Continue internal GUI cleanup

Author: APickledWalrus

src/main/java/io/github/apickledwalrus/skriptgui/elements/conditions/CondIsLocked.java

@@ -13,7 +13,7 @@
 import org.skriptlang.skript.registration.SyntaxRegistry;
 
 @Name("Is GUI Locked")
-@Description("Whether a GUI is locked or unlocked, which controls whether its items without actions can be removed.")
+@Description("Whether a GUI is locked or unlocked, which controls whether its items without actions can be removed or changed.")
 @Example("""
 	if the player's gui is locked:
 		send "You cannot remove items from this GUI!" to the player
@@ -31,8 +31,8 @@ public static void register(SyntaxRegistry syntaxRegistry) {
 		syntaxRegistry.register(SyntaxRegistry.CONDITION, SyntaxInfo.builder(CondIsLocked.class)
 			.supplier(CondIsLocked::new)
 			.addPatterns(bePatterns)
-			.addPatterns("%guis% allow[s] items to be removed",
-				"%guis% (disallow|prevent)[s] items [from] being removed")
+			.addPatterns("%guis% allow[s] items to be (removed|changed)",
+				"%guis% (disallow|prevent)[s] items [from] being (removed|changed)")
 			.build());
 	}
 
@@ -44,7 +44,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 
 	@Override
 	public boolean check(GUI gui) {
-		return gui.isRemovable() != locked;
+		return gui.isChangeable() != locked;
 	}
 
 	@Override

src/main/java/io/github/apickledwalrus/skriptgui/elements/effects/EffCancelClose.java

@@ -57,7 +57,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	protected void execute(Event event) {
 		GUI gui = SkriptGUI.getGUIManager().getGUI(event);
 		if (gui != null) {
-			gui.setCloseCancelled(event, cancel);
+			gui.setCloseCanceled(event, cancel);
 		}
 	}
 

src/main/java/io/github/apickledwalrus/skriptgui/elements/effects/EffLock.java

@@ -16,7 +16,7 @@
 import org.skriptlang.skript.registration.SyntaxRegistry;
 
 @Name("Lock/Unlock GUI")
-@Description("Locks or unlocks a GUI, which controls whether its items without actions can be removed.")
+@Description("Locks or unlocks a GUI, which controls whether its items without actions can be removed or changed.")
 @Example("unlock the player's gui")
 @Since("1.4.0")
 public class EffLock extends Effect {
@@ -25,33 +25,33 @@ public static void register(SyntaxRegistry syntaxRegistry) {
 		syntaxRegistry.register(SyntaxRegistry.EFFECT, SyntaxInfo.builder(EffLock.class)
 			.supplier(EffLock::new)
 			.addPatterns("(:unlock|:lock) [gui[s]] %guis%",
-				"allow items to be removed from %guis%",
-				"(disallow|prevent) items [from] being removed from %guis%")
+				"allow items to be (removed|changed) from %guis%",
+				"(disallow|prevent) items [from] being (removed|changed) from %guis%")
 			.build());
 	}
 
 	private Expression<GUI> guis;
-	private boolean removable;
+	private boolean changeable;
 
 	@Override
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		//noinspection unchecked
 		this.guis = (Expression<GUI>) expressions[0];
-		this.removable = parseResult.hasTag("unlock") || matchedPattern == 1;
+		this.changeable = parseResult.hasTag("unlock") || matchedPattern == 1;
 		return true;
 	}
 
 	@Override
 	protected void execute(Event event) {
 		for (GUI gui : this.guis.getArray(event)) {
-			gui.setRemovable(removable);
+			gui.setChangeable(changeable);
 		}
 	}
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return new SyntaxStringBuilder(event, debug)
-			.append(removable ? "unlock" : "lock", guis)
+			.append(changeable ? "unlock" : "lock", guis)
 			.toString();
 	}
 

src/main/java/io/github/apickledwalrus/skriptgui/elements/expressions/ExprGlobalGUIs.java

@@ -37,7 +37,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
 	@Override
 	protected GUI[] get(Event event) {
-		return SkriptGUI.getGUIManager().getTrackedGUIs().toArray(new GUI[0]);
+		return SkriptGUI.getGUIManager().getGlobalGUIs().toArray(new GUI[0]);
 	}
 
 	@Override

src/main/java/io/github/apickledwalrus/skriptgui/elements/expressions/ExprLockStatus.java

@@ -41,7 +41,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 
 	@Override
 	public @Nullable Boolean convert(GUI gui) {
-		return !gui.isRemovable(); // Not removable = locked
+		return !gui.isChangeable(); // Not changeable = locked
 	}
 
 	@Override
@@ -54,9 +54,9 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 
 	@Override
 	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
-		boolean removable = delta != null && !((boolean) delta[0]);
+		boolean changeable = delta != null && !((boolean) delta[0]);
 		for (GUI gui : getExpr().getArray(event)) {
-			gui.setRemovable(removable);
+			gui.setChangeable(changeable);
 		}
 	}