2 files changed, 68 insertions, 53 deletions

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 68b4e3d..8413843 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,24 +1,39 @@
-# Customize the default game mode; options include: shovels, snowballs, mixed
-gameMode: mixed
-
-# Customize the auto start feature of Tumble; players can be up to 8
-autoStart:
-  enabled: false
-  players: 2
-
 # Hides player join/leave messages in public chat
 hideJoinLeaveMessages: false
 
-# Customize the message that displays when the player does not have permission to execute a command from this plugin
-permissionMessage: You do not have permission to perform this command!
+# Duration in seconds to wait for more players to join
+wait-duration: 15
+# Teleport players somewhere while waiting for the game to start
+# Keep in mind that these coordinates cannot be zero! Use something like 0.5 instead
+enable-wait-area: false
+wait-area:
+  x:
+  y:
+  z:
+  world:
+
+# Place where everyone is teleported to after a game ends REQUIRED
+# Keep in mind that these coordinates cannot be zero! Use something like 0.5 instead
+lobby-spawn:
+  x: 0.5
+  y: 100
+  z: 0.5
+  world: world
 
-# Customize the place that the winner is teleported after a game ends
-# Keep in mind that these coordinates cannot be zero! The teleport will fail if any of them are; use something like 0.5 instead
-winnerTeleport: 
+# Place that the winner is teleported after a game ends
+# Keep in mind that these coordinates cannot be zero! Use something like 0.5 instead
+enable-winner-lobby-spawn: false
+winner-lobby-spawn:
   x: 
   y: 
-  z: 
+  z:
+  world:
 
-# The plugin will populate these fields automatically
-lobbyWorld: 
-gameWorld:
\ No newline at end of file
+# Add/remove as you wish
+# Keep in mind that these coordinates cannot be zero! Use something like 0.5 instead
+arenas:
+  'test':
+    x: 0.5
+    y: 60
+    z: 0.5
+    world: world
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index d070c3e..a890bdd 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,51 +3,51 @@ name: Tumble
 version: 1.0.4
 description: 'A Minecraft: Java Edition plugin recreating the Tumble minigame from Minecraft Legacy Console Edition.'
 api-version: 1.16
-load: STARTUP
+load: POSTWORLD
 author: MylesAndMore
 website: https://github.com/MylesAndMore/Tumble
-depend:
-  - Multiverse-Core
 commands:
+  join:
+    description: Joins a Tumble match.
+    usage: '§cUsage: /tumble:join <arenaName> [gameType]'
+    permission: tumble.join
+  leave:
+    description: Quits a Tumble match.
+    usage: '§cUsage: /tumble:leave [arenaName]'
+    permission: tumble.leave
+  forcestart:
+    description: Force starts a Tumble match.
+    usage: '§cUsage: /tumble:forcestart [arenaName]'
+    permission: tumble.forcestart
+  forcestop:
+    description: Force stops a Tumble match.
+    usage: '§cUsage: /tumble:forcestop [arenaName]'
+    permission: tumble.forcestop
+  config:
+    description: Modify arenas and settings
+    usage: '§cUsage: /tumble:config *not implemented yet*'
+    permission: tumble.config
   reload:
     description: Reloads the plugin's config.
     usage: '§cUsage: /tumble:reload'
     permission: tumble.reload
-  link:
-    description: Links a world on the server as a lobby/game world.
-    usage: '§cUsage: /tumble:link <world> (lobby|game)'
-    permission: tumble.link
-    aliases: [linkworld, link-world]
-  start:
-    description: Force starts a Tumble match with an optional game type.
-    usage: '§cUsage: /tumble:start [gameType]'
-    permission: tumble.start
-  winlocation:
-    description: Links the location to teleport the winning player of a game.
-    usage: '§cUsage: /tumble:winlocation [x] [y] [z]'
-    permission: tumble.winlocation
-    aliases: [win-location, winloc, win-loc]
-  autostart:
-    description: Configures the auto start functions of Tumble.
-    usage: '§cUsage: /tumble:autostart <playerAmount> [enable|disable]'
-    permission: tumble.autostart
-    aliases: [auto-start]
 permissions:
-  tumble.reload:
-    description: Allows you to reload the plugin's config.
-    default: op
-  tumble.link:
-    description: Allows you to link a world on the server as a lobby/game world.
-    default: op
-  tumble.start:
-    description: Allows you to start a Tumble match.
+  tumble.join:
+    description: Allows you to join a Tumble match.
+    default: true
+  tumble.leave:
+    description: Allows you to leave a Tumble match.
+    default: true
+  tumble.forcestart:
+    description: Allows you to force start a Tumble match.
     default: op
-  tumble.winlocation:
-    description: Allows you to link a win location.
+  tumble.forcestop:
+    description: Allows you to force stop a Tumble match.
     default: op
-  tumble.autostart:
-    description: Allows you to set the autostart details of Tumble.
-    default: op
-  tumble.update:
+  tumble.config:
     description: Allows you to get a notification if Tumble is out of date.
     default: op
+  tumble.reload:
+    description: Allows you to reload the plugin's config.
+    default: op
+