Add default text for port + go to main on direct window close + error message improved

3 files changed, 22 insertions, 24 deletions

diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/PipePlayer.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/PipePlayer.java
index a468fa4..7786115 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/PipePlayer.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/PipePlayer.java
@@ -103,8 +103,6 @@ public class PipePlayer {
         session.sendPacketImmediately(startGamePacket);
 
         spawn();
-
-
     }
 
     public void sendAttributes() {
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/gui/UIComponents.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/gui/UIComponents.java
index 85c656b..5c9ee14 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/gui/UIComponents.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/gui/UIComponents.java
@@ -26,6 +26,15 @@ public class UIComponents {
         return input;
     }
 
+    public static JsonObject createInput(String text, String placeholder, String defaultValue) {
+        JsonObject input = new JsonObject();
+        input.addProperty("type", "input");
+        input.addProperty("placeholder", placeholder);
+        input.addProperty("text", text);
+        input.addProperty("default", defaultValue);
+        return input;
+    }
+
     public static JsonObject createButton(String text, String image, String imageType) {
         JsonObject button = new JsonObject();
         button.addProperty("text", text);
@@ -51,19 +60,6 @@ public class UIComponents {
         return form;
     }
 
-    public static ModalFormRequestPacket createError(String error) {
-        ModalFormRequestPacket mf = new ModalFormRequestPacket();
-        mf.setFormId(UIForms.ERROR);
-        JsonObject form = new JsonObject();
-        form.addProperty("type", "custom_form");
-        form.addProperty("title", "Error");
-        JsonArray content = new JsonArray();
-        content.add(createLabel(error));
-        form.add("content", content);
-        mf.setFormData(form.toString());
-        return mf;
-    }
-
     public static ArrayList<String> getFormData(String data) {
         JSONParser parser = new JSONParser();
         try {
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java
index b4926fc..ca13655 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java
@@ -209,7 +209,7 @@ public class PacketHandler implements BedrockPacketHandler {
         System.out.println("\"" + packet.getFormData().replaceAll("\\s+","") + "\"");
 
             switch (packet.getFormId()) {
-                case 0:
+                case UIForms.MAIN:
                     if(UIForms.currentForm == UIForms.MAIN) {
                         if (packet.getFormData().replaceAll("\\s+","").contains("0")) {
                             session.sendPacketImmediately(UIForms.createDirectConnect());
@@ -218,18 +218,22 @@ public class PacketHandler implements BedrockPacketHandler {
                         }
                     }
                     break;
-                case 1:
+                case UIForms.DIRECT_CONNECT:
                     try {
-                        ArrayList<String> data = UIComponents.getFormData(packet.getFormData());
-                        TransferPacket tp = new TransferPacket();
-                        tp.setAddress(data.get(0).replace(" ", ""));
-                        tp.setPort(Integer.parseInt(data.get(1)));
-                        session.sendPacketImmediately(tp);
+                        if(packet.getFormData().contains("null"))
+                            session.sendPacketImmediately(UIForms.createMain());
+                        else {
+                            ArrayList<String> data = UIComponents.getFormData(packet.getFormData());
+                            TransferPacket tp = new TransferPacket();
+                            tp.setAddress(data.get(0).replace(" ", ""));
+                            tp.setPort(Integer.parseInt(data.get(1)));
+                            session.sendPacketImmediately(tp);
+                        }
                     } catch(Exception e) {
-                        session.sendPacketImmediately(UIComponents.createError("Please enter a port that contains only numbers."));
+                        session.sendPacketImmediately(UIForms.createError("Please enter a valid IP/Address and port that contains only numbers."));
                     }
                     break;
-                case 2:
+                case UIForms.ERROR:
                     session.sendPacketImmediately(UIForms.createMain());
                     break;
             }