Switch to Property system

Author: APickledWalrus

src/main/java/org/skriptlang/skriptworldguard/SkriptWorldGuard.java

@@ -19,12 +19,17 @@
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.managers.RemovalStrategy;
 import com.sk89q.worldguard.session.MoveType;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.addon.AddonModule;
 import org.skriptlang.skript.addon.SkriptAddon;
+import org.skriptlang.skript.lang.properties.Property;
+import org.skriptlang.skript.lang.properties.handlers.ContainsHandler;
+import org.skriptlang.skript.lang.properties.handlers.base.ExpressionPropertyHandler;
 import org.skriptlang.skript.registration.SyntaxRegistry;
 import org.skriptlang.skript.util.ClassLoader;
 import org.skriptlang.skriptworldguard.worldguard.RegionUtils;
@@ -166,7 +171,25 @@ public void change(WorldGuardRegion[] regions, Object @Nullable [] delta, Change
 							}
 						}
 					}
-				}));
+				})
+				.property(Property.NAME, "The name (ID) of a region as text. Cannot be changed.", addon,
+						ExpressionPropertyHandler.of(WorldGuardRegion::name, String.class))
+				.property(Property.CONTAINS, "Regions can contain chunks and locations.", addon,
+						new ContainsHandler<WorldGuardRegion, Object>() {
+							@Override
+							public boolean contains(WorldGuardRegion region, Object element) {
+								return switch (element) {
+									case Chunk chunk -> region.contains(chunk);
+									case Location location -> region.contains(location);
+									default -> false;
+								};
+							}
+
+							@Override
+							public Class<?>[] elementTypes() {
+								return new Class[]{Chunk.class, Location.class};
+							}
+						}));
 
 		Classes.registerClass(new EnumClassInfo<>(MoveType.class, "worldguardmovetype", "worldguard move types")
 				.user("worldguard ?move(ment)? ?types?")

src/main/java/org/skriptlang/skriptworldguard/worldguard/WorldGuardRegion.java

@@ -1,7 +1,5 @@
 package org.skriptlang.skriptworldguard.worldguard;
 
-import ch.njol.skript.lang.util.common.AnyContains;
-import ch.njol.skript.lang.util.common.AnyNamed;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.regions.CuboidRegion;
@@ -14,15 +12,13 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.jetbrains.annotations.NotNull;
-import org.skriptlang.skript.lang.converter.Converters;
 
 /**
  * A utility record for associating a {@link ProtectedRegion} with a {@link World}.
  * @param world The world {@code region} is within.
  * @param region WorldGuard region.
  */
-public record WorldGuardRegion(World world, ProtectedRegion region)
-		implements Comparable<WorldGuardRegion>, AnyNamed, AnyContains<Object> {
+public record WorldGuardRegion(World world, ProtectedRegion region) implements Comparable<WorldGuardRegion> {
 
 	/**
 	 * A helper method to provide a standardized way to stringify a {@link WorldGuardRegion} from its components.
@@ -37,52 +33,31 @@ public static String toString(World world, String id) {
 
 	@Override
 	public boolean equals(Object other) {
-		if (other instanceof WorldGuardRegion otherRegion) {
-			return otherRegion.world() == world && otherRegion.region().getId().equals(region.getId());
+		if (other instanceof WorldGuardRegion(World otherWorld, ProtectedRegion otherRegion)) {
+			return world == otherWorld && region.getId().equals(otherRegion.getId());
 		}
 		return false;
 	}
 
 	@Override
-	public String toString() {
+	public @NotNull String toString() {
 		return toString(world, region.getId());
 	}
 
-	/*
-	 * Comparable
-	 */
-
-	@Override
-	public int compareTo(@NotNull WorldGuardRegion other) {
-		return Integer.compare(this.region.getPriority(), other.region.getPriority());
-	}
-
-	/*
-	 * AnyNamed
+	/**
+	 * @return The name (ID) of this region.
 	 */
-
-	@Override
 	public String name() {
 		return region.getId();
 	}
 
 	/*
-	 * AnyContains
+	 * Comparable
 	 */
 
 	@Override
-	public boolean contains(Object object) {
-		if (object instanceof Chunk chunk) {
-			BlockVector2 chunkVector = BlockVector2.at(chunk.getX(), chunk.getZ());
-			return asWorldEditRegion().getChunks().contains(chunkVector);
-		}
-		Location location = Converters.convert(object, Location.class);
-		return location != null && region.contains(BukkitAdapter.asBlockVector(location));
-	}
-
-	@Override
-	public boolean isSafeToCheck(Object value) {
-		return value != null;
+	public int compareTo(@NotNull WorldGuardRegion other) {
+		return Integer.compare(this.region.getPriority(), other.region.getPriority());
 	}
 
 	/*
@@ -108,4 +83,21 @@ public Region asWorldEditRegion() {
 		return worldEditRegion;
 	}
 
+	/**
+	 * @param chunk The chunk to check for.
+	 * @return Whether {@code chunk} is within this region.
+	 */
+	public boolean contains(Chunk chunk) {
+		BlockVector2 chunkVector = BlockVector2.at(chunk.getX(), chunk.getZ());
+		return asWorldEditRegion().getChunks().contains(chunkVector);
+	}
+
+	/**
+	 * @param location The location to check for.
+	 * @return Whether {@code location} is within this region.
+	 */
+	public boolean contains(Location location) {
+		return region.contains(BukkitAdapter.asBlockVector(location));
+	}
+
 }