diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2d280c..f9fe11b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,13 +4,13 @@ jobs: build: strategy: matrix: - java: [8-jdk, 11-jdk, 15-jdk] - runs-on: ubuntu-20.04 + java: [21-jdk] + runs-on: ubuntu-22.04 container: - image: openjdk:${{ matrix.java }} + image: eclipse-temurin:${{ matrix.java }} options: --user root steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v1 - run: chmod +x ./gradlew - run: ./gradlew build --stacktrace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 92155da..ea1bc64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,12 +2,12 @@ name: Release on: [workflow_dispatch] # Manual trigger jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: - image: openjdk:15-jdk + image: eclipse-temurin:21-jdk options: --user root steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v1 - run: chmod +x ./gradlew - run: ./gradlew checkVersion build publish --stacktrace diff --git a/HEADER b/HEADER index a7f5947..ab68b0c 100644 --- a/HEADER +++ b/HEADER @@ -1,13 +1,16 @@ -Copyright (c) 2019 FabricMC +/* + * Copyright (c) $YEAR FabricMC + * + * 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. + */ -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. diff --git a/build.gradle b/build.gradle index b16f51c..200995c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,9 @@ plugins { id 'java' id 'maven-publish' - id 'org.cadixdev.licenser' version '0.6.1' + id 'checkstyle' id 'eclipse' + id "com.diffplug.spotless" version "6.23.3" } group 'net.fabricmc' @@ -11,10 +12,9 @@ version '1.5.3' def ENV = System.getenv() version = version + (ENV.GITHUB_ACTIONS ? "" : "+local") -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -archivesBaseName = "fabric-meta" +base { + archivesName = "fabric-meta" +} repositories { mavenCentral() @@ -27,6 +27,11 @@ dependencies { implementation group: 'commons-io', name: 'commons-io', version: '2.8.0' } +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} + jar { manifest { attributes "Main-Class": "net.fabricmc.meta.FabricMeta" @@ -43,16 +48,28 @@ tasks.withType(JavaCompile).configureEach { } } -license { - header file('HEADER') - include '**/*.java' +spotless { + lineEndings = com.diffplug.spotless.LineEnding.UNIX + + java { + licenseHeaderFile(rootProject.file("HEADER")) + removeUnusedImports() + importOrder('java', 'javax', '', 'net.fabricmc') + indentWithTabs() + trimTrailingWhitespace() + } +} + +checkstyle { + configFile = file('checkstyle.xml') + toolVersion = "10.12.1" } publishing { publications { maven(MavenPublication) { groupId project.group - artifactId project.archivesBaseName + artifactId project.base.archivesName.get() version project.version artifact jar diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..d64cd49 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 ffed3a2..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1aa94a4 100755 --- 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,99 @@ # ############################################################################## -## -## 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/HEAD/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_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"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # 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 +119,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,88 +130,120 @@ 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 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*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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, 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" +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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. +# + +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/gradlew.bat b/gradlew.bat index 107acd3..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,92 @@ -@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 +@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=. +@rem This is normally unused +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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/net/fabricmc/meta/FabricMeta.java b/src/main/java/net/fabricmc/meta/FabricMeta.java index 617adce..e439a69 100644 --- a/src/main/java/net/fabricmc/meta/FabricMeta.java +++ b/src/main/java/net/fabricmc/meta/FabricMeta.java @@ -79,12 +79,12 @@ public static void main(String[] args) { WebServer.start(); } - private static void update(){ + private static void update() { try { database = VersionDatabase.generate(); updateHeartbeat(); } catch (Throwable t) { - if (database == null){ + if (database == null) { throw new RuntimeException(t); } else { LOGGER.warn("update failed", t); diff --git a/src/main/java/net/fabricmc/meta/data/VersionDatabase.java b/src/main/java/net/fabricmc/meta/data/VersionDatabase.java index 264a77f..8982b3f 100644 --- a/src/main/java/net/fabricmc/meta/data/VersionDatabase.java +++ b/src/main/java/net/fabricmc/meta/data/VersionDatabase.java @@ -79,6 +79,7 @@ private void loadMcData() throws IOException { if (mappings == null || intermediary == null) { throw new RuntimeException("Mappings are null"); } + MinecraftLauncherMeta launcherMeta = MinecraftLauncherMeta.getAllMeta(); //Sorts in the order of minecraft release dates @@ -94,12 +95,15 @@ private void loadMcData() throws IOException { LOGGER.warn("Removing {} as it doesn't match a valid mc version", o.getVersion()); incorrectVersions.add(o.getVersion()); } + return true; } + return false; }); List minecraftVersions = new ArrayList<>(); + for (MavenVersion gameVersion : intermediary) { if (!minecraftVersions.contains(gameVersion.getVersion())) { minecraftVersions.add(gameVersion.getVersion()); diff --git a/src/main/java/net/fabricmc/meta/utils/LoaderMeta.java b/src/main/java/net/fabricmc/meta/utils/LoaderMeta.java index b1f28fd..2bb910d 100644 --- a/src/main/java/net/fabricmc/meta/utils/LoaderMeta.java +++ b/src/main/java/net/fabricmc/meta/utils/LoaderMeta.java @@ -31,14 +31,15 @@ public class LoaderMeta { public static final File BASE_DIR = new File("metadata"); - public static JsonObject getMeta(LoaderInfoBase loaderInfo){ + public static JsonObject getMeta(LoaderInfoBase loaderInfo) { String loaderMaven = loaderInfo.getLoader().getMaven(); String[] split = loaderMaven.split(":"); - String path = String.format("%s/%s/%s", split[0].replaceAll("\\.","/"), split[1], split[2]); + String path = String.format("%s/%s/%s", split[0].replaceAll("\\.", "/"), split[1], split[2]); String filename = String.format("%s-%s.json", split[1], split[2]); File launcherMetaFile = new File(BASE_DIR, path + "/" + filename); - if(!launcherMetaFile.exists()){ + + if (!launcherMetaFile.exists()) { try { String url = String.format("%s%s/%s", Reference.LOCAL_FABRIC_MAVEN_URL, path, filename); System.out.println("Downloading " + url); @@ -57,5 +58,4 @@ public static JsonObject getMeta(LoaderInfoBase loaderInfo){ return null; } } - } diff --git a/src/main/java/net/fabricmc/meta/utils/MinecraftLauncherMeta.java b/src/main/java/net/fabricmc/meta/utils/MinecraftLauncherMeta.java index 92c07a7..e8f2228 100644 --- a/src/main/java/net/fabricmc/meta/utils/MinecraftLauncherMeta.java +++ b/src/main/java/net/fabricmc/meta/utils/MinecraftLauncherMeta.java @@ -67,12 +67,13 @@ public boolean isStable(String id) { return versions.stream().anyMatch(version -> version.id.equals(id) && version.type.equals("release")); } - public int getIndex(String version){ + public int getIndex(String version) { for (int i = 0; i < versions.size(); i++) { - if(versions.get(i).id.equals(version)){ + if (versions.get(i).id.equals(version)) { return i; } } + return 0; } @@ -81,7 +82,6 @@ public List getVersions() { } public static class Version { - String id; String type; String url; @@ -108,5 +108,4 @@ public String getReleaseTime() { return releaseTime; } } - } diff --git a/src/main/java/net/fabricmc/meta/utils/PomParser.java b/src/main/java/net/fabricmc/meta/utils/PomParser.java index e6f3272..862ff27 100644 --- a/src/main/java/net/fabricmc/meta/utils/PomParser.java +++ b/src/main/java/net/fabricmc/meta/utils/PomParser.java @@ -36,7 +36,6 @@ import net.fabricmc.meta.web.models.BaseVersion; public class PomParser { - public String path; public String latestVersion = ""; @@ -81,7 +80,7 @@ public List getMeta(Function function, Str public List getMeta(Function function, String prefix, StableVersionIdentifier stableIdentifier) throws IOException, XMLStreamException { try { load(); - } catch (IOException e){ + } catch (IOException e) { throw new IOException("Failed to load " + path, e); } @@ -93,16 +92,16 @@ public List getMeta(Function function, Str Path unstableVersionsPath = Paths.get(prefix .replace(":", "_") .replace(".", "_") - .replaceFirst(".$","") + .replaceFirst(".$", "") + ".txt"); if (Files.exists(unstableVersionsPath)) { // Read a file containing a new line separated list of versions that should not be marked as stable. List unstableVersions = Files.readAllLines(unstableVersionsPath); list.stream() - .filter(v -> !unstableVersions.contains(v.getVersion())) - .findFirst() - .ifPresent(v -> v.setStable(true)); + .filter(v -> !unstableVersions.contains(v.getVersion())) + .findFirst() + .ifPresent(v -> v.setStable(true)); } else { stableIdentifier.process(list); } @@ -113,5 +112,4 @@ public List getMeta(Function function, Str public interface StableVersionIdentifier { void process(List versions); } - } diff --git a/src/main/java/net/fabricmc/meta/utils/YarnVersionParser.java b/src/main/java/net/fabricmc/meta/utils/YarnVersionParser.java index d9244f2..906a342 100644 --- a/src/main/java/net/fabricmc/meta/utils/YarnVersionParser.java +++ b/src/main/java/net/fabricmc/meta/utils/YarnVersionParser.java @@ -17,7 +17,6 @@ package net.fabricmc.meta.utils; public class YarnVersionParser { - private String mappingsVersion; private String minecraftVersion; @@ -49,4 +48,4 @@ public String getMinecraftVersion() { public String toString() { return version; } -} \ No newline at end of file +} diff --git a/src/main/java/net/fabricmc/meta/web/EndpointsV1.java b/src/main/java/net/fabricmc/meta/web/EndpointsV1.java index 6401ca7..c5e20cf 100644 --- a/src/main/java/net/fabricmc/meta/web/EndpointsV1.java +++ b/src/main/java/net/fabricmc/meta/web/EndpointsV1.java @@ -16,27 +16,26 @@ package net.fabricmc.meta.web; -import io.javalin.http.Context; -import net.fabricmc.meta.FabricMeta; -import net.fabricmc.meta.web.models.LoaderInfoV1; -import net.fabricmc.meta.web.models.MavenBuildGameVersion; -import net.fabricmc.meta.web.models.MavenBuildVersion; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; +import io.javalin.http.Context; + +import net.fabricmc.meta.FabricMeta; +import net.fabricmc.meta.web.models.LoaderInfoV1; +import net.fabricmc.meta.web.models.MavenBuildGameVersion; +import net.fabricmc.meta.web.models.MavenBuildVersion; + @SuppressWarnings("Duplicates") public class EndpointsV1 { - public static void setup() { - WebServer.jsonGet("/v1/versions", () -> FabricMeta.database); WebServer.jsonGet("/v1/versions/game", () -> FabricMeta.database.game); - WebServer.jsonGet("/v1/versions/game/:game_version", context -> filter(context, FabricMeta.database.game)); + WebServer.jsonGet("/v1/versions/game/:game_version", context -> filter(context, FabricMeta.database.game)); WebServer.jsonGet("/v1/versions/mappings", () -> FabricMeta.database.mappings); WebServer.jsonGet("/v1/versions/mappings/:game_version", context -> filter(context, FabricMeta.database.mappings)); @@ -44,21 +43,21 @@ public static void setup() { WebServer.jsonGet("/v1/versions/loader", () -> FabricMeta.database.getLoader()); WebServer.jsonGet("/v1/versions/loader/:game_version", EndpointsV1::getLoaderInfoAll); WebServer.jsonGet("/v1/versions/loader/:game_version/:loader_version", EndpointsV1::getLoaderInfo); - } private static > List filter(Context context, List versionList) { if (!context.pathParamMap().containsKey("game_version")) { return Collections.emptyList(); } - return versionList.stream().filter(t -> t.test(context.pathParam("game_version"))).collect(Collectors.toList()); + return versionList.stream().filter(t -> t.test(context.pathParam("game_version"))).collect(Collectors.toList()); } private static Object getLoaderInfo(Context context) { if (!context.pathParamMap().containsKey("game_version")) { return null; } + if (!context.pathParamMap().containsKey("loader_version")) { return null; } @@ -67,21 +66,23 @@ private static Object getLoaderInfo(Context context) { String loaderVersion = context.pathParam("loader_version"); MavenBuildVersion loader = FabricMeta.database.getAllLoader().stream() - .filter(mavenBuildVersion -> loaderVersion.equals(mavenBuildVersion.getVersion())) - .findFirst().orElse(null); + .filter(mavenBuildVersion -> loaderVersion.equals(mavenBuildVersion.getVersion())) + .findFirst().orElse(null); MavenBuildGameVersion mappings = FabricMeta.database.mappings.stream() - .filter(t -> t.test(gameVersion)) - .findFirst().orElse(null); + .filter(t -> t.test(gameVersion)) + .findFirst().orElse(null); if (loader == null) { context.status(400); return "no loader version found for " + gameVersion; } + if (mappings == null) { context.status(400); return "no mappings version found for " + gameVersion; } + return new LoaderInfoV1(loader, mappings).populateMeta(); } @@ -89,24 +90,23 @@ private static Object getLoaderInfoAll(Context context) { if (!context.pathParamMap().containsKey("game_version")) { return null; } + String gameVersion = context.pathParam("game_version"); MavenBuildGameVersion mappings = FabricMeta.database.mappings.stream() - .filter(t -> t.test(gameVersion)) - .findFirst().orElse(null); + .filter(t -> t.test(gameVersion)) + .findFirst().orElse(null); - if(mappings == null){ + if (mappings == null) { return Collections.emptyList(); } List infoList = new ArrayList<>(); - for(MavenBuildVersion loader : FabricMeta.database.getLoader()){ + for (MavenBuildVersion loader : FabricMeta.database.getLoader()) { infoList.add(new LoaderInfoV1(loader, mappings)); } + return infoList; } - - - } diff --git a/src/main/java/net/fabricmc/meta/web/EndpointsV2.java b/src/main/java/net/fabricmc/meta/web/EndpointsV2.java index 274c9dc..52e8f63 100644 --- a/src/main/java/net/fabricmc/meta/web/EndpointsV2.java +++ b/src/main/java/net/fabricmc/meta/web/EndpointsV2.java @@ -16,11 +16,6 @@ package net.fabricmc.meta.web; -import io.javalin.core.util.Header; -import io.javalin.http.Context; -import net.fabricmc.meta.FabricMeta; -import net.fabricmc.meta.web.models.*; - import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; @@ -31,11 +26,19 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.javalin.core.util.Header; +import io.javalin.http.Context; + +import net.fabricmc.meta.FabricMeta; +import net.fabricmc.meta.web.models.BaseVersion; +import net.fabricmc.meta.web.models.LoaderInfoV2; +import net.fabricmc.meta.web.models.MavenBuildGameVersion; +import net.fabricmc.meta.web.models.MavenBuildVersion; +import net.fabricmc.meta.web.models.MavenVersion; + @SuppressWarnings("Duplicates") public class EndpointsV2 { - public static void setup() { - WebServer.jsonGet("/v2/versions", () -> FabricMeta.database); WebServer.jsonGet("/v2/versions/game", () -> FabricMeta.database.game); @@ -59,9 +62,10 @@ public static void setup() { } private static List withLimitSkip(Context context, List list) { - if(list == null){ + if (list == null) { return Collections.emptyList(); } + int limit = context.queryParam("limit", Integer.class, "0").check(i -> i >= 0).get(); int skip = context.queryParam("skip", Integer.class, "0").check(i -> i >= 0).get(); @@ -78,14 +82,15 @@ private static > List filter(Context context, Lis if (!context.pathParamMap().containsKey("game_version")) { return Collections.emptyList(); } - return versionList.stream().filter(t -> t.test(context.pathParam("game_version"))).collect(Collectors.toList()); + return versionList.stream().filter(t -> t.test(context.pathParam("game_version"))).collect(Collectors.toList()); } private static Object getLoaderInfo(Context context) { if (!context.pathParamMap().containsKey("game_version")) { return null; } + if (!context.pathParamMap().containsKey("loader_version")) { return null; } @@ -94,21 +99,23 @@ private static Object getLoaderInfo(Context context) { String loaderVersion = context.pathParam("loader_version"); MavenBuildVersion loader = FabricMeta.database.getAllLoader().stream() - .filter(mavenBuildVersion -> loaderVersion.equals(mavenBuildVersion.getVersion())) - .findFirst().orElse(null); + .filter(mavenBuildVersion -> loaderVersion.equals(mavenBuildVersion.getVersion())) + .findFirst().orElse(null); MavenVersion mappings = FabricMeta.database.intermediary.stream() - .filter(t -> t.test(gameVersion)) - .findFirst().orElse(null); + .filter(t -> t.test(gameVersion)) + .findFirst().orElse(null); if (loader == null) { context.status(400); return "no loader version found for " + gameVersion; } + if (mappings == null) { context.status(400); return "no mappings version found for " + gameVersion; } + return new LoaderInfoV2(loader, mappings).populateMeta(); } @@ -116,30 +123,32 @@ private static List getLoaderInfoAll(Context context) { if (!context.pathParamMap().containsKey("game_version")) { return null; } + String gameVersion = context.pathParam("game_version"); MavenVersion mappings = FabricMeta.database.intermediary.stream() - .filter(t -> t.test(gameVersion)) - .findFirst().orElse(null); + .filter(t -> t.test(gameVersion)) + .findFirst().orElse(null); - if(mappings == null){ + if (mappings == null) { return Collections.emptyList(); } List infoList = new ArrayList<>(); - for(MavenBuildVersion loader : FabricMeta.database.getLoader()){ + for (MavenBuildVersion loader : FabricMeta.database.getLoader()) { infoList.add(new LoaderInfoV2(loader, mappings).populateMeta()); } + return infoList; } - private static List compatibleGameVersions(List list, Function gameVersionSupplier, Function baseVersionSupplier){ + private static List compatibleGameVersions(List list, Function gameVersionSupplier, Function baseVersionSupplier) { List versions = new ArrayList<>(); Predicate contains = s -> versions.stream().anyMatch(baseVersion -> baseVersion.getVersion().equals(s)); - for(T entry : list){ - if (!contains.test(gameVersionSupplier.apply(entry))){ + for (T entry : list) { + if (!contains.test(gameVersionSupplier.apply(entry))) { versions.add(baseVersionSupplier.apply(entry)); } } diff --git a/src/main/java/net/fabricmc/meta/web/ProfileHandler.java b/src/main/java/net/fabricmc/meta/web/ProfileHandler.java index 6489fb6..8cc3ced 100644 --- a/src/main/java/net/fabricmc/meta/web/ProfileHandler.java +++ b/src/main/java/net/fabricmc/meta/web/ProfileHandler.java @@ -39,7 +39,6 @@ import net.fabricmc.meta.web.models.LoaderInfoV2; public class ProfileHandler { - private static final Executor EXECUTOR = Executors.newFixedThreadPool(2); private static final DateFormat ISO_8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"); @@ -75,13 +74,13 @@ private static CompletableFuture profileZip(LoaderInfoV2 info) { .thenApply(inputStream -> packageZip(info, inputStream)); } - private static InputStream packageZip(LoaderInfoV2 info, InputStream profileJson) { + private static InputStream packageZip(LoaderInfoV2 info, InputStream profileJson) { String profileName = String.format("fabric-loader-%s-%s", info.getLoader().getVersion(), info.getIntermediary().getVersion()); try { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - try (ZipOutputStream zipStream = new ZipOutputStream(byteArrayOutputStream)) { + try (ZipOutputStream zipStream = new ZipOutputStream(byteArrayOutputStream)) { //Write the profile json zipStream.putNextEntry(new ZipEntry(profileName + "/" + profileName + ".json")); IOUtils.copy(profileJson, zipStream); diff --git a/src/main/java/net/fabricmc/meta/web/ServerBootstrap.java b/src/main/java/net/fabricmc/meta/web/ServerBootstrap.java index ae22c78..00f213b 100644 --- a/src/main/java/net/fabricmc/meta/web/ServerBootstrap.java +++ b/src/main/java/net/fabricmc/meta/web/ServerBootstrap.java @@ -193,6 +193,7 @@ private static int getCacheDuration(Context ctx) { if (ctx.pathParamMap().containsValue("stable")) { return 120; } + return 86400; } } diff --git a/src/main/java/net/fabricmc/meta/web/WebServer.java b/src/main/java/net/fabricmc/meta/web/WebServer.java index cd2a875..97c9657 100644 --- a/src/main/java/net/fabricmc/meta/web/WebServer.java +++ b/src/main/java/net/fabricmc/meta/web/WebServer.java @@ -16,6 +16,9 @@ package net.fabricmc.meta.web; +import java.util.function.Function; +import java.util.function.Supplier; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; import io.javalin.Javalin; @@ -23,11 +26,7 @@ import io.javalin.core.util.RouteOverviewPlugin; import io.javalin.http.Context; -import java.util.function.Function; -import java.util.function.Supplier; - public class WebServer { - public static Javalin javalin; public static Gson GSON = new GsonBuilder().setPrettyPrinting().create(); @@ -61,8 +60,8 @@ private static void handleJson(Context ctx, Object object) { object = new Object(); ctx.status(400); } + String response = GSON.toJson(object); ctx.contentType("application/json").header(Header.CACHE_CONTROL, "public, max-age=60").result(response); } - } diff --git a/src/main/java/net/fabricmc/meta/web/models/BaseVersion.java b/src/main/java/net/fabricmc/meta/web/models/BaseVersion.java index 67ebddd..fd2dd39 100644 --- a/src/main/java/net/fabricmc/meta/web/models/BaseVersion.java +++ b/src/main/java/net/fabricmc/meta/web/models/BaseVersion.java @@ -19,7 +19,6 @@ import java.util.function.Predicate; public class BaseVersion implements Predicate { - String version; boolean stable = false; diff --git a/src/main/java/net/fabricmc/meta/web/models/LoaderInfoBase.java b/src/main/java/net/fabricmc/meta/web/models/LoaderInfoBase.java index ac45f55..41f6a23 100644 --- a/src/main/java/net/fabricmc/meta/web/models/LoaderInfoBase.java +++ b/src/main/java/net/fabricmc/meta/web/models/LoaderInfoBase.java @@ -17,6 +17,5 @@ package net.fabricmc.meta.web.models; public interface LoaderInfoBase { - MavenBuildVersion getLoader(); } diff --git a/src/main/java/net/fabricmc/meta/web/models/LoaderInfoV1.java b/src/main/java/net/fabricmc/meta/web/models/LoaderInfoV1.java index 55e36f7..5523c7a 100644 --- a/src/main/java/net/fabricmc/meta/web/models/LoaderInfoV1.java +++ b/src/main/java/net/fabricmc/meta/web/models/LoaderInfoV1.java @@ -17,11 +17,11 @@ package net.fabricmc.meta.web.models; import com.google.gson.JsonObject; -import net.fabricmc.meta.utils.LoaderMeta; import org.jetbrains.annotations.Nullable; -public class LoaderInfoV1 implements LoaderInfoBase { +import net.fabricmc.meta.utils.LoaderMeta; +public class LoaderInfoV1 implements LoaderInfoBase { MavenBuildVersion loader; MavenBuildGameVersion mappings; @@ -42,4 +42,4 @@ public LoaderInfoV1 populateMeta() { public MavenBuildVersion getLoader() { return loader; } -} \ No newline at end of file +} diff --git a/src/main/java/net/fabricmc/meta/web/models/LoaderInfoV2.java b/src/main/java/net/fabricmc/meta/web/models/LoaderInfoV2.java index 836197e..0547f43 100644 --- a/src/main/java/net/fabricmc/meta/web/models/LoaderInfoV2.java +++ b/src/main/java/net/fabricmc/meta/web/models/LoaderInfoV2.java @@ -17,11 +17,11 @@ package net.fabricmc.meta.web.models; import com.google.gson.JsonObject; -import net.fabricmc.meta.utils.LoaderMeta; import org.jetbrains.annotations.Nullable; -public class LoaderInfoV2 implements LoaderInfoBase { +import net.fabricmc.meta.utils.LoaderMeta; +public class LoaderInfoV2 implements LoaderInfoBase { MavenBuildVersion loader; MavenVersion intermediary; @@ -51,4 +51,4 @@ public MavenVersion getIntermediary() { public JsonObject getLauncherMeta() { return launcherMeta; } -} \ No newline at end of file +} diff --git a/src/main/java/net/fabricmc/meta/web/models/MavenBuildGameVersion.java b/src/main/java/net/fabricmc/meta/web/models/MavenBuildGameVersion.java index 1f9f4e2..dd13358 100644 --- a/src/main/java/net/fabricmc/meta/web/models/MavenBuildGameVersion.java +++ b/src/main/java/net/fabricmc/meta/web/models/MavenBuildGameVersion.java @@ -19,13 +19,11 @@ import net.fabricmc.meta.utils.YarnVersionParser; public class MavenBuildGameVersion extends MavenBuildVersion { - String gameVersion; public MavenBuildGameVersion(String maven) { super(maven); gameVersion = new YarnVersionParser(maven.split(":")[2]).getMinecraftVersion(); - } public String getGameVersion() { diff --git a/src/main/java/net/fabricmc/meta/web/models/MavenBuildVersion.java b/src/main/java/net/fabricmc/meta/web/models/MavenBuildVersion.java index a223ed0..104a299 100644 --- a/src/main/java/net/fabricmc/meta/web/models/MavenBuildVersion.java +++ b/src/main/java/net/fabricmc/meta/web/models/MavenBuildVersion.java @@ -17,7 +17,6 @@ package net.fabricmc.meta.web.models; public class MavenBuildVersion extends MavenVersion { - String separator; int build; @@ -30,8 +29,8 @@ public MavenBuildVersion(String maven) { } else { separator = "."; } - build = Integer.parseInt(version.substring(version.lastIndexOf(".") + 1)); + build = Integer.parseInt(version.substring(version.lastIndexOf(".") + 1)); } public String getSeparator() { diff --git a/src/main/java/net/fabricmc/meta/web/models/MavenVersion.java b/src/main/java/net/fabricmc/meta/web/models/MavenVersion.java index bb1309f..162ea30 100644 --- a/src/main/java/net/fabricmc/meta/web/models/MavenVersion.java +++ b/src/main/java/net/fabricmc/meta/web/models/MavenVersion.java @@ -17,7 +17,6 @@ package net.fabricmc.meta.web.models; public class MavenVersion extends BaseVersion { - String maven; public MavenVersion(String maven, boolean stable) {