diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..41d9927 100755 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 5c51a4a..48c0a02 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 83f2acf..1b6c787 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,78 +17,113 @@ # ############################################################################## -## -## 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/master/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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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" +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 + # 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" + 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 @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -105,84 +140,95 @@ 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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=$((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; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. -# 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" +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" -# 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 +# 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 24467a1..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ 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" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ 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% +"%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 diff --git a/src/main/kotlin/com/replaymod/gradle/preprocess/MappingUtils.kt b/src/main/kotlin/com/replaymod/gradle/preprocess/MappingUtils.kt index e01010c..c0c06e8 100644 --- a/src/main/kotlin/com/replaymod/gradle/preprocess/MappingUtils.kt +++ b/src/main/kotlin/com/replaymod/gradle/preprocess/MappingUtils.kt @@ -8,7 +8,7 @@ import java.io.File fun File.readMappings(): MappingSet { val ext = name.substring(name.lastIndexOf(".") + 1) val format = MappingFormats.REGISTRY.values().find { it.standardFileExtension.orElse(null) == ext } - ?: throw UnsupportedOperationException("Cannot find mapping format for $this") + ?: throw UnsupportedOperationException("Cannot find mapping format for $this") return format.read(toPath()) } @@ -153,16 +153,16 @@ fun InnerClassMapping.join(b: InnerClassMapping, into: ClassMapping<*, *>) { // Like FieldMapping.merge but not horribly slow in newer lorenz versions fun FieldMapping.join(with: FieldMapping, parent: ClassMapping<*, *>): FieldMapping = - parent.createFieldMapping(signature) - .setDeobfuscatedName(with.deobfuscatedName) + parent.createFieldMapping(signature) + .setDeobfuscatedName(with.deobfuscatedName) // Like FieldMapping.merge but not horribly slow in newer lorenz versions fun MethodMapping.join(with: MethodMapping, parent: ClassMapping<*, *>): MethodMapping = - parent.createMethodMapping(signature) - .setDeobfuscatedName(with.deobfuscatedName) - .also { merged -> - parameterMappings.forEach { paramA -> - val paramB = with.getOrCreateParameterMapping(paramA.index) - paramA.merge(paramB, merged) - } - } + parent.createMethodMapping(signature) + .setDeobfuscatedName(with.deobfuscatedName) + .also { merged -> + parameterMappings.forEach { paramA -> + val paramB = with.getOrCreateParameterMapping(paramA.index) + paramA.merge(paramB, merged) + } + } diff --git a/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessExtension.kt b/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessExtension.kt index fca1424..5267886 100644 --- a/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessExtension.kt +++ b/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessExtension.kt @@ -5,17 +5,21 @@ import org.gradle.kotlin.dsl.mapProperty import org.gradle.kotlin.dsl.property open class PreprocessExtension(objects: ObjectFactory, val mcVersion: Int) { - val vars = objects.mapProperty().convention(mutableMapOf( + val vars = objects.mapProperty().convention( + mutableMapOf( "MC" to mcVersion - )) - val keywords = objects.mapProperty().convention(mutableMapOf( + ) + ) + val keywords = objects.mapProperty().convention( + mutableMapOf( ".java" to PreprocessTask.DEFAULT_KEYWORDS, ".kt" to PreprocessTask.DEFAULT_KEYWORDS, ".gradle" to PreprocessTask.DEFAULT_KEYWORDS, ".json" to PreprocessTask.DEFAULT_KEYWORDS, ".mcmeta" to PreprocessTask.DEFAULT_KEYWORDS, ".cfg" to PreprocessTask.CFG_KEYWORDS - )) + ) + ) val patternAnnotation = objects.property() val manageImports = objects.property() } \ No newline at end of file diff --git a/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessPlugin.kt b/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessPlugin.kt index a53c4de..85e6f12 100644 --- a/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessPlugin.kt +++ b/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessPlugin.kt @@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream import java.io.File import java.nio.charset.StandardCharsets import java.nio.file.Path +import java.util.Locale import java.util.stream.Collectors class PreprocessPlugin : Plugin { @@ -49,10 +50,12 @@ class PreprocessPlugin : Plugin { java.setSrcDirs(listOf(parent.file("src/$name/java"))) resources.setSrcDirs(listOf(parent.file("src/$name/resources"))) if (kotlin) { - withGroovyBuilder { getProperty("kotlin") as SourceDirectorySet }.setSrcDirs(listOf( + withGroovyBuilder { getProperty("kotlin") as SourceDirectorySet }.setSrcDirs( + listOf( parent.file("src/$name/kotlin"), parent.file("src/$name/java") - )) + ) + ) } } } else { @@ -64,11 +67,11 @@ class PreprocessPlugin : Plugin { project.the().configureEach { val inheritedSourceSet = inherited.the()[name] - val cName = if (name == "main") "" else name.capitalize() + val cName = if (name == "main") "" else name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } val overwritesKotlin = project.file("src/$name/kotlin").also { it.mkdirs() } val overwritesJava = project.file("src/$name/java").also { it.mkdirs() } val overwriteResources = project.file("src/$name/resources").also { it.mkdirs() } - val preprocessedRoot = project.buildDir.resolve("preprocessed/$name") + val preprocessedRoot = project.layout.buildDirectory.asFile.get().resolve("preprocessed/$name") val generatedKotlin = preprocessedRoot.resolve("kotlin") val generatedJava = preprocessedRoot.resolve("java") val generatedResources = preprocessedRoot.resolve("resources") @@ -100,21 +103,22 @@ class PreprocessPlugin : Plugin { patternAnnotation.convention(ext.patternAnnotation) manageImports.convention(ext.manageImports) } - val sourceJavaTask = project.tasks.findByName("source${name.capitalize()}Java") + val sourceJavaTask = project.tasks.findByName("source${name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}Java") (sourceJavaTask ?: project.tasks["compile${cName}Java"]).dependsOn(preprocessCode) java.setSrcDirs(listOf(overwritesJava, preprocessCode.map { generatedJava })) if (kotlin) { - val kotlinConsumerTask = project.tasks.findByName("source${name.capitalize()}Kotlin") - ?: project.tasks["compile${cName}Kotlin"] + val kotlinConsumerTask = project.tasks.findByName("source${name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}Kotlin") + ?: project.tasks["compile${cName}Kotlin"] kotlinConsumerTask.dependsOn(preprocessCode) withGroovyBuilder { getProperty("kotlin") as SourceDirectorySet }.setSrcDirs( - listOf( - overwritesKotlin, - preprocessCode.map { generatedKotlin }, - overwritesJava, - preprocessCode.map { generatedJava }, - )) + listOf( + overwritesKotlin, + preprocessCode.map { generatedKotlin }, + overwritesJava, + preprocessCode.map { generatedJava }, + ) + ) } val preprocessResources = project.tasks.register("preprocess${cName}Resources") { @@ -141,16 +145,18 @@ class PreprocessPlugin : Plugin { val inheritedIntermediaryMappings = inherited.intermediaryMappings val projectNotchMappings = project.notchMappings val inheritedNotchMappings = inherited.notchMappings - val sourceSrg = project.buildDir.resolve(prepareTaskName).resolve("source.srg") - val destinationSrg = project.buildDir.resolve(prepareTaskName).resolve("destination.srg") + val sourceSrg = project.layout.buildDirectory.asFile.get().resolve(prepareTaskName).resolve("source.srg") + val destinationSrg = project.layout.buildDirectory.asFile.get().resolve(prepareTaskName).resolve("destination.srg") val (prepareSourceTask, prepareDestTask) = if (inheritedIntermediaryMappings != null && projectIntermediaryMappings != null - && inheritedIntermediaryMappings.type == projectIntermediaryMappings.type) { + && inheritedIntermediaryMappings.type == projectIntermediaryMappings.type + ) { Pair( bakeNamedToIntermediaryMappings(prepareSourceTaskName, inheritedIntermediaryMappings, sourceSrg), bakeNamedToIntermediaryMappings(prepareDestTaskName, projectIntermediaryMappings, destinationSrg), ) } else if (inheritedNotchMappings != null && projectNotchMappings != null - && inheritedNode.mcVersion == projectNode.mcVersion) { + && inheritedNode.mcVersion == projectNode.mcVersion + ) { Pair( bakeNamedToOfficialMappings(prepareSourceTaskName, inheritedNotchMappings, inheritedIntermediaryMappings, sourceSrg), bakeNamedToOfficialMappings(prepareDestTaskName, projectNotchMappings, projectIntermediaryMappings, destinationSrg), @@ -170,11 +176,11 @@ class PreprocessPlugin : Plugin { outputs.upToDateWhen { false } from(project.file("src")) - from(File(project.buildDir, "preprocessed")) + from(File(project.layout.buildDirectory.asFile.get(), "preprocessed")) into(File(parent.projectDir, "src")) project.the().all { - val cName = if (name == "main") "" else name.capitalize() + val cName = if (name == "main") "" else name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } dependsOn(project.tasks.named("preprocess${cName}Code")) dependsOn(project.tasks.named("preprocess${cName}Resources")) @@ -191,18 +197,18 @@ class PreprocessPlugin : Plugin { fun preserveOverwrites(project: Project, toBePreserved: List?) { val overwrites = project.file("src").toPath() val overwritten = overwrites.toFile() - .walk() - .filter { it.isFile } - .map { overwrites.relativize(it.toPath()) } - .toList() + .walk() + .filter { it.isFile } + .map { overwrites.relativize(it.toPath()) } + .toList() // For the soon-to-be-core project, we must not yet delete the overwrites // as they have yet to be copied into the main sources. if (toBePreserved != null) { val source = if (project.name == coreProject) { - project.parent!!.file( "src").toPath() + project.parent!!.file("src").toPath() } else { - project.buildDir.toPath().resolve("preprocessed") + project.layout.buildDirectory.asFile.get().toPath().resolve("preprocessed") } project.delete(overwrites) toBePreserved.forEach { name -> @@ -248,6 +254,7 @@ internal class MappingsFile( @PathSensitive(PathSensitivity.NONE) val file: File, ) + private fun Mappings.toFile() = MappingsFile(type, format, file) @CacheableTask diff --git a/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessTask.kt b/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessTask.kt index a3ee307..25d6d90 100644 --- a/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessTask.kt +++ b/src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessTask.kt @@ -7,8 +7,11 @@ import org.cadixdev.lorenz.MappingSet import org.cadixdev.lorenz.io.MappingFormats import org.gradle.api.DefaultTask import org.gradle.api.GradleException -import org.gradle.api.file.ConfigurableFileTree import org.gradle.api.file.FileCollection +import org.gradle.api.file.FileSystemOperations +import org.gradle.api.file.FileTree +import org.gradle.api.file.ProjectLayout +import org.gradle.api.model.ObjectFactory import org.gradle.api.tasks.* import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.kotlin.dsl.mapProperty @@ -22,42 +25,48 @@ import java.io.Serializable import java.nio.file.Files import java.nio.file.Path import java.util.regex.Pattern +import javax.inject.Inject data class Keywords( - val disableRemap: String, - val enableRemap: String, - val `if`: String, - val ifdef: String, - val elseif: String, - val `else`: String, - val endif: String, - val eval: String + val disableRemap: String, + val enableRemap: String, + val `if`: String, + val ifdef: String, + val elseif: String, + val `else`: String, + val endif: String, + val eval: String ) : Serializable @CacheableTask -open class PreprocessTask : DefaultTask() { +open class PreprocessTask @Inject constructor( + private val layout: ProjectLayout, + private val fsops: FileSystemOperations, + objects: ObjectFactory +) : DefaultTask() { companion object { @JvmStatic val DEFAULT_KEYWORDS = Keywords( - disableRemap = "//#disable-remap", - enableRemap = "//#enable-remap", - `if` = "//#if", - ifdef = "//#ifdef", - elseif = "//#elseif", - `else` = "//#else", - endif = "//#endif", - eval = "//$$" + disableRemap = "//#disable-remap", + enableRemap = "//#enable-remap", + `if` = "//#if", + ifdef = "//#ifdef", + elseif = "//#elseif", + `else` = "//#else", + endif = "//#endif", + eval = "//$$" ) + @JvmStatic val CFG_KEYWORDS = Keywords( - disableRemap = "##disable-remap", - enableRemap = "##enable-remap", - `if` = "##if", - ifdef = "##ifdef", - elseif = "##elseif", - `else` = "##else", - endif = "##endif", - eval = "#$$" + disableRemap = "##disable-remap", + enableRemap = "##enable-remap", + `if` = "##if", + ifdef = "##ifdef", + elseif = "##elseif", + `else` = "##else", + endif = "##endif", + eval = "#$$" ) private val LOGGER = LoggerFactory.getLogger(PreprocessTask::class.java) @@ -75,15 +84,15 @@ open class PreprocessTask : DefaultTask() { @InputFiles @SkipWhenEmpty @PathSensitive(PathSensitivity.RELATIVE) - fun getSourceFileTrees(): List { - return entries.flatMap { it.source }.map { project.fileTree(it) } + fun getSourceFileTrees(): List { + return entries.flatMap { it.source }.map { layout.files(it).asFileTree } } @InputFiles @Optional @PathSensitive(PathSensitivity.RELATIVE) - fun getOverwritesFileTrees(): List { - return entries.mapNotNull { it.overwrites?.let(project::fileTree) } + fun getOverwritesFileTrees(): List { + return entries.mapNotNull { it.overwrites?.let { layout.files(it).asFileTree } } } @OutputDirectories @@ -93,7 +102,7 @@ open class PreprocessTask : DefaultTask() { private fun updateFirstInOut(update: InOut.() -> InOut) { val first = entries.removeFirstOrNull() - ?: InOut(project.files(), File("invalid"), null) + ?: InOut(layout.files(), File("invalid"), null) first.update() entries.add(0, first) } @@ -108,7 +117,7 @@ open class PreprocessTask : DefaultTask() { @get:Internal var source: FileCollection? get() = entries.firstOrNull()?.source - set(value) = updateFirstInOut { copy(source = value ?: project.files()) } + set(value) = updateFirstInOut { copy(source = value ?: layout.files()) } @Deprecated("Instead add an entry to `entries`.") @get:Internal @@ -137,12 +146,12 @@ open class PreprocessTask : DefaultTask() { @InputDirectory @Optional @PathSensitive(PathSensitivity.RELATIVE) - val jdkHome = project.objects.directoryProperty() + val jdkHome = objects.directoryProperty() @InputDirectory @Optional @PathSensitive(PathSensitivity.RELATIVE) - val remappedjdkHome = project.objects.directoryProperty() + val remappedjdkHome = objects.directoryProperty() @InputFiles @Optional @@ -155,53 +164,60 @@ open class PreprocessTask : DefaultTask() { var remappedClasspath: FileCollection? = null @Input - val vars = project.objects.mapProperty() + val vars = objects.mapProperty() @Input - val keywords = project.objects.mapProperty() + val keywords = objects.mapProperty() @Input @Optional - val patternAnnotation = project.objects.property() + val patternAnnotation = objects.property() @Input @Optional - val manageImports = project.objects.property() + val manageImports = objects.property() - @Deprecated("Instead add an entry to `entries`.", - replaceWith = ReplaceWith(expression = "entry(project.file(file), generated, overwrites)")) + @Deprecated( + "Instead add an entry to `entries`.", + replaceWith = ReplaceWith(expression = "entry(project.file(file), generated, overwrites)") + ) fun source(file: Any) { @Suppress("DEPRECATION") - source = project.files(file) + source = layout.files(file) } - @Deprecated("Instead add an entry to `entries`.", - replaceWith = ReplaceWith(expression = "entry(source, project.file(file), overwrites)")) + @Deprecated( + "Instead add an entry to `entries`.", + replaceWith = ReplaceWith(expression = "entry(source, project.file(file), overwrites)") + ) fun generated(file: Any) { @Suppress("DEPRECATION") - generated = project.file(file) + generated = layout.files(file).singleFile } fun entry(source: FileCollection, generated: File, overwrites: File) { entries.add(InOut(source, generated, overwrites)) } - @Deprecated("Unnecessarily depends on the task output. Instead set `classpath` directly.", - replaceWith = ReplaceWith(expression = "classpath = task.classpath")) + @Deprecated( + "Unnecessarily depends on the task output. Instead set `classpath` directly.", + replaceWith = ReplaceWith(expression = "classpath = task.classpath") + ) fun compileTask(task: AbstractCompile) { dependsOn(task) - classpath = (classpath ?: project.files()) + task.classpath + project.files(task.destinationDir) + classpath = (classpath ?: layout.files()) + task.classpath + layout.files(task.destinationDirectory) } @TaskAction fun preprocess() { data class Entry(val relPath: String, val inBase: Path, val outBase: Path, val overwritesBase: Path?) + val sourceFiles: List = entries.flatMap { inOut -> val outBasePath = inOut.generated.toPath() val overwritesBasePath = inOut.overwrites?.toPath() inOut.source.flatMap { inBase -> val inBasePath = inBase.toPath() - project.fileTree(inBase).map { file -> + layout.files(inBase).asFileTree.map { file -> val relPath = inBasePath.relativize(file.toPath()) Entry(relPath.toString(), inBasePath, outBasePath, overwritesBasePath) } @@ -220,10 +236,11 @@ open class PreprocessTask : DefaultTask() { val srcMap = sourceMappings!!.readMappings() val dstMap = destinationMappings!!.readMappings() legacyMap.mergeBoth( - // The inner clsMap is to make the join work, the outer one for custom classes (which are not part of - // dstMap and would otherwise be filtered by the join) - srcMap.mergeBoth(clsMap).join(dstMap.reverse()).mergeBoth(clsMap), - MappingSet.create(LegacyMappingSetModelFactory())) + // The inner clsMap is to make the join work, the outer one for custom classes (which are not part of + // dstMap and would otherwise be filtered by the join) + srcMap.mergeBoth(clsMap).join(dstMap.reverse()).mergeBoth(clsMap), + MappingSet.create(LegacyMappingSetModelFactory()) + ) } else { LegacyMapping.readMappingSet(mapping.toPath(), reverseMapping) } @@ -232,7 +249,8 @@ open class PreprocessTask : DefaultTask() { val dstMap = destinationMappings!!.readMappings() srcMap.join(dstMap.reverse()) } - MappingFormats.SRG.write(mappings, project.buildDir.resolve(name).resolve("mapping.srg").toPath().also { + + MappingFormats.SRG.write(mappings, layout.buildDirectory.asFile.get().resolve(name).resolve("mapping.srg").toPath().also { Files.createDirectories(it.parent) }) val javaTransformer = Transformer(mappings) @@ -245,7 +263,7 @@ open class PreprocessTask : DefaultTask() { if (it.exists()) { it.absolutePath.also(LOGGER::debug) } else { - LOGGER.debug("$it (file does not exist)") + LOGGER.debug("{} (file does not exist)", it) null } }.toTypedArray() @@ -254,7 +272,7 @@ open class PreprocessTask : DefaultTask() { if (it.exists()) { it.absolutePath.also(LOGGER::debug) } else { - LOGGER.debug("$it (file does not exist)") + LOGGER.debug("{} (file does not exist)", it) null } }?.toTypedArray() @@ -268,17 +286,17 @@ open class PreprocessTask : DefaultTask() { val kws = keywords.get().entries.find { (ext, _) -> relPath.endsWith(ext) } if (kws != null) { processedSources[relPath] = CommentPreprocessor(vars.get()).convertSource( - kws.value, - lines, - lines.map { Pair(it, emptyList()) }, - relPath + kws.value, + lines, + lines.map { Pair(it, emptyList()) }, + relPath ).joinToString("\n") } } } val overwritesFiles = entries .mapNotNull { it.overwrites } - .flatMap { base -> project.fileTree(base).map { Pair(base.toPath(), it) } } + .flatMap { base -> layout.files(base).asFileTree.map { Pair(base.toPath(), it) } } overwritesFiles.forEach { (base, file) -> if (file.name.endsWith(".java") || file.name.endsWith(".kt")) { val relPath = base.relativize(file.toPath()) @@ -288,7 +306,9 @@ open class PreprocessTask : DefaultTask() { mappedSources = javaTransformer.remap(sources, processedSources) } - project.delete(entries.map { it.generated }) + fsops.delete { + delete(entries.map { it.generated }) + } val commentPreprocessor = CommentPreprocessor(vars.get()) sourceFiles.forEach { (relPath, inBase, outBase, overwritesPath) -> @@ -310,7 +330,7 @@ open class PreprocessTask : DefaultTask() { } commentPreprocessor.convertFile(kws.value, file, outFile, javaTransform) } else { - project.copy { + fsops.copy { from(file) into(outFile.parentFile) } diff --git a/src/main/kotlin/com/replaymod/gradle/preprocess/RootPreprocessExtension.kt b/src/main/kotlin/com/replaymod/gradle/preprocess/RootPreprocessExtension.kt index 8afb47c..f3ede34 100644 --- a/src/main/kotlin/com/replaymod/gradle/preprocess/RootPreprocessExtension.kt +++ b/src/main/kotlin/com/replaymod/gradle/preprocess/RootPreprocessExtension.kt @@ -56,13 +56,13 @@ interface ProjectGraphNodeDSL { } open class ProjectGraphNode( - val project: String, - val mcVersion: Int, - val mappings: String, - val links: MutableList>> = mutableListOf() + val project: String, + val mcVersion: Int, + val mappings: String, + val links: MutableList>> = mutableListOf() ) : ProjectGraphNodeDSL { override fun addNode(project: String, mcVersion: Int, mappings: String, extraMappings: File?, invertMappings: Boolean): ProjectGraphNodeDSL = - ProjectGraphNode(project, mcVersion, mappings).also { links.add(Pair(it, Pair(extraMappings, invertMappings))) } + ProjectGraphNode(project, mcVersion, mappings).also { links.add(Pair(it, Pair(extraMappings, invertMappings))) } fun findNode(project: String): ProjectGraphNode? = if (project == this.project) { this