refactor: pass ServerInstance ref to EndstoneServer constructor

EndstoneMC · Mar 3, 2024 · ce0dca4 · ce0dca4
1 parent a7be72e
commit ce0dca4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 29 deletions.
diff --git a/include/endstone/detail/server.h b/include/endstone/detail/server.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <string_view>
 
-#include "bedrock/server/dedicated_server.h"
+#include "bedrock/server/server_instance.h"
 #include "endstone/detail/plugin/plugin_manager.h"
 #include "endstone/plugin/plugin_manager.h"
 #include "endstone/server.h"
@@ -27,7 +27,7 @@ namespace endstone::detail {
 
 class EndstoneServer : public Server {
 public:
-    explicit EndstoneServer(DedicatedServer &dedicated_server);
+    explicit EndstoneServer(ServerInstance &dedicated_server);
     EndstoneServer(EndstoneServer const &) = delete;
     EndstoneServer(EndstoneServer &&) = delete;
     EndstoneServer &operator=(EndstoneServer const &) = delete;
@@ -47,7 +47,7 @@ class EndstoneServer : public Server {
 private:
     void enablePlugin(Plugin &plugin) const;
 
-    DedicatedServer &dedicated_server_;
+    ServerInstance &dedicated_server_;
     Logger &logger_;
     std::unique_ptr<EndstonePluginManager> plugin_manager_;
 };

diff --git a/src/endstone_core/server.cpp b/src/endstone_core/server.cpp
@@ -28,7 +28,7 @@ namespace fs = std::filesystem;
 
 namespace endstone::detail {
 
-EndstoneServer::EndstoneServer(DedicatedServer &dedicated_server)
+EndstoneServer::EndstoneServer(ServerInstance &dedicated_server)
     : dedicated_server_(dedicated_server), logger_(LoggerFactory::getLogger("EndstoneServer"))
 {
     plugin_manager_ = std::make_unique<EndstonePluginManager>(*this);

diff --git a/src/endstone_runtime/bedrock/dedicated_server.cpp b/src/endstone_runtime/bedrock/dedicated_server.cpp
diff --git a/src/endstone_runtime/bedrock/server_instance.cpp b/src/endstone_runtime/bedrock/server_instance.cpp
@@ -15,15 +15,21 @@
 #include "bedrock/server/server_instance.h"
 
 #include "endstone/detail/hook.h"
+#include "endstone/detail/plugin/python_plugin_loader.h"
 #include "endstone/detail/server.h"
 #include "endstone/detail/singleton.h"
 
 using endstone::detail::EndstoneServer;
+using endstone::detail::PythonPluginLoader;
 using endstone::detail::Singleton;
 
 void ServerInstance::startServerThread()
 {
-    Singleton<EndstoneServer>::getInstance().loadPlugins();
+    Singleton<EndstoneServer>::setInstance(std::make_unique<EndstoneServer>(*this));
+    auto &server = Singleton<EndstoneServer>::getInstance();
+    server.getPluginManager().registerLoader(std::make_unique<PythonPluginLoader>(server));
+    server.getLogger().info("Version: {} (Minecraft: {})", server.getVersion(), server.getMinecraftVersion());
+    server.loadPlugins();
     ENDSTONE_HOOK_CALL_ORIGINAL(&ServerInstance::startServerThread, this);
 }