Move packaging and update versions

pom.xml

@@ -7,7 +7,7 @@
     <groupId>dev.efnilite</groupId>
     <artifactId>IP</artifactId>
     <packaging>pom</packaging>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
     <modules>
         <module>witp</module>
     </modules>

witp/dependency-reduced-pom.xml

@@ -3,31 +3,13 @@
   <parent>
     <artifactId>IP</artifactId>
     <groupId>dev.efnilite</groupId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>witp</artifactId>
-  <version>3.8.1</version>
+  <version>3.8.2</version>
   <build>
-    <sourceDirectory>src/main/java</sourceDirectory>
     <defaultGoal>clean package</defaultGoal>
-    <resources>
-      <resource>
-        <targetPath>.</targetPath>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>lang/items-v3.yml</include>
-          <include>lang/messages-v3.yml</include>
-          <include>lang/scoreboard-v3.yml</include>
-          <include>config.yml</include>
-          <include>generation.yml</include>
-          <include>rewards-v2.yml</include>
-          <include>schematics.yml</include>
-        </includes>
-      </resource>
-    </resources>
-    <finalName>${project.name}-${project.version}</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

witp/pom.xml

@@ -5,38 +5,19 @@
     <parent>
         <artifactId>IP</artifactId>
         <groupId>dev.efnilite</groupId>
-        <version>3.8.1</version>
+        <version>3.8.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>witp</artifactId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
 
     <properties>
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
     </properties>
 
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <finalName>${project.name}-${project.version}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <targetPath>.</targetPath>
-                <includes>
-                    <include>lang/items-v3.yml</include>
-                    <include>lang/messages-v3.yml</include>
-                    <include>lang/scoreboard-v3.yml</include>
-                    <include>config.yml</include>
-                    <include>generation.yml</include>
-                    <include>rewards-v2.yml</include>
-                    <include>schematics.yml</include>
-                </includes>
-            </resource>
-        </resources>
-
         <defaultGoal>clean package</defaultGoal>
         <plugins>
             <plugin>

witp/src/main/java/dev/efnilite/ip/IP.java

@@ -2,7 +2,7 @@
 
 import dev.efnilite.ip.api.Gamemodes;
 import dev.efnilite.ip.api.Registry;
-import dev.efnilite.ip.events.Handler;
+import dev.efnilite.ip.api.events.Handler;
 import dev.efnilite.ip.hook.FloodgateHook;
 import dev.efnilite.ip.hook.HoloHook;
 import dev.efnilite.ip.hook.MultiverseHook;

witp/src/main/java/dev/efnilite/ip/ParkourCommand.java

@@ -2,9 +2,9 @@
 
 import dev.efnilite.ip.api.Gamemode;
 import dev.efnilite.ip.leaderboard.Leaderboard;
-import dev.efnilite.ip.menu.LeaderboardMenu;
+import dev.efnilite.ip.menu.community.LeaderboardMenu;
 import dev.efnilite.ip.menu.MainMenu;
-import dev.efnilite.ip.menu.SingleplayerMenu;
+import dev.efnilite.ip.menu.play.SingleplayerMenu;
 import dev.efnilite.ip.player.ParkourPlayer;
 import dev.efnilite.ip.player.ParkourUser;
 import dev.efnilite.ip.player.data.InventoryData;

witp/src/main/java/dev/efnilite/ip/api/ParkourAPI.java

@@ -1,6 +1,7 @@
 package dev.efnilite.ip.api;
 
 import dev.efnilite.ip.IP;
+import dev.efnilite.ip.api.events.BlockGenerateEvent;
 import dev.efnilite.ip.player.ParkourPlayer;
 import dev.efnilite.ip.player.ParkourUser;
 import org.bukkit.entity.Player;
@@ -12,7 +13,7 @@
  * For player joining/leaving, please view {@link ParkourUser}.
  * For player settings, please view {@link ParkourPlayer}.
  * For player spectating, please view {@link dev.efnilite.ip.player.ParkourSpectator}.
- * For events, please view {@link dev.efnilite.ip.events.BlockGenerateEvent} and others in the events package.
+ * For events, please view {@link BlockGenerateEvent} and others in the events package.
  * For Sessions, please view {@link dev.efnilite.ip.session.Session}.
  */
 @SuppressWarnings("unused")

witp/src/main/java/dev/efnilite/ip/events/BlockGenerateEvent.java → witp/src/main/java/dev/efnilite/ip/api/events/BlockGenerateEvent.java

@@ -1,4 +1,4 @@
-package dev.efnilite.ip.events;
+package dev.efnilite.ip.api.events;
 
 import dev.efnilite.ip.generator.DefaultGenerator;
 import dev.efnilite.ip.player.ParkourPlayer;

witp/src/main/java/dev/efnilite/ip/events/Handler.java → witp/src/main/java/dev/efnilite/ip/api/events/Handler.java

@@ -1,4 +1,4 @@
-package dev.efnilite.ip.events;
+package dev.efnilite.ip.api.events;
 
 import dev.efnilite.ip.IP;
 import dev.efnilite.ip.ParkourCommand;

witp/src/main/java/dev/efnilite/ip/events/PlayerFallEvent.java → witp/src/main/java/dev/efnilite/ip/api/events/PlayerFallEvent.java

@@ -1,4 +1,4 @@
-package dev.efnilite.ip.events;
+package dev.efnilite.ip.api.events;
 
 import dev.efnilite.ip.player.ParkourPlayer;
 import dev.efnilite.vilib.event.EventWrapper;

witp/src/main/java/dev/efnilite/ip/events/PlayerScoreEvent.java → witp/src/main/java/dev/efnilite/ip/api/events/PlayerScoreEvent.java

@@ -1,4 +1,4 @@
-package dev.efnilite.ip.events;
+package dev.efnilite.ip.api.events;
 
 import dev.efnilite.ip.player.ParkourPlayer;
 import dev.efnilite.vilib.event.EventWrapper;

witp/src/main/java/dev/efnilite/ip/generator/DefaultGenerator.java

@@ -3,15 +3,15 @@
 import dev.efnilite.ip.IP;
 import dev.efnilite.ip.api.Gamemode;
 import dev.efnilite.ip.api.Gamemodes;
-import dev.efnilite.ip.events.BlockGenerateEvent;
-import dev.efnilite.ip.events.PlayerFallEvent;
-import dev.efnilite.ip.events.PlayerScoreEvent;
+import dev.efnilite.ip.api.events.BlockGenerateEvent;
+import dev.efnilite.ip.api.events.PlayerFallEvent;
+import dev.efnilite.ip.api.events.PlayerScoreEvent;
 import dev.efnilite.ip.generator.base.DefaultGeneratorBase;
 import dev.efnilite.ip.generator.base.Direction;
 import dev.efnilite.ip.generator.settings.GeneratorOption;
 import dev.efnilite.ip.internal.gamemode.DefaultGamemode;
 import dev.efnilite.ip.leaderboard.Leaderboard;
-import dev.efnilite.ip.menu.SettingsMenu;
+import dev.efnilite.ip.menu.settings.GameSettingsMenu;
 import dev.efnilite.ip.player.ParkourPlayer;
 import dev.efnilite.ip.player.ParkourSpectator;
 import dev.efnilite.ip.player.data.Score;
@@ -492,7 +492,7 @@ public void fall() {
 
     @Override
     public void menu() {
-        SettingsMenu.INSTANCE.open(player);
+        GameSettingsMenu.INSTANCE.open(player);
     }
 
     @Override

witp/src/main/java/dev/efnilite/ip/internal/gamemode/SpectatorGamemode.java

@@ -2,7 +2,7 @@
 
 import dev.efnilite.ip.api.Gamemode;
 import dev.efnilite.ip.leaderboard.Leaderboard;
-import dev.efnilite.ip.menu.SpectatorMenu;
+import dev.efnilite.ip.menu.play.SpectatorMenu;
 import dev.efnilite.ip.player.ParkourSpectator;
 import dev.efnilite.ip.player.ParkourUser;
 import dev.efnilite.ip.session.Session;

witp/src/main/java/dev/efnilite/ip/leaderboard/Leaderboard.java

@@ -11,6 +11,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -55,6 +56,8 @@ public Leaderboard(@NotNull String gamemode) {
         this.file = FOLDER + gamemode.toLowerCase() + ".json";
 
         if (Option.SQL) {
+            IP.getSqlManager().validateConnection();
+
             IP.getSqlManager().sendQuery(
                 """
                 USE `%s`;
@@ -149,6 +152,10 @@ private void _writeSql() {
      * writes all leaderboard data to the file
      */
     private void _writeFile() {
+        if (!new File(file).exists()) {
+            return;
+        }
+
         try (FileWriter writer = new FileWriter(file)) {
             IP.getGson().toJson(this, writer);
 
@@ -224,6 +231,10 @@ private void _readSql() {
      * read leaderboard data from the file
      */
     private void _readFile() {
+        if (!new File(file).exists()) {
+            return;
+        }
+
         try (FileReader reader = new FileReader(file)) {
             Leaderboard read = IP.getGson().fromJson(reader, Leaderboard.class);
 

witp/src/main/java/dev/efnilite/ip/menu/MainMenu.java

@@ -2,6 +2,9 @@
 
 import dev.efnilite.ip.IP;
 import dev.efnilite.ip.ParkourOption;
+import dev.efnilite.ip.menu.community.LeaderboardMenu;
+import dev.efnilite.ip.menu.play.SingleplayerMenu;
+import dev.efnilite.ip.menu.play.SpectatorMenu;
 import dev.efnilite.ip.player.ParkourPlayer;
 import dev.efnilite.ip.player.ParkourUser;
 import dev.efnilite.vilib.inventory.Menu;

witp/src/main/java/dev/efnilite/ip/menu/LeaderboardMenu.java → witp/src/main/java/dev/efnilite/ip/menu/community/LeaderboardMenu.java

@@ -1,8 +1,9 @@
-package dev.efnilite.ip.menu;
+package dev.efnilite.ip.menu.community;
 
 import dev.efnilite.ip.IP;
 import dev.efnilite.ip.api.Gamemode;
 import dev.efnilite.ip.leaderboard.Leaderboard;
+import dev.efnilite.ip.menu.MainMenu;
 import dev.efnilite.ip.player.ParkourUser;
 import dev.efnilite.ip.player.data.Score;
 import dev.efnilite.ip.util.Stopwatch;

witp/src/main/java/dev/efnilite/ip/menu/play/PlayMenu.java

@@ -0,0 +1,52 @@
+package dev.efnilite.ip.menu.play;
+
+import dev.efnilite.ip.IP;
+import dev.efnilite.ip.ParkourOption;
+import dev.efnilite.ip.menu.DynamicMenu;
+import dev.efnilite.vilib.inventory.Menu;
+import dev.efnilite.vilib.inventory.animation.SplitMiddleOutAnimation;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+/**
+ * Class for the main menu, accessed on executing /parkour
+ */
+public class PlayMenu extends DynamicMenu {
+
+    public static final PlayMenu INSTANCE = new PlayMenu();
+
+    public PlayMenu() {
+        // Singleplayer if player is not found
+        registerMainItem(1, 0,
+                user -> IP.getConfiguration().getFromItemData(user, "main.singleplayer").click(
+                event -> SingleplayerMenu.open(event.getPlayer())),
+                ParkourOption.JOIN::check);
+
+        registerMainItem(1, 2,
+                user -> IP.getConfiguration().getFromItemData(user, "main.spectator").click(
+                event -> SpectatorMenu.open(event.getPlayer())),
+                // display spectator if the player isn't already one
+                ParkourOption.JOIN::check);
+
+        // Always allow closing of the menu
+        registerMainItem(3, 10,
+                user -> IP.getConfiguration().getFromItemData(user, "general.close")
+                        .click(event -> event.getPlayer().closeInventory()),
+                player -> true);
+    }
+
+    /**
+     * Opens the main menu.
+     *
+     * @param   player
+     *          The player to open the menu to
+     */
+    public void open(Player player) {
+        Menu menu = new Menu(4, "<white>Play")
+                .fillBackground(Material.GRAY_STAINED_GLASS_PANE)
+                .animation(new SplitMiddleOutAnimation())
+                .distributeRowEvenly(0, 1, 2, 3);
+
+        display(player, menu);
+    }
+}

witp/src/main/java/dev/efnilite/ip/menu/SingleplayerMenu.java → witp/src/main/java/dev/efnilite/ip/menu/play/SingleplayerMenu.java

@@ -1,8 +1,9 @@
-package dev.efnilite.ip.menu;
+package dev.efnilite.ip.menu.play;
 
 import dev.efnilite.ip.IP;
 import dev.efnilite.ip.api.Gamemode;
 import dev.efnilite.ip.api.MultiGamemode;
+import dev.efnilite.ip.menu.MainMenu;
 import dev.efnilite.ip.player.ParkourUser;
 import dev.efnilite.ip.util.config.Configuration;
 import dev.efnilite.ip.util.config.Option;

witp/src/main/java/dev/efnilite/ip/menu/SpectatorMenu.java → witp/src/main/java/dev/efnilite/ip/menu/play/SpectatorMenu.java

@@ -1,7 +1,8 @@
-package dev.efnilite.ip.menu;
+package dev.efnilite.ip.menu.play;
 
 import dev.efnilite.ip.IP;
 import dev.efnilite.ip.api.Gamemodes;
+import dev.efnilite.ip.menu.MainMenu;
 import dev.efnilite.ip.player.ParkourPlayer;
 import dev.efnilite.ip.player.ParkourUser;
 import dev.efnilite.ip.session.Session;

witp/src/main/java/dev/efnilite/ip/menu/SettingsMenu.java → witp/src/main/java/dev/efnilite/ip/menu/settings/GameSettingsMenu.java

@@ -1,8 +1,10 @@
-package dev.efnilite.ip.menu;
+package dev.efnilite.ip.menu.settings;
 
 import dev.efnilite.ip.IP;
 import dev.efnilite.ip.ParkourOption;
 import dev.efnilite.ip.api.StyleType;
+import dev.efnilite.ip.menu.DynamicMenu;
+import dev.efnilite.ip.menu.MainMenu;
 import dev.efnilite.ip.player.ParkourPlayer;
 import dev.efnilite.ip.util.Util;
 import dev.efnilite.ip.util.config.Configuration;
@@ -34,11 +36,11 @@
  * @since v3.0.0
  * @author Efnilite
  */
-public class SettingsMenu extends DynamicMenu {
+public class GameSettingsMenu extends DynamicMenu {
 
-    public static final SettingsMenu INSTANCE = new SettingsMenu();
+    public static final GameSettingsMenu INSTANCE = new GameSettingsMenu();
 
-    public SettingsMenu(ParkourOption... disabled) {
+    public GameSettingsMenu(ParkourOption... disabled) {
 
         // ---------- top row ----------