update 1.5 (#5)

GameSpleef.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="GameSpleef" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="cloud.zeroprox" external.system.module.version="1.4" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="GameSpleef" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="cloud.zeroprox" external.system.module.version="1.5" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

build/resources/main/mcmod.info

@@ -2,7 +2,7 @@
     {
         "modid": "gamespleef",
         "name": "GameSpleef",
-        "version": "1.4",
+        "version": "1.5",
         "description": "A spleef minigame",
         "url": "https://zeroprox.cloud",
         "authorList": [

build/tmp/generateMetadata/mcmod.info

@@ -2,7 +2,7 @@
     {
         "modid": "gamespleef",
         "name": "GameSpleef",
-        "version": "1.4",
+        "version": "1.5",
         "description": "A spleef minigame",
         "url": "https://zeroprox.cloud",
         "authorList": [

build/tmp/jar/MANIFEST.MF

@@ -1,2 +1,2 @@
-Manifest-Version: 1.0
-
+Manifest-Version: 1.0
+

gradle.properties

@@ -1,3 +1,3 @@
 pluginGroup=cloud.zeroprox
 pluginId=gamespleef
-pluginVersion=1.4
+pluginVersion=1.5

gradlew.bat

@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

src/main/java/cloud/zeroprox/gamespleef/GameSpleef.java

@@ -200,30 +200,34 @@ private void loadConfig() throws IOException, ObjectMappingException {
             getGameManager().iGames.clear();
             List<GameSerialize> gameSerializeList = rootNodeDefaultConfig.getNode("areas").getList(TypeToken.of(GameSerialize.class));
             for (GameSerialize gameSerialize : gameSerializeList) {
-                IGame iGame = null;
-
-                List<AABB> floors = new ArrayList<>();
-                for (AABBSerialize aabbSerialize : gameSerialize.floors) {
-                    floors.add(aabbSerialize.toAABB());
-                }
-
-                if (gameSerialize.gameType == GameType.CLASSIC) {
-                    iGame = new GameClassic(gameSerialize.name,
-                            gameSerialize.area.toAABB(),
-                            floors,
-                            gameSerialize.spawn,
-                            gameSerialize.lobby,
-                            gameSerialize.playerLimit,
-                            gameSerialize.campRadius,
-                            gameSerialize.campInterval,
-                            gameSerialize.campPlayers,
-                            gameSerialize.saveInv,
-                            gameSerialize.winningCommand,
-                            gameSerialize.winningMinPlayers,
-                            gameSerialize.winningCooldown
-                    );
+                try {
+                    IGame iGame = null;
+
+                    List<AABB> floors = new ArrayList<>();
+                    for (AABBSerialize aabbSerialize : gameSerialize.floors) {
+                        floors.add(aabbSerialize.toAABB());
+                    }
+
+                    if (gameSerialize.gameType == GameType.CLASSIC) {
+                        iGame = new GameClassic(gameSerialize.name,
+                                gameSerialize.area.toAABB(),
+                                floors,
+                                gameSerialize.spawn,
+                                gameSerialize.lobby,
+                                gameSerialize.playerLimit,
+                                gameSerialize.campRadius,
+                                gameSerialize.campInterval,
+                                gameSerialize.campPlayers,
+                                gameSerialize.saveInv,
+                                gameSerialize.winningCommand,
+                                gameSerialize.winningMinPlayers,
+                                gameSerialize.winningCooldown
+                        );
+                    }
+                    getGameManager().iGames.add(iGame);
+                } catch (Exception ex) {
+                    logger.error("Error loading " + gameSerialize.name);
                 }
-                getGameManager().iGames.add(iGame);
             }
             logger.info("Loaded: " + getGameManager().iGames.size() + " games");
         }

src/main/java/cloud/zeroprox/gamespleef/commands/JoinCmd.java

@@ -10,7 +10,6 @@
 import org.spongepowered.api.command.spec.CommandExecutor;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.text.Text;
-import org.spongepowered.api.text.format.TextColors;
 
 import java.util.Optional;