reimpl kick api using serialized messages instead, Move language to own module, depenedcies fixes

proxies/bungeecord/src/main/java/com/imaginarycode/minecraft/redisbungee/BungeePlayerDataManager.java

@@ -12,7 +12,6 @@ package com.imaginarycode.minecraft.redisbungee;
 
 import com.imaginarycode.minecraft.redisbungee.api.PlayerDataManager;
 import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin;
-import com.imaginarycode.minecraft.redisbungee.api.events.IPlayerJoinedNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerChangedServerNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerJoinedNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerLeftNetworkEvent;
@@ -75,7 +74,7 @@ public class BungeePlayerDataManager extends PlayerDataManager<ProxiedPlayer> im
                 event.completeIntent((Plugin) plugin);
             } else {
                 if (plugin.configuration().kickWhenOnline()) {
-                    kickPlayer(event.getConnection().getUniqueId(), plugin.langConfiguration().messages().loggedInFromOtherLocation());
+                    serializedPlayerKick(event.getConnection().getUniqueId(), plugin.langConfiguration().messages().loggedInFromOtherLocation());
                     // wait 3 seconds before releasing the event
                     plugin.executeAsyncAfter(() -> event.completeIntent((Plugin) plugin), TimeUnit.SECONDS, 3);
                 } else {

proxies/bungeecord/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java

@@ -46,8 +46,6 @@ import redis.clients.jedis.JedisPool;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.net.InetAddress;
-import java.sql.Date;
-import java.time.Instant;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;

proxies/velocity/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     annotationProcessor(libs.platform.velocity)
     implementation(project(":RedisBungee-Commands"))
     implementation(libs.acf.velocity)
+    implementation(project(":RedisBungee-Lang"))
 
 }
 

proxies/velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java

@@ -36,9 +36,9 @@ import static com.imaginarycode.minecraft.redisbungee.api.util.serialize.MultiMa
 
 public class RedisBungeeListener {
 
-    private final RedisBungeePlugin<Player> plugin;
+    private final RedisBungeeVelocityPlugin plugin;
 
-    public RedisBungeeListener(RedisBungeePlugin<Player> plugin) {
+    public RedisBungeeListener(RedisBungeeVelocityPlugin plugin) {
         this.plugin = plugin;
     }
 

proxies/velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java

@@ -18,18 +18,14 @@ import com.imaginarycode.minecraft.redisbungee.api.RedisBungeeMode;
 import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin;
 import com.imaginarycode.minecraft.redisbungee.commands.CommandLoader;
 import com.imaginarycode.minecraft.redisbungee.commands.utils.CommandPlatformHelper;
-import com.imaginarycode.minecraft.redisbungee.api.config.LangConfiguration;
 import com.imaginarycode.minecraft.redisbungee.api.config.loaders.ConfigLoader;
 import com.imaginarycode.minecraft.redisbungee.api.config.RedisBungeeConfiguration;
-import com.imaginarycode.minecraft.redisbungee.api.config.loaders.LangConfigLoader;
 import com.imaginarycode.minecraft.redisbungee.api.events.IPlayerChangedServerNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.api.events.IPlayerJoinedNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.api.events.IPlayerLeftNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.api.events.IPubSubMessageEvent;
 import com.imaginarycode.minecraft.redisbungee.api.summoners.Summoner;
 import com.imaginarycode.minecraft.redisbungee.api.util.InitialUtils;
-import com.imaginarycode.minecraft.redisbungee.api.util.uuid.NameFetcher;
-import com.imaginarycode.minecraft.redisbungee.api.util.uuid.UUIDFetcher;
 import com.imaginarycode.minecraft.redisbungee.api.util.uuid.UUIDTranslator;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerChangedServerNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerJoinedNetworkEvent;
@@ -48,6 +44,8 @@ import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.api.scheduler.ScheduledTask;
 import net.kyori.adventure.text.Component;
+import net.limework.valiobungee.config.lang.LangConfiguration;
+import net.limework.valiobungee.config.lang.LangConfigLoader;
 import org.slf4j.Logger;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 
@@ -55,18 +53,15 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
 import java.nio.file.Path;
-import java.sql.Date;
 import java.time.Duration;
-import java.time.Instant;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 @Plugin(id = "redisbungee", name = "RedisBungee", version = Constants.VERSION, url = "https://github.com/ProxioDev/RedisBungee", authors = {"astei", "ProxioDev"})
-public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, ConfigLoader, LangConfigLoader, ServerObjectFetcher {
+public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, ConfigLoader, LangConfigLoader, ApiPlatformSupport {
     private final ProxyServer server;
     private final Logger logger;
     private final Path dataFolder;
@@ -208,7 +203,6 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
         return this.configuration;
     }
 
-    @Override
     public LangConfiguration langConfiguration() {
         return this.langConfiguration;
     }
@@ -233,15 +227,6 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
         return this.getProxy().getPlayer(player).map(Player::getUsername).orElse(null);
     }
 
-
-    @Override
-    public boolean handlePlatformKick(UUID uuid, Component message) {
-        Player player = getPlayer(uuid);
-        if (player == null) return false;
-        player.disconnect(message);
-        return true;
-    }
-
     @Override
     public String getPlayerServerName(Player player) {
         return player.getCurrentServer().map(serverConnection -> serverConnection.getServerInfo().getName()).orElse(null);
@@ -356,6 +341,11 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
         return server;
     }
 
+    @Override
+    public void kickPlayer(UUID player, Component message) {
+        this.playerDataManager.kickPlayer(player, message);
+    }
+
     public Logger getLogger() {
         return logger;
     }

proxies/velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/VelocityPlayerDataManager.java

@@ -11,8 +11,6 @@
 package com.imaginarycode.minecraft.redisbungee;
 
 import com.imaginarycode.minecraft.redisbungee.api.PlayerDataManager;
-import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin;
-import com.imaginarycode.minecraft.redisbungee.api.config.RedisBungeeConfiguration;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerChangedServerNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerJoinedNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerLeftNetworkEvent;
@@ -26,12 +24,18 @@ import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.proxy.Player;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 public class VelocityPlayerDataManager extends PlayerDataManager<Player> {
-    public VelocityPlayerDataManager(RedisBungeePlugin<Player> plugin) {
+
+    private final RedisBungeeVelocityPlugin vplugin;
+
+    public VelocityPlayerDataManager(RedisBungeeVelocityPlugin plugin) {
         super(plugin);
+        this.vplugin = plugin;
     }
 
     @Subscribe
@@ -66,6 +70,36 @@ public class VelocityPlayerDataManager extends PlayerDataManager<Player> {
         super.playerChangedServer(event.getPlayer().getUniqueId(), oldServer, currentServer);
     }
 
+    private final GsonComponentSerializer COMPONENT_SERIALIZER = GsonComponentSerializer.gson();
+
+    @Override
+    public boolean handleSerializedKick(UUID uuid, String serializedMessage) {
+        Player player = plugin.getPlayer(uuid);
+        if (player == null) return false;
+        // decode the adventure component
+        if (serializedMessage == null || serializedMessage.isEmpty()) {
+            // kick the player too even if the message is invalid
+            player.disconnect(Component.empty());
+            plugin.logWarn("unable to decode serialized adventure component because its empty or null");
+        }  else {
+            try {
+                Component message = COMPONENT_SERIALIZER.deserialize(serializedMessage);
+                player.disconnect(message);
+            } catch (Exception e) {
+               plugin.logFatal("Kick message is invalid", e);
+               plugin.logFatal("The serialized kick message:");
+               plugin.logFatal(serializedMessage);
+               // kick the player too even if the message is invalid
+               player.disconnect(Component.empty());
+            }
+        }
+        return true;
+    }
+
+    public void kickPlayer(UUID player, Component message) {
+        serializedPlayerKick(player, COMPONENT_SERIALIZER.serialize(message));
+    }
+
     @Subscribe
     public void onLoginEvent(LoginEvent event, Continuation continuation) {
         // check if online
@@ -77,11 +111,11 @@ public class VelocityPlayerDataManager extends PlayerDataManager<Player> {
                 continuation.resume();
             } else {
                 if (plugin.configuration().kickWhenOnline()) {
-                    kickPlayer(event.getPlayer().getUniqueId(), plugin.langConfiguration().messages().loggedInFromOtherLocation());
+                    kickPlayer(event.getPlayer().getUniqueId(), vplugin.langConfiguration().messages().loggedInFromOtherLocation());
                     // wait 3 seconds before releasing the event
                     plugin.executeAsyncAfter(continuation::resume, TimeUnit.SECONDS, 3);
                 } else {
-                    event.setResult(ResultedEvent.ComponentResult.denied(plugin.langConfiguration().messages().alreadyLoggedIn()));
+                    event.setResult(ResultedEvent.ComponentResult.denied(vplugin.langConfiguration().messages().alreadyLoggedIn()));
                     continuation.resume();
                 }
             }

proxies/velocity/velocity-api/build.gradle.kts

@@ -10,15 +10,9 @@ dependencies {
         exclude("com.google.code.gson", "gson")
         exclude("org.spongepowered", "configurate-yaml")
         exclude("com.github.ben-manes.caffeine", "caffeine")
-        // exclude also adventure api
-        exclude("net.kyori", "adventure-api")
-        exclude("net.kyori", "adventure-text-serializer-gson")
-        exclude("net.kyori", "adventure-text-serializer-legacy")
-        exclude("net.kyori", "adventure-text-serializer-plain")
-        exclude("net.kyori", "adventure-text-minimessage")
     }
+    implementation(project(":RedisBungee-Lang"))
     compileOnly(libs.platform.velocity)
-
 }
 
 description = "RedisBungee Velocity API"

proxies/velocity/velocity-api/src/main/java/com/imaginarycode/minecraft/redisbungee/ApiPlatformSupport.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2013-present RedisBungee contributors
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ *
+ *  http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package com.imaginarycode.minecraft.redisbungee;
+
+import com.velocitypowered.api.proxy.ProxyServer;
+import net.kyori.adventure.text.Component;
+
+import java.util.UUID;
+
+// this class used to redirect calls to keep the implementation and api separate
+public interface ApiPlatformSupport {
+
+    ProxyServer getProxy();
+
+    void kickPlayer(UUID Player, Component message);
+
+}

proxies/velocity/velocity-api/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java

@@ -50,7 +50,7 @@ public class RedisBungeeAPI extends AbstractRedisBungeeAPI {
     public final ServerInfo getServerFor(@NonNull UUID player) {
         String serverName = this.getServerNameFor(player);
         if (serverName == null) return null;
-        return ((ServerObjectFetcher) this.plugin).getProxy().getServer(serverName).map((RegisteredServer::getServerInfo)).orElse(null);
+        return ((ApiPlatformSupport) this.plugin).getProxy().getServer(serverName).map((RegisteredServer::getServerInfo)).orElse(null);
     }
 
     /**
@@ -73,7 +73,7 @@ public class RedisBungeeAPI extends AbstractRedisBungeeAPI {
      * @since 0.12.0
      */
     public void kickPlayer(UUID playerUUID, Component message) {
-        this.plugin.playerDataManager().kickPlayer(playerUUID, message);
+        ((ApiPlatformSupport) this.plugin).kickPlayer(playerUUID, message);
     }
 
 

proxies/velocity/velocity-api/src/main/java/com/imaginarycode/minecraft/redisbungee/ServerObjectFetcher.java

@@ -1,10 +0,0 @@
-package com.imaginarycode.minecraft.redisbungee;
-
-import com.velocitypowered.api.proxy.ProxyServer;
-
-public interface ServerObjectFetcher {
-
-    ProxyServer getProxy();
-
-
-}