Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-12 08:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Switch messages.yml to minimessage

Browse Source
This commit is contained in:
Taah
2022-02-24 23:09:55 -08:00
parent b6f4ddbb4c
commit bd21e5d2ba
40 changed files with 161 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dev/plex/listener/impl/AdminListener.java
View File

@ -9,7 +9,9 @@ import dev.plex.player.PlexPlayer;
import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils;
import org.bukkit.event.EventHandler;
import static dev.plex.util.PlexUtils.tl;
import static dev.plex.util.PlexUtils.messageComponent;
import static dev.plex.util.PlexUtils.messageString;
public class AdminListener extends PlexListener
{
@ -20,7 +22,7 @@ public class AdminListener extends PlexListener
PlexPlayer target = event.getPlexPlayer();
target.setRank(Rank.ADMIN.name());
DataUtils.update(target);
PlexUtils.broadcast(tl("newAdminAdded", userSender, target.getName()));
PlexUtils.broadcast(messageComponent("newAdminAdded", userSender, target.getName()));
}
@EventHandler
@ -30,7 +32,7 @@ public class AdminListener extends PlexListener
PlexPlayer target = event.getPlexPlayer();
target.setRank("");
DataUtils.update(target);
PlexUtils.broadcast(tl("adminRemoved", userSender, target.getName()));
PlexUtils.broadcast(messageComponent("adminRemoved", userSender, target.getName()));
}
@EventHandler
@ -41,6 +43,6 @@ public class AdminListener extends PlexListener
Rank newRank = event.getRank();
target.setRank(newRank.name().toLowerCase());
DataUtils.update(target);
PlexUtils.broadcast(tl("adminSetRank", userSender, target.getName(), newRank.getReadable()));
PlexUtils.broadcast(messageComponent("adminSetRank", userSender, target.getName(), newRank.getReadable()));
}
}

6
src/main/java/dev/plex/listener/impl/BanListener.java
View File

@ -7,6 +7,8 @@ import dev.plex.punishment.PunishmentType;
import dev.plex.util.MojangUtils;
import dev.plex.util.PlexUtils;
import java.time.format.DateTimeFormatter;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
@ -24,10 +26,10 @@ public class BanListener extends PlexListener
PunishedPlayer player = PlayerCache.getPunishedPlayer(event.getUniqueId());
player.getPunishments().stream().filter(punishment -> punishment.getType() == PunishmentType.BAN && punishment.isActive()).findFirst().ifPresent(punishment ->
{
String banMessage = PlexUtils.tl("banMessage", banUrl, punishment.getReason(),
Component banMessage = PlexUtils.messageComponent("banMessage", banUrl, punishment.getReason(),
DATE_FORMAT.format(punishment.getEndDate()), punishment.getPunisher() == null ? "CONSOLE" : MojangUtils.getInfo(punishment.getPunisher().toString()).getUsername());
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_BANNED,
LegacyComponentSerializer.legacyAmpersand().deserialize(banMessage));
banMessage);
});
}
}

9
src/main/java/dev/plex/listener/impl/ChatListener.java
View File

@ -31,6 +31,9 @@ public class ChatListener extends PlexListener
{
renderer.hasPrefix = true;
renderer.prefix = prefix;
} else {
renderer.hasPrefix = false;
renderer.prefix = null;
}
event.renderer(renderer);
}
@ -44,18 +47,18 @@ public class ChatListener extends PlexListener
PlexPlayer plexPlayer = PlayerCache.getPlexPlayerMap().get(player.getUniqueId());
if (plexPlayer.getRankFromString().isAtLeast(Rank.ADMIN))
{
player.sendMessage(PlexUtils.tl("adminChatFormat", sender.getName(), message));
player.sendMessage(PlexUtils.messageComponent("adminChatFormat", sender.getName(), message));
}
}
else if (plugin.getSystem().equalsIgnoreCase("permissions"))
{
if (player.hasPermission("plex.adminchat"))
{
player.sendMessage(PlexUtils.tl("adminChatFormat", sender.getName(), message));
player.sendMessage(PlexUtils.messageComponent("adminChatFormat", sender.getName(), message));
}
}
}
Bukkit.getLogger().info(PlexUtils.tl("adminChatFormat", sender.getName(), message));
plugin.getServer().getConsoleSender().sendMessage(PlexUtils.messageComponent("adminChatFormat", sender.getName(), message));
}
public static class PlexChatRenderer implements ChatRenderer

6
src/main/java/dev/plex/listener/impl/GameModeListener.java
View File

@ -17,13 +17,13 @@ public class GameModeListener extends PlexListener
if (userSender.getName().equals(target.getName()))
{
target.setGameMode(event.getGameMode());
userSender.sendMessage(PlexUtils.tl("gameModeSetTo", event.getGameMode().toString().toLowerCase()));
userSender.sendMessage(PlexUtils.messageComponent("gameModeSetTo", event.getGameMode().toString().toLowerCase()));
}
else
{
target.sendMessage(PlexUtils.tl("playerSetOtherGameMode", userSender.getName(), event.getGameMode().toString().toLowerCase()));
target.sendMessage(PlexUtils.messageComponent("playerSetOtherGameMode", userSender.getName(), event.getGameMode().toString().toLowerCase()));
target.setGameMode(event.getGameMode());
userSender.sendMessage(PlexUtils.tl("setOtherPlayerGameModeTo", target.getName(), event.getGameMode().toString().toLowerCase()));
userSender.sendMessage(PlexUtils.messageComponent("setOtherPlayerGameModeTo", target.getName(), event.getGameMode().toString().toLowerCase()));
}
}
}