v1.1: sort notes by id & add announceOnJoin

Author: Declyn

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>dev.declyn</groupId>
     <artifactId>PlayerNotes</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

src/main/java/dev/declyn/playernotes/PlayerNotesPlugin.java

@@ -4,17 +4,14 @@
 import dev.declyn.playernotes.datastore.UserDataStore;
 import dev.declyn.playernotes.datastore.impl.MongoDataStore;
 import dev.declyn.playernotes.datastore.impl.SQLDataStore;
-import dev.declyn.playernotes.user.User;
-import me.lucko.helper.Events;
+import dev.declyn.playernotes.user.UserListener;
 import me.lucko.helper.plugin.ExtendedJavaPlugin;
 import me.lucko.helper.plugin.ap.Plugin;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerLoginEvent;
 import revxrsal.commands.bukkit.BukkitCommandHandler;
 
 import java.util.Objects;
 
-@Plugin(name = "PlayerNotes", version = "1.0", authors = "Declyn")
+@Plugin(name = "PlayerNotes", version = "1.1", authors = "Declyn")
 public class PlayerNotesPlugin extends ExtendedJavaPlugin {
 
     private UserDataStore userDataStore;
@@ -30,30 +27,13 @@ protected void enable() {
             default -> throw new IllegalStateException("Data store not recognized, implemented data stores: 'flatfile', 'sql' or 'mongo'");
         };
 
-        Events.subscribe(PlayerLoginEvent.class).handler(event -> {
-            var player = event.getPlayer();
-
-            userDataStore.getUser(player.getUniqueId()).thenAccept(user -> {
-                if (user != null) {
-                    if (!user.getUsername().equals(player.getName())) {
-                        user.setUsername(player.getName());
-                        userDataStore.save(user);
-                    }
-                    return;
-                }
-
-                user = new User(player.getUniqueId(), player.getName());
-                userDataStore.save(user);
-            });
-        });
+        new UserListener(this);
 
         var commandHandler = BukkitCommandHandler.create(this);
 
         commandHandler.registerDependency(PlayerNotesPlugin.class, this);
         commandHandler.registerDependency(UserDataStore.class, userDataStore);
 
-        commandHandler.getAutoCompleter().registerSuggestion("username", (list, commandActor, executableCommand) -> getServer().getOnlinePlayers().stream().map(Player::getName).toList());
-
         commandHandler.register(new NoteCommands());
     }
 

src/main/java/dev/declyn/playernotes/commands/NoteCommands.java

@@ -10,6 +10,8 @@
 import revxrsal.commands.bukkit.BukkitCommandActor;
 import revxrsal.commands.bukkit.annotation.CommandPermission;
 
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.UUID;
 
@@ -76,7 +78,10 @@ public void view(BukkitCommandActor actor, String username, @Optional Integer id
                     authorNames.put(note.getAuthor(), userDataStore.getUser(note.getAuthor()).join().getUsername());
                 }
 
-                user.getNotes().forEach(note -> displayNote(actor, note, authorNames.get(note.getAuthor())));
+                var notes = new ArrayList<>(user.getNotes());
+                notes.sort(Comparator.comparingInt(Note::getId));
+
+                notes.forEach(note -> displayNote(actor, note, authorNames.get(note.getAuthor())));
             });
         });
     }

src/main/java/dev/declyn/playernotes/user/UserListener.java

@@ -0,0 +1,51 @@
+package dev.declyn.playernotes.user;
+
+import dev.declyn.playernotes.PlayerNotesPlugin;
+import me.lucko.helper.Events;
+import me.lucko.helper.Schedulers;
+import me.lucko.helper.utils.Players;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+
+public class UserListener {
+
+    private final PlayerNotesPlugin plugin;
+
+    public UserListener(PlayerNotesPlugin plugin) {
+        this.plugin = plugin;
+
+        Events.subscribe(PlayerLoginEvent.class).handler(event -> {
+            var player = event.getPlayer();
+
+            plugin.getUserDataStore().getUser(player.getUniqueId()).thenAccept(user -> {
+                if (user != null) {
+                    if (!user.getUsername().equals(player.getName())) {
+                        user.setUsername(player.getName());
+                        plugin.getUserDataStore().save(user);
+                    }
+                    return;
+                }
+
+                user = new User(player.getUniqueId(), player.getName());
+                plugin.getUserDataStore().save(user);
+            });
+        });
+
+        if (plugin.getConfig().getBoolean("announceNotesOnJoin")) {
+            Events.subscribe(PlayerJoinEvent.class).handler(event -> plugin.getUserDataStore().getUser(event.getPlayer().getUniqueId()).thenAccept(user -> {
+                if (user == null || user.getNotes().isEmpty()) {
+                    return;
+                }
+
+                Players.forEach(player -> {
+                    if (!player.hasPermission("notes.view")) {
+                        return;
+                    }
+
+                    Schedulers.sync().run(() -> player.chat("/notes view " + player.getName()));
+                });
+            }));
+        }
+    }
+
+}

src/main/resources/config.yml

@@ -38,4 +38,6 @@ command:
   remove: "&eRemoved note %id% from %player%."
   empty: "&c%player% does not have any notes to display."
   noteNotFound: "&cNo note with id %id% found."
-  userNotFound: "&cNo user with username %player% found."
+  userNotFound: "&cNo user with username %player% found."
+
+announceNotesOnJoin: false