Skip to content

Commit 3c122cb

Browse files
committed
replace custom message formatting with adventure placeholders
1 parent 2503028 commit 3c122cb

3 files changed

Lines changed: 10 additions & 12 deletions

File tree

src/main/java/dev/plex/command/NUSHCommand.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import dev.plex.NUSHModule;
55
import dev.plex.command.SimplePlexCommand;
66
import net.kyori.adventure.text.Component;
7+
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
78
import org.bukkit.command.CommandSender;
89
import org.bukkit.entity.Player;
910
import org.jetbrains.annotations.NotNull;
@@ -14,8 +15,6 @@
1415
import java.util.List;
1516
import io.papermc.paper.command.brigadier.CommandSourceStack;
1617

17-
import static dev.plex.api.message.MessagePlaceholder.placeholder;
18-
1918
public class NUSHCommand extends SimplePlexCommand
2019
{
2120
private final NUSHModule module;
@@ -71,7 +70,7 @@ private Component executeAction(CommandSender sender, String action, @Nullable S
7170

7271
case "status" ->
7372
{
74-
return messageComponent("nushStatus", placeholder("status", module.isEnabled() ? "<green>enabled</green>" : "<red>disabled</red>"));
73+
return messageComponent("nushStatus", Placeholder.parsed("status", module.isEnabled() ? "<green>enabled</green>" : "<red>disabled</red>"));
7574
}
7675

7776
default ->
@@ -97,7 +96,7 @@ private Component executeAction(CommandSender sender, String action, @Nullable S
9796
}
9897

9998
module.setTime(time);
100-
return messageComponent("waitTimeSet", placeholder("minutes", time));
99+
return messageComponent("waitTimeSet", Placeholder.unparsed("minutes", String.valueOf(time)));
101100
}
102101

103102
case "remove" ->
@@ -106,7 +105,7 @@ private Component executeAction(CommandSender sender, String action, @Nullable S
106105
if (module.isNewPlayer(target))
107106
{
108107
module.removePlayer(target);
109-
return messageComponent("playerRemoved", placeholder("player", target.getName()));
108+
return messageComponent("playerRemoved", Placeholder.parsed("player", target.getName()));
110109
}
111110
else
112111
{

src/main/java/dev/plex/listener/JoinListener.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package dev.plex.listener;
22

33
import dev.plex.NUSHModule;
4+
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
45
import org.bukkit.Bukkit;
56
import org.bukkit.entity.Player;
67
import org.bukkit.event.EventHandler;
78
import org.bukkit.event.Listener;
89
import org.bukkit.event.player.PlayerJoinEvent;
910

10-
import static dev.plex.api.message.MessagePlaceholder.placeholder;
11-
1211
public class JoinListener implements Listener
1312
{
1413
private final NUSHModule module;
@@ -27,7 +26,7 @@ public void onJoin(PlayerJoinEvent event)
2726
module.api().logging().debug("Adding {0} to the new player list", player.getName());
2827
module.queueNewPlayer(player);
2928
String playerName = player.getName();
30-
Bukkit.broadcast(module.messageComponent("newPlayerMarked", placeholder("player", playerName), placeholder("minutes", module.getTime())), "plex.nush.view");
29+
Bukkit.broadcast(module.messageComponent("newPlayerMarked", Placeholder.parsed("player", playerName), Placeholder.unparsed("minutes", String.valueOf(module.getTime()))), "plex.nush.view");
3130
}
3231
}
3332
}

src/main/resources/messages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
nushEnabled: "<gray>The status for NUSH is now <green>enabled</green>."
22
nushDisabled: "<gray>The status for NUSH is now <red>disabled</red>."
3-
nushStatus: "<gray>The status for NUSH is currently {status}."
3+
nushStatus: "<gray>The status for NUSH is currently <status>."
44
timeMustBeNumber: "<red>The time must be a number!"
5-
waitTimeSet: "<gray>The wait time for new players before they can chat is now set to <yellow>{minutes}</yellow> minutes."
6-
playerRemoved: "<yellow>{player} <gray>has been removed."
5+
waitTimeSet: "<gray>The wait time for new players before they can chat is now set to <yellow><minutes></yellow> minutes."
6+
playerRemoved: "<yellow><player> <gray>has been removed."
77
playerNotNushed: "<red>That player is currently not NUSH'd"
8-
newPlayerMarked: "<light_purple>[NUSH] {player} has been marked as a new player and won't be able to chat normally for {minutes} minutes."
8+
newPlayerMarked: "<light_purple>[NUSH] <player> has been marked as a new player and won't be able to chat normally for <minutes> minutes."
99
newPlayerChatPrefix: "<yellow>[NUSH] "

0 commit comments

Comments
 (0)