From 63f5af4d19f4b4f67a40f659e1ca518c073a5068 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Sat, 20 Jan 2024 17:57:12 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/plugin/core/bukkit/constant/CoreMessage.java | 8 ++++---- .../mc/plugin/core/bukkit/util/CoreBukkitUtils.java | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java index 8137f65..719a746 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java @@ -45,7 +45,7 @@ public enum CoreMessage { COMMAND_LORE_NAME_TIMEOUT("§c已取消设置物品名称"), COMMAND_LORE_NAME_SUCCESS("§a已成功设置物品名称"), - COMMAND_LORE_REMOVE_INPUT_NUMBER_ERROR("§c行号必须是一个大于0的整数"), + COMMAND_LORE_REMOVE_INPUT_NUMBER_ERROR("§c行号必须是一个大于 0 的整数"), COMMAND_LORE_REMOVE_INDEX_OUT_OF_RANGE("§c你的手持物品没有这么多行 lore 文本"), COMMAND_LORE_REMOVE_NOTHING("§c这个物品没有 lore"), @@ -57,11 +57,11 @@ public enum CoreMessage { COMMAND_LORE_SET_INDEX_OUT_OF_RANGE("§c你的手持物品没有这么多行 lore 文本"), COMMAND_LORE_SET_SUCCESS("§a已成功设置 lore 文本"), - COMMAND_LORE_INSERT_NOT_INPUT_NUMBER("§c请输入行号"), + COMMAND_LORE_INSERT_NOT_INPUT_NUMBER("§c请输入要插入 lore 的行号"), COMMAND_LORE_INSERT_INPUT_NUMBER_ERROR("§c行号必须是一个大于等于 0 的整数"), - COMMAND_LORE_INSERT_WAIT_CHAT_TEXT("§a请于 15 秒内在聊天框输入想要设置的 lore 文本"), + COMMAND_LORE_INSERT_WAIT_CHAT_TEXT("§a请于 15 秒内在聊天框输入想要插入的 lore 文本"), COMMAND_LORE_INSERT_INDEX_OUT_OF_RANGE("§c你的手持物品没有这么多行 lore 文本"), - COMMAND_LORE_INSERT_SUCCESS("§a已成功设置 lore 文本"); + COMMAND_LORE_INSERT_SUCCESS("§a已成功插入 lore 文本"); @NotNull private DisplayMessage message; 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 e676814..0333627 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 @@ -7,7 +7,6 @@ import de.tr7zw.changeme.nbtapi.NBTContainer; import de.tr7zw.changeme.nbtapi.NBTItem; import me.clip.placeholderapi.PlaceholderAPI; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.title.Title; import org.bukkit.Bukkit; @@ -213,18 +212,17 @@ public final class CoreBukkitUtils { DisplayMessage displayMessage = new DisplayMessage(); String message = config.getString("message"); if (message != null) { - displayMessage.setMessage(MiniMessage.miniMessage().deserialize(message)); + displayMessage.setMessage(LegacyComponentSerializer.legacySection().deserialize(message)); } String actionbar = config.getString("actionbar"); if (actionbar != null) { - displayMessage.setActionbar(MiniMessage.miniMessage().deserialize(actionbar)); + displayMessage.setActionbar(LegacyComponentSerializer.legacySection().deserialize(actionbar)); } String title = config.getString("title"); String subtitle = config.getString("subtitle"); if (title != null || subtitle != null) { displayMessage.setTitle( - MiniMessage.miniMessage().escapeTags(title == null ? "" : title), - MiniMessage.miniMessage().escapeTags(subtitle == null ? "" : subtitle), + title, subtitle, config.getInt("fade-in", 10), config.getInt("stay", 70), config.getInt("fade-out", 20)