Finished events

Devlrxxh · Feb 4, 2024 · 8a0fab3 · 8a0fab3
1 parent 25b4acb
commit 8a0fab3
Show file tree

Hide file tree

Showing 23 changed files with 323 additions and 517 deletions.
diff --git a/src/main/java/me/funky/praxi/Praxi.java b/src/main/java/me/funky/praxi/Praxi.java
@@ -12,9 +12,8 @@
 import me.funky.praxi.arena.command.ArenaCommand;
 import me.funky.praxi.commands.admin.general.MainCommand;
 import me.funky.praxi.commands.donater.FlyCommand;
-import me.funky.praxi.commands.event.admin.*;
 import me.funky.praxi.commands.event.map.*;
-import me.funky.praxi.commands.event.user.*;
+import me.funky.praxi.commands.event.user.HostCommand;
 import me.funky.praxi.commands.event.vote.EventMapVoteCommand;
 import me.funky.praxi.commands.user.duels.DuelAcceptCommand;
 import me.funky.praxi.commands.user.duels.DuelCommand;
@@ -135,25 +134,12 @@ public void onEnable() {
         Arrays.asList(
                 new DuelCommand(),
                 new DuelAcceptCommand(),
-                new EventAdminCommand(),
-                new EventHelpCommand(),
-                new EventCancelCommand(),
-                new EventClearCooldownCommand(),
-                new EventForceStartCommand(),
-                new EventHostCommand(),
-                new EventInfoCommand(),
-                new EventJoinCommand(),
-                new EventLeaveCommand(),
-                new EventSetLobbyCommand(),
                 new EventMapCreateCommand(),
                 new EventMapDeleteCommand(),
                 new EventMapsCommand(),
                 new EventMapSetSpawnCommand(),
                 new EventMapStatusCommand(),
                 new EventMapVoteCommand(),
-                new EventAddMapCommand(),
-                new EventRemoveMapCommand(),
-                new EventsCommand(),
                 new RematchCommand(),
                 new SpectateCommand(),
                 new StopSpectatingCommand(),
@@ -226,6 +212,8 @@ private void loadCommandCompletions() {
         commandCompletions.registerCompletion("names", c -> Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList()));
         commandCompletions.registerCompletion("arenas", c -> Arena.getArenas().stream().map(Arena::getName).collect(Collectors.toList()));
         commandCompletions.registerCompletion("kits", c -> Kit.getKits().stream().map(Kit::getName).collect(Collectors.toList()));
+        commandCompletions.registerCompletion("events", c -> Event.events.stream().map(Event::getDisplayName).collect(Collectors.toList()));
+        commandCompletions.registerCompletion("maps", c -> EventGameMap.getMaps().stream().map(EventGameMap::getMapName).collect(Collectors.toList()));
     }
 
     @Override

diff --git a/src/main/java/me/funky/praxi/commands/event/admin/EventAddMapCommand.java b/src/main/java/me/funky/praxi/commands/event/admin/EventAddMapCommand.java
diff --git a/src/main/java/me/funky/praxi/commands/event/admin/EventAdminCommand.java b/src/main/java/me/funky/praxi/commands/event/admin/EventAdminCommand.java
diff --git a/src/main/java/me/funky/praxi/commands/event/admin/EventHelpCommand.java b/src/main/java/me/funky/praxi/commands/event/admin/EventHelpCommand.java
diff --git a/src/main/java/me/funky/praxi/commands/event/admin/EventRemoveMapCommand.java b/src/main/java/me/funky/praxi/commands/event/admin/EventRemoveMapCommand.java
diff --git a/src/main/java/me/funky/praxi/commands/event/admin/EventSetLobbyCommand.java b/src/main/java/me/funky/praxi/commands/event/admin/EventSetLobbyCommand.java
diff --git a/src/main/java/me/funky/praxi/commands/event/admin/EventsCommand.java b/src/main/java/me/funky/praxi/commands/event/admin/EventsCommand.java
diff --git a/src/main/java/me/funky/praxi/commands/event/user/EventCancelCommand.java b/src/main/java/me/funky/praxi/commands/event/user/EventCancelCommand.java
diff --git a/src/main/java/me/funky/praxi/commands/event/user/EventClearCooldownCommand.java b/src/main/java/me/funky/praxi/commands/event/user/EventClearCooldownCommand.java
diff --git a/src/main/java/me/funky/praxi/commands/event/user/EventForceStartCommand.java b/src/main/java/me/funky/praxi/commands/event/user/EventForceStartCommand.java