From 55e5e69667b7a50b9493cb3a111f20d7da0fde89 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 20 May 2026 17:07:19 -0400 Subject: [PATCH] More messages --- .../dev/plex/extras/command/CakeCommand.java | 2 +- .../plex/extras/command/CartSitCommand.java | 5 ++-- .../extras/command/CloudClearCommand.java | 3 +-- .../plex/extras/command/ClownfishCommand.java | 4 +-- .../dev/plex/extras/command/EjectCommand.java | 3 +-- .../dev/plex/extras/command/ExpelCommand.java | 3 +-- .../plex/extras/command/JumpPadsCommand.java | 25 +++++++++---------- src/main/resources/tfmextras/messages.yml | 16 +++++++++--- 8 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/main/java/dev/plex/extras/command/CakeCommand.java b/src/main/java/dev/plex/extras/command/CakeCommand.java index 30056c6..fe36bda 100755 --- a/src/main/java/dev/plex/extras/command/CakeCommand.java +++ b/src/main/java/dev/plex/extras/command/CakeCommand.java @@ -29,7 +29,7 @@ public class CakeCommand extends SimplePlexCommand protected Component execute(@NotNull CommandSender sender, @Nullable Player player, @NotNull String[] args) { Bukkit.getOnlinePlayers().forEach(p -> api().scheduler().runEntity(p, () -> p.getInventory().addItem(CAKE.clone()))); - broadcast(messageComponent("cakeLyrics")); + broadcast("But there's no sense crying over every mistake. You just keep on trying till you run out of cake."); return null; } diff --git a/src/main/java/dev/plex/extras/command/CartSitCommand.java b/src/main/java/dev/plex/extras/command/CartSitCommand.java index cc302ea..f6a704b 100755 --- a/src/main/java/dev/plex/extras/command/CartSitCommand.java +++ b/src/main/java/dev/plex/extras/command/CartSitCommand.java @@ -6,7 +6,6 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.command.CommandSender; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; @@ -42,7 +41,7 @@ public class CartSitCommand extends SimplePlexCommand List minecart = player.getNearbyEntities(100, 100, 100).stream().filter(entity -> entity.getType() == EntityType.MINECART).collect(Collectors.toList()); if (minecart.isEmpty()) { - return MiniMessage.miniMessage().deserialize("Could not find a nearby minecart!"); + return messageComponent("minecartNotFound"); } Entity entity = findNearestEntity(player, minecart); api().scheduler().runEntity(entity, () -> entity.addPassenger(player)); @@ -56,7 +55,7 @@ public class CartSitCommand extends SimplePlexCommand List minecart = target.getNearbyEntities(100, 100, 100).stream().filter(entity -> entity.getType() == EntityType.MINECART).collect(Collectors.toList()); if (minecart.isEmpty()) { - return MiniMessage.miniMessage().deserialize("Could not find a nearby minecart near " + target.getName() + "!"); + return messageComponent("targetMinecartNotFound", target.getName()); } Entity entity = findNearestEntity(target, minecart); api().scheduler().runEntity(entity, () -> entity.addPassenger(target)); diff --git a/src/main/java/dev/plex/extras/command/CloudClearCommand.java b/src/main/java/dev/plex/extras/command/CloudClearCommand.java index 114d2c6..51099e0 100755 --- a/src/main/java/dev/plex/extras/command/CloudClearCommand.java +++ b/src/main/java/dev/plex/extras/command/CloudClearCommand.java @@ -6,7 +6,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.command.CommandSender; @@ -35,7 +34,7 @@ public class CloudClearCommand extends SimplePlexCommand api().scheduler().runEntity(entity, entity::remove); }); broadcast(messageComponent("areaEffectCloudClear", sender.getName())); - return MiniMessage.miniMessage().deserialize("" + removed.get() + " area effect clouds removed."); + return messageComponent("areaEffectCloudsRemoved", removed.get()); } @Override diff --git a/src/main/java/dev/plex/extras/command/ClownfishCommand.java b/src/main/java/dev/plex/extras/command/ClownfishCommand.java index 991cd6e..9c78fae 100644 --- a/src/main/java/dev/plex/extras/command/ClownfishCommand.java +++ b/src/main/java/dev/plex/extras/command/ClownfishCommand.java @@ -63,7 +63,7 @@ public class ClownfishCommand extends SimplePlexCommand module.getConfig().set("server.clownfish.toggled_players", toggledPlayers); module.getConfig().save(); - return messageComponent("toggleClownfish", isToggled ? "now" : "no longer"); + return MiniMessage.miniMessage().deserialize("You will " + (isToggled ? "now" : "no longer") + " be affected by the clownfish."); } else if (args[0].equals("restrict") && args.length == 2) { @@ -86,7 +86,7 @@ public class ClownfishCommand extends SimplePlexCommand module.getConfig().set("server.clownfish.restricted", restrictedPlayers); module.getConfig().save(); - return messageComponent("restrictClownfish", target.name(), isRestricted ? "now" : "no longer"); + return MiniMessage.miniMessage().deserialize("" + target.name() + " will " + (isRestricted ? "now" : "no longer") + " be able to use the clownfish."); } else { diff --git a/src/main/java/dev/plex/extras/command/EjectCommand.java b/src/main/java/dev/plex/extras/command/EjectCommand.java index eaccca1..f36dadc 100755 --- a/src/main/java/dev/plex/extras/command/EjectCommand.java +++ b/src/main/java/dev/plex/extras/command/EjectCommand.java @@ -5,7 +5,6 @@ import dev.plex.command.source.RequiredCommandSource; import java.util.Collections; import java.util.List; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -26,7 +25,7 @@ public class EjectCommand extends SimplePlexCommand { final int passengers = player.getPassengers().size(); api().scheduler().runEntity(player, player::eject); - return MiniMessage.miniMessage().deserialize("Ejected " + passengers + " passengers."); + return messageComponent("passengersEjected", passengers); } @Override diff --git a/src/main/java/dev/plex/extras/command/ExpelCommand.java b/src/main/java/dev/plex/extras/command/ExpelCommand.java index 49cfcfe..d358c2d 100644 --- a/src/main/java/dev/plex/extras/command/ExpelCommand.java +++ b/src/main/java/dev/plex/extras/command/ExpelCommand.java @@ -2,7 +2,6 @@ package dev.plex.extras.command; import dev.plex.command.SimplePlexCommand; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -83,7 +82,7 @@ public class ExpelCommand extends SimplePlexCommand if (!pushedPlayers.isEmpty()) { - return messageComponent("playersExpelled", String.join(", ", pushedPlayers)); + return messageComponent("playersExpelled", String.join(messageString("playersExpelledSeparator"), pushedPlayers)); } return null; diff --git a/src/main/java/dev/plex/extras/command/JumpPadsCommand.java b/src/main/java/dev/plex/extras/command/JumpPadsCommand.java index ee6ed48..6f8ce3d 100755 --- a/src/main/java/dev/plex/extras/command/JumpPadsCommand.java +++ b/src/main/java/dev/plex/extras/command/JumpPadsCommand.java @@ -8,7 +8,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; @@ -45,7 +44,7 @@ public class JumpPadsCommand extends SimplePlexCommand { if (sender instanceof ConsoleCommandSender) { - return MiniMessage.miniMessage().deserialize("You must specify a player when running this command from console."); + return messageComponent("jumpPadsConsoleSpecifyPlayer"); } if (player == null) @@ -56,7 +55,7 @@ public class JumpPadsCommand extends SimplePlexCommand if (args[0].equalsIgnoreCase("none") || args[0].equalsIgnoreCase("off")) { jumpPads.removePlayer(player); - return MiniMessage.miniMessage().deserialize("You have disabled your jump pads."); + return messageComponent("jumpPadsDisabledSelf"); } Mode mode = Mode.valueOf(args[0].toUpperCase()); @@ -65,21 +64,21 @@ public class JumpPadsCommand extends SimplePlexCommand { if (mode.equals(jumpPads.get(player))) { - return MiniMessage.miniMessage().deserialize("Your jump pads are already set to " + mode.name() + "."); + return messageComponent("jumpPadsAlreadySet", mode.name()); } else { jumpPads.updatePlayer(player, mode); - return MiniMessage.miniMessage().deserialize("Successfully set your jump pads to " + mode.name() + "."); + return messageComponent("jumpPadsSetSelf", mode.name()); } } jumpPads.addPlayer(player, mode); - return MiniMessage.miniMessage().deserialize("Successfully set your jump pads to " + mode.name() + "."); + return messageComponent("jumpPadsSetSelf", mode.name()); } catch (IllegalArgumentException ignored) { - return MiniMessage.miniMessage().deserialize("That is not a valid mode."); + return messageComponent("jumpPadsInvalidMode"); } } try @@ -88,13 +87,13 @@ public class JumpPadsCommand extends SimplePlexCommand if (p == null) { - return MiniMessage.miniMessage().deserialize("That player cannot be found."); + return messageComponent("jumpPadsPlayerNotFound"); } if (args[0].equalsIgnoreCase("none")) { jumpPads.removePlayer(p); - return MiniMessage.miniMessage().deserialize("Jump pads for " + p.getName() + " have been disabled."); + return messageComponent("jumpPadsDisabledOther", p.getName()); } Mode mode = Mode.valueOf(args[0]); @@ -108,19 +107,19 @@ public class JumpPadsCommand extends SimplePlexCommand { if (jumpPads.get(p).equals(mode)) { - return MiniMessage.miniMessage().deserialize("Your jump pads are already set to " + mode.name() + "."); + return messageComponent("jumpPadsAlreadySet", mode.name()); } jumpPads.updatePlayer(p, mode); - return MiniMessage.miniMessage().deserialize("Jump pads for " + p.getName() + " have been set to " + mode.name() + "."); + return messageComponent("jumpPadsSetOther", p.getName(), mode.name()); } jumpPads.addPlayer(p, mode); - return MiniMessage.miniMessage().deserialize("Jump pads for " + p.getName() + " have been set to " + mode.name() + "."); + return messageComponent("jumpPadsSetOther", p.getName(), mode.name()); } catch (IllegalArgumentException ignored) { - return MiniMessage.miniMessage().deserialize("That is not a valid mode."); + return messageComponent("jumpPadsInvalidMode"); } } diff --git a/src/main/resources/tfmextras/messages.yml b/src/main/resources/tfmextras/messages.yml index 86ea25b..1b860e8 100644 --- a/src/main/resources/tfmextras/messages.yml +++ b/src/main/resources/tfmextras/messages.yml @@ -1,16 +1,26 @@ playerOrbited: "{0} - Orbiting {1}" stoppedOrbiting: "No longer orbiting {0}" alreadyOrbited: "{0} is already being orbited!" -restrictClownfish: "{0} will {1} be able to use the clownfish." -toggleClownfish: "You will {0} be affected by the clownfish." emptyAdminInfo: "The admin information section of the config.yml file has not been configured." -cakeLyrics: "But there's no sense crying over every mistake. You just keep on trying till you run out of cake." areaEffectCloudClear: "{0} - Removing all area effect clouds" +areaEffectCloudsRemoved: "{0} area effect clouds removed." chatCleared: "{0} - Cleared the chat" attributeList: "All possible attributes: {0}" modifiedAutoClear: "{0} will {1} have their inventory cleared when they join." modifiedAutoTeleport: "{0} will {1} be teleported automatically when they join." +minecartNotFound: "Could not find a nearby minecart!" +targetMinecartNotFound: "Could not find a nearby minecart near {0}!" +passengersEjected: "Ejected {0} passengers." playersExpelled: "Pushed away players: {0}" +playersExpelledSeparator: ", " +jumpPadsConsoleSpecifyPlayer: "You must specify a player when running this command from console." +jumpPadsDisabledSelf: "You have disabled your jump pads." +jumpPadsAlreadySet: "Your jump pads are already set to {0}." +jumpPadsSetSelf: "Successfully set your jump pads to {0}." +jumpPadsInvalidMode: "That is not a valid mode." +jumpPadsPlayerNotFound: "That player cannot be found." +jumpPadsDisabledOther: "Jump pads for {0} have been disabled." +jumpPadsSetOther: "Jump pads for {0} have been set to {1}." enchantList: "All possible enchantments are for this item are: {0}" enchantAddAll: "Added all possible enchantments for this item." enchantReset: "Removed every enchantment from this item."