Adds missing commands, and improves permissions

README.md

@@ -9,13 +9,25 @@ To modify the arena, use `/dropperedit <name> <property> <value>`.
 
 ## Permissions
 
-| Node             | Description                                          |
-|------------------|------------------------------------------------------|
-| minigames.admin  | Gives all permissions.                               |
-| minigames.join   | Allows a player to participate in mini-game arenas.  |
-| minigames.create | Allows a player to create a new mini-game arena.     |
-| minigames.edit   | Allows a player to edit an existing mini-game arena. |
-| minigames.remove | Allows a player to remove a mini-game arena.         |
+The only permission normal players will need is `minigames.join` which is set to true by default.
+
+| Node                     | Description                                          |
+|--------------------------|------------------------------------------------------|
+| minigames.admin          | Gives all permissions.                               |
+| minigames.dropper        | Gives all dropper-related permissions.               |
+| minigames.parkour        | Gives all parkour-related permissions.               |
+| minigames.join           | Allows a player to participate in mini-game arenas.  |
+| minigames.join.dropper   | Allows a player to participate in dropper arenas.    |
+| minigames.join.parkour   | Allows a player to participate in parkour arenas.    |
+| minigames.create         | Allows a player to create a new mini-game arena.     |
+| minigames.create.dropper | Allows a player to create a new dropper arena.       |
+| minigames.create.parkour | Allows a player to create a new parkour arena.       |
+| minigames.edit           | Allows a player to edit an existing mini-game arena. |
+| minigames.edit.dropper   | Allows a player to edit an existing dropper arena.   |
+| minigames.edit.parkour   | Allows a player to edit an existing parkour arena.   |
+| minigames.remove         | Allows a player to remove a mini-game arena.         |
+| minigames.remove.dropper | Allows a player to remove a dropper arena.           |
+| minigames.remove.parkour | Allows a player to remove a parkour arena.           |
 
 ## Commands
 

src/main/java/net/knarcraft/minigames/command/parkour/EditParkourArenaCommand.java

@@ -28,7 +28,6 @@ public class EditParkourArenaCommand implements CommandExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s,
                              @NotNull String[] arguments) {
-        //TODO: Checkpoints are quite different from everything else, so some custom code is needed for dealing with them
         if (!(commandSender instanceof Player player)) {
             commandSender.sendMessage("This command must be used by a player");
             return false;

src/main/resources/plugin.yml

@@ -8,10 +8,22 @@ softdepend:
 
 # Note to self: Aliases must be lowercase!
 commands:
+  miniGamesReload:
+    aliases:
+      - mreload
+    permission: minigames.admin
+    usage: /<command>
+    description: Reloads all data from disk
+  miniGamesLeave:
+    aliases:
+      - mleave
+    permission: minigames.join
+    usage: /<command>
+    description: Used to leave the current dropper arena
   dropperGroupSet:
     aliases:
       - dgset
-    permission: dropper.edit
+    permission: minigames.edit
     usage: |
       /<command> <arena> <group>
       - The group will be created if it doesn't already exist
@@ -20,7 +32,7 @@ commands:
   dropperGroupSwap:
     aliases:
       - dgswap
-    permission: dropper.edit
+    permission: minigames.edit
     usage: |
       /<command> <arena1> <arena2>
       - The two arenas must be in the same group
@@ -28,44 +40,32 @@ commands:
   dropperGroupList:
     aliases:
       - dglist
-    permission: dropper.edit
+    permission: minigames.edit
     usage: |
       /<command> [group]
       - Existing groups will be listed if used without an argument
       - Supplying a group shows the group's arenas
     description: Lists existing groups and their arenas
-  miniGamesReload:
-    aliases:
-      - mreload
-    permission: dropper.admin
-    usage: /<command>
-    description: Reloads all data from disk
   dropperList:
     aliases:
       - dlist
-    permission: dropper.join
+    permission: minigames.join
     usage: /<command>
     description: Used to list all current dropper arenas
   dropperJoin:
     aliases:
       - djoin
-    permission: dropper.join
+    permission: minigames.join
     usage: |
       /<command> <arena> [mode]
       - Mode can be used to select challenge modes which can be played after beating the arena.
       - inverted = A game-mode where the WASD buttons are inverted
       - random = A game-mode where the WASD buttons toggle between being inverted and not
     description: Used to join a dropper arena
-  miniGamesLeave:
-    aliases:
-      - mleave
-    permission: dropper.join
-    usage: /<command>
-    description: Used to leave the current dropper arena
   dropperCreate:
     aliases:
       - dcreate
-    permission: dropper.create
+    permission: minigames.create
     usage: |
       /<command> <arena> <property> [new value]
       - Valid properties: name, spawnLocation, exitLocation, verticalVelocity, horizontalVelocity, winBlockType
@@ -73,15 +73,74 @@ commands:
   dropperEdit:
     aliases:
       - dedit
-    permission: dropper.edit
+    permission: minigames.edit
     usage: /<command> (Details not finalized)
     description: Used to edit an existing dropper arena
   dropperRemove:
     aliases:
       - dremove
-    permission: dropper.remove
+    permission: minigames.remove
     usage: /<command> <arena>
     description: Used to remove an existing dropper arena
+  parkourGroupSet:
+    aliases:
+      - pgset
+    permission: minigames.edit.parkour
+    usage: |
+      /<command> <arena> <group>
+      - The group will be created if it doesn't already exist
+      - Use "none" or "null" as the group to release the arena from its group
+    description: Sets the group of the given arena
+  parkourGroupSwap:
+    aliases:
+      - pgswap
+    permission: minigames.edit
+    usage: |
+      /<command> <arena1> <arena2>
+      - The two arenas must be in the same group
+    description: Swaps the order of two arenas in the same group
+  parkourGroupList:
+    aliases:
+      - pglist
+    permission: minigames.edit
+    usage: |
+      /<command> [group]
+      - Existing groups will be listed if used without an argument
+      - Supplying a group shows the group's arenas
+    description: Lists existing groups and their arenas
+  parkourList:
+    aliases:
+      - plist
+    permission: minigames.join
+    usage: /<command>
+    description: Used to list all current parkour arenas
+  parkourJoin:
+    aliases:
+      - pjoin
+    permission: minigames.join
+    usage: |
+      /<command> <arena>
+    description: Used to join a parkour arena
+  parkourCreate:
+    aliases:
+      - pcreate
+    permission: minigames.create
+    usage: |
+      /<command> <arena> <property> [new value]
+      - Valid properties: name, spawnLocation, exitLocation, winBlockType, winLocation, checkpointAdd, checkpointClear, killPlaneBlocks
+    description: Used to create a new parkour arena
+  parkourEdit:
+    aliases:
+      - pedit
+    permission: minigames.edit
+    usage: /<command> (Details not finalized)
+    description: Used to edit an existing parkour arena
+  parkourRemove:
+    aliases:
+      - dremove
+    permission: minigames.remove
+    usage: /<command> <arena>
+    description: Used to remove an existing parkour arena
 permissions:
   minigames.*:
     description: Gives all permissions
@@ -96,15 +155,67 @@ permissions:
       - minigames.create
       - minigames.edit
       - minigames.remove
+  minigames.dropper:
+    description: Gives all dropper-related permissions
+    default: false
+    children:
+      - minigames.join.dropper
+      - minigames.create.dropper
+      - minigames.edit.dropper
+      - minigames.remove.dropper
+  minigames.parkour:
+    description: Gives all parkour-related permissions
+    default: false
+    children:
+      - minigames.join.parkour
+      - minigames.create.parkour
+      - minigames.edit.parkour
+      - minigames.remove.parkour
   minigames.join:
     description: Allows a player to participate in mini-games arenas
     default: true
+    children:
+      - minigames.join.dropper
+      - minigames.join.parkour
+  minigames.join.dropper:
+    description: Allows a player to participate in dropper arenas
+    default: false
+  minigames.join.parkour:
+    description: Allows a player to participate in parkour arenas
+    default: false
   minigames.create:
     description: Allows a player to create a new mini-games arena
     default: false
+    children:
+      - minigames.create.dropper
+      - minigames.create.parkour
+  minigames.create.dropper:
+    description: Allows a player to create a new dropper arena
+    default: false
+  minigames.create.parkour:
+    description: Allows a player to create a new parkour arena
+    default: false
   minigames.edit:
     description: Allows a player to edit an existing mini-games arena
     default: false
+    children:
+      - minigames.edit.dropper
+      - minigames.edit.parkour
+  minigames.edit.dropper:
+    description: Allows a player to edit an existing dropper arena
+    default: false
+  minigames.edit.parkour:
+    description: Allows a player to edit an existing parkour arena
+    default: false
   minigames.remove:
     description: Allows a player to remove a mini-games arena
+    default: false
+    children:
+      - minigames.remove.dropper
+      - minigames.remove.parkour
+  minigames.remove.dropper:
+    description: Allows a player to remove a dropper arena
+    default: false
+  minigames.remove.parkour:
+    description: Allows a player to remove a parkour arena
     default: false