diff --git a/.gitignore b/.gitignore index f0db1b2..24f075a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,11 @@ build/ debug/ +# VS Code +# ------- + +.vscode/ + # IntelliJ # -------- diff --git a/build.gradle b/build.gradle index 799a674..eb24063 100644 --- a/build.gradle +++ b/build.gradle @@ -5,29 +5,28 @@ plugins { id 'java' // Generates the plugin.yml, allows easier access to common plugin libraries, and facilitates the test server tasks. - id 'kr.entree.spigradle' version '2.2.3' + id 'kr.entree.spigradle' version '2.4.2' // Allows us to shade libraries into the build plugin. id 'com.github.johnrengelman.shadow' version '5.2.0' } repositories { - jcenter() mavenCentral() + jitpack() - spigot() - paper() + spigotmc() + sonatype() + papermc() } dependencies { compileOnly spigot(project.property('mcVersion')) compileOnly paper(project.property('mcVersion')) - implementation 'com.google.guava:guava:28.2-jre' - - testImplementation platform('org.junit:junit-bom:5.7.0') - testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation mockBukkit() + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' + testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.29.0' } test { @@ -46,14 +45,22 @@ task cleanAll { // Compilation variables / tasks // --------------------------------------------------------- -targetCompatibility = 1.8 -sourceCompatibility = 1.8 +compileJava { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +// Shading +// --------------------------------------------------------- tasks.build.dependsOn(shadowJar) +tasks.prepareSpigotPlugins.dependsOn(shadowJar) shadowJar { // This is required to prevent Spigradle from attempting to look for an incorrectly named file during debug. classifier = '' + + // relocate 'old.path.lib', "${project.property('group')}.lib" } // Plugin variables / tasks @@ -73,6 +80,8 @@ spigot { eula = true buildVersion = project.property('mcVersion') args = project.property('debugServerArgs').split(/(,\s*|\s+)/) - jvmArgs = project.property('debugServerJvmArgs').split(/(,\s*|\s+)/) + + // This caused issues with the debugPaper task + // jvmArgs = project.property('debugServerJvmArgs').split(/(,\s*|\s+)/) } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index aabcfdb..a43b5c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -group = com.projectkorra +group = com.projectkorra.core name = ProjectKorra-Core authors = ProjectKorra version = 0.0.1 description = This is a placeholder plugin description. -mcVersion = 1.16.3 -apiVersion = 1.16 +mcVersion = 1.19.2 +apiVersion = 1.19 debugServerArgs = --nogui debugServerJvmArgs = \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..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 12d38de..84d1f85 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-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 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,67 +17,101 @@ # ############################################################################## -## -## 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 @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 @@ -98,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 @@ -106,80 +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=`expr $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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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. +# -# 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" +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/src/main/java/com/projectkorra/core/util/ThreadUtil.java b/src/main/java/com/projectkorra/core/util/ThreadUtil.java index 2928c5e..4862955 100644 --- a/src/main/java/com/projectkorra/core/util/ThreadUtil.java +++ b/src/main/java/com/projectkorra/core/util/ThreadUtil.java @@ -1,8 +1,7 @@ package com.projectkorra.core.util; -import org.apache.commons.lang.Validate; +import com.google.common.base.Preconditions; -import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitTask; @@ -31,7 +30,7 @@ private ThreadUtil() {} * @since 0.0.1 */ public static BukkitTask runTask(BukkitRunnable runnable) throws NullPointerException, IllegalStateException { - Validate.notNull(runnable, "runnable cannot be null"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); return runnable.runTask(PLUGIN); } @@ -49,7 +48,7 @@ public static BukkitTask runTask(BukkitRunnable runnable) throws NullPointerExce * @since 0.0.1 */ public static BukkitTask runTask(Runnable runnable) throws NullPointerException, IllegalStateException { - Validate.notNull(runnable, "runnable cannot be null"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); return PLUGIN.getServer().getScheduler().runTask(PLUGIN, runnable); } @@ -67,7 +66,7 @@ public static BukkitTask runTask(Runnable runnable) throws NullPointerException, * @since 0.0.1 */ public static BukkitTask runTaskAsynchronously(BukkitRunnable runnable) throws NullPointerException, IllegalStateException { - Validate.notNull(runnable, "runnable cannot be null"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); return runnable.runTaskAsynchronously(PLUGIN); } @@ -85,7 +84,7 @@ public static BukkitTask runTaskAsynchronously(BukkitRunnable runnable) throws N * @since 0.0.1 */ public static BukkitTask runTaskAsynchronously(Runnable runnable) throws NullPointerException, IllegalStateException { - Validate.notNull(runnable, "runnable cannot be null"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); return PLUGIN.getServer().getScheduler().runTaskAsynchronously(PLUGIN, runnable); } @@ -105,8 +104,8 @@ public static BukkitTask runTaskAsynchronously(Runnable runnable) throws NullPoi * @since 0.0.1 */ public static BukkitTask runDelayedTask(BukkitRunnable runnable, long delay) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); return runnable.runTaskLater(PLUGIN, delay); } @@ -126,8 +125,8 @@ public static BukkitTask runDelayedTask(BukkitRunnable runnable, long delay) thr * @since 0.0.1 */ public static BukkitTask runDelayedTask(Runnable runnable, long delay) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); return PLUGIN.getServer().getScheduler().runTaskLater(PLUGIN, runnable, delay); } @@ -147,8 +146,8 @@ public static BukkitTask runDelayedTask(Runnable runnable, long delay) throws Nu * @since 0.0.1 */ public static BukkitTask runDelayedTaskAsynchronously(BukkitRunnable runnable, long delay) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); return runnable.runTaskLaterAsynchronously(PLUGIN, delay); } @@ -168,8 +167,8 @@ public static BukkitTask runDelayedTaskAsynchronously(BukkitRunnable runnable, l * @since 0.0.1 */ public static BukkitTask runDelayedTaskAsynchronously(Runnable runnable, long delay) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); return PLUGIN.getServer().getScheduler().runTaskLaterAsynchronously(PLUGIN, runnable, delay); } @@ -187,7 +186,7 @@ public static BukkitTask runDelayedTaskAsynchronously(Runnable runnable, long de * @since 0.0.1 */ public static BukkitTask runRepeatingTask(BukkitRunnable runnable) throws NullPointerException, IllegalStateException { - Validate.notNull(runnable, "runnable cannot be null"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); return runRepeatingTask(runnable, 0L, 0L); } @@ -205,7 +204,7 @@ public static BukkitTask runRepeatingTask(BukkitRunnable runnable) throws NullPo * @since 0.0.1 */ public static BukkitTask runRepeatingTask(Runnable runnable) throws NullPointerException, IllegalStateException { - Validate.notNull(runnable, "runnable cannot be null"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); return runRepeatingTask(runnable, 0L, 0L); } @@ -225,8 +224,8 @@ public static BukkitTask runRepeatingTask(Runnable runnable) throws NullPointerE * @since 0.0.1 */ public static BukkitTask runRepeatingTask(BukkitRunnable runnable, long delay) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); return runRepeatingTask(runnable, delay, 0L); } @@ -246,8 +245,8 @@ public static BukkitTask runRepeatingTask(BukkitRunnable runnable, long delay) t * @since 0.0.1 */ public static BukkitTask runRepeatingTask(Runnable runnable, long delay) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); return runRepeatingTask(runnable, delay, 0L); } @@ -268,9 +267,9 @@ public static BukkitTask runRepeatingTask(Runnable runnable, long delay) throws * @since 0.0.1 */ public static BukkitTask runRepeatingTask(BukkitRunnable runnable, long delay, long period) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); - Validate.isTrue(period >= 0, "period cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); + Preconditions.checkArgument(period >= 0, "period cannot be negative"); return runnable.runTaskTimer(PLUGIN, delay, period); } @@ -291,9 +290,9 @@ public static BukkitTask runRepeatingTask(BukkitRunnable runnable, long delay, l * @since 0.0.1 */ public static BukkitTask runRepeatingTask(Runnable runnable, long delay, long period) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); - Validate.isTrue(period >= 0, "period cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); + Preconditions.checkArgument(period >= 0, "period cannot be negative"); return PLUGIN.getServer().getScheduler().runTaskTimer(PLUGIN, runnable, delay, period); } @@ -311,7 +310,7 @@ public static BukkitTask runRepeatingTask(Runnable runnable, long delay, long pe * @since 0.0.1 */ public static BukkitTask runRepeatingTaskAsynchronously(BukkitRunnable runnable) throws NullPointerException, IllegalStateException { - Validate.notNull(runnable, "runnable cannot be null"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); return runRepeatingTaskAsynchronously(runnable, 0L, 0L); } @@ -329,7 +328,7 @@ public static BukkitTask runRepeatingTaskAsynchronously(BukkitRunnable runnable) * @since 0.0.1 */ public static BukkitTask runRepeatingTaskAsynchronously(Runnable runnable) throws NullPointerException, IllegalStateException { - Validate.notNull(runnable, "runnable cannot be null"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); return runRepeatingTaskAsynchronously(runnable, 0L, 0L); } @@ -349,8 +348,8 @@ public static BukkitTask runRepeatingTaskAsynchronously(Runnable runnable) throw * @since 0.0.1 */ public static BukkitTask runRepeatingTaskAsynchronously(BukkitRunnable runnable, long delay) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); return runRepeatingTaskAsynchronously(runnable, delay, 0L); } @@ -370,8 +369,8 @@ public static BukkitTask runRepeatingTaskAsynchronously(BukkitRunnable runnable, * @since 0.0.1 */ public static BukkitTask runRepeatingTaskAsynchronously(Runnable runnable, long delay) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); return runRepeatingTaskAsynchronously(runnable, delay, 0L); } @@ -392,9 +391,9 @@ public static BukkitTask runRepeatingTaskAsynchronously(Runnable runnable, long * @since 0.0.1 */ public static BukkitTask runRepeatingTaskAsynchronously(BukkitRunnable runnable, long delay, long period) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); - Validate.isTrue(period >= 0, "period cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); + Preconditions.checkArgument(period >= 0, "period cannot be negative"); return runnable.runTaskTimerAsynchronously(PLUGIN, delay, period); } @@ -415,9 +414,9 @@ public static BukkitTask runRepeatingTaskAsynchronously(BukkitRunnable runnable, * @since 0.0.1 */ public static BukkitTask runRepeatingTaskAsynchronously(Runnable runnable, long delay, long period) throws NullPointerException, IllegalStateException, IllegalArgumentException { - Validate.notNull(runnable, "runnable cannot be null"); - Validate.isTrue(delay >= 0, "delay cannot be negative"); - Validate.isTrue(period >= 0, "period cannot be negative"); + Preconditions.checkNotNull(runnable, "runnable cannot be null"); + Preconditions.checkArgument(delay >= 0, "delay cannot be negative"); + Preconditions.checkArgument(period >= 0, "period cannot be negative"); return PLUGIN.getServer().getScheduler().runTaskTimerAsynchronously(PLUGIN, runnable, delay, period); } } \ No newline at end of file diff --git a/src/main/java/com/projectkorra/core/util/VectorUtil.java b/src/main/java/com/projectkorra/core/util/VectorUtil.java index 0df68a2..3abeca5 100644 --- a/src/main/java/com/projectkorra/core/util/VectorUtil.java +++ b/src/main/java/com/projectkorra/core/util/VectorUtil.java @@ -1,6 +1,7 @@ package com.projectkorra.core.util; -import org.apache.commons.lang.Validate; +import com.google.common.base.Preconditions; + import org.bukkit.Location; import org.bukkit.util.Vector; @@ -31,7 +32,7 @@ public static Vector direction(Location from, Location to) { * @throws IllegalArgumentException when the axis vector is a zero vector */ public static Vector orthogonal(Vector axis, double length, Angle rotation) throws IllegalArgumentException { - Validate.isTrue(!axis.equals(UnitVector.ZERO.normal()), "Axis direction cannot be the zero vector!"); + Preconditions.checkArgument(!axis.equals(UnitVector.ZERO.normal()), "Axis direction cannot be the zero vector!"); double yaw = Math.toRadians(getYaw(axis)); Vector other = new Vector(-Math.sin(yaw), axis.getY() - 1, Math.cos(yaw)); diff --git a/src/main/java/com/projectkorra/core/util/reflection/ReflectionUtil.java b/src/main/java/com/projectkorra/core/util/reflection/ReflectionUtil.java index ef443e0..3145781 100644 --- a/src/main/java/com/projectkorra/core/util/reflection/ReflectionUtil.java +++ b/src/main/java/com/projectkorra/core/util/reflection/ReflectionUtil.java @@ -1,5 +1,7 @@ package com.projectkorra.core.util.reflection; +import com.google.common.base.Preconditions; + import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -10,8 +12,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.Validate; - import org.bukkit.Bukkit; /** @@ -112,7 +112,7 @@ private static String expandPathVariables(final String path) throws IllegalArgum * @since 0.0.1 */ private static Class getType(final Object object) throws NullPointerException { - Validate.notNull(object); + Preconditions.checkNotNull(object); return object.getClass(); } @@ -181,7 +181,7 @@ public static Constructor getConstructor(final String classPath, final Class< * @since 0.0.1 */ public static Constructor getConstructor(final Class clazz, final Class... parameterTypes) throws NullPointerException, NoSuchMethodException, SecurityException { - Validate.notNull(clazz, "clazz cannot be null"); + Preconditions.checkNotNull(clazz, "clazz cannot be null"); Constructor constructor = clazz.getDeclaredConstructor(parameterTypes); constructor.setAccessible(true); @@ -259,7 +259,7 @@ public static T instantiateObject(final Class clazz, final Object... argu * @since 0.0.1 */ public static T instantiateObject(final Constructor constructor, final Object... arguments) throws NullPointerException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { - Validate.notNull(constructor, "constructor cannot be null"); + Preconditions.checkNotNull(constructor, "constructor cannot be null"); return constructor.newInstance(arguments); } @@ -306,7 +306,7 @@ public static Method getMethod(final String classPath, final String methodName, * @since 0.0.1 */ public static Method getMethod(final Class clazz, final String methodName, final Class... parameterTypes) throws NullPointerException, NoSuchMethodException, SecurityException { - Validate.notNull(clazz, "clazz cannot be null"); + Preconditions.checkNotNull(clazz, "clazz cannot be null"); // Checks all methods within the specified class. for (final Method method : clazz.getDeclaredMethods()) { @@ -480,7 +480,7 @@ public static T invokeMethod(final Object instance, final Class clazz, fi * @since 0.0.1 */ public static T invokeMethod(final Object instance, final Method method, final Class returnType, final Object... arguments) throws NullPointerException, IllegalAccessException, InvocationTargetException, IllegalArgumentException { - Validate.notNull(method, "method cannot be null"); + Preconditions.checkNotNull(method, "method cannot be null"); if (returnType == null) { return (T) method.invoke(instance, arguments); // null if void or Object, T will be Object if null is passed in but we still have to cast. @@ -533,7 +533,7 @@ public static Field getField(final String classPath, final String fieldName) thr * @since 0.0.1 */ public static Field getField(final Class clazz, final String fieldName) throws NullPointerException, NoSuchFieldException, SecurityException { - Validate.notNull(clazz, "clazz cannot be null"); + Preconditions.checkNotNull(clazz, "clazz cannot be null"); // Checks all fields within the specified class. for (final Field field : clazz.getDeclaredFields()) { @@ -677,7 +677,7 @@ public static T getValue(final Object instance, final Class clazz, final * @since 0.0.1 */ public static T getValue(final Object instance, final Field field, final Class type) throws NullPointerException, IllegalArgumentException, IllegalAccessException { - Validate.notNull(field, "field cannot be null"); + Preconditions.checkNotNull(field, "field cannot be null"); if (type == null) { return (T) field.get(instance); // null or Object, T will be Object if null is passed in but we still have to cast. @@ -747,7 +747,7 @@ public static void setValue(final Object instance, final Class clazz, final S * @since 0.0.1 */ public static void setValue(final Object instance, final Field field, final Object value) throws NullPointerException, IllegalAccessException, IllegalArgumentException { - Validate.notNull(field, "field cannot be null"); + Preconditions.checkNotNull(field, "field cannot be null"); field.set(instance, value); }