update: 0.5.0

GroupMountain · Jan 18, 2024 · b1df6e7 · b1df6e7
2 parents 4ef9a51 + d2cc564
commit b1df6e7
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 24 deletions.
diff --git a/GMLIB/GMLIB.dll b/GMLIB/GMLIB.dll
diff --git a/GMLIB/manifest.json b/GMLIB/manifest.json
@@ -4,5 +4,5 @@
     "type": "native",
     "author": "GroupMountain",
     "description": "Group Mountain Library",
-    "version": "0.4.2"
+    "version": "0.5.0"
 }
diff --git a/include/GMLIB/Server/FloatingTextAPI.h b/include/GMLIB/Server/FloatingTextAPI.h
@@ -20,19 +20,18 @@ class FloatingText {
     GMLIB_API static bool deleteFloatingText(int64 runtimeId);
 
 public:
-    GMLIB_API virtual ~FloatingText();
+    virtual ~FloatingText();
 
-    GMLIB_API virtual int64_t getFloatingTextRuntimeId();
-
-    GMLIB_API virtual void sendToClient(Player* pl);
+public:
+    GMLIB_API int64_t getFloatingTextRuntimeId();
 
-    GMLIB_API virtual void sendToAllClients();
+    GMLIB_API void sendToClient(Player* pl);
 
-    GMLIB_API virtual void removeFromClient(Player* pl);
+    GMLIB_API void sendToAllClients();
 
-    GMLIB_API virtual void removeFromAllClients();
+    GMLIB_API void removeFromClient(Player* pl);
 
-    GMLIB_API virtual void updateText(std::string newText);
+    GMLIB_API void removeFromAllClients();
 
-    GMLIB_API virtual void removeFromServer();
+    GMLIB_API void updateText(std::string newText);
 };
diff --git a/include/GMLIB/Server/FormAPI/ServerSettingForm.h b/include/GMLIB/Server/FormAPI/ServerSettingForm.h
@@ -1,2 +1,8 @@
 #pragma once
 #include "GMLIB/GMLIB.h"
+
+class GMLIB_ServerSettingForm {
+public:
+    ll::form::CustomForm mForm;
+};
+
diff --git a/manifest.json b/manifest.json
@@ -4,5 +4,5 @@
     "type": "native",
     "author": "GroupMountain",
     "description": "Group Mountain Library",
-    "version": "0.4.2"
+    "version": "0.5.0"
 }
diff --git a/src/Server/FloatingTextAPI.cc b/src/Server/FloatingTextAPI.cc
@@ -78,16 +78,10 @@ FloatingText* FloatingText::getFloatingText(int64 runtimeId) {
     return nullptr;
 }
 
-void FloatingText::removeFromServer() {
-    removeFromAllClients();
-    RuntimeFloatingTextList.erase(mRuntimeId);
-    delete this;
-}
-
 bool FloatingText::deleteFloatingText(int64 runtimeId) {
     auto ft = getFloatingText(runtimeId);
     if (ft) {
-        ft->removeFromServer();
+        delete ft;
         return true;
     }
     return false;

diff --git a/src/Server/FormAPI/NpcDialogueForm.cc b/src/Server/FormAPI/NpcDialogueForm.cc
@@ -40,7 +40,7 @@ GMLIB_NpcDialogueForm::~GMLIB_NpcDialogueForm() {
     mRuntimeNpcFormList.erase(mFormRuntimeId);
 }
 
-int GMLIB_NpcDialogueForm::addAction(std::string name, std::vector<std::string> cmds, NpcDialogueFormAction type) {
+int GMLIB_NpcDialogueForm::addAction(std::string name, NpcDialogueFormAction type, std::vector<std::string> cmds) {
     std::string                         text;
     std::vector<nlohmann::ordered_json> data;
     for (auto cmd : cmds) {
@@ -131,7 +131,6 @@ LL_AUTO_TYPE_INSTANCE_HOOK(
             }
             fm->mCallback(pl, (int)packet.mActionIndex, packet.mType);
             if (type >= 0 && type <= 2) {
-                logger.warn("delete");
                 delete fm;
             }
         }

diff --git a/src/Server/FormAPI/ServerSettingForm.cc b/src/Server/FormAPI/ServerSettingForm.cc
@@ -1,2 +1,11 @@
 #include "Global.h"
-#include <GMLIB/Server/FormAPI/ServerSettingForm.h>
+#include <GMLIB/Server/FormAPI/ServerSettingForm.h>
+
+/*
+std::optional<ll::form::CustomForm> mSeverSettingForm;
+
+void test() {
+    auto fm = ll::form::CustomForm("sv");
+    
+}
+*/
diff --git a/src/Version.h b/src/Version.h
@@ -3,8 +3,8 @@
 #define LIB_NAME "GMLIB"
 
 #define LIB_VERSION_MAJOR 0
-#define LIB_VERSION_MINOR 4
-#define LIB_VERSION_REVISION 2
+#define LIB_VERSION_MINOR 5
+#define LIB_VERSION_REVISION 0
 #define LIB_VERSION_PRERELEASE ""
 #define LIB_VERSION_BUILD_META ""
 

diff --git a/tooth.json b/tooth.json
@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/GMLIB",
-    "version": "0.4.2",
+    "version": "0.5.0",
     "info": {
         "name": "GMLIB",
         "description": "Group Mountain Library",