diff --git a/.gitattributes b/.gitattributes index dfe0770..00a51af 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,6 @@ -# Auto detect text files and perform LF normalization -* text=auto +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore index 218fbd9..a085a83 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,10 @@ hs_err_pid* *.txt *.lst *.lst -target/classes/config.yml -target/classes/plugin.yml -target/maven-archiver/pom.properties -target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst + +/target/ +/out/ +/build/ +/.idea/ +# Ignore Gradle project-specific cache directory +/.gradle/ diff --git a/SimplexCore.iml b/SimplexCore.iml deleted file mode 100644 index 90857c1..0000000 --- a/SimplexCore.iml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - PAPER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f521291 --- /dev/null +++ b/build.gradle @@ -0,0 +1,76 @@ +plugins { + id "java" + id "com.github.johnrengelman.shadow" version "6.1.0" +} + +version project.properties["pluginVersion"] +targetCompatibility = sourceCompatibility = JavaVersion.VERSION_11 + +repositories { + mavenCentral() + + //maven artifact repo urls + [ + "https://jitpack.io", + "https://papermc.io/repo/repository/maven-public/", + "https://oss.sonatype.org/content/groups/public/", + "https://repo.extendedclip.com/content/repositories/placeholderapi/", + "http://repo.comphenix.net/content/repositories/releases/", + "http://repo.comphenix.net/content/repositories/snapshots/" + ].each { s -> + maven { + url s + } + } +} + +dependencies { + //provided + [ + "com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT", + "me.clip:placeholderapi:2.10.9", + ].each {s -> + compileOnly s + } + + compileOnly ("com.github.dmulloy2:ProtocolLib:4.5.1") { + exclude group: "com.comphenix.executors" + } + + //compile + [ + "org.jetbrains:annotations:20.1.0", + "org.reflections:reflections:0.9.12" + ].each {s -> + implementation s + } +} + +shadowJar { + classifier project.properties["pluginJarClassifier"].toString() + baseName project.properties["pluginName"].toString() + + //shading and relocation + [ + "org.reflections", + "javassist" + ].each {s -> + relocate s, "${project.properties["pluginMainPackage"]}.shaded.$s" + } +} + +processResources { + //update resources when building + doFirst { + file("$buildDir/resources/main").listFiles().each { + it.delete() + } + } + + //define variables + expand( + "pluginVersion": project.version, + "pluginName": project.properties["pluginName"], + "pluginMain": "${project.properties["pluginMainPackage"]}.${project.properties["pluginMain"]}" + ) +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..2c5cd05 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +pluginMain=SimplexCorePlugin +pluginMainPackage=io.github.paldiu.simplexcore +pluginVersion=1.13 +pluginName=SimplexCore +pluginJarClassifier=BLEEDING \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..bb8b2fc --- /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-6.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..fbd7c51 --- /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 + ;; + 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..5093609 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,104 @@ +@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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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 deleted file mode 100644 index 0746069..0000000 --- a/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - 4.0.0 - - io.github.paldiu.simplexcore - SimplexCore - 1.13-BLEEDING - jar - - SimplexCore - - Core for a group of plugins designed to enhance gameplay to the max - - 11 - UTF-8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - false - - - - - - - - src/main/resources - true - - - - - - - jitpack - https://jitpack.io - - - papermc-repo - https://papermc.io/repo/repository/maven-public/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - placeholderapi - https://repo.extendedclip.com/content/repositories/placeholderapi/ - - - - - - com.destroystokyo.paper - paper-api - 1.16.4-R0.1-SNAPSHOT - provided - - - org.jetbrains - annotations - 20.1.0 - compile - - - org.reflections - reflections - 0.9.12 - compile - - - com.github.dmulloy2 - ProtocolLib - 4.5.1 - provided - - - me.clip - placeholderapi - 2.10.9 - provided - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..93f03ef --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'simplex-core' \ No newline at end of file diff --git a/src/main/java/io/github/paldiu/simplexcore/CoreState.java b/src/main/java/io/github/paldiu/simplexcore/CoreState.java index 4b0a852..290547f 100644 --- a/src/main/java/io/github/paldiu/simplexcore/CoreState.java +++ b/src/main/java/io/github/paldiu/simplexcore/CoreState.java @@ -23,7 +23,7 @@ public class CoreState { } public State getState() { - if (SimplexCore.isDebug()) { + if (SimplexCorePlugin.isDebug()) { return State.DEBUG; } @@ -31,7 +31,7 @@ public class CoreState { return State.ON; } - if (SimplexCore.isSuspended()) { + if (SimplexCorePlugin.isSuspended()) { return State.SUSPENDED; } diff --git a/src/main/java/io/github/paldiu/simplexcore/SimplexCore.java b/src/main/java/io/github/paldiu/simplexcore/SimplexCorePlugin.java similarity index 92% rename from src/main/java/io/github/paldiu/simplexcore/SimplexCore.java rename to src/main/java/io/github/paldiu/simplexcore/SimplexCorePlugin.java index daddff3..cb35426 100644 --- a/src/main/java/io/github/paldiu/simplexcore/SimplexCore.java +++ b/src/main/java/io/github/paldiu/simplexcore/SimplexCorePlugin.java @@ -9,7 +9,7 @@ import io.github.paldiu.simplexcore.utils.Constants; // This comment was added to force a test on Jenkins AutoBuild // https://jenkins.coomware.dev/job/SimplexCore -public final class SimplexCore extends SimplexAddon { +public final class SimplexCorePlugin extends SimplexAddon { protected static boolean debug = false; protected static boolean suspended = false; @@ -26,7 +26,7 @@ public final class SimplexCore extends SimplexAddon { } @Override - public SimplexCore getPlugin() { + public SimplexCorePlugin getPlugin() { return this; } diff --git a/src/main/java/io/github/paldiu/simplexcore/utils/Constants.java b/src/main/java/io/github/paldiu/simplexcore/utils/Constants.java index 6d0e6b0..9d4a80c 100644 --- a/src/main/java/io/github/paldiu/simplexcore/utils/Constants.java +++ b/src/main/java/io/github/paldiu/simplexcore/utils/Constants.java @@ -1,6 +1,6 @@ package io.github.paldiu.simplexcore.utils; -import io.github.paldiu.simplexcore.SimplexCore; +import io.github.paldiu.simplexcore.SimplexCorePlugin; import io.github.paldiu.simplexcore.command.CommandLoader; import io.github.paldiu.simplexcore.config.Yaml; import io.github.paldiu.simplexcore.config.YamlFactory; @@ -14,7 +14,7 @@ import org.bukkit.scheduler.BukkitScheduler; import java.util.logging.Logger; public final class Constants { - private static final SimplexCore plugin = JavaPlugin.getPlugin(SimplexCore.class); + private static final SimplexCorePlugin plugin = JavaPlugin.getPlugin(SimplexCorePlugin.class); private static final Server server = plugin.getServer(); private static final Logger logger = plugin.getLogger(); private static final PluginManager manager = server.getPluginManager(); @@ -27,7 +27,7 @@ public final class Constants { throw new AssertionError(); } - public static SimplexCore getPlugin() { + public static SimplexCorePlugin getPlugin() { return plugin; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 58692bd..5850d54 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,9 @@ -name: SimplexCore -version: ${project.version} -main: io.github.paldiu.simplexcore.SimplexCore +name: ${pluginName} +version: ${pluginVersion} +main: ${pluginMain} api-version: 1.16 prefix: Simplex -authors: [ Paldiu ] +authors: + - Paldiu + - Conclure description: Core for a group of plugins designed to enhance gameplay to the max