feat: add onScoreChanged #41

Author: ShrBox

src/legacy/api/EventAPI.cpp

@@ -764,29 +764,9 @@ void EnableEventListener(int eventId) {
         });
         break;
 
-        // case EVENT_TYPES::onScoreChanged:
-        //   Event::PlayerScoreChangedEvent::subscribe(
-        //       [](const PlayerScoreChangedEvent &ev) {
-        //         IF_LISTENED(EVENT_TYPES::onScoreChanged) {
-        //           CallEvent(EVENT_TYPES::onScoreChanged,
-        //                     PlayerClass::newPlayer(ev.mPlayer),
-        //                     Number::newNumber(ev.mScore),
-        //                     String::newString(ev.mObjective->getName()),
-        //                     String::newString(ev.mObjective->getDisplayName()));
-        //         }
-        //         IF_LISTENED_END(EVENT_TYPES::onScoreChanged);
-        //       });
-        //   break;
-
-        // case EVENT_TYPES::onConsoleOutput:
-        //   Event::ConsoleOutputEvent::subscribe([](const ConsoleOutputEvent &ev) {
-        //     IF_LISTENED(EVENT_TYPES::onConsoleOutput) {
-        //       CallEvent(EVENT_TYPES::onConsoleOutput,
-        //       String::newString(ev.mOutput));
-        //     }
-        //     IF_LISTENED_END(EVENT_TYPES::onConsoleOutput);
-        //   });
-        //   break;
+    case EVENT_TYPES::onScoreChanged:
+        lse::events::ScoreChangedEvent();
+        break;
 
     case EVENT_TYPES::onMobSpawn:
         lse::getSelfPluginInstance().getLogger().warn(
@@ -953,38 +933,6 @@ void InitBasicEventListeners() {
         return;
     });
 
-    //   // Plugin Hot Management
-    //   Event::ScriptPluginManagerEvent::subscribe_ref(
-    //       [](ScriptPluginManagerEvent &ev) {
-    //         switch (ev.operation) {
-    //         case ScriptPluginManagerEvent::Operation::Load:
-    //           // ev.pluginType is not used
-    //           // since in loadPlugin there will be check
-    //           try {
-    //             if (PluginManager::loadPlugin(ev.target, true, true))
-    //               ev.success = true;
-    //           } catch (...) {
-    //           }
-    //           break;
-
-    //         case ScriptPluginManagerEvent::Operation::Unload:
-    //           if (PluginManager::unloadPlugin(ev.target))
-    //             ev.success = true;
-    //           break;
-
-    //         case ScriptPluginManagerEvent::Operation::Reload:
-    //           if (PluginManager::reloadPlugin(ev.target))
-    //             ev.success = true;
-    //           break;
-
-    //         default:
-    //           break;
-    //         }
-    //         if (ev.success)
-    //           return false; // Success. No need to spread to next engine
-    //         return true;
-    //       });
-
     // ===== onServerStarted =====
     bus.emplaceListener<ServerStartedEvent>([](ServerStartedEvent& ev) {
         using namespace ll::chrono_literals;
@@ -1027,35 +975,6 @@ void InitBasicEventListeners() {
     });
 }
 
-/* onTurnLectern // 由于还是不能拦截掉书，暂时注释
-THook(void,
-"?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLecternUpdatePacket@@@Z",
-    ServerNetworkHandler* handler, NetworkIdentifier* id, Packet* pkt)
-{
-    IF_LISTENED(EVENT_TYPES::onTurnLectern)
-    {
-        // Packet* pkt = *(Packet**)pPacket;
-        Player* player = Raw_GetPlayerFromPacket(handler, id, pkt);
-        if (!player)
-            return;
-
-        int page = *((DWORD*)pkt + 12);
-        dAccess<bool>(pkt, 56) = false;
-        bool shouldDropBook = *((BYTE*)pkt + 56);
-        int totalPages = *((DWORD*)pkt + 13);
-        auto* bp = new BlockPos;
-        bp->x = *((DWORD*)pkt + 15);
-        bp->y = *((DWORD*)pkt + 16);
-        bp->z = *((DWORD*)pkt + 17);
-        CallEventRtnVoid(EVENT_TYPES::onTurnLectern,
-PlayerClass::newPlayer(player), IntPos::newPos(bp, Raw_GetPlayerDimId(player)),
-page, totalPages, Boolean::newBoolean(shouldDropBook));
-    }
-    IF_LISTENED_END(EVENT_TYPES::onTurnLectern);
-    original(handler,id,pkt);
-}
-*/
-
 bool MoneyBeforeEventCallback(LLMoneyEvent type, xuid_t from, xuid_t to, money_t value) {
     switch (type) {
     case LLMoneyEvent::Add: {

src/legacy/events/EventHooks.cpp

@@ -6,9 +6,12 @@
 #include "legacy/api/EventAPI.h"
 #include "legacy/api/ItemAPI.h"
 #include "legacy/api/PlayerAPI.h"
+#include "ll/api/service/Bedrock.h"
 #include "mc/server/ServerPlayer.h"
 #include "mc/server/commands/CommandOrigin.h"
 #include "mc/server/commands/CommandOriginType.h"
+#include "mc/world/ActorUniqueID.h"
+#include "mc/world/scores/ScoreInfo.h"
 
 #include <ll/api/memory/Hook.h>
 #include <ll/api/memory/Memory.h>
@@ -47,6 +50,7 @@
 #include <mc/world/level/block/actor/ChestBlockActor.h>
 #include <mc/world/level/block/actor/PistonBlockActor.h>
 #include <mc/world/phys/AABB.h>
+#include <mc/world/scores/ServerScoreboard.h>
 
 namespace lse::events {
 
@@ -798,6 +802,32 @@ LL_TYPE_INSTANCE_HOOK(
     origin(inEntity, inSpeed);
 }
 
+LL_TYPE_INSTANCE_HOOK(
+    ScoreChangedHook,
+    HookPriority::Normal,
+    ServerScoreboard,
+    "?onScoreChanged@ServerScoreboard@@UEAAXAEBUScoreboardId@@AEBVObjective@@@Z",
+    void,
+    ScoreboardId const& id,
+    Objective const&    obj
+) {
+    IF_LISTENED(EVENT_TYPES::onScoreChanged) {
+        if (id.getIdentityDef().isPlayerType()) {
+            CallEventVoid(
+                EVENT_TYPES::onScoreChanged,
+                PlayerClass::newPlayer(
+                    ll::service::getLevel()->getPlayer(ActorUniqueID(id.getIdentityDef().getPlayerId().mActorUniqueId))
+                ),
+                Number::newNumber(obj.getPlayerScore(id).mScore),
+                String::newString(obj.getName()),
+                String::newString(obj.getDisplayName())
+            );
+        }
+    }
+    IF_LISTENED_END(EVENT_TYPES::onScoreChanged);
+    origin(id, obj);
+}
+
 void PlayerStartDestroyBlock() { PlayerStartDestroyHook::hook(); }
 void PlayerDropItem() { PlayerDropItemHook::hook(); }
 void PlayerOpenContainerEvent() { PlayerOpenContainerHook::hook(); }
@@ -841,6 +871,7 @@ void PlayerUseRespawnAnchorEvent() { PlayerUseRespawnAnchorHook::hook(); }
 void PlayerSleepEvent() { PlayerSleepHook::hook(); }
 void PlayerOpenInventoryEvent() { PlayerOpenInventoryHook::hook(); }
 void PlayerPullFishingHookEvent() { PlayerPullFishingHook::hook(); }
+void ScoreChangedEvent() { ScoreChangedHook::hook(); }
 
 // NOLINTEND(cppcoreguidelines-pro-type-reinterpret-cast)
 // NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)

src/legacy/events/EventHooks.h

@@ -31,5 +31,6 @@ void PlayerUseRespawnAnchorEvent();
 void PlayerSleepEvent();
 void PlayerOpenInventoryEvent();
 void PlayerPullFishingHookEvent();
+void ScoreChangedEvent();
 
 } // namespace lse::events