Add view other command, update cloud, compile against 1.21.8

Author: md5sha256

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "io.github.md5sha256"
-version = "1.0.0-SNAPSHOT"
+version = "1.0.1-SNAPSHOT"
 
 repositories {
     mavenCentral()
@@ -46,24 +46,32 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
     compileOnly("com.arcaniax:HeadDatabase-API:1.3.2")
-    compileOnly("com.github.MilkBowl:VaultAPI:1.7")
-    compileOnly("net.essentialsx:EssentialsX:2.20.1")
+    compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
+        exclude(group = "org.bukkit", module = "bukkit")
+        exclude(group = "org.spigotmc", module = "spigot-api")
+        exclude(group = "io.papermc.paper", module = "paper-api")
+    }
+    compileOnly("net.essentialsx:EssentialsX:2.21.2") {
+        exclude(group = "org.bukkit", module = "bukkit")
+        exclude(group = "org.spigotmc", module = "spigot-api")
+        exclude(group = "io.papermc.paper", module = "paper-api")
+    }
     // Provided by spigot library
     compileOnly("org.mariadb.jdbc:mariadb-java-client:3.4.0")
     compileOnly("com.zaxxer:HikariCP:5.1.0")
     // Shaded libs
     implementation("de.themoep:inventorygui:1.6.1-SNAPSHOT")
     implementation("org.spongepowered:configurate-yaml:4.1.2")
     implementation("org.spongepowered:configurate-gson:4.1.2")
-    implementation("org.incendo:cloud-paper:2.0.0-beta.8") {
+    implementation("org.incendo:cloud-paper:2.0.0-beta.10") {
         exclude("com.google.guava")
     }
-    implementation("org.incendo:cloud-processors-confirmation:1.0.0-beta.3") {
+    implementation("org.incendo:cloud-processors-confirmation:1.0.0-rc.1") {
         exclude("com.google.guava")
     }
-    implementation("org.incendo:cloud-annotations:2.0.0-rc.2") {
+    implementation("org.incendo:cloud-annotations:2.0.0") {
         exclude("com.google.guava")
     }
     testImplementation(platform("org.junit:junit-bom:5.10.2"))
@@ -103,9 +111,9 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.21")
+        minecraftVersion("1.21.8")
         downloadPlugins {
-            github("EssentialsX", "essentials", "2.20.1", "EssentialsX-2.20.1.jar")
+            github("EssentialsX", "essentials", "2.21.2", "EssentialsX-2.21.2.jar")
             github("MilkBowl", "Vault", "1.7.3", "Vault.jar")
         }
     }

src/main/java/io/github/md5sha256/democracypost/command/PostCommand.java

@@ -9,6 +9,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
+import org.checkerframework.checker.units.qual.A;
 import org.incendo.cloud.SenderMapper;
 import org.incendo.cloud.annotations.AnnotationParser;
 import org.incendo.cloud.annotations.Argument;
@@ -18,6 +19,9 @@
 import org.incendo.cloud.execution.ExecutionCoordinator;
 import org.incendo.cloud.paper.LegacyPaperCommandManager;
 import org.incendo.cloud.paper.PaperCommandManager;
+import org.incendo.cloud.paper.util.sender.PaperSimpleSenderMapper;
+import org.incendo.cloud.paper.util.sender.PlayerSource;
+import org.incendo.cloud.paper.util.sender.Source;
 
 import javax.annotation.Nonnull;
 
@@ -27,10 +31,10 @@ public class PostCommand {
 
     public PostCommand(@Nonnull Plugin plugin, @Nonnull PostOfficeMenu postOfficeMenu) {
         this.postOfficeMenu = postOfficeMenu;
-        var commandManager = PaperCommandManager.builder()
+        var commandManager = PaperCommandManager.builder(PaperSimpleSenderMapper.simpleSenderMapper())
                 .executionCoordinator(ExecutionCoordinator.simpleCoordinator())
                 .buildOnEnable(plugin);
-        var annotationParser = new AnnotationParser<>(commandManager, CommandSourceStack.class);
+        var annotationParser = new AnnotationParser<>(commandManager, Source.class);
         annotationParser.parse(this);
     }
 
@@ -53,22 +57,35 @@ public void commandOpen(
     @Command("post view <player>")
     @Permission("democracypost.view")
     public void commandView(
-            @Nonnull CommandSourceStack senderSourceStack,
+            @Nonnull PlayerSource playerSource,
             @Nonnull @Argument(value = "player") OfflinePlayer who) {
-        CommandSender sender = senderSourceStack.getSender();
-        if (!(senderSourceStack.getExecutor() instanceof Player executor)) {
-            sender.sendMessage("Executor must be an instance of a player!");
-            return;
-        }
+        Player sender = playerSource.source();
         // Prevent the sender from going "back"
-        InventoryGui.clearHistory(executor);
+        InventoryGui.clearHistory(sender);
         this.postOfficeMenu.createParcelListUi(who.getUniqueId()).whenComplete((gui, throwable) -> {
             if (throwable != null) {
                 sender.sendMessage(Component.text("Error occurred when retrieving packages for " + who.getName(),
                         NamedTextColor.RED));
                 return;
             }
-            gui.show(executor);
+            gui.show(sender);
+        });
+    }
+
+    @Command("post view <player> <targetPlayer>")
+    @Permission("democracypost.view.other")
+    public void commandViewOther(
+            @Nonnull @Argument(value = "player") OfflinePlayer who,
+            @Nonnull @Argument(value = "targetPlayer") Player toOpen) {
+        // Prevent the sender from going "back"
+        InventoryGui.clearHistory(toOpen);
+        this.postOfficeMenu.createParcelListUi(who.getUniqueId()).whenComplete((gui, throwable) -> {
+            if (throwable != null) {
+                toOpen.sendMessage(Component.text("Error occurred when retrieving packages for " + who.getName(),
+                        NamedTextColor.RED));
+                return;
+            }
+            gui.show(toOpen);
         });
     }
 

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: DemocracyPost
 version: '${version}'
 main: io.github.md5sha256.democracypost.DemocracyPost
-api-version: '1.20'
+api-version: '1.21.8'
 authors: [andrewandy]
 depend: ['Vault', 'Essentials']
 softdepend: ['HeadDatabase']