Fix ItemActor::getItemStack() crash

.github/workflows/publish_release.yml

@@ -231,10 +231,24 @@ jobs:
         with:
           path: build/
 
+      - name: Push Tooth
+        working-directory: ${{env.GITHUB_WORKSPACE}}
+        if: github.event.inputs.status == 'stable'
+        run: |
+          cd Scripts
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          chmod +x ./UploadTooth.sh
+          ./UploadTooth.sh ${{ github.event.inputs.tag }}
+        env:
+          REPO_KEY: ${{secrets.PUSH_TOKEN}}
+          USERNAME: github-actions[bot]
+        shell: bash
+
       - name: Pack artifacts
         run: |
           cd build/
-          zip -9r LiteLoaderBDS.zip LiteLoaderBDS/*
+          zip -9r LiteLoaderBDS-${{ github.event.inputs.tag }}.zip LiteLoaderBDS/*
           zip -9r PDB.zip PDB/*
           zip -9r Modules.zip PeEditor PreLoader LiteLoader ScriptEngine LLParticle LLPermission
         shell: bash
@@ -247,7 +261,7 @@ jobs:
           tag: ${{ github.event.inputs.tag }}
           bodyFile: RELEASE_NOTES.md
           artifacts: |
-            build/LiteLoaderBDS.zip
+            build/LiteLoaderBDS-${{ github.event.inputs.tag }}.zip
             build/Modules.zip
             build/PDB.zip
         env:

LiteLoader/include/liteloader/Version.h

@@ -5,8 +5,8 @@
 #define LITELOADER_VERSION_RELEASE 2
 
 #define LITELOADER_VERSION_MAJOR 408
-#define LITELOADER_VERSION_MINOR 2
-#define LITELOADER_VERSION_REVISION 0
+#define LITELOADER_VERSION_MINOR 3
+#define LITELOADER_VERSION_REVISION 1
 #define LITELOADER_VERSION_ACTIONS 0
 #define LITELOADER_VERSION_STATUS LITELOADER_VERSION_DEV
 

LiteLoader/include/llapi/DynamicCommandAPI.h

@@ -390,7 +390,7 @@
      /*0*/ virtual ~DynamicCommand();
      /*1*/ virtual void execute(class CommandOrigin const& origin, class CommandOutput& output) const;
 
-     LIAPI static std::unique_ptr<class DynamicCommandInstance> createCommand(std::string const& name, std::string const& description, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, CommandFlag flag1 = {(CommandFlagValue)0x80}, CommandFlag flag2 = {(CommandFlagValue)0}, HMODULE handle = GetCurrentModule());
+     LIAPI static std::unique_ptr<class DynamicCommandInstance> createCommand(std::string const& name, std::string const& description, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, CommandFlag flag1 = {(CommandFlagValue)4}, CommandFlag flag2 = {(CommandFlagValue)0}, HMODULE handle = GetCurrentModule());
      LIAPI static std::unique_ptr<class DynamicCommandInstance> createCommand(
          std::string const& name,
          std::string const& description,
@@ -399,7 +399,7 @@
          std::vector<std::vector<std::string>>&& overloads,
          CallBackFn callback,
          CommandPermissionLevel permission = CommandPermissionLevel::GameMasters,
-         CommandFlag flag1 = {(CommandFlagValue)0x80},
+         CommandFlag flag1 = {(CommandFlagValue)0x40},
          CommandFlag flag2 = {(CommandFlagValue)0},
          HMODULE handle = GetCurrentModule());
 
@@ -412,7 +412,7 @@
          std::vector<std::vector<std::string>>&& overloads,
          CallBackFn callback,
          CommandPermissionLevel permission = CommandPermissionLevel::GameMasters,
-         CommandFlag flag1 = {(CommandFlagValue)0x80},
+         CommandFlag flag1 = {(CommandFlagValue)0x40},
          CommandFlag flag2 = {(CommandFlagValue)0},
          HMODULE handle = GetCurrentModule()) {
          return setup(createCommand(name, description, std::move(enums), std::move(params), std::move(overloads), std::move(callback), permission, flag1, flag2, handle));
@@ -483,7 +483,7 @@
 
      friend class DynamicCommand;
 
-     LIAPI DynamicCommandInstance(std::string const& name, std::string const& description, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, CommandFlag flag = {(CommandFlagValue)0x80}, HMODULE handle = GetCurrentModule());
+     LIAPI DynamicCommandInstance(std::string const& name, std::string const& description, CommandPermissionLevel permission = CommandPermissionLevel::GameMasters, CommandFlag flag = {(CommandFlagValue)0x40}, HMODULE handle = GetCurrentModule());
 
      LIAPI bool setBuilder(DynamicCommand::BuilderFn builder);
      LIAPI DynamicCommand::BuilderFn initCommandBuilder();

LiteLoader/include/llapi/HookAPI.h

@@ -1,11 +1,15 @@
 #pragma once
-#include "Global.h"
-#include "utils/Hash.h"
-#include <ModUtils/ModUtils.h>
+
 #include <vector>
 #include <string>
 #include <thread>
 
+#include <ModUtils/ModUtils.h>
+#include "Offset.h"
+
+#include "Global.h"
+#include "utils/Hash.h"
+
 // The core api of the hook function
 //__declspec(dllimport) int HookFunction(void* oldfunc, void** poutold, void* newfunc);
 // Used to get a server-defined specific function by name

LiteLoader/include/llapi/Offset.h

@@ -0,0 +1,160 @@
+#pragma once
+#include <cstdint>
+#include <utility>
+
+/*
+ * 偏移量命名规则：使用的文件名_函数名_(如有多个)第几个使用或者知道的成员名
+ * */
+
+namespace ll{
+    namespace offset{
+
+        // ->header/llapi/mc
+
+        // Null
+        constexpr uint64_t ATTRIBUTE_getName = 0x8;
+        // BaseCommandBlock::_setCommand a4 is Command
+        constexpr uint64_t BASECOMMANDBLOCK_getCommand = 0x38;
+        // ItemStackBase::init(ItemStackBase*, BlockLegacy *, int) Line14
+        constexpr uint64_t BLOCKLEGAC_getBlockItemId = 0x10C;
+        // LevelChunk::_removeCallbacks Line28
+        constexpr uint64_t BLOCKLEGAC_getBlockEntityType = 0xA8;
+        // Null
+        constexpr uint64_t BLOCKSOURCE_getDimension = 0x20;
+        // BegGoal::canUse Line6
+        constexpr uint64_t BLOCKSOURCE_getDimensionConst = 0x328;
+        // DayLockCommand::execute Line91
+        constexpr uint64_t COMMANDOUTPUT_getSuccessCount = 0x28;
+        // Null
+        constexpr uint64_t COMPOUNDTAGVARIANT_getTagType = 0x28;
+        // ExplorationMapFunction::apply Line57
+        constexpr uint64_t DIMENSION_getBlockSourceFromMainChunkSource = 0x48;
+        // Null
+        constexpr uint64_t DIMENSION_getHeight = 0xCA;
+        // Player::checkSpawnBlock Line19
+        constexpr uint64_t DIMENSION_getDimensionId = 0xC0;
+        // ItemRegistry::registerItem Line25
+        constexpr uint64_t ITEM_getFullItemName = 0xD8;
+        // Null
+        constexpr uint64_t LEVEL_getSpawner = 0x7B0;
+        // CommandAreaFactory::_getArea Line156
+        constexpr uint64_t LEVELCHUNK_getLastTick = 0x90;
+        // lambda_b490644342a3912d59dc52eb79c3a67f_::operator() Line410
+        constexpr uint64_t MINECRAFT_getNetworkHandler = 0x18;
+        // mob::die Line83
+        constexpr uint64_t MOB_getDead = 0x73A;
+        // EffectCommand::execute Line247
+        constexpr uint64_t MOBEFFECT_getResourceName = 0x50;
+        // MobEffect::MobEffect Line43
+        constexpr uint64_t MOBEFFECT_getComponentName = 0x98;
+        // ScoreboardCommand::applyPlayerOperation Line186
+        constexpr uint64_t OBJECTIVE_getName = 0x40;
+        // Objective::serialize Line55
+        constexpr uint64_t OBJECTIVE_getDisplayName = 0x60;
+        // Null
+        constexpr uint64_t PACKET_OBJECTIVE_getDisplayName = 0x10;
+        // AddPlayerPacket::AddPlayerPacket Line58
+        constexpr uint64_t PLAYER_getDeviceId = 0x1EC0;
+        // Actor::onAboveBubbleColumn Line5 照抄的，不知行不行
+        constexpr uint64_t PLAYER_isFlying_1 = 0x8B4;
+        constexpr uint64_t PLAYER_isFlying_2 = 0x8B8;
+        constexpr uint64_t PLAYER_isFlying_3 = 0x914;
+        constexpr uint64_t PLAYER_isFlying_4 = 0x918;
+        // PropertiesSettings::PropertiesSettings Line550
+        constexpr uint64_t PROPERTIESSETTINGS_useOnlineAuthentication = 0x1A1;
+        // PropertiesSettings::PropertiesSettings Line518
+        constexpr uint64_t PROPERTIESSETTINGS_getLevelName = 0x20;
+        // Null
+        constexpr uint64_t RAKNET_getAdr = 0x8;
+        // ResourcePackRepository::_initializeWorldPackSource Line62
+        constexpr uint64_t RESOURCEPACKREPOSITORY_getPackSourceFactory = 0x170;
+        // ServerScoreboard::_unpackIdentityDefToScorePacket Line30~31 16+72
+        constexpr uint64_t SCOREBOARDIDENTITYREF_getIdentityType = 0x58;
+
+        // ->src/EventAPI
+
+        // Null
+        constexpr uint64_t EVENTAPI_PlayerInteractEntity_1 = 0x68;
+        // Null
+        constexpr uint64_t EVENTAPI_PlayerInteractEntity_2 = 0x70;
+        // Hopper::Hopper
+        constexpr uint64_t EVENTAPI_HopperSearchItem = 0x5;
+        // FillingContainer::FillingContainer a2
+        constexpr uint64_t EVENTAPI_PlayerDropItem = 0xF8;
+
+        // ->src/llapi/mc
+
+        // Null
+        constexpr uint64_t BIOMEAPI_getID = 0x78;
+        // Null
+        constexpr uint64_t BIOMEAPI_getName = 0x8;
+        // Null
+        constexpr uint64_t BLOCKAPI_getTileData = 0x8;
+        // Actor::_playFlySound Line7
+        constexpr uint64_t BLOCKAPI_getRuntimeId = 0x30;
+        // Null
+        constexpr uint64_t BLOCKLEGACYAPI_getRuntimeId = 0x80;
+        // Container::Container
+        constexpr uint64_t CONTAINERAPI_getTypeName= 0x8;
+        // Null
+        constexpr uint64_t GAMEMODEAPI_getPlayer= 0x8;
+        // Null
+        constexpr uint64_t HITRESULTAPI_getFacing= 0x1C;
+        // Null
+        constexpr uint64_t HITRESULTAPI_getPos= 0x2C;
+        // Null
+        constexpr uint64_t HITRESULTAPI_isHitLiquid= 0x50;
+        // Null
+        constexpr uint64_t HITRESULTAPI_getBlockPos= 0x20;
+        // Null
+        constexpr uint64_t HITRESULTAPI_getLiquidPos= 0x54;
+        // Null
+        constexpr uint64_t HITRESULTAPI_getLiquidFacing= 0x51;
+        // Player::take Line127
+        constexpr uint64_t ITEMACTORAPI_getItemStack= 0x620;
+        // ItemActor::NormalTick Line258
+        constexpr uint64_t ITEMACTORAPI_getDespawnTime = 0x6C4;
+        // ItemActor::NormalTick Line258 也许是？
+        constexpr uint64_t ITEMACTORAPI_getLatestSpawnTime = 0x6B0;
+        // Null
+        constexpr uint64_t ITEMSTACKAPI_getCount = 0x22;
+        // MovingBlockActor::load Line69
+        constexpr uint64_t LEVELAPI_getBlockPalettePtr = 0x7D0;
+        // ServerPlayer::isHostingPlayer
+        constexpr uint64_t PLAYERAPI_getNetworkIdentifier = 0x980;
+        // KickCommand::_kickPlayer Line116
+        constexpr uint64_t PLAYERAPI_getCertificate = 0xAB0;
+        // AddPlayerPacket::AddPlayerPacket Line59
+        constexpr uint64_t PLAYERAPI_getPlatform = 0x838;
+        // InventoryContainerModel::_getContainer  2928 + 176
+        constexpr uint64_t PLAYERAPI_getInventory = 0xC20;
+        // ServerNetworkHandler::_sendLevelData Line316
+        constexpr uint64_t PLAYERAPI_getSpawnPosition = 0x1C14;
+        // ServerNetworkHandler::_sendLevelData Line310
+        constexpr uint64_t PLAYERAPI_getSpawnDimension = 0x1C20;
+        // Null
+        constexpr uint64_t PLAYERAPI_getClientUUID = 0xAA0;
+        // ServerPlayer::sendNetworkPacket 参4
+        constexpr uint64_t PLAYERAPI_getClientSubId = 0xDC0;
+        // Null
+        constexpr uint64_t PLAYERAPI_crashClient = 0X38;
+        // TransferPacket::mServerPort
+        constexpr uint64_t PLAYERAPI_sendTransferPacket_port = 0X48;
+        // TransferPacket::mServerAddress
+        constexpr uint64_t PLAYERAPI_sendTransferPacket_address = 0X28;
+        // SetScorePacket::mType
+        constexpr uint64_t PLAYERAPI_sendSetScorePacket_type = 0X28;
+        // SetScorePacket::mScoreInfo
+        constexpr uint64_t PLAYERAPI_sendSetScorePacket_data = 0X30;
+        // Null
+        constexpr uint64_t PLAYERAPI_sendCommandRequestPacket_cmd = 0X30;
+        // Null
+        constexpr uint64_t RESOURCEPACKREPOSITORYAPI_setCustomResourcePackPath = 0x30;
+
+        // ->src/llapi/nbt
+
+        // Block::Block?
+        constexpr uint64_t COMPOUNDTAGAPI_fromBlock = 0x18;
+    }
+}
+

LiteLoader/include/llapi/mc/Attribute.hpp

@@ -12,7 +12,7 @@ class Attribute {
 #define AFTER_EXTRA
 public:
     inline class HashedString const & getName() const{
-        return dAccess<HashedString>(this, 8);
+        return dAccess<HashedString>(this, ll::offset::ATTRIBUTE_getName);
     }
 
 #undef AFTER_EXTRA

LiteLoader/include/llapi/mc/BaseCommandBlock.hpp

@@ -13,7 +13,7 @@ class BaseCommandBlock {
 public:
     inline std::string const & getCommand() const{
         //BaseCommandBlock::_setCommand a4 is Command;
-        return dAccess<std::string>(this,56);
+        return dAccess<std::string>(this,ll::offset::BASECOMMANDBLOCK_getCommand);
     };
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BASECOMMANDBLOCK

LiteLoader/include/llapi/mc/BlockLegacy.hpp

@@ -163,7 +163,7 @@ public:
 
     inline int getBlockItemId() const{
         //ItemStackBase::init(ItemStackBase *this, const struct BlockLegacy *a2, int a3) Line14
-        unsigned int id = dAccess<int>(this,268);//mID
+        unsigned int id = dAccess<int>(this,ll::offset::BLOCKLEGAC_getBlockItemId);//mID
         // unsigned int id = this->mID;
         if(id < 256u)
             return id;
@@ -176,7 +176,7 @@ public:
     }
     inline enum BlockActorType getBlockEntityType() const{
         // LevelChunk::_removeCallbacks Line28
-        return dAccess<BlockActorType>(this,168);
+        return dAccess<BlockActorType>(this,ll::offset::BLOCKLEGAC_getBlockEntityType);
         //return this->mBlockEntityType;
     };
 

LiteLoader/include/llapi/mc/BlockSource.hpp

@@ -22,7 +22,7 @@ public:
 // };
     LIAPI BlockInstance getBlockInstance(BlockPos);
     inline Dimension* getDimension() const{
-        return dAccess< Dimension*>(this, 32);
+        return dAccess< Dimension*>(this, ll::offset::BLOCKSOURCE_getDimension);
     }
     inline AutomaticID<class Dimension, int> getDimensionId() const{
         //Dimension::onBlockEvent Line24
@@ -42,7 +42,7 @@ public:
     }
     inline Dimension const & getDimensionConst() const{
         //BegGoal::canUse Line6
-        return dAccess<Dimension>(this,808);
+        return dAccess<Dimension>(this,ll::offset::BLOCKSOURCE_getDimensionConst);
     };
 //    inline short getHeightmap(class BlockPos const &bs) const{
 //        auto levelchunk = getChunkAt(bs);

LiteLoader/include/llapi/mc/CommandOutput.hpp

@@ -23,13 +23,13 @@ public:
 
     inline int getSuccessCount() const{
         //DayLockCommand::execute Line91
-        return dAccess<int>(this,0x28);
+        return dAccess<int>(this,ll::offset::COMMANDOUTPUT_getSuccessCount);
     };
 
     inline void success(){
-        int successCount = dAccess<int>(this,0x28);
+        int successCount = dAccess<int>(this,ll::offset::COMMANDOUTPUT_getSuccessCount);
         ++successCount;
-        dAccess<int>(this,0x28) = successCount;
+        dAccess<int>(this,ll::offset::COMMANDOUTPUT_getSuccessCount) = successCount;
     };
 
     inline bool empty() const{

LiteLoader/include/llapi/mc/CompoundTagVariant.hpp

@@ -12,7 +12,7 @@ class CompoundTagVariant {
 #define AFTER_EXTRA
 public:
     inline Tag::Type getTagType() {
-        return dAccess<Tag::Type, 40>(this);
+        return dAccess<Tag::Type, ll::offset::COMPOUNDTAGVARIANT_getTagType>(this);
     }
     inline Tag* asTag() {
         return (Tag*)this;

LiteLoader/include/llapi/mc/Dimension.hpp

@@ -14,6 +14,11 @@ public:
 
     DimensionHeightRange(short a):max(a){};
 };
+
+struct ActorBlockSyncMessage{
+    ActorUniqueID mEntityUniqueID;
+    char mMessage[4];
+};
 #undef BEFORE_EXTRA
 
 class Dimension {
@@ -22,15 +27,15 @@ class Dimension {
 public:
     inline BlockSource& getBlockSourceFromMainChunkSource() const{
         //ExplorationMapFunction::apply Line57
-        return *dAccess<BlockSource*>(this, 72);
+        return *dAccess<BlockSource*>(this, ll::offset::DIMENSION_getBlockSourceFromMainChunkSource);
     };
     inline int getHeight(){
-        return dAccess<int>(this,202);
+        return dAccess<int>(this,ll::offset::DIMENSION_getHeight);
     };
     inline AutomaticID<class Dimension, int> getDimensionId() const{
         //Player::moveSpawnView Line33
         //Player::checkSpawnBlock Line19
-        return dAccess<AutomaticID<Dimension,int>>(this,192);
+        return dAccess<AutomaticID<Dimension,int>>(this,ll::offset::DIMENSION_getDimensionId);
     };
     inline DimensionHeightRange const & getHeightRange() const{
         // 0为主世界，1为下界，2为末地

LiteLoader/include/llapi/mc/Explosion.hpp

@@ -6,10 +6,24 @@
 #define BEFORE_EXTRA
 
 #undef BEFORE_EXTRA
+class Actor;
+class BlockSource;
 
 class Explosion {
 
 #define AFTER_EXTRA
+public:
+    Vec3 mPos;
+    float mRadius;
+    std::unordered_set<BlockPos> mToBlow;
+    bool mFire;
+    bool mBreaking;
+    bool mAllowUnderwater;
+    Actor *mSource;
+    BlockSource *mRegion;
+    float mMaxResistance;
+    std::optional<bool> mInWaterOverride;
+    char mRandom[64];
 
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXPLOSION

LiteLoader/include/llapi/mc/HitResult.hpp

@@ -6,13 +6,14 @@
 #define BEFORE_EXTRA
 // Include Headers or Declare Types Here
 
+class Actor;
 class StackResultStorageEntity;
 
 enum class HitResultType:int {
-    TILE=0,
-    ENTITY,
-    ENTITY_OUT_OF_RANGE,
-    NO_HIT,
+    TILE = 0,
+    ENTITY = 0x1,
+    ENTITY_OUT_OF_RANGE = 0x2,
+    NO_HIT = 0x3,
 };
 
 #undef BEFORE_EXTRA
@@ -22,7 +23,6 @@ class HitResult {
 #define AFTER_EXTRA
 // Add Member There
 
-    //char filler[112];
     Vec3 startPos;       //0
     Vec3 rayDir;         //12
     HitResultType type;  //24
@@ -30,20 +30,18 @@ class HitResult {
     BlockPos endBpos;    //32
     Vec3 endPos;         //44
     uintptr_t actorRef; //56
-    uintptr_t unk64;
-    int unk72;
-    int unk76;           //76
-    bool hitLiquid;      //80
-    FaceID liquidFace;   //81
-    BlockPos liquidBpos; //84
-    Vec3 liquidPos;      //96
-    bool indirectHit;    //108
-    //112
+    bool mIsHitLiquid;  //64
+    FaceID liquidFace;   //65
+    BlockPos liquidBpos; //68
+    Vec3 liquidPos;      //80
+    bool indirectHit;    //92
 public:
-    inline bool __fastcall isHit() {
-        return (unsigned int)(*((int*)this + 6) - 2) > 1;
-    }
-
+    inline bool isHit() {
+        return (unsigned int)(this->type) > 3;
+    };
+    inline Actor* getEntity() {
+        return (Actor*)(this->actorRef);
+    };
     LIAPI FaceID getFacing();
     LIAPI Vec3 getPos();
     LIAPI bool isHitLiquid();

LiteLoader/include/llapi/mc/Item.hpp

@@ -20,7 +20,7 @@ class Item {
 public:
     inline std::string const & getFullItemName() const{
         //ItemRegistry::registerItem Line25
-        return dAccess<std::string>(this,216);
+        return dAccess<std::string>(this,ll::offset::ITEM_getFullItemName);
     };
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEM

LiteLoader/include/llapi/mc/Level.hpp

@@ -143,7 +143,7 @@ public:
     }
 
     inline Spawner& getSpawner() const{
-        return *dAccess<std::unique_ptr<Spawner>>(this,1968).get();
+        return *dAccess<std::unique_ptr<Spawner>>(this,ll::offset::LEVEL_getSpawner).get();
     };
     
 #undef AFTER_EXTRA

LiteLoader/include/llapi/mc/LevelChunk.hpp

@@ -42,7 +42,7 @@ struct HardcodedSpawningArea {
 public:
     struct Tick const & getLastTick() const{
         //CommandAreaFactory::_getArea Line156
-        return *dAccess<Tick*>(this, 144);
+        return *dAccess<Tick*>(this, ll::offset::LEVELCHUNK_getLastTick);
     };
     inline int getHeightmap(const ChunkBlockPos *pos){
         //LevelChunk::_lightingCallbacks Line31 应该是这样的

LiteLoader/include/llapi/mc/LevelContainerModel.hpp

@@ -11,7 +11,13 @@
 class LevelContainerModel : public ContainerModel {
 
 #define AFTER_EXTRA
-
+    char data[200];
+public:
+    Player *mPlayer;
+    BlockPos mBlockPos;
+    BlockActorType mBlockEntityType;
+    ActorUniqueID mEntityUniqueId;
+    std::vector<Container *> initContainerList;
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELCONTAINERMODEL
 public:

LiteLoader/include/llapi/mc/Minecraft.hpp

@@ -14,7 +14,7 @@ class Minecraft {
 public:
     inline NetworkHandler & getNetworkHandler(){
         //lambda_b490644342a3912d59dc52eb79c3a67f_::operator() Line410
-        return dAccess<NetworkHandler>(this,24);
+        return dAccess<NetworkHandler>(this,ll::offset::MINECRAFT_getNetworkHandler);
     };
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MINECRAFT

LiteLoader/include/llapi/mc/Mob.hpp

@@ -28,7 +28,7 @@ public:
     }
     inline bool getDead(){
         //mob::die Line83
-        return dAccess<bool>(this,1850);
+        return dAccess<bool>(this,ll::offset::MOB_getDead);
     };
 
 #undef AFTER_EXTRA

LiteLoader/include/llapi/mc/MobEffect.hpp

@@ -53,11 +53,11 @@ public:
 
     inline std::string const & getResourceName() const{
         //EffectCommand::execute Line247
-        return dAccess<std::string>(this,80);
+        return dAccess<std::string>(this,ll::offset::MOBEFFECT_getResourceName);
     };
     inline HashedString const & getComponentName() const{
         //MobEffect::MobEffect Line43;
-        return dAccess<HashedString>(this,152);
+        return dAccess<HashedString>(this,ll::offset::MOBEFFECT_getComponentName);
     };
 
 #undef AFTER_EXTRA

LiteLoader/include/llapi/mc/Objective.hpp

@@ -14,14 +14,14 @@ class Objective {
 public:
     inline std::string getName(){
         //ScoreboardCommand::applyPlayerOperation Line186
-        return dAccess<std::string>(this, 64);
+        return dAccess<std::string>(this, ll::offset::OBJECTIVE_getName);
     };
 
     LIAPI bool setDisplay(const std::string& slotName, ObjectiveSortOrder sort);
 
     inline std::string const & getDisplayName() const{
         //Objective::serialize
-        return dAccess<std::string>(this,96);
+        return dAccess<std::string>(this,ll::offset::OBJECTIVE_getDisplayName);
     };
     
 #undef AFTER_EXTRA

LiteLoader/include/llapi/mc/Packet.hpp

@@ -39,7 +39,7 @@ public:
 
     inline ServerPlayer* getPlayerFromPacket(ServerNetworkHandler* handler, NetworkIdentifier* netId)
     {
-        return handler->getServerPlayer(*netId, dAccess<char>(this, 16));
+        return handler->getServerPlayer(*netId, dAccess<char>(this, ll::offset::PACKET_OBJECTIVE_getDisplayName));
     }
     inline enum StreamReadResult _read(class ReadOnlyBinaryStream& binaryStream)
     {

LiteLoader/include/llapi/mc/Player.hpp

@@ -184,11 +184,13 @@ public:
     }
     inline std::string* getDeviceId(){
         //AddPlayerPacket::AddPlayerPacket Line58
-        return dAccess<std::string*>(this,7872);
+        return dAccess<std::string*>(this,ll::offset::PLAYER_getDeviceId);
     };
     inline bool isFlying(){
         //Actor::onAboveBubbleColumn Line5 照抄的，不知行不行
-        return (dAccess<int>(this,2228) == 1 || !dAccess<bool>(this,2232)) && (dAccess<int>(this, 2324) == 1 || !dAccess<bool>(this, 2328));
+        return (dAccess<int>(this,ll::offset::PLAYER_isFlying_1) == 1
+                || !dAccess<bool>(this,ll::offset::PLAYER_isFlying_2))
+                && (dAccess<int>(this, ll::offset::PLAYER_isFlying_3) == 1 || !dAccess<bool>(this, ll::offset::PLAYER_isFlying_4));
     };
     inline bool isHungry(){
         void* Player_HUNGER = dlsym("?HUNGER@Player@@2VAttribute@@B");

LiteLoader/include/llapi/mc/Potion.hpp

@@ -10,7 +10,42 @@
 class Potion {
 
 #define AFTER_EXTRA
-
+public:
+     enum PotionType{
+         Undefined_9 = 0xFFFFFFFF,
+         Regular = 0x0,
+         Splash_0 = 0x1,
+         Lingering = 0x2,
+     };
+    enum PotionVariant{
+        MOVESLOW = 0x0,
+        MOVESPEED = 0x1,
+        DIGSLOW = 0x2,
+        DIGSPEED = 0x3,
+        DAMAGEBOOST = 0x4,
+        HEAL = 0x5,
+        HARM = 0x6,
+        JUMP_0 = 0x7,
+        CONFUSION = 0x8,
+        REGEN = 0x9,
+        RESISTANCE = 0xA,
+        FIRERESISTANCE = 0xB,
+        WATERBREATH = 0xC,
+        INVISIBILITY = 0xD,
+        BLINDNESS = 0xE,
+        NIGHTVISION = 0xF,
+        HUNGER = 0x10,
+        WEAKNESS = 0x11,
+        POISON = 0x12,
+        WITHER = 0x13,
+        HEALTHBOOST = 0x14,
+        ABSORPTION = 0x15,
+        SATURATION = 0x16,
+        LEVITATION = 0x17,
+        TURTLEMASTER = 0x18,
+        SLOWFALL = 0x19,
+        BASE = 0x1A,
+    };
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_POTION
 public:

LiteLoader/include/llapi/mc/PropertiesSettings.hpp

@@ -13,11 +13,11 @@ class PropertiesSettings {
 public:
     inline bool useOnlineAuthentication(){
         //PropertiesSettings::PropertiesSettings Line550;
-        return dAccess<bool>(this, 417);
+        return dAccess<bool>(this, ll::offset::PROPERTIESSETTINGS_useOnlineAuthentication);
     }
     inline std::string getLevelName(){
         //PropertiesSettings::PropertiesSettings Line518
-        return dAccess<std::string>(this,32);
+        return dAccess<std::string>(this,ll::offset::PROPERTIESSETTINGS_getLevelName);
     }
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PROPERTIESSETTINGS

LiteLoader/include/llapi/mc/RakNet.hpp

@@ -41,7 +41,7 @@ namespace RakNet {
         RakPeer(RakPeer const&) = delete;
         RakPeer(RakPeer&&) = delete;
         SystemAddress getAdr(NetworkIdentifier const& ni) {
-            RakNetGUID const& guid = dAccess<RakNetGUID>(&ni, 8);
+            RakNetGUID const& guid = dAccess<RakNetGUID>(&ni, ll::offset::RAKNET_getAdr);
             return RakPeer::GetSystemAddressFromGuid(guid);
         }
         MCAPI virtual SystemAddress GetSystemAddressFromGuid(struct RakNet::RakNetGUID) const;

LiteLoader/include/llapi/mc/ResourcePackRepository.hpp

@@ -21,7 +21,7 @@ public:
 
     inline class PackSourceFactory* getPackSourceFactory(){
         //ResourcePackRepository::_initializeWorldPackSource Line62
-        return dAccess<PackSourceFactory*>(this, 46 * 8);
+        return dAccess<PackSourceFactory*>(this, ll::offset::RESOURCEPACKREPOSITORY_getPackSourceFactory);
     };
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_RESOURCEPACKREPOSITORY

LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp

@@ -13,7 +13,7 @@ class ScoreboardIdentityRef {
 public:
     enum IdentityDefinition::Type getIdentityType(){
         //ServerScoreboard::_unpackIdentityDefToScorePacket Line30~31 16+72
-        return dAccess<enum IdentityDefinition::Type>(this, 88);
+        return dAccess<enum IdentityDefinition::Type>(this, ll::offset::SCOREBOARDIDENTITYREF_getIdentityType);
     };
 
 #undef AFTER_EXTRA

LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp

@@ -11,7 +11,12 @@
 class SetDisplayObjectivePacket : public Packet {
 
 #define AFTER_EXTRA
-
+public:
+    std::string mDisplaySlotName;
+    std::string mObjectiveName;
+    std::string mObjectiveDisplayName;
+    std::string mCriteriaName;
+    ObjectiveSortOrder mSortOrder;
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SETDISPLAYOBJECTIVEPACKET
 public:

LiteLoader/include/llapi/mc/SetScorePacket.hpp

@@ -6,12 +6,18 @@
 
 #define BEFORE_EXTRA
 
+enum ScorePacketType {
+    Change = 0x0,
+    Remove_2 = 0x1,
+};
 #undef BEFORE_EXTRA
 
 class SetScorePacket : public Packet {
 
 #define AFTER_EXTRA
-
+public:
+    ScorePacketType mType;
+    std::vector<ScorePacketInfo> mScoreInfo;
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SETSCOREPACKET
 public:

LiteLoader/include/llapi/mc/TransferPacket.hpp

@@ -12,7 +12,9 @@ class TransferPacket : public Packet {
 
 #define AFTER_EXTRA
     // Add Member There
-    char filler[40];
+public:
+    std::string mServerAddress;
+    int mServerPort;
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRANSFERPACKET
 public:

LiteLoader/src/liteloader/AddonsHelper.cpp

@@ -514,7 +514,7 @@ public:
 
     static void setup(CommandRegistry* registry) {
         registry->registerCommand("addons", "LiteLoaderBDS Addons Helper (Restart required after addon changes)",
-                                  CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x80});
+                                  CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x40});
 
         vector<string> addonsList;
         for (auto& addon : addons)

LiteLoader/src/liteloader/BuiltinCommands.cpp

@@ -118,7 +118,7 @@ public:
     static void setup(CommandRegistry* registry) {
         registry->registerCommand(
             "tpdim", "Teleport to Dimension", CommandPermissionLevel::GameMasters,
-            {(CommandFlagValue)0}, {(CommandFlagValue)0x80});
+            {(CommandFlagValue)0}, {(CommandFlagValue)0x40});
         registry->addEnum<DimensionType>("DimensionType",
                                          {
                                              {"overworld", DimensionType::OverWorld},
@@ -312,7 +312,7 @@ public:
     static void setup(CommandRegistry* registry) {
         // Register Cmd
         registry->registerCommand("ll", "LiteLoaderBDS plugin operations",
-                                  CommandPermissionLevel::Console, {(CommandFlagValue)0}, {(CommandFlagValue)0x80});
+                                  CommandPermissionLevel::Console, {(CommandFlagValue)0}, {(CommandFlagValue)0x40});
 
         // Register softenum
         vector<string> pluginList;
@@ -372,7 +372,7 @@ public:
 
     static void setup(CommandRegistry* registry) {
         registry->registerCommand("version", "Get the version of this server",
-                                  CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x80});
+                                  CommandPermissionLevel::GameMasters, {(CommandFlagValue)0}, {(CommandFlagValue)0x40});
         registry->registerOverload<VersionCommand>("version");
     }
 };

LiteLoader/src/liteloader/BuiltinUnlockCmd.cpp

@@ -10,7 +10,7 @@ bool isUnlockCmdEnabled = true;
 void LogCommandRegistration(std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2);
 
 TInstanceHook(void, "?registerCommand@CommandRegistry@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBDW4CommandPermissionLevel@@UCommandFlag@@3@Z",
-              CommandRegistry, std::string const& name, char const* description, enum CommandPermissionLevel perm, short flag1, short flag2) {
+              CommandRegistry, std::string const& name, char const* description, enum CommandPermissionLevel perm, unsigned char flag1, unsigned char flag2) {
     // For #643
     if (name.find(' ') == std::string::npos) { // If no space inside
         // Check whether command is already exists before registering
@@ -20,7 +20,7 @@ TInstanceHook(void, "?registerCommand@CommandRegistry@@QEAAXAEBV?$basic_string@D
         }
     }
     if (ll::globalConfig.enableUnlockCmd) {
-        flag1 |= 0x80;
+        flag2 |= 0x40;
     }
     if (ll::globalConfig.debugMode) {
         LogCommandRegistration(name, description, perm, flag1, flag2);

LiteLoader/src/llapi/mc/BiomeAPI.cpp

@@ -5,11 +5,11 @@
 #include <llapi/HookAPI.h>
 
 int Biome::getId() const {
-    return dAccess<int, 120>(this);
+    return dAccess<int, ll::offset::BIOMEAPI_getID>(this);
 }
 
 std::string const& Biome::getName() const {
-    return dAccess<std::string, 8>(this);
+    return dAccess<std::string, ll::offset::BIOMEAPI_getName>(this);
 }
 
 // Biome* Biome::fromId(int id) {

LiteLoader/src/llapi/mc/BlockAPI.cpp

@@ -34,7 +34,7 @@ string Block::getTypeName() const {
 
 unsigned short Block::getTileData() {
     // 等待大佬改进
-    auto tileData = dAccess<unsigned short, 8>(this);
+    auto tileData = dAccess<unsigned short, ll::offset::BLOCKAPI_getTileData>(this);
     auto blk = &getLegacyBlock();
 
     if (((BlockLegacy*)blk)->toBlock(tileData) == (Block*)this) {
@@ -64,5 +64,5 @@ bool Block::setNbt(CompoundTag* nbt) {
 
 unsigned int const & Block::getRuntimeId() const{
     // Actor::_playFlySound Line7
-    return dAccess<unsigned int>(this, 48);
+    return dAccess<unsigned int>(this, ll::offset::BLOCKAPI_getRuntimeId);
 }

LiteLoader/src/llapi/mc/BlockLegacyAPI.cpp

@@ -13,7 +13,7 @@ Block* BlockLegacy::toBlock(unsigned short tileData) {
 }
 
 string BlockLegacy::getTypeName() {
-    return dAccess<string, 128>(this);
+    return dAccess<string, ll::offset::BLOCKLEGACYAPI_getRuntimeId>(this);
 }
 
 bool BlockLegacy::applyBoneMeal(BlockSource* a1, BlockPos* a2) {

LiteLoader/src/llapi/mc/ContainerAPI.cpp

@@ -6,7 +6,7 @@
 #include <llapi/HookAPI.h>
 
  LIAPI std::string Container::getTypeName() {
-     ContainerType type = dAccess<ContainerType>(this, 8); //IDA Container::Container
+     ContainerType type = dAccess<ContainerType>(this, ll::offset::CONTAINERAPI_getTypeName); //IDA Container::Container
      // ContainerType type = getContainerType();
      return std::string{magic_enum::enum_name(type)};
  }

LiteLoader/src/llapi/mc/GameModeAPI.cpp

@@ -3,5 +3,5 @@
 #include <llapi/HookAPI.h>
 
 ServerPlayer* GameMode::getPlayer() {
-    return dAccess<ServerPlayer*, 8>(this);
+    return dAccess<ServerPlayer*, ll::offset::GAMEMODEAPI_getPlayer>(this);
 }

LiteLoader/src/llapi/mc/HitResultAPI.cpp

@@ -2,13 +2,13 @@
 #include <llapi/HookAPI.h>
 
 FaceID HitResult::getFacing() {
-    return dAccess<FaceID>(this, 28);
+    return dAccess<FaceID>(this, ll::offset::HITRESULTAPI_getFacing);
 }
 Vec3 HitResult::getPos() {
-    return dAccess<Vec3>(this, 44);
+    return dAccess<Vec3>(this, ll::offset::HITRESULTAPI_getPos);
 }
 bool HitResult::isHitLiquid() {
-    return dAccess<bool>(this, 80);
+    return dAccess<bool>(this, ll::offset::HITRESULTAPI_isHitLiquid);
 }
 // LIAPI bool HitResult::isEntity() {
 //     return getHitResultType() == HitResultType::ENTITY;
@@ -17,13 +17,13 @@ bool HitResult::isHitLiquid() {
 //     return getHitResultType() == HitResultType::TILE;
 // }
 BlockPos HitResult::getBlockPos() {
-    return dAccess<BlockPos>(this, 32);
+    return dAccess<BlockPos>(this, ll::offset::HITRESULTAPI_getBlockPos);
 }
 BlockPos HitResult::getLiquidPos() {
-    return dAccess<BlockPos>(this, 84);
+    return dAccess<BlockPos>(this, ll::offset::HITRESULTAPI_getLiquidPos);
 }
 FaceID HitResult::getLiquidFacing() {
-    return dAccess<FaceID>(this, 81);
+    return dAccess<FaceID>(this, ll::offset::HITRESULTAPI_getLiquidFacing);
 }
 // LIAPI Vec3 HitResult::getLiquidHitPos();
 // LIAPI HitResultType HitResult::getHitResultType() {

LiteLoader/src/llapi/mc/ItemActorAPI.cpp

@@ -3,18 +3,18 @@
 #include <llapi/HookAPI.h>
 
 ItemStack* ItemActor::getItemStack() {
-    return (ItemStack*)((uintptr_t)this + 1568); // IDA Player::take Line127
+    return &dAccess<ItemStack>(this, ll::offset::ITEMACTORAPI_getItemStack); // IDA Player::take Line127
 }
 
 int ItemActor::getDespawnTime() {
-    return dAccess<int, 433*4>(this); // ItemActor::NormalTick Line258
+    return dAccess<int, ll::offset::ITEMACTORAPI_getDespawnTime>(this); // ItemActor::NormalTick Line258
 }
 
 bool ItemActor::setDespawnTime(int a1) {
-    dAccess<int, 433*4>(this) = a1;
+    dAccess<int, ll::offset::ITEMACTORAPI_getDespawnTime>(this) = a1;
     return true;
 }
 
 int ItemActor::getLatestSpawnTime() {
-    return dAccess<int, 428*4>(this);
+    return dAccess<int, ll::offset::ITEMACTORAPI_getLatestSpawnTime>(this);
 }

LiteLoader/src/llapi/mc/ItemStackAPI.cpp

@@ -84,7 +84,7 @@ int ItemStack::getAux() const {
 int ItemStack::getCount() const {
     if (this->isNull())
         return 0;
-    return dAccess<unsigned char, 34>(this);
+    return dAccess<unsigned char, ll::offset::ITEMSTACKAPI_getCount>(this);
 }
 
 bool ItemStack::setItem(ItemStack* newItem) {
@@ -112,7 +112,7 @@ bool ItemStack::setNbt(CompoundTag* nbt) {
 int ItemStackBase::getCount() const {
     if (this->isNull())
         return 0;
-    return dAccess<unsigned char, 34>(this);
+    return dAccess<unsigned char, ll::offset::ITEMSTACKAPI_getCount>(this);
 }
 
 // string ItemStack::getStandardName(const Localization& language) {

LiteLoader/src/llapi/mc/LevelAPI.cpp

@@ -65,7 +65,7 @@ Block* Level::getBlock(const BlockPos& pos, BlockSource* blockSource) {
 
 BlockPalette* Level::getBlockPalettePtr(){
     // MovingBlockActor::load Line69
-    return dAccess<BlockPalette*>(Global<Level>,2000);
+    return dAccess<BlockPalette*>(Global<Level>,ll::offset::LEVELAPI_getBlockPalettePtr);
 };
 
 // Return nullptr when failing to get block

LiteLoader/src/llapi/mc/PlayerAPI.cpp

@@ -47,13 +47,13 @@ extern Logger logger;
 
 NetworkIdentifier* Player::getNetworkIdentifier() const{
     //ServerPlayer::isHostingPlayer
-    return dAccess<NetworkIdentifier*>(this, 2432);
+    return dAccess<NetworkIdentifier*>(this, ll::offset::PLAYERAPI_getNetworkIdentifier);
 }
 
 
 Certificate* Player::getCertificate() const{
     //KickCommand::_kickPlayer Line116
-    return dAccess<Certificate*>(this, 2736);
+    return dAccess<Certificate*>(this, ll::offset::PLAYERAPI_getCertificate);
 }
 
 std::string Player::getRealName() {
@@ -99,12 +99,12 @@ string Player::getServerAddress() {
 
 int Player::getPlatform(){
     //AddPlayerPacket::AddPlayerPacket Line59
-    return dAccess<int>(this, 2104);
+    return dAccess<int>(this, ll::offset::PLAYERAPI_getPlatform);
 }
 
 Container & Player::getInventory(){
     //InventoryContainerModel::_getContainer  2928 + 176
-    return dAccess<Container>(this, 3104);
+    return dAccess<Container>(this, ll::offset::PLAYERAPI_getInventory);
 }
 
 enum CommandPermissionLevel Player::getPlayerPermissionLevel(){
@@ -258,12 +258,12 @@ bool Player::transferServer(const string& address, unsigned short port) {
 
 BlockPos const & Player::getSpawnPosition(){
     //ServerNetworkHandler::_sendLevelData Line316
-    return dAccess<BlockPos>(this, 1797*4);
+    return dAccess<BlockPos>(this, ll::offset::PLAYERAPI_getSpawnPosition);
 }
 
 AutomaticID<Dimension, int> Player::getSpawnDimension(){
     //ServerNetworkHandler::_sendLevelData Line310
-    return dAccess<AutomaticID<Dimension, int>>(this, 1800*4);
+    return dAccess<AutomaticID<Dimension, int>>(this, ll::offset::PLAYERAPI_getSpawnDimension);
 }
 
 std::pair<BlockPos, int> Player::getRespawnPosition() {
@@ -322,12 +322,12 @@ string Player::getXuid() const{
 }
 
 mce::UUID Player::getClientUUID()const{
-    return dAccess<mce::UUID>(this,2720);
+    return dAccess<mce::UUID>(this,ll::offset::PLAYERAPI_getClientUUID);
 };
 
 unsigned char Player::getClientSubId() {
     //ServerPlayer::sendNetworkPacket 参4
-    return dAccess<unsigned char>(this,3520);
+    return dAccess<unsigned char>(this,ll::offset::PLAYERAPI_getClientSubId);
 }
 
 float Player::getAvgPacketLoss() {
@@ -442,7 +442,7 @@ size_t Player::getTotalXpNeededForLevel(int level) {
 
 bool Player::crashClient() {
     auto pkt = MinecraftPackets::createPacket(MinecraftPacketIds::LevelChunk);
-    dAccess<bool, 56>(pkt.get()) = 1;
+    dAccess<bool, ll::offset::PLAYERAPI_crashClient>(pkt.get()) = 1;
     sendNetworkPacket(*pkt);
     return true;
 }
@@ -684,8 +684,8 @@ bool Player::sendUpdateBlockPacket(BlockPos const& bpos, const Block& block, Upd
 
 bool Player::sendTransferPacket(const string& address, short port) const {
     auto packet = MinecraftPackets::createPacket(0x55);
-    dAccess<short>(packet.get(), 36) = port;
-    dAccess<string>(packet.get(), 40) = address;
+    dAccess<short>(packet.get(), ll::offset::PLAYERAPI_sendTransferPacket_port) = port;
+    dAccess<string>(packet.get(), ll::offset::PLAYERAPI_sendTransferPacket_address) = address;
     sendNetworkPacket(*packet);
     return true;
 }
@@ -698,8 +698,8 @@ bool Player::sendSetDisplayObjectivePacket(const string& title, const string& na
 
 bool Player::sendSetScorePacket(char type, const vector<ScorePacketInfo>& data) {
     auto packet = MinecraftPackets::createPacket(0x6c);
-    dAccess<char>(packet.get(), 48) = type;
-    dAccess<vector<ScorePacketInfo>>(packet.get(), 56) = data;
+    dAccess<char>(packet.get(), ll::offset::PLAYERAPI_sendSetScorePacket_type) = type;
+    dAccess<vector<ScorePacketInfo>>(packet.get(), ll::offset::PLAYERAPI_sendSetScorePacket_data) = data;
     sendNetworkPacket(*packet);
     return true;
 }
@@ -750,7 +750,7 @@ bool Player::sendSetScorePacket(char type, const vector<ScorePacketInfo>& data)
 
 bool Player::sendCommandRequestPacket(const string& cmd) {
     auto packet = MinecraftPackets::createPacket(0x4d);
-    dAccess<string, 48>(packet.get()) = cmd;
+    dAccess<string, ll::offset::PLAYERAPI_sendCommandRequestPacket_cmd>(packet.get()) = cmd;
     Global<ServerNetworkHandler>->handle(*getNetworkIdentifier(), *((CommandRequestPacket*)packet.get()));
     return true;
 }

LiteLoader/src/llapi/mc/ResourcePackRepositoryAPI.cpp

@@ -6,7 +6,7 @@
 #include <llapi/HookAPI.h>
 
  void ResourcePackRepository::setCustomResourcePackPath(PackType type, const std::string& path) {
-     auto CompositePack = dAccess<CompositePackSource*>(this, 48);
+     auto CompositePack = dAccess<CompositePackSource*>(this, ll::offset::RESOURCEPACKREPOSITORYAPI_setCustomResourcePackPath);
      auto PackSourceFactory = getPackSourceFactory();
      auto& DirectoryPackSource = PackSourceFactory->createDirectoryPackSource(Core::Path(path), type, PackOrigin::PackOrigin_Dev, 0);
      CompositePack->addPackSource((PackSource*)&DirectoryPackSource);

LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp

@@ -142,12 +142,12 @@ void CompoundTag::setItemStack(ItemStack* item) {
 }
 
 std::unique_ptr<CompoundTag> CompoundTag::fromBlock(Block* block) {
-    auto tag = (CompoundTag*)((uintptr_t)block + 24); //dAccess Block::Block
+    auto tag = dAccess<CompoundTag*>(block, ll::offset::COMPOUNDTAGAPI_fromBlock); //dAccess Block::Block
     return tag->clone();
 }
 
 void CompoundTag::setBlock(Block* blk) {
-    auto tag = (CompoundTag*)((uintptr_t)blk + 24);//dAccess Block::Block
+    auto tag = dAccess<CompoundTag*>(blk, ll::offset::COMPOUNDTAGAPI_fromBlock);//dAccess Block::Block
     tag->deepCopy(*this);
 }
 

PermissionAPI-1.16.40

@@ -1 +1 @@
-Subproject commit 15e2c6d7149054f36f103de0a86d58e4548a506f
+Subproject commit 23548dcf6a1761c0fab3268e733ac84b2b7ccee6

RELEASE_NOTES.md

@@ -1,19 +1,42 @@
-# Release 408.2.0
+# Release 408.3.0
 
 ![BDS 1.16.40.02](https://img.shields.io/badge/BDS-1.16.40.02-blue?style=for-the-badge) ![Protocol 408](https://img.shields.io/badge/Protocol-408-orange?style=for-the-badge)
 
+v408.3.x 版本变更内容
 ## Added
 
-* Null
+* 添加`ActorBlockSyncMessage`结构
+* 添加`Potion::PotionType`成员
+* 添加`Potion::PotionVariant`成员
 
 ## Changed
 
-* 重构文件结构
-* 更改LL命名空间至ll
-* 添加SDK库![SDK-cpp](https://github.com/quizhizhe/LL-SDK-cpp-1.16.40)
+* 集中偏移量到一个头文件
+* 规范`EventAPI.h`里变量命名
+* 补全`Explosion`类
+* 补全`HitResult`类
+* 部分补全`LevelContainerModel`类
 
 ## Fixed
 
-* Fix AttributeInstance class
+* 修复`PlayerDropItem`事件
+* 修复`BlockExploded`事件
+* 修复`ContainerChange`事件，未测试，可能有问题
+* 修复`ProjectileHitBlock`事件
+* 修复`MobHurt`事件
+* 修复`ProjectileHitEntity`事件
+* 修复`ProjectileSpawn`事件
+* 修复`SetScorePacket`类
+* 修复`TransferPacket`类
+* 修复`SetDisplayObjectivePacket`类
+* 修正`HitResult::getEntity`函数
 
-**Full Changelog**: https://github.com/quizhizhe/LiteLoaderBDS-1.16.40/compare/408.1.0...408.2.0
+v408.3.1
+
+* 修复指令在无作弊情况下不能使用
+
+## Other
+
+* 已发布到Tooth库，可使用[Lip](https://github.com/LiteLDev/Lip)或者[LipUI](https://github.com/LiteLDev/LipUI)进行安装
+
+**Full Changelog**: https://github.com/quizhizhe/LiteLoaderBDS-1.16.40/compare/408.2.0...408.3.0

ScriptEngine/src/api/CommandCompatibleAPI.cpp

@@ -19,7 +19,7 @@ using namespace std;
 
 bool RegisterCmd(const string& cmd, const string& describe, int cmdLevel) {
     ::Global<CommandRegistry>->registerCommand(cmd, describe.c_str(), (CommandPermissionLevel)cmdLevel, {(CommandFlagValue)0},
-                                               {(CommandFlagValue)0x80});
+                                               {(CommandFlagValue)0x40});
     return true;
 }
 

ScriptEngine/src/api/PlayerAPI.cpp

@@ -87,7 +87,6 @@ ClassDefine<PlayerClass> PlayerClassBuilder =
         .instanceProperty("isAdventure", &PlayerClass::isAdventure)
         .instanceProperty("isGliding", &PlayerClass::isGliding)
         .instanceProperty("isSurvival", &PlayerClass::isSurvival)
-//        .instanceProperty("isSpectator", &PlayerClass::isSpectator)
         .instanceProperty("isRiding", &PlayerClass::isRiding)
         .instanceProperty("isDancing", &PlayerClass::isDancing)
         .instanceProperty("isCreative", &PlayerClass::isCreative)

Scripts/UploadSDK.cmd

@@ -33,7 +33,7 @@ echo.
 if not exist LiteLoaderSDK/Header/ (
     echo [WARNING] LiteLoaderSDK files no found. Pulling from remote...
     echo.
-    git clone %LL_SDK_REMOTE_PATH%
+    git clone %LL_SDK_REMOTE_PATH% LiteLoaderSDK
 )
 
 cd LiteLoaderSDK

Scripts/UploadTooth.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+TOOTH_REMOTE_PATH=https://github.com/Tooth-Hub/LiteLoaderBDS-Legacy.git
+
+cd ..
+echo [INFO] Fetching LiteLoaderBDS-Legacy Tooth to GitHub ...
+git config --global core.autocrlf false
+# 获取标签
+#now_tag=$(git describe --tags --always | cut -d "-" -f 1)
+now_tag=$1
+
+echo NOW_TAG $now_tag
+
+echo [INFO] LiteLoaderBDS-Legacy Tooth Pulling from remote...
+echo
+git clone ${TOOTH_REMOTE_PATH} Tooth
+
+# cd LiteLoaderBDS-Legacy
+# git fetch --all
+# git reset --hard origin/Protocol-408
+# git checkout Protocol-408
+# cd ..
+
+echo
+echo [INFO] Fetching LiteLoaderBDS-Legacy Tooth to GitHub finished
+echo
+
+
+# copy all from build/sdk to LiteLoaderSDK
+cp -r build/LiteLoaderBDS/* Tooth
+
+cd Tooth
+vers="   \"version\": \"${now_tag:1}\","
+
+#modify tooth.json
+sed -i "4c\ ${vers}" ./tooth.json
+
+
+now_status=$(git status . -s)
+if [ "$now_status" ]; then
+    echo [INFO] Modified files found.
+    echo
+    git add .
+    git commit -m "${now_tag}"
+    git tag ${now_tag}
+
+    echo
+    echo [INFO] Pushing to origin...
+    echo
+
+    git push https://${USERNAME}:${REPO_KEY}@github.com/Tooth-Hub/LiteLoaderBDS-Legacy.git Protocol-408
+    git push --tags https://${USERNAME}:${REPO_KEY}@github.com/Tooth-Hub/LiteLoaderBDS-Legacy.git Protocol-408
+
+    cd ..
+    echo
+    echo [INFO] Upload finished.
+    echo
+else
+    cd ..
+    echo
+    echo
+    echo [INFO] No modified files found.
+    echo [INFO] No need to Upgrade LiteLoaderBDS-Legacy.
+fi

Tools/SymDBHelper/CMakeLists.txt

@@ -3,7 +3,6 @@ project(SymDBHelper)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_BUILD_TYPE Release)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/LiteLoader/Lib/)
 
 add_definitions(-D"NDEBUG" -D"_LIB" -D"_UNICODE" -D"UNICODE")
 
@@ -13,4 +12,12 @@ add_compile_options(
 )
 
 add_library(SymDBHelper STATIC SymDBHelper.cpp)
-target_link_libraries(SymDBHelper Demangler)
+target_link_libraries(SymDBHelper Demangler)
+
+# use hardcode path to avoid the problem of different build path
+add_custom_command(
+        TARGET SymDBHelper POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:SymDBHelper> ${CMAKE_BINARY_DIR}/sdk/lib/
+        COMMENT "Copying lib to sdk directory"
+        VERBATIM
+)