Update dependencies (#3093)

This commit is contained in:
modmuss50 2022-04-15 23:17:53 +01:00 committed by GitHub
parent a664192233
commit 7a9cbb55b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 289 additions and 234 deletions

2
.gitattributes vendored
View File

@ -1 +1 @@
*.mapping text eol=lf
* text eol=lf

View File

@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew build javadocJar checkMappings --stacktrace
- run: ./gradlew build javadocJar checkMappings --stacktrace --warning-mode fail
- name: Build artifacts
if: ${{ matrix.java == '18-jdk' }}
continue-on-error: true

5
HEADER
View File

@ -1 +1,4 @@
This file is free for everyone to use under the Creative Commons Zero license.
/*
* This file is free for everyone to use under the Creative Commons Zero license.
*/

View File

@ -10,9 +10,9 @@ buildscript {
dependencies {
classpath "cuchaz:enigma-cli:${project.enigma_version}"
classpath "net.fabricmc:stitch:${project.stitch_version}"
classpath "commons-io:commons-io:2.8.0"
classpath 'de.undercouch:gradle-download-task:4.1.1'
classpath 'net.fabricmc:tiny-remapper:0.7.0'
classpath "commons-io:commons-io:2.11.0"
classpath "de.undercouch:gradle-download-task:4.1.1"
classpath "net.fabricmc:tiny-remapper:${project.tiny_remapper_version}"
classpath "net.fabricmc.unpick:unpick:${project.unpick_version}"
classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}"
classpath "net.fabricmc:name-proposal:${project.name_proposal_version}"
@ -21,9 +21,9 @@ buildscript {
plugins {
id 'java' // for constants, packages, javadoc
id 'de.undercouch.download' version '4.1.1'
id 'de.undercouch.download' version '4.1.2'
id 'maven-publish'
id 'org.cadixdev.licenser' version '0.6.1'
id "com.diffplug.spotless" version "6.4.2"
id 'net.fabricmc.filament' version '0.3.0'
}
@ -82,10 +82,10 @@ dependencies {
mappingPoetJar "net.fabricmc:mappingpoet:${project.mappingpoet_version}"
unpick "net.fabricmc.unpick:unpick-cli:${project.unpick_version}"
// Update asm to allow running on JDK 18
unpick "org.ow2.asm:asm:9.2"
unpick "org.ow2.asm:asm-tree:9.2"
unpick "org.ow2.asm:asm-commons:9.2"
unpick "org.ow2.asm:asm-util:9.2"
unpick "org.ow2.asm:asm:${project.asm_version}"
unpick "org.ow2.asm:asm-tree:${project.asm_version}"
unpick "org.ow2.asm:asm-commons:${project.asm_version}"
unpick "org.ow2.asm:asm-util:${project.asm_version}"
}
def setupGroup = "jar setup"
@ -700,9 +700,10 @@ sourceSets {
packageDocs // package info files
}
license {
header file("HEADER")
include '**/*.java'
spotless {
java {
licenseHeaderFile(rootProject.file("HEADER"))
}
}
task constantsJar(type: Jar) {

View File

@ -1,13 +1,15 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
enigma_version=2.0.0
enigma_version=2.1.0
stitch_version=0.6.1
unpick_version=2.2.0
cfr_version=0.0.9
unpick_version=2.3.0
cfr_version=0.1.1
name_proposal_version=0.1.4
tiny_remapper_version=0.8.1
asm_version=9.3
# Javadoc generation/linking
fabric_loader_version=0.11.6
jetbrains_annotations_version=22.0.0
fabric_loader_version=0.13.3
jetbrains_annotations_version=23.0.0
mappingpoet_version=0.3.0

Binary file not shown.

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

269
gradlew vendored
View File

@ -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,101 @@
#
##############################################################################
##
## 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
;;
MSYS* | 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 +121,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,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
@ -106,80 +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
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
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
# 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, 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.
# 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"
# For Cygwin or MSYS, switch paths to Windows format before running java
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
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
# 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
fi
# 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.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# 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" "$@"

View File

@ -1,13 +1,13 @@
/*
* This file is free for everyone to use under the Creative Commons Zero license.
*/
/**
* Provides a few classes holding constants that possibly existed for better understanding
* of the Minecraft codebase.
*
* <p><strong>Warning:</strong> These classes are absent at runtime. They are exclusively
* for use during compile time, in which the Java Compiler will replace the field references
* with <a href="{@docRoot}/constant-values.html#net.fabricmc">constant values</a>.
*/
package net.fabricmc.yarn.constants;
/*
* This file is free for everyone to use under the Creative Commons Zero license.
*/
/**
* Provides a few classes holding constants that possibly existed for better understanding
* of the Minecraft codebase.
*
* <p><strong>Warning:</strong> These classes are absent at runtime. They are exclusively
* for use during compile time, in which the Java Compiler will replace the field references
* with <a href="{@docRoot}/constant-values.html#net.fabricmc">constant values</a>.
*/
package net.fabricmc.yarn.constants;

View File

@ -1,17 +1,17 @@
/*
* This file is free for everyone to use under the Creative Commons Zero license.
*/
/**
* The base package for all Minecraft classes. All Minecraft classes belong to this package
* in their intermediary names.
*
* <p>Unmapped classes go into this package by default. This package additionally contains
* {@link Bootstrap}, {@link SharedConstants}, and {@link MinecraftVersion} classes.
*
* <p>While it's known that some obfuscated Minecraft classes are under other packages like
* {@code com.mojang.*}, yarn keeps all mapped classes under {@code net.minecraft.*} since
* there is no convincing evidence those classes are independent from Minecraft.
*/
package net.minecraft;
/*
* This file is free for everyone to use under the Creative Commons Zero license.
*/
/**
* The base package for all Minecraft classes. All Minecraft classes belong to this package
* in their intermediary names.
*
* <p>Unmapped classes go into this package by default. This package additionally contains
* {@link Bootstrap}, {@link SharedConstants}, and {@link MinecraftVersion} classes.
*
* <p>While it's known that some obfuscated Minecraft classes are under other packages like
* {@code com.mojang.*}, yarn keeps all mapped classes under {@code net.minecraft.*} since
* there is no convincing evidence those classes are independent from Minecraft.
*/
package net.minecraft;

View File

@ -1,71 +1,71 @@
/*
* This file is free for everyone to use under the Creative Commons Zero license.
*/
/**
* Provides resources to Minecraft, including resource access, provision, and reloading.
*
* <p>"Data" as in "Data Packs" is considered resource as well.
*
* <p>Here is a quick overview on the resource access and provision APIs of Minecraft:
* <div class="fabric" id="resource-access"><table border=1>
* <caption>Resource Access APIs</caption>
* <tr>
* <th><b>Class</b></th><th><b>Usage</b></th>
* </tr>
* <tr>
* <td>{@link Resource}</td>
* <td>Accesses to binary data.</td>
* </tr>
* <tr>
* <td>{@link ResourceFactory}</td>
* <td>Provides a resource given an {@link net.minecraft.util.Identifier}.</td>
* </tr>
* <tr>
* <td>{@link ResourceManager}</td>
* <td>Exposes more resource access in addition to being a {@link ResourceFactory}.</td>
* </tr>
* <tr>
* <td>{@link LifecycledResourceManager}</td>
* <td>A resource manager with a specific lifecycle, to fine-grain resource access.</td>
* </tr>
* <tr>
* <td>{@link ResourceReloader}</td>
* <td>The most common accessor to resources, acting during {@linkplain
* SimpleResourceReload#start reloads} to set up in-game contents.
* <br><i>This is usually implemented by mods using resources.</i></td>
* </tr>
* </table></div>
*
* <div class="fabric" id="resource-provision"><table border=1>
* <caption>Resource Provision APIs</caption>
* <tr>
* <th><b>Class</b></th><th><b>Usage</b></th>
* </tr>
* <tr>
* <td>{@link ResourcePack}</td>
* <td>Provides binary data based on queries.
* <br>They are usually single-use, created by {@link ResourcePackManager} and provided
* to the resource manager in each reload.</td>
* </tr>
* <tr>
* <td>{@link ResourcePackProfile}</td>
* <td>A user-friendly, persistent form of {@link ResourcePack}. Used to create resource
* packs in reloads.</td>
* </tr>
* <tr>
* <td>{@link ResourcePackProvider}</td>
* <td>Provides {@link ResourcePackProfile}s, so they are taken account of during reloads.
* <br><i>This is usually implemented by mods providing resources.</i></td>
* </tr>
* <tr>
* <td>{@link ResourcePackManager}</td>
* <td>Keeps track of {@link ResourcePackProvider}s and uses the profiles from the providers
* to create {@link ResourcePack}s to send to resource managers in each reload.</td>
* </tr>
* </table></div>
*
* <p>In addition to these APIs, this package includes implementation details of the resource system.
*/
package net.minecraft.resource;
/*
* This file is free for everyone to use under the Creative Commons Zero license.
*/
/**
* Provides resources to Minecraft, including resource access, provision, and reloading.
*
* <p>"Data" as in "Data Packs" is considered resource as well.
*
* <p>Here is a quick overview on the resource access and provision APIs of Minecraft:
* <div class="fabric" id="resource-access"><table border=1>
* <caption>Resource Access APIs</caption>
* <tr>
* <th><b>Class</b></th><th><b>Usage</b></th>
* </tr>
* <tr>
* <td>{@link Resource}</td>
* <td>Accesses to binary data.</td>
* </tr>
* <tr>
* <td>{@link ResourceFactory}</td>
* <td>Provides a resource given an {@link net.minecraft.util.Identifier}.</td>
* </tr>
* <tr>
* <td>{@link ResourceManager}</td>
* <td>Exposes more resource access in addition to being a {@link ResourceFactory}.</td>
* </tr>
* <tr>
* <td>{@link LifecycledResourceManager}</td>
* <td>A resource manager with a specific lifecycle, to fine-grain resource access.</td>
* </tr>
* <tr>
* <td>{@link ResourceReloader}</td>
* <td>The most common accessor to resources, acting during {@linkplain
* SimpleResourceReload#start reloads} to set up in-game contents.
* <br><i>This is usually implemented by mods using resources.</i></td>
* </tr>
* </table></div>
*
* <div class="fabric" id="resource-provision"><table border=1>
* <caption>Resource Provision APIs</caption>
* <tr>
* <th><b>Class</b></th><th><b>Usage</b></th>
* </tr>
* <tr>
* <td>{@link ResourcePack}</td>
* <td>Provides binary data based on queries.
* <br>They are usually single-use, created by {@link ResourcePackManager} and provided
* to the resource manager in each reload.</td>
* </tr>
* <tr>
* <td>{@link ResourcePackProfile}</td>
* <td>A user-friendly, persistent form of {@link ResourcePack}. Used to create resource
* packs in reloads.</td>
* </tr>
* <tr>
* <td>{@link ResourcePackProvider}</td>
* <td>Provides {@link ResourcePackProfile}s, so they are taken account of during reloads.
* <br><i>This is usually implemented by mods providing resources.</i></td>
* </tr>
* <tr>
* <td>{@link ResourcePackManager}</td>
* <td>Keeps track of {@link ResourcePackProvider}s and uses the profiles from the providers
* to create {@link ResourcePack}s to send to resource managers in each reload.</td>
* </tr>
* </table></div>
*
* <p>In addition to these APIs, this package includes implementation details of the resource system.
*/
package net.minecraft.resource;

View File

@ -1,2 +1,2 @@
unpick.level=WARNING
# Otherwise it spams for every method it processes!
unpick.level=WARNING
# Otherwise it spams for every method it processes!