Release 2.14.0 (LiteLDev#1299)

LiteLDev · Jun 20, 2023 · 2fb89ca · 2fb89ca
2 parents 6980617 + ac0b8a9
commit 2fb89ca
Show file tree

Hide file tree

Showing 16 changed files with 108 additions and 95 deletions.
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -111,7 +111,9 @@ jobs:
         shell: cmd
 
       - name: Build SymDBHelper
-        run: cmake --build ${{github.workspace}}/build_clang --config ${{env.BUILD_TYPE}} --target SymDBHelper
+        run: |
+          cmake --build ${{github.workspace}}/build_clang --config ${{env.BUILD_TYPE}} --target SymDBHelper
+          cp .\build_clang\sdk\lib\SymDBHelper.lib .\build\sdk\lib\SymDBHelper.lib
 
       - name: Compress resource packs for LiteLoaderBDS
         run: |

diff --git a/LLPreLoader/CMakeLists.txt b/LLPreLoader/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_BUILD_TYPE Release)
 add_definitions(-D"NDEBUG" -D"_WINDOWS" -D"_USRDLL" -D"_WINDLL" -D"_UNICODE" -D"UNICODE")
 
 add_compile_options(
-    /permissive- /GS /GL /W0 /Gy /Zc:wchar_t /Zi /Gm- /O2 /sdl /Zc:inline /fp:precise
+    /permissive- /GS /GL /W3 /Gy /Zc:wchar_t /Zi /Gm- /O2 /sdl /Zc:inline /fp:precise
     /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /MD /FC /EHsc /nologo /diagnostics:column
 )
 

diff --git a/LLPreLoader/include/Logger.h b/LLPreLoader/include/Logger.h
@@ -34,8 +34,6 @@ inline void loadConfig() {
     if (std::filesystem::exists("plugins/LiteLoader/LiteLoader.json")) {
         try {
             LoadConfigFromJson("plugins/LiteLoader/LiteLoader.json");
-        } catch (std::exception& e) {
-            ColorLog = true;
         } catch (...) {
             ColorLog = true;
         }

diff --git a/LLPreLoader/src/SymDB.cpp b/LLPreLoader/src/SymDB.cpp
@@ -227,7 +227,7 @@ extern _declspec(dllexport) std::vector<string> dlsym_reverse(int addr) {
     if (!rvaMap)
         InitReverseLookup();
     // TODO: Fix Narrowing Conversion
-    addr = addr - imageBaseAddr;
+    addr = (int)(addr - imageBaseAddr);
     auto const iter = rvaMap->equal_range(addr);
     std::vector<string> ret;
     for (auto it = iter.first; it != iter.second; ++it) {

diff --git a/LiteLoader/include/llapi/EventAPI.h b/LiteLoader/include/llapi/EventAPI.h
@@ -649,12 +649,6 @@ class WitherBossDestroyEvent : public EventTemplate<WitherBossDestroyEvent> {
     AABB mDestroyRange{{}, {}};
 };
 
-class EnderDragonDestroyEvent : public EventTemplate<EnderDragonDestroyEvent> {
-public:
-    EnderDragon* mEnderDragon = nullptr;
-    BlockLegacy* mBlockLegacy = nullptr;
-};
-
 class EntityRideEvent : public EventTemplate<EntityRideEvent> {
 public:
     Actor* mRider = nullptr;

diff --git a/LiteLoader/include/llapi/mc/Biome.hpp b/LiteLoader/include/llapi/mc/Biome.hpp
@@ -10,27 +10,26 @@
 // Include Headers or Declare Types Here
 
 enum class VanillaBiomeTypes : int{
-        Beach = 0x0,
-        Desert = 0x1,
-        ExtremeHills = 0x2,
-        FlatWorld = 0x3,
-        Forest = 0x4,
-        Hell = 0x5,
-        //TODO: confirm IcePlainsSpikes
-        IcePlainsSpikes = 0x6, // The Ice Plains Spikes Biome is a rare variant of the ice plains biome, containing unique ice structures. It is quite cold, with most water frozen as ice. 
-        Jungle = 0x7,
-        Mesa = 0x8, // Mesa is a very rare biome which is made up from red sand, cacti, dead bushes and plateaus. The red sand is only one layer thick. Red sand is found in the Mesa itself, not its variants. Water patches are found but are not a variant. 
-        MushroomIsland = 0x9,
-        Ocean = 0xA,
-        Plain = 0xB,
-        River = 0xC,
-        Savanna = 0xD, // A savanna is a dry biome with scattered acacia trees. It typically generates bordering a desert, forest or plains biome and has three variations total. 
-        RockyBeach = 0xE,
-        Swamp = 0xF, // The Minecraft Swamp biome is a waterlogged area, consisting of many small islands separated by vast canals of water. In the Bedrock Edition, this water is a murky brown color, and this version also allows for Huge Mushrooms to appear on the islands.
-        TaigaForest = 0x10,
-        TheEnd = 0x11,
-        Custom = 0x12, // Dirve by bahavior pack?
-    };
+    Beach = 0x0,
+    Desert = 0x1,
+    ExtremeHills = 0x2,
+    Flat = 0x3,
+    Forest = 0x4,
+    Hell = 0x5,
+    Ice = 0x6,
+    Jungle = 0x7,
+    Mesa = 0x8,
+    MushroomIsland = 0x9,
+    Ocean = 0xA,
+    Plain = 0xB,
+    River = 0xC,
+    Savanna = 0xD,
+    StoneBeach = 0xE,
+    Swamp = 0xF,
+    Taiga = 0x10,
+    TheEnd = 0x11,
+    DataDriven = 0x12,
+};
 
 #undef BEFORE_EXTRA
 

diff --git a/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp
@@ -21,6 +21,7 @@ class BlockActorDataPacket : public Packet {
 
 #define AFTER_EXTRA
 // Add Member There
+    char filler[40];
 
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKACTORDATAPACKET

diff --git a/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp b/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp
@@ -8,6 +8,7 @@
 
 #define BEFORE_EXTRA
 // Include Headers or Declare Types Here
+#include "llapi/mc/ListenerInfo.hpp"
 
 #undef BEFORE_EXTRA
 
@@ -19,6 +20,8 @@ class BlockEventDispatcher {
 
 #define AFTER_EXTRA
 // Add Member There
+public:
+std::unordered_map<int, std::unique_ptr<ListenerInfo>> listeners;
 
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKEVENTDISPATCHER

diff --git a/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp b/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp
@@ -8,6 +8,8 @@
 
 #define BEFORE_EXTRA
 // Include Headers or Declare Types Here
+typedef int ListenerHandle;
+#include "llapi/mc/BlockEventDispatcher.hpp"
 
 #undef BEFORE_EXTRA
 
@@ -19,6 +21,9 @@ class BlockEventDispatcherToken {
 
 #define AFTER_EXTRA
 // Add Member There
+public:
+  ListenerHandle mHandle;
+  BlockEventDispatcher *mDispatcher;
 
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKEVENTDISPATCHERTOKEN

diff --git a/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp
@@ -20,6 +20,7 @@ class UpdateBlockPacket : public Packet {
 
 #define AFTER_EXTRA
 // Add Member There
+    char filler[24];
 
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_UPDATEBLOCKPACKET

diff --git a/LiteLoader/include/llapi/mc/VectorBase.hpp b/LiteLoader/include/llapi/mc/VectorBase.hpp
@@ -75,7 +75,7 @@ class VectorBase {
         unrollWithArgs<Component...>([&](size_t iter, auto shit) constexpr {
             using axis_type = decltype(shit);
             res += std::to_string(static_cast<T const*>(this)->get<axis_type>(iter)) +
-                   ((iter < sizeof...(Component)) ? ", " : ")");
+                   ((iter < sizeof...(Component) - 1) ? ", " : ")");
         });
         return res;
     }

diff --git a/LiteLoader/src/liteloader/BuiltinBugFix.cpp b/LiteLoader/src/liteloader/BuiltinBugFix.cpp
@@ -517,7 +517,7 @@ TClasslessInstanceHook(void, "?sendEvent@ActorEventCoordinator@@QEAAXAEBV?$Event
 #include "llapi/mc/ExtendedStreamReadResult.hpp"
 
 TInstanceHook(ExtendedStreamReadResult,
-              "?read@PlayerListPacket@@UEAA?AUExtendedStreamReadResult@@AEAVReadOnlyBinaryStream@@@Z",
+              "?_read@PlayerListPacket@@EEAA?AUExtendedStreamReadResult@@AEAVReadOnlyBinaryStream@@@Z",
               PlayerListPacket, ReadOnlyBinaryStream) {
     return ExtendedStreamReadResult{StreamReadResult::Valid, ""};
 }
@@ -538,3 +538,15 @@ TInstanceHook(void, "?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@A
     }
     pl->sendInventory(1);
 }
+
+
+// fix BlockEventDispatcherToken unregister crash error when stop server
+#include <llapi/mc/BlockEventDispatcherToken.hpp>
+TInstanceHook(void,"?unregister@BlockEventDispatcherToken@@QEAAXXZ",BlockEventDispatcherToken){
+  if (this->mHandle != -1 && this->mDispatcher->listeners.size() <= 1 && ll::globalRuntimeConfig.serverStatus == ll::LLServerStatus::Stopping)
+  {
+    logger.debug("BlockEventDispatcherToken::unregister with no listeners");
+    return;
+  }
+  original(this);
+}
diff --git a/LiteLoader/src/llapi/EventAPI.cpp b/LiteLoader/src/llapi/EventAPI.cpp
@@ -266,7 +266,6 @@ DECLARE_EVENT_DATA(MobDieEvent);
 DECLARE_EVENT_DATA(EntityExplodeEvent);
 DECLARE_EVENT_DATA(ProjectileHitEntityEvent);
 DECLARE_EVENT_DATA(WitherBossDestroyEvent);
-DECLARE_EVENT_DATA(EnderDragonDestroyEvent);
 DECLARE_EVENT_DATA(EntityRideEvent);
 DECLARE_EVENT_DATA(EntityStepOnPressurePlateEvent);
 DECLARE_EVENT_DATA(NpcCmdEvent);
@@ -1335,43 +1334,59 @@ TInstanceHook(void*, "?die@ServerPlayer@@UEAAXAEBVActorDamageSource@@@Z", Server
 #include "llapi/mc/SurvivalMode.hpp"
 
 /////////////////// PlayerDestroy ///////////////////
-
-TInstanceHook(bool, "?destroyBlock@SurvivalMode@@UEAA_NAEBVBlockPos@@E@Z", GameMode, BlockPos blockPos,
-              unsigned __int8 uChar) {
-    IF_LISTENED(PlayerDestroyBlockEvent) {
-        auto player = getPlayer();
-        if (player && player->isPlayer()) {
-            if (player->getPlayerGameType() != GameType::Creative) {
-                PlayerDestroyBlockEvent ev{};
-                ev.mPlayer = player;
-                auto blockInstance = Level::getBlockInstance(blockPos, player->getDimensionId());
-                ev.mBlockInstance = blockInstance;
-                if (!ev.call()) {
-                    return false;
-                }
-            }
-        }
-    }
-    IF_LISTENED_END(PlayerDestroyBlockEvent)
-    return original(this, blockPos, uChar);
-}
-
-TInstanceHook(bool, "?destroyBlock@GameMode@@UEAA_NAEBVBlockPos@@E@Z", GameMode, BlockPos a3, unsigned __int8 a4) {
-    auto player = getPlayer();
+TInstanceHook(bool,"?playerWillDestroy@BlockLegacy@@UEBA_NAEAVPlayer@@AEBVBlockPos@@AEBVBlock@@@Z", BlockLegacy ,Player *player, const BlockPos *pos, const Block *block){
     if (player != nullptr && player->isPlayer()) {
         IF_LISTENED(PlayerDestroyBlockEvent) {
             PlayerDestroyBlockEvent ev{};
             ev.mPlayer = player;
-            auto bl = Level::getBlockInstance(a3, player->getDimensionId());
-            ev.mBlockInstance = bl;
+            ev.mBlockInstance = Level::getBlockInstance(*pos, player->getDimensionId());
             if (!ev.call()) {
                 return false;
             }
         }
         IF_LISTENED_END(PlayerDestroyBlockEvent)
-    }
-    return original(this, a3, a4);
-}
+        }
+        return original(this, player, pos, block);
+}
+
+// TInstanceHook(bool, "?destroyBlock@SurvivalMode@@UEAA_NAEBVBlockPos@@E@Z", GameMode, BlockPos blockPos,
+//               unsigned __int8 uChar) {
+//     IF_LISTENED(PlayerDestroyBlockEvent) {
+//         auto player = getPlayer();
+//         if (player && player->isPlayer()) {
+//             if (player->getPlayerGameType() != GameType::Creative) {
+//                 PlayerDestroyBlockEvent ev{};
+//                 ev.mPlayer = player;
+//                 auto blockInstance = Level::getBlockInstance(blockPos, player->getDimensionId());
+//                 ev.mBlockInstance = blockInstance;
+//                 if (!ev.call()) {
+//                     return false;
+//                 }
+//             }
+//         }
+//     }
+//     IF_LISTENED_END(PlayerDestroyBlockEvent)
+//     return original(this, blockPos, uChar);
+// }
+
+// TInstanceHook(bool, "?_creativeDestroyBlock@GameMode@@AEAA_NAEBVBlockPos@@E@Z", GameMode, BlockPos a3, unsigned __int8 a4) {
+//     auto player = getPlayer();
+//     if (player != nullptr && player->isPlayer()) {
+//         IF_LISTENED(PlayerDestroyBlockEvent) {
+//             PlayerDestroyBlockEvent ev{};
+//             ev.mPlayer = player;
+//             auto bl = Level::getBlockInstance(a3, player->getDimensionId());
+//             ev.mBlockInstance = bl;
+//             if (!ev.call()) {
+//                 return false;
+//             }
+//         }
+//         IF_LISTENED_END(PlayerDestroyBlockEvent)
+//     }
+//     return original(this, a3, a4);
+// }
+
+
 
 /////////////////// PlayerUseItemOn ///////////////////
 TInstanceHook(InteractionResult,
@@ -1732,23 +1747,6 @@ TInstanceHook(void, "?_destroyBlocks@WitherBoss@@AEAAXAEAVLevel@@AEBVAABB@@AEAVB
     original(this, a2, aabb, a4, a5, a6);
 }
 
-////////////// EnderDragonDestroy //////////////
-#include <llapi/mc/EnderDragon.hpp>
-#include <llapi/mc/BlockLegacy.hpp>
-
-TInstanceHook(bool, "?_isDragonImmuneBlock@EnderDragon@@CA_NAEBVBlockLegacy@@@Z", EnderDragon, BlockLegacy* bl) {
-    IF_LISTENED(EnderDragonDestroyEvent) {
-        EnderDragonDestroyEvent ev{};
-        ev.mEnderDragon = (EnderDragon*)this;
-        ev.mBlockLegacy = bl;
-        if (!ev.call()) {
-            return true;
-        }
-    }
-    IF_LISTENED_END(EnderDragonDestroyEvent)
-    return original(this, bl);
-}
-
 ////////////// EntityRide //////////////
 TInstanceHook(bool, "?canAddPassenger@Actor@@UEBA_NAEAV1@@Z", Actor, Actor* a2) {
     auto rtn = original(this, a2);

diff --git a/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp b/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp
@@ -629,8 +629,12 @@ std::unique_ptr<class DynamicCommandInstance> DynamicCommand::createCommand(std:
     for (auto& param : params) {
         command->newParameter(std::move(param));
     }
-    for (auto& overload : overloads) {
-        command->addOverload(std::move(overload));
+    if (overloads.size() > 0) {
+        for (auto& overload : overloads) {
+            command->addOverload(std::move(overload));
+        }
+    }else{
+        command->addOverload();
     }
     command->setCallback(std::move(callback));
     return std::move(command);

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,13 +1,19 @@
 # Release 2.14.0
 
-![BDS 1.20.0.01](https://img.shields.io/badge/BDS-1.20.0.01-blue?style=for-the-badge) ![Protocol 582](https://img.shields.io/badge/Protocol-582-orange?style=for-the-badge)
+![BDS 1.20.0.01](https://img.shields.io/badge/BDS-1.20.0.01-blue?style=for-the-badge) ![Protocol 589](https://img.shields.io/badge/Protocol-589-orange?style=for-the-badge)
 
 ## Added
 
 - Support 2.14.0 (by @dreamguxiang @OEOTYAN)
 
-[//]: # (## Changed)
+## Changed
+
+- Remove EnderDragonDestroy event
 
 ## Fixed
 
-- Fix item disappear caused by players throwing items at unloaded chunks (by @timiya)
+- Fix item disappear caused by players throwing items at unloaded chunks (by @timiya233)
+- Fix empty overloads error (by @OEOTYAN)
+- Fix destroy event (by @dofes)
+- Fix VectorBase::toString incorrect process of right parenthesis (by @Redbeanw44602)
+- Fix stop server crash caused by BDS (by @dofes)
diff --git a/ScriptEngine/src/api/EventAPI.cpp b/ScriptEngine/src/api/EventAPI.cpp
@@ -92,7 +92,6 @@ enum class EVENT_TYPES : int {
     onEntityExplode,
     onProjectileHitEntity,
     onWitherBossDestroy,
-    onEnderDragonDestroy,
     onRide,
     onStepOnPressurePlate,
     onSpawnProjectile,
@@ -811,15 +810,6 @@ void EnableEventListener(int eventId) {
             });
             break;
 
-        case EVENT_TYPES::onEnderDragonDestroy:
-            Event::EnderDragonDestroyEvent::subscribe([](const EnderDragonDestroyEvent& ev) {
-                IF_LISTENED(EVENT_TYPES::onEnderDragonDestroy) {
-                    CallEvent(EVENT_TYPES::onEnderDragonDestroy, EntityClass::newEntity((Actor*)ev.mEnderDragon), BlockClass::newBlock(*(BlockInstance*)(ev.mBlockLegacy)));
-                }
-                IF_LISTENED_END(EVENT_TYPES::onEnderDragonDestroy);
-            });
-            break;
-
         case EVENT_TYPES::onMobHurt:
             Event::MobHurtEvent::subscribe([](const MobHurtEvent& ev) {
                 IF_LISTENED(EVENT_TYPES::onMobHurt) {