added fix for screen system + non blocking screen system

Author: Tarek

cloudnet-wrapper/src/main/java/de/dytanic/cloudnetwrapper/CloudNetWrapper.java

@@ -22,13 +22,13 @@
 import de.dytanic.cloudnet.web.client.WebClient;
 import de.dytanic.cloudnetwrapper.command.*;
 import de.dytanic.cloudnetwrapper.handlers.IWrapperHandler;
+import de.dytanic.cloudnetwrapper.handlers.ReadConsoleLogHandler;
 import de.dytanic.cloudnetwrapper.handlers.StopTimeHandler;
 import de.dytanic.cloudnetwrapper.network.packet.in.*;
 import de.dytanic.cloudnetwrapper.network.packet.out.PacketOutSetReadyWrapper;
 import de.dytanic.cloudnetwrapper.network.packet.out.PacketOutUpdateCPUUsage;
 import de.dytanic.cloudnetwrapper.network.packet.out.PacketOutUpdateWrapperInfo;
 import de.dytanic.cloudnetwrapper.network.packet.out.PacketOutWrapperScreen;
-import de.dytanic.cloudnetwrapper.screen.ScreenProvider;
 import de.dytanic.cloudnetwrapper.server.BungeeCord;
 import de.dytanic.cloudnetwrapper.server.CloudGameServer;
 import de.dytanic.cloudnetwrapper.server.GameServer;
@@ -56,7 +56,6 @@ public final class CloudNetWrapper implements Executable, Runnable, ShutdownOnCe
     private final CloudLogger cloudNetLogging;
     private final CloudNetWrapperConfig wrapperConfig;
     private final Scheduler scheduler = new Scheduler(40);
-    private final ScreenProvider screenProvider = new ScreenProvider();
     private final CommandManager commandManager = new CommandManager();
     private final WebClient webClient = new WebClient();
     private Auth auth;
@@ -180,9 +179,10 @@ public boolean bootstrap() throws Exception
         //Server Handlers
         {
             networkConnection.sendPacket(new PacketOutSetReadyWrapper(true));
-            IWrapperHandler iWrapperHandler = new StopTimeHandler();
+            IWrapperHandler iWrapperHandler = new StopTimeHandler(), readConsoleLogWrapperHandler = new ReadConsoleLogHandler();
 
             scheduler.runTaskRepeatSync(iWrapperHandler.toExecutor(), 0, iWrapperHandler.getTicks());
+            scheduler.runTaskRepeatSync(readConsoleLogWrapperHandler.toExecutor(), 0, readConsoleLogWrapperHandler.getTicks());
 
             scheduler.runTaskRepeatAsync(new Runnable() {
                 @Override

cloudnet-wrapper/src/main/java/de/dytanic/cloudnetwrapper/handlers/ReadConsoleLogHandler.java

@@ -0,0 +1,73 @@
+package de.dytanic.cloudnetwrapper.handlers;
+
+import de.dytanic.cloudnet.lib.server.screen.ScreenInfo;
+import de.dytanic.cloudnetwrapper.CloudNetWrapper;
+import de.dytanic.cloudnetwrapper.network.packet.out.PacketOutSendScreenLine;
+import de.dytanic.cloudnetwrapper.server.BungeeCord;
+import de.dytanic.cloudnetwrapper.server.CloudGameServer;
+import de.dytanic.cloudnetwrapper.server.GameServer;
+import de.dytanic.cloudnetwrapper.server.process.ServerDispatcher;
+
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+
+public final class ReadConsoleLogHandler implements IWrapperHandler {
+
+    private final StringBuffer stringBuffer = new StringBuffer();
+
+    private final byte[] buffer = new byte[1024];
+
+    private int len;
+
+    @Override
+    public void run(CloudNetWrapper obj)
+    {
+        for (CloudGameServer cloudGameServer : obj.getCloudServers().values())
+            if (cloudGameServer.isAlive() && cloudGameServer.getInstance() != null)
+                readConsoleLog(cloudGameServer);
+
+        for (BungeeCord bungeeCord : obj.getProxys().values())
+            if (bungeeCord.isAlive() && bungeeCord.getInstance() != null)
+                readConsoleLog(bungeeCord);
+
+        for (GameServer gameServer : obj.getServers().values())
+            if (gameServer.isAlive() && gameServer.getInstance() != null)
+                readConsoleLog(gameServer);
+    }
+
+    private void readConsoleLog(ServerDispatcher server)
+    {
+        if (server.getInstance().isAlive() && server.getInstance().getInputStream() != null)
+        {
+            try
+            {
+
+                InputStream inputStream = server.getInstance().getInputStream();
+
+                while (inputStream.available() > 0 && (len = inputStream.read(buffer, 0, buffer.length)) != -1)
+                    stringBuffer.append(new String(buffer, 0, len, StandardCharsets.UTF_8));
+
+                for (String input : stringBuffer.toString().split("\r"))
+                    for (String text : input.split("\n"))
+                        if (!text.trim().isEmpty())
+                        {
+                            CloudNetWrapper.getInstance().getNetworkConnection()
+                                    .sendPacket(new PacketOutSendScreenLine(Collections.singletonList(new ScreenInfo(server.getServiceId(), input))));
+                        }
+
+            } catch (Exception ignored)
+            {
+            } finally
+            {
+                stringBuffer.setLength(0);
+            }
+        }
+    }
+
+    @Override
+    public int getTicks()
+    {
+        return 40;
+    }
+}

cloudnet-wrapper/src/main/java/de/dytanic/cloudnetwrapper/network/packet/in/PacketInScreen.java

@@ -4,22 +4,16 @@
 
 package de.dytanic.cloudnetwrapper.network.packet.in;
 
-import com.google.gson.reflect.TypeToken;
-import de.dytanic.cloudnet.lib.DefaultType;
 import de.dytanic.cloudnet.lib.network.protocol.packet.PacketInHandler;
 import de.dytanic.cloudnet.lib.network.protocol.packet.PacketSender;
-import de.dytanic.cloudnet.lib.server.info.ProxyInfo;
-import de.dytanic.cloudnet.lib.server.info.ServerInfo;
 import de.dytanic.cloudnet.lib.utility.document.Document;
-import de.dytanic.cloudnetwrapper.CloudNetWrapper;
-import de.dytanic.cloudnetwrapper.server.BungeeCord;
-import de.dytanic.cloudnetwrapper.server.GameServer;
 
 public final class PacketInScreen extends PacketInHandler {
 
     @Override
     public void handleInput(Document data, PacketSender packetSender)
     {
+        /*
         if (data.getObject("type", DefaultType.class) != DefaultType.BUNGEE_CORD)
         {
             ServerInfo server = data.getObject("serverInfo", new TypeToken<ServerInfo>() {
@@ -45,5 +39,6 @@ else if (CloudNetWrapper.getInstance().getScreenProvider().contains(gameServer))
                     CloudNetWrapper.getInstance().getScreenProvider().cancel(gameServer);
             }
         }
+        */
     }
 }