Merge pull request #1 from Htepple/FormAPI-2.0

2.1-SNAPSHOT

pom.xml

@@ -6,9 +6,15 @@
 
     <groupId>ru.nukkitx</groupId>
     <artifactId>FormAPI</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
 
     <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources/</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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

@@ -38,32 +38,32 @@ public void formResponded(PlayerFormRespondedEvent event) {
 
             if (response == null || event.wasClosed()) {
                 if(temp instanceof CustomFormResponse){
-                    ((CustomFormResponse) temp).handle(player, window, null);
+                    ((CustomFormResponse) temp).handle(player, (FormWindowCustom) window, null);
 
                 }else if(temp instanceof ModalFormResponse) {
-                    ((ModalFormResponse) temp).handle(player, window, -1);
+                    ((ModalFormResponse) temp).handle(player, (FormWindowModal) window, -1);
 
                 }else if(temp instanceof SimpleFormResponse){
-                    ((SimpleFormResponse) temp).handle(player, window, -1);
+                    ((SimpleFormResponse) temp).handle(player, (FormWindowSimple) window, -1);
                 }
                 return;
             }
 
             if (window instanceof FormWindowSimple) {
                 data = ((FormResponseSimple) response).getClickedButtonId();
-                ((SimpleFormResponse) temp).handle(player, window, (int) data);
+                ((SimpleFormResponse) temp).handle(player, (FormWindowSimple) window, (int) data);
                 return;
             }
 
             if (window instanceof FormWindowCustom) {
                 data = new ArrayList<>(((FormResponseCustom) response).getResponses().values());
-                ((CustomFormResponse) temp).handle(player, window, (List<Object>)data);
+                ((CustomFormResponse) temp).handle(player, (FormWindowCustom) window, (List<Object>) data);
                 return;
             }
 
             if (window instanceof FormWindowModal) {
                 data = ((FormResponseModal) response).getClickedButtonId();
-                ((ModalFormResponse) temp).handle(player, window, (int) data);
+                ((ModalFormResponse) temp).handle(player, (FormWindowModal) window, (int) data);
             }
         }
     }

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

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

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

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 
 public abstract class Form {
+
     public static HashMap<String, FormResponse> playersForm = new HashMap<>();
     protected FormWindow form;
 

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

@@ -2,9 +2,11 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.form.window.FormWindow;
+import cn.nukkit.form.window.FormWindowModal;
+import cn.nukkit.form.window.FormWindowSimple;
 
 public interface ModalFormResponse extends FormResponse {
 
-    void handle(Player targetPlayer, FormWindow targetForm, int data);
+    void handle(Player targetPlayer, FormWindowModal targetForm, int data);
 
 }

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

@@ -2,9 +2,10 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.form.window.FormWindow;
+import cn.nukkit.form.window.FormWindowSimple;
 
 public interface SimpleFormResponse extends FormResponse {
 
-    void handle(Player targetPlayer, FormWindow targetForm, int data);
+    void handle(Player targetPlayer, FormWindowSimple targetForm, int data);
 
 }

src/main/resources/plugin.yml

@@ -1,9 +1,10 @@
 name: FormAPI
 main: ru.nukkitx.FormAPI
 api: "1.0.9"
-version: "2.0"
+version: "${pom.version}"
 author: qPexLegendary
 load: STARTUP
 authors:
   - qPexLegendary
-  - kkdevs
+  - kkdevs
+  - Hteppl