From 81a8fd218e1caca383b9c6d6fb282367eaaacd66 Mon Sep 17 00:00:00 2001 From: mohammed jasem alaajel Date: Tue, 26 Jul 2022 12:49:44 +0400 Subject: [PATCH] move PlayerUtils and change the name --- .../redisbungee/api/tasks/IntegrityCheckTask.java | 12 +++++------- .../redisbungee/api/tasks/ShutdownUtils.java | 6 +++--- .../player/PlayerUtils.java} | 4 ++-- .../redisbungee/RedisBungeeBungeeListener.java | 6 +++--- .../redisbungee/RedisBungeeVelocityListener.java | 6 +++--- 5 files changed, 16 insertions(+), 18 deletions(-) rename RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/{GenericPlayerUtils.java => util/player/PlayerUtils.java} (94%) diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/IntegrityCheckTask.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/IntegrityCheckTask.java index 3fcae8b..c872187 100644 --- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/IntegrityCheckTask.java +++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/IntegrityCheckTask.java @@ -1,6 +1,6 @@ package com.imaginarycode.minecraft.redisbungee.api.tasks; -import com.imaginarycode.minecraft.redisbungee.api.GenericPlayerUtils; +import com.imaginarycode.minecraft.redisbungee.api.util.player.PlayerUtils; import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisCluster; @@ -9,9 +9,7 @@ import redis.clients.jedis.Pipeline; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.concurrent.TimeUnit; -import java.util.logging.Level; public abstract class IntegrityCheckTask extends RedisTask { @@ -37,7 +35,7 @@ public abstract class IntegrityCheckTask extends RedisTask { if (!laggedPlayers.isEmpty()) { plugin.logInfo("Cleaning up lagged proxy " + s + " (" + laggedPlayers.size() + " players)..."); for (String laggedPlayer : laggedPlayers) { - GenericPlayerUtils.cleanUpPlayer(laggedPlayer, jedis, true); + PlayerUtils.cleanUpPlayer(laggedPlayer, jedis, true); } } } @@ -58,7 +56,7 @@ public abstract class IntegrityCheckTask extends RedisTask { } } if (!found) { - GenericPlayerUtils.cleanUpPlayer(member, jedis, false); + PlayerUtils.cleanUpPlayer(member, jedis, false); plugin.logWarn("Player found in set that was not found locally and globally: " + member); } else { jedis.srem("proxy:" + plugin.getConfiguration().getProxyId() + ":usersOnline", member); @@ -96,7 +94,7 @@ public abstract class IntegrityCheckTask extends RedisTask { if (!laggedPlayers.isEmpty()) { plugin.logInfo("Cleaning up lagged proxy " + s + " (" + laggedPlayers.size() + " players)..."); for (String laggedPlayer : laggedPlayers) { - GenericPlayerUtils.cleanUpPlayer(laggedPlayer, jedisCluster, true); + PlayerUtils.cleanUpPlayer(laggedPlayer, jedisCluster, true); } } } @@ -117,7 +115,7 @@ public abstract class IntegrityCheckTask extends RedisTask { } } if (!found) { - GenericPlayerUtils.cleanUpPlayer(member, jedisCluster, false); + PlayerUtils.cleanUpPlayer(member, jedisCluster, false); plugin.logWarn("Player found in set that was not found locally and globally: " + member); } else { jedisCluster.srem("proxy:" + plugin.getConfiguration().getProxyId() + ":usersOnline", member); diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/ShutdownUtils.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/ShutdownUtils.java index 53d0af2..bd38977 100644 --- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/ShutdownUtils.java +++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/tasks/ShutdownUtils.java @@ -1,6 +1,6 @@ package com.imaginarycode.minecraft.redisbungee.api.tasks; -import com.imaginarycode.minecraft.redisbungee.api.GenericPlayerUtils; +import com.imaginarycode.minecraft.redisbungee.api.util.player.PlayerUtils; import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisCluster; @@ -17,7 +17,7 @@ public class ShutdownUtils { if (jedis.scard("proxy:" + plugin.getConfiguration().getProxyId() + ":usersOnline") > 0) { Set players = jedis.smembers("proxy:" + plugin.getConfiguration().getProxyId() + ":usersOnline"); for (String member : players) - GenericPlayerUtils.cleanUpPlayer(member, jedis, true); + PlayerUtils.cleanUpPlayer(member, jedis, true); } return null; } @@ -28,7 +28,7 @@ public class ShutdownUtils { if (jedisCluster.scard("proxy:" + plugin.getConfiguration().getProxyId() + ":usersOnline") > 0) { Set players = jedisCluster.smembers("proxy:" + plugin.getConfiguration().getProxyId() + ":usersOnline"); for (String member : players) - GenericPlayerUtils.cleanUpPlayer(member, jedisCluster, true); + PlayerUtils.cleanUpPlayer(member, jedisCluster, true); } return null; } diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/GenericPlayerUtils.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/player/PlayerUtils.java similarity index 94% rename from RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/GenericPlayerUtils.java rename to RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/player/PlayerUtils.java index 0a1da72..565ce15 100644 --- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/GenericPlayerUtils.java +++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/player/PlayerUtils.java @@ -1,4 +1,4 @@ -package com.imaginarycode.minecraft.redisbungee.api; +package com.imaginarycode.minecraft.redisbungee.api.util.player; import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI; import redis.clients.jedis.Jedis; @@ -7,7 +7,7 @@ import redis.clients.jedis.Pipeline; import static com.imaginarycode.minecraft.redisbungee.api.util.payload.PayloadUtils.playerQuitPayload; -public class GenericPlayerUtils { +public class PlayerUtils { public static void cleanUpPlayer(String uuid, Jedis rsc, boolean firePayload) { diff --git a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeeListener.java b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeeListener.java index 86538d3..face122 100644 --- a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeeListener.java +++ b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeeListener.java @@ -7,7 +7,7 @@ import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import com.imaginarycode.minecraft.redisbungee.api.AbstractRedisBungeeListener; -import com.imaginarycode.minecraft.redisbungee.api.GenericPlayerUtils; +import com.imaginarycode.minecraft.redisbungee.api.util.player.PlayerUtils; import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin; import com.imaginarycode.minecraft.redisbungee.api.tasks.RedisTask; import com.imaginarycode.minecraft.redisbungee.api.util.payload.PayloadUtils; @@ -144,7 +144,7 @@ public class RedisBungeeBungeeListener extends AbstractRedisBungeeListener