From 496fc2817652c02d279bc5509e99485ce81c7f8a Mon Sep 17 00:00:00 2001 From: Maru32768 Date: Wed, 24 Aug 2022 00:47:10 +0900 Subject: [PATCH] fix: internal api signature --- .../main/java/net/kunmc/lab/configlib/CollectionValue.java | 2 +- .../main/java/net/kunmc/lab/configlib/ModifyAddCommand.java | 2 +- .../lab/configlib/value/collection/BlockDataSetValue.java | 2 +- .../kunmc/lab/configlib/value/collection/EnumListValue.java | 2 +- .../kunmc/lab/configlib/value/collection/EnumSetValue.java | 2 +- .../lab/configlib/value/collection/LocationSetValue.java | 2 +- .../kunmc/lab/configlib/value/collection/ObjectSetValue.java | 2 +- .../kunmc/lab/configlib/value/collection/StringListValue.java | 2 +- .../kunmc/lab/configlib/value/collection/StringSetValue.java | 2 +- .../kunmc/lab/configlib/value/collection/TeamSetValue.java | 2 +- .../kunmc/lab/configlib/value/collection/UUIDSetValue.java | 2 +- .../main/java/net/kunmc/lab/configlib/CollectionValue.java | 4 ++-- .../main/java/net/kunmc/lab/configlib/ModifyAddCommand.java | 2 +- .../java/net/kunmc/lab/configlib/ModifyRemoveCommand.java | 2 +- .../lab/configlib/value/collection/BlockPosSetValue.java | 4 ++-- .../lab/configlib/value/collection/BlockStateSetValue.java | 4 ++-- .../kunmc/lab/configlib/value/collection/EnumListValue.java | 4 ++-- .../kunmc/lab/configlib/value/collection/EnumSetValue.java | 4 ++-- .../lab/configlib/value/collection/LocationSetValue.java | 4 ++-- .../kunmc/lab/configlib/value/collection/ObjectSetValue.java | 4 ++-- .../kunmc/lab/configlib/value/collection/StringListValue.java | 4 ++-- .../kunmc/lab/configlib/value/collection/StringSetValue.java | 4 ++-- .../kunmc/lab/configlib/value/collection/TeamSetValue.java | 4 ++-- .../kunmc/lab/configlib/value/collection/UUIDSetValue.java | 4 ++-- 24 files changed, 35 insertions(+), 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 index 1920be0..51860d1 100644 --- 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 argument, CommandSender sender); - protected abstract T argumentToValueForAdd(List argument, CommandSender sender); + protected abstract T argumentToValueForAdd(String entryName, List 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 index 5a30b3a..1633cea 100644 --- 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 index 56f9e9e..5e39cdd 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSender sender) { + protected Set argumentToValueForAdd(String entryName, List 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 index ca42fe2..641b6ed 100644 --- 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 a } @Override - protected List argumentToValueForAdd(List argument, CommandSender sender) { + protected List argumentToValueForAdd(String entryName, List 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 index d78ee9f..82907c7 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSender sender) { + protected Set argumentToValueForAdd(String entryName, List 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 index 8475a4e..0058ba1 100644 --- 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 a } @Override - public Set argumentToValueForAdd(List argument, CommandSender sender) { + public Set argumentToValueForAdd(String entryName, List 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 index b48bf68..90610d9 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSender sender) { + protected Set argumentToValueForAdd(String entryName, List 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 index 6736d7f..67544e5 100644 --- 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 a } @Override - protected List argumentToValueForAdd(List argument, CommandSender sender) { + protected List argumentToValueForAdd(String entryName, List 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 index 2df5d3c..0f6a2d3 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSender sender) { + protected Set argumentToValueForAdd(String entryName, List 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 index 4fc0026..c09e194 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSender sender) { + protected Set argumentToValueForAdd(String entryName, List 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 index a4b95f5..9050664 100644 --- 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 a @Override - protected Set argumentToValueForAdd(List argument, CommandSender sender) { + protected Set argumentToValueForAdd(String entryName, List argument, CommandSender sender) { return ((List) 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 index 58e0291..0f93ab9 100644 --- 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 argument, CommandSource sender); - protected abstract T argumentToValueForAdd(List argument, CommandSource sender); + protected abstract T argumentToValueForAdd(String entryName, List 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 argument, CommandSource sender); - protected abstract T argumentToValueForRemove(List argument, CommandSource sender); + protected abstract T argumentToValueForRemove(String entryName, List 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 index 8c74f34..bd17ddf 100644 --- 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 index f31c740..236b306 100644 --- 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 index d0db8fc..69d4764 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSource sender) { + protected Set argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return null; } @@ -54,7 +54,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List argumentToValueForRemove(List argument, CommandSource sender) { + protected Set argumentToValueForRemove(String entryName, List 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 index 1864638..155bfc6 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSource sender) { + protected Set argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return Sets.newHashSet(((BlockStateInput) argument.get(0)).getState()); } @@ -67,7 +67,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List argumentToValueForRemove(List argument, CommandSource sender) { + protected Set argumentToValueForRemove(String entryName, List 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 index da9fae0..4b7ae78 100644 --- 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 a } @Override - protected List argumentToValueForAdd(List argument, CommandSource sender) { + protected List argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return Collections.singletonList(clazz.cast(argument.get(0))); } @@ -60,7 +60,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List argumentToValueForRemove(List argument, CommandSource sender) { + protected List argumentToValueForRemove(String entryName, List 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 index b84bea3..2d6c6f0 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSource sender) { + protected Set argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return Sets.newHashSet(clazz.cast(argument.get(0))); } @@ -61,7 +61,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List argumentToValueForRemove(List argument, CommandSource sender) { + protected Set argumentToValueForRemove(String entryName, List 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 index e5ae195..e02de43 100644 --- 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 a } @Override - public Set argumentToValueForAdd(List argument, CommandSource sender) { + public Set argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return Sets.newHashSet((Location) argument.get(0)); } @@ -77,7 +77,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List argumentToValueForRemove(List argument, CommandSource sender) { + public Set argumentToValueForRemove(String entryName, List 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 index d50f653..fc5cf0a 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSource sender) { + protected Set argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return Sets.newHashSet(((T) argument.get(0))); } @@ -79,7 +79,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List argumentToValueForRemove(List argument, CommandSource sender) { + protected Set argumentToValueForRemove(String entryName, List 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 index c16ca8a..17cee9f 100644 --- 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 a } @Override - protected List argumentToValueForAdd(List argument, CommandSource sender) { + protected List argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return argument.stream() .map(Object::toString) .collect(Collectors.toList()); @@ -93,7 +93,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List argumentToValueForRemove(List argument, CommandSource sender) { + protected List argumentToValueForRemove(String entryName, List 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 index 7ad1421..f719fab 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSource sender) { + protected Set argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return Collections.singleton(argument.get(0).toString()); } @@ -81,7 +81,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List argumentToValueForRemove(List argument, CommandSource sender) { + protected Set argumentToValueForRemove(String entryName, List 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 index ce923f8..9d0e34b 100644 --- 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 a } @Override - protected Set argumentToValueForAdd(List argument, CommandSource sender) { + protected Set argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return Sets.newHashSet(((ScorePlayerTeam) argument.get(0))); } @@ -73,7 +73,7 @@ protected String incorrectArgumentMessageForRemove(String entryName, List argumentToValueForRemove(List argument, CommandSource sender) { + protected Set argumentToValueForRemove(String entryName, List 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 index f580a3d..e6c4c7f 100644 --- 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 a @Override - protected Set argumentToValueForAdd(List argument, CommandSource sender) { + protected Set argumentToValueForAdd(String entryName, List argument, CommandSource sender) { return ((List) argument.get(0)).stream() .map(Entity::getUniqueID).collect(Collectors.toSet()); } @@ -98,7 +98,7 @@ protected boolean isCorrectArgumentForRemove(String entryName, List argu } @Override - protected Set argumentToValueForRemove(List argument, CommandSource sender) { + protected Set argumentToValueForRemove(String entryName, List argument, CommandSource sender) { String s = argument.get(0).toString(); if (s.equals("@a")) {