Merge pull request #62 from ParallelMC/staging

Staging

Author: UnknownSilicon

api/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 group = 'org.parallelmc'
 
-version = '4.1.0'
+version = '4.1.1'
 description = 'A set of utilities and features for use on the Parallel Minecraft server'
 
 java {
@@ -28,7 +28,7 @@ dependencies {
     compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.8'
     implementation 'mysql:mysql-connector-java:8.0.33'
     compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0'
-    compileOnly 'dev.esophose:playerparticles:8.2'
+    compileOnly 'dev.esophose:playerparticles:8.4'
     implementation 'org.reflections:reflections:0.10.2'
 }
 

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

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

build.gradle

@@ -43,6 +43,6 @@ allprojects {
 
         compileOnly "io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT"
         compileOnly 'net.luckperms:api:5.4'
-        compileOnly 'dev.esophose:playerparticles:8.2'
+        compileOnly 'dev.esophose:playerparticles:8.4'
     }
 }

modules/build.gradle

@@ -25,7 +25,7 @@ dependencies {
     compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.8'
     compileOnly 'mysql:mysql-connector-java:8.0.33'
     compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0'
-    compileOnly 'dev.esophose:playerparticles:8.2'
+    compileOnly 'dev.esophose:playerparticles:8.4'
 }
 
 def names = []

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/gui/JoinLeaveSelectInventory.java

@@ -17,10 +17,7 @@
 import parallelmc.parallelutils.modules.parallelchat.messages.JoinLeaveMessage;
 import parallelmc.parallelutils.util.GUIInventory;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Level;
 
 public class JoinLeaveSelectInventory extends GUIInventory {
@@ -69,7 +66,8 @@ public void onOpen(Player player) {
             selected = ParallelChat.get().customMessageManager.getJoinMessageNameForPlayer(player);
         else
             selected = ParallelChat.get().customMessageManager.getLeaveMessageNameForPlayer(player);
-        for (Map.Entry<String, JoinLeaveMessage> m : messages.entrySet().stream().filter(x -> x.getValue().event().equalsIgnoreCase(EVENT)).toList()) {
+        for (Map.Entry<String, JoinLeaveMessage> m :
+                messages.entrySet().stream().filter(x -> x.getValue().event().equalsIgnoreCase(EVENT)).sorted(new RankComparator()).toList()) {
             ItemStack item = new ItemStack(Material.PAPER);
             ItemMeta meta = item.getItemMeta();
             JoinLeaveMessage msg = m.getValue();

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/gui/RankComparator.java

@@ -0,0 +1,36 @@
+package parallelmc.parallelutils.modules.parallelchat.gui;
+
+import parallelmc.parallelutils.modules.parallelchat.messages.JoinLeaveMessage;
+
+import java.util.Comparator;
+import java.util.Map;
+
+/***
+ * Helper class for sorting the items by rank in the JoinLeaveSelectInventory
+ */
+public class RankComparator implements Comparator<Map.Entry<String, JoinLeaveMessage>> {
+    @Override
+    public int compare(Map.Entry<String, JoinLeaveMessage> entry1, Map.Entry<String, JoinLeaveMessage> entry2) {
+        return Integer.compare(rankValue(entry1), rankValue(entry2));
+    }
+
+    private int rankValue(Map.Entry<String, JoinLeaveMessage> entry) {
+        return switch (entry.getValue().requiredRank().toLowerCase()) {
+            case "recruit" -> 1;
+            case "cadet" -> 2;
+            case "researcher" -> 3;
+            case "adventurer" -> 4;
+            case "voyager" -> 5;
+            case "rift_master" -> 6;
+            case "bronze" -> 7;
+            case "silver" -> 8;
+            case "gold" -> 9;
+            case "diamond" -> 10;
+            case "team" -> 11;
+            case "mod" -> 12;
+            case "admin" -> 13;
+            case "owner" -> 14;
+            default -> Integer.MAX_VALUE;
+        };
+    }
+}