Merge pull request #14 from BakaAless/dev

🔀 Merge pull request #14

Author: Alessevan

build.gradle

@@ -1,5 +1,3 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
 plugins {
     id 'java'
     id 'idea'

src/main/java/fr/bakaaless/api/inventory/InventoryAPI.java

@@ -32,6 +32,7 @@ public class InventoryAPI implements Listener {
     private InventoryType type;
     private List<ItemAPI> items;
     private Consumer<InventoryAPI> function;
+    private Consumer<InventoryCloseEvent> closeEvent;
     private boolean interactionCancel;
     private boolean refreshed;
     private boolean build;
@@ -155,6 +156,16 @@ public InventoryAPI setFunction(final Consumer<InventoryAPI> function) {
         return this;
     }
 
+    /**
+     * Define the close function.
+     * @param function A consumer, that will be triggered when the player will close the inventory.
+     * @return Your InventoryAPI object
+     */
+    public InventoryAPI setCloseFunction(final Consumer<InventoryCloseEvent> function) {
+        this.closeEvent = function;
+        return this;
+    }
+
     /**
      * Enable interaction protection for your Inventory
      * @param interactionCancelled A boolean, to enable/disable
@@ -216,12 +227,20 @@ Inventory getInventory() {
 
     /**
      * Get the consumer of the refresh task of your Inventory.
-     * @return A consumer, that correspond to the refresh task.
+     * @return A consumer, that corresponds to the refresh task.
      */
     public Consumer<InventoryAPI> getFunction() {
         return function;
     }
 
+    /**
+     * Get the consumer which will be triggered when the player will close the inventory.
+     * @return A consumer, that corresponds to close event.
+     */
+    public Consumer<InventoryCloseEvent> getCloseEvent() {
+        return closeEvent;
+    }
+
     /**
      * Get the interactionCancelled boolean.
      * @return A boolean, true if interaction protection is enabled, else false.
@@ -446,6 +465,7 @@ public void stop() {
         if (this.refreshed)
             Scheduler.getInstance().remove(this);
         this.inventory = null;
+        this.build = false;
     }
 
     private Inventory generate() {
@@ -463,6 +483,7 @@ public void onClose(final InventoryCloseEvent e) {
             return;
         if (e.getInventory().getHolder() == null) {
             this.stop();
+            this.closeEvent.accept(e);
         }
     }
 

src/main/java/fr/bakaaless/api/inventory/Scheduler.java

@@ -83,13 +83,17 @@ public void forceStop(final JavaPlugin plugin) {
     synchronized void add(final InventoryAPI inv) {
         this.inventories.add(inv);
         if (this.inventories.size() == 1)
-            start();
+            this.start();
     }
 
     synchronized void remove(final InventoryAPI inv) {
         this.inventories.remove(inv);
         if (this.inventories.size() == 0)
-            stop();
+            this.stop();
+    }
+
+    synchronized int getStep() {
+        return this.step;
     }
 
 }