diff --git a/src/main/java/net/krakatoa/proxy/listener/PlayerDisconnectListener.java b/src/main/java/net/krakatoa/proxy/listener/PlayerDisconnectListener.java index 67dea0d..317407e 100644 --- a/src/main/java/net/krakatoa/proxy/listener/PlayerDisconnectListener.java +++ b/src/main/java/net/krakatoa/proxy/listener/PlayerDisconnectListener.java @@ -12,10 +12,10 @@ public class PlayerDisconnectListener implements Listener { public void onDisconnect(PlayerDisconnectEvent event) { ProxiedPlayer proxiedPlayer = event.getPlayer(); - String value = ProxySystem.getInstance().getRedisManager().getCommands() - .getdel("player:" + proxiedPlayer.getUniqueId().toString()); + Long res = ProxySystem.getInstance().getRedisManager().getRedisKeyCommands() + .del("player:" + proxiedPlayer.getUniqueId().toString()); - ProxySystem.getInstance().getLogger().info("val: " + value); + ProxySystem.getInstance().getLogger().info("val: " + res); //String uuid = ProxySystem.getInstance().getFormatter() // .formatUuid(proxiedPlayer.getUniqueId().toString()); diff --git a/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java b/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java index abd73e3..844165d 100644 --- a/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java +++ b/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java @@ -98,7 +98,7 @@ public class PostLoginListener implements Listener { } }); - ProxySystem.getInstance().getRedisManager().getCommands() + ProxySystem.getInstance().getRedisManager().getRedisKeyCommands() .set("player:" + proxiedPlayer.getUniqueId().toString(), proxiedPlayer.getName()); } diff --git a/src/main/java/net/krakatoa/proxy/redis/RedisKeyCommands.java b/src/main/java/net/krakatoa/proxy/redis/RedisKeyCommands.java new file mode 100644 index 0000000..dca6872 --- /dev/null +++ b/src/main/java/net/krakatoa/proxy/redis/RedisKeyCommands.java @@ -0,0 +1,15 @@ +package net.krakatoa.proxy.redis; + +import io.lettuce.core.dynamic.Commands; +import io.lettuce.core.dynamic.annotation.Key; + +public interface RedisKeyCommands extends Commands { + + String get(String key); + + String set(String key, String value); + + Long del(Key... keys); + + Long del(String key); +} diff --git a/src/main/java/net/krakatoa/proxy/redis/RedisManager.java b/src/main/java/net/krakatoa/proxy/redis/RedisManager.java index fbe2f1f..d378230 100644 --- a/src/main/java/net/krakatoa/proxy/redis/RedisManager.java +++ b/src/main/java/net/krakatoa/proxy/redis/RedisManager.java @@ -1,8 +1,7 @@ package net.krakatoa.proxy.redis; import io.lettuce.core.RedisClient; -import io.lettuce.core.api.StatefulRedisConnection; -import io.lettuce.core.api.sync.RedisStringCommands; +import io.lettuce.core.dynamic.RedisCommandFactory; import lombok.Data; @Data @@ -11,14 +10,19 @@ public class RedisManager { private final String connectionUri; private RedisClient client; - private StatefulRedisConnection connection; - private RedisStringCommands commands; + //private StatefulRedisConnection connection; + //private RedisStringCommands commands; //private RedisKeyReactiveCommands keyReactiveCommands; + private RedisKeyCommands redisKeyCommands; + public void connect() { this.client = RedisClient.create(this.getConnectionUri()); - this.connection = client.connect(); - this.commands = connection.sync(); + RedisCommandFactory factory = new RedisCommandFactory(client.connect()); + this.redisKeyCommands = factory.getCommands(RedisKeyCommands.class); + + //this.connection = client.connect(); + //this.commands = connection.sync(); //this.keyReactiveCommands = this.connection.reactive(); } }