removed unused param

Author: iamthenoah

src/main/java/net/azalealibrary/configuration/property/ConfigurableProperty.java

@@ -18,9 +18,9 @@ public abstract class ConfigurableProperty<T, P> {
     protected final List<AssignmentPolicy<T>> policies;
     protected final String name;
     protected final Consumer<P> callback;
-    private final List<String> description;
-    private final Supplier<P> defaultValue;
-    private @Nullable P value;
+    protected final List<String> description;
+    protected final Supplier<P> defaultValue;
+    protected @Nullable P value;
 
     protected ConfigurableProperty(PropertyType<T> propertyType, Supplier<P> defaultValue, String name, List<String> description, Consumer<P> callback, List<AssignmentPolicy<T>> policies) {
         this.propertyType = propertyType;
@@ -79,9 +79,8 @@ public void onExecute(CommandSender sender, Arguments arguments) {
         set(sender, arguments);
     }
 
-    @SuppressWarnings("unchecked")
     public List<String> onComplete(CommandSender sender, Arguments arguments) {
-        return propertyType.complete(sender, arguments, (T) get());
+        return propertyType.complete(sender, arguments);
     }
 
     protected abstract void set(CommandSender sender, Arguments arguments);

src/main/java/net/azalealibrary/configuration/property/ListProperty.java

@@ -28,7 +28,7 @@ protected void set(CommandSender sender, Arguments arguments) {
         String action = arguments.matchesAny(0, "list operation", ADD, REMOVE, REPLACE);
 
         if (action.equals(ADD)) {
-            get().add(verify(propertyType.parse(sender, arguments.subArguments(1), null)));
+            get().add(verify(propertyType.parse(sender, arguments.subArguments(1))));
             callback.accept(get());
         } else {
             int index = arguments.find(1, "position", input -> Integer.parseInt(input.replace("@", "")));
@@ -38,7 +38,7 @@ protected void set(CommandSender sender, Arguments arguments) {
             }
 
             if (action.equals(REPLACE)) {
-                get().set(index, verify(propertyType.parse(sender, arguments.subArguments(2), null)));
+                get().set(index, verify(propertyType.parse(sender, arguments.subArguments(2))));
                 callback.accept(get());
             } else {
                 get().remove(index);
@@ -56,7 +56,7 @@ public List<String> onComplete(CommandSender sender, Arguments arguments) {
         } else if (arguments.is(0, ADD) || arguments.is(0, REPLACE)) {
             // avoid suggesting more than necessary
             Arguments data = arguments.subArguments(arguments.is(0, ADD) ? 0 : 1);
-            List<String> suggestion = propertyType.complete(sender, data, null);
+            List<String> suggestion = propertyType.complete(sender, data);
             return arguments.size() -1 <= suggestion.size() ? suggestion : List.of();
         }
         return List.of();

src/main/java/net/azalealibrary/configuration/property/Property.java

@@ -19,7 +19,7 @@ private Property(PropertyType<T> type, Supplier<T> defaultValue, String name, Li
 
     @Override
     protected void set(CommandSender sender, Arguments arguments) {
-        set(verify(propertyType.parse(sender, arguments, get())));
+        set(verify(propertyType.parse(sender, arguments)));
         callback.accept(get());
     }
 

src/main/java/net/azalealibrary/configuration/property/PropertyType.java

@@ -10,7 +10,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.UUID;
 
@@ -20,45 +19,45 @@ public class PropertyType<T> {
     public static final PropertyType<String> STRING = new PropertyType<>(String.class, "text");
     public static final PropertyType<Integer> INTEGER = new PropertyType<>(Integer.class) {
         @Override
-        public Integer parse(CommandSender sender, Arguments arguments, @Nullable Integer currentValue) {
+        public Integer parse(CommandSender sender, Arguments arguments) {
             return Integer.parseInt(arguments.get(0));
         }
     };
     public static final PropertyType<Double> DOUBLE = new PropertyType<>(Double.class, "decimal") {
         @Override
-        public Double parse(CommandSender sender, Arguments arguments, @Nullable Double currentValue) {
+        public Double parse(CommandSender sender, Arguments arguments) {
             return Double.parseDouble(arguments.get(0));
         }
     };
     public static final PropertyType<Boolean> BOOLEAN = new PropertyType<>(Boolean.class) {
         @Override
-        public Boolean parse(CommandSender sender, Arguments arguments, @Nullable Boolean currentValue) {
+        public Boolean parse(CommandSender sender, Arguments arguments) {
             if (!arguments.is(0, "true") && !arguments.is(0, "false")) {
                 throw new AzaleaException(); // ensure explicit "true" or "false" text has been provided
             }
             return Boolean.parseBoolean(arguments.get(0));
         }
 
         @Override
-        public List<String> complete(CommandSender sender, Arguments arguments, @Nullable Boolean currentValue) {
-            return List.of(Boolean.toString(Boolean.FALSE.equals(currentValue)));
+        public List<String> complete(CommandSender sender, Arguments arguments) {
+            return List.of("true", "false");
         }
     };
     public static final PropertyType<Vector> VECTOR = new PropertyType<>(Vector.class) {
         @Override
-        public List<String> complete(CommandSender sender, Arguments arguments, @Nullable Vector currentValue) {
+        public List<String> complete(CommandSender sender, Arguments arguments) {
             if (sender instanceof Player player) {
                 Location location = player.getLocation();
                 double x = location.getBlockX() + .5;
                 double y = location.getBlockY() + .5;
                 double z = location.getBlockZ() + .5;
                 return List.of(x + " " + y + " " + z);
             }
-            return super.complete(sender, arguments, currentValue);
+            return super.complete(sender, arguments);
         }
 
         @Override
-        public Vector parse(CommandSender sender, Arguments arguments, @Nullable Vector currentValue) {
+        public Vector parse(CommandSender sender, Arguments arguments) {
             double x = arguments.find(0, "x", Double::parseDouble);
             double y = arguments.find(1, "y", Double::parseDouble);
             double z = arguments.find(2, "z", Double::parseDouble);
@@ -67,7 +66,7 @@ public Vector parse(CommandSender sender, Arguments arguments, @Nullable Vector
     };
     public static final PropertyType<Location> LOCATION = new PropertyType<>(Location.class, "position") {
         @Override
-        public List<String> complete(CommandSender sender, Arguments arguments, @Nullable Location currentValue) {
+        public List<String> complete(CommandSender sender, Arguments arguments) {
             if (sender instanceof Player player) {
                 Location location = player.getLocation();
                 double x = location.getBlockX() + .5;
@@ -77,11 +76,11 @@ public List<String> complete(CommandSender sender, Arguments arguments, @Nullabl
                 float pitch = location.getPitch();
                 return List.of(x + " " + y + " " + z + " " + yaw + " " + pitch);
             }
-            return super.complete(sender, arguments, currentValue);
+            return super.complete(sender, arguments);
         }
 
         @Override
-        public Location parse(CommandSender sender, Arguments arguments, @Nullable Location currentValue) {
+        public Location parse(CommandSender sender, Arguments arguments) {
             if (sender instanceof Player player) {
                 double x = arguments.find(0, "x", Double::parseDouble);
                 double y = arguments.find(1, "y", Double::parseDouble);
@@ -90,20 +89,20 @@ public Location parse(CommandSender sender, Arguments arguments, @Nullable Locat
                 float pitch = arguments.find(4, "pitch", Float::parseFloat);
                 return new Location(player.getWorld(), x, y, z, yaw, pitch);
             }
-            return super.parse(sender, arguments, currentValue);
+            return super.parse(sender, arguments);
         }
     };
     public static final PropertyType<Player> PLAYER = new PropertyType<>(Player.class) {
         @Override
-        public List<String> complete(CommandSender sender, Arguments arguments, @Nullable Player currentValue) {
+        public List<String> complete(CommandSender sender, Arguments arguments) {
             if (sender instanceof Player player) {
                 return player.getWorld().getPlayers().stream().map(Player::getDisplayName).toList();
             }
-            return super.complete(sender, arguments, currentValue);
+            return super.complete(sender, arguments);
         }
 
         @Override
-        public Player parse(CommandSender sender, Arguments arguments, @Nullable Player currentValue) {
+        public Player parse(CommandSender sender, Arguments arguments) {
             return (Player) sender;
         }
 
@@ -124,12 +123,12 @@ public String print(Player object) {
     };
     public static final PropertyType<World> WORLD = new PropertyType<>(World.class) {
         @Override
-        public List<String> complete(CommandSender sender, Arguments arguments, @Nullable World currentValue) {
+        public List<String> complete(CommandSender sender, Arguments arguments) {
             return Bukkit.getServer().getWorlds().stream().map(World::getName).toList();
         }
 
         @Override
-        public World parse(CommandSender sender, Arguments arguments, @Nullable World currentValue) {
+        public World parse(CommandSender sender, Arguments arguments) {
             return Bukkit.getWorld(arguments.get(0));
         }
 
@@ -169,11 +168,11 @@ public final String getExpected() {
         return StringUtils.capitalize(expected.toLowerCase());
     }
 
-    public List<String> complete(CommandSender sender, Arguments arguments, @Nullable T currentValue) {
+    public List<String> complete(CommandSender sender, Arguments arguments) {
         return arguments.size() == 1 ? List.of("<" + expected + ">") : List.of();
     }
 
-    public T parse(CommandSender sender, Arguments arguments, @Nullable T currentValue) {
+    public T parse(CommandSender sender, Arguments arguments) {
         return (T) arguments.get(0);
     }
 
@@ -192,7 +191,7 @@ public String print(T object) {
     // TODO - review
     public boolean test(CommandSender sender, Arguments arguments) {
         try {
-            parse(sender, arguments, null);
+            parse(sender, arguments);
             return true;
         } catch (Exception exception) {
             return false;