feat: tick callbacks

Author: MiemieMethod

src-test/pc/test/PrimordialCoreTest.cpp

@@ -4,7 +4,7 @@
 
 #include "ll/api/mod/RegisterHelper.h"
 
-namespace primordial_core {
+namespace pc {
 
 void Hooked_OriginalFunction(CallbackManager& mgr, int damage) {
     Game::EventScope scope;
@@ -109,6 +109,10 @@ bool PrimordialCoreTest::load() {
         getLogger().info("Outer scope prevented: {}", scope.isPrevented() ? "Yes" : "No");
     }
 
+    //mgr.addCallback("OnServerLevelTick", [](uint64 tick) { getLogger().info("OnServerLevelTick: {}", tick); });
+    //mgr.addCallback("OnClientLevelTick", [](uint64 tick) { getLogger().info("OnClientLevelTick: {}", tick); });
+    //mgr.addCallback("tick", []() { getLogger().info("tick"); });
+
     return true;
 }
 
@@ -130,6 +134,6 @@ bool PrimordialCoreTest::unload() {
     return true;
 }
 
-} // namespace primordial_core
+} // namespace pc
 
-LL_REGISTER_MOD(primordial_core::PrimordialCoreTest, primordial_core::PrimordialCoreTest::getInstance());
+LL_REGISTER_MOD(pc::PrimordialCoreTest, pc::PrimordialCoreTest::getInstance());

src-test/pc/test/PrimordialCoreTest.h

@@ -2,7 +2,7 @@
 
 #include "ll/api/mod/NativeMod.h"
 
-namespace primordial_core {
+namespace pc {
 
 class PrimordialCoreTest {
 
@@ -31,4 +31,4 @@ class PrimordialCoreTest {
     ll::mod::NativeMod& mSelf;
 };
 
-} // namespace primordial_core
+} // namespace pc

src/pc/Macro.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#ifdef PC_EXPORT
+#define PCAPI __declspec(dllexport)
+#else
+#define PCAPI __declspec(dllimport)
+#endif
+
+#define PCNDAPI [[nodiscard]] PCAPI
+
+#if defined(LL_PLAT_S)
+#define PCAPI_C  [[deprecated("Client API not available on SERVER")]] PCAPI
+#define PCAPI_S  PCAPI
+#define PCNDAPI_C [[deprecated("Client API not available on SERVER")]] PCNDAPI
+#define PCNDAPI_S PCNDAPI
+#elif defined(LL_PLAT_C)
+#define PCAPI_C  PCAPI
+#define PCAPI_S  [[deprecated("Server API not available on CLIENT")]] PCAPI
+#define PCNDAPI_C PCNDAPI
+#define PCNDAPI_S [[deprecated("Server API not available on CLIENT")]] PCNDAPI
+#endif

src/pc/callback/CallbackManager.hpp

@@ -12,15 +12,10 @@
 #include <type_traits>
 #include <vector>
 
-#ifdef PC_EXPORT
-#define PCAPI __declspec(dllexport)
-#define PCAPI_TEMPLATE
-#else
-#define PCAPI          __declspec(dllimport)
-#define PCAPI_TEMPLATE extern
-#endif
+#include "pc/Macro.h"
+#include "pc/mod/PrimordialCore.h"
 
-namespace primordial_core {
+namespace pc {
 
 template <typename T>
 struct function_traits;
@@ -121,7 +116,7 @@ class CallbackManager {
         std::shared_lock lock(mutex);
         auto             it = events.find(name);
         if (it == events.end()) {
-            std::cerr << "Warning: Event '" << name << "' not found\n";
+            PrimordialCore::getLogger().debug("No valid callback is registered for '{}'", name);
             return;
         }
 
@@ -131,9 +126,9 @@ class CallbackManager {
             const auto& container = std::any_cast<const ListT&>(it->second);
             container.invoke(std::forward<Args>(args)...);
         } catch (const std::bad_any_cast&) {
-            std::cerr << "Error: Invoke arguments do not match stored signature for '" << name << "'\n";
+            PrimordialCore::getLogger().error("Invoke callback arguments do not match stored signature for '{}'", name);
         }
     }
 };
 
-} // namespace primordial_core
+} // namespace pc

src/pc/callback/ItemCallbacks.cpp

@@ -1,14 +1,22 @@
-#include "ll/api/memory/Hook.h"
-
-#include "mc/world/gamemode/InteractionResult.h"
+#include "mc/world/gamemode/InteractionResult.h"
 #include "mc/world/item/Item.h"
 #include "mc/world/item/ItemUsedOnEventContext.h"
+#include "mc/world/actor/Actor.h"
+#include "mc/world/level/Level.h"
+#include "mc/world/level/Tick.h"
+
+#include "ll/api/memory/Hook.h"
+
+#include "pc/mod/PrimordialCore.h"
+#include "pc/callback/CallbackManager.hpp"
+
+using namespace pc;
 
 LL_AUTO_TYPE_INSTANCE_HOOK(
     ItemOnUseHook,
     HookPriority::Normal,
-    Item,
-    &Item::useOn,
+    ::Item,
+    &::Item::useOn,
     ::InteractionResult,
     ::ItemStack&             item,
     ::Actor&                 entity,
@@ -19,5 +27,6 @@ LL_AUTO_TYPE_INSTANCE_HOOK(
     ::Vec3 const&            clickPos,
     ::ItemUsedOnEventContext itemUsedOnEventContext
 ) {
+    PrimordialCore::getLogger().info("Current Tick: {}", entity.getLevel().getCurrentServerTick().tickID);
     return origin(item, entity, x, y, z, face, clickPos, itemUsedOnEventContext);
 }

src/pc/callback/LevelCallbacks.cpp

@@ -0,0 +1,37 @@
+#include "mc/world/level/Level.h"
+#include "mc/world/level/Tick.h"
+
+#include "ll/api/memory/Hook.h"
+
+#include "pc/mod/PrimordialCore.h"
+#include "pc/callback/CallbackManager.hpp"
+#include "pc/world/Game.h"
+
+using namespace pc;
+
+LL_AUTO_TYPE_INSTANCE_HOOK(
+    LevelTickHook,
+    HookPriority::Normal,
+    ::Level,
+    &::Level::$tick,
+    void) {
+    {
+        Game::EventScope scope;
+        if (isClientSide()) {
+            CallbackManager::getInstance().invokeCallback("OnClientLevelTick", getCurrentTick().tickID);
+#if defined(LL_PLAT_C)
+            CallbackManager::getInstance().invokeCallback("tick");
+#endif
+        } else {
+            CallbackManager::getInstance().invokeCallback("OnServerLevelTick", getCurrentTick().tickID);
+#if defined(LL_PLAT_S)
+            CallbackManager::getInstance().invokeCallback("tick");
+#endif
+        }
+        if (scope.isPrevented()) {
+            PrimordialCore::getLogger().debug("Level::tick was prevented by a callback!");
+            return;
+        }
+    }
+    return origin();
+}

src/pc/mod/PrimordialCore.cpp

@@ -1,10 +1,8 @@
-#include "pc/mod/PrimordialCore.h"
-#include "pc/callback/CallbackManager.hpp"
-#include "pc/world/Game.h"
+#include "ll/api/mod/RegisterHelper.h"
 
-#include "ll/api/mod/RegisterHelper.h"
+#include "pc/mod/PrimordialCore.h"
 
-namespace primordial_core {
+namespace pc {
 
 PrimordialCore& PrimordialCore::getInstance() {
     static PrimordialCore instance;
@@ -35,6 +33,6 @@ bool PrimordialCore::unload() {
     return true;
 }
 
-} // namespace primordial_core
+} // namespace pc
 
-LL_REGISTER_MOD(primordial_core::PrimordialCore, primordial_core::PrimordialCore::getInstance());
+LL_REGISTER_MOD(pc::PrimordialCore, pc::PrimordialCore::getInstance());

src/pc/mod/PrimordialCore.h

@@ -2,7 +2,7 @@
 
 #include "ll/api/mod/NativeMod.h"
 
-namespace primordial_core {
+namespace pc {
 
 class PrimordialCore {
 
@@ -31,4 +31,4 @@ class PrimordialCore {
     ll::mod::NativeMod& mSelf;
 };
 
-} // namespace primordial_core
+} // namespace pc

src/pc/world/Game.cpp

@@ -1,6 +1,6 @@
-#include "pc/world/Game.h"
+#include "pc/world/Game.h"
 
-namespace primordial_core {
+namespace pc {
 
 thread_local std::vector<bool> Game::prevent_stack;
 
@@ -26,4 +26,4 @@ Game::EventScope::~EventScope() { Game::prevent_stack.pop_back(); }
 
 bool Game::EventScope::isPrevented() const { return Game::getInstance()._isDefaultPrevented(); }
 
-} // namespace primordial_core
+} // namespace pc

src/pc/world/Game.h

@@ -2,13 +2,9 @@
 
 #include <vector>
 
-#ifdef PC_EXPORT
-#define PCAPI __declspec(dllexport)
-#else
-#define PCAPI __declspec(dllimport)
-#endif
+#include "pc/Macro.h"
 
-namespace primordial_core {
+namespace pc {
 
 class Game {
 private:
@@ -37,4 +33,4 @@ class Game {
     };
 };
 
-} // namespace primordial_core
+} // namespace pc