Merge pull request #1 from GreenSurvivors/dev

2.0

TodoList

@@ -5,5 +5,5 @@ Hoppers (minecart hoppers too!) cannot take or put items, unless a [Redstone] ta
 todo wiki
 todo permission group support
 todo make multi door opening/closing together configurable per sign
-todo load additional legacy private/everyone/timer names to update legacy signs better
-todo better API
+todo better API
+todo check what applies for access type / timer

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id("xyz.jpenilla.run-paper") version "1.0.6"
 }
 // Suppiled by Jenkins
-ext.majorVersion = 1
+ext.majorVersion = 2
 ext.minorVersion = 0
 ext.minecraftVersion = "1.20.1"
 
@@ -35,16 +35,17 @@ repositories {
     maven { name 'Paper'; url 'https://repo.papermc.io/repository/maven-public/' }
     maven { name 'sk89q-repo'; url "https://maven.enginehub.org/repo/" } //worldguard
     maven { name 'playpro'; url 'https://maven.playpro.com/' } //coreProtect
-    maven {name 'dmulloy2';   url 'https://repo.dmulloy2.net/repository/public/'}
 }
 
 dependencies {
     implementation 'org.apache.commons:commons-collections4:4.4'
     implementation 'org.jetbrains:annotations:23.0.0'
+    implementation("com.github.ben-manes.caffeine:caffeine:3.1.8") // caches
+    implementation("de.mkammerer:argon2-jvm:2.11") // native password hashing with argon2
+
     paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT")
     compileOnly ('com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT') { transitive = false }
     compileOnly ('net.coreprotect:coreprotect:21.0'){ transitive = false}
-    implementation("com.github.ben-manes.caffeine:caffeine:3.1.8")
 }
 
 processResources {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -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,18 +198,28 @@ 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" \
         -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.

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,7 +41,7 @@ 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.
@@ -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

src/main/java/de/greensurvivors/padlock/Padlock.java

@@ -1,18 +1,17 @@
 package de.greensurvivors.padlock;
 
 import de.greensurvivors.padlock.command.Command;
+import de.greensurvivors.padlock.command.Password;
 import de.greensurvivors.padlock.config.ConfigManager;
 import de.greensurvivors.padlock.config.MessageManager;
 import de.greensurvivors.padlock.impl.DependencyManager;
 import de.greensurvivors.padlock.impl.LockCacheManager;
 import de.greensurvivors.padlock.impl.openabledata.OpenableToggleManager;
-import de.greensurvivors.padlock.listener.BlockDebugListener;
-import de.greensurvivors.padlock.listener.BlockEnvironmentListener;
-import de.greensurvivors.padlock.listener.BlockInventoryMoveListener;
-import de.greensurvivors.padlock.listener.BlockPlayerListener;
+import de.greensurvivors.padlock.listener.*;
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
@@ -46,34 +45,46 @@ public void onEnable() {
             plugin.getLogger().info("no lockette found.");
         }
 
+        openableToggleManager = new OpenableToggleManager(this);
+        lockCacheManager = new LockCacheManager();
+
         // Read config
         messageManager = new MessageManager(this);
         configManager = new ConfigManager(this);
         configManager.reload();
 
-        openableToggleManager = new OpenableToggleManager(this);
-        lockCacheManager = new LockCacheManager();
-
         // Register Listeners
         // If debug mode is not on, debug listener won't register
-        if (debug) getServer().getPluginManager().registerEvents(new BlockDebugListener(), this);
-        getServer().getPluginManager().registerEvents(new BlockPlayerListener(this), this);
-        getServer().getPluginManager().registerEvents(new BlockEnvironmentListener(this), this);
-        getServer().getPluginManager().registerEvents(new BlockInventoryMoveListener(this), this);
-
-        //register command
-        for (String commandStr : this.getDescription().getCommands().keySet()) {
-            PluginCommand mainCommand = getCommand(commandStr);
-            if (mainCommand != null) {
-                Command lockCmd = new Command(this);
-
-                mainCommand.setExecutor(lockCmd);
-                mainCommand.setTabCompleter(lockCmd);
-            } else {
-                getLogger().log(Level.SEVERE, "Couldn't register command '" + commandStr + "'!");
-            }
+        PluginManager pluginManager = getServer().getPluginManager();
+        if (debug) pluginManager.registerEvents(new BlockDebugListener(), this);
+        pluginManager.registerEvents(new BlockPlayerListener(this), this);
+        pluginManager.registerEvents(new BlockEnvironmentListener(this), this);
+        pluginManager.registerEvents(new BlockInventoryMoveListener(this), this);
+        pluginManager.registerEvents(new ChatPlayerListener(this), this);
+
+        //register commands
+        Command lockCmd = new Command(this);
+
+        PluginCommand mainCommand = getCommand("padlock");
+        if (mainCommand != null) {
+
+            mainCommand.setExecutor(lockCmd);
+            mainCommand.setTabCompleter(lockCmd);
+        } else {
+            getLogger().log(Level.SEVERE, "Couldn't register command 'padlock'!");
         }
 
+        Password pwCmd = new Password(plugin);
+        PluginCommand pwCommand = getCommand("password");
+        if (pwCommand != null) {
+
+            pwCommand.setExecutor(pwCmd);
+            pwCommand.setTabCompleter(pwCmd);
+        } else {
+            getLogger().log(Level.SEVERE, "Couldn't register command 'password'!");
+        }
+
+
         // Dependencys
         dependencyManager = new DependencyManager(this);
     }