Use more newer java apis

AlexProgrammerDE · Dec 19, 2024 · 0a0af90 · 0a0af90
1 parent c03ccc5
commit 0a0af90
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/shared/src/main/java/net/pistonmaster/pistonqueue/shared/plugin/PistonQueuePlugin.java b/shared/src/main/java/net/pistonmaster/pistonqueue/shared/plugin/PistonQueuePlugin.java
@@ -188,13 +188,13 @@ default String replacePosition(String text, int position, QueueType type) {
     default void initializeReservationSlots() {
         schedule(() -> {
             Optional<ServerInfoWrapper> targetServer = getServer(Config.TARGET_SERVER);
-            if (!targetServer.isPresent())
+            if (targetServer.isEmpty())
                 return;
 
             Map<QueueType, AtomicInteger> map = new HashMap<>();
 
             for (PlayerWrapper player : targetServer.get().getConnectedPlayers()) {
-                QueueType playerType = QueueType.getQueueType(player::hasPermission);
+                QueueType playerType = QueueType.getQueueType(player);
 
                 map.compute(playerType, (queueType, integer) -> {
                     if (integer == null) {

diff --git a/shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/QueueListenerShared.java b/shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/QueueListenerShared.java
@@ -35,7 +35,6 @@
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
 public abstract class QueueListenerShared {
@@ -72,7 +71,7 @@ protected void onKick(PQKickedFromServerEvent event) {
 
                         event.getPlayer().sendMessage(Config.IF_TARGET_DOWN_SEND_TO_QUEUE_MESSAGE);
 
-                        QueueType.getQueueType(event.getPlayer()::hasPermission)
+                        QueueType.getQueueType(event.getPlayer())
                                 .getQueueMap()
                                 .put(event.getPlayer().getUniqueId(), event.getKickedFrom());
                     });
@@ -103,7 +102,7 @@ protected void onPreConnect(PQServerPreConnectEvent event) {
             }
         }
 
-        QueueType type = QueueType.getQueueType(player::hasPermission);
+        QueueType type = QueueType.getQueueType(player);
 
         boolean serverFull = false;
         if (Config.ALWAYS_QUEUE || (serverFull = isServerFull(type))) {
@@ -130,7 +129,7 @@ private void putQueue(PlayerWrapper player, QueueType type, PQServerPreConnectEv
         Map<UUID, String> queueMap = type.getQueueMap();
 
         // Store the data concerning the player's original destination
-        if (Config.FORCE_TARGET_SERVER || !originalTarget.isPresent()) {
+        if (Config.FORCE_TARGET_SERVER || originalTarget.isEmpty()) {
             queueMap.put(player.getUniqueId(), Config.TARGET_SERVER);
         } else {
             queueMap.put(player.getUniqueId(), originalTarget.get());
@@ -165,7 +164,7 @@ public void moveQueue() {
                 Optional<PlayerWrapper> player = plugin.getPlayer(entry.getKey());
 
                 Optional<String> optionalTarget = player.flatMap(PlayerWrapper::getCurrentServer);
-                if (!optionalTarget.isPresent() || !optionalTarget.get().equals(Config.QUEUE_SERVER)) {
+                if (optionalTarget.isEmpty() || !optionalTarget.get().equals(Config.QUEUE_SERVER)) {
                     type.getQueueMap().remove(entry.getKey());
                 }
             }
@@ -183,7 +182,7 @@ public void moveQueue() {
     }
 
     private void doRecovery(PlayerWrapper player) {
-        QueueType type = QueueType.getQueueType(player::hasPermission);
+        QueueType type = QueueType.getQueueType(player);
 
         Optional<String> currentServer = player.getCurrentServer();
         if (!type.getQueueMap().containsKey(player.getUniqueId()) && currentServer.isPresent() && currentServer.get().equals(Config.QUEUE_SERVER)) {
@@ -205,7 +204,7 @@ private void connectPlayer(QueueType type) {
 
         for (Map.Entry<UUID, String> entry : new LinkedHashMap<>(type.getQueueMap()).entrySet()) {
             Optional<PlayerWrapper> optional = plugin.getPlayer(entry.getKey());
-            if (!optional.isPresent()) {
+            if (optional.isEmpty()) {
                 continue;
             }
             PlayerWrapper player = optional.get();
@@ -252,7 +251,7 @@ private void sendXPSoundToQueueType(QueueType type) {
         List<UUID> uuids = type.getQueueMap().keySet()
                 .stream()
                 .limit(5)
-                .collect(Collectors.toList());
+                .toList();
 
         out.writeInt(uuids.size());
         uuids.forEach(id -> out.writeUTF(id.toString()));

diff --git a/shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/QueueType.java b/shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/QueueType.java
@@ -23,13 +23,13 @@
 import lombok.Getter;
 import lombok.Setter;
 import net.pistonmaster.pistonqueue.shared.config.Config;
+import net.pistonmaster.pistonqueue.shared.wrapper.PlayerWrapper;
 
 import java.time.Duration;
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Predicate;
 
 @Getter
 @AllArgsConstructor
@@ -50,9 +50,9 @@ public class QueueType {
     @Setter
     private List<String> footer;
 
-    public static QueueType getQueueType(Predicate<String> player) {
+    public static QueueType getQueueType(PlayerWrapper player) {
         for (QueueType type : Config.QUEUE_TYPES) {
-            if (type.getPermission().equals("default") || player.test(type.getPermission())) {
+            if (type.getPermission().equals("default") || player.hasPermission(type.getPermission())) {
                 return type;
             }
         }