mirror of
https://github.com/plexusorg/Plex.git
synced 2025-07-01 23:56:40 +00:00
- Switch messages.yml to minimessage
This commit is contained in:
@ -19,6 +19,7 @@ import java.util.Arrays;
|
||||
import java.util.UUID;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
@ -108,7 +109,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
|
||||
|
||||
if (commandSource == RequiredCommandSource.CONSOLE && sender instanceof Player)
|
||||
{
|
||||
sender.sendMessage(tl("noPermissionInGame"));
|
||||
sender.sendMessage(messageComponent("noPermissionInGame"));
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -116,7 +117,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
|
||||
{
|
||||
if (sender instanceof ConsoleCommandSender)
|
||||
{
|
||||
send(sender, tl("noPermissionConsole"));
|
||||
send(sender, messageComponent("noPermissionConsole"));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -129,7 +130,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
|
||||
{
|
||||
if (!plexPlayer.getRankFromString().isAtLeast(getLevel()))
|
||||
{
|
||||
send(sender, tl("noPermissionRank", ChatColor.stripColor(getLevel().getLoginMessage())));
|
||||
send(sender, messageComponent("noPermissionRank", ChatColor.stripColor(getLevel().getLoginMessage())));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -137,7 +138,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
|
||||
{
|
||||
if (!player.hasPermission(perms.permission()))
|
||||
{
|
||||
send(sender, tl("noPermissionNode", perms.permission()));
|
||||
send(sender, messageComponent("noPermissionNode", perms.permission()));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -160,7 +161,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
|
||||
| ConsoleOnlyException | ConsoleMustDefinePlayerException
|
||||
| PlayerNotBannedException ex)
|
||||
{
|
||||
send(sender, ex.getMessage());
|
||||
send(sender, MiniMessage.miniMessage().deserialize(ex.getMessage()));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -262,14 +263,14 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
|
||||
{
|
||||
if (!plexPlayer.getRankFromString().isAtLeast(rank))
|
||||
{
|
||||
throw new CommandFailException(PlexUtils.tl("noPermissionRank", ChatColor.stripColor(rank.getLoginMessage())));
|
||||
throw new CommandFailException(PlexUtils.messageString("noPermissionRank", ChatColor.stripColor(rank.getLoginMessage())));
|
||||
}
|
||||
}
|
||||
else if (plugin.getSystem().equalsIgnoreCase("permissions"))
|
||||
{
|
||||
if (!player.hasPermission(permission))
|
||||
{
|
||||
throw new CommandFailException(PlexUtils.tl("noPermissionNode", permission));
|
||||
throw new CommandFailException(PlexUtils.messageString("noPermissionNode", permission));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
@ -419,9 +420,9 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
|
||||
* @param objects Any objects to replace in order
|
||||
* @return A kyori component
|
||||
*/
|
||||
protected Component tl(String s, Object... objects)
|
||||
protected Component messageComponent(String s, Object... objects)
|
||||
{
|
||||
return componentFromString(PlexUtils.tl(s, objects));
|
||||
return PlexUtils.messageComponent(s, objects);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -482,7 +483,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
|
||||
World world = Bukkit.getWorld(name);
|
||||
if (world == null)
|
||||
{
|
||||
throw new CommandFailException(PlexUtils.tl("worldNotFound"));
|
||||
throw new CommandFailException(PlexUtils.messageString("worldNotFound"));
|
||||
}
|
||||
return world;
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
package dev.plex.command.exception;
|
||||
|
||||
import static dev.plex.util.PlexUtils.tl;
|
||||
import static dev.plex.util.PlexUtils.messageString;
|
||||
|
||||
public class ConsoleMustDefinePlayerException extends RuntimeException
|
||||
{
|
||||
public ConsoleMustDefinePlayerException()
|
||||
{
|
||||
super(tl("consoleMustDefinePlayer"));
|
||||
super(messageString("consoleMustDefinePlayer"));
|
||||
}
|
||||
}
|
@ -1,11 +1,11 @@
|
||||
package dev.plex.command.exception;
|
||||
|
||||
import static dev.plex.util.PlexUtils.tl;
|
||||
import static dev.plex.util.PlexUtils.messageString;
|
||||
|
||||
public class ConsoleOnlyException extends RuntimeException
|
||||
{
|
||||
public ConsoleOnlyException()
|
||||
{
|
||||
super(tl("consoleOnly"));
|
||||
super(messageString("consoleOnly"));
|
||||
}
|
||||
}
|
@ -1,11 +1,11 @@
|
||||
package dev.plex.command.exception;
|
||||
|
||||
import static dev.plex.util.PlexUtils.tl;
|
||||
import static dev.plex.util.PlexUtils.messageString;
|
||||
|
||||
public class PlayerNotBannedException extends RuntimeException
|
||||
{
|
||||
public PlayerNotBannedException()
|
||||
{
|
||||
super(tl("playerNotBanned"));
|
||||
super(messageString("playerNotBanned"));
|
||||
}
|
||||
}
|
@ -1,11 +1,11 @@
|
||||
package dev.plex.command.exception;
|
||||
|
||||
import static dev.plex.util.PlexUtils.tl;
|
||||
import static dev.plex.util.PlexUtils.messageString;
|
||||
|
||||
public class PlayerNotFoundException extends RuntimeException
|
||||
{
|
||||
public PlayerNotFoundException()
|
||||
{
|
||||
super(tl("playerNotFound"));
|
||||
super(messageString("playerNotFound"));
|
||||
}
|
||||
}
|
@ -61,7 +61,7 @@ public class AdminCMD extends PlexCommand
|
||||
|
||||
if (isAdmin(plexPlayer))
|
||||
{
|
||||
return tl("playerIsAdmin");
|
||||
return messageComponent("playerIsAdmin");
|
||||
}
|
||||
|
||||
Bukkit.getServer().getPluginManager().callEvent(new AdminAddEvent(sender, plexPlayer));
|
||||
@ -89,7 +89,7 @@ public class AdminCMD extends PlexCommand
|
||||
|
||||
if (!isAdmin(plexPlayer))
|
||||
{
|
||||
return tl("playerNotAdmin");
|
||||
return messageComponent("playerNotAdmin");
|
||||
}
|
||||
|
||||
Bukkit.getServer().getPluginManager().callEvent(new AdminRemoveEvent(sender, plexPlayer));
|
||||
@ -117,21 +117,21 @@ public class AdminCMD extends PlexCommand
|
||||
|
||||
if (!rankExists(args[2]))
|
||||
{
|
||||
return tl("rankNotFound");
|
||||
return messageComponent("rankNotFound");
|
||||
}
|
||||
|
||||
Rank rank = Rank.valueOf(args[2].toUpperCase());
|
||||
|
||||
if (!rank.isAtLeast(Rank.ADMIN))
|
||||
{
|
||||
return tl("rankMustBeHigherThanAdmin");
|
||||
return messageComponent("rankMustBeHigherThanAdmin");
|
||||
}
|
||||
|
||||
PlexPlayer plexPlayer = DataUtils.getPlayer(targetUUID);
|
||||
|
||||
if (!isAdmin(plexPlayer))
|
||||
{
|
||||
return tl("playerNotAdmin");
|
||||
return messageComponent("playerNotAdmin");
|
||||
}
|
||||
|
||||
Bukkit.getServer().getPluginManager().callEvent(new AdminSetRankEvent(sender, plexPlayer, rank));
|
||||
|
@ -25,7 +25,7 @@ public class AdminworldCMD extends PlexCommand
|
||||
{
|
||||
Location loc = new Location(Bukkit.getWorld("adminworld"), 0, 50, 0);
|
||||
playerSender.teleportAsync(loc);
|
||||
return tl("teleportedToWorld", "adminworld");
|
||||
return messageComponent("teleportedToWorld", "adminworld");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
@ -29,7 +29,7 @@ public class AdventureCMD extends PlexCommand
|
||||
{
|
||||
if (isConsole(sender))
|
||||
{
|
||||
throw new CommandFailException(PlexUtils.tl("consoleMustDefinePlayer"));
|
||||
throw new CommandFailException(PlexUtils.messageString("consoleMustDefinePlayer"));
|
||||
}
|
||||
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender, GameMode.ADVENTURE));
|
||||
return null;
|
||||
@ -42,9 +42,9 @@ public class AdventureCMD extends PlexCommand
|
||||
for (Player targetPlayer : Bukkit.getServer().getOnlinePlayers())
|
||||
{
|
||||
targetPlayer.setGameMode(GameMode.ADVENTURE);
|
||||
tl("gameModeSetTo", "adventure");
|
||||
messageComponent("gameModeSetTo", "adventure");
|
||||
}
|
||||
PlexUtils.broadcast(tl("setEveryoneGameMode", sender.getName(), "adventure"));
|
||||
PlexUtils.broadcast(messageComponent("setEveryoneGameMode", sender.getName(), "adventure"));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -56,7 +56,7 @@ public class BanCMD extends PlexCommand
|
||||
PlexPlayer plexPlayer1 = getPlexPlayer(playerSender);
|
||||
if (!plexPlayer1.getRankFromString().isAtLeast(plexPlayer.getRankFromString()))
|
||||
{
|
||||
return tl("higherRankThanYou");
|
||||
return messageComponent("higherRankThanYou");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -79,7 +79,7 @@ public class BanCMD extends PlexCommand
|
||||
punishment.setCustomTime(false);
|
||||
punishment.setActive(true);
|
||||
plugin.getPunishmentManager().doPunishment(punishedPlayer, punishment);
|
||||
PlexUtils.broadcast(tl("banningPlayer", sender.getName(), plexPlayer.getName()));
|
||||
PlexUtils.broadcast(messageComponent("banningPlayer", sender.getName(), plexPlayer.getName()));
|
||||
if (player != null)
|
||||
{
|
||||
player.kick(componentFromString("&cYou've been banned."));
|
||||
|
@ -29,7 +29,7 @@ public class CreativeCMD extends PlexCommand
|
||||
{
|
||||
if (isConsole(sender))
|
||||
{
|
||||
throw new CommandFailException(PlexUtils.tl("consoleMustDefinePlayer"));
|
||||
throw new CommandFailException(PlexUtils.messageString("consoleMustDefinePlayer"));
|
||||
}
|
||||
if (!(playerSender == null))
|
||||
{
|
||||
@ -45,9 +45,9 @@ public class CreativeCMD extends PlexCommand
|
||||
for (Player targetPlayer : Bukkit.getServer().getOnlinePlayers())
|
||||
{
|
||||
targetPlayer.setGameMode(GameMode.CREATIVE);
|
||||
tl("gameModeSetTo", "creative");
|
||||
messageComponent("gameModeSetTo", "creative");
|
||||
}
|
||||
PlexUtils.broadcast(tl("setEveryoneGameMode", sender.getName(), "creative"));
|
||||
PlexUtils.broadcast(messageComponent("setEveryoneGameMode", sender.getName(), "creative"));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -23,7 +23,7 @@ public class DeopAllCMD extends PlexCommand
|
||||
{
|
||||
player.setOp(false);
|
||||
}
|
||||
PlexUtils.broadcast(tl("deoppedAllPlayers", sender.getName()));
|
||||
PlexUtils.broadcast(messageComponent("deoppedAllPlayers", sender.getName()));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@ public class DeopCMD extends PlexCommand
|
||||
}
|
||||
Player player = getNonNullPlayer(args[0]);
|
||||
player.setOp(false);
|
||||
PlexUtils.broadcast(tl("oppedPlayer", sender.getName(), player.getName()));
|
||||
PlexUtils.broadcast(messageComponent("oppedPlayer", sender.getName(), player.getName()));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -25,7 +25,7 @@ public class FlatlandsCMD extends PlexCommand
|
||||
{
|
||||
Location loc = new Location(Bukkit.getWorld("flatlands"), 0, 50, 0);
|
||||
playerSender.teleportAsync(loc);
|
||||
return tl("teleportedToWorld", "flatlands");
|
||||
return messageComponent("teleportedToWorld", "flatlands");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ public class FreezeCMD extends PlexCommand
|
||||
punishment.setReason("");
|
||||
|
||||
plugin.getPunishmentManager().doPunishment(punishedPlayer, punishment);
|
||||
PlexUtils.broadcast(tl("frozePlayer", sender.getName(), player.getName()));
|
||||
PlexUtils.broadcast(messageComponent("frozePlayer", sender.getName(), player.getName()));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -19,6 +19,6 @@ public class LocalSpawnCMD extends PlexCommand
|
||||
protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
|
||||
{
|
||||
playerSender.teleportAsync(playerSender.getWorld().getSpawnLocation());
|
||||
return tl("teleportedToWorldSpawn");
|
||||
return messageComponent("teleportedToWorldSpawn");
|
||||
}
|
||||
}
|
@ -26,7 +26,7 @@ public class MasterbuilderworldCMD extends PlexCommand
|
||||
{
|
||||
Location loc = new Location(Bukkit.getWorld("masterbuilderworld"), 0, 50, 0);
|
||||
playerSender.teleportAsync(loc);
|
||||
return tl("teleportedToWorld", "Master Builder World");
|
||||
return messageComponent("teleportedToWorld", "Master Builder World");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
@ -39,7 +39,7 @@ public class NameHistoryCMD extends PlexCommand
|
||||
AshconInfo info = MojangUtils.getInfo(username);
|
||||
if (info == null)
|
||||
{
|
||||
return tl("nameHistoryDoesntExist");
|
||||
return messageComponent("nameHistoryDoesntExist");
|
||||
}
|
||||
PlexLog.debug("NameHistory UUID: " + info.getUuid());
|
||||
PlexLog.debug("NameHistory Size: " + info.getUsernameHistories().length);
|
||||
|
@ -23,7 +23,7 @@ public class OpAllCMD extends PlexCommand
|
||||
{
|
||||
player.setOp(true);
|
||||
}
|
||||
PlexUtils.broadcast(tl("oppedAllPlayers", sender.getName()));
|
||||
PlexUtils.broadcast(messageComponent("oppedAllPlayers", sender.getName()));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@ public class OpCMD extends PlexCommand
|
||||
}
|
||||
Player player = getNonNullPlayer(args[0]);
|
||||
player.setOp(true);
|
||||
PlexUtils.broadcast(tl("oppedPlayer", sender.getName(), player.getName()));
|
||||
PlexUtils.broadcast(messageComponent("oppedPlayer", sender.getName(), player.getName()));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -23,14 +23,14 @@ public class RankCMD extends PlexCommand
|
||||
if (!(playerSender == null))
|
||||
{
|
||||
Rank rank = getPlexPlayer(playerSender).getRankFromString();
|
||||
return tl("yourRank", rank.getReadable());
|
||||
return messageComponent("yourRank", rank.getReadable());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Player player = getNonNullPlayer(args[0]);
|
||||
Rank rank = getPlexPlayer(player).getRankFromString();
|
||||
return tl("otherRank", player.getName(), rank.getReadable());
|
||||
return messageComponent("otherRank", player.getName(), rank.getReadable());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
@ -29,7 +29,7 @@ public class SpectatorCMD extends PlexCommand
|
||||
{
|
||||
if (isConsole(sender))
|
||||
{
|
||||
throw new CommandFailException(PlexUtils.tl("consoleMustDefinePlayer"));
|
||||
throw new CommandFailException(PlexUtils.messageString("consoleMustDefinePlayer"));
|
||||
}
|
||||
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender, GameMode.SPECTATOR));
|
||||
return null;
|
||||
@ -42,9 +42,9 @@ public class SpectatorCMD extends PlexCommand
|
||||
for (Player targetPlayer : Bukkit.getServer().getOnlinePlayers())
|
||||
{
|
||||
targetPlayer.setGameMode(GameMode.SPECTATOR);
|
||||
tl("gameModeSetTo", "spectator");
|
||||
messageComponent("gameModeSetTo", "spectator");
|
||||
}
|
||||
PlexUtils.broadcast(tl("setEveryoneGameMode", sender.getName(), "spectator"));
|
||||
PlexUtils.broadcast(messageComponent("setEveryoneGameMode", sender.getName(), "spectator"));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -29,7 +29,7 @@ public class SurvivalCMD extends PlexCommand
|
||||
{
|
||||
if (isConsole(sender))
|
||||
{
|
||||
throw new CommandFailException(PlexUtils.tl("consoleMustDefinePlayer"));
|
||||
throw new CommandFailException(PlexUtils.messageString("consoleMustDefinePlayer"));
|
||||
}
|
||||
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender, GameMode.SURVIVAL));
|
||||
}
|
||||
@ -41,9 +41,9 @@ public class SurvivalCMD extends PlexCommand
|
||||
for (Player targetPlayer : Bukkit.getServer().getOnlinePlayers())
|
||||
{
|
||||
targetPlayer.setGameMode(GameMode.SURVIVAL);
|
||||
send(targetPlayer, tl("gameModeSetTo", "survival"));
|
||||
send(targetPlayer, messageComponent("gameModeSetTo", "survival"));
|
||||
}
|
||||
PlexUtils.broadcast(tl("setEveryoneGameMode", sender.getName(), "survival"));
|
||||
PlexUtils.broadcast(messageComponent("setEveryoneGameMode", sender.getName(), "survival"));
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -38,7 +38,7 @@ public class TagCMD extends PlexCommand
|
||||
{
|
||||
if (sender instanceof ConsoleCommandSender)
|
||||
{
|
||||
return tl("noPermissionConsole");
|
||||
return messageComponent("noPermissionConsole");
|
||||
}
|
||||
PlexPlayer player = DataUtils.getPlayer(playerSender.getUniqueId());
|
||||
if (args.length < 2)
|
||||
@ -60,7 +60,7 @@ public class TagCMD extends PlexCommand
|
||||
{
|
||||
if (sender instanceof ConsoleCommandSender)
|
||||
{
|
||||
return tl("noPermissionConsole");
|
||||
return messageComponent("noPermissionConsole");
|
||||
}
|
||||
|
||||
PlexPlayer player = DataUtils.getPlayer(playerSender.getUniqueId());
|
||||
|
@ -47,7 +47,7 @@ public class UnbanCMD extends PlexCommand
|
||||
}
|
||||
|
||||
plugin.getPunishmentManager().unban(targetUUID);
|
||||
PlexUtils.broadcast(tl("unbanningPlayer", sender.getName(), plexPlayer.getName()));
|
||||
PlexUtils.broadcast(messageComponent("unbanningPlayer", sender.getName(), plexPlayer.getName()));
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
@ -31,10 +31,10 @@ public class UnfreezeCMD extends PlexCommand
|
||||
PunishedPlayer punishedPlayer = PlayerCache.getPunishedPlayer(player.getUniqueId());
|
||||
if (!punishedPlayer.isFrozen())
|
||||
{
|
||||
throw new CommandFailException(PlexUtils.tl("playerNotFrozen"));
|
||||
throw new CommandFailException(PlexUtils.messageString("playerNotFrozen"));
|
||||
}
|
||||
punishedPlayer.setFrozen(false);
|
||||
return tl("unfrozePlayer", sender.getName(), player.getName());
|
||||
return messageComponent("unfrozePlayer", sender.getName(), player.getName());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -30,7 +30,7 @@ public class WorldCMD extends PlexCommand
|
||||
}
|
||||
World world = getNonNullWorld(args[0]);
|
||||
playerSender.teleportAsync(new Location(world, 0, world.getHighestBlockYAt(0, 0) + 1, 0, 0, 0));
|
||||
return tl("playerWorldTeleport", world.getName());
|
||||
return messageComponent("playerWorldTeleport", world.getName());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user