fix: internal api signature

TeamKun · Aug 23, 2022 · 496fc28 · 496fc28
1 parent af006d7
commit 496fc28
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 35 deletions.
diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/CollectionValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/CollectionValue.java
@@ -40,7 +40,7 @@ public U addableByCommand(boolean addable) {
 
     protected abstract String incorrectArgumentMessageForAdd(String entryName, List<Object> argument, CommandSender sender);
 
-    protected abstract T argumentToValueForAdd(List<Object> argument, CommandSender sender);
+    protected abstract T argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender);
 
     protected abstract boolean validateForAdd(String entryName, T value, CommandSender sender);
 

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/ModifyAddCommand.java b/bukkit/src/main/java/net/kunmc/lab/configlib/ModifyAddCommand.java
@@ -24,7 +24,7 @@ public ModifyAddCommand(Field field, CollectionValue value, BaseConfig config) {
                     return;
                 }
 
-                Collection newValue = value.argumentToValueForAdd(argument, sender);
+                Collection newValue = value.argumentToValueForAdd(entryName, argument, sender);
                 if (!value.validateForAdd(entryName, newValue, sender)) {
                     ctx.sendFailure(value.invalidValueMessageForAdd(entryName, newValue, sender));
                     return;

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/BlockDataSetValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/BlockDataSetValue.java
@@ -44,7 +44,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<BlockData> argumentToValueForAdd(List<Object> argument, CommandSender sender) {
+    protected Set<BlockData> argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender) {
         return Sets.newHashSet((BlockData) argument.get(0));
     }
 

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/EnumListValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/EnumListValue.java
@@ -40,7 +40,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected List<T> argumentToValueForAdd(List<Object> argument, CommandSender sender) {
+    protected List<T> argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender) {
         return Collections.singletonList(clazz.cast(argument.get(0)));
     }
 

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/EnumSetValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/EnumSetValue.java
@@ -41,7 +41,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<T> argumentToValueForAdd(List<Object> argument, CommandSender sender) {
+    protected Set<T> argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender) {
         return Sets.newHashSet(clazz.cast(argument.get(0)));
     }
 

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/LocationSetValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/LocationSetValue.java
@@ -40,7 +40,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    public Set<Location> argumentToValueForAdd(List<Object> argument, CommandSender sender) {
+    public Set<Location> argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender) {
         Location l = ((Location) argument.get(0));
 
         if (sender instanceof ConsoleCommandSender) {

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/ObjectSetValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/ObjectSetValue.java
@@ -50,7 +50,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<T> argumentToValueForAdd(List<Object> argument, CommandSender sender) {
+    protected Set<T> argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender) {
         return Sets.newHashSet(((T) argument.get(0)));
     }
 

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/StringListValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/StringListValue.java
@@ -60,7 +60,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected List<String> argumentToValueForAdd(List<Object> argument, CommandSender sender) {
+    protected List<String> argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender) {
         return argument.stream()
                 .map(Object::toString)
                 .collect(Collectors.toList());

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/StringSetValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/StringSetValue.java
@@ -59,7 +59,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<String> argumentToValueForAdd(List<Object> argument, CommandSender sender) {
+    protected Set<String> argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender) {
         return Collections.singleton(argument.get(0).toString());
     }
 

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/TeamSetValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/TeamSetValue.java
@@ -52,7 +52,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<Team> argumentToValueForAdd(List<Object> argument, CommandSender sender) {
+    protected Set<Team> argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender) {
         return Sets.newHashSet(((Team) argument.get(0)));
     }
 

diff --git a/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/UUIDSetValue.java b/bukkit/src/main/java/net/kunmc/lab/configlib/value/collection/UUIDSetValue.java
@@ -43,7 +43,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
 
 
     @Override
-    protected Set<UUID> argumentToValueForAdd(List<Object> argument, CommandSender sender) {
+    protected Set<UUID> argumentToValueForAdd(String entryName, List<Object> argument, CommandSender sender) {
         return ((List<Entity>) argument.get(0)).stream()
                 .map(Entity::getUniqueId)
                 .collect(Collectors.toSet());

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/CollectionValue.java b/forge/src/main/java/net/kunmc/lab/configlib/CollectionValue.java
@@ -40,7 +40,7 @@ public U addableByCommand(boolean addable) {
 
     protected abstract String incorrectArgumentMessageForAdd(String entryName, List<Object> argument, CommandSource sender);
 
-    protected abstract T argumentToValueForAdd(List<Object> argument, CommandSource sender);
+    protected abstract T argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender);
 
     protected abstract boolean validateForAdd(String entryName, T value, CommandSource sender);
 
@@ -92,7 +92,7 @@ public U removableByCommand(boolean removable) {
 
     protected abstract String incorrectArgumentMessageForRemove(String entryName, List<Object> argument, CommandSource sender);
 
-    protected abstract T argumentToValueForRemove(List<Object> argument, CommandSource sender);
+    protected abstract T argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender);
 
     protected abstract boolean validateForRemove(String entryName, T value, CommandSource sender);
 

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/ModifyAddCommand.java b/forge/src/main/java/net/kunmc/lab/configlib/ModifyAddCommand.java
@@ -24,7 +24,7 @@ public ModifyAddCommand(Field field, CollectionValue value, BaseConfig config) {
                     return;
                 }
 
-                Collection newValue = value.argumentToValueForAdd(argument, sender);
+                Collection newValue = value.argumentToValueForAdd(entryName, argument, sender);
                 if (!value.validateForAdd(entryName, newValue, sender)) {
                     ctx.sendFailure(value.invalidValueMessageForAdd(entryName, newValue, sender));
                     return;

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/ModifyRemoveCommand.java b/forge/src/main/java/net/kunmc/lab/configlib/ModifyRemoveCommand.java
@@ -24,7 +24,7 @@ public ModifyRemoveCommand(Field field, CollectionValue value, BaseConfig config
                     return;
                 }
 
-                Collection newValue = value.argumentToValueForRemove(argument, sender);
+                Collection newValue = value.argumentToValueForRemove(entryName, argument, sender);
                 if (!value.validateForRemove(entryName, newValue, sender)) {
                     ctx.sendFailure(value.invalidValueMessageForRemove(entryName, newValue, sender));
                     return;

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/BlockPosSetValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/BlockPosSetValue.java
@@ -34,7 +34,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<BlockPos> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    protected Set<BlockPos> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return null;
     }
 
@@ -54,7 +54,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List<Object
     }
 
     @Override
-    protected Set<BlockPos> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    protected Set<BlockPos> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         return null;
     }
 

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/BlockStateSetValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/BlockStateSetValue.java
@@ -43,7 +43,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<BlockState> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    protected Set<BlockState> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return Sets.newHashSet(((BlockStateInput) argument.get(0)).getState());
     }
 
@@ -67,7 +67,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List<Object
     }
 
     @Override
-    protected Set<BlockState> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    protected Set<BlockState> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         return Sets.newHashSet(((BlockStateInput) argument.get(0)).getState());
     }
 

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/EnumListValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/EnumListValue.java
@@ -40,7 +40,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected List<T> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    protected List<T> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return Collections.singletonList(clazz.cast(argument.get(0)));
     }
 
@@ -60,7 +60,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List<Object
     }
 
     @Override
-    protected List<T> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    protected List<T> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         return Collections.singletonList(clazz.cast(argument.get(0)));
     }
 

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/EnumSetValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/EnumSetValue.java
@@ -41,7 +41,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<T> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    protected Set<T> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return Sets.newHashSet(clazz.cast(argument.get(0)));
     }
 
@@ -61,7 +61,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List<Object
     }
 
     @Override
-    protected Set<T> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    protected Set<T> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         return Sets.newHashSet(clazz.cast(argument.get(0)));
     }
 

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/LocationSetValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/LocationSetValue.java
@@ -35,7 +35,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    public Set<Location> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    public Set<Location> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return Sets.newHashSet((Location) argument.get(0));
     }
 
@@ -77,7 +77,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List<Object
     }
 
     @Override
-    public Set<Location> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    public Set<Location> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         double x = ((Double) argument.get(0));
         double y = ((Double) argument.get(1));
         double z = ((Double) argument.get(2));

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/ObjectSetValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/ObjectSetValue.java
@@ -50,7 +50,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<T> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    protected Set<T> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return Sets.newHashSet(((T) argument.get(0)));
     }
 
@@ -79,7 +79,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List<Object
     }
 
     @Override
-    protected Set<T> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    protected Set<T> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         return Sets.newHashSet(((T) argument.get(0)));
     }
 

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/StringListValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/StringListValue.java
@@ -60,7 +60,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected List<String> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    protected List<String> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return argument.stream()
                 .map(Object::toString)
                 .collect(Collectors.toList());
@@ -93,7 +93,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List<Object
     }
 
     @Override
-    protected List<String> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    protected List<String> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         return argument.stream()
                 .map(Object::toString)
                 .collect(Collectors.toList());

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/StringSetValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/StringSetValue.java
@@ -59,7 +59,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<String> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    protected Set<String> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return Collections.singleton(argument.get(0).toString());
     }
 
@@ -81,7 +81,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List<Object
     }
 
     @Override
-    protected Set<String> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    protected Set<String> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         return Collections.singleton(argument.get(0).toString());
     }
 

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/TeamSetValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/TeamSetValue.java
@@ -49,7 +49,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
     }
 
     @Override
-    protected Set<ScorePlayerTeam> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    protected Set<ScorePlayerTeam> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return Sets.newHashSet(((ScorePlayerTeam) argument.get(0)));
     }
 
@@ -73,7 +73,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List<Object
     }
 
     @Override
-    protected Set<ScorePlayerTeam> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    protected Set<ScorePlayerTeam> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         return Sets.newHashSet(((ScorePlayerTeam) argument.get(0)));
     }
 

diff --git a/forge/src/main/java/net/kunmc/lab/configlib/value/collection/UUIDSetValue.java b/forge/src/main/java/net/kunmc/lab/configlib/value/collection/UUIDSetValue.java
@@ -42,7 +42,7 @@ protected String incorrectArgumentMessageForAdd(String entryName, List<Object> a
 
 
     @Override
-    protected Set<UUID> argumentToValueForAdd(List<Object> argument, CommandSource sender) {
+    protected Set<UUID> argumentToValueForAdd(String entryName, List<Object> argument, CommandSource sender) {
         return ((List<Entity>) argument.get(0)).stream()
                 .map(Entity::getUniqueID).collect(Collectors.toSet());
     }
@@ -98,7 +98,7 @@ protected boolean isCorrectArgumentForRemove(String entryName, List<Object> argu
     }
 
     @Override
-    protected Set<UUID> argumentToValueForRemove(List<Object> argument, CommandSource sender) {
+    protected Set<UUID> argumentToValueForRemove(String entryName, List<Object> argument, CommandSource sender) {
         String s = argument.get(0).toString();
 
         if (s.equals("@a")) {