adapt: adapt LeviLamina 0.5.0

GroupMountain · Jan 18, 2024 · a16bae4 · a16bae4
1 parent 1395af6
commit a16bae4
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/include/GMLIB/Server/FloatingTextAPI.h b/include/GMLIB/Server/FloatingTextAPI.h
@@ -15,6 +15,8 @@ class FloatingText {
 public:
     static FloatingText* getFloatingText(int64 runtimeId);
 
+    static bool deleteFloatingText(int64 runtimeId);
+
 public:
     virtual ~FloatingText();
 
@@ -29,4 +31,6 @@ class FloatingText {
     virtual void removeFromAllClients();
 
     virtual void updateText(std::string newText);
+
+    //virtual bool removeFromServer();
 };
diff --git a/include/GMLIB/Server/PlayerAPI.h b/include/GMLIB/Server/PlayerAPI.h
@@ -73,11 +73,12 @@ class GMLIB_Player : public Player {
 
     GMLIB_API bool resetScore();
 
-    GMLIB_API void setClientSidebar(
-        const std::string                               title,
-        const std::vector<std::pair<std::string, int>>& data,
-        ObjectiveSortOrder                              sortOrder = ObjectiveSortOrder::Ascending
-    );
+    // Broken
+    // GMLIB_API void setClientSidebar(
+    //     const std::string                               title,
+    //     const std::vector<std::pair<std::string, int>>& data,
+    //     ObjectiveSortOrder                              sortOrder = ObjectiveSortOrder::Ascending
+    // );
 
     GMLIB_API void removeClientSidebar();
 

diff --git a/src/Server/FormAPI/NpcDialogueForm.cc b/src/Server/FormAPI/NpcDialogueForm.cc
@@ -135,6 +135,8 @@ LL_AUTO_INSTANCE_HOOK(
     ll::service::getLevel()->forEachPlayer([](Player& pl) -> bool {
         logger.warn("{}", pl.getRealName());
         sendFakeNpc(&pl);
+        //auto gpl = (GMLIB_Player*)&pl;
+        //gpl->setClientSidebar("114514", {{"114", 1}, {"514", 2},{ "1919810", 3}});
         return true;
     });
     origin(a1, a2, a3);

diff --git a/src/Server/PlayerAPI.cc b/src/Server/PlayerAPI.cc
@@ -159,6 +159,7 @@ type, int value, std::string& fakeName) : mScoreboardId(*scoreboardId) , mObject
     }
 */
 
+/*
 void GMLIB_Player::setClientSidebar(
     const std::string                               title,
     const std::vector<std::pair<std::string, int>>& data,
@@ -184,6 +185,7 @@ void GMLIB_Player::setClientSidebar(
     SetDisplayObjectivePacket("sidebar", "GMLIB_SIDEBAR_API", title, "dummy", ObjectiveSortOrder(sortOrder))
         .sendTo(*this);
 }
+*/
 
 void GMLIB_Player::removeClientSidebar() {
     SetDisplayObjectivePacket("sidebar", "", "", "dummy", ObjectiveSortOrder::Ascending).sendTo(*this);

diff --git a/src/include_all.h b/src/include_all.h
@@ -63,11 +63,12 @@
 #include <ll/api/event/player/PlayerSwingEvent.h>
 #include <ll/api/event/player/PlayerUseItemEvent.h>
 #include <ll/api/event/player/PlayerUseItemOnEvent.h>
+#include <ll/api/event/server/ServerStartedEvent.h>
+#include <ll/api/event/server/ServerStoppingEvent.h>
+#include <ll/api/event/server/ServiceEvents.h>
 #include <ll/api/event/world/BlockChangedEvent.h>
 #include <ll/api/event/world/FireSpreadEvent.h>
 #include <ll/api/event/world/LevelEvent.h>
-#include <ll/api/event/world/ServerStartedEvent.h>
-#include <ll/api/event/world/ServerStoppingEvent.h>
 #include <ll/api/event/world/SpawnMobEvent.h>
 #include <ll/api/event/world/WorldEvent.h>
 #include <ll/api/form/CustomForm.h>
@@ -98,6 +99,9 @@
 #include <ll/api/schedule/Task.h>
 #include <ll/api/service/Bedrock.h>
 #include <ll/api/service/PlayerInfo.h>
+#include <ll/api/service/Service.h>
+#include <ll/api/service/ServiceId.h>
+#include <ll/api/service/ServiceManager.h>
 #include <ll/api/thread/GlobalThreadPauser.h>
 #include <ll/api/thread/InterruptableSleep.h>
 #include <ll/api/thread/SharedRecursiveMutex.h>
@@ -2385,6 +2389,7 @@
 #include <mc/external/concurrentqueue/ConcurrentQueue.h>
 #include <mc/external/concurrentqueue/ConcurrentQueueDefaultTraits.h>
 #include <mc/external/concurrentqueue/moodycamel.h>
+#include <mc/external/expected_lite/expected.h>
 #include <mc/external/glm/glm.h>
 #include <mc/external/glm/mat.h>
 #include <mc/external/glm/qua.h>
@@ -2397,11 +2402,6 @@
 #include <mc/external/lib_http_client/ThreadPoolImpl.h>
 #include <mc/external/lib_http_client/WaitTimer.h>
 #include <mc/external/lib_http_client/WaitTimerImpl.h>
-#include <mc/external/nonstd/detail.h>
-#include <mc/external/nonstd/expected.h>
-#include <mc/external/nonstd/expected_lite.h>
-#include <mc/external/nonstd/nonstd.h>
-#include <mc/external/nonstd/storage_t.h>
 #include <mc/external/openssl/evp_md_st.h>
 #include <mc/external/openssl/ssl_ctx_st.h>
 #include <mc/external/openssl/ssl_session_st.h>

diff --git a/xmake.lua b/xmake.lua
@@ -1,7 +1,12 @@
 add_rules("mode.debug", "mode.release", "mode.releasedbg")
 
 add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
-add_requires("levilamina 0.4.1") -- or add_requires("levilamina x.x.x") to specify target LeviLamina version
+
+if not has_config("vs_runtime") then
+    set_runtimes("MD")
+end
+
+add_requires("levilamina") -- or add_requires("levilamina x.x.x") to specify target LeviLamina version
 
 target("GMLIB") -- Change this to your plugin name.
     add_cxflags(