Update to plugin version 1.14.1

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>eu.mclive</groupId>
   <artifactId>ChatLog</artifactId>
-  <version>1.13.6-release</version>
+  <version>1.14.1-release</version>
   <name>Chatlog</name>
   <description>Chatlog generator to report players</description>
 
@@ -26,7 +26,7 @@
 			<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.14.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -35,7 +35,7 @@
 			<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.6.0</version>
                 <configuration>
                     <artifactSet>
                         <includes>
@@ -73,8 +73,7 @@
  		<dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <!-- Bukkit API Version, change if out dated -->
-            <version>1.19.4-R0.1-SNAPSHOT</version>
+            <version>1.21.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <type>jar</type>
         </dependency>
@@ -87,7 +86,7 @@
 <dependency>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-lang3</artifactId>
-    <version>3.12.0</version>
+    <version>3.17.0</version>
 </dependency>
     </dependencies>
 

resources/config.yml

@@ -57,4 +57,6 @@ Cleanup:
  # How old messages need to be before they are deleted.
   since: 14
 
-update-check: true
+update-check: true
+# How often to check for updates in days, defaults to 1 day
+update-interval: 1

resources/plugin.yml

@@ -1,17 +1,21 @@
 name: ChatLog
 descriptipn: Chatlog generator to report players
-version: 1.13.6
+version: 1.14.1
 api-version: 1.13
 author: McLive
 website: www.freecraft.eu
 
 main: eu.mclive.ChatLog.ChatLog
 
 commands:
-  chatreport:
-    aliases: [chatlog]
+  chatlog:
+    aliases:
+      - chatreport
     description: Generate a chatlog to report players
 
 permissions:
   chatlog.command:
-    description: Allows /chatreport
+    description: Allows /chatlog
+
+  chatlog.reload:
+    description: Allows reloading the plugin with /chatlog reload

src/eu/mclive/ChatLog/AsyncChatListener.java

@@ -17,6 +17,7 @@ public void onAsyncPlayerChat(final AsyncPlayerChatEvent e) {
         if (e.isCancelled()) {
             return;
         }
-        plugin.getUtils().logMessage(e.getPlayer(), e.getMessage());
+		String worldName = e.getPlayer().getWorld().getName();
+        plugin.getUtils().logMessage(e.getPlayer(), worldName, e.getMessage());
     }
 }

src/eu/mclive/ChatLog/ChatListener.java

@@ -17,6 +17,7 @@ public void onPlayerChat(final PlayerChatEvent e) {
         if (e.isCancelled()) {
             return;
         }
-        plugin.getUtils().logMessage(e.getPlayer(), e.getMessage());
+		String worldName = e.getPlayer().getWorld().getName();
+        plugin.getUtils().logMessage(e.getPlayer(), worldName, e.getMessage());
     }
 }

src/eu/mclive/ChatLog/ChatLog.java

@@ -1,17 +1,17 @@
 package eu.mclive.ChatLog;
 
-import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.concurrent.Callable;
+import java.util.logging.Logger;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import eu.mclive.ChatLog.Commands.Chatreport;
+import eu.mclive.ChatLog.Commands.Chatlog;
 import eu.mclive.ChatLog.MySQL.MySQL;
 import eu.mclive.ChatLog.MySQL.MySQLHandler;
 import eu.mclive.ChatLog.update.UpdateListener;
@@ -20,21 +20,16 @@
 public class ChatLog extends JavaPlugin implements Listener {
 
     public UUIDHandler UUIDHandler;
+    public Logger logger = getLogger();
     public MySQL sql;
     public Messages messages;
     public MySQLHandler sqlHandler;
     public Long pluginstart = null;
     private eu.mclive.ChatLog.bstats.Metrics bstats;
     private Utils utils;
 
-    /**
-     * Issued ChatLogs since last submit.
-     */
     private int issuedChatLogs = 0;
 
-    /**
-     * Logged Messages since last submit.
-     */
     private int loggedMessages = 0;
 
     public void onEnable() {
@@ -68,15 +63,18 @@ public void onEnable() {
                 Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GREEN + "[ChatLog] " + ChatColor.RED + "Failed to load bStats.");
             }
         }
-
+		UpdateUtil.scheduleUpdateChecker(this);
         this.cleanup();
-
         this.registerEvents();
         this.registerCommands();
-        this.checkUpdates();
-
-        Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GREEN + "[ChatLog] " + ChatColor.GREEN + "Plugin started.");
-    }
+		boolean performUpdateCheck = getConfig().getBoolean("update-check");
+		if (performUpdateCheck) {
+			Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GREEN + "[ChatLog] " + ChatColor.YELLOW + "Checking for updates...");
+			UpdateUtil.checkForUpdates(this);
+			}
+
+			Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GREEN + "[ChatLog] " + ChatColor.GREEN + "Plugin started.");
+			}
 
     public void onDisable() {
 		if (sql != null) {
@@ -91,7 +89,7 @@ private void setupConfig() {
     }
 
     private void registerCommands() {
-        getCommand("chatreport").setExecutor(new Chatreport(this));
+        getCommand("chatlog").setExecutor(new Chatlog(this));
     }
 
     private void registerEvents() {
@@ -141,9 +139,9 @@ public void run() {
                 String server = getConfig().getString("Server-Name");
                 String bypassCharacter = getConfig().getString("bypass-character");
                 String bypassPermission = getConfig().getString("bypass-permission");
-                //System.out.println(server + p + msg + timestamp);
+                String worldName = p.getWorld().getName();
                 if (bypassCharacter.isEmpty() || (msg.startsWith(bypassCharacter) && !p.hasPermission(bypassPermission)) || !msg.startsWith(bypassCharacter)) {
-                    sqlHandler.addMessage(server, p, msg, timestamp);
+                    sqlHandler.addMessage(server, p, msg, timestamp, worldName);
                 }
             }
         });