even more oops: why caches are set to 1 hour ._.

i must forgotten to remove it during development

.github/workflows/gradle.yml

@@ -5,9 +5,9 @@ name: RedisBungee Build
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ main ]
   pull_request:
-    branches: [ develop ]
+    branches: [ main ]
 
 jobs:
   build:

README.md

@@ -9,6 +9,10 @@ or [Velocity*](https://github.com/PaperMC/Velocity) proxies
 
 [![](https://raw.githubusercontent.com/Prospector/badges/master/modrinth-badge-72h-padded.png)](https://modrinth.com/plugin/redisbungee)
 
+## Wiki
+
+https://github.com/ProxioDev/RedisBungee/wiki
+
 ## Support
 
 open an issue with question button

RedisBungee-API/build.gradle.kts

@@ -35,7 +35,6 @@ blossom {
     commit = "$commitStdout".replace("\n", "") // for some reason it adds new line so remove it.
     commitStdout.close()
     replaceToken("@git_commit@", commit)
-    replaceToken("@build_date@", "${Instant.now().epochSecond}")
 }
 
 
@@ -53,7 +52,7 @@ tasks {
         val jedisVersion = libs.jedis.get().version
         val configurateVersion = libs.configurate.get().version
         val guavaVersion = libs.guava.get().version
-        val adventureVersion = libs.guava.get().version
+        val adventureVersion = libs.adventure.plain.get().version
         options.links(
             "https://configurate.aoeu.xyz/$configurateVersion/apidocs/", // configurate
             "https://javadoc.io/doc/redis.clients/jedis/$jedisVersion/", // jedis

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/AbstractRedisBungeeAPI.java

@@ -423,7 +423,7 @@ public abstract class AbstractRedisBungeeAPI {
         if (getMode() == RedisBungeeMode.SINGLE) {
             JedisPool jedisPool = ((JedisPooledSummoner) this.plugin.getSummoner()).getCompatibilityJedisPool();
             if (jedisPool == null) {
-                throw new IllegalStateException("JedisPool compatibility mode is disabled");
+                throw new IllegalStateException("JedisPool compatibility mode is disabled, Please enable it in the RedisBungee config.yml");
             }
             return jedisPool;
         } else {

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java

@@ -15,7 +15,6 @@ public class Constants {
 
     public final static String VERSION = "@version@";
     public final static String GIT_COMMIT = "@git_commit@";
-    public final static long BUILD_DATE = Long.parseLong("@build_date@");
 
     public static String getGithubCommitLink() {
         return "https://github.com/ProxioDev/RedisBungee/commit/" + GIT_COMMIT;

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java

@@ -37,11 +37,10 @@ import java.util.concurrent.TimeUnit;
 public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEvent, SC extends IPlayerChangedServerNetworkEvent, NJE extends IPlayerLeftNetworkEvent, CE> {
 
     protected final RedisBungeePlugin<P> plugin;
-    private final LoadingCache<UUID, String> serverCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build(this::getServerFromRedis);
-    private final LoadingCache<UUID, String> lastServerCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build(this::getLastServerFromRedis);
-    private final LoadingCache<UUID, String> proxyCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build(this::getProxyFromRedis);
-    private final LoadingCache<UUID, InetAddress> ipCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build(this::getIpAddressFromRedis);
-    private final LoadingCache<UUID, Long> lastOnlineCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build(this::getLastOnlineFromRedis);
+    private final LoadingCache<UUID, String> serverCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(this::getServerFromRedis);
+    private final LoadingCache<UUID, String> lastServerCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(this::getLastServerFromRedis);
+    private final LoadingCache<UUID, String> proxyCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(this::getProxyFromRedis);
+    private final LoadingCache<UUID, InetAddress> ipCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(this::getIpAddressFromRedis);
     private final Object SERVERS_TO_PLAYERS_KEY = new Object();
     private final LoadingCache<Object, Multimap<String, UUID>> serverToPlayersCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.MINUTES).build(this::serversToPlayersBuilder);
     private final UnifiedJedis unifiedJedis;
@@ -80,7 +79,6 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
         this.proxyCache.invalidate(event.getUuid());
         this.serverCache.invalidate(event.getUuid());
         this.ipCache.invalidate(event.getUuid());
-        this.lastOnlineCache.invalidate(event.getUuid());
     }
 
     protected void handlePubSubMessageEvent(IPubSubMessageEvent event) {
@@ -161,13 +159,13 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
         unifiedJedis.hset("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", data);
     }
 
-    protected void addPlayer(final UUID uuid, final InetAddress inetAddress) {
+    protected void addPlayer(final UUID uuid, final String name, final InetAddress inetAddress) {
         Map<String, String> redisData = new HashMap<>();
         redisData.put("last-online", String.valueOf(0));
         redisData.put("proxy", this.proxyId);
         redisData.put("ip", inetAddress.getHostAddress());
         unifiedJedis.hset("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", redisData);
-
+        plugin.getUuidTranslator().persistInfo(name, uuid, this.unifiedJedis);
         JSONObject data = new JSONObject();
         data.put("proxy", this.proxyId);
         data.put("uuid", uuid);
@@ -228,7 +226,7 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
     }
 
     public long getLastOnline(UUID uuid) {
-        return this.lastOnlineCache.get(uuid);
+        return getLastOnlineFromRedis(uuid);
     }
 
     public Multimap<String, UUID> serversToPlayers() {

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/config/loaders/GenericConfigLoader.java

@@ -12,7 +12,6 @@ package com.imaginarycode.minecraft.redisbungee.api.config.loaders;
 
 import org.jetbrains.annotations.Nullable;
 
-;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/InitialUtils.java

@@ -34,7 +34,7 @@ public class InitialUtils {
                         }
                         long uuidCacheSize = unifiedJedis.hlen("uuid-cache");
                         if (uuidCacheSize > 750000) {
-                            plugin.logInfo("Looks like you have a really big UUID cache! Run https://github.com/ProxioDev/Brains");
+                            plugin.logInfo("Looks like you have a really big UUID cache! Run '/rb clean' to remove expired cache entries");
                         }
                         break;
                     }

RedisBungee-API/src/main/resources/config.yml

@@ -56,7 +56,7 @@ network-id: "main"
 # You can set Environment variable 'REDISBUNGEE_PROXY_ID' to override
 proxy-id: "proxy-1"
 
-# since RedisBungee Internally now uses JedisPooled instead of Jedis, JedisPool.
+# since RedisBungee Internally now uses UnifiedJedis instead of Jedis, JedisPool.
 # which will break compatibility with old plugins that uses RedisBungee JedisPool
 # so to mitigate this issue, RedisBungee will create an JedisPool for compatibility reasons.
 # disabled by default

RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/BungeePlayerDataManager.java

@@ -84,7 +84,7 @@ public class BungeePlayerDataManager extends PlayerDataManager<ProxiedPlayer, Po
     @Override
     @EventHandler
     public void onLoginEvent(PostLoginEvent event) {
-        super.addPlayer(event.getPlayer().getUniqueId(), event.getPlayer().getAddress().getAddress());
+        super.addPlayer(event.getPlayer().getUniqueId(), event.getPlayer().getName(), event.getPlayer().getAddress().getAddress());
     }
 
     @Override

RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java

@@ -197,7 +197,6 @@ public class RedisBungee extends Plugin implements RedisBungeePlugin<ProxiedPlay
     public void initialize() {
         logInfo("Initializing RedisBungee.....");
         logInfo("Version: {}", Constants.VERSION);
-        logInfo("Build date: {}", Date.from(Instant.ofEpochSecond(Constants.BUILD_DATE)));
         ThreadFactory factory = ((ThreadPoolExecutor) getExecutorService()).getThreadFactory();
         ScheduledExecutorService service = Executors.newScheduledThreadPool(24, factory);
         try {

RedisBungee-Commands/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     `java-library`
+    `maven-publish`
 }
 
 dependencies {
@@ -22,3 +23,11 @@ tasks {
         filteringCharset = Charsets.UTF_8.name()
     }
 }
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            from(components["java"])
+        }
+    }
+}

RedisBungee-Commands/src/main/java/com/imaginarycode/minecraft/redisbungee/commands/CommandRedisBungee.java

@@ -11,6 +11,7 @@
 package com.imaginarycode.minecraft.redisbungee.commands;
 
 import co.aikar.commands.CommandIssuer;
+import co.aikar.commands.RegisteredCommand;
 import co.aikar.commands.annotation.*;
 import com.google.common.primitives.Ints;
 import com.imaginarycode.minecraft.redisbungee.Constants;
@@ -26,12 +27,12 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 @CommandAlias("rb|redisbungee")
 @CommandPermission("redisbungee.command.use")
+@Description("Main command")
 public class CommandRedisBungee extends AdventureBaseCommand {
 
     private final RedisBungeePlugin<?> plugin;
@@ -42,12 +43,12 @@ public class CommandRedisBungee extends AdventureBaseCommand {
 
     @Default
     @Subcommand("info|version|git")
+    @Description("information about current redisbungee build")
     public void info(CommandIssuer issuer) {
         final String message = """
         <color:aqua>This proxy is running RedisBungee Limework's fork
         <color:gold>========================================
         <color:aqua>RedisBungee version: <color:green><version>
-        <color:aqua>Build date: <color:green><build-date>
         <color:aqua>Commit: <color:green><commit>
         <color:gold>========================================
         <color:gold>run /rb help for more commands""";
@@ -57,7 +58,6 @@ public class CommandRedisBungee extends AdventureBaseCommand {
             .deserialize(
                 message,
                 Placeholder.component("version", Component.text(Constants.VERSION)),
-                Placeholder.component("build-date", Component.text( new Date(Constants.BUILD_DATE * 1000).toString() )),
                 Placeholder.component(
                     "commit",
                     Component.text(Constants.GIT_COMMIT.substring(0, 8))
@@ -67,19 +67,29 @@ public class CommandRedisBungee extends AdventureBaseCommand {
     }
     // <color:aqua>......: <color:green>......
     @HelpCommand
+    @Description("shows the help page")
     public void help(CommandIssuer issuer) {
-        final String message = """
-        <color:gold>========================================
-        <color:aqua>/rb info: <color:green>shows info of this version.
-        <color:aqua>/rb help: <color:green>shows this page.
-        <color:aqua>/rb clean: <color:green>cleans up the uuid cache
-        <color:red><bold>WARNING...</bold> <color:white>command above could cause performance issues
-        <color:aqua>/rb show: <color:green>shows list of proxies with player count
-        <color:gold>========================================
-        <color:gold>run /rb help for more commands""";
-        sendMessage(issuer, MiniMessage.miniMessage().deserialize(message));
+        final String barFormat = "<color:gold>========================================";
+        final String commandFormat = "<color:aqua>/rb <sub-command>: <color:green><description>";
+
+        TextComponent.Builder message = Component.text();
+        message.append(MiniMessage.miniMessage().deserialize(barFormat));
+
+        getSubCommands().forEach((subCommand, registeredCommand) -> {
+            String[] split = registeredCommand.getCommand().split(" ");
+            if (split.length > 1 && subCommand.equalsIgnoreCase(split[1])) {
+                message.appendNewline().append(MiniMessage.miniMessage().deserialize(commandFormat, Placeholder.component("sub-command", Component.text(subCommand)),
+                        Placeholder.component("description", MiniMessage.miniMessage().deserialize(registeredCommand.getHelpText()))
+                ));
+            }
+        });
+
+        message.appendNewline().append(MiniMessage.miniMessage().deserialize(barFormat));
+
+        sendMessage(issuer, message.build());
     }
     @Subcommand("clean")
+    @Description("cleans up the uuid cache<color:red> <bold>WARNING...</bold> <color:white>command above could cause performance issues")
     @Private
     public void cleanUp(CommandIssuer issuer) {
         if (StopperUUIDCleanupTask.isRunning) {
@@ -99,6 +109,7 @@ public class CommandRedisBungee extends AdventureBaseCommand {
 
     }
     @Subcommand("show")
+    @Description("Shows proxies in this network")
     public void showProxies(CommandIssuer issuer, String[] args) {
         final String closer = "<color:gold>========================================";
         final String pageTop = "<color:yellow>Page: <color:green><current>/<max> <color:yellow>Network ID: <color:green><network> <color:yellow>Proxies online: <color:green><proxies>";
@@ -123,15 +134,6 @@ public class CommandRedisBungee extends AdventureBaseCommand {
         } else currentPage = 1;
 
         var data = new ArrayList<>(plugin.proxyDataManager().eachProxyCount().entrySet());
-        data.addAll(data);
-        data.addAll(data);
-        data.addAll(data);
-        data.addAll(data);
-        data.addAll(data);
-        data.addAll(data);
-        data.addAll(data);
-        data.addAll(data);
-
         // there is no way this runs because there is always an heartbeat.
         // if not could be some shenanigans done by devs :P
         if (data.isEmpty()) {
@@ -139,7 +141,7 @@ public class CommandRedisBungee extends AdventureBaseCommand {
             return;
         }
         // compute the total pages
-        int maxPages = data.size() < pageSize ? 1 : data.size() / pageSize ;
+        int maxPages = (int) Math.ceil(data.size() / (double) pageSize);
         if (currentPage > maxPages) currentPage = maxPages;
         var subList = subListProxies(data, currentPage, pageSize);
         TextComponent.Builder builder = Component.text();
@@ -169,17 +171,19 @@ public class CommandRedisBungee extends AdventureBaseCommand {
         }
         if (currentPage > 1) {
             builder.append(MiniMessage.miniMessage().deserialize(previousPage)
-                    .clickEvent(ClickEvent.runCommand("/rb show " + (currentPage - 1))));
+                    .color(NamedTextColor.WHITE).clickEvent(ClickEvent.runCommand("/rb show " + (currentPage - 1))));
+        } else {
+            builder.append(MiniMessage.miniMessage().deserialize(previousPage).color(NamedTextColor.GRAY));
         }
         if (subList.size() == pageSize && !subListProxies(data, currentPage + 1, pageSize).isEmpty()) {
             builder.append(MiniMessage.miniMessage().deserialize(nextPage)
-                    .clickEvent(ClickEvent.runCommand("/rb show " + (currentPage + 1))));
+                    .color(NamedTextColor.WHITE).clickEvent(ClickEvent.runCommand("/rb show " + (currentPage + 1))));
+        } else {
+            builder.append(MiniMessage.miniMessage().deserialize(nextPage).color(NamedTextColor.GRAY));
         }
         builder.appendNewline();
         builder.append(MiniMessage.miniMessage().deserialize(closer));
         sendMessage(issuer, builder.build());
 
-
-
     }
 }

RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java

@@ -102,7 +102,6 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
         this.logger = logger;
         this.dataFolder = dataDirectory;
         logInfo("Version: {}", Constants.VERSION);
-        logInfo("Build date: {}", Date.from(Instant.ofEpochSecond(Constants.BUILD_DATE)));
         try {
             loadConfig(this, dataDirectory);
             loadLangConfig(this, dataDirectory);

RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/VelocityPlayerDataManager.java

@@ -84,7 +84,7 @@ public class VelocityPlayerDataManager extends PlayerDataManager<Player, PostLog
     @Override
     @Subscribe
     public void onLoginEvent(PostLoginEvent event) {
-        addPlayer(event.getPlayer().getUniqueId(), event.getPlayer().getRemoteAddress().getAddress());
+        addPlayer(event.getPlayer().getUniqueId(), event.getPlayer().getUsername(), event.getPlayer().getRemoteAddress().getAddress());
     }
 
     @Override

gradle.properties

@@ -1,2 +1,2 @@
 group=com.imaginarycode.minecraft
-version=0.12.0-SNAPSHOT
+version=0.12.2