diff --git a/.gitattributes b/.gitattributes index 07764a78d9..0f09d3260f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -* text eol=lf \ No newline at end of file +* text=auto eol=lf +*.bat text eol=crlf \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6774b1759..aed02fc074 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,18 +4,18 @@ jobs: build: strategy: matrix: - java: [17-jdk, 20-jdk] + java: [17-jdk, 21-jdk] runs-on: ubuntu-22.04 container: image: eclipse-temurin:${{ matrix.java }} options: --user root steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: ./gradlew build javadocJar checkMappings --stacktrace --warning-mode fail - name: Build artifacts - if: ${{ matrix.java == '20-jdk' }} + if: ${{ matrix.java == '21-jdk' }} continue-on-error: true - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Artifacts path: build/libs/ @@ -23,9 +23,9 @@ jobs: test-build-logic: runs-on: ubuntu-22.04 container: - image: eclipse-temurin:20-jdk + image: eclipse-temurin:21-jdk options: --user root steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v2 - run: ./gradlew :filament:build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6c114d697f..d8a92393ec 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,10 +6,10 @@ jobs: if: ${{ github.repository_owner == 'FabricMC' }} runs-on: ubuntu-22.04 container: - image: eclipse-temurin:20-jdk + image: eclipse-temurin:21-jdk options: --user root steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Generate the build number based on tags to allow per branch build numbers, not something github provides by default. - name: Generate build number id: buildnumber diff --git a/.github/workflows/release-filament.yml b/.github/workflows/release-filament.yml index 7396c3e780..3d60b327d6 100644 --- a/.github/workflows/release-filament.yml +++ b/.github/workflows/release-filament.yml @@ -4,10 +4,10 @@ jobs: build: runs-on: ubuntu-22.04 container: - image: eclipse-temurin:20-jdk + image: eclipse-temurin:21-jdk options: --user root steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: ./gradlew :filament:build :filament:publish --stacktrace --no-configuration-cache env: MAVEN_URL: ${{ secrets.MAVEN_URL }} diff --git a/build.gradle b/build.gradle index 1fd1588843..d1522ecf8e 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w05b" +def minecraft_version = "24w06a" filament { minecraftVersion = minecraft_version @@ -109,6 +109,8 @@ import net.fabricmc.filament.task.mappingio.MergeMappingsTask import net.fabricmc.mappingio.format.MappingFormat import net.fabricmc.nameproposal.MappingNameCompleter import org.gradle.work.DisableCachingByDefault +import com.diffplug.spotless.LineEnding +import groovy.xml.XmlSlurper import java.util.zip.GZIPOutputStream @@ -186,7 +188,7 @@ tasks.register('mapSpecializedMethods', MapSpecializedMethodsTask) { tasks.register('convertToV1', ConvertMappingsTask) { input = mapSpecializedMethods.output output = new File(tempDir, "yarn-mappings.tiny") - outputFormat = MappingFormat.TINY + outputFormat = MappingFormat.TINY_FILE } tasks.register('mergeTiny', MergeMappingsTask) { @@ -194,7 +196,7 @@ tasks.register('mergeTiny', MergeMappingsTask) { output = new File(tempDir, "mappings.tiny") mappingInputs.from downloadIntermediary.output mappingInputs.from convertToV1.output - outputFormat = MappingFormat.TINY + outputFormat = MappingFormat.TINY_FILE } // Disable the default jar task @@ -281,7 +283,7 @@ tasks.withType(AbstractArchiveTask).configureEach { } spotless { - lineEndings = com.diffplug.spotless.LineEnding.UNIX + lineEndings = LineEnding.UNIX java { licenseHeaderFile(rootProject.file("HEADER")) @@ -347,7 +349,7 @@ tasks.register('mergeV2', MergeMappingsTask) { output = new File(tempDir, "merged-v2.tiny") mappingInputs.from downloadIntermediary.output mappingInputs.from insertAutoGeneratedEnumMappings.output - outputFormat = MappingFormat.TINY_2 + outputFormat = MappingFormat.TINY_2_FILE } tasks.register('v2UnmergedYarnJar', Jar) { @@ -510,8 +512,8 @@ javadoc { source fileTree(fakeSourceDir) + sourceSets.constants.allJava + sourceSets.packageDocs.allJava classpath = configurations.javadocClasspath.plus minecraftLibraries - def fs = services.get(FileSystemOperations.class) - def outputDir = javadoc.outputDirectory + def fs = project.services.get(FileSystemOperations.class) + def outputDir = javadoc.destinationDir doLast { fs.copy { @@ -558,7 +560,7 @@ check.dependsOn javadocLint publishing { publications { - maven(MavenPublication) { + register("maven", MavenPublication) { groupId 'net.fabricmc' artifactId "yarn" version yarnVersion diff --git a/filament/build.gradle b/filament/build.gradle index 0b1840a463..9b4714b455 100644 --- a/filament/build.gradle +++ b/filament/build.gradle @@ -38,10 +38,10 @@ dependencies { implementation "net.fabricmc:tiny-remapper:$properties.tiny_remapper_version" implementation "net.fabricmc:mappingpoet:$properties.mappingpoet_version" implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2' - implementation 'net.fabricmc:mapping-io:0.4.0' + implementation 'net.fabricmc:mapping-io:0.5.1' // Contains a number of useful utilities we can re-use. - implementation ("net.fabricmc:fabric-loom:1.2.7") { + implementation ("net.fabricmc:fabric-loom:1.5.7") { transitive = false } @@ -61,7 +61,14 @@ test { checkstyle { configFile = file('checkstyle.xml') - toolVersion = '10.3.3' + toolVersion = '10.13.0' +} + +// Workaround https://github.com/gradle/gradle/issues/27035 +configurations.checkstyle { + resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") { + select("com.google.guava:guava:0") + } } gradlePlugin { @@ -91,7 +98,7 @@ publishing { /** * Run this task to download the gradle sources next to the api jar, you may need to manually attach the sources jar */ -task downloadGradleSources() { +tasks.register('downloadGradleSources') { doLast { // Awful hack to find the gradle api location def gradleApiFile = project.configurations.detachedConfiguration(dependencies.gradleApi()).files.stream() diff --git a/gradle.properties b/gradle.properties index 7611bbf38e..358a35e596 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,15 +6,15 @@ org.gradle.configuration-cache=true enigma_version=2.3.3 unpick_version=2.3.0 cfr_version=0.2.1 -name_proposal_version=0.1.5 -asm_version=9.5 +name_proposal_version=0.2.0 +asm_version=9.6 # Javadoc generation/linking -fabric_loader_version=0.14.25 -jetbrains_annotations_version=23.0.0 +fabric_loader_version=0.15.6 +jetbrains_annotations_version=24.1.0 mappingpoet_version=0.3.2 # Build logic -tiny_remapper_version=0.8.5 -junit_version=5.7.1 -assertj_version=3.19.0 +tiny_remapper_version=0.10.1 +junit_version=5.10.2 +assertj_version=3.25.3 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c49..d64cd49177 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 ac72c34e8a..a80b22ce5c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1a53..1aa94a4269 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ 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=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # 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, 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: +# * 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" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f13..25da30dbde 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index d8cfc4edc4..aa179285f9 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -1022,7 +1022,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_44624 solid Z FIELD field_44625 instrument Lnet/minecraft/class_2766; FIELD field_44626 replaceable Z - METHOD (Lnet/minecraft/class_2248;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V + METHOD (Lnet/minecraft/class_2248;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V ARG 1 block ARG 2 propertyMap ARG 3 codec diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 46fce801ba..d12cc6cf96 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -27,34 +27,35 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior CLASS 7 METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V ARG 1 entity - CLASS 8 - FIELD field_13367 fallbackBehavior Lnet/minecraft/class_2347; CLASS 9 FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347; + CLASS 10 + FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347; CLASS 17 - FIELD field_20533 fallbackBehavior Lnet/minecraft/class_2347; - METHOD method_22141 tryPutFilledBottle (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + CLASS 18 + FIELD field_49138 fallbackBehavior Lnet/minecraft/class_2347; + METHOD method_57069 (Lnet/minecraft/class_4970$class_4971;)Z + ARG 0 state + METHOD method_57070 tryPutFilledBottle (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 pointer ARG 2 emptyBottleStack ARG 3 filledBottleStack - METHOD method_27900 (Lnet/minecraft/class_4970$class_4971;)Z - ARG 0 state - CLASS 21 + CLASS 22 FIELD field_38001 fallback Lnet/minecraft/class_2347; - CLASS 23 + CLASS 24 METHOD method_17199 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1681;)V ARG 1 entity - CLASS 24 + CLASS 25 METHOD method_17200 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1680;)V ARG 1 entity - CLASS 25 + CLASS 26 METHOD method_17201 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1683;)V ARG 1 entity - CLASS 26 + CLASS 27 CLASS 1 METHOD method_17203 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity - CLASS 27 + CLASS 28 CLASS 1 METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity diff --git a/mappings/net/minecraft/block/entity/Hopper.mapping b/mappings/net/minecraft/block/entity/Hopper.mapping index 7e08de54ee..eac4534168 100644 --- a/mappings/net/minecraft/block/entity/Hopper.mapping +++ b/mappings/net/minecraft/block/entity/Hopper.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_2615 net/minecraft/block/entity/Hopper FIELD field_12025 INSIDE_SHAPE Lnet/minecraft/class_265; - FIELD field_12026 INPUT_AREA_SHAPE Lnet/minecraft/class_265; - FIELD field_12027 ABOVE_SHAPE Lnet/minecraft/class_265; - METHOD method_11262 getInputAreaShape ()Lnet/minecraft/class_265; + FIELD field_12026 INPUT_AREA_SHAPE Lnet/minecraft/class_238; + METHOD method_11262 getInputAreaShape ()Lnet/minecraft/class_238; METHOD method_11264 getHopperY ()D METHOD method_11265 getHopperZ ()D METHOD method_11266 getHopperX ()D diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping index 565a7036b8..aac85173a9 100644 --- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity FIELD field_12024 inventory Lnet/minecraft/class_2371; FIELD field_31341 TRANSFER_COOLDOWN I FIELD field_31342 INVENTORY_SIZE I + FIELD field_49101 facing Lnet/minecraft/class_2350; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -33,27 +34,28 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity ARG 1 stack ARG 2 slot ARG 3 side - METHOD method_11245 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;Lnet/minecraft/class_238;)Ljava/util/stream/Stream; - ARG 2 box - METHOD method_11246 insert (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1263;)Z + METHOD method_11246 insert (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2614;)Z ARG 0 world ARG 1 pos - ARG 2 state - ARG 3 inventory + ARG 2 blockEntity METHOD method_11247 extract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1542;)Z ARG 0 inventory ARG 1 itemEntity - METHOD method_11248 getInputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;)Lnet/minecraft/class_1263; + METHOD method_11248 getInputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1263; ARG 0 world ARG 1 hopper + ARG 2 pos + ARG 3 state METHOD method_11250 getInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1263; ARG 0 world ARG 1 pos - METHOD method_11251 getInventoryAt (Lnet/minecraft/class_1937;DDD)Lnet/minecraft/class_1263; + METHOD method_11251 getInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;DDD)Lnet/minecraft/class_1263; ARG 0 world - ARG 1 x - ARG 3 y - ARG 5 z + ARG 1 pos + ARG 2 state + ARG 3 x + ARG 5 y + ARG 7 z METHOD method_11252 canExtract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;ILnet/minecraft/class_2350;)Z ARG 0 hopperInventory ARG 1 fromInventory @@ -69,14 +71,11 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity METHOD method_11254 canMergeItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 first ARG 1 second - METHOD method_11255 getOutputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1263; + METHOD method_11255 getOutputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2614;)Lnet/minecraft/class_1263; ARG 0 world ARG 1 pos - ARG 2 state + ARG 2 blockEntity METHOD method_11256 isFull ()Z - METHOD method_11257 isInventoryEmpty (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Z - ARG 0 inv - ARG 1 facing METHOD method_11258 isInventoryFull (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Z ARG 0 inventory ARG 1 direction @@ -90,17 +89,20 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity ARG 1 inventory ARG 2 slot ARG 3 side - METHOD method_17766 (Lnet/minecraft/class_1263;I)Z - ARG 1 slot - METHOD method_17767 getAvailableSlots (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Ljava/util/stream/IntStream; + METHOD method_17767 getAvailableSlots (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)[I ARG 0 inventory ARG 1 side - METHOD method_17768 (Lnet/minecraft/class_2615;Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;I)Z - ARG 3 slot - METHOD method_17769 (Lnet/minecraft/class_1263;I)Z - ARG 1 slot METHOD method_31692 serverTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2614;)V ARG 0 world ARG 1 pos ARG 2 state ARG 3 blockEntity + METHOD method_57009 getEntityInventoryAt (Lnet/minecraft/class_1937;DDD)Lnet/minecraft/class_1263; + ARG 0 world + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_57010 getBlockInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1263; + ARG 0 world + ARG 1 pos + ARG 2 state diff --git a/mappings/net/minecraft/class_315.mapping b/mappings/net/minecraft/class_315.mapping new file mode 100644 index 0000000000..9c59be4b69 --- /dev/null +++ b/mappings/net/minecraft/class_315.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_315 + CLASS class_9242 + METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V diff --git a/mappings/net/minecraft/class_9224.mapping b/mappings/net/minecraft/class_9224.mapping new file mode 100644 index 0000000000..e056a42363 --- /dev/null +++ b/mappings/net/minecraft/class_9224.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9224 + METHOD method_56927 (ZLnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + ARG 1 enabled diff --git a/mappings/net/minecraft/class_9243.mapping b/mappings/net/minecraft/class_9243.mapping new file mode 100644 index 0000000000..b383c0f366 --- /dev/null +++ b/mappings/net/minecraft/class_9243.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9243 + FIELD field_49114 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/class_9247.mapping b/mappings/net/minecraft/class_9247.mapping new file mode 100644 index 0000000000..d91db78ef7 --- /dev/null +++ b/mappings/net/minecraft/class_9247.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9247 + FIELD field_49124 realmsManager Lnet/minecraft/class_3283; + METHOD method_57046 createLifecycledResourceManager ()Lnet/minecraft/class_6860; + METHOD method_57048 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_3288;)V + ARG 1 resourcePackProfile diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 2e47d3f728..52a9ce28cf 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -366,8 +366,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_27022 hasOutline (Lnet/minecraft/class_1297;)Z COMMENT Checks if the provided {@code entity} should display an outline around its model. ARG 1 entity - METHOD method_27466 initFont (Z)V - ARG 1 forcesUnicode METHOD method_29041 openChatScreen (Ljava/lang/String;)V ARG 1 text METHOD method_29042 shouldBlockMessages (Ljava/util/UUID;)Z diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping index 4970c9f5ec..692c709e0e 100644 --- a/mappings/net/minecraft/client/font/FontLoader.mapping +++ b/mappings/net/minecraft/client/font/FontLoader.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader - FIELD field_44801 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44801 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_51731 getType ()Lnet/minecraft/class_394; METHOD method_51734 build ()Lcom/mojang/datafixers/util/Either; METHOD method_51757 (Lnet/minecraft/class_394;)Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index 1b26125c39..99712cd1e7 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager FIELD field_2261 LOGGER Lorg/slf4j/Logger; FIELD field_24254 MISSING_STORAGE_ID Lnet/minecraft/class_2960; FIELD field_24255 missingStorage Lnet/minecraft/class_377; - FIELD field_24256 idOverrides Ljava/util/Map; FIELD field_32226 FONTS_JSON Ljava/lang/String; FIELD field_40409 FINDER Lnet/minecraft/class_7654; FIELD field_44757 GSON Lcom/google/gson/Gson; @@ -14,18 +13,7 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_27539 createTextRenderer ()Lnet/minecraft/class_327; METHOD method_27540 (Lnet/minecraft/class_377;)V ARG 0 fontStorage - METHOD method_27541 setIdOverrides (Ljava/util/Map;)V - ARG 1 idOverrides - METHOD method_27542 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; - ARG 1 id - METHOD method_45077 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; - ARG 1 id METHOD method_45078 createAdvanceValidatingTextRenderer ()Lnet/minecraft/class_327; - METHOD method_51606 getEffectiveId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; - ARG 1 id - METHOD method_51607 (Lnet/minecraft/class_2960;Ljava/util/List;)V - ARG 1 fontId - ARG 2 providers METHOD method_51608 loadIndex (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 resourceManager ARG 2 executor @@ -33,10 +21,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager ARG 1 entry METHOD method_51610 (Lnet/minecraft/class_3695;Lnet/minecraft/class_378$class_8536;)V ARG 2 index - METHOD method_51611 (Lnet/minecraft/class_390;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + METHOD method_51611 (Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 3 dest - METHOD method_51612 (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_389$class_8539;)V - ARG 5 loadable METHOD method_51613 load (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8539;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 key ARG 2 loadable @@ -45,8 +31,6 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_51614 reload (Lnet/minecraft/class_378$class_8536;Lnet/minecraft/class_3695;)V ARG 1 index ARG 2 profiler - METHOD method_51615 (Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8540;)V - ARG 2 reference METHOD method_51617 getRequiredFontProviders (Ljava/util/List;)Ljava/util/Map; ARG 1 entries METHOD method_51618 (Ljava/util/List;I)V @@ -54,10 +38,9 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_51619 loadFontProviders (Ljava/util/List;Lnet/minecraft/class_2960;)Ljava/util/List; ARG 0 fontResources ARG 1 id - METHOD method_51620 insertFont (Ljava/util/List;Lnet/minecraft/class_390;)V + METHOD method_51620 insertFont (Ljava/util/List;Lnet/minecraft/class_390$class_9241;)V ARG 1 fonts - ARG 2 font - METHOD method_51621 (Ljava/util/List;Lnet/minecraft/class_390;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; + METHOD method_51621 (Ljava/util/List;Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; ARG 4 providers METHOD method_51622 (Ljava/util/List;Ljava/util/Map;Ljava/lang/Void;)Lnet/minecraft/class_378$class_8536; ARG 2 ignored @@ -70,8 +53,6 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager ARG 2 entries CLASS class_8534 FontKey CLASS class_8535 Builder - METHOD method_51628 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/Optional; - ARG 0 future METHOD method_51629 build (Ljava/util/function/Function;)Ljava/util/Optional; ARG 1 fontRetriever METHOD method_51630 (Ljava/util/function/Function;Lnet/minecraft/class_2960;)Ljava/util/Optional; @@ -80,12 +61,10 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager CLASS class_8537 FontEntry METHOD (Lnet/minecraft/class_2960;)V ARG 1 fontId - METHOD method_51631 addReferenceBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8540;)V + METHOD method_51631 addReferenceBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8540;)V ARG 1 key - ARG 2 reference - METHOD method_51632 addBuilder (Lnet/minecraft/class_378$class_8534;Ljava/util/concurrent/CompletableFuture;)V + METHOD method_51632 addBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Ljava/util/concurrent/CompletableFuture;)V ARG 1 key - ARG 2 provider METHOD method_51633 (Lnet/minecraft/class_378$class_8535;)Ljava/util/stream/Stream; ARG 0 builder METHOD method_51634 getRequiredFontProviders (Ljava/util/function/Function;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index f4f520ad12..c60a90cb68 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage FIELD field_20910 whiteRectangleGlyphRenderer Lnet/minecraft/class_382; FIELD field_2246 id Lnet/minecraft/class_2960; - FIELD field_2247 fonts Ljava/util/List; FIELD field_2248 textureManager Lnet/minecraft/class_1060; FIELD field_2249 charactersByWidth Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_2252 RANDOM Lnet/minecraft/class_5819; @@ -13,7 +12,7 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V ARG 1 textureManager ARG 2 id - METHOD method_2004 setFonts (Ljava/util/List;)V + METHOD method_2004 setFonts (Ljava/util/List;Ljava/util/Set;)V ARG 1 fonts METHOD method_2010 closeGlyphAtlases ()V METHOD method_2011 getGlyph (IZ)Lnet/minecraft/class_379; @@ -29,11 +28,6 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage METHOD method_2014 getGlyphRenderer (I)Lnet/minecraft/class_382; ARG 1 codePoint METHOD method_22943 getRectangleRenderer ()Lnet/minecraft/class_382; - METHOD method_24290 closeFonts ()V - METHOD method_27545 (Ljava/util/List;Ljava/util/Set;I)V - ARG 3 codePoint - METHOD method_27546 (I)Lit/unimi/dsi/fastutil/ints/IntList; - ARG 0 advance METHOD method_40038 findGlyph (I)Lnet/minecraft/class_377$class_7647; COMMENT {@return the glyph of {@code codePoint}} COMMENT diff --git a/mappings/net/minecraft/client/gui/screen/option/FontOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/FontOptionsScreen.mapping new file mode 100644 index 0000000000..3b417aa2b0 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/option/FontOptionsScreen.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9246 net/minecraft/client/gui/screen/option/FontOptionsScreen + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V + ARG 1 parent + ARG 2 gameOptions + METHOD method_57041 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172; + ARG 0 gameOptions diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 807f0a2e17..213d07f344 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -133,7 +133,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 1 packet METHOD method_52801 warnOnUnknownPayload (Lnet/minecraft/class_8710;)V ARG 1 payload - METHOD method_52802 refreshTagBasedData ()V METHOD method_53876 createEntity (Lnet/minecraft/class_2604;)Lnet/minecraft/class_1297; ARG 1 packet METHOD method_54133 startWorldLoading (Lnet/minecraft/class_746;Lnet/minecraft/class_638;)V @@ -141,6 +140,3 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 2 world METHOD method_54134 clearWorld ()V METHOD method_55823 getScoreboard ()Lnet/minecraft/class_269; - METHOD method_56582 handleSynchronizedTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V - ARG 1 registryRef - ARG 2 tags diff --git a/mappings/net/minecraft/client/network/ClientRegistries.mapping b/mappings/net/minecraft/client/network/ClientRegistries.mapping index 9a6b7917e9..8bf55839f3 100644 --- a/mappings/net/minecraft/client/network/ClientRegistries.mapping +++ b/mappings/net/minecraft/client/network/ClientRegistries.mapping @@ -1,14 +1,10 @@ CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries FIELD field_48767 dynamicRegistries Lnet/minecraft/class_9173$class_9174; - FIELD field_48768 tags Lnet/minecraft/class_9173$class_9175; + FIELD field_48768 tags Lnet/minecraft/class_9175; METHOD method_56583 putDynamicRegistry (Lnet/minecraft/class_5321;Ljava/util/List;)V ARG 1 registryRef ARG 2 entries - METHOD method_56584 (Lnet/minecraft/class_5455$class_6892;)V - ARG 0 entry - METHOD method_56585 createRegistryManager (Lnet/minecraft/class_5455;Z)Lnet/minecraft/class_5455$class_6890; - ARG 1 precedingRegistryManager - ARG 2 local + METHOD method_56585 createRegistryManager (Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;Z)Lnet/minecraft/class_5455$class_6890; METHOD method_56586 putTags (Ljava/util/Map;)V ARG 1 tags CLASS class_9174 DynamicRegistries @@ -18,15 +14,4 @@ CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries METHOD method_56588 put (Lnet/minecraft/class_5321;Ljava/util/List;)V ARG 1 registryRef ARG 2 entries - METHOD method_56589 load (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455; - ARG 1 precedingRegistryManager - CLASS class_9175 Tags - FIELD field_48770 tagsByRegistry Ljava/util/Map; - METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V - ARG 1 registryRef - ARG 2 serialized - METHOD method_56591 load (Lnet/minecraft/class_5455;)V - ARG 1 registryManager - METHOD method_56592 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V - ARG 1 registryRef - ARG 2 serialized + METHOD method_56589 load (Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455; diff --git a/mappings/net/minecraft/client/network/Tags.mapping b/mappings/net/minecraft/client/network/Tags.mapping new file mode 100644 index 0000000000..5faf20770c --- /dev/null +++ b/mappings/net/minecraft/client/network/Tags.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9175 net/minecraft/client/network/Tags + FIELD field_48770 tagsByRegistry Ljava/util/Map; + METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V + ARG 1 registryRef + ARG 2 serialized + METHOD method_56591 load (Lnet/minecraft/class_5455;Ljava/util/function/Predicate;)V diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 50d669412f..20ab1a5494 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -222,6 +222,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_45987 narratorHotkey Lnet/minecraft/class_7172; FIELD field_46854 HIDE_SPLASH_TEXTS_TOOLTIP Lnet/minecraft/class_2561; FIELD field_46855 hideSplashTexts Lnet/minecraft/class_7172; + FIELD field_49105 japaneseGlyphVariants Lnet/minecraft/class_7172; METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile @@ -597,6 +598,11 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_53530 getNarratorHotkey ()Lnet/minecraft/class_7172; METHOD method_53842 getSyncedOptions ()Lnet/minecraft/class_8791; METHOD method_54581 getHideSplashTexts ()Lnet/minecraft/class_7172; + METHOD method_57018 getJapaneseGlyphVariants ()Lnet/minecraft/class_7172; + METHOD method_57020 onFontOptionsChanged ()V + METHOD method_57021 shouldUseJapaneseGlyphsByDefault ()Z + METHOD method_57022 (Ljava/lang/Boolean;)V + ARG 0 value CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key @@ -627,6 +633,5 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_33684 visitBoolean (Ljava/lang/String;Z)Z ARG 1 key ARG 2 current + CLASS class_9242 METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V - ARG 1 key - ARG 2 option diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index c2fbd8b6ab..ecdae0ab78 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -38,11 +38,6 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle FIELD field_3871 z D FIELD field_3872 boundingBox Lnet/minecraft/class_238; FIELD field_3874 x D - METHOD (Lnet/minecraft/class_638;DDD)V - ARG 1 world - ARG 2 x - ARG 4 y - ARG 6 z METHOD (Lnet/minecraft/class_638;DDDDDD)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/client/realms/FileUpload.mapping b/mappings/net/minecraft/client/realms/FileUpload.mapping index f0bbd049aa..47a08985ea 100644 --- a/mappings/net/minecraft/client/realms/FileUpload.mapping +++ b/mappings/net/minecraft/client/realms/FileUpload.mapping @@ -13,14 +13,13 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload FIELD field_19561 requestConfig Lorg/apache/http/client/config/RequestConfig; FIELD field_32056 MAX_ATTEMPTS I FIELD field_32057 UPLOAD_ENDPOINT Ljava/lang/String; - METHOD (Ljava/io/File;JILnet/minecraft/class_4888;Lnet/minecraft/class_320;Ljava/lang/String;Lnet/minecraft/class_4351;)V + METHOD (Ljava/io/File;JILnet/minecraft/class_4888;Lnet/minecraft/class_320;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_4351;)V ARG 1 file ARG 2 worldId ARG 4 slotId ARG 5 uploadInfo ARG 6 session ARG 7 clientVersion - ARG 8 uploadStatus METHOD method_20970 cancel ()V METHOD method_20971 requestUpload (I)Lnet/minecraft/class_4429; ARG 1 currentAttempt diff --git a/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping index c2f21afe0e..bccfe3a4f5 100644 --- a/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping +++ b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_9079 net/minecraft/client/render/entity/animation/ArmadilloAnimations - FIELD field_47843 ROLLING Lnet/minecraft/class_7184; FIELD field_47844 IDLE Lnet/minecraft/class_7184; - FIELD field_47845 SCARED Lnet/minecraft/class_7184; + FIELD field_49108 ROLLING Lnet/minecraft/class_7184; + FIELD field_49109 SCARED Lnet/minecraft/class_7184; + FIELD field_49110 UNROLLING Lnet/minecraft/class_7184; diff --git a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping index 535d6ac7eb..6d6e67fcd1 100644 --- a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResourcePackProvider FIELD field_40556 METADATA Lnet/minecraft/class_3272; FIELD field_40557 METADATA_MAP Lnet/minecraft/class_7662; - FIELD field_40558 VANILLA_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_40559 PROFILE_NAME_TEXTS Ljava/util/Map; FIELD field_40560 ID Lnet/minecraft/class_2960; FIELD field_40561 resourcePacksPath Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator.mapping new file mode 100644 index 0000000000..133c605e8b --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9249 net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator diff --git a/mappings/net/minecraft/datafixer/FixUtil.mapping b/mappings/net/minecraft/datafixer/FixUtil.mapping new file mode 100644 index 0000000000..8d940608b9 --- /dev/null +++ b/mappings/net/minecraft/datafixer/FixUtil.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil + METHOD method_56943 fixBlockPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_56944 renameKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 oldKey + ARG 2 newKey + METHOD method_56945 replaceKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 oldKey + ARG 2 newKey + ARG 3 newValue + METHOD method_56946 replaceKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/UnaryOperator;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 oldKey + ARG 2 newKey + ARG 3 valueTransformer + METHOD method_56947 setOptional (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 key + ARG 2 value diff --git a/mappings/net/minecraft/datafixer/fix/BlockPosFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockPosFormatFix.mapping new file mode 100644 index 0000000000..da001b6629 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BlockPosFormatFix.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_9230 net/minecraft/datafixer/fix/BlockPosFormatFix + FIELD field_49057 PATROL_TARGET_ENTITY_IDS Ljava/util/List; + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_56953 createFixRule (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/util/Map;)Lcom/mojang/datafixers/TypeRewriteRule; + ARG 1 typeReference + ARG 2 id + ARG 3 oldToNewKey + METHOD method_56956 fixOldBlockPosFormat (Lcom/mojang/datafixers/Typed;Ljava/util/Map;)Lcom/mojang/datafixers/Typed; + ARG 2 oldToNewKey + METHOD method_56957 fixMapItemFrames (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + METHOD method_56958 addEntityFixes (Ljava/util/List;)V + ARG 1 rules + METHOD method_56963 addBlockEntityFixes (Ljava/util/List;)V + ARG 1 rules diff --git a/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping index c191cd605e..768454b839 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping @@ -3,7 +3,3 @@ CLASS net/minecraft/class_8222 net/minecraft/datafixer/fix/EntityBrushableBlockF ARG 1 outputSchema METHOD method_49763 renameFields (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic - METHOD method_49764 renameField (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; - ARG 1 dynamic - ARG 2 oldName - ARG 3 newName diff --git a/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping index aedcf97b54..a552604534 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping @@ -3,9 +3,3 @@ CLASS net/minecraft/class_7407 net/minecraft/datafixer/fix/EntityPaintingFieldsR ARG 1 outputSchema METHOD method_43386 rename (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic - METHOD method_43387 rename (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; - ARG 1 dynamic - ARG 2 oldKey - ARG 3 newKey - METHOD method_43388 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - ARG 3 value diff --git a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping index d791b7d53d..21d19108db 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping @@ -7,7 +7,3 @@ CLASS net/minecraft/class_7505 net/minecraft/datafixer/fix/ItemNbtFix ARG 3 itemIdPredicate METHOD method_20445 fixNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic - METHOD method_44192 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - ARG 3 typed - METHOD method_44193 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - ARG 1 nbt diff --git a/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping b/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping index bb72bab30b..f8ec26bd41 100644 --- a/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_8575 net/minecraft/datafixer/fix/LegacyDragonFightFix ARG 0 typed METHOD method_52228 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 0 levelData + METHOD method_56973 updateExitPortalLocation (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic diff --git a/mappings/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.mapping new file mode 100644 index 0000000000..0d45b47d56 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9231 net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_56975 update (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping index b4674b598f..681d6aad37 100644 --- a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_5129 net/minecraft/datafixer/fix/RenameItemStackAttributesFix - FIELD field_23695 RENAMES Ljava/util/Map; - METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + FIELD field_23695 RENAMES Ljava/util/function/UnaryOperator; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V ARG 1 outputSchema METHOD method_26808 updateAttributeName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_26810 updateAttributeModifiers (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - ARG 0 typed METHOD method_26814 updatePlayerAttributes (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - ARG 0 typed diff --git a/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping b/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping index 01c5cc35f4..967ecd59f6 100644 --- a/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping @@ -6,35 +6,37 @@ CLASS net/minecraft/class_8744 net/minecraft/datafixer/fix/StatusEffectFix METHOD method_53078 makeBlockEntitiesRule ()Lcom/mojang/datafixers/TypeRewriteRule; METHOD method_53082 fixEffect (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 0 effectDynamic + METHOD method_53083 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic METHOD method_53084 updateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/util/Optional; + ARG 0 dynamic ARG 1 idKey METHOD method_53085 renameKeyAndUpdateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic ARG 1 oldKey ARG 3 newKey - METHOD method_53086 renameKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; - ARG 1 oldKey - ARG 2 newKey - METHOD method_53087 renameKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic; - ARG 1 oldKey - ARG 2 newKey - ARG 3 value - METHOD method_53088 setOptionalValue (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic; - ARG 1 key - ARG 2 value METHOD method_53090 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 idMap METHOD method_53091 (Ljava/lang/Number;)Ljava/lang/String; ARG 0 oldId METHOD method_53093 makeEntitiesRule ()Lcom/mojang/datafixers/TypeRewriteRule; METHOD method_53096 renameKeyAndUpdateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic ARG 1 oldKey ARG 2 newKey METHOD method_53098 makeItemStacksRule ()Lcom/mojang/datafixers/TypeRewriteRule; METHOD method_53100 fixStewEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic METHOD method_53101 fixEffectList (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic ARG 1 oldEffectListKey ARG 2 newEffectListKey METHOD method_53103 fixCustomPotionEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic METHOD method_53104 fixEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic METHOD method_53105 fixActiveEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_53108 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic METHOD method_53713 makePlayersRule ()Lcom/mojang/datafixers/TypeRewriteRule; diff --git a/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping b/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping new file mode 100644 index 0000000000..a75342ffe9 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9229 net/minecraft/datafixer/fix/WolfHealthFix + FIELD field_49054 WOLF_ENTITY_ID Ljava/lang/String; + FIELD field_49055 MAX_HEALTH_ATTRIBUTE_ID Lnet/minecraft/class_2960; + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping index fea335f42d..4b961850b4 100644 --- a/mappings/net/minecraft/entity/AnimationState.mapping +++ b/mappings/net/minecraft/entity/AnimationState.mapping @@ -17,3 +17,6 @@ CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState METHOD method_45317 setRunning (ZI)V ARG 1 running ARG 2 age + METHOD method_56988 skip (IF)V + ARG 1 seconds + ARG 2 speedMultiplier diff --git a/mappings/net/minecraft/entity/DataTracked.mapping b/mappings/net/minecraft/entity/DataTracked.mapping new file mode 100644 index 0000000000..ed0cc28a4f --- /dev/null +++ b/mappings/net/minecraft/entity/DataTracked.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9221 net/minecraft/entity/DataTracked + METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V + ARG 1 entries + METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V + ARG 1 data diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index b6efda6d99..ffb3214e57 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -915,7 +915,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 9 yaw ARG 10 pitch METHOD method_48155 canSprintAsVehicle ()Z - METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V + METHOD method_48850 (Ljava/util/List;)V ARG 1 dataEntries METHOD method_48921 couldAcceptPassenger ()Z COMMENT {@return {@code true} if this entity supports passengers in general} @@ -1264,7 +1264,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5671 getCommandSource ()Lnet/minecraft/class_2168; COMMENT {@return a command source which represents this entity} METHOD method_5672 getHighSpeedSplashSound ()Lnet/minecraft/class_3414; - METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V + METHOD method_5674 (Lnet/minecraft/class_2940;)V COMMENT Called on the client when the tracked data is set. COMMENT COMMENT

This can be overridden to refresh other fields when the tracked data @@ -1352,14 +1352,17 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

This is {@code 0} for non-players. COMMENT COMMENT @see #hasPermissionLevel + METHOD method_56918 onExplodedBy (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_5692 updateMovementInFluid (Lnet/minecraft/class_6862;D)Z ARG 1 tag ARG 2 speed - METHOD method_5693 initDataTracker ()V + METHOD method_5693 initDataTracker (Lnet/minecraft/class_2945$class_9222;)V COMMENT Initializes data tracker. COMMENT COMMENT @apiNote Subclasses should override this and call {@link DataTracker#startTracking} COMMENT for any data that needs to be tracked. + ARG 1 builder METHOD method_5694 onPlayerCollision (Lnet/minecraft/class_1657;)V COMMENT Called when a player collides with the entity. Does nothing by default. COMMENT @@ -1387,6 +1390,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @see World#canPlayerModifyAt ARG 1 attacker + METHOD method_56989 getFinalGravity ()D METHOD method_5699 dropStack (Lnet/minecraft/class_1799;F)Lnet/minecraft/class_1542; COMMENT Drops {@code stack} at the entity's position with the given Y offset. COMMENT @@ -1398,6 +1402,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #dropStack(ItemStack) ARG 1 stack ARG 2 yOffset + METHOD method_56990 applyGravity ()V METHOD method_5700 onBubbleColumnSurfaceCollision (Z)V COMMENT Called when the entity collides with a bubble column with an air above. COMMENT @@ -2290,6 +2295,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@return whether the entity is a spectator} COMMENT COMMENT

This returns {@code false} unless the entity is a player in spectator game mode. + METHOD method_7490 getGravity ()D CLASS class_4738 PositionUpdater METHOD accept (Lnet/minecraft/class_1297;DDD)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping index 51ccc47f90..5895a4bcfb 100644 --- a/mappings/net/minecraft/entity/EntityStatuses.mapping +++ b/mappings/net/minecraft/entity/EntityStatuses.mapping @@ -55,3 +55,4 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_38094 EARS_TWITCH B FIELD field_38847 SONIC_BOOM B FIELD field_42621 START_DIGGING B + FIELD field_49074 PEEKING B diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 5aca2ba5bd..9553200965 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -375,6 +375,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack + METHOD method_56994 getJumpVelocity (F)F + ARG 1 strength METHOD method_5877 getHandItems ()Ljava/lang/Iterable; METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index 3a6f1b5fbf..6f2cd256b5 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -1,16 +1,12 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker FIELD field_13329 dirty Z - FIELD field_13331 entries Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - FIELD field_13332 TRACKED_ENTITIES Lit/unimi/dsi/fastutil/objects/Object2IntMap; - FIELD field_13333 trackedEntity Lnet/minecraft/class_1297; + FIELD field_13331 entries [Lnet/minecraft/class_2945$class_2946; + FIELD field_13333 trackedEntity Lnet/minecraft/class_9221; FIELD field_13334 LOGGER Lorg/slf4j/Logger; - FIELD field_13335 lock Ljava/util/concurrent/locks/ReadWriteLock; FIELD field_33378 MAX_DATA_VALUE_ID I - METHOD (Lnet/minecraft/class_1297;)V + METHOD (Lnet/minecraft/class_9221;[Lnet/minecraft/class_2945$class_2946;)V ARG 1 trackedEntity - METHOD method_12776 addTrackedData (Lnet/minecraft/class_2940;Ljava/lang/Object;)V - ARG 1 key - ARG 2 value + ARG 2 entries METHOD method_12778 set (Lnet/minecraft/class_2940;Ljava/lang/Object;)V ARG 1 key ARG 2 value @@ -19,16 +15,12 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker METHOD method_12781 getDirtyEntries ()Ljava/util/List; METHOD method_12783 getEntry (Lnet/minecraft/class_2940;)Lnet/minecraft/class_2945$class_2946; ARG 1 key - METHOD method_12784 startTracking (Lnet/minecraft/class_2940;Ljava/lang/Object;)V - ARG 1 key - ARG 2 initialValue METHOD method_12785 copyToFrom (Lnet/minecraft/class_2945$class_2946;Lnet/minecraft/class_2945$class_7834;)V ARG 1 to ARG 2 from METHOD method_12786 isDirty ()Z METHOD method_12789 get (Lnet/minecraft/class_2940;)Ljava/lang/Object; ARG 1 data - METHOD method_12790 isEmpty ()Z METHOD method_12791 registerData (Ljava/lang/Class;Lnet/minecraft/class_2941;)Lnet/minecraft/class_2940; ARG 0 entityClass ARG 1 dataHandler @@ -37,8 +29,6 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker ARG 1 key ARG 2 value ARG 3 force - METHOD method_51696 containsKey (Lnet/minecraft/class_2940;)Z - ARG 1 key CLASS class_2946 Entry FIELD field_13336 dirty Z FIELD field_13337 data Lnet/minecraft/class_2940; @@ -71,3 +61,12 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker ARG 0 buf ARG 1 id ARG 2 handler + CLASS class_9222 Builder + FIELD field_49022 entity Lnet/minecraft/class_9221; + FIELD field_49023 entries [Lnet/minecraft/class_2945$class_2946; + METHOD (Lnet/minecraft/class_9221;)V + ARG 1 entity + METHOD method_56911 build ()Lnet/minecraft/class_2945; + METHOD method_56912 add (Lnet/minecraft/class_2940;Ljava/lang/Object;)Lnet/minecraft/class_2945$class_9222; + ARG 1 data + ARG 2 value diff --git a/mappings/net/minecraft/entity/data/TrackedData.mapping b/mappings/net/minecraft/entity/data/TrackedData.mapping index 2506b12da7..515f9dc4fc 100644 --- a/mappings/net/minecraft/entity/data/TrackedData.mapping +++ b/mappings/net/minecraft/entity/data/TrackedData.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2940 net/minecraft/entity/data/TrackedData - FIELD field_13306 id I - FIELD field_13307 dataType Lnet/minecraft/class_2941; + FIELD comp_2327 id I + FIELD comp_2328 dataType Lnet/minecraft/class_2941; METHOD (ILnet/minecraft/class_2941;)V ARG 1 id ARG 2 dataType + METHOD comp_2327 id ()I + METHOD comp_2328 dataType ()Lnet/minecraft/class_2941; METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_12712 getType ()Lnet/minecraft/class_2941; - METHOD method_12713 getId ()I diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index 4d63607626..492cb30ad7 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity ARG 0 projectile ARG 1 hitEntity ARG 2 random - METHOD method_56088 (Lnet/minecraft/class_1299;)Ljava/lang/Boolean; - ARG 0 projectileOwnerType METHOD method_56560 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309; ARG 0 livingAttacker METHOD method_56561 (Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 922ca8eb84..7ce5b9bea3 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -42,7 +42,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_6189 navigation Lnet/minecraft/class_1408; FIELD field_6190 visibilityCache Lnet/minecraft/class_1413; FIELD field_6191 ambientSoundChance I - FIELD field_6192 leashNbt Lnet/minecraft/class_2487; + FIELD field_6192 leashNbt Lcom/mojang/datafixers/util/Either; FIELD field_6193 MOB_FLAGS Lnet/minecraft/class_2940; FIELD field_6194 experiencePoints I FIELD field_6195 handItems Lnet/minecraft/class_2371; diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index af724be1d3..a43af437c8 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -144,7 +144,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity METHOD method_6769 setHorseFlag (IZ)V ARG 1 bitmask ARG 2 flag - METHOD method_6771 getJumpStrength ()D METHOD method_6772 getEatingAnimationProgress (F)F ARG 1 tickDelta METHOD method_6774 getChildJumpStrengthBonus (Ljava/util/function/DoubleSupplier;)D diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping index 1d50d2dad3..8d46953eb7 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping @@ -25,6 +25,9 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain METHOD method_55739 addPanicActivities (Lnet/minecraft/class_4095;)V ARG 0 brain CLASS class_9072 RollUpTask + FIELD field_49087 RUN_TIME_IN_TICKS I + FIELD field_49090 ticksUntilPeek I + FIELD field_49091 considerPeeking Z + METHOD method_57001 calculateTicksUntilPeek (Lnet/minecraft/class_9069;)I + ARG 1 entity CLASS class_9073 UnrollAndFleeTask - METHOD method_56559 (Lnet/minecraft/class_1314;)Z - ARG 0 entity diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping index 934f9f8334..9cce001864 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity - FIELD field_47780 scaredAnimationState Lnet/minecraft/class_7094; - FIELD field_47781 rollingAnimationState Lnet/minecraft/class_7094; FIELD field_47785 STATE Lnet/minecraft/class_2940; FIELD field_47786 currentStateTicks J FIELD field_47787 nextScuteShedCooldown I + FIELD field_49080 unrollingAnimationState Lnet/minecraft/class_7094; + FIELD field_49081 rollingAnimationState Lnet/minecraft/class_7094; + FIELD field_49082 scaredAnimationState Lnet/minecraft/class_7094; + FIELD field_49083 peeking Z METHOD method_55711 isRolledUp ()Z METHOD method_55713 setState (Lnet/minecraft/class_9069$class_9070;)V ARG 1 state @@ -19,23 +21,30 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity METHOD method_55722 createArmadilloAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55723 isNotIdle ()Z METHOD method_55724 unroll ()V - METHOD method_55725 setRolling (Z)V - ARG 1 rolling METHOD method_56083 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 entityType ARG 1 world ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_56997 shouldUnrollAndFlee ()Z CLASS class_9070 State FIELD field_47793 name Ljava/lang/String; FIELD field_47794 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_48335 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_48336 INDEX_TO_VALUE Ljava/util/function/IntFunction; FIELD field_48337 index I - METHOD (Ljava/lang/String;ILjava/lang/String;I)V + FIELD field_49085 runRollUpTask Z + FIELD field_49086 lengthInTicks I + METHOD (Ljava/lang/String;ILjava/lang/String;ZII)V ARG 3 name - ARG 4 index + ARG 4 runRollUpTask + ARG 5 lengthInTicks + ARG 6 index METHOD method_55727 fromName (Ljava/lang/String;)Lnet/minecraft/class_9069$class_9070; ARG 0 name METHOD method_56084 getIndex ()I + METHOD method_56998 shouldRunRollUpTask ()Z + METHOD method_56999 isRolledUp (J)Z + ARG 1 currentStateTicks + METHOD method_57000 getLengthInTicks ()I diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 5bec5e1d43..964f5d09db 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_43088 (Lnet/minecraft/class_6880;)V ARG 1 variant + METHOD method_6175 onTamedChanged ()V CLASS class_3698 CatFleeGoal FIELD field_16293 cat Lnet/minecraft/class_1451; METHOD (Lnet/minecraft/class_1451;Ljava/lang/Class;FDD)V diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping index b3fedc1445..e8cc6bce4f 100644 --- a/mappings/net/minecraft/entity/passive/GoatBrain.mapping +++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain FIELD field_33491 MAX_RAM_TARGET_DISTANCE I FIELD field_33492 LONG_JUMP_VERTICAL_RANGE I FIELD field_33493 LONG_JUMP_HORIZONTAL_RANGE I - FIELD field_33494 LONG_JUMP_MAX_RANGE F FIELD field_33495 MIN_RAM_TARGET_DISTANCE I FIELD field_33496 ADULT_RAM_STRENGTH_MULTIPLIER F FIELD field_33497 BABY_RAM_STRENGTH_MULTIPLIER F diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping index 3024ee7775..4f56fb604e 100644 --- a/mappings/net/minecraft/entity/passive/TameableEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TameableEntity.mapping @@ -8,16 +8,17 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity METHOD method_24345 isSitting ()Z METHOD method_24346 setSitting (Z)V ARG 1 sitting + METHOD method_56996 updateAttributesForTamed ()V METHOD method_6170 setOwner (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_6171 isOwner (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_6172 isInSittingPose ()Z - METHOD method_6173 setTamed (Z)V + METHOD method_6173 setTamed (ZZ)V ARG 1 tamed + ARG 2 updateAttributes METHOD method_6174 setOwnerUuid (Ljava/util/UUID;)V ARG 1 uuid - METHOD method_6175 onTamedChanged ()V METHOD method_6178 canAttackWithOwner (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 target ARG 2 owner diff --git a/mappings/net/minecraft/entity/projectile/AbstractWindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractWindChargeEntity.mapping new file mode 100644 index 0000000000..5ec26db86a --- /dev/null +++ b/mappings/net/minecraft/entity/projectile/AbstractWindChargeEntity.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_9236 net/minecraft/entity/projectile/AbstractWindChargeEntity + METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDD)V + ARG 1 type + ARG 2 world + ARG 3 owner + ARG 4 x + ARG 6 y + ARG 8 z + METHOD method_55055 createExplosion ()V + CLASS class_9237 WindChargeExplosionBehavior diff --git a/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping new file mode 100644 index 0000000000..29849a58f1 --- /dev/null +++ b/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9238 net/minecraft/entity/projectile/BreezeWindChargeEntity + FIELD field_49095 EXPLOSION_BEHAVIOR Lnet/minecraft/class_9236$class_9237; + FIELD field_49096 BASE_EXPLOSION_POWER F + METHOD (Lnet/minecraft/class_8949;Lnet/minecraft/class_1937;)V + ARG 1 breeze + ARG 2 world diff --git a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping index a8a377a1a0..fedce701e7 100644 --- a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping @@ -1,8 +1,18 @@ CLASS net/minecraft/class_8956 net/minecraft/entity/projectile/WindChargeEntity FIELD field_47579 EXPLOSION_BEHAVIOR Lnet/minecraft/class_8956$class_9036; - METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_8949;Lnet/minecraft/class_1937;)V - ARG 1 type - ARG 2 breeze - ARG 3 world - METHOD method_55055 createExplosion ()V + FIELD field_49097 BASE_EXPLOSION_POWER F + METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;DDD)V + ARG 1 player + ARG 2 world + ARG 3 x + ARG 5 y + ARG 7 z + METHOD (Lnet/minecraft/class_1937;DDDDDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 directionX + ARG 10 directionY + ARG 12 directionZ CLASS class_9036 WindChargeExplosionBehavior diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping index 9d483cf2f1..35c93a68e6 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping @@ -9,4 +9,3 @@ CLASS net/minecraft/class_1682 net/minecraft/entity/projectile/thrown/ThrownEnti ARG 1 type ARG 2 owner ARG 3 world - METHOD method_7490 getGravity ()F diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index dadc674625..553547e57d 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState FIELD field_25018 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3611;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V + METHOD (Lnet/minecraft/class_3611;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V ARG 1 fluid - ARG 2 propertiesMap + ARG 2 propertyMap ARG 3 codec METHOD method_15756 canFlowTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world diff --git a/mappings/net/minecraft/item/WindChargeItem.mapping b/mappings/net/minecraft/item/WindChargeItem.mapping new file mode 100644 index 0000000000..854112bee5 --- /dev/null +++ b/mappings/net/minecraft/item/WindChargeItem.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9239 net/minecraft/item/WindChargeItem + FIELD field_49099 COOLDOWN I diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping index eadbe59b1d..81b37f1e25 100644 --- a/mappings/net/minecraft/nbt/NbtHelper.mapping +++ b/mappings/net/minecraft/nbt/NbtHelper.mapping @@ -71,12 +71,13 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper COMMENT the element to test ARG 2 ignoreListOrder COMMENT whether to ignore ordering for {@link NbtList} - METHOD method_10691 toBlockPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338; + METHOD method_10691 toBlockPos (Lnet/minecraft/class_2487;Ljava/lang/String;)Ljava/util/Optional; COMMENT {@return the block position from the {@code nbt}} COMMENT COMMENT @see #fromBlockPos(BlockPos) ARG 0 nbt - METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; + ARG 1 key + METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2520; COMMENT {@return the serialized block position} COMMENT COMMENT @see #toBlockPos(NbtCompound) diff --git a/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping index 0af1dcb3f7..30d17b87aa 100644 --- a/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_8732 net/minecraft/network/listener/ClientConfiguratio ARG 1 packet METHOD method_52796 onFeatures (Lnet/minecraft/class_7832;)V ARG 1 packet + METHOD method_57045 onSelectKnownPacks (Lnet/minecraft/class_9250;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping index 155c956103..a082ea6357 100644 --- a/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_8735 net/minecraft/network/listener/ServerConfigurationPacketListener METHOD method_52408 onReady (Lnet/minecraft/class_8736;)V ARG 1 packet + METHOD method_56909 onSelectKnownPacks (Lnet/minecraft/class_9220;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/ConfigPackets.mapping b/mappings/net/minecraft/network/packet/ConfigPackets.mapping index fde35a3e6f..bc3c99355a 100644 --- a/mappings/net/minecraft/network/packet/ConfigPackets.mapping +++ b/mappings/net/minecraft/network/packet/ConfigPackets.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_9156 net/minecraft/network/packet/ConfigPackets FIELD field_48694 FINISH_CONFIGURATION_S2C Lnet/minecraft/class_9145; FIELD field_48697 FINISH_CONFIGURATION_C2S Lnet/minecraft/class_9145; + FIELD field_49018 SELECT_KNOWN_PACKS_S2C Lnet/minecraft/class_9145; + FIELD field_49019 SELECT_KNOWN_PACKS_C2S Lnet/minecraft/class_9145; METHOD method_56510 s2c (Ljava/lang/String;)Lnet/minecraft/class_9145; ARG 0 id METHOD method_56511 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145; diff --git a/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping b/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping new file mode 100644 index 0000000000..ef40d34b73 --- /dev/null +++ b/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9226 net/minecraft/network/packet/VersionedIdentifier + FIELD field_49035 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49036 DEFAULT_NAMESPACE Ljava/lang/String; + METHOD method_56931 isVanilla ()Z + METHOD method_56932 createVanilla (Ljava/lang/String;)Lnet/minecraft/class_9226; + ARG 0 path diff --git a/mappings/net/minecraft/network/packet/c2s/config/SelectKnownPacksC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/config/SelectKnownPacksC2SPacket.mapping new file mode 100644 index 0000000000..2c6451c846 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/config/SelectKnownPacksC2SPacket.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9220 net/minecraft/network/packet/c2s/config/SelectKnownPacksC2SPacket + FIELD field_49020 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/s2c/config/SelectKnownPacksS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/SelectKnownPacksS2CPacket.mapping new file mode 100644 index 0000000000..bb12abc7d7 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/config/SelectKnownPacksS2CPacket.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9250 net/minecraft/network/packet/s2c/config/SelectKnownPacksS2CPacket + FIELD field_49141 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping index 904aee6ece..0de8dafd00 100644 --- a/mappings/net/minecraft/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/registry/MutableRegistry.mapping @@ -3,10 +3,9 @@ CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry COMMENT Note that in vanilla, all registries are instances of this. COMMENT COMMENT @see Registry - METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883; + METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lnet/minecraft/class_9248;)Lnet/minecraft/class_6880$class_6883; ARG 1 key ARG 2 value - ARG 3 lifecycle METHOD method_35863 isEmpty ()Z COMMENT {@return whether the registry is empty} METHOD method_46769 createMutableEntryLookup ()Lnet/minecraft/class_7871; diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 8a8e6404d4..52a879ac3e 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -121,23 +121,13 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries METHOD method_47475 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47476 bootstrap ()V - METHOD method_47477 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; - ARG 0 key - ARG 1 lifecycle - ARG 2 initializer - METHOD method_47478 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_7923$class_6889;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385; + METHOD method_47478 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2385; ARG 0 key ARG 1 registry ARG 2 initializer - ARG 3 lifecycle METHOD method_47479 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; ARG 0 key ARG 1 initializer - METHOD method_47480 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; - ARG 0 key - ARG 1 defaultId - ARG 2 lifecycle - ARG 3 initializer METHOD method_47481 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; ARG 0 key ARG 1 defaultId @@ -150,11 +140,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries METHOD method_47484 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V ARG 1 registry METHOD method_47487 init ()V - METHOD method_47488 createIntrusive (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; - ARG 0 key - ARG 1 defaultId - ARG 2 lifecycle - ARG 3 initializer METHOD method_47489 createIntrusive (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; ARG 0 key ARG 1 defaultId diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index f9b1ec74d1..a2b6e347a8 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -175,9 +175,6 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry METHOD method_30517 getKey ()Lnet/minecraft/class_5321; COMMENT {@return the registry key that identifies this registry} METHOD method_31138 getLifecycle ()Lcom/mojang/serialization/Lifecycle; - METHOD method_31139 getEntryLifecycle (Ljava/lang/Object;)Lcom/mojang/serialization/Lifecycle; - COMMENT Gets the lifecycle of a registry entry. - ARG 1 entry METHOD method_31140 getOrThrow (Lnet/minecraft/class_5321;)Ljava/lang/Object; COMMENT {@return the value that is assigned {@code key}} COMMENT @@ -198,12 +195,6 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry ARG 0 registry ARG 1 key ARG 2 entry - METHOD method_39667 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; - ARG 1 id - METHOD method_39670 (Ljava/lang/Object;)I - ARG 1 value - METHOD method_39671 (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 value METHOD method_39673 getCodec ()Lcom/mojang/serialization/Codec; COMMENT {@return the codec for serializing {@code T}} COMMENT @@ -235,8 +226,6 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry COMMENT {@return a stream of all tag keys known to this registry} METHOD method_40276 freeze ()Lnet/minecraft/class_2378; METHOD method_40278 clearTags ()V - METHOD method_40285 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult; - ARG 1 entry METHOD method_40286 iterateEntries (Lnet/minecraft/class_6862;)Ljava/lang/Iterable; COMMENT {@return an iterable of values that are assigned {@code tag}, or an empty iterable COMMENT if the tag is not known to the registry} @@ -262,12 +251,6 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry METHOD method_46772 getTagCreatingWrapper ()Lnet/minecraft/class_7225$class_7226; COMMENT {@return a registry wrapper that creates and stores a new registry entry list COMMENT when handling an unknown tag key} - METHOD method_47441 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle; - ARG 1 entry - METHOD method_47442 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle; - ARG 1 entry - METHOD method_47443 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; - ARG 1 id METHOD method_47983 getEntry (Ljava/lang/Object;)Lnet/minecraft/class_6880; ARG 1 value METHOD method_47984 registerReference (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; diff --git a/mappings/net/minecraft/registry/RegistryCodecs.mapping b/mappings/net/minecraft/registry/RegistryCodecs.mapping index 44018e98b7..d447d72965 100644 --- a/mappings/net/minecraft/registry/RegistryCodecs.mapping +++ b/mappings/net/minecraft/registry/RegistryCodecs.mapping @@ -16,14 +16,3 @@ CLASS net/minecraft/class_6895 net/minecraft/registry/RegistryCodecs ARG 1 alwaysSerializeAsList COMMENT whether to always serialize the list as a list COMMENT instead of serializing as one entry if the length is {@code 0} - METHOD method_45944 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_2378; - ARG 2 entries - METHOD method_45945 (Lnet/minecraft/class_2378;)Ljava/util/Map; - ARG 0 registry - METHOD method_45946 (Lnet/minecraft/class_2385;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5321;Ljava/lang/Object;)V - ARG 2 key - ARG 3 value - METHOD method_45947 createKeyedRegistryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 0 registryRef - ARG 1 lifecycle - ARG 2 elementCodec diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping index 2111871f06..8418aa4ee8 100644 --- a/mappings/net/minecraft/registry/RegistryLoader.mapping +++ b/mappings/net/minecraft/registry/RegistryLoader.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader ARG 4 errors METHOD method_45123 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V ARG 1 entry - METHOD method_45124 (Ljava/lang/String;)V - ARG 0 error METHOD method_45125 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960; ARG 0 entry METHOD method_45126 writeLoadingError (Ljava/util/Map;)V @@ -53,19 +51,10 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader ARG 2 entries METHOD method_56516 (Ljava/lang/String;)V ARG 0 error - METHOD method_56517 (Ljava/util/Map;Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V - ARG 1 loader - ARG 2 infoGetter - METHOD method_56518 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V + METHOD method_56518 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V ARG 0 data - ARG 1 infoGetter - ARG 2 registry - ARG 3 elementDecoder - ARG 4 errors - METHOD method_56519 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890; + METHOD method_56519 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890; ARG 0 data - ARG 1 registryManager - ARG 2 entries CLASS class_7656 RegistryLoadable METHOD apply (Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V ARG 1 loader @@ -80,6 +69,5 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader METHOD method_56520 loadFromResource (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V ARG 1 resourceManager ARG 2 infoGetter - METHOD method_56521 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_6903$class_7863;)V + METHOD method_56521 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_6903$class_7863;)V ARG 1 data - ARG 2 infoGetter diff --git a/mappings/net/minecraft/registry/SerializableRegistries.mapping b/mappings/net/minecraft/registry/SerializableRegistries.mapping index 844649b391..7f96137e9e 100644 --- a/mappings/net/minecraft/registry/SerializableRegistries.mapping +++ b/mappings/net/minecraft/registry/SerializableRegistries.mapping @@ -6,21 +6,12 @@ CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries ARG 0 dynamicRegistryManager METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream; ARG 0 combinedRegistries - METHOD method_56595 (Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/List;Lnet/minecraft/class_6880$class_6883;)V - ARG 3 registryEntry - METHOD method_56596 (Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2378;)V - ARG 3 registry - METHOD method_56597 serialize (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;)V + METHOD method_56597 serialize (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;)V ARG 0 nbtOps - ARG 1 entry ARG 2 registryManager - ARG 3 callback - METHOD method_56598 forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;)V + METHOD method_56598 forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;)V ARG 0 nbtOps ARG 1 registryManager - ARG 2 callback - METHOD method_56599 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;Lnet/minecraft/class_7655$class_7657;)V - ARG 3 entry METHOD method_56600 (Lnet/minecraft/class_6880$class_6883;Ljava/lang/String;)Ljava/lang/IllegalArgumentException; ARG 1 error METHOD method_56601 (Lnet/minecraft/class_5455$class_6892;)Z diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping index 99cd184cf1..f89348be85 100644 --- a/mappings/net/minecraft/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry FIELD field_25067 keyToEntry Ljava/util/Map; FIELD field_26682 rawIdToEntry Lit/unimi/dsi/fastutil/objects/ObjectList; FIELD field_26683 entryToRawId Lit/unimi/dsi/fastutil/objects/Reference2IntMap; - FIELD field_26731 entryToLifecycle Ljava/util/Map; FIELD field_26732 lifecycle Lcom/mojang/serialization/Lifecycle; FIELD field_36461 valueToEntry Ljava/util/Map; FIELD field_36462 tagToEntryList Ljava/util/Map; diff --git a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping index 45d85bf747..01a700c9f5 100644 --- a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping +++ b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/class_3255 net/minecraft/resource/AbstractFileResourcePack FIELD field_14182 LOGGER Lorg/slf4j/Logger; - FIELD field_39993 name Ljava/lang/String; - FIELD field_40857 alwaysStable Z - METHOD (Ljava/lang/String;Z)V - ARG 1 name - ARG 2 alwaysStable METHOD method_14392 parseMetadata (Lnet/minecraft/class_3270;Ljava/io/InputStream;)Ljava/lang/Object; ARG 0 metaReader ARG 1 inputStream diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index 991f397ce1..f44c39ff60 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -4,11 +4,6 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack FIELD field_26938 metadata Lnet/minecraft/class_7662; FIELD field_40002 rootPaths Ljava/util/List; FIELD field_40003 namespacePaths Ljava/util/Map; - METHOD (Lnet/minecraft/class_7662;Ljava/util/Set;Ljava/util/List;Ljava/util/Map;)V - ARG 1 metadata - ARG 2 namespaces - ARG 3 rootPaths - ARG 4 namespacePaths METHOD method_14418 collectIdentifiers (Lnet/minecraft/class_3262$class_7664;Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/List;)V ARG 0 consumer ARG 1 namespace diff --git a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping index 4c157c6e44..79ae7a54c5 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping @@ -33,7 +33,7 @@ CLASS net/minecraft/class_7665 net/minecraft/resource/DefaultResourcePackBuilder ARG 2 path METHOD method_45209 exists (Ljava/nio/file/Path;)Z ARG 1 path - METHOD method_45210 build ()Lnet/minecraft/class_3268; + METHOD method_45210 build (Lnet/minecraft/class_9224;)Lnet/minecraft/class_3268; METHOD method_45211 (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)V ARG 1 type ARG 2 path diff --git a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping index a1a8e8f857..6c8e9bb5ef 100644 --- a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping +++ b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping @@ -2,10 +2,8 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack FIELD field_14187 LOGGER Lorg/slf4j/Logger; FIELD field_40000 SEPARATOR_JOINER Lcom/google/common/base/Joiner; FIELD field_40001 root Ljava/nio/file/Path; - METHOD (Ljava/lang/String;Ljava/nio/file/Path;Z)V - ARG 1 name + METHOD (Lnet/minecraft/class_9224;Ljava/nio/file/Path;)V ARG 2 root - ARG 3 alwaysStable METHOD method_14402 isValidPath (Ljava/nio/file/Path;)Z ARG 0 path METHOD method_45179 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)Lnet/minecraft/class_7367; @@ -33,7 +31,5 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack ARG 0 path CLASS class_8619 DirectoryBackedFactory FIELD field_45049 path Ljava/nio/file/Path; - FIELD field_45050 alwaysStable Z - METHOD (Ljava/nio/file/Path;Z)V + METHOD (Ljava/nio/file/Path;)V ARG 1 path - ARG 2 alwaysStable diff --git a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping index c3050244fc..baf797b343 100644 --- a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping @@ -9,18 +9,11 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider ARG 2 type ARG 3 source ARG 4 symlinkFinder - METHOD method_45271 forEachProfile (Ljava/nio/file/Path;Lnet/minecraft/class_8580;ZLjava/util/function/BiConsumer;)V + METHOD method_45271 forEachProfile (Ljava/nio/file/Path;Lnet/minecraft/class_8580;Ljava/util/function/BiConsumer;)V ARG 0 path ARG 1 symlinkFinder - ARG 2 alwaysStable - ARG 3 consumer METHOD method_45272 (Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_3288$class_7680;)V - ARG 2 path ARG 3 packFactory METHOD method_45273 getFileName (Ljava/nio/file/Path;)Ljava/lang/String; ARG 0 path CLASS class_8620 PackOpenerImpl - FIELD field_45055 alwaysStable Z - METHOD (Lnet/minecraft/class_8580;Z)V - ARG 1 symlinkFinder - ARG 2 alwaysStable diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping index 38d380f637..6ebcf30728 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -29,4 +29,3 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource COMMENT

This input stream is closed when this resource is closed. METHOD method_43039 getReader ()Ljava/io/BufferedReader; METHOD method_45304 getPack ()Lnet/minecraft/class_3262; - METHOD method_45305 isAlwaysStable ()Z diff --git a/mappings/net/minecraft/resource/ResourcePack.mapping b/mappings/net/minecraft/resource/ResourcePack.mapping index a46ecbcee5..51f0c0d38b 100644 --- a/mappings/net/minecraft/resource/ResourcePack.mapping +++ b/mappings/net/minecraft/resource/ResourcePack.mapping @@ -22,7 +22,4 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack METHOD method_14409 getName ()Ljava/lang/String; METHOD method_14410 openRoot ([Ljava/lang/String;)Lnet/minecraft/class_7367; ARG 1 segments - METHOD method_45178 isAlwaysStable ()Z - COMMENT {@return whether the dynamic registry entries from this pack are always - COMMENT "stable"/not experimental} CLASS class_7664 ResultConsumer diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping index 7afff65760..8cae08c26e 100644 --- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping @@ -8,68 +8,29 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile COMMENT

The profiles are registered by {@link ResourcePackProvider}s. COMMENT COMMENT

Closing the profile doesn't have any effect. - FIELD field_14270 pinned Z - FIELD field_14271 alwaysEnabled Z - FIELD field_14272 name Ljava/lang/String; FIELD field_14273 packFactory Lnet/minecraft/class_3288$class_7680; - FIELD field_14274 displayName Lnet/minecraft/class_2561; - FIELD field_14277 position Lnet/minecraft/class_3288$class_3289; FIELD field_14279 LOGGER Lorg/slf4j/Logger; - FIELD field_25346 source Lnet/minecraft/class_5352; - FIELD field_45056 metadata Lnet/minecraft/class_3288$class_7679; - METHOD (Ljava/lang/String;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_2561;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)V - ARG 1 name - ARG 2 alwaysEnabled - ARG 3 packFactory - ARG 4 displayName - ARG 5 metadata - ARG 6 position - ARG 7 pinned - ARG 8 source + FIELD field_49038 metaData Lnet/minecraft/class_3288$class_7679; + METHOD (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_9225;)V + ARG 2 packFactory + ARG 3 metaData METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_14456 of (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)Lnet/minecraft/class_3288; - COMMENT Creates a resource pack profile from the given parameters. - COMMENT - COMMENT

Compared to calling the factory directly, this utility method obtains the - COMMENT pack's metadata information from the pack created by the {@code packFactory}. - COMMENT If the created pack doesn't have metadata information, this method returns - COMMENT {@code null}. - COMMENT - COMMENT @return the created profile, or {@code null} if missing metadata - ARG 0 name - ARG 1 displayName - ARG 2 alwaysEnabled - ARG 3 packFactory - ARG 4 metadata - ARG 5 position - ARG 6 pinned - ARG 7 source METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_14458 createResourcePack ()Lnet/minecraft/class_3262; METHOD method_14459 getDescription ()Lnet/minecraft/class_2561; METHOD method_14460 getCompatibility ()Lnet/minecraft/class_3281; METHOD method_14461 getInformationText (Z)Lnet/minecraft/class_2561; ARG 1 enabled - METHOD method_14462 (ZLnet/minecraft/class_2583;)Lnet/minecraft/class_2583; - ARG 2 style METHOD method_14463 getName ()Ljava/lang/String; METHOD method_14464 isAlwaysEnabled ()Z METHOD method_14465 isPinned ()Z METHOD method_14466 getInitialPosition ()Lnet/minecraft/class_3288$class_3289; METHOD method_29483 getSource ()Lnet/minecraft/class_5352; - METHOD method_45274 loadMetadata (Ljava/lang/String;Lnet/minecraft/class_3288$class_7680;I)Lnet/minecraft/class_3288$class_7679; - ARG 0 name + METHOD method_45274 loadMetadata (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;I)Lnet/minecraft/class_3288$class_7679; ARG 1 packFactory ARG 2 currentPackFormat - METHOD method_45275 create (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3264;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; - ARG 0 name - ARG 1 displayName - ARG 2 alwaysEnabled - ARG 3 packFactory - ARG 4 type - ARG 5 position - ARG 6 source + METHOD method_45275 create (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3264;Lnet/minecraft/class_9225;)Lnet/minecraft/class_3288; METHOD method_45276 getRequestedFeatures ()Lnet/minecraft/class_7699; METHOD method_52440 getSupportedFormats (Ljava/lang/String;Lnet/minecraft/class_3272;)Lnet/minecraft/class_6497; ARG 0 packName @@ -83,8 +44,6 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile ARG 4 listInverted CLASS class_7679 Metadata CLASS class_7680 PackFactory - METHOD method_52424 open (Ljava/lang/String;)Lnet/minecraft/class_3262; - ARG 1 name - METHOD method_52425 openWithOverlays (Ljava/lang/String;Lnet/minecraft/class_3288$class_7679;)Lnet/minecraft/class_3262; - ARG 1 name + METHOD method_52424 open (Lnet/minecraft/class_9224;)Lnet/minecraft/class_3262; + METHOD method_52425 openWithOverlays (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7679;)Lnet/minecraft/class_3262; ARG 2 metadata diff --git a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping index 7a709b1d4d..0c95c1ebe0 100644 --- a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping +++ b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider FIELD field_26939 METADATA_MAP Lnet/minecraft/class_7662; - FIELD field_29782 NAME Lnet/minecraft/class_2561; FIELD field_40051 METADATA Lnet/minecraft/class_3272; FIELD field_40052 FEATURE_FLAGS Lnet/minecraft/class_7663; FIELD field_40053 ID Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/resource/ZipResourcePack.mapping b/mappings/net/minecraft/resource/ZipResourcePack.mapping index 555368f94f..549a6e2f6f 100644 --- a/mappings/net/minecraft/resource/ZipResourcePack.mapping +++ b/mappings/net/minecraft/resource/ZipResourcePack.mapping @@ -2,11 +2,8 @@ CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack FIELD field_39096 LOGGER Lorg/slf4j/Logger; FIELD field_45038 zipFile Lnet/minecraft/class_3258$class_8616; FIELD field_45039 overlay Ljava/lang/String; - METHOD (Ljava/lang/String;Lnet/minecraft/class_3258$class_8616;ZLjava/lang/String;)V - ARG 1 name + METHOD (Lnet/minecraft/class_9224;Lnet/minecraft/class_3258$class_8616;Ljava/lang/String;)V ARG 2 zipFile - ARG 3 alwaysStable - ARG 4 overlay METHOD method_14391 openFile (Ljava/lang/String;)Lnet/minecraft/class_7367; ARG 1 path METHOD method_45177 toPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String; @@ -19,13 +16,10 @@ CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack ARG 1 entryName CLASS class_8615 ZipBackedFactory FIELD field_45040 file Ljava/io/File; - FIELD field_45041 alwaysStable Z - METHOD (Ljava/io/File;Z)V + METHOD (Ljava/io/File;)V ARG 1 file - ARG 2 alwaysStable - METHOD (Ljava/nio/file/Path;Z)V + METHOD (Ljava/nio/file/Path;)V ARG 1 path - ARG 2 alwaysStable CLASS class_8616 ZipFileWrapper FIELD field_45042 file Ljava/io/File; FIELD field_45043 zip Ljava/util/zip/ZipFile; diff --git a/mappings/net/minecraft/server/command/DatapackCommand.mapping b/mappings/net/minecraft/server/command/DatapackCommand.mapping index 625e037e5a..b206e06eb6 100644 --- a/mappings/net/minecraft/server/command/DatapackCommand.mapping +++ b/mappings/net/minecraft/server/command/DatapackCommand.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_3027 net/minecraft/server/command/DatapackCommand METHOD method_13112 (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/List;Lnet/minecraft/class_3288;)V ARG 1 profiles ARG 2 profile - METHOD method_13113 (Lnet/minecraft/class_3288;)Lnet/minecraft/class_3288; - ARG 0 profilex METHOD method_13114 executeEnable (Lnet/minecraft/class_2168;Lnet/minecraft/class_3288;Lnet/minecraft/class_3027$class_3028;)I ARG 0 source ARG 1 container diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping index e2e1f4515f..22743d8862 100644 --- a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping @@ -13,6 +13,3 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN METHOD method_52410 endConfiguration ()V METHOD method_52411 queueSendResourcePackTask ()V METHOD method_52412 pollTask ()V - METHOD method_56530 (Lnet/minecraft/class_5321;Ljava/util/List;)V - ARG 1 registryRef - ARG 2 entries diff --git a/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping b/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping new file mode 100644 index 0000000000..b33004bb01 --- /dev/null +++ b/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9223 net/minecraft/server/network/SynchronizeRegistriesTask + FIELD field_49028 KEY Lnet/minecraft/class_8605$class_8606; diff --git a/mappings/net/minecraft/state/State.mapping b/mappings/net/minecraft/state/State.mapping index 5fe72d06bc..f06b2ade5a 100644 --- a/mappings/net/minecraft/state/State.mapping +++ b/mappings/net/minecraft/state/State.mapping @@ -1,30 +1,35 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State FIELD field_24737 PROPERTY_MAP_PRINTER Ljava/util/function/Function; - FIELD field_24738 entries Lcom/google/common/collect/ImmutableMap; + FIELD field_24738 propertyMap Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap; FIELD field_24739 owner Ljava/lang/Object; FIELD field_24740 codec Lcom/mojang/serialization/MapCodec; FIELD field_24741 withTable Lcom/google/common/collect/Table; FIELD field_31385 NAME Ljava/lang/String; FIELD field_31386 PROPERTIES Ljava/lang/String; - METHOD (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V + METHOD (Ljava/lang/Object;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V ARG 1 owner - ARG 2 entries + ARG 2 propertyMap ARG 3 codec METHOD method_11654 get (Lnet/minecraft/class_2769;)Ljava/lang/Comparable; ARG 1 property - METHOD method_11656 getEntries ()Lcom/google/common/collect/ImmutableMap; + METHOD method_11656 getEntries ()Ljava/util/Map; METHOD method_11657 with (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/Object; ARG 1 property ARG 2 value + METHOD method_28492 (Lnet/minecraft/class_2688;)Ljava/lang/Object; + ARG 0 state METHOD method_28493 cycle (Lnet/minecraft/class_2769;)Ljava/lang/Object; ARG 1 property METHOD method_28494 createCodec (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 codec ARG 1 ownerToStateFunction METHOD method_28495 getNext (Ljava/util/Collection;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 values ARG 1 value METHOD method_28496 createWithTable (Ljava/util/Map;)V ARG 1 states + METHOD method_28497 (Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/serialization/Codec; + ARG 1 owner METHOD method_28498 contains (Lnet/minecraft/class_2769;)Z ARG 1 property METHOD method_28499 toMapWith (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/util/Map; diff --git a/mappings/net/minecraft/state/StateManager.mapping b/mappings/net/minecraft/state/StateManager.mapping index d7401571e1..115d3b3573 100644 --- a/mappings/net/minecraft/state/StateManager.mapping +++ b/mappings/net/minecraft/state/StateManager.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager METHOD method_11669 validate (Lnet/minecraft/class_2769;)V ARG 1 property CLASS class_2691 Factory - METHOD create (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)Ljava/lang/Object; + METHOD create (Ljava/lang/Object;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)Ljava/lang/Object; ARG 1 owner - ARG 2 entries + ARG 2 propertyMap ARG 3 codec diff --git a/mappings/net/minecraft/test/Batches.mapping b/mappings/net/minecraft/test/Batches.mapping index da92a05bec..aaeb48ea6e 100644 --- a/mappings/net/minecraft/test/Batches.mapping +++ b/mappings/net/minecraft/test/Batches.mapping @@ -1,23 +1,18 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches FIELD field_48467 BATCH_SIZE I METHOD method_56188 defaultBatcher ()Lnet/minecraft/class_4520$class_9116; - METHOD method_56189 (Lnet/minecraft/class_3218;Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/List;)Lnet/minecraft/class_4514; - ARG 3 batchedFunctions METHOD method_56190 (Lnet/minecraft/class_3218;Ljava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 1 entry METHOD method_56191 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517; ARG 1 testFunction - METHOD method_56192 (Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/List;)Lnet/minecraft/class_4514; - ARG 2 batchStates METHOD method_56193 (Ljava/util/Collection;)Ljava/util/Collection; ARG 0 states METHOD method_56194 createBatches (Ljava/util/Collection;Lnet/minecraft/class_3218;)Ljava/util/Collection; ARG 0 testFunctions ARG 1 world - METHOD method_56195 create (Ljava/util/List;Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;)Lnet/minecraft/class_4514; + METHOD method_56195 create (Ljava/util/List;Ljava/lang/String;J)Lnet/minecraft/class_4514; ARG 0 states ARG 1 batchId - ARG 2 index METHOD method_56196 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 0 entry METHOD method_56197 (Lnet/minecraft/class_4517;)Ljava/lang/String; diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9235.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9235.mapping new file mode 100644 index 0000000000..9ae234b625 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9235.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9235 net/minecraft/unused/packageinfo/PackageInfo9235 diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping index 8ea132987f..6b8d86213c 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping @@ -13,12 +13,10 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport ARG 1 statistics METHOD method_38013 collectHeapSection (Lnet/minecraft/class_6525$class_6526;)Lcom/google/gson/JsonElement; ARG 1 statistics - METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6767;)Lcom/google/gson/JsonElement; + METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6767;Ljava/util/function/BiConsumer;)Lcom/google/gson/JsonElement; ARG 1 statistics METHOD method_38015 collectThreadAllocationSection (Lnet/minecraft/class_6530$class_6531;)Lcom/google/gson/JsonElement; ARG 1 statistics - METHOD method_38016 (Lcom/google/gson/JsonArray;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 pair METHOD method_38017 (Lcom/google/gson/JsonArray;Ljava/lang/String;Ljava/lang/Double;)V ARG 1 threadName ARG 2 allocation diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping index ae4f893419..2b22b64fb6 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord ARG 1 event ARG 2 samples ARG 3 bytesKey - METHOD method_39432 (Lnet/minecraft/class_6767$class_6769;)Lnet/minecraft/class_6516$class_6766; + METHOD method_39432 (Lnet/minecraft/class_6769;)Lnet/minecraft/class_6516$class_6766; ARG 0 packet METHOD method_39433 createNetworkIoStatistics (Ljava/time/Duration;Ljava/util/Map;)Lnet/minecraft/class_6767; ARG 0 duration diff --git a/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping new file mode 100644 index 0000000000..0d477585c1 --- /dev/null +++ b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_9232 net/minecraft/util/profiling/jfr/event/ChunkRegionEvent + FIELD levelId worldId Ljava/lang/String; + METHOD (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V + ARG 4 bytes + CLASS class_9233 Constants + FIELD field_49059 regionPosX Ljava/lang/String; + FIELD field_49060 regionPosZ Ljava/lang/String; + FIELD field_49061 localPosX Ljava/lang/String; + FIELD field_49062 localPosZ Ljava/lang/String; + FIELD field_49063 chunkPosX Ljava/lang/String; + FIELD field_49064 chunkPosZ Ljava/lang/String; + FIELD field_49065 world Ljava/lang/String; + FIELD field_49066 dimension Ljava/lang/String; + FIELD field_49067 type Ljava/lang/String; + FIELD field_49068 compression Ljava/lang/String; + FIELD field_49069 bytes Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping index 03575183b4..e1ac280700 100644 --- a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping @@ -14,8 +14,3 @@ CLASS net/minecraft/class_6767 net/minecraft/util/profiling/jfr/sample/NetworkIo FIELD field_35586 COMPARATOR Ljava/util/Comparator; METHOD method_39444 add (Lnet/minecraft/class_6767$class_6768;)Lnet/minecraft/class_6767$class_6768; ARG 1 statistics - CLASS class_6769 Packet - FIELD comp_259 side Ljava/lang/String; - METHOD comp_259 side ()Ljava/lang/String; - METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6767$class_6769; - ARG 0 event diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping new file mode 100644 index 0000000000..cc4e3508cb --- /dev/null +++ b/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_6769 net/minecraft/util/profiling/jfr/sample/Packet + FIELD comp_259 side Ljava/lang/String; + METHOD comp_259 side ()Ljava/lang/String; + METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6769; + ARG 0 event diff --git a/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping b/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping index 8ded369e15..c5dc3d86b5 100644 --- a/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping @@ -14,13 +14,10 @@ CLASS net/minecraft/class_7723 net/minecraft/world/dimension/DimensionOptionsReg ARG 0 dimensionOptions METHOD method_45518 toConfig (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7723$class_7725; ARG 1 existingRegistry - METHOD method_45519 createRegistry (Lnet/minecraft/class_2378;Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378; - ARG 0 currentRegistry - ARG 1 overworldEntry + METHOD method_45519 createRegistry (Ljava/util/Map;Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)Ljava/util/Map; ARG 2 chunkGenerator - METHOD method_45520 createRegistry (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378; + METHOD method_45520 createRegistry (Lnet/minecraft/class_2378;Ljava/util/Map;Lnet/minecraft/class_2794;)Ljava/util/Map; ARG 0 dynamicRegistry - ARG 1 currentRegistry ARG 2 chunkGenerator METHOD method_45521 (Lnet/minecraft/class_2378;Ljava/util/List;Lnet/minecraft/class_5321;)V ARG 3 key @@ -49,7 +46,6 @@ CLASS net/minecraft/class_7723 net/minecraft/world/dimension/DimensionOptionsReg METHOD method_45534 (Lnet/minecraft/class_5363;)Lnet/minecraft/class_31$class_7729; ARG 0 overworldEntry CLASS class_7724 Entry - METHOD method_45535 getLifecycle ()Lcom/mojang/serialization/Lifecycle; CLASS class_7725 DimensionsConfig METHOD method_45536 getLifecycle ()Lcom/mojang/serialization/Lifecycle; METHOD method_45537 toDynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890; diff --git a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping index ba80411383..a2dc6966b7 100644 --- a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping +++ b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping @@ -17,3 +17,4 @@ CLASS net/minecraft/class_5362 net/minecraft/world/explosion/ExplosionBehavior METHOD method_55504 shouldDamage (Lnet/minecraft/class_1927;Lnet/minecraft/class_1297;)Z ARG 1 explosion ARG 2 entity + METHOD method_57007 getKnockbackModifier ()F diff --git a/mappings/net/minecraft/world/gen/WorldPreset.mapping b/mappings/net/minecraft/world/gen/WorldPreset.mapping index 6d69ab511b..a6a0bd9353 100644 --- a/mappings/net/minecraft/world/gen/WorldPreset.mapping +++ b/mappings/net/minecraft/world/gen/WorldPreset.mapping @@ -9,9 +9,6 @@ CLASS net/minecraft/class_7145 net/minecraft/world/gen/WorldPreset ARG 0 instance METHOD method_41588 (Lnet/minecraft/class_7145;)Ljava/util/Map; ARG 0 preset - METHOD method_41589 (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;)V - ARG 2 registryKey - METHOD method_41591 createDimensionOptionsRegistry ()Lnet/minecraft/class_2378; METHOD method_44351 validate (Lnet/minecraft/class_7145;)Lcom/mojang/serialization/DataResult; ARG 0 preset METHOD method_45546 createDimensionsRegistryHolder ()Lnet/minecraft/class_7723; diff --git a/mappings/net/minecraft/world/gen/WorldPresets.mapping b/mappings/net/minecraft/world/gen/WorldPresets.mapping index 0a199ef695..dbea58e7cc 100644 --- a/mappings/net/minecraft/world/gen/WorldPresets.mapping +++ b/mappings/net/minecraft/world/gen/WorldPresets.mapping @@ -7,8 +7,7 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets FIELD field_35757 AMPLIFIED Lnet/minecraft/class_5321; METHOD method_41593 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 presetRegisterable - METHOD method_41594 getWorldPreset (Lnet/minecraft/class_2378;)Ljava/util/Optional; - ARG 0 registry + METHOD method_41594 getWorldPreset (Lnet/minecraft/class_7723;)Ljava/util/Optional; METHOD method_41597 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_41598 createDemoOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723; diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index 2d27abc887..d5a57f3b28 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -1,12 +1,6 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage FIELD field_18484 pointOfInterestDistanceTracker Lnet/minecraft/class_4153$class_4154; FIELD field_20688 preloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet; - METHOD (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V - ARG 1 path - ARG 2 dataFixer - ARG 3 dsync - ARG 4 registryManager - ARG 5 world METHOD method_19112 remove (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_19113 (Lnet/minecraft/class_2338;ILnet/minecraft/class_4156;)Z diff --git a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping index e2ec92f403..a7beb15489 100644 --- a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping +++ b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping @@ -2,11 +2,7 @@ CLASS net/minecraft/class_9172 net/minecraft/world/storage/ChunkPosKeyedStorage FIELD field_48760 worker Lnet/minecraft/class_4698; FIELD field_48761 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_48762 dataFixTypes Lnet/minecraft/class_4284; - METHOD (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/lang/String;Lnet/minecraft/class_4284;)V - ARG 1 directory - ARG 2 dataFixer - ARG 3 dsync - ARG 4 name + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_4284;)V ARG 5 dataFixTypes METHOD method_56565 set (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos diff --git a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping index a679f9da05..3096ef698a 100644 --- a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping @@ -1,8 +1,3 @@ CLASS net/minecraft/class_9170 net/minecraft/world/storage/RecreatedChunkStorage FIELD field_48748 recreationWorker Lnet/minecraft/class_4698; FIELD field_48749 outputDirectory Ljava/nio/file/Path; - METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V - ARG 1 directory - ARG 2 outputDirectory - ARG 3 dataFixer - ARG 4 dsync diff --git a/mappings/net/minecraft/world/storage/RecreationStorage.mapping b/mappings/net/minecraft/world/storage/RecreationStorage.mapping index 7e8689b8ea..cef5cd7b30 100644 --- a/mappings/net/minecraft/world/storage/RecreationStorage.mapping +++ b/mappings/net/minecraft/world/storage/RecreationStorage.mapping @@ -1,10 +1,3 @@ CLASS net/minecraft/class_9171 net/minecraft/world/storage/RecreationStorage FIELD field_48750 recreationWorker Lnet/minecraft/class_4698; FIELD field_48751 outputDirectory Ljava/nio/file/Path; - METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/lang/String;Lnet/minecraft/class_4284;)V - ARG 1 directory - ARG 2 outputDirectory - ARG 3 dataFixer - ARG 4 dsync - ARG 5 name - ARG 6 dataFixTypes diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping index 44fbc1af2d..a42ff95720 100644 --- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping @@ -4,9 +4,6 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage FIELD field_23748 dsync Z FIELD field_31425 MCA_EXTENSION Ljava/lang/String; FIELD field_31426 MAX_CACHE_SIZE I - METHOD (Ljava/nio/file/Path;Z)V - ARG 1 directory - ARG 2 dsync METHOD method_12440 getRegionFile (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2861; ARG 1 pos METHOD method_17911 getTagAt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index c1442faa6e..442064177f 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -11,15 +11,8 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile FIELD field_31417 SECTOR_DATA_LIMIT I FIELD field_31421 FILE_EXTENSION Ljava/lang/String; FIELD field_48752 path Ljava/nio/file/Path; - METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V - ARG 1 path + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V ARG 2 directory - ARG 3 compressionFormat - ARG 4 dsync - METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V - ARG 1 file - ARG 2 directory - ARG 3 dsync METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I ARG 1 pos METHOD method_12423 hasChunk (Lnet/minecraft/class_1923;)Z diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index db979f08d0..1f78a2716e 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -6,10 +6,6 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker FIELD field_24468 executor Lnet/minecraft/class_3846; FIELD field_38240 blendingStatusCaches Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; FIELD field_38241 MAX_CACHE_SIZE I - METHOD (Ljava/nio/file/Path;ZLjava/lang/String;)V - ARG 1 directory - ARG 2 dsync - ARG 3 name METHOD method_23698 completeAll (Z)Ljava/util/concurrent/CompletableFuture; ARG 1 sync METHOD method_23701 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_4698$class_4699;)V diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index 5ddd3e1c0d..2cbf14c1df 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage FIELD field_17655 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_21494 worker Lnet/minecraft/class_4698; FIELD field_36219 FEATURE_UPDATING_VERSION I - METHOD (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V - ARG 1 directory - ARG 2 dataFixer - ARG 3 dsync METHOD method_17907 updateChunkNbt (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;Ljava/util/Optional;)Lnet/minecraft/class_2487; ARG 1 worldKey ARG 2 persistentStateManagerFactory diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index cfd5ebae25..9eebe666c2 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -52,19 +52,12 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_48735 upgradingText Lnet/minecraft/class_5250; FIELD field_48736 finishedText Lnet/minecraft/class_5250; FIELD field_48737 targetName Ljava/lang/String; - METHOD (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V - ARG 2 dataFixTypes - ARG 3 targetName - ARG 4 upgradingText - ARG 5 finishedText METHOD method_56537 update ()V METHOD method_56538 update (Lnet/minecraft/class_5321;Ljava/lang/AutoCloseable;Lnet/minecraft/class_1923;)Z ARG 1 worldKey ARG 2 storage ARG 3 chunkPos - METHOD method_56539 listRegions (Lnet/minecraft/class_5321;Ljava/lang/String;)Ljava/util/List; - ARG 1 worldKey - ARG 2 targetName + METHOD method_56539 listRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/List; METHOD method_56540 (Lnet/minecraft/class_1257$class_9165;)I ARG 0 region METHOD method_56541 recreate (Lnet/minecraft/class_2861;)V @@ -76,15 +69,10 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater ARG 1 storage ARG 2 chunkPos ARG 3 worldKey - METHOD method_56544 listWoldData (Ljava/lang/String;)Ljava/util/List; - ARG 1 targetName - METHOD method_56545 enumerateRegions (Ljava/lang/String;Lnet/minecraft/class_5321;)Ljava/util/ListIterator; - ARG 1 targetName - ARG 2 worldKey - METHOD method_56546 openStorage (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable; - ARG 1 targetName + METHOD method_56544 listWoldData ()Ljava/util/List; + METHOD method_56545 enumerateRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/ListIterator; + METHOD method_56546 openStorage (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable; ARG 2 worldDirectory - ARG 3 targetDirectory CLASS class_9162 RegionUpdate CLASS class_9163 WorldData CLASS class_9164 EntitiesUpdate diff --git a/unpick-definitions/entity_status.unpick b/unpick-definitions/entity_status.unpick index 0c85fc9ed1..7a8cba5fb9 100644 --- a/unpick-definitions/entity_status.unpick +++ b/unpick-definitions/entity_status.unpick @@ -56,6 +56,7 @@ constant entity_statuses net/minecraft/entity/EntityStatuses ADD_DEATH_PARTICLES constant entity_statuses net/minecraft/entity/EntityStatuses EARS_TWITCH constant entity_statuses net/minecraft/entity/EntityStatuses SONIC_BOOM constant entity_statuses net/minecraft/entity/EntityStatuses START_DIGGING +constant entity_statuses net/minecraft/entity/EntityStatuses PEEKING target_method net/minecraft/entity/Entity handleStatus (B)V param 0 entity_statuses