diff --git a/.gitignore b/.gitignore index 71701ef..911a89e 100644 --- a/.gitignore +++ b/.gitignore @@ -104,4 +104,7 @@ gradle-app.setting **/build/ # End of https://www.gitignore.io/api/gradle,intellij -.idea/ \ No newline at end of file +.idea/ + +# run-paper +run/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 53692ff..bb8060e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,24 @@ buildscript { repositories { - jcenter() + gradlePluginPortal() } dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0' + classpath 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0' } } +plugins { + id 'net.minecrell.plugin-yml.bukkit' version '0.4.0' + id 'xyz.jpenilla.run-paper' version '1.0.4' +} + apply plugin: 'java' group = pluginGroup version = pluginVersion -sourceCompatibility = '1.8' -targetCompatibility = '1.8' +sourceCompatibility = '16' +targetCompatibility = '16' apply plugin: "com.github.johnrengelman.shadow" @@ -31,24 +36,24 @@ tasks.withType(JavaCompile) { shadowJar { minimize() + relocate 'net.kyori.adventure.text.minimessage', 'net.draycia.uranium.libs.net.kyori.adventure.text.minimessage' + relocate 'net.kyori.adventure.text.serializer.plain', 'net.draycia.uranium.libs.net.kyori.adventure.serializer.plain' + relocate 'com.zaxxer', 'net.draycia.uranium.libs.com.zaxxer' + relocate 'co.aikar', 'net.draycia.uranium.libs.co.aikar' + relocate 'org.checkerframework', 'net.draycia.uranium.libs.org.checkerframework' + relocate 'org.slf4j', 'net.draycia.uranium.libs.org.slf4j' + relocate 'org.codehaus', 'net.draycia.uranium.libs.org.codehaus' + relocate 'org.yaml', 'net.draycia.uranium.libs.org.yaml' + relocate 'org.spongepowered.configurate', 'net.draycia.uranium.libs.org.spongepowered.configurate' + relocate 'io.leangen.geantyref', 'net.draycia.uranium.libs.io.leangen.geantyref' archiveClassifier.set("") archiveFileName.set(project.name + ".jar") } jar { archiveFileName.set(project.name + ".jar") - } -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation - -task relocateShadowJar(type: ConfigureShadowRelocation) { - target = tasks.shadowJar - prefix = "net.draycia.uranium.libs" // Default value is "shadow" -} - -tasks.shadowJar.dependsOn tasks.relocateShadowJar - repositories { mavenCentral() maven {url = 'https://papermc.io/repo/repository/maven-public/'} @@ -59,23 +64,52 @@ repositories { } dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' - compileOnly 'com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT' - compileOnly 'me.clip:placeholderapi:2.10.5' - compile 'net.kyori:adventure-api:4.0.0-SNAPSHOT' - compile 'net.kyori:text-adapter-bukkit:3.0.3' - compile 'net.kyori:adventure-platform-bukkit:4.0.0-SNAPSHOT' - compile 'net.kyori:adventure-text-minimessage:3.0.0-SNAPSHOT' - compile 'org.spongepowered:configurate-yaml:3.7' - compile "co.aikar:acf-bukkit:0.5.0-SNAPSHOT" - compile "com.zaxxer:HikariCP:2.4.1" - compile "co.aikar:idb-bukkit:1.0.0-SNAPSHOT" + testImplementation group: 'junit', name: 'junit', version: '4.12' + + // Paper & Plugins + compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT' + compileOnly 'me.clip:placeholderapi:2.10.10' + + // Kyori + implementation('net.kyori:adventure-text-minimessage:4.2.0-SNAPSHOT') { + exclude group: 'net.kyori', module: 'adventure-api' + } + implementation('net.kyori:adventure-text-serializer-plain:4.8.1') { + exclude group: 'net.kyori', module: 'adventure-api' + } + + // Sponge + implementation 'org.spongepowered:configurate-yaml:4.1.2' + + // Misc + implementation "com.zaxxer:HikariCP:5.0.0" + + // Phase these out + implementation "co.aikar:acf-bukkit:0.5.0-SNAPSHOT" + implementation "co.aikar:idb-bukkit:1.0.0-SNAPSHOT" } import org.apache.tools.ant.filters.ReplaceTokens processResources { + duplicatesStrategy = 'include' from(sourceSets.main.resources.srcDirs) { filter ReplaceTokens, tokens: [version: version] } } + +bukkit { + main = 'net.draycia.uranium.Uranium' + description = "Adds various minigames to chat." + version = project.version as String + apiVersion = '1.13' + load = 'STARTUP' + authors = ['MTM123', 'Vicarious'] + softDepend = ['Vault', "PlaceholderAPI"] +} + +tasks { + runServer { + minecraftVersion("1.17.1") + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c1609c4..9980f9c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ pluginGroup=net.draycia -pluginVersion=1.0.1 +pluginVersion=1.1.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59b5f89..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 83f2acf..c53aefa 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or 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. @@ -17,78 +17,113 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# 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». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# 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 +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +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"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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. Please set the JAVA_HOME variable in your environment to match the @@ -105,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") +# 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. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9618d8d..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @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="-Xmx64m" "-Xms64m" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ 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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/java/net/draycia/uranium/Uranium.java b/src/main/java/net/draycia/uranium/Uranium.java index f0abbaf..7dbf26b 100644 --- a/src/main/java/net/draycia/uranium/Uranium.java +++ b/src/main/java/net/draycia/uranium/Uranium.java @@ -1,6 +1,7 @@ package net.draycia.uranium; -import com.google.common.reflect.TypeToken; +import java.nio.file.Files; +import java.nio.file.Path; import net.draycia.uranium.games.GameManager; import net.draycia.uranium.hooks.Placeholders; import net.draycia.uranium.storage.MysqlStorage; @@ -8,17 +9,12 @@ import net.draycia.uranium.util.Config; import net.draycia.uranium.util.GameConfig; import net.draycia.uranium.util.GameConfigSerializer; -import net.kyori.adventure.platform.bukkit.BukkitAudiences; -import ninja.leaping.configurate.ConfigurationNode; -import ninja.leaping.configurate.objectmapping.ObjectMapper; -import ninja.leaping.configurate.objectmapping.ObjectMappingException; -import ninja.leaping.configurate.objectmapping.serialize.TypeSerializerCollection; -import ninja.leaping.configurate.yaml.YAMLConfigurationLoader; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; -import org.yaml.snakeyaml.DumperOptions; +import org.spongepowered.configurate.ConfigurateException; +import org.spongepowered.configurate.yaml.NodeStyle; +import org.spongepowered.configurate.yaml.YamlConfigurationLoader; -import java.io.File; import java.io.IOException; import java.sql.SQLException; import java.text.DecimalFormat; @@ -30,22 +26,19 @@ public final class Uranium extends JavaPlugin { private GameManager gameManager; private Config config; - private BukkitAudiences audiences; - private DecimalFormat decimalFormat = new DecimalFormat("0.00"); + private final DecimalFormat decimalFormat = new DecimalFormat("0.00"); @Override public void onEnable() { - audiences = BukkitAudiences.create(this); - saveResource("words.txt", false); saveResource("problems.txt", false); saveResource("trivia.txt", false); try { config = loadSettings(); - } catch (ObjectMappingException | IOException e) { + } catch (IOException e) { + getLogger().log(Level.SEVERE, "Failed to load config. See below for exception."); e.printStackTrace(); - getLogger().log(Level.SEVERE, "Failed to load config. Check logs."); } if (config.getDatabaseCredentials().isEnabled()) { @@ -86,41 +79,42 @@ public GameManager getGameManager() { return gameManager; } - private Config loadSettings() throws ObjectMappingException, IOException { - File mainDir = getDataFolder().getAbsoluteFile(); - if (!mainDir.exists()) { - //noinspection ResultOfMethodCallIgnored - Not interested in knowing the result - mainDir.mkdirs(); - } + private Config loadSettings() throws IOException { + final Path dataDirectory = getDataFolder().toPath(); - File cfgFile = new File(getDataFolder().getAbsoluteFile(), "config.yml"); + if (!Files.exists(dataDirectory)) { + Files.createDirectories(dataDirectory); + } - //noinspection UnstableApiUsage - TypeSerializerCollection.defaults().register(TypeToken.of(GameConfig.class), new GameConfigSerializer()); + Path configFile = dataDirectory.resolve("config.yml"); - ObjectMapper.BoundInstance instance = ObjectMapper.forClass(Config.class).bindToNew(); - YAMLConfigurationLoader loader = YAMLConfigurationLoader.builder() - .setFile(cfgFile) - .setFlowStyle(DumperOptions.FlowStyle.BLOCK) + YamlConfigurationLoader loader = YamlConfigurationLoader.builder() + .path(configFile) + .nodeStyle(NodeStyle.BLOCK) + .defaultOptions(options -> { + return options.shouldCopyDefaults(true).serializers(serializerBuilder -> + serializerBuilder.register(GameConfig.class, new GameConfigSerializer()) + ); + }) .build(); - // Pretty sure I'm doing this part wrong - ConfigurationNode node = ConfigurationNode.root(); - if (!cfgFile.exists()) { - instance.serialize(node); - loader.save(node); - } + try { + final var node = loader.load(); + final Config gameConfig = node.get(Config.class); - instance.populate(loader.load()); + if (!Files.exists(configFile)) { + node.set(Config.class, gameConfig); + loader.save(node); + } - return instance.getInstance(); + return gameConfig; + } catch (final ConfigurateException exception) { + exception.printStackTrace(); + return new Config(); + } } public Storage getStorage() { return storage; } - - public BukkitAudiences getAudiences() { - return audiences; - } } diff --git a/src/main/java/net/draycia/uranium/games/ChatGame.java b/src/main/java/net/draycia/uranium/games/ChatGame.java index efb4022..3b7f986 100644 --- a/src/main/java/net/draycia/uranium/games/ChatGame.java +++ b/src/main/java/net/draycia/uranium/games/ChatGame.java @@ -3,10 +3,8 @@ import net.draycia.uranium.Uranium; import net.draycia.uranium.util.Config; import net.draycia.uranium.util.GameConfig; -import net.draycia.uranium.util.MessageKey; -import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.Template; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; @@ -29,7 +27,7 @@ public abstract class ChatGame { private boolean finished; - ChatGame(Uranium main) { + ChatGame(final Uranium main) { this.main = main; this.config = main.getSettings(); //Once again multiple names for config this.gameManager = main.getGameManager(); @@ -55,68 +53,63 @@ public long getStartTime() { abstract GameConfig getGameConfig(); - abstract List getRewardCommands(int place); + abstract List getRewardCommands(final int place); abstract GameType getGameType(); public String getFailureMessage() { - return config.getMessage(MessageKey.FAILURE).get(0); + return config.getMessages().failure(); } - public String getIncompleteMessage() { - return config.getMessage(MessageKey.TYPE_INCOMPLETE).get(0); + public String getCompleteMessage() { + return config.getMessages().typeComplete(); } String getRandomWord() { return getRandomLine("pizza"); } - String getRandomLine(String def) { - File words = new File(this.main.getDataFolder(), getGameConfig().getSupplementaryFile()); + String getRandomLine(final String def) { + final File words = new File(this.main.getDataFolder(), getGameConfig().getSupplementaryFile()); try { RandomAccessFile file = new RandomAccessFile(words, "r"); String line; for (line = null; line == null; line = file.readLine()) { - long result = ThreadLocalRandom.current().nextLong(words.length()); + final long result = ThreadLocalRandom.current().nextLong(words.length()); file.seek(result); file.readLine(); } return line; - } catch (IOException e) { + } catch (final IOException e) { e.printStackTrace(); return def; } } - public void onStart(String message) { - Component component = MiniMessage.get().parse(message.replace("", getDisplayText()), "hover", this.getDisplayText()); - - for (Player player : Bukkit.getOnlinePlayers()) { - Audience audience = getPlugin().getAudiences().player(player); - - audience.sendMessage(component); - } + public void broadcastFormat(final String message) { + Bukkit.broadcast(MiniMessage.get().parse(message, + Template.of("word", this.getDisplayText()), + Template.of("hover", this.getDisplayText()))); } - public void onSuccess(Player player) { - + public void onSuccess(final Player player) { if (playersWon.containsKey(player.getUniqueId())) { return; } - double duration = (double) (System.currentTimeMillis() - this.getStartTime()) / 1000.0D; + final double duration = (double) (System.currentTimeMillis() - this.getStartTime()) / 1000.0D; playersWon.put(player.getUniqueId(), duration); - int place = playersWon.size(); + final int place = playersWon.size(); - String time = this.main.getDecimalFormat().format(duration); + final String time = this.main.getDecimalFormat().format(duration); getRewardCommands(place).forEach(reward -> { reward = reward.replace("%player%", player.getName()) .replace("%time%", time) - .replace("%place%", getPlaceFromNumeric(place)); + .replace("%place%", ordinal(place)); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), reward); }); @@ -126,29 +119,23 @@ public void onSuccess(Player player) { } public void onFailure() { - String message; + if (hasAnyWins()) { - message = setPlaceholders(getIncompleteMessage()); + message = setPlaceholders(getCompleteMessage()); } else { message = getFailureMessage(); } - Component component = MiniMessage.get().parse(message, "word", this.getAnswer()); - - for (Player player : Bukkit.getOnlinePlayers()) { - Audience audience = getPlugin().getAudiences().player(player); - - audience.sendMessage(component); - } + Bukkit.broadcast(MiniMessage.get().parse(message, Template.of("word", this.getAnswer()))); this.onFinish(); } public String setPlaceholders(String string) { - String format = config.getMessage(MessageKey.WINNERS_FORMAT).get(0); - String sep = config.getMessage(MessageKey.WINNERS_SEPARATOR).get(0); + String format = config.getMessages().winners(); + String sep = config.getMessages().winnersSeparator(); List winnerEntries = new ArrayList<>(); @@ -193,17 +180,14 @@ private void onFinish() { gameManager.startNewGame(); } - private String getPlaceFromNumeric(int place) { - switch (place) { - case 1: - return "1st"; - case 2: - return "2nd"; - case 3: - return "3rd"; - default: - return ""; - } + private final String[] suffixes = + new String[] { "th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th" }; + + private String ordinal(int i) { + return switch (i % 100) { + case 11, 12, 13 -> i + "th"; + default -> i + suffixes[i % 10]; + }; } } diff --git a/src/main/java/net/draycia/uranium/games/GameManager.java b/src/main/java/net/draycia/uranium/games/GameManager.java index bd5f467..b6ad3cf 100644 --- a/src/main/java/net/draycia/uranium/games/GameManager.java +++ b/src/main/java/net/draycia/uranium/games/GameManager.java @@ -1,13 +1,13 @@ package net.draycia.uranium.games; +import io.papermc.paper.event.player.AsyncChatEvent; import net.draycia.uranium.Uranium; import net.draycia.uranium.util.Config; +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -27,23 +27,30 @@ public GameManager(Uranium plugin) { } @EventHandler - public void onChat(AsyncPlayerChatEvent event) { - if (this.chatGame != null) { - if (event.getMessage().equalsIgnoreCase(this.chatGame.getAnswer())) { - if (config.shouldCancelWinningMessages()) { - event.setCancelled(true); - } - - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> { - this.chatGame.onSuccess(event.getPlayer()); - if (chatGame.isFinished()) { - this.chatGame = null; - Bukkit.getScheduler().cancelTask(autoEndTask); - } - }); - } + public void onPlayerChat(final AsyncChatEvent event) { + // No game is active + if (this.chatGame == null) { + return; + } + + final String message = PlainTextComponentSerializer.plainText().serialize(event.originalMessage()); + // Message is not the correct answer, ignore + if (!message.equalsIgnoreCase(this.chatGame.getAnswer())) { + return; } + + if (config.shouldCancelWinningMessages()) { + event.setCancelled(true); + } + + Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> { + this.chatGame.onSuccess(event.getPlayer()); + if (chatGame.isFinished()) { + this.chatGame = null; + Bukkit.getScheduler().cancelTask(autoEndTask); + } + }); } public void startNewGame() { @@ -62,7 +69,7 @@ public void startNewGame() { autoEndTask = -1; } - }, config.getAutoEndTime() * 20); + }, config.getAutoEndTime() * 20L); }, config.getTimeBetweenGames() * 20L); } @@ -93,19 +100,13 @@ public ChatGame getRandomGame() { GameType gameType = games.get(random.nextInt(games.size())); - switch (gameType) { - case HANGMAN: - return new HangmanGame(plugin); - case HOVER: - return new HoverGame(plugin); - case MATH: - return new MathGame(plugin); - case TRIVIA: - return new TriviaGame(plugin); - case UNSCRAMBLE: - default: - return new UnscrambleGame(plugin); - } + return switch (gameType) { + case HANGMAN -> new HangmanGame(plugin); + case HOVER -> new HoverGame(plugin); + case MATH -> new MathGame(plugin); + case TRIVIA -> new TriviaGame(plugin); + default -> new UnscrambleGame(plugin); + }; } } diff --git a/src/main/java/net/draycia/uranium/games/HangmanGame.java b/src/main/java/net/draycia/uranium/games/HangmanGame.java index 38a79e2..2102819 100644 --- a/src/main/java/net/draycia/uranium/games/HangmanGame.java +++ b/src/main/java/net/draycia/uranium/games/HangmanGame.java @@ -2,7 +2,6 @@ import net.draycia.uranium.Uranium; import net.draycia.uranium.util.HangmanConfig; -import net.draycia.uranium.util.MessageKey; import java.util.List; import java.util.concurrent.ThreadLocalRandom; @@ -18,7 +17,7 @@ public class HangmanGame extends ChatGame { word = getRandomWord(); display = makeDashedWord(word); - super.onStart(getConfig().getMessage(MessageKey.HANGMAN_START).get(0)); + super.broadcastFormat(getConfig().getMessages().hangmanStart()); } @Override @@ -32,17 +31,22 @@ public String getDisplayText() { } @Override - HangmanConfig getGameConfig() { - return (HangmanConfig) getConfig().getGameConfig(GameType.HANGMAN); + public HangmanConfig getGameConfig() { + return (HangmanConfig) this.getConfig().getGameConfig(this.getGameType()); } @Override - List getRewardCommands(int place) { - return getGameConfig().getCommandRewards(place); + public List getRewardCommands(int place) { + return this.getGameConfig().getCommandRewards(place); } @Override - GameType getGameType() { + public String getCompleteMessage() { + return getConfig().getMessages().hangmanComplete(); + } + + @Override + public GameType getGameType() { return GameType.HANGMAN; } diff --git a/src/main/java/net/draycia/uranium/games/HoverGame.java b/src/main/java/net/draycia/uranium/games/HoverGame.java index 6d01fa3..ee5fb95 100644 --- a/src/main/java/net/draycia/uranium/games/HoverGame.java +++ b/src/main/java/net/draycia/uranium/games/HoverGame.java @@ -2,19 +2,18 @@ import net.draycia.uranium.Uranium; import net.draycia.uranium.util.GameConfig; -import net.draycia.uranium.util.MessageKey; import java.util.List; public class HoverGame extends ChatGame { - private String word; + private final String word; public HoverGame(Uranium main) { super(main); this.word = this.getRandomWord(); - super.onStart(getConfig().getMessage(MessageKey.TYPE_START).get(0)); + super.broadcastFormat(getConfig().getMessages().typeStart()); } public String getAnswer() { @@ -26,17 +25,22 @@ public String getDisplayText() { } @Override - GameConfig getGameConfig() { - return getConfig().getGameConfig(GameType.HOVER); + public GameConfig getGameConfig() { + return this.getConfig().getGameConfig(this.getGameType()); } @Override - List getRewardCommands(int place) { - return getConfig().getGameConfig(GameType.HOVER).getCommandRewards(place); + public List getRewardCommands(int place) { + return this.getConfig().getGameConfig(this.getGameType()).getCommandRewards(place); } @Override - GameType getGameType() { + public String getCompleteMessage() { + return getConfig().getMessages().typeComplete(); + } + + @Override + public GameType getGameType() { return GameType.HOVER; } diff --git a/src/main/java/net/draycia/uranium/games/MathGame.java b/src/main/java/net/draycia/uranium/games/MathGame.java index ba8f117..122dd7c 100644 --- a/src/main/java/net/draycia/uranium/games/MathGame.java +++ b/src/main/java/net/draycia/uranium/games/MathGame.java @@ -2,7 +2,6 @@ import net.draycia.uranium.Uranium; import net.draycia.uranium.util.GameConfig; -import net.draycia.uranium.util.MessageKey; import java.util.List; @@ -23,7 +22,7 @@ public class MathGame extends ChatGame { problem = in[0]; solution = in[1]; - super.onStart(getConfig().getMessage(MessageKey.MATH_START).get(0)); + super.broadcastFormat(getConfig().getMessages().mathStart()); } @Override @@ -37,17 +36,22 @@ public String getDisplayText() { } @Override - GameConfig getGameConfig() { - return getConfig().getGameConfig(GameType.MATH); + public GameConfig getGameConfig() { + return this.getConfig().getGameConfig(this.getGameType()); } @Override - List getRewardCommands(int place) { - return getGameConfig().getCommandRewards(place); + public List getRewardCommands(int place) { + return this.getGameConfig().getCommandRewards(place); } @Override - GameType getGameType() { + public String getCompleteMessage() { + return getConfig().getMessages().mathComplete(); + } + + @Override + public GameType getGameType() { return GameType.MATH; } diff --git a/src/main/java/net/draycia/uranium/games/TriviaGame.java b/src/main/java/net/draycia/uranium/games/TriviaGame.java index 76f431f..1459586 100644 --- a/src/main/java/net/draycia/uranium/games/TriviaGame.java +++ b/src/main/java/net/draycia/uranium/games/TriviaGame.java @@ -2,7 +2,6 @@ import net.draycia.uranium.Uranium; import net.draycia.uranium.util.GameConfig; -import net.draycia.uranium.util.MessageKey; import java.util.List; @@ -23,7 +22,7 @@ public class TriviaGame extends ChatGame { problem = in[0]; solution = in[1]; - super.onStart(getConfig().getMessage(MessageKey.TRIVIA_START).get(0)); + super.broadcastFormat(getConfig().getMessages().triviaStart()); } @Override @@ -37,17 +36,22 @@ public String getDisplayText() { } @Override - GameConfig getGameConfig() { - return getConfig().getGameConfig(GameType.TRIVIA); + public GameConfig getGameConfig() { + return this.getConfig().getGameConfig(this.getGameType()); } @Override - List getRewardCommands(int place) { - return getGameConfig().getCommandRewards(place); + public List getRewardCommands(int place) { + return this.getGameConfig().getCommandRewards(place); } @Override - GameType getGameType() { + public String getCompleteMessage() { + return getConfig().getMessages().triviaComplete(); + } + + @Override + public GameType getGameType() { return GameType.TRIVIA; } diff --git a/src/main/java/net/draycia/uranium/games/UnscrambleGame.java b/src/main/java/net/draycia/uranium/games/UnscrambleGame.java index 9f05b28..efcfeaf 100644 --- a/src/main/java/net/draycia/uranium/games/UnscrambleGame.java +++ b/src/main/java/net/draycia/uranium/games/UnscrambleGame.java @@ -3,22 +3,21 @@ import com.google.common.primitives.Chars; import net.draycia.uranium.Uranium; import net.draycia.uranium.util.GameConfig; -import net.draycia.uranium.util.MessageKey; import java.util.Collections; import java.util.List; public class UnscrambleGame extends ChatGame { - private String word; - private String displayWord; + private final String word; + private final String displayWord; public UnscrambleGame(Uranium main) { super(main); this.word = super.getRandomWord(); this.displayWord = this.scrambleWord(this.getAnswer()); - super.onStart(getConfig().getMessage(MessageKey.UNSCRAMBLE_START).get(0)); + super.broadcastFormat(getConfig().getMessages().unscrambleStart()); } public String getAnswer() { @@ -47,17 +46,22 @@ private String scrambleWord(String word) { } @Override - GameConfig getGameConfig() { - return getConfig().getGameConfig(GameType.UNSCRAMBLE); + public GameConfig getGameConfig() { + return this.getConfig().getGameConfig(this.getGameType()); } @Override - List getRewardCommands(int place) { - return getConfig().getGameConfig(GameType.UNSCRAMBLE).getCommandRewards(place); + public List getRewardCommands(int place) { + return this.getConfig().getGameConfig(this.getGameType()).getCommandRewards(place); } @Override - GameType getGameType() { + public String getCompleteMessage() { + return getConfig().getMessages().unscrambleComplete(); + } + + @Override + public GameType getGameType() { return GameType.UNSCRAMBLE; } diff --git a/src/main/java/net/draycia/uranium/hooks/Placeholders.java b/src/main/java/net/draycia/uranium/hooks/Placeholders.java index 5eb3b18..a65b4be 100644 --- a/src/main/java/net/draycia/uranium/hooks/Placeholders.java +++ b/src/main/java/net/draycia/uranium/hooks/Placeholders.java @@ -6,6 +6,7 @@ import net.draycia.uranium.storage.GameStats; import net.draycia.uranium.storage.Storage; import org.bukkit.entity.Player; +import org.checkerframework.checker.nullness.qual.Nullable; public class Placeholders extends PlaceholderExpansion { @@ -43,34 +44,52 @@ public String getVersion() { } @Override - public String onPlaceholderRequest(Player player, String identifier) { + public @Nullable String onPlaceholderRequest(Player player, String identifier) { if (storage == null) { - return ""; + return null; } if (player == null) { - return ""; + return null; } if (identifier.equals("total_wins")) { - return String.valueOf(storage.getTotalWins(player.getUniqueId())); + return getTotalWins(player); + } else if (identifier.endsWith("wins")) { + return getGameWins(player, identifier); + } else if (identifier.endsWith("record")) { + return getGameRecordTime(player, identifier); } else { - GameType gameType = getGameType(identifier); + return null; + } + } - if (gameType == null) { - return null; - } + private String getTotalWins(final Player player) { + return String.valueOf(storage.getTotalWins(player.getUniqueId())); + } - GameStats stats = storage.getGameStats(player.getUniqueId(), gameType); + private String getGameWins(final Player player, final String identifier) { + GameType gameType = getGameType(identifier); - if (identifier.endsWith("wins")) { - return String.valueOf(stats.getTimesWon()); - } else if (identifier.endsWith("record")) { - return stats.getRecordTime() == 0 ? "N/A" : String.valueOf(stats.getRecordTime()); - } + if (gameType == null) { + return null; } - return null; + GameStats stats = storage.getGameStats(player.getUniqueId(), gameType); + + return String.valueOf(stats.getTimesWon()); + } + + private String getGameRecordTime(final Player player, final String identifier) { + GameType gameType = getGameType(identifier); + + if (gameType == null) { + return null; + } + + GameStats stats = storage.getGameStats(player.getUniqueId(), gameType); + + return stats.getRecordTime() == 0 ? "N/A" : String.valueOf(stats.getRecordTime()); } private GameType getGameType(String placeholder) { diff --git a/src/main/java/net/draycia/uranium/storage/MysqlStorage.java b/src/main/java/net/draycia/uranium/storage/MysqlStorage.java index e3ca371..9d6c09d 100644 --- a/src/main/java/net/draycia/uranium/storage/MysqlStorage.java +++ b/src/main/java/net/draycia/uranium/storage/MysqlStorage.java @@ -2,6 +2,7 @@ import co.aikar.idb.BukkitDB; import co.aikar.idb.DB; +import co.aikar.idb.PooledDatabaseOptions; import net.draycia.uranium.Uranium; import net.draycia.uranium.games.GameType; import net.draycia.uranium.util.DatabaseCredentials; @@ -32,9 +33,14 @@ public MysqlStorage(Uranium plugin) throws SQLException { private void init() throws SQLException { DatabaseCredentials creds = plugin.getSettings().getDatabaseCredentials(); - BukkitDB.createHikariDatabase(plugin, creds.getUser(), creds.getPassword(), creds.getDatabase(), + + PooledDatabaseOptions options = BukkitDB.getRecommendedOptions(plugin, + creds.getUser(), creds.getPassword(), creds.getDatabase(), creds.getHost() + ":" + creds.getPort()); + options.getOptions().setDriverClassName("com.mysql.cj.jdbc.Driver"); + BukkitDB.createHikariDatabase(plugin, options); + DB.executeUpdate("CREATE TABLE IF NOT EXISTS `game_stats` (" + "`uuid` binary(16) NOT NULL," + "`gametype` varchar(16) NOT NULL," + @@ -54,7 +60,7 @@ public void onQuit(PlayerQuitEvent event) { } private void loadPlayer(UUID uuid) { - DB.getResultsAsync("SELECT * FROM `game_stats` WHERE `uuid`=?;", (Object) getBytesFromUUID(uuid)).thenAcceptAsync(res -> { + DB.getResultsAsync("SELECT * FROM `game_stats` WHERE `uuid`=?;", getBytesFromUUID(uuid)).thenAcceptAsync(res -> { if (res == null || res.size() == 0) { Arrays.stream(GameType.values()).forEach(type -> savePlayer(uuid, type, 0, false)); } else { diff --git a/src/main/java/net/draycia/uranium/util/Config.java b/src/main/java/net/draycia/uranium/util/Config.java index 90f17de..bfb5bdd 100644 --- a/src/main/java/net/draycia/uranium/util/Config.java +++ b/src/main/java/net/draycia/uranium/util/Config.java @@ -1,45 +1,48 @@ package net.draycia.uranium.util; import net.draycia.uranium.games.GameType; -import ninja.leaping.configurate.objectmapping.Setting; -import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; -import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; +import org.spongepowered.configurate.objectmapping.ConfigSerializable; +import org.spongepowered.configurate.objectmapping.meta.Comment; +import org.spongepowered.configurate.objectmapping.meta.Setting; @ConfigSerializable public class Config { - @Setting(value = "time-between-games", comment = "Time between chat games in seconds") + @Setting("time-between-games") + @Comment("Time between chat games in seconds") private int timeBetweenGames = 300; - @Setting(value = "auto-end-time", comment = "Time in seconds before the games will automatically end") + @Setting("auto-end-time") + @Comment("Time in seconds before the games will automatically end") private int autoEndTime = 30; - @Setting(value = "cancel-winning-messages", comment = "Should messages that won the game be cancelled?") + @Setting("cancel-winning-messages") + @Comment("Should messages that won the game be cancelled?") private boolean cancelWinningMessages = true; - @Setting(value = "database") + @Setting("database") private DatabaseCredentials databaseCredentials = new DatabaseCredentials(); - @Setting(value = "game-config") - private Map gameConfig = new LinkedHashMap<>(); - { - gameConfig.put(GameType.MATH, new GameConfig("problems.txt")); - gameConfig.put(GameType.HOVER, new GameConfig()); - gameConfig.put(GameType.UNSCRAMBLE, new GameConfig()); - gameConfig.put(GameType.HANGMAN, new HangmanConfig()); - gameConfig.put(GameType.TRIVIA, new GameConfig("trivia.txt")); - } + @Setting("game-config") + private Map gameConfig = Map.of( + GameType.MATH, new GameConfig("problems.txt"), + GameType.HOVER, new GameConfig(), + GameType.UNSCRAMBLE, new GameConfig(), + GameType.HANGMAN, new HangmanConfig(), + GameType.TRIVIA, new GameConfig("trivia.txt") + ); @Setting - private Map> language = MessageKey.getDefaultMessages(); + private Messages language = new Messages(); - @Setting(value = "require-player-count", comment = "If games should be skipped if the minimum-players isn't met or exceeded") + @Setting("require-player-count") + @Comment("If games should be skipped if the minimum-players isn't met or exceeded") private boolean skipIfNotEnoughPlayers = false; - @Setting(value = "minimum-players", comment = "The minimum amount of players required for games to start") + @Setting("minimum-players") + @Comment("The minimum amount of players required for games to start") private int minimumPlayers = 1; public int getTimeBetweenGames() { @@ -62,8 +65,8 @@ public int getMinimumPlayers() { return minimumPlayers; } - public List getMessage(MessageKey key) { - return language.get(key); //Maybe getOrDefault(..., key.getDefaultMessage()) would be better? Not sure + public Messages getMessages() { + return language; } public DatabaseCredentials getDatabaseCredentials() { diff --git a/src/main/java/net/draycia/uranium/util/DatabaseCredentials.java b/src/main/java/net/draycia/uranium/util/DatabaseCredentials.java index cf9fc4b..42be7a1 100644 --- a/src/main/java/net/draycia/uranium/util/DatabaseCredentials.java +++ b/src/main/java/net/draycia/uranium/util/DatabaseCredentials.java @@ -1,7 +1,7 @@ package net.draycia.uranium.util; -import ninja.leaping.configurate.objectmapping.Setting; -import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; +import org.spongepowered.configurate.objectmapping.ConfigSerializable; +import org.spongepowered.configurate.objectmapping.meta.Setting; @ConfigSerializable public class DatabaseCredentials { diff --git a/src/main/java/net/draycia/uranium/util/GameConfig.java b/src/main/java/net/draycia/uranium/util/GameConfig.java index c515b3a..fe64a30 100644 --- a/src/main/java/net/draycia/uranium/util/GameConfig.java +++ b/src/main/java/net/draycia/uranium/util/GameConfig.java @@ -1,7 +1,6 @@ package net.draycia.uranium.util; import java.util.Arrays; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -9,16 +8,14 @@ public class GameConfig { private String supplementaryFile = "words.txt"; - private Map> commandRewards = new LinkedHashMap<>(); - - { - commandRewards.put(1, Arrays.asList("eco give %player% 1500", - "broadcast &a%player%&7 answered &a%place%&7 in &a%time%&7 seconds!")); - commandRewards.put(2, Arrays.asList("eco give %player% 1000", - "broadcast &a%player%&7 answered &a%place%&7 in &a%time%&7 seconds!")); - commandRewards.put(3, Arrays.asList("eco give %player% 500", - "broadcast &a%player%&7 answered &a%place%&7 in &a%time%&7 seconds!")); - } + private Map> commandRewards = Map.of( + 1, Arrays.asList("eco give %player% 1500", + "broadcast &a%player%&7 answered &a%place%&7 in &a%time%&7 seconds!"), + 2, Arrays.asList("eco give %player% 1000", + "broadcast &a%player%&7 answered &a%place%&7 in &a%time%&7 seconds!"), + 3, Arrays.asList("eco give %player% 500", + "broadcast &a%player%&7 answered &a%place%&7 in &a%time%&7 seconds!") + ); private boolean isEnabled = true; diff --git a/src/main/java/net/draycia/uranium/util/GameConfigSerializer.java b/src/main/java/net/draycia/uranium/util/GameConfigSerializer.java index 10fa462..6469d52 100644 --- a/src/main/java/net/draycia/uranium/util/GameConfigSerializer.java +++ b/src/main/java/net/draycia/uranium/util/GameConfigSerializer.java @@ -1,26 +1,28 @@ package net.draycia.uranium.util; -import com.google.common.reflect.TypeToken; -import ninja.leaping.configurate.ConfigurationNode; -import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer; -import org.checkerframework.checker.nullness.qual.NonNull; +import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.List; import java.util.Map; +import org.spongepowered.configurate.ConfigurationNode; +import org.spongepowered.configurate.serialize.SerializationException; +import org.spongepowered.configurate.serialize.TypeSerializer; public class GameConfigSerializer implements TypeSerializer { - @Nullable + private Type commandRewardsType = new TypeToken>>() {}.getType(); + @Override - public GameConfig deserialize(@NonNull TypeToken type, @NonNull ConfigurationNode value) { + public GameConfig deserialize(Type type, ConfigurationNode value) throws SerializationException { + String fileName = value.node("supplementary-file").getString(); + Map> commandRewards = (Map>) value.node("command-rewards").get(commandRewardsType); + boolean isEnabled = value.node("is-enabled").getBoolean(); - String fileName = value.getNode("supplementary-file").getString(); - Map> commandRewards = (Map>) value.getNode("command-rewards").getValue(); - boolean isEnabled = value.getNode("is-enabled").getBoolean(); + ConfigurationNode dashNode = value.node("dash-percentage"); - ConfigurationNode dashNode = value.getNode("dash-percentage"); - if (!dashNode.isVirtual()) { + if (!dashNode.virtual()) { return new HangmanConfig(fileName, isEnabled, commandRewards, dashNode.getDouble()); } @@ -28,18 +30,17 @@ public GameConfig deserialize(@NonNull TypeToken type, @NonNull Configuration } @Override - public void serialize(@NonNull TypeToken type, @Nullable GameConfig obj, @NonNull ConfigurationNode value) { + public void serialize(Type type, @Nullable GameConfig obj, ConfigurationNode value) throws SerializationException { if (obj == null) { return; } - value.getNode("supplementary-file").setValue(obj.getSupplementaryFile()); - value.getNode("command-rewards").setValue(obj.getAllCommandRewards()); - value.getNode("is-enabled").setValue(obj.isEnabled()); + value.node("supplementary-file").set(obj.getSupplementaryFile()); + value.node("command-rewards").set(obj.getAllCommandRewards()); + value.node("is-enabled").set(obj.isEnabled()); if (obj instanceof HangmanConfig) { - value.getNode("dash-percentage").setValue(((HangmanConfig) obj).getDashPercentage()); + value.node("dash-percentage").set(((HangmanConfig) obj).getDashPercentage()); } } - } diff --git a/src/main/java/net/draycia/uranium/util/HangmanConfig.java b/src/main/java/net/draycia/uranium/util/HangmanConfig.java index 0eaac07..fc79944 100644 --- a/src/main/java/net/draycia/uranium/util/HangmanConfig.java +++ b/src/main/java/net/draycia/uranium/util/HangmanConfig.java @@ -1,10 +1,9 @@ package net.draycia.uranium.util; -import ninja.leaping.configurate.objectmapping.Setting; -import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; - import java.util.List; import java.util.Map; +import org.spongepowered.configurate.objectmapping.ConfigSerializable; +import org.spongepowered.configurate.objectmapping.meta.Setting; @ConfigSerializable public class HangmanConfig extends GameConfig { diff --git a/src/main/java/net/draycia/uranium/util/MessageKey.java b/src/main/java/net/draycia/uranium/util/MessageKey.java deleted file mode 100644 index d27ef20..0000000 --- a/src/main/java/net/draycia/uranium/util/MessageKey.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.draycia.uranium.util; - -import java.util.*; -import java.util.stream.Collectors; - -public enum MessageKey { - - FAILURE("Games » Nobody typed in time!"), - TYPE_START("'>Games » Hover and type the word!"), - UNSCRAMBLE_START("'>Games » Hover and unscramble the word!"), - MATH_START("'>Games » Hover and solve the math problem!"), - HANGMAN_START("'>Games » Hover and fill in the blanks!"), - TRIVIA_START("'>Games » Hover and answer this trivia question!"), - TYPE_INCOMPLETE("Games » Game ended. Winners: "), - UNSCRAMBLE_INCOMPLETE("Games » Game ended. Winners: "), - MATH_INCOMPLETE("Games » Game ended. Winners: "), - HANGMAN_INCOMPLETE("Games » Game ended. Winners: "), - WINNERS_FORMAT("[