diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..467ef2f --- /dev/null +++ b/.classpath @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fa412ed --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +# Compiled class file +*.class + +# Gradle +/.gradle/ +bin/ +build/ + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* diff --git a/.project b/.project new file mode 100644 index 0000000..62d5b06 --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + WebAddon + Project WebAddon created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..e889521 --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..35068d9 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index d44947a..60a1331 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'com.github.johnrengelman.shadow' version '2.0.3' + id 'com.github.johnrengelman.shadow' version '4.0.2' id 'java' } group 'com.pikachu.webaddon' -version '1.0-SNAPSHOT' +version '1.0.0' sourceCompatibility = 1.8 @@ -13,41 +13,17 @@ repositories { mavenCentral() maven { - name = 'spigotmc-repo' - url = 'https://hub.spigotmc.org/nexus/content/groups/public/' + url 'https://hub.spigotmc.org/nexus/content/groups/public/' } maven { - url 'https://raw.githubusercontent.com/bensku/mvn-repo/master/' + url 'https://jitpack.io/' } - - maven { - url 'https://repo.destroystokyo.com/repository/maven-public/' - } - - maven { - url 'http://maven.sk89q.com/repo' - } - - maven { - url 'http://nexus.hc.to/content/repositories/pub_releases' - } - - maven { - url 'https://jitpack.io' - } - } dependencies { - compileOnly('org.spigotmc:spigot-api:1.12.1-R0.1-SNAPSHOT') - testCompile group: 'junit', name: 'junit', version: '4.12' - compileOnly 'ch.njol:skript:2.2-dev33' - compile('com.sparkjava:spark-core:2.7.2') -} - - -shadowJar { - dependencies + shadow 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT' + compileOnly 'com.github.SkriptLang:Skript:2.3.6' + implementation 'com.sparkjava:spark-core:2.9.0' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf 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..ea13fdf --- /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-5.3.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..b0d6d0a --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/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 +# +# http://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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# 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 new file mode 100644 index 0000000..9991c50 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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 http://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 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/src/main/java/com/pikachu/webaddon/skript/classinfos/SimpleType.java b/src/main/java/com/pikachu/webaddon/skript/classinfos/SimpleType.java index d8eb411..cd5c969 100644 --- a/src/main/java/com/pikachu/webaddon/skript/classinfos/SimpleType.java +++ b/src/main/java/com/pikachu/webaddon/skript/classinfos/SimpleType.java @@ -10,7 +10,6 @@ import ch.njol.skript.registrations.Classes; import com.pikachu.webaddon.util.ReflectionUtils; -import javax.annotation.Nullable; import java.util.HashMap; import java.util.Locale; @@ -46,17 +45,17 @@ public SimpleType(Class clz, String name, String pattern, String variableName register(); } - public abstract String toString(T arg0, int arg1); + public abstract String toString(T type, int flags); - public String toVariableNameString(T arg0) { - return toString(arg0, 0); + public String toVariableNameString(T type) { + return toString(type, 0); } - public T parse(String arg0, ParseContext arg1) { + public T parse(String pattern, ParseContext context) { return null; } - public boolean canParse(ParseContext pc) { + public boolean canParse(ParseContext context) { return false; } @@ -86,19 +85,18 @@ public boolean canParse(ParseContext context) { } @Override - @Nullable - public T parse(String arg0, ParseContext arg1) { - return SimpleType.this.parse(arg0, arg1); + public T parse(String pattern, ParseContext context) { + return SimpleType.this.parse(pattern, context); } @Override - public String toString(T arg0, int arg1) { - return SimpleType.this.toString(arg0, arg1); + public String toString(T type, int flags) { + return SimpleType.this.toString(type, flags); } @Override - public String toVariableNameString(T arg0) { - return SimpleType.this.toVariableNameString(arg0); + public String toVariableNameString(T type) { + return SimpleType.this.toVariableNameString(type); } })); } catch (Exception e) { diff --git a/src/main/java/com/pikachu/webaddon/skript/expressions/ExprFileContents.java b/src/main/java/com/pikachu/webaddon/skript/expressions/ExprFileContents.java index 6b7a52d..23c9feb 100644 --- a/src/main/java/com/pikachu/webaddon/skript/expressions/ExprFileContents.java +++ b/src/main/java/com/pikachu/webaddon/skript/expressions/ExprFileContents.java @@ -1,15 +1,16 @@ package com.pikachu.webaddon.skript.expressions; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.stream.Collectors; + import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.expressions.base.PropertyExpression; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; @Name("File Contents") @Description("The contents of a file") @@ -22,9 +23,10 @@ public class ExprFileContents extends SimplePropertyExpression { } @Override - public String convert(String s) { + public String convert(String path) { try { - return FileUtils.readFileToString(new File(s), (Charset) null); + return Files.lines(Paths.get(path), StandardCharsets.UTF_8) + .collect(Collectors.joining("\n")); } catch (IOException e) { return null; } diff --git a/src/main/java/com/pikachu/webaddon/skript/expressions/ExprIP.java b/src/main/java/com/pikachu/webaddon/skript/expressions/ExprIP.java index f91e538..24a6e76 100644 --- a/src/main/java/com/pikachu/webaddon/skript/expressions/ExprIP.java +++ b/src/main/java/com/pikachu/webaddon/skript/expressions/ExprIP.java @@ -8,11 +8,11 @@ @Name("IP address") @Description("The IP address of a request") -@Examples("send back \"Woah bro! Your IP address is %ip of event-request%\"") +@Examples("send back \"Woah bro! Your IP address is %request-IP of event-request%\"") public class ExprIP extends SimplePropertyExpression { static { - register(ExprIP.class, String.class, "ip", "requests"); + register(ExprIP.class, String.class, "request(-| )IP", "requests"); } @Override diff --git a/src/main/java/com/pikachu/webaddon/util/AsyncEffect.java b/src/main/java/com/pikachu/webaddon/util/AsyncEffect.java index 37adb6c..f147378 100644 --- a/src/main/java/com/pikachu/webaddon/util/AsyncEffect.java +++ b/src/main/java/com/pikachu/webaddon/util/AsyncEffect.java @@ -3,7 +3,6 @@ import ch.njol.skript.lang.TriggerItem; import org.bukkit.event.Event; -import javax.annotation.Nullable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -21,7 +20,6 @@ public abstract class AsyncEffect extends DelayFork { private static final ExecutorService THREADS = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); @Override - @Nullable protected TriggerItem walk(Event e) { debug(e, true); DelayFork.addDelayedEvent(e); diff --git a/src/main/java/com/pikachu/webaddon/util/ConvertibleSimpleExpression.java b/src/main/java/com/pikachu/webaddon/util/ConvertibleSimpleExpression.java index cc8805a..4fdaba8 100644 --- a/src/main/java/com/pikachu/webaddon/util/ConvertibleSimpleExpression.java +++ b/src/main/java/com/pikachu/webaddon/util/ConvertibleSimpleExpression.java @@ -16,7 +16,6 @@ import ch.njol.util.coll.CollectionUtils; import ch.njol.util.coll.iterator.ArrayIterator; import org.bukkit.event.Event; -import org.eclipse.jdt.annotation.Nullable; import java.lang.reflect.Array; import java.util.Iterator; @@ -28,14 +27,13 @@ public abstract class ConvertibleSimpleExpression implements Expression { */ protected ParserInstance pi; private int time = 0; - @Nullable private ClassInfo returnTypeInfo; @SuppressWarnings("null") protected ConvertibleSimpleExpression() { } - public final static boolean check(final @Nullable T[] all, final Checker c, final boolean invert, final boolean and) { + public final static boolean check(final T[] all, final Checker c, final boolean invert, final boolean and) { if (all == null) return false; boolean hasElement = false; @@ -55,7 +53,6 @@ public final static boolean check(final @Nullable T[] all, final Checker c, final bool * @see ConvertedExpression#newInstance(Expression, Class...) * @see Converter */ - @Nullable protected ConvertedExpression getConvertedExpr(final Class... to) { assert !CollectionUtils.containsSuperclass(to, getReturnType()); return ConvertedExpression.newInstance(this, to); @@ -180,7 +175,6 @@ public final boolean check(final Event e, final Checker c, final bool @Override @SuppressWarnings("unchecked") - @Nullable public Expression getConvertedExpression(final Class... to) { if (CollectionUtils.containsSuperclass(to, getReturnType())) return (Expression) this; @@ -188,7 +182,6 @@ public Expression getConvertedExpression(final Class... to) } @Override - @Nullable public Class[] acceptChange(final Changer.ChangeMode mode) { ClassInfo rti = returnTypeInfo; if (rti == null) @@ -201,7 +194,7 @@ public Class[] acceptChange(final Changer.ChangeMode mode) { @SuppressWarnings("unchecked") @Override - public void change(final Event e, final @Nullable Object[] delta, final Changer.ChangeMode mode) { + public void change(final Event e, final Object[] delta, final Changer.ChangeMode mode) { final ClassInfo rti = returnTypeInfo; if (rti == null) throw new UnsupportedOperationException(); @@ -277,7 +270,6 @@ public boolean isLoopOf(final String s) { } @Override - @Nullable public Iterator iterator(final Event e) { return new ArrayIterator(getArray(e)); } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 75e47ef..43a7002 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: WebAddon description: HTTP server functionality for Skript main: com.pikachu.webaddon.WebAddon -version: 1.0 +version: 1.0.0 author: sky_high depend: [Skript] \ No newline at end of file