refactor: move plugin loading and enabling codes to PluginManager

EndstoneMC · Mar 3, 2024 · 8788793 · 8788793
1 parent ca262c9
commit 8788793
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/include/endstone/detail/plugin/plugin_manager.h b/include/endstone/detail/plugin/plugin_manager.h
@@ -36,6 +36,7 @@ class EndstonePluginManager : public PluginManager {
     bool isPluginEnabled(Plugin *plugin) const override;
     std::vector<Plugin *> loadPlugins(const std::string &directory) override;
     void enablePlugin(Plugin &plugin) const override;
+    void enablePlugins() const override;
     void disablePlugin(Plugin &plugin) const override;
     void disablePlugins() const override;
     void clearPlugins() override;

diff --git a/include/endstone/plugin/plugin_manager.h b/include/endstone/plugin/plugin_manager.h
@@ -36,6 +36,7 @@ class PluginManager {
     [[nodiscard]] virtual bool isPluginEnabled(Plugin *plugin) const = 0;
     [[nodiscard]] virtual std::vector<Plugin *> loadPlugins(const std::string &directory) = 0;
     virtual void enablePlugin(Plugin &plugin) const = 0;
+    virtual void enablePlugins() const = 0;
     virtual void disablePlugin(Plugin &plugin) const = 0;
     virtual void disablePlugins() const = 0;
     virtual void clearPlugins() = 0;

diff --git a/src/endstone_core/plugin/plugin_manager.cpp b/src/endstone_core/plugin/plugin_manager.cpp
@@ -93,6 +93,11 @@ std::vector<Plugin *> EndstonePluginManager::loadPlugins(const std::string &dire
         }
     }
 
+    for (const auto &plugin : loaded_plugins) {
+        plugin->getLogger().info("Loading {}", plugin->getDescription().getFullName());
+        plugin->onLoad();
+    }
+
     return loaded_plugins;
 }
 
@@ -103,6 +108,13 @@ void EndstonePluginManager::enablePlugin(Plugin &plugin) const
     }
 }
 
+void EndstonePluginManager::enablePlugins() const
+{
+    for (const auto &plugin : plugins_) {
+        enablePlugin(*plugin);
+    }
+}
+
 void EndstonePluginManager::disablePlugin(Plugin &plugin) const
 {
     if (plugin.isEnabled()) {

diff --git a/src/endstone_core/server.cpp b/src/endstone_core/server.cpp
@@ -42,11 +42,7 @@ void EndstoneServer::loadPlugins()
     auto plugin_dir = fs::current_path() / "plugins";
 
     if (exists(plugin_dir)) {
-        auto plugins = plugin_manager_->loadPlugins(plugin_dir.string());
-        for (const auto &plugin : plugins) {
-            plugin->getLogger().info("Loading {}", plugin->getDescription().getFullName());
-            plugin->onLoad();
-        }
+        plugin_manager_->loadPlugins(plugin_dir.string());
     }
     else {
         create_directories(plugin_dir);
@@ -55,12 +51,7 @@ void EndstoneServer::loadPlugins()
 
 void EndstoneServer::enablePlugins() const
 {
-    auto plugins = plugin_manager_->getPlugins();
-    for (const auto &plugin : plugins) {
-        if (!plugin->isEnabled()) {
-            enablePlugin(*plugin);
-        }
-    }
+    plugin_manager_->enablePlugins();
 }
 
 void EndstoneServer::enablePlugin(Plugin &plugin) const

diff --git a/test_package/src/test_server.cpp b/test_package/src/test_server.cpp
@@ -54,21 +54,12 @@ class TestServer : public Server {
     void loadPlugins()
     {
         auto plugin_dir = fs::current_path() / "plugins";
-        auto plugins = plugin_manager_->loadPlugins(plugin_dir.string());
-        for (const auto &plugin : plugins) {
-            plugin->getLogger().info("Loading {}", plugin->getDescription().getFullName());
-            plugin->onLoad();
-        }
+        plugin_manager_->loadPlugins(plugin_dir.string());
     }
 
     void enablePlugins() const
     {
-        auto plugins = plugin_manager_->getPlugins();
-        for (const auto &plugin : plugins) {
-            if (!plugin->isEnabled()) {
-                plugin_manager_->enablePlugin(*plugin);
-            }
-        }
+        plugin_manager_->enablePlugins();
     }
 
     void disablePlugins() const
@@ -78,12 +69,12 @@ class TestServer : public Server {
 
     [[nodiscard]] std::string_view getVersion() const override
     {
-        return "test";
+        return "test(endstone)";
     }
 
     [[nodiscard]] std::string getMinecraftVersion() const override
     {
-        return "test";
+        return "test(minecraft)";
     }
 
 private: