Add support for Velocity's RedisBungee (ValioBungee)

Author: AlexanderMandera

WarpSystem/WarpSystem-Proxy/WarpSystem-Proxy-BungeeCord/pom.xml

@@ -70,6 +70,7 @@
         <dependency>
             <groupId>com.imaginarycode.minecraft</groupId>
             <artifactId>RedisBungee</artifactId>
+            <version>0.3.8-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

WarpSystem/WarpSystem-Proxy/WarpSystem-Proxy-Velocity/pom.xml

@@ -66,5 +66,12 @@
             <version>3.1.1</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.ProxioDev.ValioBungee</groupId>
+            <artifactId>RedisBungee-Velocity</artifactId>
+            <version>0.12.6</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
+
 </project>

WarpSystem/WarpSystem-Proxy/WarpSystem-Proxy-Velocity/src/main/java/de/codingair/warpsystem/velocity/base/WarpSystem.java

@@ -22,6 +22,7 @@
 import de.codingair.warpsystem.velocity.base.listeners.MainListener;
 import de.codingair.warpsystem.velocity.base.listeners.SetupAssistantListener;
 import de.codingair.warpsystem.velocity.base.managers.*;
+import de.codingair.warpsystem.velocity.redis.RedisBungeeHandler;
 import de.codingair.warpsystem.velocity.utils.VelocityHandler;
 import de.codingair.warpsystem.velocity.utils.VelocityPlayer;
 import de.codingair.warpsystem.velocity.utils.VelocityScheduleTask;
@@ -159,7 +160,13 @@ private void checkRedis() {
         if (!enabled) {
             name = "Disabled";
         } else if (proxy.getPluginManager().getPlugin("trevor").isPresent()) {
+            name = "Trevor";
             RedisCore.core().setHandler(new TrevorHandler());
+        } else if (proxy.getPluginManager().getPlugin("redisbungee").isPresent()) {
+            name = "RedisBungee";
+            RedisBungeeHandler handler = new RedisBungeeHandler();
+            proxy.getEventManager().register(this, handler);
+            RedisCore.core().setHandler(handler);
         }
 
         log("Redis hook: " + name);

WarpSystem/WarpSystem-Proxy/WarpSystem-Proxy-Velocity/src/main/java/de/codingair/warpsystem/velocity/redis/RedisBungeeHandler.java

@@ -0,0 +1,63 @@
+package de.codingair.warpsystem.velocity.redis;
+
+import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI;
+import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
+import com.velocitypowered.api.event.Subscribe;
+import de.codingair.warpsystem.core.proxy.redis.RedisHandler;
+import de.codingair.warpsystem.core.proxy.transfer.CoreDataHandler;
+
+import java.io.*;
+import java.util.Base64;
+
+public class RedisBungeeHandler extends RedisHandler {
+    public RedisBungeeHandler() {
+        super(RedisBungeeAPI.getRedisBungeeApi().getProxyId(), CoreDataHandler.redisChannel);
+    }
+
+    @Override
+    public void send(byte[] data) {
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        DataOutputStream out = new DataOutputStream(stream);
+
+        try {
+            out.writeUTF(source);
+
+            //use Base64 to avoid virtual ends for the packet stream
+            byte[] encoded = Base64.getEncoder().encode(data);
+            out.writeUTF(new String(encoded));
+
+            RedisBungeeAPI.getRedisBungeeApi().sendChannelMessage(channel, stream.toString());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void registerChannel() {
+
+    }
+
+    @Override
+    public void unregisterChannel() {
+
+    }
+
+    @Subscribe
+    public void onPubSub(PubSubMessageEvent e) {
+        if (e.getChannel().equals(channel)) {
+            DataInputStream in = new DataInputStream(new ByteArrayInputStream(e.getMessage().getBytes()));
+
+            try {
+                String source = in.readUTF();
+                if (source.equals(this.source)) return;
+
+                String encoded = in.readUTF();
+                byte[] data = Base64.getDecoder().decode(encoded.getBytes());
+
+                sink.receive(data, source);
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+}

WarpSystem/pom.xml

@@ -141,12 +141,6 @@
                 <version>master-d32606d677-1</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>com.imaginarycode.minecraft</groupId>
-                <artifactId>RedisBungee</artifactId>
-                <version>0.3.8-SNAPSHOT</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>org.geysermc.floodgate</groupId>
                 <artifactId>api</artifactId>