Track GUI closing by events

Author: APickledWalrus

…/elements/effects/EffCancelGUIClose.java …lements/effects/EffCancelGuiClosing.javasrc/main/java/io/github/apickledwalrus/skriptgui/elements/effects/EffCancelGUIClose.java renamed to src/main/java/io/github/apickledwalrus/skriptgui/elements/effects/EffCancelGuiClosing.java src/main/java/io/github/apickledwalrus/skriptgui/elements/effects/EffCancelGUIClose.java renamed to src/main/java/io/github/apickledwalrus/skriptgui/elements/effects/EffCancelGuiClosing.java

@@ -30,10 +30,10 @@
 		"\t\tcancel the gui closing"
 })
 @Since("1.2.0")
-public class EffCancelGUIClose extends Effect {
+public class EffCancelGuiClosing extends Effect {
 
 	static {
-		Skript.registerEffect(EffCancelGUIClose.class,
+		Skript.registerEffect(EffCancelGuiClosing.class,
 				"(:cancel|uncancel) [the] gui clos(e|ing)"
 		);
 	}
@@ -48,14 +48,15 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 			return false;
 		}
 		cancel = parseResult.hasTag("cancel");
+		parser.setHasDelayBefore(Kleenean.TRUE); // Cancelling forces a 1-tick delay
 		return true;
 	}
 
 	@Override
 	protected void execute(Event event) {
 		GUI gui = SkriptGUI.getGUIManager().getGUI(event);
 		if (gui != null) {
-			gui.setCloseCancelled(cancel);
+			gui.setCloseCancelled(event, cancel);
 		}
 	}
 

src/main/java/io/github/apickledwalrus/skriptgui/gui/GUI.java

@@ -6,6 +6,7 @@
 import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
@@ -17,8 +18,10 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.function.Consumer;
 
 public class GUI implements AnyNamed {
@@ -116,10 +119,10 @@ public void onClose(InventoryCloseEvent e) {
 			if (onClose != null) {
 				SkriptGUI.getGUIManager().setGUI(e, GUI.this);
 				onClose.accept(e);
-				if (closeCancelled) {
+				if (closeCancelled.contains(e)) {
 					Bukkit.getScheduler().runTaskLater(SkriptGUI.getInstance(), () -> {
 						// Reset behavior (it shouldn't persist)
-						setCloseCancelled(false);
+						setCloseCancelled(e, false);
 
 						Player closer = (Player) e.getPlayer();
 						pause(closer); // Avoid calling any open sections
@@ -153,7 +156,7 @@ public void onClose(InventoryCloseEvent e) {
 	@Nullable
 	private Consumer<InventoryCloseEvent> onClose;
 	// Whether the inventory close event for this event handler is cancelled.
-	private boolean closeCancelled;
+	private final Set<Event> closeCancelled = new HashSet<>();
 
 	@Nullable
 	private String id;
@@ -500,8 +503,12 @@ public void setOnClose(Consumer<InventoryCloseEvent> onClose) {
 	 * Sets whether this GUI's close event should be cancelled.
 	 * @param cancel Whether this GUI's close event should be cancelled.
 	 */
-	public void setCloseCancelled(boolean cancel) {
-		closeCancelled = cancel;
+	public void setCloseCancelled(Event event, boolean cancel) {
+		if (cancel) {
+			closeCancelled.add(event);
+		} else {
+			closeCancelled.remove(event);
+		}
 	}
 
 	/**