fix: fix block.name #130

fix: fix getAllPluginInfo #128

Author: ShrBox

docs/apis/ScriptAPI/Ll.md

@@ -40,6 +40,7 @@ Some interfaces related to loader operations are provided here.
   | ----------------- | ----------------------- | -------------------------------- |
   | plugin.name       | Plugin name             | `String`                         |
   | plugin.desc       | Plugin description      | `String`                         |
+  | plugin.type       | Plugin type             | `String`                         |
   | plugin.version    | Plugin version (array)  | `Array<Integer,Integer,Integer>` |
   | plugin.versionStr | Plugin version (string) | `String`                         |
   | plugin.filePath   | Path to plugin          | `String`                         |

docs/apis/ScriptAPI/Ll.zh.md

@@ -42,6 +42,7 @@
   | ----------------- | -------------------- | -------------------------------- |
   | plugin.name       | 插件名称             | `String`                         |
   | plugin.desc       | 插件描述             | `String`                         |
+  | plugin.type       | 插件类型             | `String`                         |
   | plugin.version    | 插件版本（数组形式） | `Array<Integer,Integer,Integer>` |
   | plugin.versionStr | 插件版本             | `String`                         |
   | plugin.filePath   | 插件路径             | `String`                         |

src/legacy/api/BlockAPI.cpp

@@ -112,8 +112,8 @@ Block* BlockClass::extract(Local<Value> v) {
 
 // member function
 void BlockClass::preloadData(BlockPos bp, int dim) {
-    name = block->getName().getString(); // TODO
-    type = block->getName().getString();
+    name = block->buildDescriptionName();
+    type = block->getTypeName();
     id   = block->getBlockItemId();
     pos  = {bp.x, bp.y, bp.z, dim};
 }

src/legacy/api/LlAPI.cpp

@@ -167,36 +167,39 @@ Local<Value> LlClass::requireVersion(const Arguments& args) { return Boolean::ne
 Local<Value> LlClass::getAllPluginInfo(const Arguments& args) {
     try {
         Local<Array> plugins = Array::newArray();
-        lse::getPluginManager().forEachPlugin([&](std::string_view name, ll::plugin::Plugin& plugin) {
-            // Create plugin object
-            auto pluginObject = Object::newObject();
-
-            pluginObject.set("name", plugin.getManifest().name);
-            if (plugin.getManifest().description.has_value()) {
-                pluginObject.set("desc", plugin.getManifest().description.value());
-            }
-
-            auto ver = Array::newArray();
-            ver.add(Number::newNumber(plugin.getManifest().version->major));
-            ver.add(Number::newNumber(plugin.getManifest().version->minor));
-            ver.add(Number::newNumber(plugin.getManifest().version->patch));
-
-            pluginObject.set("version", ver);
-            pluginObject.set("versionStr", plugin.getManifest().version->to_string());
-            pluginObject.set("filePath", plugin.getManifest().entry);
+        ll::plugin::PluginManagerRegistry::getInstance().forEachPluginWithType(
+            [&](std::string_view type, std::string_view name, ll::plugin::Plugin& plugin) {
+                // Create plugin object
+                auto pluginObject = Object::newObject();
 
-            if (plugin.getManifest().extraInfo.has_value()) {
-                auto others = Object::newObject();
-                for (const auto& [k, v] : plugin.getManifest().extraInfo.value()) {
-                    others.set(k, v);
+                pluginObject.set("name", plugin.getManifest().name);
+                if (plugin.getManifest().description.has_value()) {
+                    pluginObject.set("desc", plugin.getManifest().description.value());
+                }
+                pluginObject.set("type", type);
+
+                auto ver = Array::newArray();
+                ver.add(Number::newNumber(plugin.getManifest().version->major));
+                ver.add(Number::newNumber(plugin.getManifest().version->minor));
+                ver.add(Number::newNumber(plugin.getManifest().version->patch));
+
+                pluginObject.set("version", ver);
+                pluginObject.set("versionStr", plugin.getManifest().version->to_string());
+                pluginObject.set("filePath", plugin.getManifest().entry);
+
+                if (plugin.getManifest().extraInfo.has_value()) {
+                    auto others = Object::newObject();
+                    for (const auto& [k, v] : plugin.getManifest().extraInfo.value()) {
+                        others.set(k, v);
+                    }
+                    pluginObject.set("others", others);
                 }
-                pluginObject.set("others", others);
-            }
 
-            // Add plugin object to list
-            plugins.add(pluginObject);
-            return true;
-        });
+                // Add plugin object to list
+                plugins.add(pluginObject);
+                return true;
+            }
+        );
         return plugins;
     }
     CATCH("Fail in LLAPI");