GH-89 Update lite commands version and all commands.

build.gradle.kts

@@ -21,6 +21,7 @@ repositories {
     maven { url = uri("https://oss.sonatype.org/content/repositories/central") }
     maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
     maven { url = uri("https://repo.eternalcode.pl/releases") }
+    maven { url = uri("https://repo.eternalcode.pl/snapshots") }
     maven { url = uri("https://repository.minecodes.pl/releases") }
 }
 
@@ -29,7 +30,8 @@ dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
     implementation("net.kyori:adventure-platform-bukkit:4.3.1")
     implementation("net.kyori:adventure-text-minimessage:4.14.0")
-    implementation("dev.rollczi.litecommands:bukkit-adventure:2.8.9")
+    implementation("dev.rollczi:litecommands-bukkit:3.1.0-SNAPSHOT")
+    implementation("dev.rollczi:litecommands-adventure:3.1.0-SNAPSHOT")
 
     // skull api
     implementation("dev.rollczi:liteskullapi:1.3.0")
@@ -107,11 +109,13 @@ bukkit {
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
     options.setIncremental(true)
+    options.compilerArgs.add("-parameters")
 }
 
 tasks {
     runServer {
         minecraftVersion("1.20.2")
+        downloadPlugins.url("https://github.com/MilkBowl/Vault/releases/download/1.7.3/Vault.jar")
     }
 
     test {

src/main/java/com/eternalcode/parcellockers/ParcelLockers.java

@@ -1,11 +1,12 @@
 package com.eternalcode.parcellockers;
 
 import com.eternalcode.parcellockers.command.argument.PlayerArgument;
-import com.eternalcode.parcellockers.command.handler.InvalidUsage;
+import com.eternalcode.parcellockers.command.handler.InvalidUsageImpl;
 import com.eternalcode.parcellockers.command.handler.PermissionMessage;
 import com.eternalcode.parcellockers.configuration.ConfigurationManager;
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
 import com.eternalcode.parcellockers.database.DataSourceFactory;
+import com.eternalcode.parcellockers.feature.itemstorage.repository.ItemStorageRepositoryImpl;
 import com.eternalcode.parcellockers.locker.LockerManager;
 import com.eternalcode.parcellockers.locker.controller.LockerBreakController;
 import com.eternalcode.parcellockers.locker.controller.LockerInteractionController;
@@ -24,8 +25,9 @@
 import com.google.common.base.Stopwatch;
 import com.zaxxer.hikari.HikariDataSource;
 import dev.rollczi.litecommands.LiteCommands;
-import dev.rollczi.litecommands.bukkit.adventure.platform.LiteBukkitAdventurePlatformFactory;
-import dev.rollczi.litecommands.bukkit.tools.BukkitOnlyPlayerContextual;
+import dev.rollczi.litecommands.annotations.LiteCommandsAnnotations;
+import dev.rollczi.litecommands.bukkit.LiteBukkitMessages;
+import dev.rollczi.litecommands.bukkit.LiteCommandsBukkit;
 import io.papermc.lib.PaperLib;
 import io.papermc.lib.environments.Environment;
 import io.sentry.Sentry;
@@ -86,26 +88,26 @@ public void onEnable() {
 
         LockerRepositoryImpl parcelLockerRepositoryImpl = new LockerRepositoryImpl(dataSource);
         parcelLockerRepositoryImpl.updatePositionCache();
-
+        ItemStorageRepositoryImpl itemStorageRepository = new ItemStorageRepositoryImpl(dataSource);
+
         ParcelRepositoryImpl parcelRepository = new ParcelRepositoryImpl(dataSource);
 
         ParcelManager parcelManager = new ParcelManager(config, announcer, parcelRepository);
         LockerManager lockerManager = new LockerManager(parcelLockerRepositoryImpl);
 
         MainGUI mainGUI = new MainGUI(this, server, miniMessage, config, parcelRepository, parcelLockerRepositoryImpl);
         ParcelListGUI parcelListGUI = new ParcelListGUI(this, server, miniMessage, config, parcelRepository, parcelLockerRepositoryImpl, mainGUI);
-
-        this.liteCommands = LiteBukkitAdventurePlatformFactory.builder(server, "parcellockers", false, this.audiences, true)
+        this.liteCommands = LiteCommandsBukkit.builder("parcellockers", this)
                 .argument(Parcel.class, new ParcelArgument(parcelRepository))
                 .argument(Player.class, new PlayerArgument(server, config))
-                .contextualBind(Player.class, new BukkitOnlyPlayerContextual<>(config.messages.onlyForPlayers))
-                .commandInstance(
-                        new ParcelCommand(server, parcelLockerRepositoryImpl, announcer, config, mainGUI, parcelListGUI, parcelManager),
-                        new ParcelLockersCommand(configManager, config, announcer, miniMessage)
-                )
-                .invalidUsageHandler(new InvalidUsage(announcer, config))
-                .permissionHandler(new PermissionMessage(announcer, config))
-                .register();
+                .message(LiteBukkitMessages.PLAYER_ONLY, config.messages.onlyForPlayers)
+                .commands(LiteCommandsAnnotations.of(
+                    new ParcelCommand(server, parcelLockerRepositoryImpl, announcer, config, mainGUI, parcelListGUI, parcelManager),
+                    new ParcelLockersCommand(configManager, config, announcer, miniMessage)
+                ))
+                .invalidUsage(new InvalidUsageImpl(announcer, config))
+                .missingPermission(new PermissionMessage(announcer, config))
+                .build();
 
         if (!this.setupEconomy()) {
             this.getLogger().severe("Disabling due to no Vault dependency found!");
@@ -114,7 +116,7 @@ public void onEnable() {
         }
 
         Stream.of(
-            new LockerInteractionController(parcelLockerRepositoryImpl, miniMessage, config),
+            new LockerInteractionController(parcelLockerRepositoryImpl, itemStorageRepository, miniMessage, config),
             new LockerPlaceController(config, miniMessage, this, parcelLockerRepositoryImpl, announcer),
             new LockerBreakController(parcelLockerRepositoryImpl, announcer, config.messages)
         ).forEach(controller -> server.getPluginManager().registerEvents(controller, this));
@@ -129,7 +131,7 @@ public void onEnable() {
     @Override
     public void onDisable() {
         if (this.liteCommands != null) {
-            this.liteCommands.getPlatform().unregisterAll();
+            this.liteCommands.unregister();
         }
 
         if (this.audiences != null) {
@@ -161,12 +163,12 @@ private boolean setupEconomy() {
         if (this.getServer().getPluginManager().getPlugin("Vault") == null) {
             return false;
         }
-        
+
         RegisteredServiceProvider<Economy> rsp = this.getServer().getServicesManager().getRegistration(Economy.class);
         if (rsp == null) {
-            return false;
+            return false; // !!!MAJK!!! Vault is installed but no economy plugin is registered (e.g. EssentialsX)
         }
-        
+
         this.economy = rsp.getProvider();
         return true;
     }

src/main/java/com/eternalcode/parcellockers/ParcelLockersCommand.java

@@ -3,16 +3,17 @@
 import com.eternalcode.parcellockers.configuration.ConfigurationManager;
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
 import com.eternalcode.parcellockers.notification.NotificationAnnouncer;
-import dev.rollczi.litecommands.command.async.Async;
-import dev.rollczi.litecommands.command.execute.Execute;
-import dev.rollczi.litecommands.command.permission.Permission;
-import dev.rollczi.litecommands.command.route.Route;
+import dev.rollczi.litecommands.annotations.async.Async;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.execute.Execute;
+import dev.rollczi.litecommands.annotations.permission.Permission;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@Route(name = "parcellockers", aliases = {"parcellocker"})
+@Command(name = "parcellockers", aliases = {"parcellocker"})
 @Permission("parcellockers.admin")
 public class ParcelLockersCommand {
 
@@ -29,14 +30,14 @@ public ParcelLockersCommand(ConfigurationManager configManager, PluginConfigurat
     }
 
     @Async
-    @Execute(route = "reload", aliases = {"rl"})
-    void reload(CommandSender sender) {
+    @Execute(name = "reload", aliases = {"rl"})
+    void reload(@Context CommandSender sender) {
         this.configManager.reload();
         this.announcer.sendMessage(sender, this.config.messages.reload);
     }
 
-    @Execute(route = "give")
-    void give(Player player) {
+    @Execute(name = "give")
+    void give(@Context Player player) {
         ItemStack parcelItem = this.config.settings.parcelLockerItem.toGuiItem(this.miniMessage).getItemStack();
         player.getInventory().addItem(parcelItem);
     }

src/main/java/com/eternalcode/parcellockers/command/argument/PlayerArgument.java

@@ -1,19 +1,18 @@
 package com.eternalcode.parcellockers.command.argument;
 
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
-import dev.rollczi.litecommands.argument.ArgumentName;
-import dev.rollczi.litecommands.argument.simple.OneArgument;
-import dev.rollczi.litecommands.command.LiteInvocation;
-import dev.rollczi.litecommands.suggestion.Suggestion;
+import dev.rollczi.litecommands.argument.Argument;
+import dev.rollczi.litecommands.argument.parser.ParseResult;
+import dev.rollczi.litecommands.argument.resolver.ArgumentResolver;
+import dev.rollczi.litecommands.invocation.Invocation;
+import dev.rollczi.litecommands.suggestion.SuggestionContext;
+import dev.rollczi.litecommands.suggestion.SuggestionResult;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
-import panda.std.Result;
 
-import java.util.List;
-
-@ArgumentName("player")
-public class PlayerArgument implements OneArgument<Player> {
+public class PlayerArgument extends ArgumentResolver<CommandSender, Player> {
 
     private final Server server;
     private final PluginConfiguration config;
@@ -24,20 +23,21 @@ public PlayerArgument(Server server, PluginConfiguration config) {
     }
 
     @Override
-    public Result<Player, ?> parse(LiteInvocation invocation, String argument) {
+    protected ParseResult<Player> parse(Invocation<CommandSender> invocation, Argument<Player> context, String argument) {
         Player player = this.server.getPlayer(argument);
 
         if (player == null) {
-            return Result.error(this.config.messages.cantFindPlayer);
+            return ParseResult.failure(this.config.messages.cantFindPlayer);
         }
-        return Result.ok(player);
+
+        return ParseResult.success(player);
     }
 
     @Override
-    public List<Suggestion> suggest(LiteInvocation invocation) {
+    public SuggestionResult suggest(Invocation<CommandSender> invocation, Argument<Player> argument, SuggestionContext context) {
         return this.server.getOnlinePlayers().stream()
                 .map(HumanEntity::getName)
-                .map(Suggestion::of)
-                .toList();
+                .collect(SuggestionResult.collector());
     }
+
 }

src/main/java/com/eternalcode/parcellockers/command/handler/InvalidUsageImpl.java

@@ -0,0 +1,43 @@
+package com.eternalcode.parcellockers.command.handler;
+
+import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
+import com.eternalcode.parcellockers.notification.NotificationAnnouncer;
+import dev.rollczi.litecommands.handler.result.ResultHandlerChain;
+import dev.rollczi.litecommands.invalidusage.InvalidUsage;
+import dev.rollczi.litecommands.invalidusage.InvalidUsageHandler;
+import dev.rollczi.litecommands.invocation.Invocation;
+import dev.rollczi.litecommands.schematic.Schematic;
+import org.bukkit.command.CommandSender;
+import panda.utilities.text.Formatter;
+
+import java.util.List;
+
+public class InvalidUsageImpl implements InvalidUsageHandler<CommandSender> {
+
+    private final NotificationAnnouncer announcer;
+    private final PluginConfiguration config;
+
+    public InvalidUsageImpl(NotificationAnnouncer announcer, PluginConfiguration config) {
+        this.announcer = announcer;
+        this.config = config;
+    }
+
+    @Override
+    public void handle(Invocation<CommandSender> invocation, InvalidUsage<CommandSender> result, ResultHandlerChain<CommandSender> chain) {
+        Schematic schematic = result.getSchematic();
+        List<String> schematics = schematic.all();
+
+        if (schematic.isOnlyFirst()) {
+            this.announcer.sendMessage(invocation.sender(), this.config.messages.parcelCommandUsage);
+            return;
+        }
+
+        for (String scheme : schematics) {
+            Formatter formatter = new Formatter()
+                    .register("{USAGE}", scheme);
+
+            this.announcer.sendMessage(invocation.sender(), formatter.format(this.config.messages.invalidUsage));
+        }
+    }
+
+}

src/main/java/com/eternalcode/parcellockers/command/handler/PermissionMessage.java

@@ -2,14 +2,14 @@
 
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
 import com.eternalcode.parcellockers.notification.NotificationAnnouncer;
-import dev.rollczi.litecommands.command.LiteInvocation;
-import dev.rollczi.litecommands.command.permission.RequiredPermissions;
-import dev.rollczi.litecommands.handle.PermissionHandler;
+import dev.rollczi.litecommands.handler.result.ResultHandlerChain;
+import dev.rollczi.litecommands.invocation.Invocation;
+import dev.rollczi.litecommands.permission.MissingPermissions;
+import dev.rollczi.litecommands.permission.MissingPermissionsHandler;
 import org.bukkit.command.CommandSender;
 import panda.utilities.text.Formatter;
-import panda.utilities.text.Joiner;
 
-public class PermissionMessage implements PermissionHandler<CommandSender> {
+public class PermissionMessage implements MissingPermissionsHandler<CommandSender> {
 
     private final NotificationAnnouncer announcer;
     private final PluginConfiguration config;
@@ -20,14 +20,12 @@ public PermissionMessage(NotificationAnnouncer announcer, PluginConfiguration co
     }
 
     @Override
-    public void handle(CommandSender commandSender, LiteInvocation invocation, RequiredPermissions requiredPermissions) {
-        String value = Joiner.on(", ")
-                .join(requiredPermissions.getPermissions())
-                .toString();
+    public void handle(Invocation<CommandSender> invocation, MissingPermissions missingPermissions, ResultHandlerChain<CommandSender> chain) {
+        String permissions = missingPermissions.asJoinedText();
 
         Formatter formatter = new Formatter()
-                .register("{PERMISSION}", value);
+                .register("{PERMISSION}", permissions);
 
-        this.announcer.sendMessage(commandSender, formatter.format(this.config.messages.noPermission));
+        this.announcer.sendMessage(invocation.sender(), formatter.format(this.config.messages.noPermission));
     }
 }

src/main/java/com/eternalcode/parcellockers/locker/controller/LockerInteractionController.java

@@ -1,6 +1,7 @@
 package com.eternalcode.parcellockers.locker.controller;
 
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
+import com.eternalcode.parcellockers.feature.itemstorage.repository.ItemStorageRepository;
 import com.eternalcode.parcellockers.locker.gui.LockerMainGUI;
 import com.eternalcode.parcellockers.locker.repository.LockerRepositoryImpl;
 import com.eternalcode.parcellockers.shared.Position;
@@ -18,11 +19,13 @@
 public class LockerInteractionController implements Listener {
 
     private final LockerRepositoryImpl parcelLockerRepositoryImpl;
+    private final ItemStorageRepository itemStorageRepository;
     private final MiniMessage miniMessage;
     private final PluginConfiguration config;
 
-    public LockerInteractionController(LockerRepositoryImpl parcelLockerRepositoryImpl, MiniMessage miniMessage, PluginConfiguration config) {
+    public LockerInteractionController(LockerRepositoryImpl parcelLockerRepositoryImpl, ItemStorageRepository itemStorageRepository, MiniMessage miniMessage, PluginConfiguration config) {
         this.parcelLockerRepositoryImpl = parcelLockerRepositoryImpl;
+        this.itemStorageRepository = itemStorageRepository;
         this.miniMessage = miniMessage;
         this.config = config;
     }
@@ -42,7 +45,7 @@ public void onInventoryOpen(PlayerInteractEvent event) {
 
         if (this.parcelLockerRepositoryImpl.isInCache(blockPos)) {
             event.setCancelled(true);
-            new LockerMainGUI(this.miniMessage, this.config).show(player);
+            new LockerMainGUI(this.miniMessage, this.config, itemStorageRepository).show(player);
         }
     }
 }