commit efea6b3d206a9e51fe4968c8eff558476bccea55 Author: Timo Ley Date: Sat May 16 16:55:59 2020 +0200 Basic JSON definition diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f432552 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.gradle +.idea +src/test \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3766af8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,20 @@ +plugins { + id 'java' +} + +group 'ley.anvil' +version '1.0-SNAPSHOT' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + compile 'com.google.code.gson:gson:+' + compile 'org.apache.maven:maven-core:+' + compile 'org.python:jython:2.7.0' + + testCompile group: 'junit', name: 'junit', version: '4.12' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..87b738c 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..44e7c4d --- /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.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..af6708f --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## 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"' + +# 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..6d57edc --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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" + +@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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d8078f4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'addonscript' + diff --git a/src/main/java/ley/anvil/addonscript/util/JSON.java b/src/main/java/ley/anvil/addonscript/util/JSON.java new file mode 100644 index 0000000..3019f8d --- /dev/null +++ b/src/main/java/ley/anvil/addonscript/util/JSON.java @@ -0,0 +1,19 @@ +package ley.anvil.addonscript.util; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +public abstract class JSON { + + public static Gson gson = new GsonBuilder().create(); + + public String toJSON() { + return gson.toJson(this); + } + + @Override + public String toString() { + return toJSON(); + } + +} diff --git a/src/main/java/ley/anvil/addonscript/v1/AddonscriptJSON.java b/src/main/java/ley/anvil/addonscript/v1/AddonscriptJSON.java new file mode 100644 index 0000000..a1fe545 --- /dev/null +++ b/src/main/java/ley/anvil/addonscript/v1/AddonscriptJSON.java @@ -0,0 +1,252 @@ +package ley.anvil.addonscript.v1; + +import ley.anvil.addonscript.util.JSON; + +import java.util.List; + +public class AddonscriptJSON extends JSON { + + public static AddonscriptJSON fromJSON(String json) { + return gson.fromJson(json, AddonscriptJSON.class); + } + + public static AddonscriptJSON create() { + AddonscriptJSON as = new AddonscriptJSON(); + as.asversion = 1; + return as; + } + + /** + * The version of the AddonScript file + */ + public int asversion; + + /** + * The ID of the addon + */ + public String id; + + /** + * The name of the addon + */ + public String name; + + /** + * The type of the addon + * For example mod or modpack + */ + public String type; + + /** + * A link to an external AddonScript file which should be loaded instead of this + */ + public String extScript; + + /** + * The Minecraft versions, which are compatile with this addon + */ + public List mcversion; + + /** + * A list of versions of this addon + */ + public List versions; + + /** + * A list of the contributors of this addon + */ + public List contributors; + + /** + * A list of repositories this file uses + */ + public List repositories; + + /** + * A list of external installers this file uses + */ + public List installers; + + /** + * Meta information for this addon + */ + public Meta meta; + + public static class Version implements Comparable { + /** + * The name of this version + * (for example: 1.0, 1.1, 2.0) + */ + public String versionname; + /** + * The numeric ID of this version + * Used to identify, which version is higher/lower than another + * Can be -1 if this file uses only one version + */ + public int versionid; + /** + * The changelog of this version + */ + public List changelog; + /** + * The UNIX Timestamp when this version was released + */ + public int timestamp; + /** + * A link to another Addonscript JSON file, which handles this version + */ + public String extScript; + /** + * A list of files of this version + */ + public List files; + /** + * A lis of addons, that are related to this addon + */ + public List relations; + + @Override + public int compareTo(Version o) { + return versionid - o.versionid; + } + } + + public static class Contributor { + /** + * The name of the contributor + */ + public String name; + /** + * The role of the contributor + * (for example: author, developer, owner ...) + */ + public String role; + } + + public static class Meta { + /** + * A link to the icon of this addon + */ + public String icon; + } + + public static class Repository { + /** + * The ID of this repository + * Must be unique to this file + */ + public String id; + /** + * The type of this repository + * Currently supported: curseforge + */ + public String type; + /** + * The base url of this repository + */ + public String url; + } + + public static class Installer { + /** + * The ID of this installer + * Must be unique to this file + */ + public String id; + /** + * A link or relative path to a python file, which is an installer + */ + public String link; + + } + + public static class File { + /** + * The installer for this file + * Format: ::... + * Installer ID can be internal. + */ + public String installer = "internal.override"; + /** + * A link or relative path to this file. + * It can also be a path to a directory, if the installer supports directories + */ + public String file; + /** + * Should this file be on the client? + */ + public boolean client = true; + /** + * Should this file be on the server? + */ + public boolean server = true; + /** + * Is this file required or optional? + */ + public boolean required = true; + + } + + public static class Relation { + /** + * The installer for this file + * Format: ::... + * Installer ID can be internal. + */ + public String installer = "internal.dir:mods"; + /** + * A link to the file or another Addonscript JSON file + */ + public String file; + /** + * The type of this relation + * Supported type: included, required, recommended, optional or incompatible + */ + public String type = "included"; + /** + * A String which represents the file as an artifact. + * Format: : + */ + public String artifact; + /** + * Informations about the version of the addons + * Only useable when using a link to a Addonscript JSON file + */ + public VersionData version; + /** + * Should this file be on the client? + */ + public boolean client = true; + /** + * Should this file be on the server? + */ + public boolean server = true; + /** + * Is this file required or optional? + */ + public boolean required = true; + + } + + /** + * Currently useless + */ + public static class VersionData { + + public String version; + + public int versionID; + + public int minVersion; + + public int maxVersion; + + public boolean openUp; + + public boolean openDown; + + } + + + +}