Add {PERMISSIONS} placeholder.

Add reload command.
Bump Bukkit API.
Bump LiteCommands (fix complete).

Author: Rollczi

pom.xml

@@ -39,7 +39,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>${project.name} ${project.version} (1.8-1.17)</finalName>
+                            <finalName>${project.name} ${project.version} (MC 1.8-1.18)</finalName>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
@@ -88,21 +88,21 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.18.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <!-- CDN Configs -->
         <dependency>
             <groupId>net.dzikoysk</groupId>
             <artifactId>cdn</artifactId>
-            <version>1.13.3</version>
+            <version>1.13.5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.panda-lang</groupId>
             <artifactId>expressible</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.12</version>
         </dependency>
         <dependency>
             <groupId>org.panda-lang</groupId>
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>dev.rollczi.litecommands</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.4.0</version>
+            <version>1.5.0</version>
             <scope>compile</scope>
         </dependency>
 

src/main/java/dev/rollczi/antilegs/LiteAntiLegs.java

@@ -6,8 +6,9 @@
 
 import dev.rollczi.antilegs.commands.AntiLegsArgument;
 import dev.rollczi.antilegs.commands.AntiLegsCommand;
+import dev.rollczi.antilegs.commands.LitePermissionMessage;
 import dev.rollczi.antilegs.commands.PlayerArgument;
-import dev.rollczi.antilegs.config.ConfigManager;
+import dev.rollczi.antilegs.config.ConfigurationManager;
 import dev.rollczi.antilegs.config.PluginConfig;
 import dev.rollczi.antilegs.listeners.ArmorEquipBlock;
 import dev.rollczi.antilegs.listeners.PlayerDamageByPlayer;
@@ -32,7 +33,7 @@ public final class LiteAntiLegs extends JavaPlugin {
 
     @Getter private static LiteAntiLegs instance;
 
-    @Getter private ConfigManager configManager;
+    @Getter private ConfigurationManager configManager;
     @Getter private CombatManager combatManager;
     @Getter private CooldownManager cooldownManager;
     @Getter private AntiLegsManager antiLegsManager;
@@ -41,20 +42,24 @@ public final class LiteAntiLegs extends JavaPlugin {
     @Override
     public void onEnable() {
         instance = this;
-        this.configManager = new ConfigManager(this);
+        this.configManager = new ConfigurationManager(this.getDataFolder());
         this.configManager.loadConfigs(); // load data from config file
-        this.combatManager = new CombatManager(this);
-        this.cooldownManager = new CooldownManager();
-        this.antiLegsManager = new AntiLegsManager();
-        this.antiLegsManager.registerAntiLeg(StandardAntiLegs.create(configManager.getPluginConfig()));
 
         PluginConfig config = this.configManager.getPluginConfig();
 
+        this.combatManager = new CombatManager(config);
+        this.cooldownManager = new CooldownManager();
+        this.antiLegsManager = new AntiLegsManager();
+        this.antiLegsManager.registerAntiLeg(StandardAntiLegs.create(config));
+
         this.liteCommands = LiteBukkitFactory.builder(this.getServer(), "lite-antilegs")
+                .bind(LiteAntiLegs.class, () -> this)
+                .bind(ConfigurationManager.class, () -> configManager)
+
                 .argument(Player.class, new PlayerArgument(this))
                 .argument(AntiLegs.class, new AntiLegsArgument(this))
-                .bind(LiteAntiLegs.class, this)
-                .message(ValidationInfo.NO_PERMISSION, config.onPermission)
+
+                .message(ValidationInfo.NO_PERMISSION, new LitePermissionMessage(config))
                 .command(AntiLegsCommand.class)
                 .register();
 

src/main/java/dev/rollczi/antilegs/commands/AntiLegsArgument.java

@@ -7,13 +7,16 @@
 import dev.rollczi.antilegs.LiteAntiLegs;
 import dev.rollczi.antilegs.system.antilegs.AntiLegs;
 import dev.rollczi.antilegs.system.antilegs.AntiLegsManager;
-import dev.rollczi.litecommands.inject.SingleArgumentHandler;
+import dev.rollczi.litecommands.LiteInvocation;
+import dev.rollczi.litecommands.argument.ArgumentName;
+import dev.rollczi.litecommands.argument.SingleArgumentHandler;
 import dev.rollczi.litecommands.valid.ValidationCommandException;
 import dev.rollczi.litecommands.valid.ValidationInfo;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
+@ArgumentName("antilegs_type")
 public class AntiLegsArgument implements SingleArgumentHandler<AntiLegs> {
 
     private final LiteAntiLegs plugin;
@@ -23,7 +26,7 @@ public AntiLegsArgument(LiteAntiLegs plugin) {
     }
 
     @Override
-    public AntiLegs parse(String argument) throws ValidationCommandException {
+    public AntiLegs parse(LiteInvocation invocation, String argument) throws ValidationCommandException {
         AntiLegsManager manager = plugin.getAntiLegsManager();
         return manager.getAntiLegs(argument)
                 .orThrow(() -> new ValidationCommandException(ValidationInfo.CUSTOM, "&cBłąd: Standardowa implementacja nie została zarejestrowana."));

src/main/java/dev/rollczi/antilegs/commands/AntiLegsCommand.java

@@ -5,30 +5,35 @@
 package dev.rollczi.antilegs.commands;
 
 import dev.rollczi.antilegs.LiteAntiLegs;
+import dev.rollczi.antilegs.config.ConfigurationManager;
 import dev.rollczi.antilegs.config.PluginConfig;
 import dev.rollczi.antilegs.system.antilegs.AntiLegs;
 import dev.rollczi.antilegs.system.antilegs.AntiLegsManager;
 import dev.rollczi.antilegs.system.antilegs.StandardAntiLegs;
 import dev.rollczi.antilegs.utils.ChatUtils;
 import dev.rollczi.antilegs.utils.InventoryUtils;
-import dev.rollczi.litecommands.LiteSender;
 import dev.rollczi.litecommands.annotations.Arg;
 import dev.rollczi.litecommands.annotations.Execute;
 import dev.rollczi.litecommands.annotations.IgnoreMethod;
 import dev.rollczi.litecommands.annotations.Permission;
 import dev.rollczi.litecommands.annotations.Required;
 import dev.rollczi.litecommands.annotations.Section;
 import dev.rollczi.litecommands.annotations.UsageMessage;
+import dev.rollczi.litecommands.platform.LiteSender;
 import dev.rollczi.litecommands.valid.ValidationCommandException;
 import dev.rollczi.litecommands.valid.ValidationInfo;
+import net.dzikoysk.cdn.CdnException;
 import org.bukkit.entity.Player;
+import panda.std.Blank;
+import panda.std.Result;
 
 @Section(route = "antilegs", aliases = {"antynogi"})
 @Permission("dev.rollczi.antilegs")
-@UsageMessage("&cPrawidłowe użycie &8» &7/antynogi give|give -other>")
+@UsageMessage("&cPrawidłowe użycie &8» &7/antynogi give|give -other|reload")
 public final class AntiLegsCommand {
 
     @Section(route = "give")
+    @Permission("dev.rollczi.antilegs.give")
     public static class Give {
 
         private final LiteAntiLegs plugin;
@@ -65,4 +70,23 @@ private void give(LiteSender sender, Player player, AntiLegs antiLegs) {
 
     }
 
+    @Execute(route = "reload")
+    @Permission("dev.rollczi.antilegs.reload")
+    public void reload(LiteSender liteSender, ConfigurationManager manager) {
+        Result<Blank, CdnException> result = manager.loadConfigs();
+
+        if (result.isOk()) {
+            PluginConfig config = manager.getPluginConfig();
+
+            liteSender.sendMessage(config.reload);
+            return;
+        }
+
+        CdnException error = result.getError();
+
+        liteSender.sendMessage("&cInternal Error: " + error.getMessage());
+        liteSender.sendMessage("&c(See console logs)");
+        error.printStackTrace();
+    }
+
 }

src/main/java/dev/rollczi/antilegs/commands/LitePermissionMessage.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 Rollczi
+ */
+
+package dev.rollczi.antilegs.commands;
+
+import dev.rollczi.antilegs.config.PluginConfig;
+import dev.rollczi.litecommands.valid.messages.LiteMessage;
+import dev.rollczi.litecommands.valid.messages.MessageInfoContext;
+import panda.utilities.text.Joiner;
+
+public class LitePermissionMessage implements LiteMessage {
+
+    private final PluginConfig config;
+
+    public LitePermissionMessage(PluginConfig config) {
+        this.config = config;
+    }
+
+    @Override
+    public String message(MessageInfoContext messageInfoContext) {
+        String permissions = Joiner
+                .on(", ")
+                .join(messageInfoContext.getMissingPermissions())
+                .toString();
+
+        return config.noPermission.replace("{PERMISSIONS}", permissions);
+    }
+
+}

src/main/java/dev/rollczi/antilegs/commands/PlayerArgument.java

@@ -5,7 +5,9 @@
 package dev.rollczi.antilegs.commands;
 
 import dev.rollczi.antilegs.LiteAntiLegs;
-import dev.rollczi.litecommands.inject.SingleArgumentHandler;
+import dev.rollczi.litecommands.LiteInvocation;
+import dev.rollczi.litecommands.argument.ArgumentName;
+import dev.rollczi.litecommands.argument.SingleArgumentHandler;
 import dev.rollczi.litecommands.valid.ValidationCommandException;
 import dev.rollczi.litecommands.valid.ValidationInfo;
 import org.bukkit.Bukkit;
@@ -16,6 +18,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+@ArgumentName("player")
 public class PlayerArgument implements SingleArgumentHandler<Player> {
 
     private final LiteAntiLegs plugin;
@@ -25,9 +28,9 @@ public PlayerArgument(LiteAntiLegs plugin) {
     }
 
     @Override
-    public Player parse(String argument) throws ValidationCommandException {
+    public Player parse(LiteInvocation invocation, String argument) throws ValidationCommandException {
         return Option.of(Bukkit.getPlayer(argument))
-                .orThrow(() -> new ValidationCommandException(ValidationInfo.CUSTOM, plugin.getConfigManager().getPluginConfig().onFoundPlayer));
+                .orThrow(() -> new ValidationCommandException(ValidationInfo.CUSTOM, plugin.getConfigManager().getPluginConfig().noFoundPlayer));
     }
 
     @Override

src/main/java/dev/rollczi/antilegs/config/AbstractConfigWithResource.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022 Rollczi
+ */
+
+package dev.rollczi.antilegs.config;
+
+import net.dzikoysk.cdn.entity.Exclude;
+import net.dzikoysk.cdn.source.Resource;
+import net.dzikoysk.cdn.source.Source;
+import org.apache.commons.lang.Validate;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+
+public abstract class AbstractConfigWithResource implements ConfigWithResource {
+
+    @Exclude
+    private Resource resource;
+
+    @Contract("null -> fail")
+    protected AbstractConfigWithResource(Resource resource) {
+        Validate.notNull(resource);
+        this.resource = resource;
+    }
+
+    @Contract("null, null -> fail")
+    protected AbstractConfigWithResource(File folder, String child) {
+        Validate.notNull(folder);
+        Validate.notNull(child);
+        this.resource = Source.of(new File(folder, child));
+    }
+
+    @Exclude
+    @Override @NotNull
+    public Resource getResource() {
+        return this.resource;
+    }
+
+    @Exclude
+    @Override @Contract("null -> fail")
+    public void setResource(Resource resource) {
+        Validate.notNull(resource);
+        this.resource = resource;
+    }
+
+}

src/main/java/dev/rollczi/antilegs/config/ConfigManager.java

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2022 Rollczi
+ */
+
+package dev.rollczi.antilegs.config;
+
+import net.dzikoysk.cdn.source.Resource;
+
+public interface ConfigWithResource {
+
+    Resource getResource();
+
+    void setResource(Resource resource);
+
+}