refactor: update registerPlaceholder function signature

Author: wu-vincent

endstone_papi/pypapi.cpp

@@ -10,9 +10,9 @@ class PyPlaceholderAPI : public papi::PlaceholderAPI {
 public:
     using PlaceholderAPI::PlaceholderAPI;
 
-    [[nodiscard]] std::string setPlaceholder(const endstone::Player &player, std::string_view text) const override
+    [[nodiscard]] std::string setPlaceholders(const endstone::Player &player, std::string_view text) const override
     {
-        PYBIND11_OVERRIDE_PURE_NAME(std::string, PlaceholderAPI, "set_placeholder", setPlaceholder, player, text);
+        PYBIND11_OVERRIDE_PURE_NAME(std::string, PlaceholderAPI, "set_placeholders", setPlaceholder, player, text);
     }
 
     [[nodiscard]] bool isRegistered(std::string_view identifier) const override
@@ -33,10 +33,8 @@ class PyPlaceholderAPI : public papi::PlaceholderAPI {
         PYBIND11_OVERRIDE_PURE_NAME(bool, PlaceholderAPI, "contains_placeholders", containsPlaceholders, text);
     }
 
-    [[nodiscard]] bool registerPlaceholder(
-        endstone::Plugin &plugin, std::string_view identifier,
-        std::function<std::string(std::optional<endstone::Player &>, std::optional<std::string>)> processor)
-        const override
+    [[nodiscard]] bool registerPlaceholder(const endstone::Plugin &plugin, std::string_view identifier,
+                                           Processor processor) const override
     {
         PYBIND11_OVERRIDE_PURE_NAME(bool, PlaceholderAPI, "register_placeholder", registerPlaceholder, plugin,
                                     identifier, processor);
@@ -51,7 +49,7 @@ PYBIND11_MODULE(pypapi, m)
     py::class_<papi::PlaceholderAPI, PyPlaceholderAPI, endstone::Service, std::shared_ptr<papi::PlaceholderAPI>>(
         m, "PlaceholderAPI")
         .def(py::init<>())
-        .def("set_placeholder", &papi::PlaceholderAPI::setPlaceholder, py::arg("player"), py::arg("text"),
+        .def("set_placeholders", &papi::PlaceholderAPI::setPlaceholders, py::arg("player"), py::arg("text"),
              "Translates all placeholders into their corresponding values.")
         .def("is_registered", &papi::PlaceholderAPI::isRegistered, py::arg("identifier"),
              "Check if a specific placeholder identifier is currently registered.")

endstone_papi/pypapi.py

@@ -16,7 +16,7 @@ def __init__(self, plugin: Plugin):
         self._placeholder_pattern = re.compile(r"[{]([^{}]+)[}]")
         self._register_default_placeholders()
 
-    def set_placeholder(self, player: Player | None, text: str) -> str:
+    def set_placeholders(self, player: Player | None, text: str) -> str:
         return apply(player, text, self._registry.get)
 
     def is_registered(self, identifier: str) -> bool:

endstone_papi/pypapi.pyi

@@ -4,7 +4,7 @@ from endstone import Player
 __all__ = ["PlaceholderAPI"]
 
 class PlaceholderAPI(Service):
-    def set_placeholder(self, player: Player, text: str) -> str:
+    def set_placeholders(self, player: Player, text: str) -> str:
         """
         Translates all placeholders into their corresponding values.
         The pattern of a valid placeholder is {<identifier>:<params>}.

examples/cpp/plugin.cpp

@@ -18,7 +18,7 @@ class JoinExample : public endstone::Plugin {
     void onPlayerJoin(endstone::PlayerJoinEvent &event)
     {
         std::string join_text = "{player_name} joined the server! Their game mode is {player_gamemode}";
-        join_text = papi_->setPlaceholder(event.getPlayer(), join_text);
+        join_text = papi_->setPlaceholders(event.getPlayer(), join_text);
         event.setJoinMessage(join_text);
     }
 

include/endstone_papi/papi.h

@@ -5,6 +5,7 @@
 namespace papi {
 class PlaceholderAPI : public endstone::Service {
 public:
+    using Processor = std::function<std::string(const endstone::Player &, std::string)>;
     /**
      * Translates all placeholders into their corresponding values.
      * <br>The pattern of a valid placeholder is <code>{<identifier>|<params>}</code>.
@@ -13,7 +14,7 @@ class PlaceholderAPI : public endstone::Service {
      * @param text Text to set the placeholder values in
      * @return String containing all translated placeholders
      */
-    [[nodiscard]] virtual std::string setPlaceholder(const endstone::Player &player, std::string_view text) const = 0;
+    [[nodiscard]] virtual std::string setPlaceholders(const endstone::Player &player, std::string_view text) const = 0;
 
     /**
      * Check if a specific placeholder identifier is currently registered.
@@ -53,8 +54,7 @@ class PlaceholderAPI : public endstone::Service {
      * @param processor the processor that will process the placeholder
      * @return true if the placeholder was successfully registered, false otherwise
      */
-    [[nodiscard]] virtual bool registerPlaceholder(
-        endstone::Plugin &plugin, std::string_view identifier,
-        std::function<std::string(std::optional<endstone::Player &>, std::optional<std::string>)> processor) const = 0;
+    [[nodiscard]] virtual bool registerPlaceholder(const endstone::Plugin &plugin, std::string_view identifier,
+                                                   Processor processor) const = 0;
 };
 } // namespace papi