Make Java examples compile

Author: DerEchtePilz

reference-code/bukkit/src/main/java/annotations/SubcommandMethodExample.java

@@ -1,22 +1,26 @@
 package annotations;
 
+import dev.jorel.commandapi.annotations.Permission;
+import dev.jorel.commandapi.annotations.Subcommand;
+import dev.jorel.commandapi.annotations.arguments.AEntitySelectorArgument;
+import dev.jorel.commandapi.annotations.arguments.AStringArgument;
+import org.bukkit.entity.Player;
+
 import static annotations.WarpCommand.warps;
 
 class SubcommandMethodExample {
     // #region subcommandMethodExample
-    @dev.jorel.commandapi.annotations.Subcommand("create")
-    @dev.jorel.commandapi.annotations.Permission("warps.create")
-    public static void createWarp(org.bukkit.entity.Player player, @dev.jorel.commandapi.annotations.arguments.AStringArgument String warpName) {
+    @Subcommand("create")
+    @Permission("warps.create")
+    public static void createWarp(Player player, @AStringArgument String warpName) {
         warps.put(warpName, player.getLocation());
     }
     // #endregion subcommandMethodExample
 
     // #region subcommandAliasesMethodExample
-    @dev.jorel.commandapi.annotations.Subcommand({"teleport", "tp"})
-    public static void teleport(org.bukkit.entity.Player player, @dev.jorel.commandapi.annotations.arguments.APlayerArgument org.bukkit.OfflinePlayer target) {
-        if (target.isOnline() && target instanceof org.bukkit.entity.Player onlineTarget) {
-            player.teleport(onlineTarget);
-        }
+    @Subcommand({"teleport", "tp"})
+    public static void teleport(Player player, @AEntitySelectorArgument.OnePlayer Player target) {
+        player.teleport(target);
     }
     // #endregion subcommandAliasesMethodExample
 }

reference-code/bukkit/src/main/java/createcommands/arguments/CommandArguments.java

@@ -4,7 +4,6 @@
 import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 import dev.jorel.commandapi.arguments.GreedyStringArgument;
 import dev.jorel.commandapi.arguments.IntegerArgument;
-import dev.jorel.commandapi.arguments.PlayerArgument;
 import dev.jorel.commandapi.arguments.StringArgument;
 import org.bukkit.entity.Player;
 
@@ -14,8 +13,8 @@ class CommandArguments {
         new CommandAPICommand("mycommand")
             .withArguments(new StringArgument("name"))
             .withArguments(new IntegerArgument("amount"))
-            .withOptionalArguments(new PlayerArgument("player"))
-            .withOptionalArguments(new PlayerArgument("target"))
+            .withOptionalArguments(new EntitySelectorArgument.OnePlayer("player"))
+            .withOptionalArguments(new EntitySelectorArgument.OnePlayer("target"))
             .withOptionalArguments(new GreedyStringArgument("message"))
             .executesPlayer((player, args) -> {
                 String name = (String) args.get(0); // Access arguments by index
@@ -40,7 +39,7 @@ class CommandArguments {
 
         // #region getUncheckedExample
         new CommandAPICommand("mycommand")
-            .withArguments(new PlayerArgument("player"))
+            .withArguments(new EntitySelectorArgument.OnePlayer("player"))
             .executesPlayer((player, args) -> {
                 Player p = args.getUnchecked("player");
                 // Do whatever with the player
@@ -51,8 +50,8 @@ class CommandArguments {
         // #region getByArgumentExample
         StringArgument nameArgument = new StringArgument("name");
         IntegerArgument amountArgument = new IntegerArgument("amount");
-        PlayerArgument playerArgument = new PlayerArgument("player");
-        PlayerArgument targetArgument = new PlayerArgument("target");
+        EntitySelectorArgument.OnePlayer playerArgument = new EntitySelectorArgument.OnePlayer("player");
+        EntitySelectorArgument.OnePlayer targetArgument = new EntitySelectorArgument.OnePlayer("target");
         GreedyStringArgument messageArgument = new GreedyStringArgument("message");
 
         new CommandAPICommand("mycommand")

reference-code/bukkit/src/main/java/createcommands/arguments/ListedArguments.java

@@ -1,16 +1,16 @@
 package createcommands.arguments;
 
 import dev.jorel.commandapi.CommandAPICommand;
+import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 import dev.jorel.commandapi.arguments.GreedyStringArgument;
 import dev.jorel.commandapi.arguments.IntegerArgument;
-import dev.jorel.commandapi.arguments.PlayerArgument;
 import org.bukkit.entity.Player;
 
 class ListedArguments {
     static {
         // #region listedArgumentsExample
         new CommandAPICommand("mycommand")
-            .withArguments(new PlayerArgument("player"))
+            .withArguments(new EntitySelectorArgument.OnePlayer("player"))
             .withArguments(new IntegerArgument("value").setListed(false))
             .withArguments(new GreedyStringArgument("message"))
             .executes((sender, args) -> {

reference-code/bukkit/src/main/java/createcommands/arguments/OptionalArguments.java

@@ -1,8 +1,8 @@
 package createcommands.arguments;
 
 import dev.jorel.commandapi.CommandAPICommand;
+import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 import dev.jorel.commandapi.arguments.IntegerArgument;
-import dev.jorel.commandapi.arguments.PlayerArgument;
 import dev.jorel.commandapi.arguments.StringArgument;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -11,7 +11,7 @@ class OptionalArguments {
     static {
         // #region simpleOptionalArgumentsExample
         new CommandAPICommand("sayhi")
-            .withOptionalArguments(new PlayerArgument("target"))
+            .withOptionalArguments(new EntitySelectorArgument.OnePlayer("target"))
             .executesPlayer((player, args) -> {
                 Player target = (Player) args.get("target");
                 if (target != null) {
@@ -25,7 +25,7 @@ class OptionalArguments {
 
         // #region getOptionalExample
         new CommandAPICommand("sayhi")
-            .withOptionalArguments(new PlayerArgument("target"))
+            .withOptionalArguments(new EntitySelectorArgument.OnePlayer("target"))
             .executesPlayer((player, args) -> {
                 Player target = (Player) args.getOptional("target").orElse(player);
                 target.sendMessage("Hi!");
@@ -36,7 +36,7 @@ class OptionalArguments {
         // #region argumentsAfterOptionalArgumentsExample
         new CommandAPICommand("rate")
             .withOptionalArguments(new StringArgument("topic").combineWith(new IntegerArgument("rating", 0, 10)))
-            .withOptionalArguments(new PlayerArgument("target"))
+            .withOptionalArguments(new EntitySelectorArgument.OnePlayer("target"))
             .executes((sender, args) -> {
                 String topic = (String) args.get("topic");
                 if (topic == null) {

reference-code/bukkit/src/main/java/createcommands/arguments/suggestions/StringSuggestions.java

@@ -3,9 +3,9 @@
 import dev.jorel.commandapi.CommandAPICommand;
 import dev.jorel.commandapi.arguments.Argument;
 import dev.jorel.commandapi.arguments.ArgumentSuggestions;
+import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 import dev.jorel.commandapi.arguments.GreedyStringArgument;
 import dev.jorel.commandapi.arguments.IntegerArgument;
-import dev.jorel.commandapi.arguments.PlayerArgument;
 import dev.jorel.commandapi.arguments.StringArgument;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -59,7 +59,7 @@ public static String[] getFriends(CommandSender sender) {
     {
         // #region createFriendCommand
         List<Argument<?>> arguments = new ArrayList<>();
-        arguments.add(new PlayerArgument("friend").replaceSuggestions(
+        arguments.add(new EntitySelectorArgument.OnePlayer("friend").replaceSuggestions(
             ArgumentSuggestions.strings(info ->
                 Friends.getFriends(info.sender())
             ))
@@ -82,7 +82,7 @@ public static String[] getFriends(CommandSender sender) {
         // Replace the suggestions for the PlayerArgument.
         // info.sender() refers to the command sender that is running this command
         // info.previousArgs() refers to the Object[] of previously declared arguments (in this case, the IntegerArgument radius)
-        commandArgs.add(new PlayerArgument("target").replaceSuggestions(
+        commandArgs.add(new EntitySelectorArgument.OnePlayer("target").replaceSuggestions(
             ArgumentSuggestions.strings(info -> {
 
                 // Cast the first argument (radius, which is an IntegerArgument) to get its value

reference-code/bukkit/src/main/java/createcommands/arguments/suggestions/Tooltips.java

@@ -7,8 +7,8 @@
 import dev.jorel.commandapi.StringTooltip;
 import dev.jorel.commandapi.arguments.Argument;
 import dev.jorel.commandapi.arguments.ArgumentSuggestions;
+import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 import dev.jorel.commandapi.arguments.LocationArgument;
-import dev.jorel.commandapi.arguments.PlayerArgument;
 import dev.jorel.commandapi.arguments.SafeSuggestions;
 import dev.jorel.commandapi.arguments.StringArgument;
 import org.bukkit.Location;
@@ -34,7 +34,7 @@ class Tooltips {
                 }
             ))
         );
-        arguments.add(new PlayerArgument("target"));
+        arguments.add(new EntitySelectorArgument.OnePlayer("target"));
         // #endregion createArgumentsWithTooltips
 
         // #region registerEmoteCommand

reference-code/bukkit/src/main/java/createcommands/arguments/types/CommandArguments.java

@@ -3,7 +3,7 @@
 import dev.jorel.commandapi.CommandAPICommand;
 import dev.jorel.commandapi.arguments.ArgumentSuggestions;
 import dev.jorel.commandapi.arguments.CommandArgument;
-import dev.jorel.commandapi.arguments.PlayerArgument;
+import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 import dev.jorel.commandapi.arguments.SuggestionsBranch;
 import dev.jorel.commandapi.wrappers.CommandResult;
 import org.bukkit.Bukkit;
@@ -14,7 +14,7 @@ class CommandArguments {
     static {
         // #region sudoCommandExample
         new CommandAPICommand("sudo")
-            .withArguments(new PlayerArgument("target"))
+            .withArguments(new EntitySelectorArgument.OnePlayer("target"))
             .withArguments(new CommandArgument("command"))
             .executes((sender, args) -> {
                 Player target = (Player) args.get("target");

reference-code/bukkit/src/main/java/createcommands/arguments/types/StringsArguments.java

@@ -1,15 +1,15 @@
 package createcommands.arguments.types;
 
 import dev.jorel.commandapi.CommandAPICommand;
+import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 import dev.jorel.commandapi.arguments.GreedyStringArgument;
-import dev.jorel.commandapi.arguments.PlayerArgument;
 import org.bukkit.entity.Player;
 
 class StringsArguments {
     static {
         // #region greedyStringArgumentsExample
         new CommandAPICommand("message")
-            .withArguments(new PlayerArgument("target"))
+            .withArguments(new EntitySelectorArgument.OnePlayer("target"))
             .withArguments(new GreedyStringArgument("message"))
             .executes((sender, args) -> {
                 ((Player) args.get("target")).sendMessage((String) args.get("message"));

reference-code/bukkit/src/main/java/createcommands/arguments/types/chat/ChatPreview.java

@@ -2,7 +2,7 @@
 
 import dev.jorel.commandapi.CommandAPICommand;
 import dev.jorel.commandapi.arguments.AdvancementArgument;
-import dev.jorel.commandapi.arguments.PlayerArgument;
+import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.advancement.AdvancementProgress;
 import org.bukkit.entity.Player;
@@ -11,7 +11,7 @@ class AdvancementArguments {
     static {
         // #region advancementArgumentsExample
         new CommandAPICommand("award")
-            .withArguments(new PlayerArgument("player"))
+            .withArguments(new EntitySelectorArgument.OnePlayer("player"))
             .withArguments(new AdvancementArgument("advancement"))
             .executes((sender, args) -> {
                 Player target = (Player) args.get("player");