Merge pull request LiteLDev#892 from LiteLDev/beta

Merge beta into main
PoiCraft · Nov 4, 2022 · 402b4a5 · 402b4a5
2 parents ae408ea + fc06de9
commit 402b4a5
Show file tree

Hide file tree

Showing 193 changed files with 889 additions and 680 deletions.
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       tag:
         required: true
-        description: 'tag is going to be released'
+        description: 'release tag'
 
 env:
   BUILD_TYPE: Release

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,30 +2,15 @@
 
 # LiteLoader Release Note
 
-**Adapted to BDS-1.19.40 | ProtocolVersion 557**
+**Adapted to BDS-1.19.41 | ProtocolVersion 557**
 
 ## New features
-
-- Support 1.19.40 @dreamguxiang
-- Add DeviceAPI::getPlayMode for LLSE @shishkevichd
-- Add `EntityAPI::distanceToSqr` @shishkevichd
-- Add property lore for ItemAPI @shishkevichd
-- Add setHealth, setMaxHealth for ActorAPI @shishkevichd
-
-## Changes
-
-- Drop item when add is failed (in `Player::giveItem`) @Redbeanw44602
-- Add amount parameter to `Container.addItem` @Redbeanw44602
-- Add WanderingTrader spawn to MobSpawnEvent @Redbeanw44602
-- `EntityAPI::distanceToPos` -> `EntityAPI::distanceTo` @shishkevichd
-- Now `EntityAPI::distanceTo` accepts an Entity @shishkevichd
+- Support 1.19.41 @dreamguxiang
+- Add Player::getAbilities Player::setAbility #890 @dreamguxiang
+- Add Actor::getBiomeId Actor::getBiomeName #883 @dreamguxiang
 
 ## Bug Fixes
-
-- Fix `Player::giveItem` bug #834,#850 @Redbeanw44602
-- Fix PlayerInfo api error #856 @ShrBox
-- Fix PlayerUseBucketEvent fails to listen in some cases #855(#865) @quizhizhe
-- Fix `Actor::teleport` @dreamguxiang
-- Fix some ios players join server and server lag #863 @dreamguxiang
-- Fix `runcmd/runcmdEx` some commands cannot be executed #858,#859,#715,#553 @dreamguxiang
-- Fix `mc.cloneMob` pos error #861 @dreamguxiang
+- Fix #888 @ShrBox
+- Fix Abilities(MayFly) Permissions #890 @dreamguxiang
+- Fix `Player::getrealName` error #886 @dreamguxiang
+- Fix `Biome::getName` is empty @dreamguxiang
diff --git a/LiteLoader/include/liteloader/Config.h b/LiteLoader/include/liteloader/Config.h
@@ -58,6 +58,7 @@ struct LLConfig {
     bool enableParticleAPI = false;
     bool enablePermissionAPI = true;
     bool enableClientChunkPreGeneration = true;
+    bool enableFixAbility = true;
     std::vector<std::string> outputFilterRegex = {};
 };
 

diff --git a/LiteLoader/include/liteloader/Version.h b/LiteLoader/include/liteloader/Version.h
@@ -6,7 +6,7 @@
 
 #define LITELOADER_VERSION_MAJOR 2
 #define LITELOADER_VERSION_MINOR 8
-#define LITELOADER_VERSION_REVISION 0
+#define LITELOADER_VERSION_REVISION 1
 #define LITELOADER_VERSION_COMMIT_SHA UNKNOWN
 #define LITELOADER_VERSION_STATUS LITELOADER_VERSION_DEV
 #define LITELOADER_VERSION_STATUS_VERSION 0

diff --git a/LiteLoader/include/llapi/mc/Actor.hpp b/LiteLoader/include/llapi/mc/Actor.hpp
@@ -24,6 +24,8 @@ class Vec2;
 class BlockInstance;
 class ItemStack;
 class BlockSource;
+class Biome;
+
 enum class FaceID : char;
 
 #undef BEFORE_EXTRA
@@ -71,6 +73,7 @@ class Actor {
     LIAPI bool refreshActorData();
     LIAPI bool addEffect(MobEffect::EffectType type, int tick, int level, bool ambient = false, bool showParticles = true, bool showAnimation = false);
     LIAPI float quickEvalMolangScript(const string& expression);
+    LIAPI Biome* getBiome();
     //LIAPI Json::Value quickEvalMolangScriptAsJson(const string& expression);
 
     inline Vec3 getPos()

diff --git a/LiteLoader/include/llapi/mc/ActorLimitedLifetimeComponent.hpp b/LiteLoader/include/llapi/mc/ActorLimitedLifetimeComponent.hpp
@@ -36,22 +36,22 @@ class ActorLimitedLifetimeComponent {
     MCAPI ActorLimitedLifetimeComponent();
     /**
      * @symbol ?addAdditionalSaveData@ActorLimitedLifetimeComponent@@QEBAXAEBVActor@@AEAVCompoundTag@@@Z
-     * @hash   -261951495
+     * @hash   -261889991
      */
     MCAPI void addAdditionalSaveData(class Actor const &, class CompoundTag &) const;
     /**
      * @symbol ?readAdditionalSaveData@ActorLimitedLifetimeComponent@@QEAAXAEAVActor@@AEBVCompoundTag@@@Z
-     * @hash   -1557228213
+     * @hash   -1557166709
      */
     MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &);
     /**
      * @symbol ?convertFromLegacyData@ActorLimitedLifetimeComponent@@SAXAEBVCompoundTag@@AEAV2@@Z
-     * @hash   1141382996
+     * @hash   1141444500
      */
     MCAPI static void convertFromLegacyData(class CompoundTag const &, class CompoundTag &);
     /**
      * @symbol ?needsLegacyConversion@ActorLimitedLifetimeComponent@@SA_NAEBVCompoundTag@@@Z
-     * @hash   -2019282559
+     * @hash   -2019221055
      */
     MCAPI static bool needsLegacyConversion(class CompoundTag const &);
 

diff --git a/LiteLoader/include/llapi/mc/ActorPropertyUtils.hpp b/LiteLoader/include/llapi/mc/ActorPropertyUtils.hpp
@@ -22,27 +22,27 @@ namespace ActorPropertyUtils {
 #undef AFTER_EXTRA
     /**
      * @symbol ?_checkAndQueueBoolValue@ActorPropertyUtils@@YA_NAEBVPropertyGroup@@_KPEAVActorDefinitionDiffList@@_N@Z
-     * @hash   -1224589691
+     * @hash   -1224528187
      */
     MCAPI bool _checkAndQueueBoolValue(class PropertyGroup const &, unsigned __int64, class ActorDefinitionDiffList *, bool);
     /**
      * @symbol ?_checkAndQueueEnumIndexValueByHash@ActorPropertyUtils@@YA_NAEBVPropertyGroup@@_K1PEAVActorDefinitionDiffList@@1@Z
-     * @hash   413072500
+     * @hash   413134004
      */
     MCAPI bool _checkAndQueueEnumIndexValueByHash(class PropertyGroup const &, unsigned __int64, unsigned __int64, class ActorDefinitionDiffList *, unsigned __int64);
     /**
      * @symbol ?_checkAndQueueFloatValue@ActorPropertyUtils@@YA_NAEBVPropertyGroup@@_K1PEAVActorDefinitionDiffList@@M@Z
-     * @hash   -1966551202
+     * @hash   -1966489698
      */
     MCAPI bool _checkAndQueueFloatValue(class PropertyGroup const &, unsigned __int64, unsigned __int64, class ActorDefinitionDiffList *, float);
     /**
      * @symbol ?_checkAndQueueIntValue@ActorPropertyUtils@@YA_NAEBVPropertyGroup@@_K1PEAVActorDefinitionDiffList@@H@Z
-     * @hash   -732199808
+     * @hash   -732138304
      */
     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
-     * @hash   -2107978511
+     * @hash   -2107917007
      */
     MCAPI void addPendingEventResponseChange(class PropertyComponent const &, class Actor &, class HashedString const &, struct MolangScriptArg const &, std::string const &);
 

diff --git a/LiteLoader/include/llapi/mc/AddRiderComponent.hpp b/LiteLoader/include/llapi/mc/AddRiderComponent.hpp
@@ -30,7 +30,7 @@ class AddRiderComponent {
 public:
     /**
      * @symbol ?reloadComponent@AddRiderComponent@@QEAAXAEAVActor@@@Z
-     * @hash   105868674
+     * @hash   105930178
      */
     MCAPI void reloadComponent(class Actor &);
     /**

diff --git a/LiteLoader/include/llapi/mc/AddRiderDefinition.hpp b/LiteLoader/include/llapi/mc/AddRiderDefinition.hpp
@@ -31,12 +31,12 @@ class AddRiderDefinition {
 public:
     /**
      * @symbol ?initialize@AddRiderDefinition@@QEAAXAEAVEntityContext@@AEAVAddRiderComponent@@@Z
-     * @hash   334828861
+     * @hash   334890365
      */
     MCAPI void initialize(class EntityContext &, class AddRiderComponent &);
     /**
      * @symbol ?buildSchema@AddRiderDefinition@@SAXAEAV?$shared_ptr@V?$JsonSchemaObjectNode@VEmptyClass@JsonUtil@@VAddRiderDefinition@@@JsonUtil@@@std@@@Z
-     * @hash   -2139885002
+     * @hash   -2139823498
      */
     MCAPI static void buildSchema(class std::shared_ptr<class JsonUtil::JsonSchemaObjectNode<class JsonUtil::EmptyClass, class AddRiderDefinition>> &);
 

diff --git a/LiteLoader/include/llapi/mc/AdventureSettings.hpp b/LiteLoader/include/llapi/mc/AdventureSettings.hpp
@@ -18,7 +18,12 @@
 struct AdventureSettings {
 
 #define AFTER_EXTRA
-
+public:
+    bool mNoPvM;
+    bool mNoMvP;
+    bool mImmutableWorld;
+    bool mShowNameTags;
+    bool mAutoJump;
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ADVENTURESETTINGS
 public:

diff --git a/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp b/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp
@@ -36,13 +36,13 @@ class AllayVibrationConfig {
     /**
      * @vftbl  1
      * @symbol ?onSignalReceive@AllayVibrationConfig@@UEAAXAEAVBlockSource@@VBlockPos@@AEBVGameEvent@@PEAVActor@@M3@Z
-     * @hash   -325364605
+     * @hash   -325303101
      */
     virtual void onSignalReceive(class BlockSource &, class BlockPos, class GameEvent const &, class Actor *, float, class Actor *);
     /**
      * @vftbl  2
      * @symbol ?isValidVibration@AllayVibrationConfig@@UEAA_NAEBVGameEvent@@@Z
-     * @hash   -917171741
+     * @hash   -917110237
      */
     virtual bool isValidVibration(class GameEvent const &);
     /**
@@ -53,7 +53,7 @@ class AllayVibrationConfig {
     virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &);
     /**
      * @symbol ??0AllayVibrationConfig@@QEAA@AEAVActor@@G@Z
-     * @hash   -88529254
+     * @hash   -88467750
      */
     MCAPI AllayVibrationConfig(class Actor &, unsigned short);
 

diff --git a/LiteLoader/include/llapi/mc/AmphibiousMoveControlDescription.hpp b/LiteLoader/include/llapi/mc/AmphibiousMoveControlDescription.hpp
@@ -34,7 +34,7 @@ class AmphibiousMoveControlDescription {
     /**
      * @vftbl  0
      * @symbol ?getJsonName@AmphibiousMoveControlDescription@@UEBAPEBDXZ
-     * @hash   63069955
+     * @hash   63131459
      */
     virtual char const * getJsonName() const;
     /**
@@ -45,13 +45,13 @@ class AmphibiousMoveControlDescription {
     /**
      * @vftbl  2
      * @symbol ?deserializeData@MoveControlDescription@@UEAAXUDeserializeDataParams@@@Z
-     * @hash   664675072
+     * @hash   664736576
      */
     virtual void deserializeData(struct DeserializeDataParams);
     /**
      * @vftbl  3
      * @symbol ?serializeData@MoveControlDescription@@UEBAXAEAVValue@Json@@@Z
-     * @hash   -434143862
+     * @hash   -434082358
      */
     virtual void serializeData(class Json::Value &) const;
 

diff --git a/LiteLoader/include/llapi/mc/AsyncBlockInternalGuard.hpp b/LiteLoader/include/llapi/mc/AsyncBlockInternalGuard.hpp
@@ -30,7 +30,7 @@ class AsyncBlockInternalGuard {
 public:
     /**
      * @symbol ??0AsyncBlockInternalGuard@@QEAA@PEAUXAsyncBlock@@@Z
-     * @hash   52866019
+     * @hash   52927523
      */
     MCAPI AsyncBlockInternalGuard(struct XAsyncBlock *);
 

diff --git a/LiteLoader/include/llapi/mc/AsyncState.hpp b/LiteLoader/include/llapi/mc/AsyncState.hpp
@@ -30,7 +30,7 @@ class AsyncState {
 public:
     /**
      * @symbol ?Release@AsyncState@@QEAAXXZ
-     * @hash   -103463933
+     * @hash   -103402429
      */
     MCAPI void Release();
 

diff --git a/LiteLoader/include/llapi/mc/AsyncStateRef.hpp b/LiteLoader/include/llapi/mc/AsyncStateRef.hpp
@@ -30,7 +30,7 @@ class AsyncStateRef {
 public:
     /**
      * @symbol ??1AsyncStateRef@@QEAA@XZ
-     * @hash   1268208938
+     * @hash   1268270442
      */
     MCAPI ~AsyncStateRef();
 

diff --git a/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp b/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp
@@ -31,49 +31,49 @@ class BackgroundTaskQueue {
 public:
     /**
      * @symbol ??0BackgroundTaskQueue@@QEAA@XZ
-     * @hash   89418730
+     * @hash   89480234
      */
     MCAPI BackgroundTaskQueue();
     /**
      * @symbol ?flush@BackgroundTaskQueue@@QEAAXXZ
-     * @hash   2031233117
+     * @hash   2031294621
      */
     MCAPI void flush();
     /**
      * @symbol ?getApproximateTaskCount@BackgroundTaskQueue@@QEBA_KXZ
-     * @hash   1515940077
+     * @hash   1516001581
      */
     MCAPI unsigned __int64 getApproximateTaskCount() const;
     /**
      * @symbol ?getNextItemPriority@BackgroundTaskQueue@@QEAAHXZ
-     * @hash   -2100485126
+     * @hash   -2100423622
      */
     MCAPI int getNextItemPriority();
     /**
      * @symbol ?queue@BackgroundTaskQueue@@QEAAXV?$shared_ptr@VBackgroundTaskBase@@@std@@_N@Z
-     * @hash   1425939450
+     * @hash   1426000954
      */
     MCAPI void queue(class std::shared_ptr<class BackgroundTaskBase>, bool);
     /**
      * @symbol ?resortPriorityQueue@BackgroundTaskQueue@@QEAAXXZ
-     * @hash   1888070093
+     * @hash   1888131597
      */
     MCAPI void resortPriorityQueue();
     /**
      * @symbol ?tryPop@BackgroundTaskQueue@@QEAA?AV?$shared_ptr@VBackgroundTaskBase@@@std@@H@Z
-     * @hash   -751434542
+     * @hash   -751373038
      */
     MCAPI class std::shared_ptr<class BackgroundTaskBase> tryPop(int);
     /**
      * @symbol ??1BackgroundTaskQueue@@QEAA@XZ
-     * @hash   1991013306
+     * @hash   1991074810
      */
     MCAPI ~BackgroundTaskQueue();
 
 //private:
     /**
      * @symbol ?_fetchAllAvailableTasks@BackgroundTaskQueue@@AEAA_NXZ
-     * @hash   78979443
+     * @hash   79040947
      */
     MCAPI bool _fetchAllAvailableTasks();