Рефакторинг

Signed-off-by: Андрей <terentev.andrey.2002@gmail.com>

Author: ScarletRedMan

src/main/java/ru/nukkitx/events/EventListener.java

@@ -14,12 +14,17 @@
 import cn.nukkit.form.window.FormWindowCustom;
 import cn.nukkit.form.window.FormWindowModal;
 import cn.nukkit.form.window.FormWindowSimple;
+import ru.nukkitx.forms.CustomFormResponse;
 import ru.nukkitx.forms.Form;
+import ru.nukkitx.forms.ModalFormResponse;
+import ru.nukkitx.forms.SimpleFormResponse;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class EventListener implements Listener {
 
+    @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.HIGH)
     public void formResponded(PlayerFormRespondedEvent event) {
         Player player = event.getPlayer();
@@ -35,27 +40,49 @@ public void formResponded(PlayerFormRespondedEvent event) {
             Object data;
 
             if (event.wasClosed()) {
-                data = null;
-                temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
+                if(temp instanceof CustomFormResponse){
+                    ((CustomFormResponse) temp).handle(player, window, null);
+
+                }else if(temp instanceof ModalFormResponse) {
+                    ((ModalFormResponse) temp).handle(player, window, -1);
+
+                }else if(temp instanceof SimpleFormResponse){
+                    ((SimpleFormResponse) temp).handle(player, window, -1);
+
+                }else temp.handle(player, window, null, Form.paramsForm.get(player.getName()));
+
                 return;
             }
 
             if (window instanceof FormWindowSimple) {
                 data = ((FormResponseSimple) response).getClickedButtonId();
-                temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
+
+                if(temp instanceof SimpleFormResponse)
+                    ((SimpleFormResponse) temp).handle(player, window, (int) data);
+                else
+                    temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
+
                 return;
             }
 
             if (window instanceof FormWindowCustom) {
                 data = new ArrayList<>(((FormResponseCustom) response).getResponses().values());
-                temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
+
+                if(temp instanceof CustomFormResponse)
+                    ((CustomFormResponse) temp).handle(player, window, (List<Object>)data);
+                else
+                    temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
+
                 return;
             }
 
             if (window instanceof FormWindowModal) {
                 data = ((FormResponseModal) response).getClickedButtonId();
-                temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
-                return;
+
+                if(temp instanceof ModalFormResponse)
+                    ((ModalFormResponse) temp).handle(player, window, (int) data);
+                else
+                    temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
             }
         }
     }

src/main/java/ru/nukkitx/forms/CustomFormResponse.java

@@ -0,0 +1,12 @@
+package ru.nukkitx.forms;
+
+import cn.nukkit.Player;
+import cn.nukkit.form.window.FormWindow;
+
+import java.util.List;
+
+public interface CustomFormResponse extends FormResponse {
+
+    void handle(Player targetPlayer, FormWindow targetForm, List<Object> data);
+
+}

src/main/java/ru/nukkitx/forms/Form.java

@@ -10,17 +10,19 @@ public abstract class Form {
     public static HashMap<String, HashMap<String, Object>> paramsForm = new HashMap<>();
     protected FormWindow form;
 
-    public final void send(Player player) {
+    public void send(Player player) {
         player.showFormWindow(form);
     }
 
-    public final void send(Player player, FormResponse response) {
+    @Deprecated
+    public void send(Player player, FormResponse response) {
         playersForm.put(player.getName(), response);
         paramsForm.put(player.getName(), null);
         player.showFormWindow(form);
     }
 
-    public final void send(Player player, FormResponse response, HashMap<String, Object> params) {
+    @Deprecated
+    public void send(Player player, FormResponse response, HashMap<String, Object> params) {
         playersForm.put(player.getName(), response);
         paramsForm.put(player.getName(), params);
         player.showFormWindow(form);

src/main/java/ru/nukkitx/forms/FormResponse.java

@@ -7,13 +7,6 @@
 
 public interface FormResponse {
 
-    /*
-     *
-     * player - Игрок.
-     * window - Форма, полученного результата.
-     * data - Результат формы (является null, если форма была закрыта)
-     *
-     */
-
+    @Deprecated
     void handle(Player player, FormWindow window, Object data, HashMap<String, Object> params);
 }

src/main/java/ru/nukkitx/forms/ModalFormResponse.java

@@ -0,0 +1,10 @@
+package ru.nukkitx.forms;
+
+import cn.nukkit.Player;
+import cn.nukkit.form.window.FormWindow;
+
+public interface ModalFormResponse extends FormResponse {
+
+    void handle(Player targetPlayer, FormWindow targetForm, int data);
+
+}

src/main/java/ru/nukkitx/forms/SimpleFormResponse.java

@@ -0,0 +1,10 @@
+package ru.nukkitx.forms;
+
+import cn.nukkit.Player;
+import cn.nukkit.form.window.FormWindow;
+
+public interface SimpleFormResponse extends FormResponse {
+
+    void handle(Player targetPlayer, FormWindow targetForm, int data);
+
+}

src/main/java/ru/nukkitx/forms/elements/CustomForm.java

@@ -1,7 +1,9 @@
 package ru.nukkitx.forms.elements;
 
+import cn.nukkit.Player;
 import cn.nukkit.form.element.*;
 import cn.nukkit.form.window.FormWindowCustom;
+import ru.nukkitx.forms.CustomFormResponse;
 import ru.nukkitx.forms.Form;
 
 import java.util.List;
@@ -20,6 +22,12 @@ public CustomForm(String title) {
         form = new FormWindowCustom(title);
     }
 
+    public void send(Player player, CustomFormResponse response){
+        playersForm.put(player.getName(), response);
+        paramsForm.put(player.getName(), null);
+        player.showFormWindow(form);
+    }
+
     public CustomForm setTitle(String value) {
         ((FormWindowCustom) form).setTitle(value);
         return this;

src/main/java/ru/nukkitx/forms/elements/ModalForm.java

@@ -1,7 +1,9 @@
 package ru.nukkitx.forms.elements;
 
+import cn.nukkit.Player;
 import cn.nukkit.form.window.FormWindowModal;
 import ru.nukkitx.forms.Form;
+import ru.nukkitx.forms.ModalFormResponse;
 
 public class ModalForm extends Form {
 
@@ -29,6 +31,12 @@ public ModalForm(String title, String content, String trueButton, String falseBu
         form = new FormWindowModal(title, content, trueButton, falseButton);
     }
 
+    public void send(Player player, ModalFormResponse response){
+        playersForm.put(player.getName(), response);
+        paramsForm.put(player.getName(), null);
+        player.showFormWindow(form);
+    }
+
     public ModalForm setTitle(String value) {
         ((FormWindowModal) form).setTitle(value);
 

src/main/java/ru/nukkitx/forms/elements/SimpleForm.java

@@ -1,9 +1,11 @@
 package ru.nukkitx.forms.elements;
 
+import cn.nukkit.Player;
 import cn.nukkit.form.element.ElementButton;
 import cn.nukkit.form.element.ElementButtonImageData;
 import cn.nukkit.form.window.FormWindowSimple;
 import ru.nukkitx.forms.Form;
+import ru.nukkitx.forms.SimpleFormResponse;
 
 public class SimpleForm extends Form {
 
@@ -23,6 +25,12 @@ public SimpleForm(String title, String content) {
         form = new FormWindowSimple(title, content);
     }
 
+    public void send(Player player, SimpleFormResponse response) {
+        playersForm.put(player.getName(), response);
+        paramsForm.put(player.getName(), null);
+        player.showFormWindow(form);
+    }
+
     public SimpleForm setTitle(String value) {
         ((FormWindowSimple) form).setTitle(value);
         return this;

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: FormAPI
 main: ru.nukkitx.FormAPI
 api: "1.0.9"
-version: "1.0"
+version: "1.2"
 author: qPexLegendary
 load: STARTUP
 authors: