bump to 0.12.0

Signed-off-by: mohammed jasem alaajel <xrambad@gmail.com>

.github/workflows/gradle.yml

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

README.md

@@ -9,10 +9,6 @@ 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

@@ -52,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.adventure.plain.get().version
+        val adventureVersion = libs.guava.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, Please enable it in the RedisBungee config.yml");
+                throw new IllegalStateException("JedisPool compatibility mode is disabled");
             }
             return jedisPool;
         } else {

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

@@ -37,10 +37,11 @@ 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.MINUTES).build(this::getServerFromRedis);
+    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.MINUTES).build(this::getLastServerFromRedis);
+    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.MINUTES).build(this::getProxyFromRedis);
+    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.MINUTES).build(this::getIpAddressFromRedis);
+    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 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;
@@ -79,6 +80,7 @@ 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) {
@@ -159,13 +161,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 String name, final InetAddress inetAddress) {
+    protected void addPlayer(final UUID uuid, 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);
@@ -226,7 +228,7 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
     }
 
     public long getLastOnline(UUID uuid) {
-        return getLastOnlineFromRedis(uuid);
+        return this.lastOnlineCache.get(uuid);
     }
 
     public Multimap<String, UUID> serversToPlayers() {

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 '/rb clean' to remove expired cache entries");
+                            plugin.logInfo("Looks like you have a really big UUID cache! Run https://github.com/ProxioDev/Brains");
                         }
                         break;
                     }

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().getName(), event.getPlayer().getAddress().getAddress());
+        super.addPlayer(event.getPlayer().getUniqueId(), event.getPlayer().getAddress().getAddress());
     }
 
     @Override

RedisBungee-Commands/build.gradle.kts

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

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().getUsername(), event.getPlayer().getRemoteAddress().getAddress());
+        addPlayer(event.getPlayer().getUniqueId(), event.getPlayer().getRemoteAddress().getAddress());
     }
 
     @Override

gradle.properties

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