4 files changed, 70 insertions, 59 deletions
diff --git a/src/main/resources/arenas.yml b/src/main/resources/arenas.yml
new file mode 100644
index 0000000..7b902be
--- /dev/null
+++ b/src/main/resources/arenas.yml
@@ -0,0 +1,23 @@
+arenas:
+  'test':
+    kill-at-y: 5
+    game-spawn:
+      x: 100
+      y: 100
+      z: 100
+      world: world
+    lobby:
+      x: 0.5
+      y: 100
+      z: 0.5
+      world: world
+    winner-lobby:
+      x: 0.5
+      y: 100
+      z: 0.5
+      world: world
+    wait-arena:
+      x: 0.5
+      y: 100
+      z: 0.5
+      world: world
+\ No newline at end of file
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index b13570e..97f0a12 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -3,42 +3,5 @@ hideJoinLeaveMessages: false
 
 # 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
-wait-area:
-  enable: false
-  spawn:
-    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
 
-# 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
-winner-lobby:
-  enable: false
-  spawn:
-    x:
-    y:
-    z:
-    world:
-
-# Add/remove as you wish
-# Keep in mind that these coordinates cannot be zero! Use something like 0.5 instead
-arenas:
-  'test':
-    kill-at-y: 5
-    spawn:
-      x: 100
-      y: 100
-      z: 100
-      world: world
-\ No newline at end of file
diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml
new file mode 100644
index 0000000..fa57b1c
--- /dev/null
+++ b/src/main/resources/language.yml
@@ -0,0 +1,42 @@
+prefix: "&f[&eTumble&f] "
+
+unknown-command: "&4Unknown command '%command%'"
+no-permission: "&4You do not have permission to perform this command! &7Required permission: '%permission%.'"
+missing-arena-parameter: "&4Missing arena name!"
+invalid-arena: "&4arena '%arena%' does not exist!"
+invalid-type: "&4Invalid game type"
+no-game-in-arena: "&4No game is currently running in this arena"
+player-not-in-game: "&4You are not in a game!"
+not-for-console: "&4This cannot be run by the console"
+game-in-progress: "&4This game is still in progress!&7 wait until it finishes or join another game"
+another-type-in-arena: "A game of %type% is currently taking place in this arena!&7 choose another arena or join it with &a/tmbl join %arena% %type%"
+already-in-game: "&4You are already in a game! Leave it to join another one."
+
+create-success: "&aArena created successfully! &eBefore you can join, you must set a game spawn location with /tmbl setGameSpawn"
+forcestart-success: "&aStarting game."
+forcestop-success: "&aGame stopped."
+join-success: "&aJoined game &d%arena% - %type%"
+leave-success: "&aLeft game &d%arena% - %type%"
+reload-success: "&aConfiguration reloaded. &eCheck console for errors."
+remove-success: "&aArena removed."
+set-success: "&aLocation set."
+
+showdown: "&4Showdown!"
+lobby-in-10: "&9Returning to lobby in ten seconds..."
+waiting-for-players: "&aWaiting for players"
+time-till-start: "&aGame will begin in %wait% seconds!"
+round-over: "&cRound over!"
+round-winner: "&6%winner%  has won the round!"
+round-draw: "&6Draw!"
+game-over: "&Game over!"
+game-winner: "&6%winner%  has won the Game!"
+count-3: "&23"
+count-2: "&e2"
+count-1: "&41"
+count-go: "&aGo!"
+
+
+
+
+
+
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 486fccf..ed246c5 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -7,31 +7,14 @@ load: POSTWORLD
 author: MylesAndMore
 website: https://github.com/MylesAndMore/Tumble
 softdepend: [Multiverse-Core]
+
 commands:
-  tumble-join:
+  tumble:
     description: Joins a Tumble match.
-    usage: '§cUsage: /tumble-join <arenaName> [gameType]'
+    usage: '§cUsage: /tumble'
     permission: tumble.join
-  tumble-leave:
-    description: Quits a Tumble match.
-    usage: '§cUsage: /tumble-leave'
-    permission: tumble.leave
-  tumble-forcestart:
-    description: Force starts a Tumble match.
-    usage: '§cUsage: /tumble-forcestart [arenaName]'
-    permission: tumble.forcestart
-  tumble-forcestop:
-    description: Force stops a Tumble match.
-    usage: '§cUsage: /tumble-forcestop [arenaName]'
-    permission: tumble.forcestop
-  tumble-config:
-    description: Modify arenas and worlds.
-    usage: '§cUsage: /tumble-config <add|set|disable|delete> <data>'
-    permission: tumble.config
-  tumble-reload:
-    description: Reloads the plugin's config.
-    usage: '§cUsage: /tumble-reload'
-    permission: tumble.reload
+    aliases: tmbl
+
 permissions:
   tumble.join:
     description: Allows you to join a Tumble match.