feat: replace py::class_ with py_class helper function

EndstoneMC · Mar 6, 2024 · 9c0e1c5 · 9c0e1c5
1 parent 9cf94b2
commit 9c0e1c5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/src/endstone_python/forward.h → include/endstone/detail/python.h b/src/endstone_python/forward.h → include/endstone/detail/python.h
@@ -18,10 +18,11 @@
 
 namespace endstone::detail {
 
-template <typename Type, typename... Options>
-pybind11::class_<Type, Options...> py_class(pybind11::handle scope, const char *name)
+template <typename Type, typename... Options, typename... Extra>
+pybind11::class_<Type, Options...> py_class(pybind11::handle scope, const char *name, Extra &&...extra)
 {
-    static pybind11::class_<Type, Options...> instance = pybind11::class_<Type, Options...>(scope, name);
+    static pybind11::class_<Type, Options...> instance =
+        pybind11::class_<Type, Options...>(scope, name, std::forward<Extra>(extra)...);
     return instance;
 }
 

diff --git a/src/endstone_python/endstone_python.cpp b/src/endstone_python/endstone_python.cpp
@@ -26,9 +26,9 @@ void init_util(py::module_ &);
 PYBIND11_MODULE(endstone_python, m)  // NOLINT(*-use-anonymous-namespace)
 {
     init_logger(m);
-    init_util(m);
     init_server(m);
     init_plugin(m);
+    init_util(m);
 }
 
 }  // namespace endstone::detail
diff --git a/src/endstone_python/logger.cpp b/src/endstone_python/logger.cpp
@@ -16,13 +16,15 @@
 
 #include <pybind11/pybind11.h>
 
+#include "endstone/detail/python.h"
+
 namespace py = pybind11;
 
 namespace endstone::detail {
 
 void init_logger(py::module &m)
 {
-    auto logger = py::class_<Logger>(m, "Logger");
+    auto logger = py_class<Logger>(m, "Logger");
 
     py::enum_<Logger::Level>(logger, "Level")
         .value("TRACE", Logger::Level::Trace)
@@ -33,7 +35,8 @@ void init_logger(py::module &m)
         .value("CRITICAL", Logger::Level::Critical)
         .export_values();
 
-    logger.def("set_level", &Logger::setLevel, py::arg("level"))
+    py_class<Logger>(m, "Logger")
+        .def("set_level", &Logger::setLevel, py::arg("level"))
         .def("is_enabled_for", &Logger::isEnabledFor, py::arg("level"))
         .def(
             "trace", [](const Logger &logger, const std::string &message) { logger.trace(message); }, py::arg("msg"))

diff --git a/src/endstone_python/plugin.cpp b/src/endstone_python/plugin.cpp
@@ -17,11 +17,11 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
+#include "endstone/detail/python.h"
 #include "endstone/logger.h"
 #include "endstone/plugin/plugin_loader.h"
 #include "endstone/plugin/plugin_manager.h"
 #include "endstone/server.h"
-#include "forward.h"
 
 namespace py = pybind11;
 
@@ -107,7 +107,7 @@ class PyPluginLoader : public PluginLoader {
 
 void init_plugin(py::module &m)
 {
-    py::class_<PluginDescription>(m, "PluginDescription")
+    py_class<PluginDescription>(m, "PluginDescription")
         .def(py::init(&createPluginDescription), py::arg("name"), py::arg("version"),
              py::arg("description") = py::none(), py::arg("authors") = py::none(), py::arg("prefix") = py::none())
         .def_property_readonly("name", &PluginDescription::getName)
@@ -119,7 +119,7 @@ void init_plugin(py::module &m)
 
     py_class<PluginLoader, PyPluginLoader>(m, "PluginLoader");
 
-    py::class_<Plugin, PyPlugin>(m, "Plugin")
+    py_class<Plugin, PyPlugin>(m, "Plugin")
         .def(py::init<>())
         .def("on_load", &Plugin::onLoad)
         .def("on_enable", &Plugin::onEnable)
@@ -131,7 +131,8 @@ void init_plugin(py::module &m)
         .def_property_readonly("enabled", &Plugin::isEnabled)
         .def_property_readonly("name", &Plugin::getName);
 
-    py_class<PluginLoader, PyPluginLoader>(m, "PluginLoader").def(py::init<Server &>(), py::arg("server"))
+    py_class<PluginLoader, PyPluginLoader>(m, "PluginLoader")
+        .def(py::init<Server &>(), py::arg("server"))
         .def("load_plugins", &PluginLoader::loadPlugins, py::arg("directory"),
              py::return_value_policy::reference_internal)
         .def("enable_plugin", &PluginLoader::enablePlugin, py::arg("plugin"))

diff --git a/src/endstone_python/server.cpp b/src/endstone_python/server.cpp
@@ -17,9 +17,9 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
+#include "endstone/detail/python.h"
 #include "endstone/logger.h"
 #include "endstone/plugin/plugin_manager.h"
-#include "forward.h"
 
 namespace py = pybind11;
 
@@ -29,7 +29,7 @@ void init_server(py::module &m)
 {
     py_class<PluginManager>(m, "PluginManager");
 
-    py::class_<Server>(m, "Server")
+    py_class<Server>(m, "Server")
         .def_property_readonly("logger", &Server::getLogger, py::return_value_policy::reference)
         .def_property_readonly("plugin_manager", &Server::getPluginManager, py::return_value_policy::reference)
         .def_property_readonly("name", &Server::getVersion)

diff --git a/src/endstone_python/util.cpp b/src/endstone_python/util.cpp
@@ -14,6 +14,7 @@
 
 #include <pybind11/pybind11.h>
 
+#include "endstone/detail/python.h"
 #include "endstone/util/color_format.h"
 
 namespace py = pybind11;
@@ -24,7 +25,7 @@ namespace endstone::detail {
 
 void init_util(py::module &m)
 {
-    py::class_<ColorFormat>(m, "ColorFormat")
+    py_class<ColorFormat>(m, "ColorFormat")
         .ADD_COLOR_FORMAT(BLACK)
         .ADD_COLOR_FORMAT(DARK_BLUE)
         .ADD_COLOR_FORMAT(DARK_GREEN)