did some updates
This commit is contained in:
@@ -25,14 +25,16 @@ public class CommandMonitor implements Listener {
|
||||
public void onPlayerCommand(PlayerCommandPreprocessEvent event) {
|
||||
if (!config.getBoolean("notifications.commands.enabled", true)) return;
|
||||
|
||||
String commandLine = event.getMessage().toLowerCase().trim();
|
||||
String commandLine = event.getMessage().trim();
|
||||
CommandSender sender = event.getPlayer();
|
||||
|
||||
List<String> watched = config.getStringList("notifications.commands.watch");
|
||||
for (String keyword : watched) {
|
||||
if (commandLine.startsWith("/" + keyword.toLowerCase())) {
|
||||
if (commandLine.toLowerCase().startsWith("/" + keyword.toLowerCase())) {
|
||||
String[] parts = commandLine.split("\\s+");
|
||||
String target = parts.length > 1 ? parts[1] : null;
|
||||
String title = messageManager.getMessage(keyword + ".title");
|
||||
String message = messageManager.formatMessage(keyword + ".message", (sender instanceof Player) ? (Player) sender : null);
|
||||
String message = messageManager.formatMessage(keyword + ".message", (sender instanceof Player) ? (Player) sender : null, target);
|
||||
notifier.sendNotification(title, message);
|
||||
break;
|
||||
}
|
||||
|
@@ -20,12 +20,15 @@ public class MessageManager {
|
||||
return messages.getString("messages." + path, "");
|
||||
}
|
||||
|
||||
public String formatMessage(String path, Player player) {
|
||||
public String formatMessage(String path, Player player, String target) {
|
||||
String message = getMessage(path);
|
||||
|
||||
if (player != null) {
|
||||
message = message.replace("%player%", player.getName());
|
||||
}
|
||||
if (target != null) {
|
||||
message = message.replace("%target%", target);
|
||||
}
|
||||
|
||||
String serverName = plugin.getConfig().getString("server-name", "Minecraft Server");
|
||||
message = message.replace("%server%", serverName);
|
||||
|
@@ -26,7 +26,7 @@ public class PlayerEventListener implements Listener {
|
||||
if (config.getBoolean("notifications.join", true)) {
|
||||
Player player = event.getPlayer();
|
||||
String title = messageManager.getMessage("join.title");
|
||||
String message = messageManager.formatMessage("join.message", player);
|
||||
String message = messageManager.formatMessage("join.message", player, null);
|
||||
notifier.sendNotification(title, message);
|
||||
}
|
||||
}
|
||||
@@ -36,7 +36,7 @@ public class PlayerEventListener implements Listener {
|
||||
if (config.getBoolean("notifications.quit", true)) {
|
||||
Player player = event.getPlayer();
|
||||
String title = messageManager.getMessage("quit.title");
|
||||
String message = messageManager.formatMessage("quit.message", player);
|
||||
String message = messageManager.formatMessage("quit.message", player, null);
|
||||
notifier.sendNotification(title, message);
|
||||
}
|
||||
}
|
||||
|
@@ -10,16 +10,16 @@ messages:
|
||||
message: "%player% issued /stop"
|
||||
ban:
|
||||
title: "Player Banned"
|
||||
message: "%player% used /ban"
|
||||
message: "%player% banned %target%"
|
||||
kick:
|
||||
title: "Player Kicked"
|
||||
message: "%player% used /kick"
|
||||
message: "%player% kicked %target%"
|
||||
mute:
|
||||
title: "Player Muted"
|
||||
message: "%player% used /mute"
|
||||
message: "%player% muted %target%"
|
||||
warn:
|
||||
title: "Player Warned"
|
||||
message: "%player% used /warn"
|
||||
message: "%player% warned %target%"
|
||||
op:
|
||||
title: "Player Opped"
|
||||
message: "%player% used /op"
|
||||
message: "%player% opped %target%"
|
@@ -1,5 +1,5 @@
|
||||
name: NTFYNotifier
|
||||
version: 1.0.0
|
||||
version: ${project.version}
|
||||
main: com.minster586.ntfyplugin.Main
|
||||
api-version: 1.14
|
||||
author: minster586
|
||||
|
Reference in New Issue
Block a user