From 16c3db1820d3665d397f7157de7c0f94bc9ef027 Mon Sep 17 00:00:00 2001
From: C10udburst <18114966+C10udburst@users.noreply.github.com>
Date: Sat, 19 Feb 2022 16:00:52 +0100
Subject: [PATCH] tweaks numero duo

---
 .../rejects/commands/ServerCommand.java       | 28 +++++++++++++++++--
 .../utils/portscanner/PScanRunner.java        |  3 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/main/java/anticope/rejects/commands/ServerCommand.java b/src/main/java/anticope/rejects/commands/ServerCommand.java
index 0a7e78b..0057eb0 100644
--- a/src/main/java/anticope/rejects/commands/ServerCommand.java
+++ b/src/main/java/anticope/rejects/commands/ServerCommand.java
@@ -53,6 +53,7 @@ public class ServerCommand extends Command {
         ports.put(8123, "DynMap");
         ports.put(25566, "Minequery");
         ports.put(3306, "MySQL");
+        ports.put(3389, "RDP");
     }
 
     @Override
@@ -122,7 +123,7 @@ public class ServerCommand extends Command {
         BaseText text = new LiteralText(String.format("- %s%d%s ", Formatting.GREEN, port, Formatting.GRAY));
         if (ports.containsKey(port)) {
             text.append(ports.get(port));
-            if (ports.get(port).startsWith("HTTP")) {
+            if (ports.get(port).startsWith("HTTP") || ports.get(port).startsWith("FTP")) {
                 text.setStyle(text.getStyle()
                     .withClickEvent(new ClickEvent(
                         Action.OPEN_URL,
@@ -133,8 +134,7 @@ public class ServerCommand extends Command {
                         new LiteralText("Open in browser")
                     ))
                 );
-            }
-            else if (ports.get(port) == "DynMap") {
+            } else if (ports.get(port) == "DynMap") {
                 text.setStyle(text.getStyle()
                     .withClickEvent(new ClickEvent(
                         ClickEvent.Action.OPEN_URL,
@@ -145,7 +145,29 @@ public class ServerCommand extends Command {
                         new LiteralText("Open in browser")
                     ))
                 );
+            } else {
+                text.setStyle(text.getStyle()
+                    .withClickEvent(new ClickEvent(
+                        ClickEvent.Action.COPY_TO_CLIPBOARD,
+                        String.format("%s:%d", address.getHostAddress(), port)
+                    ))
+                    .withHoverEvent(new HoverEvent(
+                        HoverEvent.Action.SHOW_TEXT,
+                        new LiteralText("Copy")
+                    ))
+                );
             }
+        } else {
+            text.setStyle(text.getStyle()
+                .withClickEvent(new ClickEvent(
+                    ClickEvent.Action.COPY_TO_CLIPBOARD,
+                    String.format("%s:%d", address.getHostAddress(), port)
+                ))
+                .withHoverEvent(new HoverEvent(
+                    HoverEvent.Action.SHOW_TEXT,
+                    new LiteralText("Copy")
+                ))
+            );
         }
 
         return text;
diff --git a/src/main/java/anticope/rejects/utils/portscanner/PScanRunner.java b/src/main/java/anticope/rejects/utils/portscanner/PScanRunner.java
index 75abeb3..1cfee46 100644
--- a/src/main/java/anticope/rejects/utils/portscanner/PScanRunner.java
+++ b/src/main/java/anticope/rejects/utils/portscanner/PScanRunner.java
@@ -24,7 +24,7 @@ public class PScanRunner {
                 futures.add(isPortOpen(es, address.getHostAddress(), port, timeoutMS, threadDelay));
             });
             try {
-                boolean _1 = es.awaitTermination(200L, TimeUnit.MILLISECONDS);
+                es.awaitTermination(200L, TimeUnit.MILLISECONDS);
             } catch (InterruptedException ignored) {
             }
             List<PortScannerManager.ScanResult> results = new ArrayList<>();
@@ -52,7 +52,6 @@ public class PScanRunner {
             Thread.sleep(delay);
             portsScanned++;
             try {
-                //System.out.println(ip + ":" + port);
                 Socket socket = new Socket();
                 socket.connect(new InetSocketAddress(ip, port), timeout);
                 socket.close();