v1.0.3

Author: katorly

README.md

@@ -1,6 +1,6 @@
 # Starlin_L2
 [![License](https://img.shields.io/badge/license-CC%20BY--NC--ND--4.0-green?style=for-the-badge)](http://creativecommons.org/licenses/by-nc-nd/4.0) ![Pull Requests](https://img.shields.io/github/issues-pr-closed/katorlys/Starlin_L2?style=for-the-badge) ![Issues](https://img.shields.io/github/issues-closed/katorlys/Starlin_L2?style=for-the-badge)<br>
-![Build](https://img.shields.io/github/workflow/status/katorlys/Starlin_L2/Build?style=for-the-badge)
+![Build](https://img.shields.io/github/workflow/status/katorlys/Starlin_L2/Build?style=for-the-badge) ![Codacy](https://img.shields.io/codacy/grade/b187c52b9b754ed8a670a3017201c05f?style=for-the-badge)
 
 ## Introduction
 Starlin_L2 Minecraft Spigot plugin made for StarlinWorld (星林宇宙) server.<br>
@@ -15,7 +15,7 @@ Main functions:<br>
 ![](https://cdn.jsdelivr.net/gh/katorly/Gallery001/plugins/2022-01-20_14.52.png)
 
 ## Commands
-- `/l2 time [player]` Displays the first-join time and monthly online time of the excutor or the specific player.
+- `/l2 time [player]` Displays the first-join time and total online time of the excutor or the specific player.
 
 ## Config
 ### timedata.yml

pom.xml

@@ -4,7 +4,7 @@
 
     <artifactId>starlin_l2</artifactId>
     <groupId>com.github.katorly</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
 
     <!-- Repositories -->
     <repositories>

src/main/java/com/github/katorly/starlin_l2/CommandHandler.java

@@ -37,6 +37,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                         messageSender.sendMessage(player, "&b&l星林宇宙 &r&8>> &7您 (&f" + pname + "&7) 的游玩信息:");
                         messageSender.sendMessage(player, " &7首次加入: &f" + first_time);
                         messageSender.sendMessage(player, " &7总计时长: &f" + total_time + " 小时");
+                        messageSender.sendMessage(player, " &7游玩信息在您退出重进后会更新.");
                     }
                 } else if (args.length == 2) {
                     Player p = null;
@@ -57,6 +58,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                         sender.sendMessage(messageSender.Color("&b&l星林宇宙 &r&8>> &7玩家 &f" + pname + "&7 的游玩信息:"));
                         sender.sendMessage(messageSender.Color(" &7首次加入: &f" + first_time));
                         sender.sendMessage(messageSender.Color(" &7总计时长: &f" + total_time + " 小时"));
+                        sender.sendMessage(messageSender.Color(" &7游玩信息在该玩家退出重进后会更新."));
                     } else {
                         sender.sendMessage(messageSender.Color("&b&l星林宇宙 &r&8>> &7玩家不在线或不存在!"));
                     }
@@ -81,7 +83,7 @@ public List<String> onTabComplete(CommandSender sender, Command commandd, String
             return sub;
         }
         if (args.length == 2) {
-            if (args[0] == "time") {
+            if (Objects.equals(args[0], "time")) {
                 List<String> sub = new ArrayList<>();
                 for (Player player : Bukkit.getOnlinePlayers()) {
                     sub.add(player.getName());

src/main/java/com/github/katorly/starlin_l2/EventListener.java

@@ -7,7 +7,7 @@
 
 import com.github.katorly.starlin_l2.backup.configReader;
 import com.github.katorly.starlin_l2.backup.messageSender;
-import com.github.katorly.starlin_l2.utils.MonthlyPlayTime;
+import com.github.katorly.starlin_l2.utils.PlayTime;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -26,27 +26,10 @@ public class EventListener implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent e) throws ParseException {
-
-        FileConfiguration timedata = starlin_l2.timedata.getConfig(); //Check whether player has joined before.
-        long t = System.currentTimeMillis();
-        SimpleDateFormat d = new SimpleDateFormat("yyyy");
-        String year = d.format(t);
-        String u = e.getPlayer().getUniqueId().toString();
-        if (!starlin_l2.timedata.getConfig().contains(u)) { //if not
-            timedata.set(u + ".name", e.getPlayer().getName());
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm");
-            String timenow = dateFormat.format(t);
-            timedata.set(u + ".first-time", timenow);
-            timedata.set(u + ".total", 0.0);
-            configReader.save(starlin_l2.timedata);
-        }
-        if (!starlin_l2.timedata.getConfig().contains(u + ".month-time." + year)) {
-            timedata.set(u + ".month-time." + year, "0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0");
-            configReader.save(starlin_l2.timedata);
-        }
 
-        MonthlyPlayTime.initialize(e.getPlayer()); //Get player's join time.
+        PlayTime.initialize(e.getPlayer()); //Get player's join time and check whether player has joined before.
 
+        long t = System.currentTimeMillis();
         FileConfiguration monthly = starlin_l2.monthly.getConfig(); //Record monthly players.
         String pname = e.getPlayer().getName();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM");
@@ -94,7 +77,7 @@ public void run() {
 
     @EventHandler //Count player's monthly play time.
     public void onPlayerLeave(PlayerQuitEvent e) throws ParseException {
-        MonthlyPlayTime.settle(e.getPlayer());
+        PlayTime.settle(e.getPlayer());
     }
 
     @EventHandler //Prevent crops from being trampled.

src/main/java/com/github/katorly/starlin_l2/starlin_l2.java

@@ -1,20 +1,17 @@
 package com.github.katorly.starlin_l2;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
 import com.github.katorly.starlin_l2.backup.configReader;
-import com.github.katorly.starlin_l2.utils.MonthlyPlayTime;
+import com.github.katorly.starlin_l2.utils.PlayTime;
 
 import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitRunnable;
 
 public class starlin_l2 extends JavaPlugin {
     public static starlin_l2 INSTANCE;
@@ -38,20 +35,19 @@ public void onEnable() {
         Bukkit.getLogger().info("[starlin_l2] Starlin_L2 enabled! Made for StarlinWorld server only.");
         for (Player p : Bukkit.getOnlinePlayers()) {
             try {
-                MonthlyPlayTime.initialize(p);
+                PlayTime.initialize(p);
             } catch (ParseException e) {
                 Bukkit.getLogger().severe("[starlin_l2] Error counting player's monthly play time.");
                 e.printStackTrace();
             }
         }
-        this.timeCounter();
     }
 
     @Override
     public void onDisable() {
         for (Player p : Bukkit.getOnlinePlayers()) {
             try {
-                MonthlyPlayTime.settle(p);
+                PlayTime.settle(p);
             } catch (ParseException e) {
                 Bukkit.getLogger().severe("[starlin_l2] Error counting player's monthly play time.");
                 e.printStackTrace();
@@ -61,29 +57,4 @@ public void onDisable() {
         configReader.save(timedata);
         Bukkit.getLogger().info("[starlin_l2] Starlin_L2 disabled!");
     }
-
-    public void timeCounter() { //Counts the player's play time.
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                for (Player player : Bukkit.getOnlinePlayers()) {
-                    FileConfiguration timedata = starlin_l2.timedata.getConfig();
-                    String u = player.getUniqueId().toString();
-                    if (!starlin_l2.timedata.getConfig().contains(u)) { //if data not exist
-                        timedata.set(u + ".name", player.getName());
-                        long t = System.currentTimeMillis();
-                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm");
-                        String timenow = dateFormat.format(t);
-                        timedata.set(u + ".first-time", timenow);
-                        timedata.set(u + ".total", 0.0);
-                        configReader.save(starlin_l2.timedata);
-                    } else {
-                        Double newtotal = Double.valueOf(String.format("%.1f", timedata.getDouble(u + ".total"))) + 0.1; //if data exist
-                        timedata.set(u + ".total", Double.valueOf(String.format("%.1f", newtotal)));
-                        configReader.save(starlin_l2.timedata);
-                    }
-                }
-            }
-        }.runTaskTimer(this, 7200L, 7200L);
-    }
 }

…ly/starlin_l2/utils/MonthlyPlayTime.java …b/katorly/starlin_l2/utils/PlayTime.javasrc/main/java/com/github/katorly/starlin_l2/utils/MonthlyPlayTime.java renamed to src/main/java/com/github/katorly/starlin_l2/utils/PlayTime.java src/main/java/com/github/katorly/starlin_l2/utils/MonthlyPlayTime.java renamed to src/main/java/com/github/katorly/starlin_l2/utils/PlayTime.java

@@ -10,7 +10,7 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 
-public class MonthlyPlayTime {
+public class PlayTime {
     public static void initialize(Player p) throws ParseException { //Get player's join time.
         long t = System.currentTimeMillis();
         SimpleDateFormat dnow = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -19,14 +19,22 @@ public static void initialize(Player p) throws ParseException { //Get player's j
         starlin_l2.INSTANCE.StartTime.put(p.getPlayer().getUniqueId(), t1);
     }
 
-    public static void settle(Player p) throws ParseException { //Count player's monthly play time.
+    public static void settle(Player p) throws ParseException { //Count player's total & monthly play time.
         FileConfiguration timedata = starlin_l2.timedata.getConfig();
         long t = System.currentTimeMillis();
         SimpleDateFormat d = new SimpleDateFormat("yyyy");
         String year = d.format(t);
         String u = p.getPlayer().getUniqueId().toString();
         Long minutes;
-        if (!starlin_l2.timedata.getConfig().contains(u + ".month-time." + year)) {
+        if (!starlin_l2.timedata.getConfig().contains(u)) {
+            timedata.set(u + ".name", p.getName());
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+            String timenow = dateFormat.format(t);
+            timedata.set(u + ".first-time", timenow);
+            timedata.set(u + ".total", 0.0);
+            timedata.set(u + ".month-time." + year, "0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0");
+            configReader.save(starlin_l2.timedata);
+        } else if (!starlin_l2.timedata.getConfig().contains(u + ".month-time." + year)) {
             timedata.set(u + ".month-time." + year, "0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0");
             configReader.save(starlin_l2.timedata);
         } else {
@@ -45,6 +53,8 @@ public static void settle(Player p) throws ParseException { //Count player's mon
                 mtime[month - 1] = String.format("%.1f", Double.valueOf(mtime[month - 1]) + minutes / 60.0);
                 String newtime = String.join(",", mtime);
                 timedata.set(u + ".month-time." + year, newtime);
+                Double newtotal = Double.valueOf(String.format("%.1f", timedata.getDouble(u + ".total"))) + minutes / 60.0;
+                timedata.set(u + ".total", Double.valueOf(String.format("%.1f", newtotal)));
                 configReader.save(starlin_l2.timedata);
             }
         }

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: starlin_l2
-version: "1.0.2"
+version: "1.0.3"
 author: Katorly
 main: com.github.katorly.starlin_l2.starlin_l2
 api-version: 1.18