diff --git a/README.md b/README.md index b47dbd6..993dece 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Requires Fabric API. ## License Libraries that the project is using: - `Argon2 (LGPLv3)` https://github.com/phxql/argon2-jvm -- `JDBC (Apache 2)` https://github.com/xerial/sqlite-jdbc +- `JDBC (Apache 2)` https://github.com/polyjdbc/polyjdbc - `JNA (Apache 2 || LGPLv3)` https://github.com/java-native-access/jna This project is licensed under the `MIT` license. diff --git a/build.gradle b/build.gradle index 98772bd..97c1949 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,8 @@ dependencies { include 'de.mkammerer:argon2-jvm:2.6' // JDBC SQLite Driver - implementation group:'org.xerial', name:'sqlite-jdbc', version:'3.8.11.2' - include group:'org.xerial', name:'sqlite-jdbc', version:'3.8.11.2' + implementation group: 'org.polyjdbc', name: 'polyjdbc', version: '0.7.6' + include group: 'org.polyjdbc', name: 'polyjdbc', version: '0.7.6' // JNA lib include 'net.java.dev.jna:jna:5.5.0' diff --git a/gradle.properties b/gradle.properties index d9333e1..7778b32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,12 +2,12 @@ org.gradle.jvmargs=-Xmx1G # Fabric properties -minecraft_version=20w13a -yarn_mappings=20w13a+build.5 -loader_version=0.7.8+build.189 +minecraft_version=20w14a +yarn_mappings=20w14a+build.9 +loader_version=0.7.10+build.191 #Fabric api -fabric_version=0.5.6+build.313-1.16 +fabric_version=0.5.8+build.316-1.16 # Mod Properties mod_version = 1.3.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..490fda8 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 c757199..0a9701e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -#Thu Oct 17 21:45:53 CEST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip +#Fri Apr 03 20:13:47 CEST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 8e25e6c..2fe81a7 100644 --- a/gradlew +++ b/gradlew @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# 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"` @@ -154,19 +154,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` 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" ;; + 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 @@ -175,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # 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" -# 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 - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9618d8d..62bd9b9 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" diff --git a/src/main/java/org/samo_lego/simpleauth/database/SimpleAuthDatabase.java b/src/main/java/org/samo_lego/simpleauth/database/SimpleAuthDatabase.java index 2c82070..c32bd04 100644 --- a/src/main/java/org/samo_lego/simpleauth/database/SimpleAuthDatabase.java +++ b/src/main/java/org/samo_lego/simpleauth/database/SimpleAuthDatabase.java @@ -64,7 +64,7 @@ public class SimpleAuthDatabase { + "FROM users WHERE UUID = ?"; try (PreparedStatement pstmt = conn.prepareStatement(sql); - PreparedStatement pstmtCheck = conn.prepareStatement(sqlCheck)) { + PreparedStatement pstmtCheck = conn.prepareStatement(sqlCheck)) { pstmtCheck.setString(1, uuid); ResultSet rs = pstmtCheck.executeQuery(); diff --git a/src/main/java/org/samo_lego/simpleauth/utils/AuthConfig.java b/src/main/java/org/samo_lego/simpleauth/utils/AuthConfig.java index e8ef1f3..7465acd 100644 --- a/src/main/java/org/samo_lego/simpleauth/utils/AuthConfig.java +++ b/src/main/java/org/samo_lego/simpleauth/utils/AuthConfig.java @@ -76,8 +76,6 @@ public class AuthConfig { public String globalPasswordSet = "§aGlobal password was successfully set!"; public String cannotChangePassword = "§cYou cannot change password!"; public String cannotUnregister = "§cYou cannot unregister this account!"; - public String cannotChangePassword = "§6You cannot change password!"; - public String cannotUnregister = "§6You cannot unregister this account!"; public String notAuthenticated = "§cYou are not authenticated!\n§6Try with /login or /register."; public String alreadyAuthenticated = "§6You are already authenticated."; public String successfullyAuthenticated = "§aYou are now authenticated.";