diff --git a/.gitignore b/.gitignore index ab87f3f..fb0080a 100644 --- a/.gitignore +++ b/.gitignore @@ -118,5 +118,4 @@ run/ !gradle-wrapper.jar # My stuff -gradle/ -*.bat \ No newline at end of file +*.bat diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..d427916 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,23 @@ +pipeline { + agent any + environment { + NEXUS_CREDS = credentials('alttd-snapshot-user') + } + stages { + stage('Gradle') { + steps { + sh './gradlew shadowJar -x test -PalttdSnapshotUsername=$NEXUS_CREDS_USR -PalttdSnapshotPassword=$NEXUS_CREDS_PSW' + } + } + stage('Archive') { + steps { + archiveArtifacts artifacts: 'build/libs/', followSymlinks: false + } + } + stage('discord') { + steps { + discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook + } + } + } +} diff --git a/build.gradle b/build.gradle index 51e9249..fe1e194 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,4 @@ + plugins { id 'java' id 'eclipse' @@ -5,23 +6,32 @@ plugins { } group = 'com.alttd' -version = '1.0-SNAPSHOT' +version = '1.1-SNAPSHOT' repositories { - mavenCentral() maven { - name = 'velocitypowered-repo' - url = 'https://nexus.velocitypowered.com/repository/maven-public/' + name = 'papermc' + url = 'https://repo.papermc.io/repository/maven-public/' } + mavenCentral() // Add this to ensure access to JUnit libraries } dependencies { - implementation 'org.junit.jupiter:junit-jupiter:5.9.0' - compileOnly 'com.velocitypowered:velocity-api:3.1.0' - annotationProcessor 'com.velocitypowered:velocity-api:3.1.0' + compileOnly 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' + annotationProcessor 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' + implementation 'org.spongepowered:configurate-yaml:4.1.2' + implementation 'org.spongepowered:configurate-core:4.1.2' + + // JUnit Jupiter dependencies + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0' + + // Enable JUnit tests + testImplementation 'org.junit.platform:junit-platform-launcher' } -def targetJavaVersion = 17 +def targetJavaVersion = 21 java { def javaVersion = JavaVersion.toVersion(targetJavaVersion) sourceCompatibility = javaVersion @@ -37,6 +47,11 @@ tasks.withType(JavaCompile).configureEach { } } +// Add this to run tests with JUnit Jupiter +test { + useJUnitPlatform() +} + def templateSource = file('src/main/templates') def templateDest = layout.buildDirectory.dir('generated/sources/templates') def generateTemplates = tasks.register('generateTemplates', Copy) { task -> diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a80b22c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefa..1aa94a4 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/com/alttd/datalock/Config.java b/src/main/java/com/alttd/datalock/Config.java index c329f94..678a835 100644 --- a/src/main/java/com/alttd/datalock/Config.java +++ b/src/main/java/com/alttd/datalock/Config.java @@ -1,12 +1,10 @@ package com.alttd.datalock; import com.google.common.base.Throwables; -import com.google.common.reflect.TypeToken; -import ninja.leaping.configurate.ConfigurationNode; -import ninja.leaping.configurate.ConfigurationOptions; -import ninja.leaping.configurate.objectmapping.ObjectMappingException; -import ninja.leaping.configurate.yaml.YAMLConfigurationLoader; -import org.yaml.snakeyaml.DumperOptions; +import org.spongepowered.configurate.ConfigurationNode; +import org.spongepowered.configurate.ConfigurationOptions; +import org.spongepowered.configurate.serialize.SerializationException; +import org.spongepowered.configurate.yaml.YamlConfigurationLoader; import java.io.File; import java.io.IOException; @@ -22,7 +20,7 @@ public final class Config { private static final String HEADER = ""; public static ConfigurationNode config; - public static YAMLConfigurationLoader configLoader; + public static YamlConfigurationLoader configLoader; static int version; static boolean verbose; @@ -33,9 +31,8 @@ public final class Config { CONFIG_PATH = new File(DataLock.getDataDirectory().toAbsolutePath().toString()); File configFile = new File(CONFIG_PATH, "config.yml"); - configLoader = YAMLConfigurationLoader.builder() - .setFile(configFile) - .setFlowStyle(DumperOptions.FlowStyle.BLOCK) + configLoader = YamlConfigurationLoader.builder() + .file(configFile) .build(); if (!configFile.getParentFile().exists()) { if (!configFile.getParentFile().mkdirs()) { @@ -53,7 +50,7 @@ public final class Config { } try { - config = configLoader.load(ConfigurationOptions.defaults().setHeader(HEADER)); + config = configLoader.load(ConfigurationOptions.defaults().header(HEADER)); } catch (IOException e) { e.printStackTrace(); } @@ -76,24 +73,24 @@ public final class Config { try { method.setAccessible(true); method.invoke(instance); - } catch (InvocationTargetException | IllegalAccessException ex) { - throw Throwables.propagate(ex.getCause()); + } catch (InvocationTargetException | IllegalAccessException e) { + throw Throwables.propagate(e.getCause()); } } } } try { configLoader.save(config); - } catch (IOException ex) { - throw Throwables.propagate(ex.getCause()); + } catch (IOException e) { + throw Throwables.propagate(e.getCause()); } } public static void saveConfig() { try { configLoader.save(config); - } catch (IOException ex) { - throw Throwables.propagate(ex.getCause()); + } catch (IOException e) { + throw Throwables.propagate(e.getCause()); } } @@ -102,48 +99,54 @@ public final class Config { } private static void set(String path, Object def) { - if (config.getNode(splitPath(path)).isVirtual()) - config.getNode(splitPath(path)).setValue(def); + if (config.node(splitPath(path)).virtual()) { + try { + config.node(splitPath(path)).set(def); + } catch (SerializationException e) { + e.printStackTrace(); + } + } } private static void setString(String path, String def) { try { - if (config.getNode(splitPath(path)).isVirtual()) - config.getNode(splitPath(path)).setValue(TypeToken.of(String.class), def); - } catch (ObjectMappingException ex) { + if (config.node(splitPath(path)).virtual()) + config.node(splitPath(path)).set(String.class, def); + } catch (SerializationException e) { } } private static boolean getBoolean(String path, boolean def) { set(path, def); - return config.getNode(splitPath(path)).getBoolean(def); + return config.node(splitPath(path)).getBoolean(def); } private static double getDouble(String path, double def) { set(path, def); - return config.getNode(splitPath(path)).getDouble(def); + return config.node(splitPath(path)).getDouble(def); } private static int getInt(String path, int def) { set(path, def); - return config.getNode(splitPath(path)).getInt(def); + return config.node(splitPath(path)).getInt(def); } private static String getString(String path, String def) { setString(path, def); - return config.getNode(splitPath(path)).getString(def); + return config.node(splitPath(path)).getString(def); } private static Long getLong(String path, Long def) { set(path, def); - return config.getNode(splitPath(path)).getLong(def); + return config.node(splitPath(path)).getLong(def); } private static List getList(String path, T def) { try { set(path, def); - return config.getNode(splitPath(path)).getList(TypeToken.of(String.class)); - } catch (ObjectMappingException ex) { + return config.node(splitPath(path)).getList(String.class); + } catch (SerializationException e) { + e.printStackTrace(); } return new ArrayList<>(); }