Merge pull request #56 from ParallelMC/staging

Staging

Author: UnknownSilicon

api/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 group = 'org.parallelmc'
 
-version = '3.5.0'
+version = '3.5.1'
 description = 'A set of utilities and features for use on the Parallel Minecraft server'
 
 java {
@@ -214,6 +214,10 @@ bukkit {
             description = 'Reloads all emojis'
             usage = '/reloademojis'
         }
+        emojis {
+            description = 'Lists all emojis'
+            usage = '/emojis'
+        }
         banword {
             description = 'Adds a word to the banned words list'
             usage = '/banword (word)'

api/src/main/java/parallelmc/parallelutils/Constants.java

@@ -2,7 +2,7 @@
 
 public class Constants {
 
-	public static final Version VERSION = new Version(3, 5, 0);
+	public static final Version VERSION = new Version(3, 5, 1);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world2";
 }

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/ParallelChat.java

@@ -255,6 +255,7 @@ UUID        varchar(36) not null,
         puPlugin.getCommand("formats").setExecutor(new ParallelFormats());
         puPlugin.getCommand("dnd").setExecutor(new ParallelDoNotDisturb());
         puPlugin.getCommand("reloademojis").setExecutor(new ParallelReloadEmojis());
+        puPlugin.getCommand("emojis").setExecutor(new ParallelEmojis());
         puPlugin.getCommand("banword").setExecutor(new ParallelBanWord());
         puPlugin.getCommand("allowword").setExecutor(new ParallelAllowWord());
 

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/commands/ParallelEmojis.java

@@ -0,0 +1,28 @@
+package parallelmc.parallelutils.modules.parallelchat.commands;
+
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import parallelmc.parallelutils.modules.parallelchat.ParallelChat;
+import parallelmc.parallelutils.modules.parallelchat.emojis.Emoji;
+
+public class ParallelEmojis implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String label, String[] args) {
+        if (commandSender instanceof Player player) {
+            StringBuilder sb = new StringBuilder("<red>=========================<white>\n");
+            // TODO: allow clicking on the emoji to insert it into a message
+            for (Emoji e : ParallelChat.get().emojiManager.getEmojis().values()) {
+                sb.append(e.id());
+                sb.append('\n');
+            }
+            sb.append("\n<gray>Type an emoji ID in a message to turn it into an emoji!\n");
+            sb.append("<red>=========================");
+            player.sendMessage(MiniMessage.miniMessage().deserialize(sb.toString()));
+        }
+        return true;
+    }
+}

modules/src/main/java/parallelmc/parallelutils/modules/parallelitems

@@ -156,14 +156,11 @@ private void uploadLeaderboardCache() {
         try (Connection dbConn = puPlugin.getDbConn()) {
             if (dbConn == null) throw new SQLException("Unable to establish connection!");
             PreparedStatement statement = dbConn.prepareStatement("""
-                    IF EXISTS (SELECT 1 FROM Leaderboard WHERE UUID = ? AND Course = ?)
-                        BEGIN
-                            UPDATE Leaderboard SET Time = ? WHERE UUID = ? AND Course = ?
-                        END
+                    IF EXISTS (SELECT 1 FROM Leaderboard WHERE UUID = ? AND Course = ?) THEN
+                        UPDATE Leaderboard SET Time = ? WHERE UUID = ? AND Course = ?;
                     ELSE
-                        BEGIN
-                            INSERT INTO Leaderboard (UUID, Course, Time) VALUES (?, ?, ?)
-                        END""");
+                        INSERT INTO Leaderboard (UUID, Course, Time) VALUES (?, ?, ?);
+                    END IF;""");
             statement.setQueryTimeout(60);
             leaderboardCache.forEach((u, v) -> {
                 v.forEach((t) -> {
@@ -199,12 +196,17 @@ public List<ParkourTime> getTopTimesFor(String course, int amount) {
             return new ArrayList<>();
         }
         // thanks chatgpt
-        return leaderboardCache.values().stream()
+        // jk fuck you chatgpt
+        List<ParkourTime> filter = leaderboardCache.values().stream()
                 .flatMap(List::stream)
                 .filter(x -> x.course().equals(course))
                 .sorted(Comparator.comparingLong(ParkourTime::time))
-                .toList()
-                .subList(0, Math.min(amount, leaderboardCache.size()));
+                .toList();
+
+        if (filter.size() == 0)
+            return new ArrayList<>();
+
+        return filter.subList(0, Math.min(amount, leaderboardCache.size()));
     }
 
     public long getBestTimeFor(Player player, ParkourLayout layout) {

modules/src/main/java/parallelmc/parallelutils/modules/parallelparkour/ParallelParkour.java

@@ -26,7 +26,8 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
             if (args.length == 0)
                 return false;
             if (!ParallelParkour.get().parkourNameExists(args[0])) {
-                ParallelChat.sendParallelMessageTo(player, "A parkour with the name " + args[0] + " does not exist!");
+                ParallelChat.sendParallelMessageTo(player, "A course with the name " + args[0] + " does not exist!");
+                return true;
             }
             List<ParkourTime> times = ParallelParkour.get().getTopTimesFor(args[0], 10);
             ParallelChat.sendParallelMessageTo(player, MiniMessage.miniMessage().deserialize("<gold>Speedrun Leaderboard for: <yellow>" + args[0]));