1.6.4

ancap-dev · Feb 17, 2023 · ea0ec08 · ea0ec08
1 parent ac6f226
commit ea0ec08
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/...mplementation/plugin/AuthorsSupplier.java → ...ugin/api/information/AuthorsSupplier.java b/...mplementation/plugin/AuthorsSupplier.java → ...ugin/api/information/AuthorsSupplier.java
@@ -1,16 +1,15 @@
-package ru.ancap.framework.artifex.implementation.plugin;
+package ru.ancap.framework.plugin.api.information;
 
 import lombok.AllArgsConstructor;
 import org.bukkit.plugin.java.JavaPlugin;
 import ru.ancap.framework.communicate.Communicator;
 import ru.ancap.framework.communicate.message.CallableMessage;
 import ru.ancap.framework.communicate.message.Message;
 import ru.ancap.framework.communicate.replacement.Placeholder;
-import ru.ancap.framework.artifex.Artifex;
 import ru.ancap.framework.command.api.commands.object.event.CommandDispatch;
 import ru.ancap.framework.command.api.commands.object.executor.CommandOperator;
-import ru.ancap.framework.language.additional.LAPIDomain;
 import ru.ancap.framework.language.additional.LAPIMessage;
+import ru.ancap.framework.plugin.api.common.CommonMessageDomains;
 
 @AllArgsConstructor
 public class AuthorsSupplier implements CommandOperator {
@@ -19,7 +18,7 @@ public class AuthorsSupplier implements CommandOperator {
     private final String domain;
 
     public AuthorsSupplier(JavaPlugin plugin) {
-        this(plugin, LAPIDomain.of(Artifex.class, "plugin-info"));
+        this(plugin, CommonMessageDomains.pluginInfo);
     }
 
     @Override

diff --git a/Artifex/locale_0.yml b/Artifex/locale_0.yml
@@ -29,7 +29,7 @@ ru:
             enter-language: "Команда §n/language§r§f предназначена для выбора серверного языка. Используйте её так: §n/language set <код языка>§r§f, где код языка может быть любым из стандарта ISO 639-1."
             setup: "Твой язык изменён на русский."
         plugin-info:
-          - "Artifex v%VERSION%."
+          - "%PLUGIN% v%VERSION%."
           - "Авторы: %AUTHORS%. "
         console:
           notify:

diff --git a/Artifex/src/main/java/ru/ancap/framework/artifex/ArtifexCommandExecutor.java b/Artifex/src/main/java/ru/ancap/framework/artifex/ArtifexCommandExecutor.java
@@ -2,7 +2,7 @@
 
 import ru.ancap.framework.communicate.replacement.Placeholder;
 import ru.ancap.framework.command.api.commands.CommandTarget;
-import ru.ancap.framework.artifex.implementation.plugin.AuthorsSupplier;
+import ru.ancap.framework.plugin.api.information.AuthorsSupplier;
 import ru.ancap.framework.command.api.commands.operator.communicate.Reply;
 import ru.ancap.framework.command.api.commands.operator.delegate.Delegate;
 import ru.ancap.framework.command.api.commands.operator.delegate.subcommand.Raw;

diff --git a/Artifex/src/main/resources/locale_0.yml b/Artifex/src/main/resources/locale_0.yml
@@ -29,7 +29,7 @@ ru:
             enter-language: "Команда §n/language§r§f предназначена для выбора серверного языка. Используйте её так: §n/language set <код языка>§r§f, где код языка может быть любым из стандарта ISO 639-1."
             setup: "Твой язык изменён на русский."
         plugin-info:
-          - "Artifex v%VERSION%."
+          - "%PLUGIN% v%VERSION%."
           - "Авторы: %AUTHORS%. "
         console:
           notify:

diff --git a/...I/src/main/java/ru/ancap/framework/command/api/commands/operator/arguments/Arguments.java b/...I/src/main/java/ru/ancap/framework/command/api/commands/operator/arguments/Arguments.java
@@ -53,8 +53,10 @@ private static Map<Integer, ArgumentsShard> bindingsFor(List<Argument> arguments
             int size = argument.extractor().size();
             int endIndex = lastStartIndex + size;
             ArgumentsShard shard = new ArgumentsShard(lastStartIndex, endIndex, argument);
-            for (int cursor = lastStartIndex; cursor < endIndex; cursor++) map.put(cursor, shard);
-            lastStartIndex = endIndex + 1;
+            for (int cursor = lastStartIndex; cursor < endIndex; cursor++) {
+                map.put(cursor, shard);
+            }
+            lastStartIndex = endIndex;
         }
         return map;
     }
@@ -75,7 +77,10 @@ public void on(CommandDispatch dispatch) {
 
         int argumentIndex = 0;
 
-        if (dispatch.command().arguments().size() < this.requiredLiterals) this.onNotEnough.accept(dispatch.source().sender(), this.requiredLiterals - dispatch.command().arguments().size());
+        if (dispatch.command().arguments().size() < this.requiredLiterals) {
+            this.onNotEnough.accept(dispatch.source().sender(), this.requiredLiterals - dispatch.command().arguments().size());
+            return;
+        }
 
         while (!command.isRaw() && argumentIndex <= this.arguments.size() - 1) {
             Argument argument = this.arguments.get(0);

diff --git a/...urceAPI/src/main/java/ru/ancap/framework/resource/config/FileConfigurationPreparator.java b/...urceAPI/src/main/java/ru/ancap/framework/resource/config/FileConfigurationPreparator.java
@@ -91,11 +91,13 @@ public FileConfiguration prepare(InputStream base, @NotNull File target) {
                         FilenameUtils.getBaseName(target.getName())+"_"+System.currentTimeMillis()+".old"
                 ), userData);
                 Set<String> userKeys = userData.getKeys(true);
+                userKeys.remove(this.versionFieldName);
                 for (String key : userKeys) {
-                    if (key.equals(this.versionFieldName)) continue;
+                    AncapDebug.debug("key", key);
                     Object value = userData.get(key);
                     String transferTarget = transferMap.getTarget(key);
                     if (transferTarget == null) transferTarget = key;
+                    AncapDebug.debug("setting it to", transferMap);
                     finalConfig.set(transferTarget, value);
                 } break;
             default: throw new IllegalStateException("Unexpected value: " + this.resolveStateFrom(base, target));