Additions & Fixes

Added night/day cycle in Discord bot RPC, fixed 'null' player in Discord /deaths, added players total playtime in Discord /deaths

Author: Urpagin

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'net.urpagin'
-version = '1.2.0'
+version = '1.2.1'
 
 var jdaVersion = "5.0.0-beta.24"
 

src/main/java/net/urpagin/discordlink/DiscordInterface.java

@@ -9,6 +9,7 @@
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.urpagin.discordlink.discord.listeners.DiscordCommandListener;
 import net.urpagin.discordlink.discord.listeners.DiscordMessageListener;
+import net.urpagin.discordlink.minecraft.listeners.TimeWatcher;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -55,17 +56,26 @@ public void initializeBot() {
     }
 
     public static void updateActivityPlaying() {
-        Server server = Bukkit.getServer(); // Get server instance
         Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> {
-            int onlinePlayers = server.getOnlinePlayers().size();
-            int maxPlayers = server.getMaxPlayers();
-            String plural = (onlinePlayers > 1) ? "players" : "player";
-            String activityMessage = String.format("\uD83C\uDF1F %d/%d %s online!", onlinePlayers, maxPlayers, plural);
+            String activityMessage = getActivityMessage();
             api.getPresence().setActivity(Activity.customStatus(activityMessage));
         }, 20L); // Delay the task by 20 ticks (1 second)
         // When a player quits it's not registered when no waiting is done.
     }
 
+    private static String getActivityMessage() {
+        Server server = Bukkit.getServer(); // Get server instance
+
+        int onlinePlayers = server.getOnlinePlayers().size();
+        int maxPlayers = server.getMaxPlayers();
+        boolean isDay = TimeWatcher.isDay();
+
+        String timeEmoji = (isDay) ? "☀\uFE0F" : "\uD83C\uDF19"; // Either sun or crescent moon emoji.
+        String playerPlural = (onlinePlayers > 1) ? "players" : "player";
+        return String.format("%s %d/%d %s online!", timeEmoji, onlinePlayers, maxPlayers, playerPlural);
+    }
+
+
     public boolean sendMessageToChannel(String content) {
         if (content.length() > DISCORD_MAX_MESSAGE_LENGTH) return false;
         content = content.strip();

src/main/java/net/urpagin/discordlink/DiscordLink.java

@@ -28,6 +28,7 @@ public void onEnable() {
         getServer().getPluginManager().registerEvents(new MinecraftPlayerQuitListener(), this);
         getServer().getPluginManager().registerEvents(new MinecraftPlayerDeathListener(), this);
         getServer().getPluginManager().registerEvents(new MinecraftPlayerConnectionTracker(), this);
+        new TimeWatcher(this.getServer().getWorlds().getFirst()).runTaskTimer(this, 0L, 80L); // Every 4 seconds
 
         discord = new DiscordInterface(this, ReadConfig.getBotToken(), ReadConfig.getDiscordChannelId());
 

src/main/java/net/urpagin/discordlink/discord/listeners/DiscordCommandListener.java

@@ -113,48 +113,68 @@ private String getDeathsString() {
         Map<String, UUID> allPlayerNames = new HashMap<>();
 
         // Add offline players name & UUID to the set!
-        for (OfflinePlayer p : Bukkit.getServer().getOfflinePlayers())
+        for (OfflinePlayer p : Bukkit.getServer().getOfflinePlayers()) {
+            if (!p.hasPlayedBefore() || p.getName() == null)
+                continue;
             allPlayerNames.put(p.getName(), p.getUniqueId());
+        }
         // Add online players name & UUID to the set!
-        for (Player p : Bukkit.getServer().getOnlinePlayers())
+        for (Player p : Bukkit.getServer().getOnlinePlayers()) {
             allPlayerNames.put(p.getName(), p.getUniqueId());
+        }
 
         if (allPlayerNames.isEmpty()) {
             return String.format("%s No one died! Yet... %s", SMILE_EMOJI, WICKED_IMP_EMOJI);
         }
 
         // Map of username to death count
-        Map<String, Integer> playersDeathCount = new HashMap<>();
+        Map<UUID, Integer> playersDeathCount = new HashMap<>();
         for (Map.Entry<String, UUID> entry : allPlayerNames.entrySet()) {
-            String playerName = entry.getKey();
             UUID playerId = entry.getValue();
             OfflinePlayer p = Bukkit.getOfflinePlayer(playerId);
-            playersDeathCount.put(playerName, p.getStatistic(Statistic.DEATHS));
+            playersDeathCount.put(playerId, p.getStatistic(Statistic.DEATHS));
         }
 
         // Sorting death count by descending order
-        Map<String, Integer> sortedByDeathCount = playersDeathCount.entrySet().stream()
+        Map<UUID, Integer> sortedByDeathCount = playersDeathCount.entrySet().stream()
                 .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
                 .collect(Collectors.toMap(
                         Map.Entry::getKey,
                         Map.Entry::getValue,
                         (oldValue, newValue) -> oldValue,
                         LinkedHashMap::new));
 
+
         StringBuilder response = new StringBuilder();
         response.append(String.format("## %s Deaths Leaderboard %s\n", SKULL_EMOJI, SKULL_EMOJI));
         String firstPlaceEmoji = String.format(" %s%s%s", CROSSBONES_EMOJI, CROSSBONES_EMOJI, CROSSBONES_EMOJI);
-        for (Map.Entry<String, Integer> entry : sortedByDeathCount.entrySet()) {
-            String playerName = entry.getKey();
+        for (Map.Entry<UUID, Integer> entry : sortedByDeathCount.entrySet()) {
+            OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(entry.getKey());
+            String playerName = offlinePlayer.getName();
             int deathCount = entry.getValue();
             String plural = (deathCount > 1) ? "times" : "time";
-            response.append("- ").append(playerName).append(" died **").append(deathCount).append("** ").append(plural).append(firstPlaceEmoji).append("\n");
+            String totalHoursPlayed = getHoursFromTicks(offlinePlayer.getStatistic(Statistic.PLAY_ONE_MINUTE)) + "h";
+            response.append("- ")
+                    .append(playerName)
+                    .append(" died **")
+                    .append(deathCount)
+                    .append("** ")
+                    .append(plural)
+                    .append(firstPlaceEmoji)
+                    .append(" (")
+                    .append(totalHoursPlayed)
+                    .append(")\n");
             firstPlaceEmoji = "";
         }
 
         return response.toString();
     }
 
+    private long getHoursFromTicks(int ticks) {
+        return ticks / 20 / 60 / 60; // Because 20 ticks is 1 second.
+    }
+
+
     private void handleBecomeAGod(SlashCommandInteractionEvent event) {
         String response = String.format("%s%s%s%s blud be trippin frfr %s%s%s", MAN_SPEAKING_EMOJI, MAN_SPEAKING_EMOJI, FIRE_EMOJI, FIRE_EMOJI, SKULL_EMOJI, SKULL_EMOJI, SKULL_EMOJI);
         replyToEvent(event, response);

src/main/java/net/urpagin/discordlink/minecraft/listeners/MinecraftChatListener.java

@@ -60,7 +60,7 @@ public void onChat(AsyncPlayerChatEvent event) {
         // ---- now process chat message ----
 
         String playerHealthString = getPlayerHealthString(event.getPlayer());
-        String discordMessage = "";
+        String discordMessage;
 
         if (playerHealthString.isEmpty()) {
             discordMessage = String.format("**<%s>** %s", playerName, message);

src/main/java/net/urpagin/discordlink/minecraft/listeners/TimeWatcher.java

@@ -0,0 +1,34 @@
+package net.urpagin.discordlink.minecraft.listeners;
+
+import net.urpagin.discordlink.DiscordInterface;
+import org.bukkit.World;
+import org.bukkit.scheduler.BukkitRunnable;
+
+public class TimeWatcher extends BukkitRunnable {
+    private static World world;
+    private boolean wasDay;
+
+    public TimeWatcher(World world) {
+        TimeWatcher.world = world;
+        this.wasDay = isDaytime(world.getTime());
+    }
+
+    private static boolean isDaytime(long time) {
+        return time >= 0 && time < 12300;
+    }
+
+    public static boolean isDay() {
+        return isDaytime(world.getTime());
+    }
+
+    @Override
+    public void run() {
+        boolean isDay = isDaytime(world.getTime());
+
+        if (isDay == wasDay)
+            return;
+        wasDay = isDay;
+
+        DiscordInterface.updateActivityPlaying();
+    }
+}