From 258bb9ac4f812c0a22832531f4c0399cd4b9dcf9 Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Thu, 14 Mar 2024 23:49:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(core-bukkit):=20=E5=BD=93=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=20PlaceholderAPI=20=E6=97=B6=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=20UI=20=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                                   |  2 +-
 .../core/bukkit/page/handler/PageHandler.java      |  4 ++++
 .../plugin/core/bukkit/util/CoreBukkitUtils.java   | 14 +++++++++-----
 core-bukkit/src/main/resources/plugin.yml          |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f335947..09be84c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "cn.hamster3.mc.plugin"
-version = "1.3.0"
+version = "1.3.1"
 
 subprojects {
     apply {
diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java
index d524f6f..0344839 100644
--- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java
+++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java
@@ -3,6 +3,7 @@ package cn.hamster3.mc.plugin.core.bukkit.page.handler;
 import cn.hamster3.mc.plugin.core.bukkit.page.ButtonGroup;
 import cn.hamster3.mc.plugin.core.bukkit.page.PageConfig;
 import cn.hamster3.mc.plugin.core.bukkit.page.PageManager;
+import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.entity.HumanEntity;
@@ -118,6 +119,9 @@ public abstract class PageHandler implements InventoryHolder {
     @NotNull
     public String getTitle() {
         String title = pageConfig.getTitle();
+        if (player instanceof Player && Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
+            title = PlaceholderAPI.setPlaceholders((Player) player, title);
+        }
         for (Map.Entry<String, String> entry : getPageVariables().entrySet()) {
             title = title.replace(entry.getKey(), entry.getValue());
         }
diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
index 1a0a58a..4089309 100644
--- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
+++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
@@ -390,21 +390,25 @@ public final class CoreBukkitUtils {
         if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
             command = PlaceholderAPI.setPlaceholders(player, command);
         }
-        String[] split = command.split(":", 2);
-        switch (split[0]) {
+        String[] args = command.split(":", 2);
+        switch (args[0]) {
             case "player": {
-                Bukkit.dispatchCommand(player, split[1]);
+                Bukkit.dispatchCommand(player, args[1]);
                 break;
             }
             case "console": {
-                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), split[1]);
+                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), args[1]);
+                break;
+            }
+            case "message": {
+                player.sendMessage(args[1]);
                 break;
             }
             case "op": {
                 boolean op = player.isOp();
                 player.setOp(true);
                 try {
-                    Bukkit.dispatchCommand(player, split[1]);
+                    Bukkit.dispatchCommand(player, args[1]);
                 } finally {
                     player.setOp(op);
                 }
diff --git a/core-bukkit/src/main/resources/plugin.yml b/core-bukkit/src/main/resources/plugin.yml
index 07ff519..8bbfad8 100644
--- a/core-bukkit/src/main/resources/plugin.yml
+++ b/core-bukkit/src/main/resources/plugin.yml
@@ -12,6 +12,7 @@ load: STARTUP
 softdepend:
   - Vault
   - PlayerPoints
+  - PlaceholderAPI
 
 loadbefore:
   - HamsterAPI