From 79db9acf959d93649e1fbb59d51bb9c3d990b587 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Fri, 29 Dec 2023 18:00:56 +0800 Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20=E4=BF=AE=E5=A4=8D=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/lore/sub/LoreCustomModelDataCommand.java | 5 +---- .../core/bukkit/command/lore/sub/LoreFlagCommand.java | 11 ++--------- .../mc/plugin/core/bukkit/constant/CoreMessage.java | 5 ++--- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java index 04dce4b..1daf178 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java @@ -3,7 +3,6 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; -import net.kyori.adventure.text.TextReplacementConfig; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -66,9 +65,7 @@ public class LoreCustomModelDataCommand extends ChildCommand { int data = Integer.parseInt(args[0]); meta.setCustomModelData(data); stack.setItemMeta(meta); - CoreMessage.COMMAND_LORE_CMD_SET_SUCCESS.show(sender, TextReplacementConfig.builder() - .matchLiteral("%data%").replacement(args[0]) - .build()); + CoreMessage.COMMAND_LORE_CMD_SET_SUCCESS.show(sender, "%data%", args[0]); } catch (NumberFormatException e) { CoreMessage.COMMAND_LORE_CMD_SET_INPUT_ERROR.show(sender); return true; diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java index bf64693..40e7f85 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java @@ -3,7 +3,6 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; -import net.kyori.adventure.text.TextReplacementConfig; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -71,16 +70,10 @@ public class LoreFlagCommand extends ChildCommand { if (meta != null) { if (meta.hasItemFlag(flag)) { meta.removeItemFlags(flag); - CoreMessage.COMMAND_LORE_FLAG_REMOVE_SUCCESS.show(player, TextReplacementConfig.builder() - .replacement("%flag%") - .matchLiteral(flag.name()) - .build()); + CoreMessage.COMMAND_LORE_FLAG_REMOVE_SUCCESS.show(player, "%flag%", flag.name()); } else { meta.addItemFlags(flag); - CoreMessage.COMMAND_LORE_FLAG_SET_SUCCESS.show(player, TextReplacementConfig.builder() - .replacement("%flag%") - .matchLiteral(flag.name()) - .build()); + CoreMessage.COMMAND_LORE_FLAG_SET_SUCCESS.show(player, "%flag%", flag.name()); } } stack.setItemMeta(meta); 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 7d62611..e3dc5d5 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 @@ -108,9 +108,8 @@ public enum CoreMessage { } } - public void show(@NotNull CommandSender sender, @NotNull TextReplacementConfig... replacement) { - Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().sender(sender); - message.show(audience, replacement); + public void show(@NotNull CommandSender sender) { + message.show(CoreBukkitAPI.getInstance().getAudienceProvider().sender(sender)); } public void show(@NotNull CommandSender sender, @NotNull String... replacement) {