diff --git a/base/src/main/java/io/github/p2vman/data/Codec.java b/base/src/main/java/io/github/p2vman/data/Codec.java deleted file mode 100644 index 80cd7da..0000000 --- a/base/src/main/java/io/github/p2vman/data/Codec.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.github.p2vman.data; - -public interface Codec extends Encoder, Decoder { - static Codec of(final Encoder encoder, final Decoder decoder) { - return new Codec() { - @Override - public T decode(I input) throws DecoderException { - return decoder.decode(input); - } - - @Override - public void encode(O out, T obj) throws EncoderException { - encoder.encode(out, obj); - } - }; - } -} diff --git a/base/src/main/java/io/github/p2vman/data/Decoder.java b/base/src/main/java/io/github/p2vman/data/Decoder.java deleted file mode 100644 index 017d0c9..0000000 --- a/base/src/main/java/io/github/p2vman/data/Decoder.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.p2vman.data; - -@FunctionalInterface -public interface Decoder { - R decode(I input) throws DecoderException; -} diff --git a/base/src/main/java/io/github/p2vman/data/DecoderException.java b/base/src/main/java/io/github/p2vman/data/DecoderException.java deleted file mode 100644 index 945bd34..0000000 --- a/base/src/main/java/io/github/p2vman/data/DecoderException.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.github.p2vman.data; - -public class DecoderException extends Exception { - public DecoderException() { - super(); - } - public DecoderException(final String message) { - super(message); - } - public DecoderException(final String message, final Throwable cause) { - super(message, cause); - } - public DecoderException(final Throwable cause) { - super(cause); - } -} diff --git a/base/src/main/java/io/github/p2vman/data/Encoder.java b/base/src/main/java/io/github/p2vman/data/Encoder.java deleted file mode 100644 index f4bd3ba..0000000 --- a/base/src/main/java/io/github/p2vman/data/Encoder.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.github.p2vman.data; - -public interface Encoder { - void encode(O out, T obj) throws EncoderException; -} diff --git a/base/src/main/java/io/github/p2vman/data/EncoderException.java b/base/src/main/java/io/github/p2vman/data/EncoderException.java deleted file mode 100644 index 0d7bebb..0000000 --- a/base/src/main/java/io/github/p2vman/data/EncoderException.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.github.p2vman.data; - -public class EncoderException extends Exception { - public EncoderException() { - super(); - } - - public EncoderException(final String message) { - super(message); - } - - public EncoderException(final String message, final Throwable cause) { - super(message, cause); - } - - public EncoderException(final Throwable cause) { - super(cause); - } -} diff --git a/base/src/main/java/io/github/p2vman/eptalist/storge/Storge.java b/base/src/main/java/io/github/p2vman/eptalist/storge/Storge.java index 4016808..9ff12ee 100644 --- a/base/src/main/java/io/github/p2vman/eptalist/storge/Storge.java +++ b/base/src/main/java/io/github/p2vman/eptalist/storge/Storge.java @@ -1,18 +1,13 @@ package io.github.p2vman.eptalist.storge; -import io.github.p2vman.Utils; -import j.ApiStatus; - import java.io.Closeable; import java.io.IOException; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; -@ApiStatus.In_Development public abstract class Storge implements Closeable { public static ExecutorService threadPool = Executors.newFixedThreadPool(2, new ThreadFactory() { private final ThreadFactory defaultFactory = Executors.defaultThreadFactory(); @@ -70,16 +65,4 @@ public abstract class Storge implements Closeable { public void close() throws IOException { } - - public abstract List toList(); - public abstract Answer addUserAsync(T name); - public abstract Answer addUser(T name); - public abstract Answer removeUser(T name); - public abstract Answer removeUserAsync(T name); - public abstract Answer isAsync(T name); - - @ApiStatus.In_Development - public static class Answer { - - } } diff --git a/base/src/main/java/io/github/p2vman/profiling/ExempleProfiler.java b/base/src/main/java/io/github/p2vman/profiling/ExempleProfiler.java index be5fb21..146a142 100644 --- a/base/src/main/java/io/github/p2vman/profiling/ExempleProfiler.java +++ b/base/src/main/java/io/github/p2vman/profiling/ExempleProfiler.java @@ -5,7 +5,6 @@ import java.util.Map; import java.util.Stack; public class ExempleProfiler implements Profiler { - private static final String $file = "https://github.com/p2vman/EptaListProject/blob/master/base/src/main/java/io/github/p2vman/profiling/ExempleProfiler.java"; private final Map totalTimes = new HashMap<>(); private final Stack stack = new Stack<>(); private final Map startTimes = new HashMap<>(); @@ -17,12 +16,11 @@ public class ExempleProfiler implements Profiler { public String pop() { if (stack.isEmpty()) { - throw new IllegalStateException($file+"#L20"); + throw new IllegalStateException(); } String name = stack.pop(); Long startTime = startTimes.remove(name); if (startTime == null) { - System.out.println($file+"#L26"); throw new IllegalStateException(name); } long elapsedTime = System.nanoTime() - startTime; @@ -32,7 +30,7 @@ public class ExempleProfiler implements Profiler { public String peek() { if (stack.isEmpty()) { - throw new IllegalStateException($file+"#L35"); + throw new IllegalStateException(); } return stack.peek(); } @@ -40,7 +38,6 @@ public class ExempleProfiler implements Profiler { public long getElapsedTimeAndRemove(String name) { Long elapsedTime = totalTimes.remove(name); if (elapsedTime == null) { - System.out.println($file+"#L44"); throw new IllegalStateException(name); } return elapsedTime / 1_000_000; @@ -49,7 +46,6 @@ public class ExempleProfiler implements Profiler { public long getElapsedTime(String name) { Long elapsedTime = totalTimes.get(name); if (elapsedTime == null) { - System.out.println($file+"#L53"); throw new IllegalStateException(name); } return elapsedTime / 1_000_000; diff --git a/base/src/main/java/io/github/p2vman/updater/Updater.java b/base/src/main/java/io/github/p2vman/updater/Updater.java index 2892292..9ea8f31 100644 --- a/base/src/main/java/io/github/p2vman/updater/Updater.java +++ b/base/src/main/java/io/github/p2vman/updater/Updater.java @@ -2,12 +2,12 @@ package io.github.p2vman.updater; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import lombok.Getter; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.HttpURLConnection; -import java.net.ProtocolException; import java.net.URL; import java.util.Objects; @@ -17,15 +17,11 @@ public class Updater { if (updater == null) updater = new Updater(); return updater; } + @Getter private String id; - public String getId() { - return id; - } - private static final String API_URL = "https://api.spiget.org/v2/resources/"; private static final String URL = "https://www.spigotmc.org/"; - private static final String SPIGOT_SIDE_API = "https://api.spigotmc.org/legacy/"; private JsonObject object; public JsonObject getJson() { @@ -42,7 +38,7 @@ public class Updater { } } - public JsonObject getLasted() throws ProtocolException, IOException { + public JsonObject getLasted() throws IOException { URL url = new URL(API_URL + id + "/versions/latest"); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); conn.setRequestMethod("GET"); @@ -51,7 +47,7 @@ public class Updater { return JsonParser.parseReader(new BufferedReader(new InputStreamReader(conn.getInputStream()))).getAsJsonObject(); } - public String getVersionUrl() throws ProtocolException, IOException { + public String getVersionUrl() throws IOException { URL url = new URL(API_URL + id); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); conn.setRequestMethod("GET"); diff --git a/base/src/main/java/j/ApiStatus.java b/base/src/main/java/j/ApiStatus.java deleted file mode 100644 index d2999e9..0000000 --- a/base/src/main/java/j/ApiStatus.java +++ /dev/null @@ -1,14 +0,0 @@ -package j; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -public class ApiStatus { - @Retention(RetentionPolicy.SOURCE) - @Target({ElementType.CONSTRUCTOR, ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.PACKAGE}) - public @interface In_Development { - - } -} diff --git a/boungecord/gradlew b/boungecord/gradlew deleted file mode 100644 index b740cf1..0000000 --- a/boungecord/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# 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. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# 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/HEAD/platforms/jvm/plugins-application/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 -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 - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# 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 - -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 ;; #( - 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 - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - 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 -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" || "$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 - 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 - # 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 -fi - - -# 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" \ - -classpath "$CLASSPATH" \ - 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. -# -# 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/boungecord/gradlew.bat b/boungecord/gradlew.bat deleted file mode 100644 index 25da30d..0000000 --- a/boungecord/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@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=. -@rem This is normally unused -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" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -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 - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -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 - -: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 %* - -:end -@rem End local scope for the variables with windows NT shell -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! -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 - -:omega diff --git a/boungecord/src/main/java/io/github/p2vman/eptalist/bounge/Boungecord.java b/boungecord/src/main/java/io/github/p2vman/eptalist/bounge/Boungecord.java index cb343b3..f0a32c1 100644 --- a/boungecord/src/main/java/io/github/p2vman/eptalist/bounge/Boungecord.java +++ b/boungecord/src/main/java/io/github/p2vman/eptalist/bounge/Boungecord.java @@ -23,7 +23,7 @@ public final class Boungecord extends Plugin { public static final java.util.logging.Logger LOGGER = java.util.logging.Logger.getLogger("EptaList"); public static final Profiler profiler = new ExempleProfiler(); public static Config.ConfigContainer config; - public static Data list; + public static Data list; public static Config.Mode mode; public static List identifiers = new ArrayList<>(); @@ -42,7 +42,7 @@ public final class Boungecord extends Plugin { } } try { - list = (Data) Storge.find(mode.storage).getConstructor(Map.class).newInstance(mode.data); + list = Storge.find(mode.storage).getConstructor(Map.class).newInstance(mode.data); } catch (Exception e) { e.printStackTrace(); } @@ -55,10 +55,7 @@ public final class Boungecord extends Plugin { if (!data.exists()) { data.mkdirs(); } - File cf = new File(data, "wh.json"); - if (!cf.exists()) cf = new File(data, "config.toml"); - - config = new Config.ConfigContainer(cf); + config = new Config.ConfigContainer(new File(data, "config.cfg")); load(); if (config.get().auto_update_check) { diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/spigot/src/main/java/io/github/p2vman/eptalist/spigot/EptaList.java b/spigot/src/main/java/io/github/p2vman/eptalist/spigot/EptaList.java index ae239bf..85aba56 100644 --- a/spigot/src/main/java/io/github/p2vman/eptalist/spigot/EptaList.java +++ b/spigot/src/main/java/io/github/p2vman/eptalist/spigot/EptaList.java @@ -58,7 +58,7 @@ public final class EptaList extends JavaPlugin { } } try { - list = (Data) Storge.find(mode.storage).getConstructor(Map.class).newInstance(mode.data); + list = Storge.find(mode.storage).getConstructor(Map.class).newInstance(mode.data); } catch (Exception e) { e.printStackTrace(); } @@ -75,10 +75,7 @@ public final class EptaList extends JavaPlugin { data.mkdirs(); } - File cf = new File(data, "wh.json"); - if (!cf.exists()) cf = new File(data, "config.toml"); - - config = new Config.ConfigContainer(cf); + config = new Config.ConfigContainer(new File(data, "config.cfg")); load(); if (config.get().auto_update_check) { diff --git a/velocity/src/main/java/io/github/p2vman/eptalist/velocity/Velocity.java b/velocity/src/main/java/io/github/p2vman/eptalist/velocity/Velocity.java index e782f94..5f15e71 100644 --- a/velocity/src/main/java/io/github/p2vman/eptalist/velocity/Velocity.java +++ b/velocity/src/main/java/io/github/p2vman/eptalist/velocity/Velocity.java @@ -60,7 +60,7 @@ public class Velocity { } } try { - list = (Data) Storge.find(mode.storage).getConstructor(Map.class).newInstance(mode.data); + list = Storge.find(mode.storage).getConstructor(Map.class).newInstance(mode.data); } catch (Exception e) { e.printStackTrace(); } @@ -75,12 +75,7 @@ public class Velocity { if (!Files.exists(dataDirectory)) { dataDirectory.toFile().mkdirs(); } - - File cf = new File(dataDirectory.toFile(), "config.json"); - if (!cf.exists()) cf = new File(dataDirectory.toFile(), "config.toml"); - - - config = new Config.ConfigContainer(cf); + config = new Config.ConfigContainer(new File(dataDirectory.toFile(), "config.cfg")); load(); if (config.get().auto_update_check) { try {