diff --git a/.gitignore b/.gitignore
index 408c231..2fd2c68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,10 +16,15 @@
.*.sw[a-p]
# various other potential build files
+/.gradle
/build
/bin
/dist
/manifest.mf
# Mac filesystem dust
-/.DS_Store
\ No newline at end of file
+/.DS_Store
+
+#IntelliJ IDEA
+/.idea
+*.iml
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..647b1d9
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/../../../../../../:\Users\jim\IdeaProjects\Dynmap-WorldGuard\.idea/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..c1d5cf9
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Dynmap-WorldGuard
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..1e32a67
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 0000000..cd711a0
--- /dev/null
+++ b/.idea/discord.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..611e7c8
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..9ba3c3f
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml
new file mode 100644
index 0000000..9fa3156
--- /dev/null
+++ b/.idea/libraries-with-intellij-classes.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..2288807
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/Dynmap-WorldGuard.main.iml b/.idea/modules/Dynmap-WorldGuard.main.iml
new file mode 100644
index 0000000..fa63d4b
--- /dev/null
+++ b/.idea/modules/Dynmap-WorldGuard.main.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+ SPIGOT
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/Dynmap-WorldGuard_main.iml b/.idea/modules/Dynmap-WorldGuard_main.iml
new file mode 100644
index 0000000..fa63d4b
--- /dev/null
+++ b/.idea/modules/Dynmap-WorldGuard_main.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+ SPIGOT
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Dynmap-WorldGuard.iml b/Dynmap-WorldGuard.iml
new file mode 100644
index 0000000..6d44b22
--- /dev/null
+++ b/Dynmap-WorldGuard.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+ BUKKIT
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..dc6f737
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,61 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+ id 'java'
+ id 'maven-publish'
+}
+
+repositories {
+ mavenLocal()
+ mavenCentral()
+
+ maven {
+ url 'https://repo.mikeprimm.com/'
+ }
+
+ maven {
+ url 'https://maven.enginehub.org/repo/'
+ }
+}
+
+dependencies {
+ compileOnly 'us.dynmap:dynmap-api:3.0-SNAPSHOT'
+ compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.5'
+ compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.0.0'
+ compileOnly 'com.sk89q:squirrelid:0.2.0'
+ compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
+}
+
+group = 'org.dynmap'
+version = '1.3-SNAPSHOT'
+
+java.sourceCompatibility = JavaVersion.VERSION_16
+java.targetCompatibility = JavaVersion.VERSION_16
+
+tasks {
+ processResources {
+ from("${project.rootDir}/src/main/resources") {
+ duplicatesStrategy = DuplicatesStrategy.INCLUDE
+ project.properties.findAll().each {
+ prop ->
+ if (prop.value != null && prop.value instanceof java.lang.String) {
+ filter(ReplaceTokens, tokens: [(prop.key): prop.value])
+ filter(ReplaceTokens, tokens: [('project.' + prop.key): prop.value])
+ }
+ }
+ }
+ }
+
+ compileJava {
+ options.compilerArgs += ["-Xlint:all", "-Xlint:-processing"]
+ options.encoding = 'UTF-8'
+ }
+}
+
+publishing {
+ publications {
+ maven(MavenPublication) {
+ from(components.java)
+ }
+ }
+}
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 8cad937..50b4668 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -1,199 +1,135 @@
-
-
- 4.0.0
- org.dynmap
- Dynmap-WorldGuard
- 1.4-beta-1
-
-
-
- true
- src/main/resources
-
- *.yml
- *.txt
-
-
-
- src/main/resources
-
- *.yml
- *.txt
-
-
-
-
-
- maven-compiler-plugin
- 2.0.2
-
- 1.8
- 1.8
-
-
-
- maven-shade-plugin
- 3.2.1
-
-
- package
-
- shade
-
-
- true
-
-
- org.bstats:bstats-bukkit:2.2.1
-
- **
-
-
-
- com.sk89q:squirrelid
-
- **
-
-
-
-
-
-
-
-
-
- com.sk89q.squirrelid
- com.sk89q.worldguard.util.profile
-
-
- org.bstats
- org.dynmap.worldguard.bstats
-
-
-
-
-
-
-
-
-
-
- dynmap-repo
- https://repo.mikeprimm.com/
-
-
- spigot-repo
- https://hub.spigotmc.org/nexus/content/repositories/snapshots/
-
-
- enginehub-maven
- https://maven.enginehub.org/repo/
-
-
-
-
- essentials
- https://repo.essentialsx.net/releases/
-
-
-
-
- us.dynmap
- dynmap-api
- 3.3-SNAPSHOT
- provided
-
-
- DynmapCoreAPI
- us.dynmap
-
-
-
-
- org.bukkit
- bukkit
- 1.13.2-R0.1-SNAPSHOT
- provided
-
-
- commons-lang
- commons-lang
-
-
- json-simple
- com.googlecode.json-simple
-
-
- guava
- com.google.guava
-
-
- gson
- com.google.code.gson
-
-
- snakeyaml
- org.yaml
-
-
-
-
- com.sk89q.worldedit
- worldedit-bukkit
- 7.2.0
- provided
-
-
- worldedit-core
- com.sk89q.worldedit
-
-
- bukkit
- com.sk89q.worldedit.worldedit-libs
-
-
- spigot-api
- org.spigotmc
-
-
- paperlib
- io.papermc
-
-
- log4j-slf4j-impl
- org.apache.logging.log4j
-
-
- fastutil
- it.unimi.dsi
-
-
-
-
- com.sk89q.worldguard
- worldguard-bukkit
- 7.0.0
- provided
-
-
- worldguard-core
- com.sk89q.worldguard
-
-
- commandbook
- com.sk89q
-
-
-
-
-
-
-
- org.bstats
- bstats-bukkit
- 2.2.1
- compile
-
-
-
-
+
+
+ 4.0.0
+ org.dynmap
+ Dynmap-WorldGuard
+ 1.4-SNAPSHOT
+
+
+
+ true
+ src/main/resources
+
+ *.yml
+ *.txt
+
+
+
+ src/main/resources
+
+ *.yml
+ *.txt
+
+
+
+
+
+ maven-compiler-plugin
+ 3.10.0
+
+ 1.8
+ 1.8
+
+
+
+ maven-shade-plugin
+ 3.2.4
+
+
+ package
+
+ shade
+
+
+ true
+
+
+ org.bstats:bstats-bukkit:2.2.1
+
+ **
+
+
+
+ com.sk89q:squirrelid
+
+ **
+
+
+
+
+
+
+
+
+
+ com.sk89q.squirrelid
+ com.sk89q.worldguard.util.profile
+
+
+ org.bstats
+ org.dynmap.worldguard.bstats
+
+
+
+
+
+
+
+
+ dynmap-repo
+ https://repo.mikeprimm.com/
+
+
+ enginehub-maven
+ https://maven.enginehub.org/repo/
+
+
+ essentials
+ https://repo.essentialsx.net/releases/
+
+
+ spigot-repo
+ https://hub.spigotmc.org/nexus/content/repositories/snapshots/
+
+
+ papermc
+ https://papermc.io/repo/repository/maven-public/
+
+
+
+
+ us.dynmap
+ dynmap-api
+ 3.3
+ provided
+
+
+ io.papermc.paper
+ paper-api
+ 1.17.1-R0.1-SNAPSHOT
+ provided
+
+
+ com.sk89q.worldedit
+ worldedit-bukkit
+ 7.2.9
+ provided
+
+
+ com.sk89q.worldguard
+ worldguard-bukkit
+ 7.0.6
+ provided
+
+
+
+
+
+ org.bstats
+ bstats-bukkit
+ 2.2.1
+ compile
+
+
+
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..7454180
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..05679dc
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..744e882
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or 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 UN*X
+##
+##############################################################################
+
+# 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
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$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"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# 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"
+ 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
+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
+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
+
+# 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
+ # 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\""
+ fi
+ 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" ;;
+ 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, 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"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@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=.
+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%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+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%"=="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
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/pom.xml b/pom.xml
index 5d92587..3b8dba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 2.0.2
+ 3.10.0
1.8
1.8
@@ -36,7 +36,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.2.1
+ 3.2.4
@@ -75,31 +75,30 @@
-
-
-
dynmap-repo
https://repo.mikeprimm.com/
-
- spigot-repo
- https://hub.spigotmc.org/nexus/content/repositories/snapshots/
-
enginehub-maven
https://maven.enginehub.org/repo/
-
-
essentials
https://repo.essentialsx.net/releases/
+
+ spigot-repo
+ https://hub.spigotmc.org/nexus/content/repositories/snapshots/
+
+
+ papermc
+ https://papermc.io/repo/repository/maven-public/
+
@@ -117,13 +116,13 @@
us.dynmap
dynmap-api
- 3.3-SNAPSHOT
+ 3.3
provided
- org.bukkit
- bukkit
- 1.13.2-R0.1-SNAPSHOT
+ io.papermc.paper
+ paper-api
+ 1.17.1-R0.1-SNAPSHOT
provided
@@ -141,15 +140,15 @@
com.sk89q.worldedit
worldedit-bukkit
- 7.2.0
+ 7.2.9
provided
com.sk89q.worldguard
worldguard-bukkit
- 7.0.0
+ 7.0.6
provided
1.4-SNAPSHOT
-
\ No newline at end of file
+
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..e8c0963
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,5 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+rootProject.name = 'Dynmap-WorldGuard'
diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml
deleted file mode 100644
index 2ec55c3..0000000
--- a/src/main/assembly/package.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
- bin
- false
-
- zip
-
-
-
-
-
- ${project.build.directory}/${artifactId}-${version}.jar
- /
- ${artifactId}.jar
-
-
-
diff --git a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
index 74d9aad..99040a8 100644
--- a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
+++ b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
@@ -1,6 +1,5 @@
package org.dynmap.worldguard;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -27,7 +26,6 @@
import org.dynmap.markers.MarkerAPI;
import org.dynmap.markers.MarkerSet;
-import com.sk89q.squirrelid.cache.ProfileCache;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.World;
@@ -42,6 +40,7 @@
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import com.sk89q.worldguard.protection.regions.RegionContainer;
import com.sk89q.worldguard.protection.regions.RegionType;
+import com.sk89q.worldguard.util.profile.cache.ProfileCache;
public class DynmapWorldGuardPlugin extends JavaPlugin {
private static Logger log;
@@ -53,7 +52,6 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
BooleanFlag boost_flag;
int updatesPerTick = 20;
- FileConfiguration cfg;
MarkerSet set;
long updperiod;
boolean use3d;
@@ -64,7 +62,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
Map ownerstyle;
Set visible;
Set hidden;
- boolean stop;
+ boolean stop;
int maxdepth;
@Override
@@ -72,7 +70,7 @@ public void onLoad() {
log = this.getLogger();
this.registerCustomFlags();
}
-
+
private static class AreaStyle {
String strokecolor;
String unownedstrokecolor;
@@ -101,15 +99,15 @@ private static class AreaStyle {
fillopacity = cfg.getDouble(path+".fillOpacity", 0.35);
}
}
-
+
public static void info(String msg) {
log.log(Level.INFO, msg);
}
public static void severe(String msg) {
log.log(Level.SEVERE, msg);
}
-
- private Map resareas = new HashMap();
+
+ private Map resareas = new HashMap<>();
private String formatInfoWindow(ProtectedRegion region, AreaMarker m) {
String v = ""+infowindow+"
";
@@ -125,28 +123,28 @@ private String formatInfoWindow(ProtectedRegion region, AreaMarker m) {
v = v.replace("%parent%", "");
v = v.replace("%priority%", String.valueOf(region.getPriority()));
Map, Object> map = region.getFlags();
- String flgs = "";
+ StringBuilder flgs = new StringBuilder();
for(Flag f : map.keySet()) {
- flgs += f.getName() + ": " + map.get(f).toString() + "
";
+ flgs.append(f.getName()).append(": ").append(map.get(f).toString()).append("
");
}
- v = v.replace("%flags%", flgs);
+ v = v.replace("%flags%", flgs.toString());
return v;
}
-
+
private boolean isVisible(String id, String worldname) {
if((visible != null) && (visible.size() > 0)) {
- if((visible.contains(id) == false) && (visible.contains("world:" + worldname) == false) &&
- (visible.contains(worldname + "/" + id) == false)) {
+ if((!visible.contains(id)) && (!visible.contains("world:" + worldname)) &&
+ (!visible.contains(worldname + "/" + id))) {
return false;
}
}
if((hidden != null) && (hidden.size() > 0)) {
- if(hidden.contains(id) || hidden.contains("world:" + worldname) || hidden.contains(worldname + "/" + id))
- return false;
+ return !hidden.contains(id) && !hidden.contains("world:" + worldname) && !hidden.contains(
+ worldname + "/" + id);
}
return true;
}
-
+
private void addStyle(String resid, String worldid, AreaMarker m, ProtectedRegion region) {
AreaStyle as = cusstyle.get(worldid + "/" + resid);
if(as == null) {
@@ -162,15 +160,13 @@ else if((tok.length >= 2) && resid.startsWith(tok[0]) && resid.endsWith(tok[1]))
}
}
if(as == null) { /* Check for owner style matches */
- if(ownerstyle.isEmpty() != true) {
+ if(!ownerstyle.isEmpty()) {
DefaultDomain dd = region.getOwners();
PlayerDomain pd = dd.getPlayerDomain();
if(pd != null) {
for(String p : pd.getPlayers()) {
- if(as == null) {
- as = ownerstyle.get(p.toLowerCase());
- if (as != null) break;
- }
+ as = ownerstyle.get(p.toLowerCase());
+ if (as != null) break;
}
if (as == null) {
for(UUID uuid : pd.getUniqueIds()) {
@@ -201,12 +197,9 @@ else if((tok.length >= 2) && resid.startsWith(tok[0]) && resid.endsWith(tok[1]))
if(as == null)
as = defstyle;
- boolean unowned = false;
- if((region.getOwners().getPlayers().size() == 0) &&
- (region.getOwners().getUniqueIds().size() == 0 )&&
- (region.getOwners().getGroups().size() == 0)) {
- unowned = true;
- }
+ boolean unowned = (region.getOwners().getPlayers().size() == 0) &&
+ (region.getOwners().getUniqueIds().size() == 0) &&
+ (region.getOwners().getGroups().size() == 0);
int sc = 0xFF0000;
int fc = 0xFF0000;
try {
@@ -215,7 +208,7 @@ else if((tok.length >= 2) && resid.startsWith(tok[0]) && resid.endsWith(tok[1]))
else
sc = Integer.parseInt(as.strokecolor.substring(1), 16);
fc = Integer.parseInt(as.fillcolor.substring(1), 16);
- } catch (NumberFormatException nfx) {
+ } catch (NumberFormatException ignored) {
}
m.setLineStyle(as.strokeweight, as.strokeopacity, sc);
m.setFillStyle(as.fillopacity, fc);
@@ -224,18 +217,18 @@ else if((tok.length >= 2) && resid.startsWith(tok[0]) && resid.endsWith(tok[1]))
}
if (boost_flag != null) {
Boolean b = region.getFlag(boost_flag);
- m.setBoostFlag((b == null)?false:b.booleanValue());
+ m.setBoostFlag(b != null && b);
}
}
-
+
/* Handle specific region */
private void handleRegion(World world, ProtectedRegion region, Map newmap) {
String name = region.getId();
/* Make first letter uppercase */
name = name.substring(0, 1).toUpperCase() + name.substring(1);
- double[] x = null;
- double[] z = null;
-
+ double[] x;
+ double[] z;
+
/* Handle areas */
if(isVisible(region.getId(), world.getName())) {
String id = region.getId();
@@ -278,7 +271,7 @@ else if(tn == RegionType.POLYGON) {
}
if(use3d) { /* If 3D? */
m.setRangeY(l1.getY()+1.0, l0.getY());
- }
+ }
/* Set line and fill properties */
addStyle(id, world.getName(), m, region);
@@ -291,13 +284,13 @@ else if(tn == RegionType.POLYGON) {
newmap.put(markerid, m);
}
}
-
+
private class UpdateJob implements Runnable {
- Map newmap = new HashMap(); /* Build new map */
+ Map newmap = new HashMap<>(); /* Build new map */
List worldsToDo = null;
List regionsToDo = null;
World curworld = null;
-
+
public void run() {
if (stop) {
return;
@@ -305,7 +298,7 @@ public void run() {
// If worlds list isn't primed, prime it
if (worldsToDo == null) {
List w = Bukkit.getWorlds();
- worldsToDo = new ArrayList();
+ worldsToDo = new ArrayList<>();
for (org.bukkit.World wrld : w) {
worldsToDo.add(WorldGuard.getInstance().getPlatform().getMatcher().getWorldByName(wrld.getName()));
}
@@ -328,8 +321,8 @@ public void run() {
RegionManager rm = rc.get(curworld); /* Get region manager for world */
if(rm != null) {
Map regions = rm.getRegions(); /* Get all the regions */
- if ((regions != null) && (regions.isEmpty() == false)) {
- regionsToDo = new ArrayList(regions.values());
+ if (!regions.isEmpty()) {
+ regionsToDo = new ArrayList<>(regions.values());
}
}
}
@@ -365,14 +358,14 @@ public void onPluginEnable(PluginEnableEvent event) {
Plugin wg = p.getServer().getPluginManager().getPlugin("WorldGuard");
if(wg != null && wg.isEnabled())
activate();
- } else if(name.equals("WorldGuard") && dynmap.isEnabled()) {
+ } else if(name.equals("WorldGuard") && dynmap.isEnabled()) {
activate();
}
}
}
-
+
private Metrics metrics;
-
+
public void onEnable() {
info("initializing");
PluginManager pm = getServer().getPluginManager();
@@ -389,16 +382,16 @@ public void onEnable() {
severe("Cannot find WorldGuard!");
return;
}
-
- getServer().getPluginManager().registerEvents(new OurServerListener(), this);
-
+
+ getServer().getPluginManager().registerEvents(new OurServerListener(), this);
+
/* If both enabled, activate */
if(dynmap.isEnabled() && wgp.isEnabled())
activate();
/* Start up metrics */
metrics = new Metrics(this, 14178);
}
-
+
private void registerCustomFlags() {
try {
BooleanFlag bf = new BooleanFlag(BOOST_FLAG);
@@ -412,10 +405,10 @@ private void registerCustomFlags() {
log.info("Custom flag '" + BOOST_FLAG + "' not registered");
}
}
-
+
private boolean reload = false;
-
- private void activate() {
+
+ private void activate() {
/* Now, get markers API */
markerapi = api.getMarkerAPI();
if(markerapi == null) {
@@ -432,7 +425,7 @@ private void activate() {
FileConfiguration cfg = getConfig();
cfg.options().copyDefaults(true); /* Load defaults, if needed */
this.saveConfig(); /* Save updates, if needed */
-
+
/* Now, add marker set for mobs (make it transient) */
set = markerapi.getMarkerSet("worldguard.markerset");
if(set == null)
@@ -455,13 +448,13 @@ private void activate() {
/* Get style information */
defstyle = new AreaStyle(cfg, "regionstyle");
- cusstyle = new HashMap();
- ownerstyle = new HashMap();
- cuswildstyle = new HashMap();
+ cusstyle = new HashMap<>();
+ ownerstyle = new HashMap<>();
+ cuswildstyle = new HashMap<>();
ConfigurationSection sect = cfg.getConfigurationSection("custstyle");
if(sect != null) {
Set ids = sect.getKeys(false);
-
+
for(String id : ids) {
if(id.indexOf('|') >= 0)
cuswildstyle.put(id, new AreaStyle(cfg, "custstyle." + id, defstyle));
@@ -472,28 +465,28 @@ private void activate() {
sect = cfg.getConfigurationSection("ownerstyle");
if(sect != null) {
Set ids = sect.getKeys(false);
-
+
for(String id : ids) {
ownerstyle.put(id.toLowerCase(), new AreaStyle(cfg, "ownerstyle." + id, defstyle));
}
}
List vis = cfg.getStringList("visibleregions");
if(vis != null) {
- visible = new HashSet(vis);
+ visible = new HashSet<>(vis);
}
List hid = cfg.getStringList("hiddenregions");
if(hid != null) {
- hidden = new HashSet(hid);
+ hidden = new HashSet<>(hid);
}
/* Set up update job - based on periond */
int per = cfg.getInt("update.period", 300);
if(per < 15) per = 15;
- updperiod = (long)(per*20);
+ updperiod = per* 20L;
stop = false;
-
+
getServer().getScheduler().scheduleSyncDelayedTask(this, new UpdateJob(), 40); /* First time is 2 seconds */
-
+
info("version " + this.getDescription().getVersion() + " is activated");
}
@@ -505,5 +498,4 @@ public void onDisable() {
resareas.clear();
stop = true;
}
-
}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 7043660..6f0e5e8 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,6 @@
name: Dynmap-WorldGuard
main: org.dynmap.worldguard.DynmapWorldGuardPlugin
-version: "${project.version}"
+version: @project.version@
author: mikeprimm
depend: [ dynmap, WorldGuard ]
-api-version: 1.13
-
+api-version: 1.16