Improve caching!

Author: AlexProgrammerDE

PistonQueuePlaceholder/src/main/java/net/pistonmaster/pistonqueueplaceholder/PistonQueuePlaceholder.java

@@ -50,7 +50,7 @@ public void onPluginMessageReceived(String channel, @NotNull Player player, byte
 
     private void checkIfBungee() {
         if (!PaperLib.isSpigot()) {
-            getLogger().severe(ChatColor.RED + "You probably run CraftBukkit... Please update atleast to spigot for this to work...");
+            getLogger().severe(ChatColor.RED + "You probably run CraftBukkit... Please update at least to spigot for this to work...");
             getLogger().severe(ChatColor.RED + "Plugin disabled!");
             getServer().getPluginManager().disablePlugin(this);
         }

README.md

@@ -1,12 +1,12 @@
 # PistonQueue
 
-[![PistonDev Discord](https://discord.com/api/guilds/739784741124833301/embed.png)](https://discord.gg/CDrcxzH) 
+[![PistonDev Discord](https://discord.com/api/guilds/739784741124833301/embed.png)](https://discord.gg/CDrcxzH)
 [![](https://img.shields.io/badge/contributions-welcome-brightgreen)](https://github.com/AlexProgrammerDE/PistonQueue)
 
 ## About
 
-PistonQueue is a basic and easy to use queue plugin designed for anarchy and survival servers. This plugin is a fork
-of LeeesBungeeQueue but LeeesBungeeQueue was a designed more for the server 6b6t.org, so a fork of the plugin was created
+PistonQueue is a basic and easy to use queue plugin designed for anarchy and survival servers. This plugin is a fork of
+LeeesBungeeQueue but LeeesBungeeQueue was a designed more for the server 6b6t.org, so a fork of the plugin was created
 that is designed for everyone and has more updates and support.
 
 ## Features
@@ -29,7 +29,8 @@ Instead of showing an error saying the server is down you can customize this mes
 
 ### Auth server support
 
-Auth server support for cracked (offline mode: false) servers. You can now have the authserver go first and then the queue!
+Auth server support for cracked (offline mode: false) servers. You can now have the authserver go first and then the
+queue!
 
 ## Setup
 

pom.xml

@@ -1,5 +1,5 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.pistonmaster</groupId>
@@ -13,7 +13,15 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <url>https://pistonmaster.net/</url>
-         
+
+    <licenses>
+        <license>
+            <name>Apache License Version 2.0</name>
+            <url>LICENSE</url>
+            <distribution>>repo</distribution>
+        </license>
+    </licenses>
+
     <build>
         <defaultGoal>clean package</defaultGoal>
         <plugins>

src/main/java/net/pistonmaster/pistonqueue/bungee/PistonQueue.java

@@ -44,7 +44,6 @@
 import java.net.Socket;
 import java.nio.file.Files;
 import java.time.Duration;
-import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.Map.Entry;
@@ -304,15 +303,15 @@ private void updateTab(QueueType queue, List<String> header, List<String> footer
             StringBuilder footerBuilder = new StringBuilder();
 
             for (int i = 0; i < header.size(); i++) {
-                headerBuilder.append(ChatUtils.parseToString(replacePosition(header.get(i), player.getUniqueId(), position, queue)));
+                headerBuilder.append(ChatUtils.parseToString(replacePosition(header.get(i), position, queue)));
 
                 if (i != (header.size() - 1)) {
                     headerBuilder.append("\n");
                 }
             }
 
             for (int i = 0; i < footer.size(); i++) {
-                footerBuilder.append(ChatUtils.parseToString(replacePosition(footer.get(i), player.getUniqueId(), position, queue)));
+                footerBuilder.append(ChatUtils.parseToString(replacePosition(footer.get(i), position, queue)));
 
                 if (i != (footer.size() - 1)) {
                     footerBuilder.append("\n");
@@ -325,18 +324,7 @@ private void updateTab(QueueType queue, List<String> header, List<String> footer
         }
     }
 
-    private String replacePosition(String text, UUID uuid, int position, QueueType type) {
-        if (type.getPositionCache().containsKey(uuid)) {
-            List<Pair<Integer, Instant>> list = type.getPositionCache().get(uuid);
-            if (list.stream().map(Pair::getLeft).noneMatch(integer -> integer == position)) {
-                list.add(new Pair<>(position, Instant.now()));
-            }
-        } else {
-            List<Pair<Integer, Instant>> list = new ArrayList<>();
-            list.add(new Pair<>(position, Instant.now()));
-            type.getPositionCache().put(uuid, list);
-        }
-
+    private String replacePosition(String text, int position, QueueType type) {
         if (type.getDurationToPosition().containsKey(position)) {
             Duration duration = type.getDurationToPosition().get(position);
 
@@ -367,12 +355,12 @@ private String format(String str, Duration duration, int position) {
         String format = String.format("%dh %dm", duration.toHours(), duration.toMinutes() % 60);
 
         if (duration.toHours() == 0)
-            format = String.format("%dm", duration.toMinutes());
+            format = String.format("%dm", duration.toMinutes() == 0 ? 1 : duration.toMinutes());
 
         return str.replace("%position%", String.valueOf(position)).replace("%wait%", format);
     }
 
-    public void sendCustomData() {
+    private void sendCustomData() {
         Collection<ProxiedPlayer> networkPlayers = getProxy().getPlayers();
 
         if (networkPlayers == null || networkPlayers.isEmpty()) {

src/main/java/net/pistonmaster/pistonqueue/bungee/listeners/QueueListener.java

@@ -211,6 +211,8 @@ private void connectPlayer(QueueType type) {
             return;
         }
 
+        indexPositionTime();
+
         List<Pair<Integer, Instant>> cache = type.getPositionCache().get(entry.getKey());
 
         if (cache != null) {
@@ -288,4 +290,32 @@ private boolean isAnyoneQueued() {
 
         return false;
     }
+
+    private void indexPositionTime() {
+        for (QueueType type : QueueType.values()) {
+            int position = 0;
+
+            for (Entry<UUID, String> entry : new LinkedHashMap<>(type.getQueueMap()).entrySet()) {
+                ProxiedPlayer player = plugin.getProxy().getPlayer(entry.getKey());
+                if (player == null || !player.isConnected()) {
+                    type.getQueueMap().remove(entry.getKey());
+                    continue;
+                }
+
+                position++;
+
+                if (type.getPositionCache().containsKey(player.getUniqueId())) {
+                    List<Pair<Integer, Instant>> list = type.getPositionCache().get(player.getUniqueId());
+                    int finalPosition = position;
+                    if (list.stream().map(Pair::getLeft).noneMatch(integer -> integer == finalPosition)) {
+                        list.add(new Pair<>(position, Instant.now()));
+                    }
+                } else {
+                    List<Pair<Integer, Instant>> list = new ArrayList<>();
+                    list.add(new Pair<>(position, Instant.now()));
+                    type.getPositionCache().put(player.getUniqueId(), list);
+                }
+            }
+        }
+    }
 }