Merge branch 'main' of https://github.com/RedstoneCloud/CloudBridge

Author: PleaseInsertNameHere

pom.xml

@@ -16,6 +16,7 @@
         <version.allay>0.1.2</version.allay>
         <version.waterdogpe>2.0.3-SNAPSHOT</version.waterdogpe>
         <version.powernukkitx>master-SNAPSHOT</version.powernukkitx>
+        <version.nukkit>1.0-SNAPSHOT</version.nukkit>
     </properties>
 
     <repositories>
@@ -57,7 +58,7 @@
             <groupId>com.github.PowerNukkitX</groupId>
             <artifactId>PowerNukkitX</artifactId>
             <version>${version.powernukkitx}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.cloudburstmc.netty</groupId>
@@ -74,29 +75,38 @@
             <groupId>dev.waterdog.waterdogpe</groupId>
             <artifactId>waterdog</artifactId>
             <version>${version.waterdogpe}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.github.AllayMC.Allay</groupId>
             <artifactId>api</artifactId>
             <version>${version.allay}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.nukkit</groupId>
+            <artifactId>nukkit</artifactId>
+            <version>${version.nukkit}</version>
+            <scope>provided</scope>
         </dependency>
 
-        <!--<dependency>
+        <dependency>
             <groupId>com.github.RedstoneCloud.RedstoneCloud</groupId>
             <artifactId>api</artifactId>
             <version>main-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        -->
 
+<!--
         <dependency>
             <groupId>de.redstonecloud</groupId>
             <artifactId>api</artifactId>
             <version>0.1-beta</version>
             <scope>compile</scope>
         </dependency>
+-->
     </dependencies>
 
     <build>
@@ -122,4 +132,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgePlayer.java

@@ -33,7 +33,7 @@ public static BridgePlayer readFromCache(String uuid) {
                 .address(HostAndPort.fromString(json.get("address").getAsString()))
                 .network(BridgeServer.readFromCache(json.get("network").getAsString()))
                 .server(BridgeServer.readFromCache(json.get("server").getAsString()))
-                .customData(new JsonParser().parse(json.get("customData").getAsString()))
+                .customData(JsonParser.parseString(json.get("customData").getAsString()))
                 .build();
 
         return server;

src/main/java/de/redstonecloud/bridge/platform/nukkit/NukkitExecutor.java

@@ -0,0 +1,75 @@
+package de.redstonecloud.bridge.platform.nukkit;
+
+import cn.nukkit.Player;
+import cn.nukkit.Server;
+import cn.nukkit.scheduler.Task;
+import com.google.common.net.HostAndPort;
+import de.redstonecloud.api.components.ICloudPlayer;
+import de.redstonecloud.bridge.cloudinterface.components.BridgeExecutor;
+import de.redstonecloud.bridge.cloudinterface.components.BridgeServer;
+
+import java.util.Objects;
+import java.util.UUID;
+
+public class NukkitExecutor implements BridgeExecutor {
+    private static Server server = Server.getInstance();
+
+    public Player getPlayerByCloudPlayer(ICloudPlayer player) {
+        return server.getPlayer(UUID.fromString(player.getUUID())).get();
+    }
+
+    public void sendMessage(ICloudPlayer cloudPlayer, String message) {
+        Objects.requireNonNull(getPlayerByCloudPlayer(cloudPlayer)).sendMessage(message);
+    }
+
+    @Override
+    public void sendTitle(ICloudPlayer cloudPlayer, String title) {
+        getPlayerByCloudPlayer(cloudPlayer).sendTitle(title);
+    }
+
+    @Override
+    public void kick(ICloudPlayer player) {
+        Objects.requireNonNull(getPlayerByCloudPlayer(player)).kick();
+    }
+
+    @Override
+    public void kick(ICloudPlayer player, String reason) {
+        Objects.requireNonNull(getPlayerByCloudPlayer(player)).kick(reason, false);
+    }
+
+    @Override
+    public void sendActionbar(ICloudPlayer player, String message) {
+        getPlayerByCloudPlayer(player).sendActionBar(message);
+    }
+
+    @Override
+    public void sendToast(ICloudPlayer player, String title, String message) {
+        getPlayerByCloudPlayer(player).sendToast(title, message);
+    }
+
+    @Override
+    public void runDelayed(Runnable code, int tickDelay) {
+        server.getScheduler().scheduleDelayedTask(new Task() {
+            @Override
+            public void onRun(int i) {
+                code.run();
+            }
+        }, tickDelay);
+    }
+
+
+
+    public void addServer(String name, HostAndPort address) {}
+
+    public void removeServer(String name) {}
+
+    public boolean hasServer(String name) {
+        return false;
+    }
+
+    public BridgeServer determineServer(String serverName) {
+        return null;
+    }
+
+    public void connect(ICloudPlayer player, String name) {}
+}

src/main/java/de/redstonecloud/bridge/platform/nukkit/NukkitListener.java

@@ -0,0 +1,24 @@
+package de.redstonecloud.bridge.platform.nukkit;
+
+import cn.nukkit.Player;
+import cn.nukkit.event.EventHandler;
+import cn.nukkit.event.Listener;
+import cn.nukkit.event.player.PlayerLoginEvent;
+import cn.nukkit.event.player.PlayerQuitEvent;
+import de.redstonecloud.bridge.cloudinterface.CloudInterface;
+
+public class NukkitListener implements Listener {
+    @EventHandler
+    public void onLogin(PlayerLoginEvent ev) {
+        Player player = ev.getPlayer();
+
+        CloudInterface.getInstance().playerLogin(player.getName(), player.getUniqueId().toString(), player.getAddress());
+    }
+
+    @EventHandler
+    public void onDisconnect(PlayerQuitEvent ev) {
+        Player player = ev.getPlayer();
+
+        CloudInterface.getInstance().playerDisconnect(player.getUniqueId().toString());
+    }
+}

src/main/java/de/redstonecloud/bridge/platform/nukkit/NukkitPlugin.java

@@ -0,0 +1,24 @@
+package de.redstonecloud.bridge.platform.nukkit;
+
+import cn.nukkit.plugin.PluginBase;
+import de.redstonecloud.bridge.cloudinterface.CloudInterface;
+
+public class NukkitPlugin extends PluginBase {
+    public CloudInterface cloudInterface;
+
+    @Override
+    public void onLoad() {
+        cloudInterface = CloudInterface.getInstance();
+    }
+
+    @Override
+    public void onEnable() {
+        cloudInterface.start(new NukkitExecutor());
+        this.getServer().getPluginManager().registerEvents(new NukkitListener(), this);
+    }
+
+    @Override
+    public void onDisable() {
+        cloudInterface.shutdown();
+    }
+}

src/main/java/de/redstonecloud/bridge/platform/waterdogpe/WDPEHandler.java

@@ -60,7 +60,7 @@ public static ServerInfo fetchServer() {
                 .send(BestTemplateResultPacket.class, response -> name.complete(response.getServer()));
 
         try {
-            BridgeServer srv = CloudInterface.getExecutor().determineServer(name.completeOnTimeout("", 1, TimeUnit.SECONDS).get().toUpperCase());
+            BridgeServer srv = CloudInterface.getExecutor().determineServer(name.completeOnTimeout("", 3, TimeUnit.SECONDS).get().toUpperCase());
             return ProxyServer.getInstance().getServerInfo(srv.getName());
         } catch (Exception e) {
             return null;

src/main/resources/nukkit.yml

@@ -0,0 +1,9 @@
+name: CloudBridge
+main: de.redstonecloud.bridge.platform.nukkit.NukkitPlugin
+load: STARTUP
+version: 1.0
+api: 1.0.0
+
+description: CloudBridge for RedstoneCloud
+author: RedstoneCloud
+website: https://github.com/RedstoneCloud

src/main/resources/plugin.json

@@ -0,0 +1,6 @@
+{
+  "entrance": "de.redstonecloud.bridge.platform.allay.AllayPlugin",
+  "name": "CloudBridge",
+  "authors": ["RedstoneCloud"],
+  "version": "1.0"
+}