From c28b4b89ba671129e69059ef22bfca22245f4ee7 Mon Sep 17 00:00:00 2001
From: minster586 <43217359+minster586@users.noreply.github.com>
Date: Sat, 9 Aug 2025 02:59:19 -0400
Subject: [PATCH] did some updates

---
 .gitignore                                           |  1 +
 pom.xml                                              | 12 +++++++++++-
 .../com/minster586/ntfyplugin/CommandMonitor.java    |  8 +++++---
 .../com/minster586/ntfyplugin/MessageManager.java    |  5 ++++-
 .../minster586/ntfyplugin/PlayerEventListener.java   |  4 ++--
 src/main/resources/msg.yml                           | 10 +++++-----
 src/main/resources/plugin.yml                        |  2 +-
 7 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea8c4bf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/pom.xml b/pom.xml
index fe85a1c..03c328b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.minster586</groupId>
     <artifactId>NTFYNotifier</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <packaging>jar</packaging>
     <name>NTFYNotifier</name>
 
@@ -34,9 +34,19 @@
 
     <build>
         <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>plugin.yml</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>false</filtering>
+                <excludes>
+                    <exclude>plugin.yml</exclude>
+                </excludes>
             </resource>
         </resources>
         <plugins>
diff --git a/src/main/java/com/minster586/ntfyplugin/CommandMonitor.java b/src/main/java/com/minster586/ntfyplugin/CommandMonitor.java
index 11077f0..705b0db 100644
--- a/src/main/java/com/minster586/ntfyplugin/CommandMonitor.java
+++ b/src/main/java/com/minster586/ntfyplugin/CommandMonitor.java
@@ -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;
             }
diff --git a/src/main/java/com/minster586/ntfyplugin/MessageManager.java b/src/main/java/com/minster586/ntfyplugin/MessageManager.java
index f66c8f8..1914717 100644
--- a/src/main/java/com/minster586/ntfyplugin/MessageManager.java
+++ b/src/main/java/com/minster586/ntfyplugin/MessageManager.java
@@ -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);
diff --git a/src/main/java/com/minster586/ntfyplugin/PlayerEventListener.java b/src/main/java/com/minster586/ntfyplugin/PlayerEventListener.java
index ffaeb13..9e81267 100644
--- a/src/main/java/com/minster586/ntfyplugin/PlayerEventListener.java
+++ b/src/main/java/com/minster586/ntfyplugin/PlayerEventListener.java
@@ -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);
         }
     }
diff --git a/src/main/resources/msg.yml b/src/main/resources/msg.yml
index 2b4d0f3..f823f35 100644
--- a/src/main/resources/msg.yml
+++ b/src/main/resources/msg.yml
@@ -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"
\ No newline at end of file
+    message: "%player% opped %target%"
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 17b2ab1..61e316f 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: NTFYNotifier
-version: 1.0.0
+version: ${project.version}
 main: com.minster586.ntfyplugin.Main
 api-version: 1.14
 author: minster586