MiniDay/hamster-core
1
0
Fork 0
Code Issues Pull Requests Actions Releases 8 Activity

style: 优化代码

Browse Source
This commit is contained in:
叁只仓鼠
2024-01-20 17:57:12 +08:00
parent f1b8edba45
commit 63f5af4d19
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java
View File

@@ -45,7 +45,7 @@ public enum CoreMessage {
COMMAND_LORE_NAME_TIMEOUT("§c已取消设置物品名称"), COMMAND_LORE_NAME_TIMEOUT("§c已取消设置物品名称"),
COMMAND_LORE_NAME_SUCCESS("§a已成功设置物品名称"), 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_INDEX_OUT_OF_RANGE("§c你的手持物品没有这么多行 lore 文本"),
COMMAND_LORE_REMOVE_NOTHING("§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_INDEX_OUT_OF_RANGE("§c你的手持物品没有这么多行 lore 文本"),
COMMAND_LORE_SET_SUCCESS("§a已成功设置 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_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_INDEX_OUT_OF_RANGE("§c你的手持物品没有这么多行 lore 文本"),
COMMAND_LORE_INSERT_SUCCESS("§a已成功设置 lore 文本"); COMMAND_LORE_INSERT_SUCCESS("§a已成功插入 lore 文本");
@NotNull @NotNull
private DisplayMessage message; private DisplayMessage message;

8
core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
View File

@@ -7,7 +7,6 @@ import de.tr7zw.changeme.nbtapi.NBTContainer;
import de.tr7zw.changeme.nbtapi.NBTItem; import de.tr7zw.changeme.nbtapi.NBTItem;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import net.kyori.adventure.text.Component; 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.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.title.Title; import net.kyori.adventure.title.Title;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@@ -213,18 +212,17 @@ public final class CoreBukkitUtils {
DisplayMessage displayMessage = new DisplayMessage(); DisplayMessage displayMessage = new DisplayMessage();
String message = config.getString("message"); String message = config.getString("message");
if (message != null) { if (message != null) {
displayMessage.setMessage(MiniMessage.miniMessage().deserialize(message)); displayMessage.setMessage(LegacyComponentSerializer.legacySection().deserialize(message));
} }
String actionbar = config.getString("actionbar"); String actionbar = config.getString("actionbar");
if (actionbar != null) { if (actionbar != null) {
displayMessage.setActionbar(MiniMessage.miniMessage().deserialize(actionbar)); displayMessage.setActionbar(LegacyComponentSerializer.legacySection().deserialize(actionbar));
} }
String title = config.getString("title"); String title = config.getString("title");
String subtitle = config.getString("subtitle"); String subtitle = config.getString("subtitle");
if (title != null || subtitle != null) { if (title != null || subtitle != null) {
displayMessage.setTitle( displayMessage.setTitle(
MiniMessage.miniMessage().escapeTags(title == null ? "" : title), title, subtitle,
MiniMessage.miniMessage().escapeTags(subtitle == null ? "" : subtitle),
config.getInt("fade-in", 10), config.getInt("fade-in", 10),
config.getInt("stay", 70), config.getInt("stay", 70),
config.getInt("fade-out", 20) config.getInt("fade-out", 20)