zAPI 2.0.2

Author: yL3oft

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.yleoft</groupId>
     <artifactId>zAPI</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <description>A library for creating Paper-based plugins.</description>
     <url>https://github.com/yL3oft/zAPI</url>
 

src/main/java/me/yleoft/zAPI/command/CommandBasis.java

@@ -189,6 +189,17 @@ final class ParameterParseResult {
             }
 
             String[] paramArgs = Arrays.copyOfRange(args, start, start + taken);
+
+            // Whitelist validation
+            for (String arg : paramArgs) {
+                if (!param.isWhitelisted(arg)) {
+                    if (param.whitelistMessage() != null) {
+                        message(sender, param.whitelistMessage());
+                    }
+                    return new ParameterParseResult(new String[0], true);
+                }
+            }
+
             alreadyUsed.add(param);
 
             if (sender instanceof Player p) {

src/main/java/me/yleoft/zAPI/command/Parameter.java

@@ -2,70 +2,45 @@
 
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-/**
- * Represents a command parameter with its properties.
- */
 public interface Parameter {
 
-    /**
-     * The name of the parameter.
-     *
-     * @return The name of the parameter.
-     */
     @NotNull String name();
 
-    /**
-     * The aliases of the parameter.
-     *
-     * @return The aliases of the parameter.
-     */
     default @NotNull List<String> aliases() { return List.of(); }
 
-    /**
-     * The permission required to use the parameter.
-     *
-     * @return The permission required to use the parameter.
-     */
     default String permission() { return null; }
 
-    /**
-     * Whether to stop processing sub-commands after this parameter is executed.
-     *
-     * @return true to stop processing sub-commands, false otherwise.
-     */
     default boolean stopSubCommands() { return false; }
 
-    /**
-     * The minimum number of arguments required for this parameter.
-     *
-     * @return The minimum number of arguments required for this parameter.
-     */
     default int minArgs() { return 0; }
 
-    /**
-     * The maximum number of arguments allowed for this parameter.
-     *
-     * @return The maximum number of arguments allowed for this parameter.
-     */
     default int maxArgs() { return Integer.MAX_VALUE; }
 
-    /**
-     * Called when the parameter is executed.
-     * @param sender The command sender
-     * @param fullArgs All args (same as Bukkit gives)
-     * @param parameterArgs The args already typed for THIS parameter (not including the "-name" token)
-     */
-    default void execute(@NotNull CommandSender sender, @NotNull String[] fullArgs, @NotNull String[] parameterArgs) {};
-
-    /**
-     * Called for tab completion when the user is currently typing arguments for this parameter.
-     * @param sender The command sender
-     * @param fullArgs All args (same as Bukkit gives)
-     * @param parameterArgs The args already typed for THIS parameter (not including the "-name" token)
-     */
+    @Nullable
+    default Set<String> whitelist() { return null; }
+
+    @Nullable
+    default String whitelistMessage() { return null; }
+
+    default boolean isWhitelisted(@NotNull String value) {
+        Set<String> whitelist = whitelist();
+        if (whitelist == null || whitelist.isEmpty()) return true;
+
+        Set<String> lowercaseWhitelist = whitelist.stream()
+                .map(String::toLowerCase)
+                .collect(Collectors.toSet());
+
+        return lowercaseWhitelist.contains(value.toLowerCase());
+    }
+
+    default void execute(@NotNull CommandSender sender, @NotNull String[] fullArgs, @NotNull String[] parameterArgs) {}
+
     default @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String[] fullArgs, @NotNull String[] parameterArgs) {
         return List.of();
     }

src/main/java/me/yleoft/zAPI/location/LocationHandler.java

@@ -1,5 +1,6 @@
 package me.yleoft.zAPI.location;
 
+import me.yleoft.zAPI.zAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -9,12 +10,10 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 import static java.util.Objects.requireNonNull;
 
-/**
- * Utility class for location-related operations.
- */
 public final class LocationHandler {
 
     private static final EnumSet<Material> blacklistedGround = EnumSet.noneOf(Material.class);
@@ -154,6 +153,20 @@ public static Location findNearestSafeLocation(@NotNull final Location origin, i
         return bestLoc;
     }
 
+    @NotNull
+    public static CompletableFuture<Location> findNearestSafeLocationAsync(@NotNull final Location origin, int radius, int heightCheckRange) {
+        CompletableFuture<Location> future = new CompletableFuture<>();
+        zAPI.getScheduler().runAtLocation(origin, task -> {
+            try {
+                Location result = findNearestSafeLocation(origin, radius, heightCheckRange);
+                future.complete(result);
+            } catch (Exception e) {
+                future.completeExceptionally(e);
+            }
+        });
+        return future;
+    }
+
     /**
      * Checks if the given location is safe for a player to stand on.
      * @param loc the location to check
@@ -170,6 +183,20 @@ public static boolean isSafeLocation(@NotNull final Location loc) {
         return isAirOrNonSolid(feet) && isAirOrNonSolid(head) && isSafeGround(ground);
     }
 
+    @NotNull
+    public static CompletableFuture<Boolean> isSafeLocationAsync(@NotNull final Location loc) {
+        CompletableFuture<Boolean> future = new CompletableFuture<>();
+        zAPI.getScheduler().runAtLocation(loc, task -> {
+            try {
+                boolean result = isSafeLocation(loc);
+                future.complete(result);
+            } catch (Exception e) {
+                future.completeExceptionally(e);
+            }
+        });
+        return future;
+    }
+
     /**
      * Checks if the given block is air or a non-solid block.
      * @param block the block to check
@@ -189,7 +216,7 @@ private static boolean isSafeGround(@NotNull final Block block) {
         return block.getType().isSolid() && !block.isLiquid() && !blacklistedGround.contains(type);
     }
 
-    private static class MutableBlockLocation {
+    public static class MutableBlockLocation {
         private final World world;
         private int x, y, z;
 
@@ -235,6 +262,4 @@ public Location toLocation() {
             return new Location(world, x, y, z);
         }
     }
-
-
 }

src/main/java/me/yleoft/zAPI/utility/ExternalDependencyManager.java

@@ -119,8 +119,7 @@ public Map<String, Path> downloadAll() throws IOException, InterruptedException
     public URLClassLoader loadIsolated(String id, ClassLoader parent) throws IOException, InterruptedException {
         Path jar = download(id);
         URL url = jar.toUri().toURL();
-        ClassLoader p = (parent != null) ? parent : Thread.currentThread().getContextClassLoader();
-        return new URLClassLoader(new URL[]{url}, p);
+        return new URLClassLoader(new URL[]{url}, parent);
     }
 
     /**
@@ -132,8 +131,7 @@ public URLClassLoader loadAllIntoOneIsolatedLoader(ClassLoader parent) throws IO
         for (String id : sortedIds()) {
             urls.add(download(id).toUri().toURL());
         }
-        ClassLoader p = (parent != null) ? parent : Thread.currentThread().getContextClassLoader();
-        return new URLClassLoader(urls.toArray(URL[]::new), p);
+        return new URLClassLoader(urls.toArray(URL[]::new), parent);
     }
 
     /**