Hotfix and change Tablist Header

.gitea/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Create Pre Release
         run: |
           FILES=./target/d7serverlite*.jar
-          USER=D7MC
+          USER=LagacySurvival
           REPO=D7ServerLite
           # Set up variables
           AUTH_HEADER="Authorization: token ${{ secrets.TOKEN }}"

src/main/java/de/npid7/serverlite/Commands/PlaytimeCommand.java

@@ -1,5 +1,6 @@
 package de.npid7.serverlite.Commands;
 
+import de.npid7.serverlite.Helpers.Spielzeit;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
@@ -9,41 +10,47 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import de.npid7.serverlite.Helpers.Spielzeit;
-
 public class PlaytimeCommand implements CommandExecutor {
-    private void makeMessage(OfflinePlayer pl, Player exec) {
-        if (pl == null) {
-            return;
-        }
-        exec.sendMessage("- " + ChatColor.GOLD.toString() + "PLAYTIME: ");
-        exec.sendMessage("- " + ChatColor.GRAY.toString() + "Player: " + ChatColor.WHITE.toString() + pl.getName());
-        // exec.sendMessage("- First Join: ");
-        exec.sendMessage("- " + ChatColor.GRAY.toString() + "Spielzeit: " + ChatColor.GREEN.toString()
-                + Spielzeit.getHours(pl.getStatistic(Statistic.TOTAL_WORLD_TIME)));
-        exec.sendMessage(
-                "- " + ChatColor.GRAY.toString() + "Detailierte Spielzeit: " + ChatColor.GREEN.toString()
-                        + Spielzeit.formatTicks(pl.getStatistic(Statistic.TOTAL_WORLD_TIME)));
-        exec.sendMessage("- " + ChatColor.GRAY.toString() + "Du hast den Server " + ChatColor.GREEN.toString()
-                + (pl.getStatistic(Statistic.LEAVE_GAME) + 1) + ChatColor.GRAY.toString() + " mal betreten.");
+  private void makeMessage(OfflinePlayer pl, Player exec) {
+    if (pl == null) {
+      return;
     }
+    exec.sendMessage("- " + ChatColor.GOLD.toString() + "PlayTime: ");
+    exec.sendMessage(
+        "- " + ChatColor.GRAY.toString() + "Player: " + ChatColor.WHITE.toString() + pl.getName());
+    // exec.sendMessage("- First Join: ");
+    int playtime = Spielzeit.getHours(pl.getStatistic(Statistic.TOTAL_WORLD_TIME));
+    String str = " Stunden";
+    if (playtime == 1) {
+      str = " Stunde";
+    }
+    exec.sendMessage("- " + ChatColor.GRAY.toString() + "Spielzeit: " + ChatColor.GREEN.toString()
+        + playtime + str);
+    exec.sendMessage("- " + ChatColor.GRAY.toString()
+        + "Detailierte Spielzeit: " + ChatColor.GREEN.toString()
+        + Spielzeit.formatTicks(pl.getStatistic(Statistic.TOTAL_WORLD_TIME)));
+    exec.sendMessage("- " + ChatColor.GRAY.toString() + "Server " + ChatColor.GREEN.toString()
+        + (pl.getStatistic(Statistic.LEAVE_GAME) + 1) + ChatColor.GRAY.toString()
+        + " mal betreten.");
+  }
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) {
-        if (strings.length != 0) {
-            if (!sender.hasPermission("d7.d7")) {
-                sender.sendMessage(ChatColor.RED.toString() + "Nur Admins dürfen /plytime auf spieler anwenden");
-                return false;
-            }
-            OfflinePlayer pl = Bukkit.getOfflinePlayer(strings[0]);
-            if (pl == null) {
-                sender.sendMessage(ChatColor.RED.toString() + "Der Spieler existiert nicht!");
-                return false;
-            }
-            makeMessage(pl, (Player) sender);
-        } else {
-            makeMessage(Bukkit.getOfflinePlayer(((Player) sender).getUniqueId()), (Player) sender);
-        }
+  @Override
+  public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) {
+    if (strings.length != 0) {
+      if (!sender.hasPermission("d7.d7")) {
+        sender.sendMessage(
+            ChatColor.RED.toString() + "Nur Admins dürfen /plytime auf spieler anwenden");
         return false;
+      }
+      OfflinePlayer pl = Bukkit.getOfflinePlayer(strings[0]);
+      if (pl == null) {
+        sender.sendMessage(ChatColor.RED.toString() + "Der Spieler existiert nicht!");
+        return false;
+      }
+      makeMessage(pl, (Player) sender);
+    } else {
+      makeMessage(Bukkit.getOfflinePlayer(((Player) sender).getUniqueId()), (Player) sender);
     }
+    return false;
+  }
 }

src/main/java/de/npid7/serverlite/D7ServerLite.java

@@ -6,7 +6,7 @@ import de.npid7.serverlite.Commands.StatusCommand;
 import de.npid7.serverlite.Commands.TimerCommand;
 import de.npid7.serverlite.Configs.PlayerConfig;
 import de.npid7.serverlite.Configs.PluginConfig;
-import de.npid7.serverlite.Listeners.JoinListener;
+import de.npid7.serverlite.Listeners.PlayerListener;
 import de.npid7.serverlite.TabCompleters.D7Completer;
 import de.npid7.serverlite.TabCompleters.PlaytimeCompleter;
 import de.npid7.serverlite.TabCompleters.StatusCompleter;
@@ -53,12 +53,12 @@ public class D7ServerLite extends JavaPlugin {
     getCommand("d7").setExecutor(new D7Command());
     getCommand("d7").setTabCompleter(new D7Completer());
     getCommand("timer").setExecutor(new TimerCommand());
-    getCommand("trimer").setTabCompleter(new TimerCompleter());
+    getCommand("timer").setTabCompleter(new TimerCompleter());
     getCommand("playtime").setExecutor(new PlaytimeCommand());
     getCommand("playtime").setTabCompleter(new PlaytimeCompleter());
 
-    // Register onJoin Event to generate PlayerConfigEntry
-    Bukkit.getPluginManager().registerEvents(new JoinListener(), this);
+    // Register onJoin Event to generate PlayerConfigEntry and customize chat message
+    Bukkit.getPluginManager().registerEvents(new PlayerListener(), this);
   }
 
   /**

src/main/java/de/npid7/serverlite/Helpers/Wordlist.java

@@ -2,8 +2,6 @@ package de.npid7.serverlite.Helpers;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.util.Map;
 import java.util.Vector;
 
 public class Wordlist {

src/main/java/de/npid7/serverlite/Listeners/JoinListener.java

@@ -1,21 +0,0 @@
-package de.npid7.serverlite.Listeners;
-
-import de.npid7.serverlite.Configs.PlayerConfig;
-import de.npid7.serverlite.D7ServerLite;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-public class JoinListener implements Listener {
-  @EventHandler
-  public void onJoin(PlayerJoinEvent event) {
-    Player player = event.getPlayer();
-    if (D7ServerLite.getInst().getPlayerConfig().Find(player.getUniqueId()) == null) {
-      D7ServerLite.getInst().getPlayerConfig().Add(player.getUniqueId(),
-          new PlayerConfig.PlayerEntry(
-              D7ServerLite.getInst().getPluginConfig().getDefaultStatus(), player.getName(), false));
-      D7ServerLite.getInst().getPlayerConfig().Save();
-    }
-  }
-}

src/main/java/de/npid7/serverlite/Listeners/PlayerListener.java

@@ -0,0 +1,41 @@
+package de.npid7.serverlite.Listeners;
+
+import de.npid7.serverlite.Configs.PlayerConfig;
+import de.npid7.serverlite.D7ServerLite;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+public class PlayerListener implements Listener {
+  @EventHandler
+  public void onPlayerMessage(AsyncPlayerChatEvent e) {
+    String msg = e.getMessage();
+    String prefix = "";
+    String status = D7ServerLite.getInst().getPlayerConfig().getStatus(e.getPlayer().getUniqueId());
+    String statusColor = "";
+    if (!status.equals("")) {
+      statusColor = D7ServerLite.getInst().getPluginConfig().getStatusColor(status);
+      if (statusColor == null) {
+        statusColor = ChatColor.WHITE.toString();
+      }
+      prefix = "[" + statusColor + status + ChatColor.WHITE.toString() + "] ";
+    }
+    prefix += "<" + e.getPlayer().getDisplayName() + "> ";
+    e.setFormat(prefix + msg);
+  }
+
+  @EventHandler
+  public void onJoin(PlayerJoinEvent event) {
+    Player player = event.getPlayer();
+    if (D7ServerLite.getInst().getPlayerConfig().Find(player.getUniqueId()) == null) {
+      D7ServerLite.getInst().getPlayerConfig().Add(player.getUniqueId(),
+          new PlayerConfig.PlayerEntry(
+              D7ServerLite.getInst().getPluginConfig().getDefaultStatus(), player.getName(), false));
+      D7ServerLite.getInst().getPlayerConfig().Save();
+    }
+  }
+}

src/main/java/de/npid7/serverlite/Tasks/TablistTask.java

@@ -2,8 +2,10 @@ package de.npid7.serverlite.Tasks;
 
 import de.npid7.serverlite.D7ServerLite;
 import de.npid7.serverlite.Helpers.Spielzeit;
-import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Statistic;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -46,12 +48,18 @@ public class TablistTask {
       if (playtime == 1) {
         str = " Stunde";
       }
+      String tpsclr = ChatColor.GREEN.toString();
+      if (tps < 18.0 && tps > 15.0) {
+        tpsclr = ChatColor.GOLD.toString();
+      } else if (tps <= 15 || tps > 20) {
+        tpsclr = ChatColor.RED.toString();
+      }
       pl.setPlayerListHeader(
-          "\n§x§5§5§5§5§5§5§lѕ§x§5§B§5§B§5§B§lᴜ§x§6§1§6§1§6§1§lʀ§x§6§7§6§7§6§7§lᴠ§x§6§D§6§D§6§D§lɪ§x§7§3§7§3§7§3§lᴠ§x§7§9§7§9§7§9§lᴀ§x§8§0§8§0§8§0§lʟ§x§8§6§8§6§8§6§lᴘ§x§8§C§8§C§8§C§lʀ§x§9§2§9§2§9§2§lᴏ§x§9§8§9§8§9§8§lᴊ§x§9§E§9§E§9§E§lᴇ§x§A§4§A§4§A§4§lᴋ§x§A§A§A§A§A§A§lᴛ\n"
+          "\n§x§B§1§9§1§6§9§lʟ§x§A§D§8§E§6§8§lᴇ§x§A§A§8§C§6§7§lɢ§x§A§6§8§9§6§6§lᴀ§x§A§2§8§7§6§5§lᴄ§x§9§F§8§4§6§4§lʏ §x§9§8§7§F§6§2§lѕ§x§9§4§7§C§6§0§lᴜ§x§9§0§7§A§5§F§lʀ§x§8§D§7§7§5§E§lᴠ§x§8§9§7§5§5§D§lɪ§x§8§5§7§2§5§C§lᴠ§x§8§2§7§0§5§B§lᴀ§x§7§E§6§D§5§A§lʟ\n"
           + "\n" + ChatColor.GRAY.toString() + "ᴅᴇɪɴ ᴘɪɴɢ" + ChatColor.DARK_GRAY.toString() + ": "
           + ChatColor.GREEN.toString() + pl.getPing() + "   " + ChatColor.GRAY.toString()
           + "ѕᴇʀᴠᴇʀ ᴛᴘѕ" + ChatColor.DARK_GRAY.toString() + ": " + ChatColor.GREEN.toString()
-          + String.format("%.1f", tps) + "\n\n" + ChatColor.GRAY.toString() + "ѕᴘɪᴇʟᴢᴇɪᴛ"
+          + tpsclr + String.format("%.1f", tps) + "\n\n" + ChatColor.GRAY.toString() + "ѕᴘɪᴇʟᴢᴇɪᴛ"
           + ChatColor.DARK_GRAY.toString() + ": " + ChatColor.GREEN.toString() + playtime + str
           + "\n");
       pl.setPlayerListFooter("\n");
@@ -71,6 +79,11 @@ public class TablistTask {
       body += ChatColor.WHITE.toString() + pl.getDisplayName();
       body += " " + ChatColor.RED.toString() + pl.getStatistic(Statistic.DEATHS);
       pl.setPlayerListName(body);
+      if (D7ServerLite.getInst().getPlayerConfig().getTimer(pl.getUniqueId())) {
+        pl.spigot().sendMessage(ChatMessageType.ACTION_BAR,
+            new TextComponent(ChatColor.GOLD.toString()
+                + Spielzeit.formatTicks(pl.getStatistic(Statistic.TOTAL_WORLD_TIME))));
+      }
     }
   }