diff --git a/build.gradle b/build.gradle index 38efc6624a..12161240f8 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ buildscript { } } dependencies { - classpath "cuchaz:enigma:0.14.2.143" - classpath "net.fabricmc:stitch:0.4.0.67" + classpath "cuchaz:enigma:0.14.3.146" + classpath "net.fabricmc:stitch:0.4.1.68" classpath "commons-io:commons-io:2.6" classpath "com.google.guava:guava:28.0-jre" classpath 'de.undercouch:gradle-download-task:3.4.3' @@ -48,8 +48,8 @@ configurations { } dependencies { - enigmaRuntime "net.fabricmc:stitch:0.4.0.67" - enigmaRuntime "cuchaz:enigma:0.14.2.143" + enigmaRuntime "net.fabricmc:stitch:0.4.1.68" + enigmaRuntime "cuchaz:enigma:0.14.3.146" } def setupGroup = "jar setup" @@ -71,9 +71,11 @@ def libs = new File("build/libs/") import com.google.common.hash.Hashing +import com.google.common.collect.Iterables import cuchaz.enigma.command.CheckMappingsCommand import cuchaz.enigma.command.ComposeMappingsCommand import cuchaz.enigma.command.ConvertMappingsCommand +import cuchaz.enigma.command.MapSpecializedMethodsCommand import groovy.io.FileType import groovy.json.JsonSlurper import net.fabricmc.stitch.commands.CommandMergeTiny @@ -88,6 +90,9 @@ import net.fabricmc.tinyremapper.TinyUtils import org.apache.commons.io.FileUtils import java.nio.charset.StandardCharsets +import java.nio.file.FileSystems +import java.nio.file.Files +import java.nio.file.Path import java.util.zip.GZIPOutputStream boolean validateChecksum(File file, String checksum) { @@ -340,7 +345,7 @@ task checkMappings { } } -task buildYarnTiny(dependsOn: mergeJars, type: WithV2FileOutput) { +task buildYarnTiny(dependsOn: mapIntermediaryJar, type: WithV2FileOutput) { group = buildMappingGroup inputs.dir mappingsDir if (!libs.exists()) { @@ -355,22 +360,19 @@ task buildYarnTiny(dependsOn: mergeJars, type: WithV2FileOutput) { doLast { logger.lifecycle(":generating tiny mappings") - String[] v1Args = [ - "enigma", - mappingsDir.getAbsolutePath(), - "tiny:intermediary:named", - v1Output.getAbsolutePath() - ] + new MapSpecializedMethodsCommand().run( + intermediaryJar.getAbsolutePath(), + "enigma", + mappingsDir.getAbsolutePath(), + "tinyv2:intermediary:named", + v2Output.getAbsolutePath() + ) - String[] v2Args = [ - "enigma", - mappingsDir.getAbsolutePath(), - "tinyv2:intermediary:named", - v2Output.getAbsolutePath() - ] - - new ConvertMappingsCommand().run(v1Args) - new ConvertMappingsCommand().run(v2Args) + new ConvertMappingsCommand().run( + "tinyv2", + v2Output.getAbsolutePath(), + "tiny:intermediary:named", + v1Output.getAbsolutePath()) } } @@ -411,8 +413,8 @@ task mergeTiny(dependsOn: ["buildYarnTiny", "invertIntermediary"], type: FileOut task tinyJar(type: Jar, dependsOn: mergeTiny) { group = buildMappingGroup outputs.upToDateWhen { false } - archiveName = "yarn-${yarnVersion}.jar" - destinationDir(file("build/libs")) + archiveFileName = "yarn-${yarnVersion}.jar" + destinationDirectory.set(file("build/libs")) classifier = "" from(mergeTiny.output) { rename { "mappings/mappings.tiny" } @@ -568,12 +570,12 @@ task v2UnmergedYarnJar(dependsOn: insertAutoGeneratedEnumMappings, type: Jar) { def mappings = insertAutoGeneratedEnumMappings.output group = "mapping build" outputs.upToDateWhen { false } - archiveName = "yarn-${yarnVersion}-v2.jar" + archiveFileName = "yarn-${yarnVersion}-v2.jar" from(file(mappings)) { rename mappings.name, "mappings/mappings.tiny" } - destinationDir(file("build/libs")) + destinationDirectory.set(file("build/libs")) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf016..cc4fdc293d 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 290541c738..1ba7206f88 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0ab5d..2fe81a7d95 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -154,19 +154,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9991c50326..9618d8d960 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS, diff --git a/mappings/com/mojang/realmsclient/client/Ping.mapping b/mappings/com/mojang/realmsclient/client/Ping.mapping index 784487b37a..10c6eaf50e 100644 --- a/mappings/com/mojang/realmsclient/client/Ping.mapping +++ b/mappings/com/mojang/realmsclient/client/Ping.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_4339 com/mojang/realmsclient/client/Ping - CLASS 1 - METHOD method_20986 compare (Lcom/mojang/realmsclient/dto/RegionPingResult;Lcom/mojang/realmsclient/dto/RegionPingResult;)I - ARG 1 o1 - ARG 2 o2 CLASS class_4340 Region FIELD field_19565 US_EAST_1 Lnet/minecraft/class_4339$class_4340; FIELD field_19566 US_WEST_2 Lnet/minecraft/class_4339$class_4340; diff --git a/mappings/com/mojang/realmsclient/client/Request.mapping b/mappings/com/mojang/realmsclient/client/Request.mapping index a37cc33b2f..4aa0fe0193 100644 --- a/mappings/com/mojang/realmsclient/client/Request.mapping +++ b/mappings/com/mojang/realmsclient/client/Request.mapping @@ -4,15 +4,11 @@ CLASS net/minecraft/class_4346 com/mojang/realmsclient/client/Request ARG 1 uri ARG 2 connectTimeout ARG 3 readTimeout - METHOD method_21055 doConnect ()Lnet/minecraft/class_4346; - METHOD method_21057 doConnect ()Lnet/minecraft/class_4346$class_4347; CLASS class_4348 Get METHOD (Ljava/lang/String;II)V ARG 1 uri ARG 2 connectTimeout ARG 3 readTimeout - METHOD method_21055 doConnect ()Lnet/minecraft/class_4346; - METHOD method_21058 doConnect ()Lnet/minecraft/class_4346$class_4348; CLASS class_4349 Post FIELD field_19599 content Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;II)V @@ -20,8 +16,6 @@ CLASS net/minecraft/class_4346 com/mojang/realmsclient/client/Request ARG 2 content ARG 3 connectTimeout ARG 4 readTimeout - METHOD method_21055 doConnect ()Lnet/minecraft/class_4346; - METHOD method_21059 doConnect ()Lnet/minecraft/class_4346$class_4349; CLASS class_4350 Put FIELD field_19600 content Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;II)V @@ -29,8 +23,6 @@ CLASS net/minecraft/class_4346 com/mojang/realmsclient/client/Request ARG 2 content ARG 3 connectTimeout ARG 4 readTimeout - METHOD method_21055 doConnect ()Lnet/minecraft/class_4346; - METHOD method_21060 doConnect ()Lnet/minecraft/class_4346$class_4350; FIELD field_19596 connection Ljava/net/HttpURLConnection; FIELD field_19597 url Ljava/lang/String; FIELD field_19598 connected Z diff --git a/mappings/com/mojang/realmsclient/dto/RealmsServer.mapping b/mappings/com/mojang/realmsclient/dto/RealmsServer.mapping index 66ce8ea896..feb217370b 100644 --- a/mappings/com/mojang/realmsclient/dto/RealmsServer.mapping +++ b/mappings/com/mojang/realmsclient/dto/RealmsServer.mapping @@ -1,13 +1,9 @@ CLASS com/mojang/realmsclient/dto/RealmsServer - CLASS 1 - METHOD method_20829 compare (Lcom/mojang/realmsclient/dto/PlayerInfo;Lcom/mojang/realmsclient/dto/PlayerInfo;)I - ARG 1 o1 - ARG 2 o2 CLASS class_4319 McoServerComparator FIELD field_19432 refOwner Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 owner - METHOD method_20830 compare (Lcom/mojang/realmsclient/dto/RealmsServer;Lcom/mojang/realmsclient/dto/RealmsServer;)I + METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I ARG 1 server1 ARG 2 server2 CLASS class_4320 State diff --git a/mappings/com/mojang/realmsclient/gui/ChatFormatting.mapping b/mappings/com/mojang/realmsclient/gui/ChatFormatting.mapping deleted file mode 100644 index 82b6f7fa3a..0000000000 --- a/mappings/com/mojang/realmsclient/gui/ChatFormatting.mapping +++ /dev/null @@ -1,38 +0,0 @@ -CLASS net/minecraft/class_4357 com/mojang/realmsclient/gui/ChatFormatting - FIELD field_19609 isFormat Z - FIELD field_19610 toString Ljava/lang/String; - FIELD field_19612 BLACK Lnet/minecraft/class_4357; - FIELD field_19613 DARK_BLUE Lnet/minecraft/class_4357; - FIELD field_19614 DARK_GREEN Lnet/minecraft/class_4357; - FIELD field_19615 DARK_AQUA Lnet/minecraft/class_4357; - FIELD field_19616 DARK_RED Lnet/minecraft/class_4357; - FIELD field_19617 DARK_PURPLE Lnet/minecraft/class_4357; - FIELD field_19618 GOLD Lnet/minecraft/class_4357; - FIELD field_19619 GRAY Lnet/minecraft/class_4357; - FIELD field_19620 DARK_GRAY Lnet/minecraft/class_4357; - FIELD field_19621 BLUE Lnet/minecraft/class_4357; - FIELD field_19622 GREEN Lnet/minecraft/class_4357; - FIELD field_19623 AQUA Lnet/minecraft/class_4357; - FIELD field_19624 RED Lnet/minecraft/class_4357; - FIELD field_19625 LIGHT_PURPLE Lnet/minecraft/class_4357; - FIELD field_19626 YELLOW Lnet/minecraft/class_4357; - FIELD field_19627 WHITE Lnet/minecraft/class_4357; - FIELD field_19628 OBFUSCATED Lnet/minecraft/class_4357; - FIELD field_19629 BOLD Lnet/minecraft/class_4357; - FIELD field_19630 STRIKETHROUGH Lnet/minecraft/class_4357; - FIELD field_19631 UNDERLINE Lnet/minecraft/class_4357; - FIELD field_19632 ITALIC Lnet/minecraft/class_4357; - FIELD field_19633 RESET Lnet/minecraft/class_4357; - FIELD field_19634 FORMATTING_BY_CHAR Ljava/util/Map; - FIELD field_19635 FORMATTING_BY_NAME Ljava/util/Map; - FIELD field_19636 STRIP_FORMATTING_PATTERN Ljava/util/regex/Pattern; - FIELD field_19637 code C - METHOD (Ljava/lang/String;IC)V - ARG 3 code - METHOD (Ljava/lang/String;ICZ)V - ARG 3 code - ARG 4 isFormat - METHOD method_21061 getChar ()C - METHOD method_21063 getName ()Ljava/lang/String; - METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/class_4357; - ARG 0 name diff --git a/mappings/com/mojang/realmsclient/gui/RealmsConstants.mapping b/mappings/com/mojang/realmsclient/gui/RealmsConstants.mapping new file mode 100644 index 0000000000..6985a1f090 --- /dev/null +++ b/mappings/com/mojang/realmsclient/gui/RealmsConstants.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4359 com/mojang/realmsclient/gui/RealmsConstants + METHOD method_21072 row (I)I + ARG 0 i diff --git a/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping b/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping index 50c962cb59..40ad288373 100644 --- a/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping +++ b/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping @@ -7,6 +7,10 @@ CLASS net/minecraft/class_4367 com/mojang/realmsclient/gui/RealmsWorldSlotButton ARG 0 name CLASS class_4369 Listener METHOD method_21108 onSlotClick (ILnet/minecraft/class_4367$class_4368;ZZ)V + ARG 1 slotIndex + ARG 2 action + ARG 3 minigame + ARG 4 empty CLASS class_4370 State FIELD field_19682 isCurrentlyActiveSlot Z FIELD field_19683 slotName Ljava/lang/String; diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping new file mode 100644 index 0000000000..7e4265f4b4 --- /dev/null +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_4371 com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton + FIELD field_19690 width I + FIELD field_19691 height I + FIELD field_19692 x I + FIELD field_19693 y I + METHOD (IIII)V + ARG 1 width + ARG 2 height + ARG 3 x + ARG 4 y + METHOD method_21109 getRight ()I + METHOD method_21110 handleClick (I)V + ARG 1 index + METHOD method_21111 render (IIII)V + ARG 1 offsetX + ARG 2 offsetY + ARG 3 mouseX + ARG 4 mouseY + METHOD method_21112 render (IIZ)V + ARG 1 x + ARG 2 y + ARG 3 hovered + METHOD method_21113 render (Ljava/util/List;Lnet/minecraft/realms/RealmsObjectSelectionList;IIII)V + ARG 0 buttons + ARG 1 selectionList + ARG 2 offsetX + ARG 3 offsetY + ARG 4 mouseX + ARG 5 mouseY + METHOD method_21114 handleClick (Lnet/minecraft/realms/RealmsObjectSelectionList;Lnet/minecraft/realms/RealmListEntry;Ljava/util/List;IDD)V + ARG 0 selectionList + ARG 1 entry + ARG 2 buttons + ARG 3 button + ARG 4 mouseX + ARG 6 mouseY + METHOD method_21115 getBottom ()I diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping index d2da66f18f..c4e903b203 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping @@ -25,11 +25,6 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu ARG 1 eventKey ARG 2 scancode ARG 3 mods - METHOD method_21108 onSlotClick (ILnet/minecraft/class_4367$class_4368;ZZ)V - ARG 1 slotIndex - ARG 2 action - ARG 3 minigame - ARG 4 empty METHOD method_21198 stateChanged ()V METHOD method_21199 addSlotButton (I)V ARG 1 i @@ -59,8 +54,6 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu ARG 1 serverData METHOD method_21208 saveSlotSettings (Lcom/mojang/realmsclient/dto/RealmsWorldOptions;)V ARG 1 options - METHOD method_21209 callback (Lcom/mojang/realmsclient/dto/WorldTemplate;)V - ARG 1 worldTemplate METHOD method_21214 renderMousehoverTooltip (Ljava/lang/String;II)V ARG 1 msg ARG 2 x @@ -110,7 +103,6 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu METHOD method_21241 showRegularButtons ()V METHOD method_21242 hideMinigameButtons ()V METHOD method_21243 showMinigameButtons ()V - METHOD method_21395 callback (Ljava/lang/Object;)V METHOD mouseClicked (DDI)Z ARG 1 x ARG 3 y diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping index 6fc3d23e7a..8664d83daa 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping @@ -136,8 +136,6 @@ CLASS net/minecraft/class_4410 com/mojang/realmsclient/gui/screens/RealmsResetWo ARG 7 resetType ARG 8 hoveredOrFocused ARG 9 hovered - METHOD method_21371 callback (Lcom/mojang/realmsclient/dto/WorldTemplate;)V - ARG 1 worldTemplate METHOD method_21372 resetWorld (Lnet/minecraft/class_4410$class_4413;)V ARG 1 resetWorldInfo METHOD method_21376 setResetTitle (Ljava/lang/String;)V @@ -153,7 +151,6 @@ CLASS net/minecraft/class_4410 com/mojang/realmsclient/gui/screens/RealmsResetWo ARG 1 resetWorldInfo METHOD method_21384 frame (I)I ARG 1 i - METHOD method_21395 callback (Ljava/lang/Object;)V METHOD mouseClicked (DDI)Z ARG 1 x ARG 3 y diff --git a/mappings/com/mojang/realmsclient/util/RealmsTasks.mapping b/mappings/com/mojang/realmsclient/util/RealmsTasks.mapping index eb4203b0ab..a0f0d12bef 100644 --- a/mappings/com/mojang/realmsclient/util/RealmsTasks.mapping +++ b/mappings/com/mojang/realmsclient/util/RealmsTasks.mapping @@ -31,8 +31,6 @@ CLASS net/minecraft/class_4434 com/mojang/realmsclient/util/RealmsTasks METHOD (Lnet/minecraft/realms/RealmsScreen;Lcom/mojang/realmsclient/dto/RealmsServerAddress;)V ARG 1 lastScreen ARG 2 address - METHOD method_21068 tick ()V - METHOD method_21071 abortTask ()V CLASS class_4439 RealmsGetServerDetailsTask FIELD field_20224 server Lcom/mojang/realmsclient/dto/RealmsServer; FIELD field_20225 lastScreen Lnet/minecraft/realms/RealmsScreen; diff --git a/mappings/com/mojang/realmsclient/util/RealmsUtil.mapping b/mappings/com/mojang/realmsclient/util/RealmsUtil.mapping index 4741aff407..3f1ec86fdc 100644 --- a/mappings/com/mojang/realmsclient/util/RealmsUtil.mapping +++ b/mappings/com/mojang/realmsclient/util/RealmsUtil.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4448 com/mojang/realmsclient/util/RealmsUtil CLASS 1 - METHOD method_21571 load (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; + METHOD load (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 uuid FIELD field_20260 gameProfileCache Lcom/google/common/cache/LoadingCache; FIELD field_20261 authenticationService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index 76de1f9c80..04de93999c 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -27,7 +27,8 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri ARG 3 partner FIELD field_1271 ID Lnet/minecraft/class_2960; FIELD field_1272 handlers Ljava/util/Map; - METHOD method_855 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;Lnet/minecraft/class_1296;)V + METHOD method_855 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;Lnet/minecraft/class_1296;)V ARG 1 player - ARG 2 parent1 - ARG 3 parent2 + ARG 2 parent + ARG 3 partner + ARG 4 child diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index 7ede7a05f7..7695b19fc3 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -14,5 +14,6 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionC METHOD method_8791 any ()Lnet/minecraft/class_1996$class_1998; FIELD field_9488 ID Lnet/minecraft/class_2960; FIELD field_9489 handlers Ljava/util/Map; - METHOD method_8784 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1842;)V + METHOD method_8784 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1842;)V ARG 1 player + ARG 2 potion diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index 429c33568c..edccccaf0f 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens ARG 2 to FIELD field_9493 ID Lnet/minecraft/class_2960; FIELD field_9494 handlers Ljava/util/Map; - METHOD method_8794 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)V + METHOD method_8794 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)V ARG 1 player ARG 2 from ARG 3 to diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index ed1449c489..94074a334f 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -17,4 +17,6 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLigh ARG 0 victims FIELD field_9499 ID Lnet/minecraft/class_2960; FIELD field_9500 handlers Ljava/util/Map; - METHOD method_8803 handle (Lnet/minecraft/class_3222;Ljava/util/Collection;)V + METHOD method_8803 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;)V + ARG 1 player + ARG 2 victims diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index d4457c7223..6ec0ed9d91 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -14,5 +14,6 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac METHOD method_8818 level (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2006$class_2008; FIELD field_9504 ID Lnet/minecraft/class_2960; FIELD field_9505 handlers Ljava/util/Map; - METHOD method_8812 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2580;)V + METHOD method_8812 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2580;)V ARG 1 player + ARG 2 beacon diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index 30c2e2f544..9e08918e9a 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -19,5 +19,6 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCr ARG 0 item FIELD field_9509 ID Lnet/minecraft/class_2960; FIELD field_9510 handlers Ljava/util/Map; - METHOD method_8821 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V + METHOD method_8821 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player + ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/Criterion.mapping index 2adf031c6a..4b348ffee0 100644 --- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criterion.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_179 net/minecraft/advancement/criterion/Criterion METHOD method_796 apply (Lnet/minecraft/class_2985;)V METHOD method_797 getConditions ()Lnet/minecraft/class_184; METHOD method_791 endTracking (Lnet/minecraft/class_2985;)V + ARG 1 tracker METHOD method_792 beginTrackingCondition (Lnet/minecraft/class_2985;Lnet/minecraft/class_179$class_180;)V ARG 1 manager METHOD method_793 endTrackingCondition (Lnet/minecraft/class_2985;Lnet/minecraft/class_179$class_180;)V @@ -18,3 +19,4 @@ CLASS net/minecraft/class_179 net/minecraft/advancement/criterion/Criterion METHOD method_794 getId ()Lnet/minecraft/class_2960; METHOD method_795 conditionsFromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_184; ARG 1 obj + ARG 2 context diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index b2bafafc9b..152209463f 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVi ARG 3 villager FIELD field_9514 ID Lnet/minecraft/class_2960; FIELD field_9515 handlers Ljava/util/Map; - METHOD method_8831 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1642;Lnet/minecraft/class_1646;)V + METHOD method_8831 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1642;Lnet/minecraft/class_1646;)V ARG 1 player ARG 2 zombie + ARG 3 villager diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index 90b557f2fb..a3475de99b 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -17,4 +17,5 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange ARG 0 effects FIELD field_9558 ID Lnet/minecraft/class_2960; FIELD field_9559 handlers Ljava/util/Map; - METHOD method_8863 handle (Lnet/minecraft/class_3222;)V + METHOD method_8863 trigger (Lnet/minecraft/class_3222;)V + ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index 3d518f494e..0d2b467631 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem ARG 2 level FIELD field_9563 ID Lnet/minecraft/class_2960; FIELD field_9564 handlers Ljava/util/Map; - METHOD method_8870 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V + METHOD method_8870 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V ARG 1 player ARG 2 stack + ARG 3 levels diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index 9c7d31b9d3..63fec1baf3 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -19,4 +19,6 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCri ARG 1 state FIELD field_9572 ID Lnet/minecraft/class_2960; FIELD field_9573 handlers Ljava/util/Map; - METHOD method_8885 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2680;)V + METHOD method_8885 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2680;)V + ARG 1 player + ARG 2 state diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index a8bf7a1587..26e806f7a0 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -19,6 +19,6 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketC ARG 1 stack FIELD field_9612 ID Lnet/minecraft/class_2960; FIELD field_9613 handlers Ljava/util/Map; - METHOD method_8932 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V + METHOD method_8932 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index 518233b1d2..130b6c9f72 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -29,4 +29,8 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo ARG 2 item FIELD field_9617 ID Lnet/minecraft/class_2960; FIELD field_9618 handlers Ljava/util/Map; - METHOD method_8939 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1536;Ljava/util/Collection;)V + METHOD method_8939 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1536;Ljava/util/Collection;)V + ARG 1 player + ARG 2 rodStack + ARG 3 bobber + ARG 4 fishingLoots diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index bb5e7b4fd7..f556fdb999 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -22,5 +22,6 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan ARG 0 items FIELD field_9625 ID Lnet/minecraft/class_2960; FIELD field_9626 handlers Ljava/util/Map; - METHOD method_8950 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1661;)V + METHOD method_8950 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1661;)V ARG 1 player + ARG 2 inventory diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 6256271df6..3874a1a769 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit ARG 2 durability FIELD field_9633 ID Lnet/minecraft/class_2960; FIELD field_9634 handlers Ljava/util/Map; - METHOD method_8960 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V + METHOD method_8960 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V ARG 1 player - ARG 2 item + ARG 2 stack + ARG 3 damage diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index 0e44750362..7161f31364 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -24,3 +24,5 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross FIELD field_9656 handlers Ljava/util/Map; METHOD method_8980 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;I)V ARG 1 player + ARG 2 victims + ARG 3 amount diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index daf2e09a8a..8671bec362 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri ARG 3 duration FIELD field_9671 ID Lnet/minecraft/class_2960; FIELD field_9672 handlers Ljava/util/Map; - METHOD method_9008 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)V + METHOD method_9008 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)V ARG 1 player - ARG 2 coord + ARG 2 startPos + ARG 3 duration diff --git a/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping index 0f423f359a..97d2b0c571 100644 --- a/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping @@ -27,5 +27,5 @@ CLASS net/minecraft/class_2092 net/minecraft/advancement/criterion/LocationArriv ARG 0 location FIELD field_9694 id Lnet/minecraft/class_2960; FIELD field_9695 handlers Ljava/util/Map; - METHOD method_9027 handle (Lnet/minecraft/class_3222;)V + METHOD method_9027 trigger (Lnet/minecraft/class_3222;)V ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping index a804b7d977..91e2e1b4c8 100644 --- a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping @@ -31,6 +31,6 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/NetherTravelC ARG 7 exitedZ FIELD field_9717 ID Lnet/minecraft/class_2960; FIELD field_9718 handlers Ljava/util/Map; - METHOD method_9080 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;)V + METHOD method_9080 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;)V ARG 1 player - ARG 2 entered + ARG 2 enteredPos diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index 2c829b29c9..2ed503daa8 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite METHOD method_9001 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; FIELD field_9661 id Lnet/minecraft/class_2960; FIELD field_9662 handlers Ljava/util/Map; - METHOD method_8990 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V + METHOD method_8990 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V ARG 1 player ARG 2 entity + ARG 3 source diff --git a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping index e68513b7ff..00d0b71ace 100644 --- a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_2111 net/minecraft/advancement/criterion/PlacedBlockCr ARG 0 block FIELD field_9724 ID Lnet/minecraft/class_2960; FIELD field_9725 handlers Ljava/util/Map; - METHOD method_9087 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V + METHOD method_9087 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 blockPos ARG 3 stack diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index e48d3006fc..b5d7cd3fd2 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -28,8 +28,9 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt ARG 6 blocked FIELD field_9732 ID Lnet/minecraft/class_2960; FIELD field_9733 handlers Ljava/util/Map; - METHOD method_9097 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;FFZ)V + METHOD method_9097 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;FFZ)V ARG 1 player + ARG 2 entity ARG 3 source ARG 4 dealt ARG 5 taken diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index 69d8520eeb..4890d324a7 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -11,5 +11,6 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlocke METHOD method_9112 matches (Lnet/minecraft/class_1860;)Z FIELD field_9738 ID Lnet/minecraft/class_2960; FIELD field_9739 handlers Ljava/util/Map; - METHOD method_9107 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1860;)V + METHOD method_9107 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1860;)V ARG 1 player + ARG 2 recipe diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index 22ce758690..5beac7e9eb 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -13,3 +13,5 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowC FIELD field_9743 ID Lnet/minecraft/class_2960; FIELD field_9744 handlers Ljava/util/Map; METHOD method_9115 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V + ARG 1 player + ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index 3ea9fb3fa0..6f53209170 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -12,5 +12,6 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntit METHOD method_9130 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Z FIELD field_9748 ID Lnet/minecraft/class_2960; FIELD field_9749 handlers Ljava/util/Map; - METHOD method_9124 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)V + METHOD method_9124 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)V ARG 1 player + ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 07446e216c..6b2ecf438e 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -14,5 +14,6 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCri METHOD method_9139 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;)Z FIELD field_9753 ID Lnet/minecraft/class_2960; FIELD field_9754 handlers Ljava/util/Map; - METHOD method_9132 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;)V + METHOD method_9132 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;)V ARG 1 player + ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index 6483be72f7..f830490000 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -9,4 +9,5 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion CLASS class_2137 Conditions FIELD field_9758 ID Lnet/minecraft/class_2960; FIELD field_9759 handlers Ljava/util/Map; - METHOD method_9141 handle (Lnet/minecraft/class_3222;)V + METHOD method_9141 trigger (Lnet/minecraft/class_3222;)V + ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index f467100600..b51e07dffe 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -11,5 +11,6 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeC METHOD method_9162 matches (D)Z FIELD field_9768 id Lnet/minecraft/class_2960; FIELD field_9769 handlers Ljava/util/Map; - METHOD method_9157 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;)V + METHOD method_9157 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;)V ARG 1 player + ARG 2 strongholdPos diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index d66b949af8..0531f9b899 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -12,5 +12,6 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCrit METHOD method_9171 matches (Lnet/minecraft/class_1799;)Z FIELD field_9773 ID Lnet/minecraft/class_2960; FIELD field_9774 handlers Ljava/util/Map; - METHOD method_9165 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V + METHOD method_9165 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player + ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index 1bb7ff56a9..545fd0270c 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -16,3 +16,5 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTrade FIELD field_9763 handlers Ljava/util/Map; METHOD method_9146 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_3988;Lnet/minecraft/class_1799;)V ARG 1 player + ARG 2 trader + ARG 3 stack diff --git a/mappings/net/minecraft/block/BambooBlock.mapping b/mappings/net/minecraft/block/BambooBlock.mapping index f436d110d8..89b7d918b1 100644 --- a/mappings/net/minecraft/block/BambooBlock.mapping +++ b/mappings/net/minecraft/block/BambooBlock.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2211 net/minecraft/block/BambooBlock ARG 1 state ARG 2 world ARG 3 pos - ARG 4 rand + ARG 4 random ARG 5 height METHOD method_9386 countBambooBelow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 1 world diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 164e3927d9..e03d7402fc 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -66,7 +66,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block FIELD field_10644 FACINGS [Lnet/minecraft/class_2350; FIELD field_10645 dynamicBounds Z FIELD field_10646 defaultState Lnet/minecraft/class_2680; - FIELD field_10647 stateFactory Lnet/minecraft/class_2689; + FIELD field_10647 stateManager Lnet/minecraft/class_2689; FIELD field_10648 resistance F FIELD field_10649 FACE_CULL_MAP Ljava/lang/ThreadLocal; FIELD field_10650 hardness F @@ -77,7 +77,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block FIELD field_19312 FULL_CUBE_SHAPE_CACHE Lcom/google/common/cache/LoadingCache; METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings - METHOD method_16361 isSolidMediumSquare (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + METHOD method_16361 topCoversMediumSquare (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos METHOD method_16362 canSuffocate (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z @@ -85,7 +85,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 view ARG 3 pos METHOD method_16841 getOffsetType ()Lnet/minecraft/class_2248$class_2250; - METHOD method_17454 createContainerProvider (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; + METHOD method_17454 createContainerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; ARG 1 state ARG 2 world ARG 3 pos @@ -107,7 +107,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 state ARG 2 world ARG 3 pos - ARG 4 rnd + ARG 4 random METHOD method_9497 dropStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 state ARG 1 world @@ -125,10 +125,10 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 entity METHOD method_9503 getBlockFromItem (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2248; ARG 0 item - METHOD method_9504 onRainTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_9504 rainTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_9505 getLightSubtracted (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I + METHOD method_9505 getOpacity (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 1 state ARG 2 view ARG 3 pos @@ -201,7 +201,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 state ARG 2 view ARG 3 pos - ARG 4 ePos + ARG 4 context METHOD method_9531 getStateFromRawId (I)Lnet/minecraft/class_2680; ARG 0 stateId METHOD method_9533 shouldDropItemsOnExplosion (Lnet/minecraft/class_1927;)Z @@ -257,7 +257,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 state ARG 2 view ARG 3 pos - ARG 4 ePos + ARG 4 context METHOD method_9551 getRenderLayer ()Lnet/minecraft/class_1921; METHOD method_9552 shouldPostProcess (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 state @@ -324,7 +324,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 state ARG 2 mirror METHOD method_9570 hasBlockEntity ()Z - METHOD method_9571 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; + METHOD method_9571 getCullingShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; ARG 1 state ARG 2 view ARG 3 pos @@ -359,7 +359,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 view ARG 3 pos METHOD method_9580 getDropTableId ()Lnet/minecraft/class_2960; - METHOD method_9581 canConnect (Lnet/minecraft/class_2248;)Z + METHOD method_9581 cannotConnect (Lnet/minecraft/class_2248;)Z ARG 0 block METHOD method_9582 pushEntitiesUpBeforeBlockChange (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 0 from @@ -408,7 +408,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 player ARG 3 world ARG 4 pos - METHOD method_9595 getStateFactory ()Lnet/minecraft/class_2689; + METHOD method_9595 getStateManager ()Lnet/minecraft/class_2689; METHOD method_9597 getMaterial (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3614; ARG 1 state METHOD method_9598 rotate (Lnet/minecraft/class_2680;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 96c039fc03..4dfa596461 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -34,7 +34,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 2 pos ARG 3 oldState ARG 4 moved - METHOD method_11581 getLightSubtracted (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I + METHOD method_11581 getOpacity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 1 view ARG 2 pos METHOD method_11582 canSuffocate (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z @@ -97,6 +97,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState METHOD method_11606 getOutlineShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; ARG 1 view ARG 2 pos + ARG 3 context METHOD method_11607 getRayTraceShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; ARG 1 view ARG 2 pos @@ -117,7 +118,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 2 pos ARG 3 entity METHOD method_11614 getBlock ()Lnet/minecraft/class_2248; - METHOD method_11615 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; + METHOD method_11615 getCullingShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; ARG 1 view ARG 2 pos METHOD method_11616 hasRandomTicks ()Z @@ -150,6 +151,8 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 1 world ARG 2 pos METHOD method_11628 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; + ARG 1 view + ARG 2 pos METHOD method_11629 activate (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Z ARG 1 world ARG 2 player @@ -182,8 +185,8 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState METHOD method_16337 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; ARG 1 view ARG 2 pos - ARG 3 ePos - METHOD method_16384 getCullShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_265; + ARG 3 context + METHOD method_16384 getCullingFace (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_265; ARG 1 view ARG 2 pos ARG 3 facing @@ -191,7 +194,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState METHOD method_16550 serialize (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_2680;)Lcom/mojang/datafixers/Dynamic; ARG 0 ops ARG 1 state - METHOD method_17526 createContainerProvider (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; + METHOD method_17526 createContainerFactory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; ARG 1 world ARG 2 pos METHOD method_17770 getOutlineShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; @@ -203,3 +206,6 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 3 hitResult ARG 4 projectile METHOD method_20827 isSideSolidFullSquare (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 world + ARG 2 pos + ARG 3 direction diff --git a/mappings/net/minecraft/block/ConnectedPlantBlock.mapping b/mappings/net/minecraft/block/ConnectingBlock.mapping similarity index 91% rename from mappings/net/minecraft/block/ConnectedPlantBlock.mapping rename to mappings/net/minecraft/block/ConnectingBlock.mapping index 2b95d4061e..2450e6ee12 100644 --- a/mappings/net/minecraft/block/ConnectedPlantBlock.mapping +++ b/mappings/net/minecraft/block/ConnectingBlock.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2429 net/minecraft/block/ConnectedPlantBlock +CLASS net/minecraft/class_2429 net/minecraft/block/ConnectingBlock FIELD field_11327 UP Lnet/minecraft/class_2746; FIELD field_11328 WEST Lnet/minecraft/class_2746; FIELD field_11329 FACING_PROPERTIES Ljava/util/Map; diff --git a/mappings/net/minecraft/block/FenceBlock.mapping b/mappings/net/minecraft/block/FenceBlock.mapping index 4a909b1ec4..d3bc1f38dd 100644 --- a/mappings/net/minecraft/block/FenceBlock.mapping +++ b/mappings/net/minecraft/block/FenceBlock.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2354 net/minecraft/block/FenceBlock - FIELD field_11066 SHAPES [Lnet/minecraft/class_265; + FIELD field_11066 cullingShapes [Lnet/minecraft/class_265; METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings METHOD h (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; @@ -8,4 +8,5 @@ CLASS net/minecraft/class_2354 net/minecraft/block/FenceBlock ARG 3 pos METHOD method_10184 canConnect (Lnet/minecraft/class_2680;ZLnet/minecraft/class_2350;)Z ARG 1 state + ARG 2 neighborIsFullSquare ARG 3 dir diff --git a/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping b/mappings/net/minecraft/block/HorizontalConnectingBlock.mapping similarity index 98% rename from mappings/net/minecraft/block/HorizontalConnectedBlock.mapping rename to mappings/net/minecraft/block/HorizontalConnectingBlock.mapping index 6bad93ebaf..4f58213d2e 100644 --- a/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping +++ b/mappings/net/minecraft/block/HorizontalConnectingBlock.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2310 net/minecraft/block/HorizontalConnectedBlock +CLASS net/minecraft/class_2310 net/minecraft/block/HorizontalConnectingBlock FIELD field_10900 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_10901 collisionShapes [Lnet/minecraft/class_265; FIELD field_10902 FACING_PROPERTIES Ljava/util/Map; diff --git a/mappings/net/minecraft/block/PortalBlock.mapping b/mappings/net/minecraft/block/NetherPortalBlock.mapping similarity index 96% rename from mappings/net/minecraft/block/PortalBlock.mapping rename to mappings/net/minecraft/block/NetherPortalBlock.mapping index c34e3fde7f..3fa4605a31 100644 --- a/mappings/net/minecraft/block/PortalBlock.mapping +++ b/mappings/net/minecraft/block/NetherPortalBlock.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2423 net/minecraft/block/PortalBlock +CLASS net/minecraft/class_2423 net/minecraft/block/NetherPortalBlock CLASS class_2424 AreaHelper FIELD field_11311 width I FIELD field_11312 height I diff --git a/mappings/net/minecraft/block/RedstoneTorchBlock.mapping b/mappings/net/minecraft/block/RedstoneTorchBlock.mapping index 7c9e4d2a5b..5c388ae319 100644 --- a/mappings/net/minecraft/block/RedstoneTorchBlock.mapping +++ b/mappings/net/minecraft/block/RedstoneTorchBlock.mapping @@ -21,5 +21,5 @@ CLASS net/minecraft/class_2459 net/minecraft/block/RedstoneTorchBlock ARG 0 state ARG 1 world ARG 2 pos - ARG 3 rand + ARG 3 random ARG 4 unpower diff --git a/mappings/net/minecraft/block/RedstoneWireBlock.mapping b/mappings/net/minecraft/block/RedstoneWireBlock.mapping index 0bb9bd9ac0..a784d596ba 100644 --- a/mappings/net/minecraft/block/RedstoneWireBlock.mapping +++ b/mappings/net/minecraft/block/RedstoneWireBlock.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock ARG 1 view ARG 2 pos ARG 3 dir - METHOD method_10478 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + METHOD method_10478 couldConnectTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 view ARG 2 pos ARG 3 dir diff --git a/mappings/net/minecraft/block/Stainable.mapping b/mappings/net/minecraft/block/Stainable.mapping new file mode 100644 index 0000000000..9e56ab3cc5 --- /dev/null +++ b/mappings/net/minecraft/block/Stainable.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4275 net/minecraft/block/Stainable + METHOD method_10622 getColor ()Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping index b68818e46f..a13f8ca217 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity METHOD method_10910 getPatternCount (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_10911 getPatterns ()Ljava/util/List; - METHOD method_10913 deserialize (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V + METHOD method_10913 readFrom (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V ARG 1 stack ARG 2 baseColor METHOD method_10914 readPattern ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index c60252ca9c..28b116580d 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity FIELD field_11863 world Lnet/minecraft/class_1937; FIELD field_11864 type Lnet/minecraft/class_2591; - FIELD field_11865 invalid Z + FIELD field_11865 removed Z FIELD field_11866 cachedState Lnet/minecraft/class_2680; FIELD field_11867 pos Lnet/minecraft/class_2338; FIELD field_11868 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_2591;)V ARG 1 type - METHOD method_10996 validate ()V + METHOD method_10996 cancelRemoval ()V METHOD method_10997 getWorld ()Lnet/minecraft/class_1937; METHOD method_10998 setPos (Lnet/minecraft/class_2338;)V METHOD method_10999 writeIdentifyingData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; @@ -19,6 +19,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11005 createFromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; METHOD method_11006 getSquaredRenderDistance ()D METHOD method_11007 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 tag METHOD method_11008 getSquaredDistance (DDD)D ARG 1 x ARG 3 y @@ -26,10 +27,11 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11009 setWorld (Lnet/minecraft/class_1937;)V METHOD method_11010 getCachedState ()Lnet/minecraft/class_2680; METHOD method_11011 shouldNotCopyTagFromItem ()Z - METHOD method_11012 invalidate ()V + METHOD method_11012 markRemoved ()V METHOD method_11013 applyRotation (Lnet/minecraft/class_2470;)V METHOD method_11014 fromTag (Lnet/minecraft/class_2487;)V - METHOD method_11015 isInvalid ()Z + ARG 1 tag + METHOD method_11015 isRemoved ()Z METHOD method_11016 getPos ()Lnet/minecraft/class_2338; METHOD method_11017 getType ()Lnet/minecraft/class_2591; METHOD method_16886 toUpdatePacket ()Lnet/minecraft/class_2622; diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping index 1acae6170d..686b7947eb 100644 --- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping @@ -3,8 +3,8 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity FIELD field_12202 source Z FIELD field_12203 extending Z FIELD field_12204 pushedBlock Lnet/minecraft/class_2680; - FIELD field_12206 progress F - FIELD field_12207 nextProgress F + FIELD field_12206 lastProgress F + FIELD field_12207 progress F FIELD field_12208 savedWorldTime J METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;ZZ)V ARG 1 pushedBlock @@ -12,13 +12,17 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity ARG 3 extending ARG 4 source METHOD method_11494 getRenderOffsetX (F)F + ARG 1 tickDelta METHOD method_11495 getPushedBlock ()Lnet/minecraft/class_2680; METHOD method_11498 getFacing ()Lnet/minecraft/class_2350; METHOD method_11499 getProgress (F)F + ARG 1 tickDelta METHOD method_11501 isExtending ()Z METHOD method_11507 getRenderOffsetZ (F)F + ARG 1 tickDelta METHOD method_11508 getSavedWorldTime ()J METHOD method_11511 getRenderOffsetY (F)F + ARG 1 tickDelta METHOD method_11512 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; METHOD method_11513 finish ()V METHOD method_11515 isSource ()Z diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 273a5b3c7f..28a9a472c1 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_11366 saveStructure (Z)Z METHOD method_11367 shouldIgnoreEntities ()Z METHOD method_11368 loadStructure (Z)Z + ARG 1 resizeDisabled METHOD method_11369 findStructureBlockEntities (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Ljava/util/List; ARG 1 pos1 ARG 2 pos2 diff --git a/mappings/net/minecraft/block/piston/PistonHandler.mapping b/mappings/net/minecraft/block/piston/PistonHandler.mapping index 73a0d18226..30d99c1e68 100644 --- a/mappings/net/minecraft/block/piston/PistonHandler.mapping +++ b/mappings/net/minecraft/block/piston/PistonHandler.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2674 net/minecraft/block/piston/PistonHandler - FIELD field_12243 direction Lnet/minecraft/class_2350; + FIELD field_12243 motionDirection Lnet/minecraft/class_2350; FIELD field_12244 posTo Lnet/minecraft/class_2338; FIELD field_12245 movedBlocks Ljava/util/List; FIELD field_12246 brokenBlocks Ljava/util/List; @@ -9,7 +9,10 @@ CLASS net/minecraft/class_2674 net/minecraft/block/piston/PistonHandler ARG 1 world ARG 2 pos ARG 3 dir + ARG 4 retracted METHOD method_11536 getBrokenBlocks ()Ljava/util/List; METHOD method_11537 calculatePush ()Z METHOD method_11540 tryMove (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 pos + ARG 2 dir METHOD method_11541 getMovedBlocks ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index d1c0a722b0..0a2b265085 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1695 windowFocused Z FIELD field_1696 thread Ljava/lang/Thread; FIELD field_1697 runDirectory Ljava/io/File; - FIELD field_1698 isRunning Z + FIELD field_1698 running Z FIELD field_1699 currentServerEntry Lnet/minecraft/class_642; FIELD field_1700 instance Lnet/minecraft/class_310; FIELD field_1701 openProfilerSection Ljava/lang/String; @@ -30,13 +30,13 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1712 nextDebugInfoUpdateTime J FIELD field_1713 particleManager Lnet/minecraft/class_702; FIELD field_1714 musicTracker Lnet/minecraft/class_1142; - FIELD field_1715 resourcePackContainerManager Lnet/minecraft/class_3283; + FIELD field_1715 resourcePackManager Lnet/minecraft/class_3283; FIELD field_1717 languageManager Lnet/minecraft/class_1076; FIELD field_1718 memoryReservedForCrash [B FIELD field_1719 cameraEntity Lnet/minecraft/class_1297; FIELD field_1720 versionType Ljava/lang/String; FIELD field_1721 isDemo Z - FIELD field_1722 resourcePackCreator Lnet/minecraft/class_1066; + FIELD field_1722 builtinPackProvider Lnet/minecraft/class_1066; FIELD field_1723 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_1724 player Lnet/minecraft/class_746; FIELD field_1725 windowSettings Lnet/minecraft/class_543; @@ -49,7 +49,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1733 searchManager Lnet/minecraft/class_1124; FIELD field_1734 paused Z FIELD field_1735 fpsCounter I - FIELD field_1737 firstPersonRenderer Lnet/minecraft/class_759; + FIELD field_1737 heldItemRenderer Lnet/minecraft/class_759; FIELD field_1738 currentFps I FIELD field_1739 netProxy Ljava/net/Proxy; FIELD field_17404 renderTaskQueue Ljava/util/Queue; @@ -60,7 +60,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1743 skipGameRender Z FIELD field_1744 connectedToRealms Z FIELD field_1745 resourceManager Lnet/minecraft/class_3296; - FIELD field_1746 clientConnection Lnet/minecraft/class_2535; + FIELD field_1746 connection Lnet/minecraft/class_2535; FIELD field_1747 crashReport Lnet/minecraft/class_128; FIELD field_1748 levelStorage Lnet/minecraft/class_32; FIELD field_1749 ALT_TEXT_RENDERER_ID Lnet/minecraft/class_2960; @@ -79,7 +79,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1762 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_1763 bakedModelManager Lnet/minecraft/class_1092; FIELD field_1764 textureManager Lnet/minecraft/class_1060; - FIELD field_1765 hitResult Lnet/minecraft/class_239; + FIELD field_1765 crosshairTarget Lnet/minecraft/class_239; FIELD field_1766 server Lnet/minecraft/class_1132; FIELD field_1767 spriteAtlas Lnet/minecraft/class_1059; FIELD field_1768 dataFixer Lcom/mojang/datafixers/DataFixer; @@ -92,7 +92,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1775 snooper Lnet/minecraft/class_1276; FIELD field_17763 splashTextLoader Lnet/minecraft/class_4008; FIELD field_18008 paintingManager Lnet/minecraft/class_4044; - FIELD field_18009 voidFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_18009 COMPLETED_UNIT_FUTURE Ljava/util/concurrent/CompletableFuture; FIELD field_18173 statusEffectSpriteManager Lnet/minecraft/class_4074; FIELD field_18174 resourceReloadFuture Ljava/util/concurrent/CompletableFuture; FIELD field_18175 overlay Lnet/minecraft/class_4071; @@ -106,7 +106,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 key METHOD method_1487 getNetworkProxy ()Ljava/net/Proxy; METHOD method_1488 getTickDelta ()F - METHOD method_1489 getFirstPersonRenderer ()Lnet/minecraft/class_759; + METHOD method_1489 getHeldItemRenderer ()Lnet/minecraft/class_759; METHOD method_1490 stop ()V METHOD method_1492 drawProfilerResults ()V METHOD method_1493 isPaused ()Z @@ -130,16 +130,16 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1508 handleInputEvents ()V METHOD method_1511 doItemPick ()V METHOD method_1513 reloadResourcesConcurrently ()Ljava/util/concurrent/CompletableFuture; - METHOD method_1514 start ()V + METHOD method_1514 run ()V METHOD method_1515 getGameVersion ()Ljava/lang/String; METHOD method_1516 getResourcePackDownloader ()Lnet/minecraft/class_1066; METHOD method_1517 isFancyGraphicsEnabled ()Z METHOD method_1519 cleanUpAfterCrash ()V - METHOD method_1520 getResourcePackContainerManager ()Lnet/minecraft/class_3283; + METHOD method_1520 getResourcePackManager ()Lnet/minecraft/class_3283; METHOD method_1521 reloadResources ()Ljava/util/concurrent/CompletableFuture; METHOD method_1522 getFramebuffer ()Lnet/minecraft/class_276; METHOD method_1523 render (Z)V - ARG 1 fullRender + ARG 1 tick METHOD method_1524 handleProfilerKeyPress (I)V ARG 1 digit METHOD method_1526 getLanguageManager ()Lnet/minecraft/class_1076; @@ -188,7 +188,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1583 doItemUse ()V METHOD method_1584 setCurrentServerEntry (Lnet/minecraft/class_642;)V METHOD method_1586 getLevelStorage ()Lnet/minecraft/class_32; - METHOD method_1587 populateCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; + METHOD method_1587 addDetailsToCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; ARG 1 report METHOD method_1588 isAmbientOcclusionEnabled ()Z METHOD method_1589 isConnectedToRealms ()Z diff --git a/mappings/net/minecraft/client/block/ColoredBlock.mapping b/mappings/net/minecraft/client/block/ColoredBlock.mapping deleted file mode 100644 index 113e327852..0000000000 --- a/mappings/net/minecraft/client/block/ColoredBlock.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_4275 net/minecraft/client/block/ColoredBlock - METHOD method_10622 getColor ()Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping index c33ac5c6c3..83a10c3176 100644 --- a/mappings/net/minecraft/client/color/block/BlockColors.mapping +++ b/mappings/net/minecraft/client/color/block/BlockColors.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors ARG 2 pos ARG 3 tintIndex METHOD method_1689 create ()Lnet/minecraft/class_324; - METHOD method_1690 register (Lnet/minecraft/class_322;[Lnet/minecraft/class_2248;)V + METHOD method_1690 registerColorProvider (Lnet/minecraft/class_322;[Lnet/minecraft/class_2248;)V ARG 1 provider ARG 2 blocks METHOD method_1691 getColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I @@ -58,7 +58,7 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors ARG 1 view ARG 2 pos ARG 3 tintIndex - METHOD method_1697 getColorMultiplier (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I + METHOD method_1697 getColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I ARG 1 state ARG 2 view ARG 3 pos diff --git a/mappings/net/minecraft/client/font/Font.mapping b/mappings/net/minecraft/client/font/Font.mapping index 7c77db9f7b..39b960dc1d 100644 --- a/mappings/net/minecraft/client/font/Font.mapping +++ b/mappings/net/minecraft/client/font/Font.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_390 net/minecraft/client/font/Font METHOD method_2040 getGlyph (C)Lnet/minecraft/class_383; + ARG 1 character diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping index 41265b0e54..25a13d7363 100644 --- a/mappings/net/minecraft/client/font/FontLoader.mapping +++ b/mappings/net/minecraft/client/font/FontLoader.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader METHOD method_2039 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; + ARG 1 manager diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index 17296860fa..256011ab7c 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -8,4 +8,6 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_18627 getResourceReloadListener ()Lnet/minecraft/class_3302; METHOD method_2018 setForceUnicodeFont (ZLjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V ARG 1 forceUnicodeFont + ARG 2 prepareExecutor + ARG 3 applyExecutor METHOD method_2019 getTextRenderer (Lnet/minecraft/class_2960;)Lnet/minecraft/class_327; diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index f1035f816d..3f11774bc8 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -17,13 +17,13 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage METHOD method_2004 setFonts (Ljava/util/List;)V ARG 1 fonts METHOD method_2008 getRenderableGlyph (C)Lnet/minecraft/class_383; - ARG 1 c + ARG 1 character METHOD method_2010 closeGlyphAtlases ()V METHOD method_2011 getGlyph (C)Lnet/minecraft/class_379; - ARG 1 c + ARG 1 character METHOD method_2012 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; ARG 1 c METHOD method_2013 getObfuscatedGlyphRenderer (Lnet/minecraft/class_379;)Lnet/minecraft/class_382; ARG 1 glyph METHOD method_2014 getGlyphRenderer (C)Lnet/minecraft/class_382; - ARG 1 c + ARG 1 character diff --git a/mappings/net/minecraft/client/font/FontType.mapping b/mappings/net/minecraft/client/font/FontType.mapping index 389ad9908f..42eaab8458 100644 --- a/mappings/net/minecraft/client/font/FontType.mapping +++ b/mappings/net/minecraft/client/font/FontType.mapping @@ -6,5 +6,6 @@ CLASS net/minecraft/class_394 net/minecraft/client/font/FontType ARG 3 id ARG 4 factory METHOD method_2047 createLoader (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; + ARG 1 json METHOD method_2048 byId (Ljava/lang/String;)Lnet/minecraft/class_394; ARG 0 id diff --git a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping index 6dd44efada..b21a6e7eed 100644 --- a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping +++ b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_380 net/minecraft/client/font/GlyphAtlasTexture FIELD field_2263 hasColor Z FIELD field_2264 rootSlot Lnet/minecraft/class_380$class_381; METHOD (Lnet/minecraft/class_2960;Z)V + ARG 1 id ARG 2 hasColor METHOD method_2022 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; ARG 1 glyph diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index d8fcc36e3c..682bff416d 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 1 textureManager ARG 2 fontStorage METHOD method_16196 findWordEdge (Ljava/lang/String;IIZ)I - ARG 1 string + ARG 1 text ARG 2 direction ARG 3 position ARG 4 skipWhitespaceToRightOfWord @@ -45,41 +45,46 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 10 blue ARG 11 alpha METHOD method_1711 trimToWidth (Ljava/lang/String;IZ)Ljava/lang/String; - ARG 1 string + ARG 1 text ARG 2 width ARG 3 rightToLeft - METHOD method_1712 drawStringBounded (Ljava/lang/String;IIII)V - ARG 1 str + METHOD method_1712 drawTrimmed (Ljava/lang/String;IIII)V + ARG 1 text ARG 2 x ARG 3 y ARG 4 maxWidth + ARG 5 color METHOD method_1713 getStringBoundedHeight (Ljava/lang/String;I)I - ARG 1 str + ARG 1 text + ARG 2 maxWidth METHOD method_1714 trimToWidth (Ljava/lang/String;I)Ljava/lang/String; - ARG 1 string + ARG 1 text ARG 2 width METHOD method_1715 setFonts (Ljava/util/List;)V ARG 1 fonts METHOD method_1716 getCharacterCountForWidth (Ljava/lang/String;I)I ARG 1 text ARG 2 offset - METHOD method_1717 renderStringBounded (Ljava/lang/String;IIII)V - ARG 1 str + METHOD method_1717 drawWrapped (Ljava/lang/String;IIII)V + ARG 1 text ARG 2 x ARG 3 y ARG 4 maxWidth + ARG 5 color METHOD method_1718 trimEndNewlines (Ljava/lang/String;)Ljava/lang/String; - ARG 1 string + ARG 1 text METHOD method_1719 setRightToLeft (Z)V + ARG 1 rightToLeft METHOD method_1720 drawWithShadow (Ljava/lang/String;FFI)I - ARG 1 string + ARG 1 text ARG 2 x ARG 3 y ARG 4 color METHOD method_1721 mirror (Ljava/lang/String;)Ljava/lang/String; - ARG 1 string + ARG 1 text METHOD method_1722 wrapStringToWidth (Ljava/lang/String;I)Ljava/lang/String; ARG 1 text + ARG 2 width METHOD method_1723 draw (Ljava/lang/String;FFIZ)I ARG 1 str ARG 2 x @@ -96,11 +101,12 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 1 character METHOD method_1726 isRightToLeft ()Z METHOD method_1727 getStringWidth (Ljava/lang/String;)I - ARG 1 string + ARG 1 text METHOD method_1728 wrapStringToWidthAsList (Ljava/lang/String;I)Ljava/util/List; ARG 1 text + ARG 2 width METHOD method_1729 draw (Ljava/lang/String;FFI)I - ARG 1 string + ARG 1 text ARG 2 x ARG 3 y ARG 4 color diff --git a/mappings/net/minecraft/client/font/TextureFont.mapping b/mappings/net/minecraft/client/font/TextureFont.mapping index 229737e899..8b1c23f69e 100644 --- a/mappings/net/minecraft/client/font/TextureFont.mapping +++ b/mappings/net/minecraft/client/font/TextureFont.mapping @@ -35,8 +35,9 @@ CLASS net/minecraft/class_386 net/minecraft/client/font/TextureFont ARG 6 height ARG 7 advance ARG 8 ascent - FIELD field_2284 characterToGlyphMap Lit/unimi/dsi/fastutil/chars/Char2ObjectMap; + FIELD field_2284 glyphs Lit/unimi/dsi/fastutil/chars/Char2ObjectMap; FIELD field_2285 image Lnet/minecraft/class_1011; FIELD field_2286 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_1011;Lit/unimi/dsi/fastutil/chars/Char2ObjectMap;)V ARG 1 image + ARG 2 glyphs diff --git a/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping b/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping index b2a0df2d39..ae304cd542 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_396 net/minecraft/client/font/TrueTypeFontLoader ARG 5 shiftY ARG 6 excludedCharacters METHOD method_2059 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; + ARG 0 json diff --git a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping index ee32ba6b9c..dd2d9f37a6 100644 --- a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping +++ b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_391 net/minecraft/client/font/UnicodeTextureFont ARG 1 resourceManager ARG 2 sizes ARG 3 template - METHOD method_2041 getGlyphId (C)Lnet/minecraft/class_2960; + METHOD method_2041 getImageId (C)Lnet/minecraft/class_2960; ARG 1 character METHOD method_2042 getGlyphImage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1011; ARG 1 glyphId diff --git a/mappings/net/minecraft/client/gl/GlFramebuffer.mapping b/mappings/net/minecraft/client/gl/Framebuffer.mapping similarity index 79% rename from mappings/net/minecraft/client/gl/GlFramebuffer.mapping rename to mappings/net/minecraft/client/gl/Framebuffer.mapping index 694f50de58..38524398a8 100644 --- a/mappings/net/minecraft/client/gl/GlFramebuffer.mapping +++ b/mappings/net/minecraft/client/gl/Framebuffer.mapping @@ -1,13 +1,13 @@ -CLASS net/minecraft/class_276 net/minecraft/client/gl/GlFramebuffer +CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer FIELD field_1474 depthAttachment I FIELD field_1475 colorAttachment I FIELD field_1476 fbo I - FIELD field_1477 viewHeight I + FIELD field_1477 viewportHeight I FIELD field_1478 useDepthAttachment Z FIELD field_1479 clearColor [F - FIELD field_1480 viewWidth I - FIELD field_1481 texHeight I - FIELD field_1482 texWidth I + FIELD field_1480 viewportWidth I + FIELD field_1481 textureHeight I + FIELD field_1482 textureWidth I FIELD field_1483 texFilter I METHOD (IIZZ)V ARG 1 width @@ -21,7 +21,7 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/GlFramebuffer ARG 2 height ARG 3 getError METHOD method_1232 setTexFilter (I)V - METHOD method_1233 draw (IIZ)V + METHOD method_1233 drawInternal (IIZ)V ARG 1 width ARG 2 height METHOD method_1234 resize (IIZ)V diff --git a/mappings/net/minecraft/client/gl/GlDebug.mapping b/mappings/net/minecraft/client/gl/GlDebug.mapping index df5a33009b..b078d529d1 100644 --- a/mappings/net/minecraft/client/gl/GlDebug.mapping +++ b/mappings/net/minecraft/client/gl/GlDebug.mapping @@ -21,5 +21,6 @@ CLASS net/minecraft/class_1008 net/minecraft/client/gl/GlDebug ARG 0 opcode METHOD method_4227 enableDebug (IZ)V ARG 0 verbosity + ARG 1 sync METHOD method_4228 getType (I)Ljava/lang/String; ARG 0 opcode diff --git a/mappings/net/minecraft/client/gl/GlBuffer.mapping b/mappings/net/minecraft/client/gl/VertexBuffer.mapping similarity index 84% rename from mappings/net/minecraft/client/gl/GlBuffer.mapping rename to mappings/net/minecraft/client/gl/VertexBuffer.mapping index f8037befbc..0648cfacfa 100644 --- a/mappings/net/minecraft/client/gl/GlBuffer.mapping +++ b/mappings/net/minecraft/client/gl/VertexBuffer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_291 net/minecraft/client/gl/GlBuffer +CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer FIELD field_1593 vertexCount I FIELD field_1594 id I FIELD field_1595 format Lnet/minecraft/class_293; diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index 08cb13d11f..02b8a75c4f 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -62,10 +62,10 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 4 y ARG 5 color METHOD fill (IIIII)V - ARG 0 left - ARG 1 top - ARG 2 right - ARG 3 bottom + ARG 0 x1 + ARG 1 y1 + ARG 2 x2 + ARG 3 y2 ARG 4 color METHOD fillGradient (IIIIII)V ARG 1 top diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 09b5849d43..087b909a68 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 message ARG 2 messageId METHOD method_1805 render (I)V - ARG 1 timestamp + ARG 1 ticks METHOD method_1806 getWidth (D)I ARG 0 widthOption METHOD method_1807 removeMessage (I)V diff --git a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping index 9ce0a05d96..bcc142d877 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_303 net/minecraft/client/gui/hud/ChatHudLine FIELD field_1649 id I - FIELD field_1650 timestamp I + FIELD field_1650 creationTick I FIELD field_1651 text Lnet/minecraft/class_2561; METHOD (ILnet/minecraft/class_2561;I)V - ARG 1 timestamp + ARG 1 creationTick ARG 2 text ARG 3 id METHOD method_1412 getText ()Lnet/minecraft/class_2561; METHOD method_1413 getId ()I - METHOD method_1414 getTimestamp ()I + METHOD method_1414 getCreationTick ()I diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 8592f1584b..9dd8879324 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -34,7 +34,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1736 renderCrosshair ()V METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I - METHOD method_1739 getSpectatorWidget ()Lnet/minecraft/class_365; + METHOD method_1739 getSpectatorHud ()Lnet/minecraft/class_365; METHOD method_1740 getBossBarHud ()Lnet/minecraft/class_337; METHOD method_1741 renderMountHealth ()V METHOD method_1742 setDefaultTitleFade ()V diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index f150e9a577..bf5318c2fc 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud FIELD field_2197 WIDGETS_TEX Lnet/minecraft/class_2960; - FIELD field_2198 lastKeyPressTime J + FIELD field_2198 lastInteractionTime J FIELD field_2199 SPECTATOR_TEX Lnet/minecraft/class_2960; FIELD field_2200 spectatorMenu Lnet/minecraft/class_531; FIELD field_2201 client Lnet/minecraft/class_310; @@ -10,7 +10,7 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud ARG 1 height ARG 2 x ARG 4 state - METHOD method_1977 onHotbarKeyPress (I)V + METHOD method_1977 selectSlot (I)V ARG 1 slot METHOD method_1978 render (F)V ARG 1 tickDelta diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping index 548921da0a..c5f0b2a414 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping @@ -19,7 +19,8 @@ CLASS net/minecraft/class_531 net/minecraft/client/gui/hud/spectator/SpectatorMe METHOD (Lnet/minecraft/class_536;)V ARG 1 closeCallback METHOD method_2770 getCommands ()Ljava/util/List; - METHOD method_2771 setSelectedSlot (I)V + METHOD method_2771 useCommand (I)V + ARG 1 slot METHOD method_2772 getCurrentState ()Lnet/minecraft/class_539; METHOD method_2773 getSelectedSlot ()I METHOD method_2774 getSelectedCommand ()Lnet/minecraft/class_537; diff --git a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping index 968db0df9a..c67fccfb82 100644 --- a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_422 net/minecraft/client/gui/screen/AddServerScreen FIELD field_19236 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; - FIELD field_2469 serverEntry Lnet/minecraft/class_642; + FIELD field_2469 server Lnet/minecraft/class_642; FIELD field_2471 serverNameField Lnet/minecraft/class_342; FIELD field_2472 buttonAdd Lnet/minecraft/class_4185; FIELD field_2473 resourcePackOptionButton Lnet/minecraft/class_4185; diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping index 6e255c9505..6bfb4a4d9d 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping @@ -4,7 +4,9 @@ CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmChatLinkScr FIELD field_2372 warning Ljava/lang/String; FIELD field_2373 copy Ljava/lang/String; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;Z)V + ARG 1 callback ARG 2 link + ARG 3 trusted METHOD method_2100 copyToClipboard ()V METHOD render (IIF)V ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping index b31f729216..1873415cbc 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_410 net/minecraft/client/gui/screen/ConfirmScreen FIELD field_2404 messageSplit Ljava/util/List; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/String;Ljava/lang/String;)V ARG 1 callback + ARG 2 title ARG 3 message ARG 4 yesTranslated ARG 5 noTranslated diff --git a/mappings/net/minecraft/client/gui/screen/EndCreditsScreen.mapping b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping similarity index 61% rename from mappings/net/minecraft/client/gui/screen/EndCreditsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping index a50e0d1564..bfe0e8d381 100644 --- a/mappings/net/minecraft/client/gui/screen/EndCreditsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping @@ -1,14 +1,14 @@ -CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/EndCreditsScreen +CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen FIELD field_2626 MINECRAFT_TITLE_TEXTURE Lnet/minecraft/class_2960; - FIELD field_2627 inGame Z - FIELD field_2630 respawn Ljava/lang/Runnable; + FIELD field_2627 endCredits Z + FIELD field_2630 finishAction Ljava/lang/Runnable; FIELD field_2631 EDITION_TITLE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2632 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_2633 VIGNETTE_TEXTURE Lnet/minecraft/class_2960; METHOD (ZLjava/lang/Runnable;)V - ARG 1 inGame - ARG 2 respawn - METHOD method_2257 respawn ()V + ARG 1 endCredits + ARG 2 finishAction + METHOD method_2257 close ()V METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping b/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping index 5f05c92add..5dff83dd4c 100644 --- a/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_421 net/minecraft/client/gui/screen/FatalErrorScreen FIELD field_2467 message Ljava/lang/String; METHOD (Lnet/minecraft/class_2561;Ljava/lang/String;)V + ARG 1 title ARG 2 message METHOD render (IIF)V ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index 473de3d2c8..e17835d83b 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 3 height METHOD insertText (Ljava/lang/String;Z)V ARG 1 text + ARG 2 override METHOD isCopy (I)Z ARG 0 code METHOD isCut (I)Z diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 0aceb22fab..6a2346fc18 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -8,10 +8,10 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 2 mouseY CLASS class_4202 EntityStatsListWidget CLASS class_4201 EntityStatItem - FIELD field_2642 itemsButton Lnet/minecraft/class_447$class_4200; - FIELD field_2643 listWidget Lnet/minecraft/class_4280; - FIELD field_2644 generalButton Lnet/minecraft/class_447$class_4198; - FIELD field_2646 mobsButton Lnet/minecraft/class_447$class_4202; + FIELD field_2642 itemStats Lnet/minecraft/class_447$class_4200; + FIELD field_2643 selectedList Lnet/minecraft/class_4280; + FIELD field_2644 generalStats Lnet/minecraft/class_447$class_4198; + FIELD field_2646 mobStats Lnet/minecraft/class_447$class_4202; FIELD field_2647 statHandler Lnet/minecraft/class_3469; FIELD field_2648 parent Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3469;)V diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTreeWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping similarity index 61% rename from mappings/net/minecraft/client/gui/screen/advancement/AdvancementTreeWidget.mapping rename to mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping index af78730de5..f4e5912e37 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTreeWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping @@ -1,17 +1,27 @@ -CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/AdvancementTreeWidget +CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/AdvancementTab FIELD field_2680 client Lnet/minecraft/class_310; - FIELD field_2682 rootAdvancement Lnet/minecraft/class_161; - FIELD field_2684 tabType Lnet/minecraft/class_453; + FIELD field_2682 root Lnet/minecraft/class_161; + FIELD field_2684 type Lnet/minecraft/class_453; FIELD field_2685 widgets Ljava/util/Map; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_457;Lnet/minecraft/class_453;ILnet/minecraft/class_161;Lnet/minecraft/class_185;)V ARG 1 client - ARG 5 rootAdvancement - METHOD method_2308 getWidgetForAdvancement (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + ARG 2 screen + ARG 3 type + ARG 4 index + ARG 5 root + ARG 6 display + METHOD method_2308 getWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + ARG 1 advancement METHOD method_2311 drawBackground (IIZ)V ARG 1 x ARG 2 y + ARG 3 selected METHOD method_2315 drawIcon (IILnet/minecraft/class_918;)V ARG 1 x ARG 2 y + ARG 3 itemRenderer METHOD method_2317 create (Lnet/minecraft/class_310;Lnet/minecraft/class_457;ILnet/minecraft/class_161;)Lnet/minecraft/class_454; ARG 0 minecraft + ARG 1 screen + ARG 2 index + ARG 3 root diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping index 5c40e2dec7..36928a972b 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping @@ -4,7 +4,10 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc ARG 2 x ARG 3 y ARG 4 selected + ARG 5 index METHOD method_2306 drawIcon (IIILnet/minecraft/class_918;Lnet/minecraft/class_1799;)V ARG 1 x ARG 2 y + ARG 3 index ARG 4 itemRenderer + ARG 5 icon diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping index 1dd7c86895..f896713e19 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/AdvancementWidget FIELD field_2702 advancement Lnet/minecraft/class_161; - FIELD field_2703 tree Lnet/minecraft/class_454; + FIELD field_2703 tab Lnet/minecraft/class_454; FIELD field_2704 client Lnet/minecraft/class_310; FIELD field_2707 children Ljava/util/List; FIELD field_2709 WIDGETS_TEX Lnet/minecraft/class_2960; @@ -8,8 +8,11 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_2711 xPos I FIELD field_2712 display Lnet/minecraft/class_185; METHOD (Lnet/minecraft/class_454;Lnet/minecraft/class_310;Lnet/minecraft/class_161;Lnet/minecraft/class_185;)V - ARG 1 tree + ARG 1 tab ARG 2 client ARG 3 advancement - METHOD method_2328 getRootWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + ARG 4 display + METHOD method_2328 getParent (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + ARG 1 advancement METHOD method_2333 setProgress (Lnet/minecraft/class_167;)V + ARG 1 progress diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping index fc22e6ab4b..b92fb0d93b 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/AdvancementsScreen FIELD field_2716 TABS_TEXTURE Lnet/minecraft/class_2960; FIELD field_2717 WINDOW_TEXTURE Lnet/minecraft/class_2960; - FIELD field_2719 widgetMap Ljava/util/Map; - FIELD field_2720 selectedWidget Lnet/minecraft/class_454; + FIELD field_2719 tabs Ljava/util/Map; + FIELD field_2720 selectedTab Lnet/minecraft/class_454; FIELD field_2721 advancementHandler Lnet/minecraft/class_632; METHOD keyPressed (III)Z ARG 1 keyCode @@ -10,17 +10,21 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc ARG 3 modifiers METHOD method_2334 drawWidgets (II)V ARG 1 x + ARG 2 y METHOD method_2335 getAdvancementWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; ARG 1 advancement - METHOD method_2336 getAdvancementTreeWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_454; + METHOD method_2336 getTab (Lnet/minecraft/class_161;)Lnet/minecraft/class_454; + ARG 1 advancement METHOD method_2337 drawAdvancementTree (IIII)V ARG 1 mouseX ARG 2 mouseY ARG 3 x + ARG 4 y METHOD method_2338 drawWidgetTooltip (IIII)V ARG 1 mouseX ARG 2 mouseY ARG 3 x + ARG 4 y METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.mapping index c49b1e1a79..e429c946bd 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.mapping @@ -59,6 +59,7 @@ CLASS net/minecraft/class_463 net/minecraft/client/gui/screen/ingame/AbstractCom METHOD method_2357 showSuggestions ()V METHOD method_2359 commitAndClose ()V METHOD method_2360 onCommandChanged (Ljava/lang/String;)V + ARG 1 text METHOD method_2368 updateTrackedOutput ()V METHOD mouseClicked (DDI)Z ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping index d64b83da49..c7f77ec21a 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_489 net/minecraft/client/gui/screen/ingame/AbstractFur ARG 2 recipeBook ARG 3 inventory ARG 4 title + ARG 5 background METHOD charTyped (CI)Z ARG 1 chr ARG 2 keyCode diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping index a831c9733c..0c371dd4b9 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen FIELD field_2900 offsetGuiForEffects Z - METHOD method_2477 drawPotionEffects ()V + METHOD method_2477 drawStatusEffects ()V METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping index df1e0ba7b1..57601f7c35 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_471 net/minecraft/client/gui/screen/ingame/AnvilScreen ARG 2 scanCode ARG 3 modifiers METHOD method_2403 onRenamed (Ljava/lang/String;)V + ARG 1 name METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping index 6fbb95f4ab..33a3e31c72 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping @@ -8,19 +8,19 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr FIELD field_2828 signing Z FIELD field_2829 highlightTo I FIELD field_2830 lastClickTime J - FIELD field_2831 buttonSign Lnet/minecraft/class_4185; + FIELD field_2831 signButton Lnet/minecraft/class_4185; FIELD field_2832 hand Lnet/minecraft/class_1268; FIELD field_2833 cursorIndex I FIELD field_2835 itemStack Lnet/minecraft/class_1799; FIELD field_2837 dirty Z - FIELD field_2839 buttonNextPage Lnet/minecraft/class_474; + FIELD field_2839 previousPageButton Lnet/minecraft/class_474; FIELD field_2840 currentPage I - FIELD field_2841 buttonFinalize Lnet/minecraft/class_4185; - FIELD field_2843 buttonPreviousPage Lnet/minecraft/class_474; + FIELD field_2841 finalizeButton Lnet/minecraft/class_4185; + FIELD field_2843 nextPageButton Lnet/minecraft/class_474; FIELD field_2844 tickCounter I FIELD field_2847 title Ljava/lang/String; - FIELD field_2848 buttonDone Lnet/minecraft/class_4185; - FIELD field_2849 buttonCancel Lnet/minecraft/class_4185; + FIELD field_2848 doneButton Lnet/minecraft/class_4185; + FIELD field_2849 cancelButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)V ARG 1 playerEntity ARG 2 itemStack @@ -63,12 +63,12 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr ARG 1 content ARG 2 index METHOD method_2417 getCharacterCountForWidth (Ljava/lang/String;I)I - ARG 1 string + ARG 1 text ARG 2 width METHOD method_2421 moveCursorToTop (Ljava/lang/String;)V ARG 1 content METHOD method_2424 getStringWidth (Ljava/lang/String;)I - ARG 1 string + ARG 1 text METHOD method_2425 getCharacterCountForStringWidth (Ljava/lang/String;I)I ARG 1 string ARG 2 width diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping index 7cfe163414..8251e81c32 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping @@ -17,8 +17,8 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen FIELD field_17119 pageIndex I FIELD field_17120 cachedPage Ljava/util/List; FIELD field_17121 cachedPageIndex I - FIELD field_17122 lastPageButton Lnet/minecraft/class_474; - FIELD field_17123 nextPageButton Lnet/minecraft/class_474; + FIELD field_17122 nextPageButton Lnet/minecraft/class_474; + FIELD field_17123 previousPageButton Lnet/minecraft/class_474; FIELD field_17417 EMPTY_PROVIDER Lnet/minecraft/class_3872$class_3931; FIELD field_17418 contents Lnet/minecraft/class_3872$class_3931; FIELD field_18976 pageTurnSound Z @@ -31,7 +31,7 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen ARG 1 keyCode ARG 2 scanCode ARG 3 modifiers - METHOD method_17048 getLineAt (DD)Lnet/minecraft/class_2561; + METHOD method_17048 getTextAt (DD)Lnet/minecraft/class_2561; ARG 1 x ARG 3 y METHOD method_17053 getStringWidth (Ljava/lang/String;)I @@ -42,7 +42,8 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen METHOD method_17059 updatePageButtons ()V METHOD method_17554 setPageProvider (Lnet/minecraft/class_3872$class_3931;)V ARG 1 pageProvider - METHOD method_17555 getLines (Lnet/minecraft/class_2487;)Ljava/util/List; + METHOD method_17555 readPages (Lnet/minecraft/class_2487;)Ljava/util/List; + ARG 0 tag METHOD method_17556 setPage (I)Z ARG 1 index METHOD method_17557 addCloseButton ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index 9d5257fae1..b692a8e750 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/CartographyTableScreen FIELD field_17421 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3910;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 atl2 + ARG 1 container ARG 2 inventory ARG 3 title METHOD method_17566 drawMap (Lnet/minecraft/class_22;IIF)V @@ -10,6 +10,7 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph ARG 3 y ARG 4 size METHOD method_17567 drawMap (Lnet/minecraft/class_22;ZZZZ)V + ARG 1 mapState ARG 2 isMap ARG 3 isPaper ARG 4 isGlassPane diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractContainerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen.mapping similarity index 97% rename from mappings/net/minecraft/client/gui/screen/ingame/AbstractContainerScreen.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen.mapping index 76b8b482ea..0f685596d6 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractContainerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen.mapping @@ -1,6 +1,6 @@ -CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/AbstractContainerScreen +CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ContainerScreen FIELD field_17410 playerInventory Lnet/minecraft/class_1661; - FIELD field_2776 left I + FIELD field_2776 x I FIELD field_2777 touchDragSlotStart Lnet/minecraft/class_1735; FIELD field_2778 heldButtonCode I FIELD field_2779 containerHeight I @@ -24,7 +24,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/AbstractCon FIELD field_2797 container Lnet/minecraft/class_1703; FIELD field_2798 cancelNextRelease Z FIELD field_2799 lastClickedSlot Lnet/minecraft/class_1735; - FIELD field_2800 top I + FIELD field_2800 y I FIELD field_2801 BACKGROUND_TEXTURE Lnet/minecraft/class_2960; FIELD field_2802 touchDropOriginSlot Lnet/minecraft/class_1735; FIELD field_2803 draggedStackRemainder I @@ -66,6 +66,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/AbstractCon ARG 1 keyCode ARG 2 scanCode METHOD method_2385 drawSlot (Lnet/minecraft/class_1735;)V + ARG 1 slot METHOD method_2386 getSlotAt (DD)Lnet/minecraft/class_1735; ARG 1 xPosition ARG 3 yPosition diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index f6065a8513..4f0b058c8e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -23,9 +23,17 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv ARG 2 scanCode ARG 3 modifiers METHOD method_2462 onHotbarKeyPress (Lnet/minecraft/class_310;IZZ)V + ARG 0 client + ARG 1 index + ARG 2 restore + ARG 3 save METHOD method_2463 isClickInTab (Lnet/minecraft/class_1761;DD)Z - METHOD method_2465 doRenderScrollBar ()Z + ARG 1 group + ARG 2 mouseX + ARG 4 mouseY + METHOD method_2465 hasScrollbar ()Z METHOD method_2466 setSelectedTab (Lnet/minecraft/class_1761;)V + ARG 1 group METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen9.mapping b/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping similarity index 91% rename from mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen9.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping index 6a5a905f18..f85b77fe29 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen9.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_480 net/minecraft/client/gui/screen/ingame/ContainerScreen9 +CLASS net/minecraft/class_480 net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen FIELD field_2885 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1716;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 container diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen54.mapping b/mappings/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.mapping similarity index 92% rename from mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen54.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.mapping index 89ffeadae3..a3cc71a5ba 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen54.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_476 net/minecraft/client/gui/screen/ingame/ContainerScreen54 +CLASS net/minecraft/class_476 net/minecraft/client/gui/screen/ingame/GenericContainerScreen FIELD field_2861 TEXTURE Lnet/minecraft/class_2960; FIELD field_2864 rows I METHOD (Lnet/minecraft/class_1707;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index 2965ad3827..4fcd184e8a 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -9,6 +9,11 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc METHOD (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_2486 drawEntity (IIIFFLnet/minecraft/class_1309;)V + ARG 0 x + ARG 1 y + ARG 2 size + ARG 3 mouseX + ARG 4 mouseY ARG 5 entity METHOD mouseClicked (DDI)Z ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping index fdc3eb8f56..a9f02d9b3c 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3935 net/minecraft/client/gui/screen/ingame/LecternScreen - FIELD field_17422 lecternContainer Lnet/minecraft/class_3916; + FIELD field_17422 container Lnet/minecraft/class_3916; FIELD field_17423 listener Lnet/minecraft/class_1712; METHOD method_17572 sendButtonPressPacket (I)V ARG 1 id diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping index e5ddcc764c..df7c6c79a4 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping @@ -29,8 +29,8 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip METHOD method_2528 setTooltip (Ljava/lang/String;)V ARG 1 text METHOD method_2529 getServerList ()Lnet/minecraft/class_641; - METHOD method_2531 selectEntry (Lnet/minecraft/class_4267$class_504;)V - ARG 1 arg1 + METHOD method_2531 select (Lnet/minecraft/class_4267$class_504;)V + ARG 1 entry METHOD method_2534 refresh ()V METHOD method_2536 connect ()V METHOD method_2548 connect (Lnet/minecraft/class_642;)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 84f73ae82a..b45fff147f 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -1,4 +1,25 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget + FIELD field_19104 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_19105 SERVER_PINGER_THREAD_POOL Ljava/util/concurrent/ThreadPoolExecutor; + FIELD field_19106 UNKNOWN_SERVER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_19107 SERVER_SELECTION_TEXTURE Lnet/minecraft/class_2960; + FIELD field_19108 screen Lnet/minecraft/class_500; + FIELD field_19109 servers Ljava/util/List; + FIELD field_19110 scanningEntry Lnet/minecraft/class_4267$class_504; + FIELD field_19111 lanServers Ljava/util/List; + METHOD (Lnet/minecraft/class_500;Lnet/minecraft/class_310;IIIII)V + ARG 1 screen + ARG 2 client + ARG 3 width + ARG 4 height + ARG 5 top + ARG 6 bottom + ARG 7 entryHeight + METHOD method_20125 setServers (Lnet/minecraft/class_641;)V + ARG 1 servers + METHOD method_20126 setLanServers (Ljava/util/List;)V + ARG 1 lanServers + METHOD method_20131 updateEntries ()V CLASS class_504 Entry CLASS class_4268 ScanningEntry FIELD field_19112 client Lnet/minecraft/class_310; @@ -15,31 +36,24 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 1 mouseX ARG 3 mouseY ARG 5 button - CLASS class_4270 ServerItem + CLASS class_4270 ServerEntry FIELD field_19118 screen Lnet/minecraft/class_500; FIELD field_19119 client Lnet/minecraft/class_310; FIELD field_19120 server Lnet/minecraft/class_642; - FIELD field_19121 iconLocation Lnet/minecraft/class_2960; - FIELD field_19123 iconTexture Lnet/minecraft/class_1043; + FIELD field_19121 iconTextureId Lnet/minecraft/class_2960; + FIELD field_19122 iconUri Ljava/lang/String; + FIELD field_19123 icon Lnet/minecraft/class_1043; FIELD field_19124 time J METHOD (Lnet/minecraft/class_4267;Lnet/minecraft/class_500;Lnet/minecraft/class_642;)V ARG 2 screen ARG 3 server METHOD method_20133 getServer ()Lnet/minecraft/class_642; + METHOD method_20134 draw (IILnet/minecraft/class_2960;)V + ARG 1 x + ARG 2 y + ARG 3 textureId + METHOD method_20137 updateIcon ()V METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY ARG 5 button - FIELD field_19104 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_19108 screen Lnet/minecraft/class_500; - FIELD field_19109 serverItems Ljava/util/List; - FIELD field_19110 scanningEntry Lnet/minecraft/class_4267$class_504; - FIELD field_19111 serverEntries Ljava/util/List; - METHOD (Lnet/minecraft/class_500;Lnet/minecraft/class_310;IIIII)V - ARG 1 screen - ARG 2 client - ARG 3 width - ARG 4 height - ARG 5 top - ARG 6 bottom - ARG 7 entryHeight diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/AccessibilityScreen.mapping similarity index 81% rename from mappings/net/minecraft/client/gui/screen/AccessibilityScreen.mapping rename to mappings/net/minecraft/client/gui/screen/options/AccessibilityScreen.mapping index c517f431d5..e89629d8d9 100644 --- a/mappings/net/minecraft/client/gui/screen/AccessibilityScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/AccessibilityScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/AccessibilityScreen +CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/options/AccessibilityScreen FIELD field_18730 OPTIONS [Lnet/minecraft/class_316; FIELD field_18731 parent Lnet/minecraft/class_437; FIELD field_18732 gameOptions Lnet/minecraft/class_315; diff --git a/mappings/net/minecraft/client/gui/screen/ChatOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/ChatOptionsScreen.mapping similarity index 81% rename from mappings/net/minecraft/client/gui/screen/ChatOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/options/ChatOptionsScreen.mapping index dadbc59135..2739092dd8 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/ChatOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/ChatOptionsScreen +CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/options/ChatOptionsScreen FIELD field_2352 OPTIONS [Lnet/minecraft/class_316; FIELD field_2354 parent Lnet/minecraft/class_437; FIELD field_2355 narratorOptionButton Lnet/minecraft/class_339; diff --git a/mappings/net/minecraft/client/gui/screen/controls/ControlsListWidget.mapping b/mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping similarity index 89% rename from mappings/net/minecraft/client/gui/screen/controls/ControlsListWidget.mapping rename to mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping index 0b9e30aef7..5023d386ad 100644 --- a/mappings/net/minecraft/client/gui/screen/controls/ControlsListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/controls/ControlsListWidget +CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/options/ControlsListWidget CLASS class_460 CategoryEntry FIELD field_2736 name Ljava/lang/String; FIELD field_2737 nameWidth I diff --git a/mappings/net/minecraft/client/gui/screen/controls/ControlsOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/ControlsOptionsScreen.mapping similarity index 87% rename from mappings/net/minecraft/client/gui/screen/controls/ControlsOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/options/ControlsOptionsScreen.mapping index 4eee5252c9..16f0b3eddd 100644 --- a/mappings/net/minecraft/client/gui/screen/controls/ControlsOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/ControlsOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_458 net/minecraft/client/gui/screen/controls/ControlsOptionsScreen +CLASS net/minecraft/class_458 net/minecraft/client/gui/screen/options/ControlsOptionsScreen FIELD field_2723 time J FIELD field_2724 options Lnet/minecraft/class_315; FIELD field_2725 resetButton Lnet/minecraft/class_4185; diff --git a/mappings/net/minecraft/client/gui/screen/LanguageOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping similarity index 91% rename from mappings/net/minecraft/client/gui/screen/LanguageOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping index 39be86476c..882d1dea9a 100644 --- a/mappings/net/minecraft/client/gui/screen/LanguageOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/LanguageOptionsScreen +CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/options/LanguageOptionsScreen CLASS class_4195 LanguageSelectionListWidget CLASS class_4194 LanguageEntry FIELD field_18743 languageDefinition Lnet/minecraft/class_1077; diff --git a/mappings/net/minecraft/client/gui/screen/MouseOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/MouseOptionsScreen.mapping similarity index 76% rename from mappings/net/minecraft/client/gui/screen/MouseOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/options/MouseOptionsScreen.mapping index befa2e01cd..bd06040daa 100644 --- a/mappings/net/minecraft/client/gui/screen/MouseOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/MouseOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/MouseOptionsScreen +CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/options/MouseOptionsScreen FIELD field_19245 parent Lnet/minecraft/class_437; FIELD field_19246 buttonList Lnet/minecraft/class_353; FIELD field_19247 OPTIONS [Lnet/minecraft/class_316; diff --git a/mappings/net/minecraft/client/gui/screen/SkinOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping similarity index 76% rename from mappings/net/minecraft/client/gui/screen/SkinOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping index 84b1f62732..11cf40f366 100644 --- a/mappings/net/minecraft/client/gui/screen/SkinOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/SkinOptionsScreen +CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/options/SkinOptionsScreen FIELD field_2577 parent Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent diff --git a/mappings/net/minecraft/client/gui/screen/SoundOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping similarity index 75% rename from mappings/net/minecraft/client/gui/screen/SoundOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping index e90d167166..410a462738 100644 --- a/mappings/net/minecraft/client/gui/screen/SoundOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/SoundOptionsScreen +CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/options/SoundOptionsScreen FIELD field_2617 parent Lnet/minecraft/class_437; FIELD field_2618 options Lnet/minecraft/class_315; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping similarity index 86% rename from mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping rename to mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping index b7e89bcfb1..bc85e77e83 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget +CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget CLASS class_509 AlternateButtonWidget CLASS class_510 InputSlot FIELD field_3114 recipe Lnet/minecraft/class_1860; @@ -23,7 +23,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA FIELD field_3103 buttonY I FIELD field_3104 lastClickedRecipe Lnet/minecraft/class_1860; FIELD field_3105 buttonX I - FIELD field_3106 alternateButtons Ljava/util/List; + FIELD field_3106 alternativeButtons Ljava/util/List; FIELD field_3107 visible Z FIELD field_3108 client Lnet/minecraft/class_310; FIELD field_3109 BG_TEX Lnet/minecraft/class_2960; @@ -34,10 +34,13 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA ARG 1 mouseX ARG 3 mouseY METHOD method_2613 setVisible (Z)V + ARG 1 visible METHOD method_2614 getResults ()Lnet/minecraft/class_516; METHOD method_2615 getLastClickedRecipe ()Lnet/minecraft/class_1860; METHOD method_2616 isVisible ()Z - METHOD method_2617 showAlternatesForResult (Lnet/minecraft/class_310;Lnet/minecraft/class_516;IIIIF)V + METHOD method_2617 showAlternativesForResult (Lnet/minecraft/class_310;Lnet/minecraft/class_516;IIIIF)V + ARG 1 client + ARG 2 results ARG 3 buttonX ARG 4 buttonY ARG 5 areaCenterX diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping index 8fb716aa91..e49d3ccf79 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_505 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 1 client ARG 2 x ARG 3 y + ARG 4 isBig ARG 5 lastFrameDuration METHOD method_2569 addSlot (Lnet/minecraft/class_1856;II)V ARG 1 ingredient diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookProvider.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookProvider.mapping index 94599b575b..b1c159735d 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookProvider.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookProvider.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_518 net/minecraft/client/gui/screen/recipebook/RecipeBookProvider METHOD method_16891 refreshRecipeBook ()V - METHOD method_2659 getRecipeBookGui ()Lnet/minecraft/class_507; + METHOD method_2659 getRecipeBookWidget ()Lnet/minecraft/class_507; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index 16951d5579..25c98eb32a 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2581 drawGhostSlots (IIZF)V ARG 1 left ARG 2 top + ARG 3 isBig ARG 4 lastFrameDuration METHOD method_2585 setBookButtonTexture ()V METHOD method_2586 refreshSearchResults ()V diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeDisplayListener.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeDisplayListener.mapping index c55051bd38..d27352c2aa 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeDisplayListener.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeDisplayListener.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_515 net/minecraft/client/gui/screen/recipebook/RecipeDisplayListener METHOD method_2646 onRecipesDisplayed (Ljava/util/List;)V + ARG 1 recipes diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping index 03e73906f7..da4e7b186d 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping @@ -2,8 +2,10 @@ CLASS net/minecraft/class_512 net/minecraft/client/gui/screen/recipebook/RecipeG FIELD field_3122 bounce F FIELD field_3123 category Lnet/minecraft/class_314; METHOD method_2622 checkForNewRecipes (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_2623 getCategory ()Lnet/minecraft/class_314; METHOD method_2624 hasKnownRecipes (Lnet/minecraft/class_299;)Z + ARG 1 recipeBook METHOD renderButton (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping index 551d74e32a..cf61cada4b 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeResultCollection - FIELD field_3144 allRecipes Ljava/util/List; - FIELD field_3145 fittableResults Ljava/util/Set; - FIELD field_3146 craftableResults Ljava/util/Set; - FIELD field_3147 allResults Ljava/util/Set; + FIELD field_3144 recipes Ljava/util/List; + FIELD field_3145 fittingRecipes Ljava/util/Set; + FIELD field_3146 craftableRecipes Ljava/util/Set; + FIELD field_3147 unlockedRecipes Ljava/util/Set; METHOD method_2647 initialize (Lnet/minecraft/class_3439;)V ARG 1 recipeBook - METHOD method_2648 getResultsExclusive (Z)Ljava/util/List; - ARG 1 isCraftable + METHOD method_2648 getRecipes (Z)Ljava/util/List; + ARG 1 craftable METHOD method_2649 computeCraftables (Lnet/minecraft/class_1662;IILnet/minecraft/class_3439;)V ARG 1 recipeFinder ARG 2 gridWidth @@ -17,6 +17,8 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeR ARG 1 craftableOnly METHOD method_2652 isInitialized ()Z METHOD method_2653 isCraftable (Lnet/minecraft/class_1860;)Z + ARG 1 recipe METHOD method_2654 addRecipe (Lnet/minecraft/class_1860;)V - METHOD method_2655 hasCraftableResults ()Z - METHOD method_2657 hasFittableResults ()Z + ARG 1 recipe + METHOD method_2655 hasCraftableRecipes ()Z + METHOD method_2657 hasFittingRecipes ()Z diff --git a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping index c2b550ef6b..b8c3affb79 100644 --- a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping @@ -32,5 +32,5 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/resourcepack/Resou ARG 2 width ARG 3 height ARG 4 title - METHOD method_2690 addEntry (Lnet/minecraft/class_521$class_4271;)V + METHOD method_2690 add (Lnet/minecraft/class_521$class_4271;)V ARG 1 entry diff --git a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen.mapping index 2c92326560..af63ffd089 100644 --- a/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen.mapping @@ -1,13 +1,15 @@ CLASS net/minecraft/class_519 net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen - FIELD field_3154 selectedList Lnet/minecraft/class_523; - FIELD field_3155 edited Z + FIELD field_3154 enabledPacks Lnet/minecraft/class_523; + FIELD field_3155 dirty Z FIELD field_3156 parent Lnet/minecraft/class_437; - FIELD field_3157 availableList Lnet/minecraft/class_522; + FIELD field_3157 availablePacks Lnet/minecraft/class_522; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent - METHOD method_2660 setEdited ()V - METHOD method_2663 remove (Lnet/minecraft/class_521$class_4271;)V - METHOD method_2674 select (Lnet/minecraft/class_521$class_4271;)V + METHOD method_2660 markDirty ()V + METHOD method_2663 disable (Lnet/minecraft/class_521$class_4271;)V + ARG 1 resourcePack + METHOD method_2674 enable (Lnet/minecraft/class_521$class_4271;)V + ARG 1 resourcePack METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 18573b26fc..a5676d5369 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -2,23 +2,23 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_18979 generatorOptionsTag Lnet/minecraft/class_2487; FIELD field_3180 structures Z FIELD field_3181 seed Ljava/lang/String; - FIELD field_3182 buttonCommandsAllowed Lnet/minecraft/class_4185; - FIELD field_3184 textFieldSeed Lnet/minecraft/class_342; - FIELD field_3186 buttonGameModeSwitch Lnet/minecraft/class_4185; + FIELD field_3182 enableCheatsButton Lnet/minecraft/class_4185; + FIELD field_3184 seedField Lnet/minecraft/class_342; + FIELD field_3186 gameModeSwitchButton Lnet/minecraft/class_4185; FIELD field_3187 parent Lnet/minecraft/class_437; - FIELD field_3188 textFieldLevelName Lnet/minecraft/class_342; - FIELD field_3189 buttonMapTypeSwitch Lnet/minecraft/class_4185; - FIELD field_3190 isCreatingLevel Z - FIELD field_3191 enableBonusItems Z - FIELD field_3192 commandsAllowed Z - FIELD field_3193 buttonMoreOptions Lnet/minecraft/class_4185; + FIELD field_3188 levelNameField Lnet/minecraft/class_342; + FIELD field_3189 mapTypeSwitchButton Lnet/minecraft/class_4185; + FIELD field_3190 creatingLevel Z + FIELD field_3191 bonusChest Z + FIELD field_3192 cheatsEnabled Z + FIELD field_3193 moreOptionsButton Lnet/minecraft/class_4185; FIELD field_3195 levelName Ljava/lang/String; - FIELD field_3197 buttonGenerateBonusItems Lnet/minecraft/class_4185; - FIELD field_3198 buttonCustomizeType Lnet/minecraft/class_4185; + FIELD field_3197 generateBonusChestButton Lnet/minecraft/class_4185; + FIELD field_3198 customizeTypeButton Lnet/minecraft/class_4185; FIELD field_3201 gameMode Ljava/lang/String; - FIELD field_3203 buttonGenerateStructures Lnet/minecraft/class_4185; + FIELD field_3203 generateStructuresButton Lnet/minecraft/class_4185; FIELD field_3204 generatorType I - FIELD field_3205 buttonCreateLevel Lnet/minecraft/class_4185; + FIELD field_3205 createLevelButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent METHOD keyPressed (III)Z @@ -27,6 +27,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 3 modifiers METHOD method_2736 createLevel ()V METHOD method_2737 recreateLevel (Lnet/minecraft/class_31;)V + ARG 1 levelProperties METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping index 2216654b4b..efd77cbc2d 100644 --- a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS ARG 2 scanCode ARG 3 modifiers METHOD method_19940 worldSelected (Z)V + ARG 1 active METHOD method_2739 setTooltip (Ljava/lang/String;)V ARG 1 value METHOD mouseScrolled (DDD)Z diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 88e9e4ddcb..52556c09c2 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -1,5 +1,25 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWidget - CLASS class_4272 LevelItem + FIELD field_19132 DATE_FORMAT Ljava/text/DateFormat; + FIELD field_19133 UNKNOWN_SERVER_LOCATION Lnet/minecraft/class_2960; + FIELD field_19134 WORLD_SELECTION_LOCATION Lnet/minecraft/class_2960; + FIELD field_3237 parent Lnet/minecraft/class_526; + FIELD field_3238 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_3239 levels Ljava/util/List; + METHOD (Lnet/minecraft/class_526;Lnet/minecraft/class_310;IIIIILjava/util/function/Supplier;Lnet/minecraft/class_528;)V + ARG 1 parent + ARG 2 client + ARG 3 width + ARG 4 height + ARG 5 top + ARG 6 bottom + ARG 7 itemHeight + ARG 8 searchFilter + ARG 9 list + METHOD method_2750 filter (Ljava/util/function/Supplier;Z)V + ARG 1 filter + ARG 2 load + METHOD method_2752 getParent ()Lnet/minecraft/class_526; + CLASS class_4272 Entry FIELD field_19136 client Lnet/minecraft/class_310; FIELD field_19137 screen Lnet/minecraft/class_526; FIELD field_19138 level Lnet/minecraft/class_34; @@ -21,23 +41,3 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid ARG 1 mouseX ARG 3 mouseY ARG 5 button - FIELD field_19132 DATE_FORMAT Ljava/text/DateFormat; - FIELD field_19133 UNKNOWN_SERVER_LOCATION Lnet/minecraft/class_2960; - FIELD field_19134 WORLD_SELECTION_LOCATION Lnet/minecraft/class_2960; - FIELD field_3237 parent Lnet/minecraft/class_526; - FIELD field_3238 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_3239 levels Ljava/util/List; - METHOD (Lnet/minecraft/class_526;Lnet/minecraft/class_310;IIIIILjava/util/function/Supplier;Lnet/minecraft/class_528;)V - ARG 1 parent - ARG 2 client - ARG 3 width - ARG 4 height - ARG 5 top - ARG 6 bottom - ARG 7 itemHeight - ARG 8 searchFilter - ARG 9 list - METHOD method_2750 filter (Ljava/util/function/Supplier;Z)V - ARG 1 filter - ARG 2 load - METHOD method_2752 getParent ()Lnet/minecraft/class_526; diff --git a/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping index 74140284f4..9cde704a69 100644 --- a/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping @@ -10,7 +10,9 @@ CLASS net/minecraft/class_347 net/minecraft/client/gui/widget/LockButtonWidget METHOD (IILnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y + ARG 3 action METHOD method_1895 setLocked (Z)V + ARG 1 locked METHOD method_1896 isLocked ()Z METHOD renderButton (IIF)V ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/ingame/PageTurnWidget.mapping b/mappings/net/minecraft/client/gui/widget/PageTurnWidget.mapping similarity index 68% rename from mappings/net/minecraft/client/gui/screen/ingame/PageTurnWidget.mapping rename to mappings/net/minecraft/client/gui/widget/PageTurnWidget.mapping index 5782df6e5b..8d20d28892 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/PageTurnWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/PageTurnWidget.mapping @@ -1,9 +1,11 @@ -CLASS net/minecraft/class_474 net/minecraft/client/gui/screen/ingame/PageTurnWidget +CLASS net/minecraft/class_474 net/minecraft/client/gui/widget/PageTurnWidget FIELD field_18977 playPageTurnSound Z FIELD field_2851 isNextPageButton Z METHOD (IIZLnet/minecraft/class_4185$class_4241;Z)V ARG 1 x ARG 2 y + ARG 3 isNextPageButton + ARG 4 action ARG 5 playPageTurnSound METHOD renderButton (IIF)V ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping index 1a446bcbbc..a6134e3fd9 100644 --- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping @@ -6,11 +6,12 @@ CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget ARG 4 height ARG 5 progress METHOD (Lnet/minecraft/class_315;IIIID)V + ARG 1 options ARG 2 x ARG 3 y ARG 4 width ARG 5 height - ARG 6 progress + ARG 6 value METHOD getYImage (Z)I ARG 1 isHovered METHOD keyPressed (III)Z diff --git a/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping index 1c5e94aba0..731018ee19 100644 --- a/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping @@ -4,4 +4,5 @@ CLASS net/minecraft/class_444 net/minecraft/client/gui/widget/SoundSliderWidget ARG 1 client ARG 2 x ARG 3 y + ARG 4 category ARG 5 width diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index c049f596db..f45b354c5a 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -6,8 +6,8 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget FIELD field_2098 uneditableColor I FIELD field_2099 renderTextProvider Ljava/util/function/BiFunction; FIELD field_2100 editableColor I - FIELD field_2101 cursorMin I - FIELD field_2102 cursorMax I + FIELD field_2101 selectionEnd I + FIELD field_2102 selectionStart I FIELD field_2104 textPredicate Ljava/util/function/Predicate; FIELD field_2105 textRenderer Lnet/minecraft/class_327; FIELD field_2106 suggestion Ljava/lang/String; @@ -19,12 +19,15 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 3 y ARG 4 width ARG 5 height + ARG 6 message METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_342;Ljava/lang/String;)V ARG 1 textRenderer ARG 2 x ARG 3 y ARG 4 width ARG 5 height + ARG 6 copyFrom + ARG 7 message METHOD charTyped (CI)Z ARG 1 chr ARG 2 keyCode @@ -43,6 +46,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD method_1854 setRenderTextProvider (Ljava/util/function/BiFunction;)V ARG 1 renderTextProvider METHOD method_1855 moveCursor (I)V + ARG 1 offset METHOD method_1858 setHasBorder (Z)V ARG 1 hasBorder METHOD method_1860 setUneditableColor (I)V @@ -51,14 +55,16 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD method_1862 setVisible (Z)V ARG 1 visible METHOD method_1863 setChangedListener (Ljava/util/function/Consumer;)V + ARG 1 changedListener METHOD method_1865 tick ()V METHOD method_1866 getSelectedText ()Ljava/lang/String; - METHOD method_1867 addText (Ljava/lang/String;)V + METHOD method_1867 write (Ljava/lang/String;)V + ARG 1 text METHOD method_1868 setEditableColor (I)V ARG 1 color METHOD method_1874 onChanged (Ljava/lang/String;)V ARG 1 newText - METHOD method_1875 setCursor (I)V + METHOD method_1875 setSelectionStart (I)V ARG 1 cursor METHOD method_1880 setMaxLength (I)V ARG 1 maximumLength @@ -67,7 +73,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD method_1885 isVisible ()Z METHOD method_1887 setSuggestion (Ljava/lang/String;)V ARG 1 suggestion - METHOD method_1888 setIsEditable (Z)V + METHOD method_1888 setEditable (Z)V ARG 1 editable METHOD method_1889 getCharacterX (I)I ARG 1 index diff --git a/mappings/net/minecraft/client/model/Cuboid.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping similarity index 53% rename from mappings/net/minecraft/client/model/Cuboid.mapping rename to mappings/net/minecraft/client/model/ModelPart.mapping index e4232c6d11..5175d3a026 100644 --- a/mappings/net/minecraft/client/model/Cuboid.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -1,8 +1,8 @@ -CLASS net/minecraft/class_630 net/minecraft/client/model/Cuboid +CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart FIELD field_3654 pitch F - FIELD field_3655 rotationPointZ F - FIELD field_3656 rotationPointY F - FIELD field_3657 rotationPointX F + FIELD field_3655 pivotZ F + FIELD field_3656 pivotY F + FIELD field_3657 pivotX F FIELD field_3658 textureHeight F FIELD field_3659 textureWidth F FIELD field_3660 compiled Z @@ -20,47 +20,51 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/Cuboid FIELD field_3674 roll F FIELD field_3675 yaw F METHOD (Lnet/minecraft/class_3879;II)V - ARG 1 owner + ARG 1 model ARG 2 textureOffsetU ARG 3 textureOffsetV METHOD (Lnet/minecraft/class_3879;Ljava/lang/String;)V ARG 1 owner ARG 2 name - METHOD method_17138 copyRotation (Lnet/minecraft/class_630;)V + METHOD method_17138 copyPositionAndRotation (Lnet/minecraft/class_630;)V METHOD method_17578 removeChild (Lnet/minecraft/class_630;)V - METHOD method_2844 addBox (FFFIII)Lnet/minecraft/class_630; - ARG 1 xMin - ARG 2 yMin - ARG 3 zMin - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize + METHOD method_2844 addCuboid (FFFIII)Lnet/minecraft/class_630; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 sizeX + ARG 5 sizeY + ARG 6 sizeZ METHOD method_2845 addChild (Lnet/minecraft/class_630;)V + ARG 1 part METHOD method_2846 render (F)V ARG 1 scale METHOD method_2847 applyTransform (F)V ARG 1 scale - METHOD method_2848 addBox (Ljava/lang/String;FFFIIIFII)Lnet/minecraft/class_630; - ARG 1 suffix - ARG 2 xMin - ARG 3 yMin - ARG 4 zMin - ARG 5 xSize - ARG 6 ySize - ARG 7 zSize + METHOD method_2848 addCuboid (Ljava/lang/String;FFFIIIFII)Lnet/minecraft/class_630; + ARG 1 name + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 sizeX + ARG 6 sizeY + ARG 7 sizeZ + ARG 8 extra ARG 9 textureOffsetU ARG 10 textureOffsetV - METHOD method_2849 addBox (FFFIIIFZ)V - ARG 1 xMin - ARG 2 yMin - ARG 3 zMin - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize + METHOD method_2849 addCuboid (FFFIIIFZ)V + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 sizeX + ARG 5 sizeY + ARG 6 sizeZ + ARG 7 extra + ARG 8 mirror METHOD method_2850 setTextureOffset (II)Lnet/minecraft/class_630; - ARG 1 u - ARG 2 v - METHOD method_2851 setRotationPoint (FFF)V + ARG 1 textureOffsetU + ARG 2 textureOffsetV + METHOD method_2851 setPivot (FFF)V ARG 1 x ARG 2 y ARG 3 z @@ -69,19 +73,21 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/Cuboid METHOD method_2853 setTextureSize (II)Lnet/minecraft/class_630; ARG 1 width ARG 2 height - METHOD method_2854 addBox (FFFIIIZ)Lnet/minecraft/class_630; - ARG 1 xMin - ARG 2 yMin - ARG 3 zMin - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize + METHOD method_2854 addCuboid (FFFIIIZ)Lnet/minecraft/class_630; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 sizeX + ARG 5 sizeY + ARG 6 sizeZ + ARG 7 mirror METHOD method_2855 compile (F)V ARG 1 scale - METHOD method_2856 addBox (FFFIIIF)V - ARG 1 xMin - ARG 2 yMin - ARG 3 zMin - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize + METHOD method_2856 addCuboid (FFFIIIF)V + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 sizeX + ARG 5 sizeY + ARG 6 sizeZ + ARG 7 extra diff --git a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping index e32258fa53..e312a30321 100644 --- a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping +++ b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping @@ -9,7 +9,10 @@ CLASS net/minecraft/class_632 net/minecraft/client/network/ClientAdvancementMana FIELD field_3685 selectedTab Lnet/minecraft/class_161; FIELD field_3686 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_2861 onAdvancements (Lnet/minecraft/class_2779;)V + ARG 1 packet METHOD method_2862 setListener (Lnet/minecraft/class_632$class_633;)V ARG 1 listener METHOD method_2863 getManager ()Lnet/minecraft/class_163; METHOD method_2864 selectTab (Lnet/minecraft/class_161;Z)V + ARG 1 tab + ARG 2 local diff --git a/mappings/net/minecraft/client/network/ClientCommandSource.mapping b/mappings/net/minecraft/client/network/ClientCommandSource.mapping index 32a3943523..fca2efe211 100644 --- a/mappings/net/minecraft/client/network/ClientCommandSource.mapping +++ b/mappings/net/minecraft/client/network/ClientCommandSource.mapping @@ -4,8 +4,12 @@ CLASS net/minecraft/class_637 net/minecraft/client/network/ClientCommandSource FIELD field_3724 completionId I FIELD field_3725 client Lnet/minecraft/class_310; METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_310;)V - ARG 1 client - METHOD method_2929 formatDouble (D)Ljava/lang/String; - METHOD method_2930 formatInt (I)Ljava/lang/String; + ARG 1 networkHandler + ARG 2 client + METHOD method_2929 format (D)Ljava/lang/String; + ARG 0 d + METHOD method_2930 format (I)Ljava/lang/String; + ARG 0 i METHOD method_2931 onCommandSuggestions (ILcom/mojang/brigadier/suggestion/Suggestions;)V ARG 1 completionId + ARG 2 suggestions diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 2df8a37b81..a56f85ba7d 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -17,6 +17,9 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_3701 loginScreen Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;)V ARG 1 client + ARG 2 screen + ARG 3 connection + ARG 4 profile METHOD method_16690 getSessionId ()Ljava/util/UUID; METHOD method_2867 getTagManager ()Lnet/minecraft/class_3505; METHOD method_2868 clearWorld ()V @@ -24,6 +27,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_2871 getPlayerListEntry (Ljava/util/UUID;)Lnet/minecraft/class_640; ARG 1 uuid METHOD method_2873 sendResourcePackStatus (Lnet/minecraft/class_2856$class_2857;)V + ARG 1 packStatus METHOD method_2874 getPlayerListEntry (Ljava/lang/String;)Lnet/minecraft/class_640; ARG 1 profileName METHOD method_2875 getCommandSource ()Lnet/minecraft/class_637; @@ -32,6 +36,8 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_2879 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_2880 getPlayerList ()Ljava/util/Collection; METHOD method_2883 sendPacket (Lnet/minecraft/class_2596;)V + ARG 1 packet METHOD method_2886 getCommandDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_2888 validateResourcePackUrl (Ljava/lang/String;)Z + ARG 1 url METHOD method_2890 getWorld ()Lnet/minecraft/class_638; diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 6767c8aace..d4fffd408b 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3925 lastPitch F FIELD field_3926 lastX D FIELD field_3927 lastAutoJump Z - FIELD field_3928 stats Lnet/minecraft/class_3469; + FIELD field_3928 statHandler Lnet/minecraft/class_3469; FIELD field_3929 nextNauseaStrength F FIELD field_3930 recipeBook Lnet/minecraft/class_299; FIELD field_3931 lastRenderYaw F @@ -39,7 +39,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_3138 updateHealth (F)V METHOD method_3141 onRecipeDisplayed (Lnet/minecraft/class_1860;)V METHOD method_3142 sendChatMessage (Ljava/lang/String;)V - METHOD method_3143 getStats ()Lnet/minecraft/class_3469; + METHOD method_3143 getStatHandler ()Lnet/minecraft/class_3469; METHOD method_3144 isRiding ()Z METHOD method_3146 setServerBrand (Ljava/lang/String;)V ARG 1 serverBrand diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index c1b57800ed..79ee96e6dc 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -14,7 +14,9 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 3 hand ARG 4 hitResult METHOD method_2897 stopUsingItem (Lnet/minecraft/class_1657;)V + ARG 1 player METHOD method_2899 breakBlock (Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_2900 clickButton (II)V ARG 1 syncId ARG 2 buttonId @@ -23,27 +25,35 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 2 stateHandler ARG 3 recipeBook METHOD method_2903 copyAbilities (Lnet/minecraft/class_1657;)V + ARG 1 player METHOD method_2904 getReachDistance ()F METHOD method_2905 interactEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 entity ARG 3 hand METHOD method_2907 setGameMode (Lnet/minecraft/class_1934;)V + ARG 1 gameMode METHOD method_2908 hasStatusBars ()Z METHOD method_2909 clickCreativeStack (Lnet/minecraft/class_1799;I)V ARG 1 stack + ARG 2 slotId METHOD method_2910 attackBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 pos + ARG 2 direction METHOD method_2911 syncSelectedSlot ()V METHOD method_2912 clickRecipe (ILnet/minecraft/class_1860;Z)V ARG 1 syncId ARG 2 recipe + ARG 3 craftAll METHOD method_2913 hasExperienceBar ()Z METHOD method_2914 hasCreativeInventory ()Z METHOD method_2915 dropCreativeStack (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_2916 pickFromInventory (I)V ARG 1 slot METHOD method_2917 interactEntityAtLocation (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_3966;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; + ARG 1 player + ARG 3 hitResult METHOD method_2918 attackEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)V ARG 1 player ARG 2 target diff --git a/mappings/net/minecraft/client/network/DataQueryHandler.mapping b/mappings/net/minecraft/client/network/DataQueryHandler.mapping index 603fb5100d..717cc1a703 100644 --- a/mappings/net/minecraft/client/network/DataQueryHandler.mapping +++ b/mappings/net/minecraft/client/network/DataQueryHandler.mapping @@ -1,8 +1,15 @@ CLASS net/minecraft/class_300 net/minecraft/client/network/DataQueryHandler FIELD field_1640 networkHandler Lnet/minecraft/class_634; FIELD field_1641 expectedTransactionId I - FIELD field_1642 queryConsumer Ljava/util/function/Consumer; - METHOD method_1402 setNextQueryConsumer (Ljava/util/function/Consumer;)I + FIELD field_1642 callback Ljava/util/function/Consumer; + METHOD method_1402 nextQuery (Ljava/util/function/Consumer;)I + ARG 1 callback METHOD method_1403 queryBlockNbt (Lnet/minecraft/class_2338;Ljava/util/function/Consumer;)V + ARG 1 pos + ARG 2 callback METHOD method_1404 handleQueryResponse (ILnet/minecraft/class_2487;)Z + ARG 1 transactionId + ARG 2 tag METHOD method_1405 queryEntityNbt (ILjava/util/function/Consumer;)V + ARG 1 entityNetworkId + ARG 2 callback diff --git a/mappings/net/minecraft/client/network/LanServerEntry.mapping b/mappings/net/minecraft/client/network/LanServerInfo.mapping similarity index 93% rename from mappings/net/minecraft/client/network/LanServerEntry.mapping rename to mappings/net/minecraft/client/network/LanServerInfo.mapping index 8d05163981..571cdbcb48 100644 --- a/mappings/net/minecraft/client/network/LanServerEntry.mapping +++ b/mappings/net/minecraft/client/network/LanServerInfo.mapping @@ -1,9 +1,10 @@ -CLASS net/minecraft/class_1131 net/minecraft/client/network/LanServerEntry +CLASS net/minecraft/class_1131 net/minecraft/client/network/LanServerInfo FIELD field_5515 motd Ljava/lang/String; FIELD field_5516 lastTimeMillis J FIELD field_5517 addressPort Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 motd + ARG 2 addressPort METHOD method_4812 getAddressPort ()Ljava/lang/String; METHOD method_4813 getMotd ()Ljava/lang/String; METHOD method_4814 updateLastTime ()V diff --git a/mappings/net/minecraft/client/network/ServerEntryNetworkPart.mapping b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping similarity index 73% rename from mappings/net/minecraft/client/network/ServerEntryNetworkPart.mapping rename to mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping index c04ee94364..d660d3f5a3 100644 --- a/mappings/net/minecraft/client/network/ServerEntryNetworkPart.mapping +++ b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping @@ -1,9 +1,9 @@ -CLASS net/minecraft/class_644 net/minecraft/client/network/ServerEntryNetworkPart +CLASS net/minecraft/class_644 net/minecraft/client/network/MultiplayerServerListPinger FIELD field_3769 clientConnections Ljava/util/List; FIELD field_3770 ZERO_SPLITTER Lcom/google/common/base/Splitter; FIELD field_3771 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_2999 getZeroSplitter ()Lcom/google/common/base/Splitter; METHOD method_3001 ping (Lnet/minecraft/class_642;)V METHOD method_3002 getLogger ()Lorg/apache/logging/log4j/Logger; - METHOD method_3003 (Lnet/minecraft/class_642;)V + METHOD method_3003 add (Lnet/minecraft/class_642;)V ARG 1 entry diff --git a/mappings/net/minecraft/client/options/ServerEntry.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping similarity index 94% rename from mappings/net/minecraft/client/options/ServerEntry.mapping rename to mappings/net/minecraft/client/network/ServerInfo.mapping index cedad355b4..08f46ccd3e 100644 --- a/mappings/net/minecraft/client/options/ServerEntry.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_642 net/minecraft/client/options/ServerEntry +CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo CLASS class_643 ResourcePackState FIELD field_3765 name Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/network/packet/GuiCloseS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/GuiCloseS2CPacket.mapping deleted file mode 100644 index 6d6321f14c..0000000000 --- a/mappings/net/minecraft/client/network/packet/GuiCloseS2CPacket.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_2645 net/minecraft/client/network/packet/GuiCloseS2CPacket - FIELD field_12137 id I - METHOD (I)V - ARG 1 id diff --git a/mappings/net/minecraft/client/network/packet/GuiOpenS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/GuiOpenS2CPacket.mapping deleted file mode 100644 index dc0e98d0f0..0000000000 --- a/mappings/net/minecraft/client/network/packet/GuiOpenS2CPacket.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_2648 net/minecraft/client/network/packet/GuiOpenS2CPacket - FIELD field_12142 entityHorseId I - FIELD field_12143 slotCount I - FIELD field_12144 id I - METHOD (III)V - ARG 1 id - ARG 2 slotCount - ARG 3 entityHorseId - METHOD method_11432 getId ()I - METHOD method_11433 getHorseId ()I - METHOD method_11434 getSlotCount ()I diff --git a/mappings/net/minecraft/client/network/packet/HeldItemChangeS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/HeldItemChangeS2CPacket.mapping deleted file mode 100644 index 46fa4a8c63..0000000000 --- a/mappings/net/minecraft/client/network/packet/HeldItemChangeS2CPacket.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2735 net/minecraft/client/network/packet/HeldItemChangeS2CPacket - FIELD field_12463 slot I - METHOD (I)V - ARG 1 slot - METHOD method_11803 getSlot ()I diff --git a/mappings/net/minecraft/client/network/packet/KeepAliveS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/KeepAliveS2CPacket.mapping deleted file mode 100644 index e7cbbd1aad..0000000000 --- a/mappings/net/minecraft/client/network/packet/KeepAliveS2CPacket.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2670 net/minecraft/client/network/packet/KeepAliveS2CPacket - FIELD field_12211 id J - METHOD (J)V - ARG 1 id - METHOD method_11517 getId ()J diff --git a/mappings/net/minecraft/client/network/packet/QueryPongS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/QueryPongS2CPacket.mapping deleted file mode 100644 index 8fdd745934..0000000000 --- a/mappings/net/minecraft/client/network/packet/QueryPongS2CPacket.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_2923 net/minecraft/client/network/packet/QueryPongS2CPacket - FIELD field_13280 startTime J - METHOD (J)V - ARG 1 startTime diff --git a/mappings/net/minecraft/client/options/DoubleOption.mapping b/mappings/net/minecraft/client/options/DoubleOption.mapping index 31c00f1380..498409f438 100644 --- a/mappings/net/minecraft/client/options/DoubleOption.mapping +++ b/mappings/net/minecraft/client/options/DoubleOption.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4067 net/minecraft/client/options/DoubleOption - FIELD field_18204 interval F + FIELD field_18204 step F FIELD field_18205 min D FIELD field_18206 max D FIELD field_18207 getter Ljava/util/function/Function; @@ -9,7 +9,7 @@ CLASS net/minecraft/class_4067 net/minecraft/client/options/DoubleOption ARG 1 key ARG 2 min ARG 4 max - ARG 6 interval + ARG 6 step ARG 7 getter ARG 8 setter ARG 9 displayStringGetter diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping index d5988d0f29..401a2ba536 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/options/GameOptions.mapping @@ -100,19 +100,25 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions ARG 2 optionsFile METHOD method_1624 setSoundVolume (Lnet/minecraft/class_3419;F)V ARG 1 category - METHOD method_1627 addResourcePackContainersToManager (Lnet/minecraft/class_3283;)V + ARG 2 volume + METHOD method_1627 addResourcePackProfilesToManager (Lnet/minecraft/class_3283;)V ARG 1 manager METHOD method_1630 getSoundVolume (Lnet/minecraft/class_3419;)F + ARG 1 category METHOD method_1631 togglePlayerModelPart (Lnet/minecraft/class_1664;)V + ARG 1 part METHOD method_1632 getCloudRenderMode ()Lnet/minecraft/class_4063; METHOD method_1633 getEnabledPlayerModelParts ()Ljava/util/Set; METHOD method_1634 parseFloat (Ljava/lang/String;)F METHOD method_1635 setPlayerModelPart (Lnet/minecraft/class_1664;Z)V ARG 1 part + ARG 2 enabled METHOD method_1636 load ()V METHOD method_1639 shouldUseNativeTransport ()Z METHOD method_1640 write ()V METHOD method_1641 setKeyCode (Lnet/minecraft/class_304;Lnet/minecraft/class_3675$class_306;)V + ARG 1 key + ARG 2 code METHOD method_1643 onPlayerModelPartChange ()V METHOD method_19343 getTextBackgroundOpacity (F)F ARG 1 fallback diff --git a/mappings/net/minecraft/client/options/ServerList.mapping b/mappings/net/minecraft/client/options/ServerList.mapping index c3f0218d59..1def57182d 100644 --- a/mappings/net/minecraft/client/options/ServerList.mapping +++ b/mappings/net/minecraft/client/options/ServerList.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_641 net/minecraft/client/options/ServerList - FIELD field_3749 serverEntries Ljava/util/List; + FIELD field_3749 servers Ljava/util/List; FIELD field_3750 client Lnet/minecraft/class_310; FIELD field_3751 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_310;)V diff --git a/mappings/net/minecraft/client/particle/BlockCrackParticle.mapping b/mappings/net/minecraft/client/particle/BlockDustParticle.mapping similarity index 97% rename from mappings/net/minecraft/client/particle/BlockCrackParticle.mapping rename to mappings/net/minecraft/client/particle/BlockDustParticle.mapping index ac9f9251cb..07ad7a267f 100644 --- a/mappings/net/minecraft/client/particle/BlockCrackParticle.mapping +++ b/mappings/net/minecraft/client/particle/BlockDustParticle.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_727 net/minecraft/client/particle/BlockCrackParticle +CLASS net/minecraft/class_727 net/minecraft/client/particle/BlockDustParticle CLASS class_728 Factory FIELD field_3891 blockPos Lnet/minecraft/class_2338; FIELD field_3892 blockState Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/client/particle/FireSmokeLargeParticle.mapping b/mappings/net/minecraft/client/particle/LargeFireSmokeParticle.mapping similarity index 63% rename from mappings/net/minecraft/client/particle/FireSmokeLargeParticle.mapping rename to mappings/net/minecraft/client/particle/LargeFireSmokeParticle.mapping index 668643fe82..e892adce5e 100644 --- a/mappings/net/minecraft/client/particle/FireSmokeLargeParticle.mapping +++ b/mappings/net/minecraft/client/particle/LargeFireSmokeParticle.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_696 net/minecraft/client/particle/FireSmokeLargeParticle +CLASS net/minecraft/class_696 net/minecraft/client/particle/LargeFireSmokeParticle CLASS class_697 Factory METHOD (Lnet/minecraft/class_1937;DDDDDDLnet/minecraft/class_4002;)V ARG 1 world diff --git a/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping index 5cdcf624a9..e11c7a23bd 100644 --- a/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping @@ -8,7 +8,9 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipe/book/ClientRecipeBook METHOD method_1394 addGroup (Lnet/minecraft/class_314;)Lnet/minecraft/class_516; ARG 1 group METHOD method_1395 getGroupsForContainer (Lnet/minecraft/class_1729;)Ljava/util/List; + ARG 0 container METHOD method_1396 getResultsForGroup (Lnet/minecraft/class_314;)Ljava/util/List; + ARG 1 category METHOD method_1400 getGroupForRecipe (Lnet/minecraft/class_1860;)Lnet/minecraft/class_314; METHOD method_1401 reload ()V METHOD method_18092 addGroupResults (Lnet/minecraft/class_314;Lnet/minecraft/class_516;)V diff --git a/mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping b/mappings/net/minecraft/client/render/BlockBreakingInfo.mapping similarity index 50% rename from mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping rename to mappings/net/minecraft/client/render/BlockBreakingInfo.mapping index 5edc1b1c73..3b19e9da22 100644 --- a/mappings/net/minecraft/client/render/PartiallyBrokenBlockEntry.mapping +++ b/mappings/net/minecraft/client/render/BlockBreakingInfo.mapping @@ -1,15 +1,15 @@ -CLASS net/minecraft/class_3191 net/minecraft/client/render/PartiallyBrokenBlockEntry - FIELD field_13857 lastUpdateTicks I +CLASS net/minecraft/class_3191 net/minecraft/client/render/BlockBreakingInfo + FIELD field_13857 lastUpdateTick I FIELD field_13858 stage I - FIELD field_13859 breakingEntityId I + FIELD field_13859 actorNetworkId I FIELD field_13860 pos Lnet/minecraft/class_2338; METHOD (ILnet/minecraft/class_2338;)V ARG 1 breakingEntityId ARG 2 pos METHOD method_13987 setStage (I)V - ARG 1 value + ARG 1 stage METHOD method_13988 getStage ()I - METHOD method_13989 setLastUpdateTicks (I)V - ARG 1 value - METHOD method_13990 getLastUpdateTicks ()I + METHOD method_13989 setLastUpdateTick (I)V + ARG 1 lastUpdateTick + METHOD method_13990 getLastUpdateTick ()I METHOD method_13991 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index a70c13a5f6..9288b09a19 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder METHOD method_1347 getVertexCount ()I FIELD field_1553 currentElementId I FIELD field_1554 vertexCount I - FIELD field_1555 bufByte Ljava/nio/ByteBuffer; + FIELD field_1555 buffer Ljava/nio/ByteBuffer; FIELD field_1556 building Z FIELD field_1557 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_1558 currentElement Lnet/minecraft/class_296; @@ -24,7 +24,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder FIELD field_1566 bufFloat Ljava/nio/FloatBuffer; FIELD field_1567 drawMode I METHOD (I)V - ARG 1 size + ARG 1 initialCapacity METHOD method_1310 getColorIndex (I)I METHOD method_1311 getVertexFormat ()Lnet/minecraft/class_293; METHOD method_1312 texture (DD)Lnet/minecraft/class_287; @@ -75,6 +75,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder METHOD method_1327 disableColor ()V METHOD method_1328 begin (ILnet/minecraft/class_293;)V ARG 1 drawMode + ARG 2 format METHOD method_1329 setColor (II)V ARG 1 color ARG 2 index @@ -89,7 +90,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder METHOD method_1332 setQuadColor (I)V ARG 1 color METHOD method_1333 putVertexData ([I)V - METHOD method_1334 toBufferState ()Lnet/minecraft/class_287$class_288; + METHOD method_1334 popState ()Lnet/minecraft/class_287$class_288; METHOD method_1335 grow (I)V ARG 1 size METHOD method_1336 color (FFFF)Lnet/minecraft/class_287; diff --git a/mappings/net/minecraft/client/render/BufferRenderer.mapping b/mappings/net/minecraft/client/render/BufferRenderer.mapping index f192e01b03..d8b70a03ee 100644 --- a/mappings/net/minecraft/client/render/BufferRenderer.mapping +++ b/mappings/net/minecraft/client/render/BufferRenderer.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_286 net/minecraft/client/render/BufferRenderer METHOD method_1309 draw (Lnet/minecraft/class_287;)V + ARG 0 bufferBuilder diff --git a/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping similarity index 68% rename from mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping rename to mappings/net/minecraft/client/render/BuiltChunkStorage.mapping index aa112f0c4a..565c9f667b 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_769 net/minecraft/client/render/ChunkRenderDispatcher - FIELD field_4146 renderer Lnet/minecraft/class_761; +CLASS net/minecraft/class_769 net/minecraft/client/render/BuiltChunkStorage + FIELD field_4146 worldRenderer Lnet/minecraft/class_761; FIELD field_4147 sizeZ I FIELD field_4148 sizeX I FIELD field_4149 sizeY I @@ -8,13 +8,19 @@ CLASS net/minecraft/class_769 net/minecraft/client/render/ChunkRenderDispatcher METHOD (Lnet/minecraft/class_1937;ILnet/minecraft/class_761;Lnet/minecraft/class_850;)V ARG 1 world ARG 3 renderer - METHOD method_16040 scheduleChunkRender (IIIZ)V + METHOD method_16040 scheduleRebuild (IIIZ)V ARG 1 x ARG 2 y ARG 3 z + ARG 4 important METHOD method_3323 getChunkRenderer (Lnet/minecraft/class_2338;)Lnet/minecraft/class_851; ARG 1 pos METHOD method_3324 createChunks (Lnet/minecraft/class_850;)V METHOD method_3326 getChunkIndex (III)I - METHOD method_3327 delete ()V + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_3327 clear ()V METHOD method_3330 updateCameraPosition (DD)V + ARG 1 x + ARG 3 z diff --git a/mappings/net/minecraft/client/render/GuiLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping similarity index 84% rename from mappings/net/minecraft/client/render/GuiLighting.mapping rename to mappings/net/minecraft/client/render/DiffuseLighting.mapping index 508068d4e3..3577c7786d 100644 --- a/mappings/net/minecraft/client/render/GuiLighting.mapping +++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_308 net/minecraft/client/render/GuiLighting +CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting FIELD field_1675 buffer Ljava/nio/FloatBuffer; FIELD field_1676 oppositeLight Lnet/minecraft/class_1160; FIELD field_1677 towardLight Lnet/minecraft/class_1160; diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 248b888dc7..372cfa8ff4 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -81,13 +81,15 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3192 render (FJZ)V ARG 1 tickDelta ARG 2 startTime - ARG 4 fullRender + ARG 4 tick METHOD method_3193 getViewDistance ()F METHOD method_3194 getMapRenderer ()Lnet/minecraft/class_330; METHOD method_3195 getSkyDarkness (F)F ARG 1 tickDelta METHOD method_3196 getFov (Lnet/minecraft/class_4184;FZ)D + ARG 1 camera ARG 2 tickDelta + ARG 3 changingFov METHOD method_3198 bobViewWhenHurt (F)V ARG 1 tickDelta METHOD method_3199 updateMovementFovMultiplier ()V diff --git a/mappings/net/minecraft/block/BlockRenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping similarity index 70% rename from mappings/net/minecraft/block/BlockRenderLayer.mapping rename to mappings/net/minecraft/client/render/RenderLayer.mapping index e9daee12ca..97daaf06c4 100644 --- a/mappings/net/minecraft/block/BlockRenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1921 net/minecraft/block/BlockRenderLayer +CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_9175 CUTOUT_MIPPED Lnet/minecraft/class_1921; FIELD field_9177 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/render/RenderTickCounter.mapping b/mappings/net/minecraft/client/render/RenderTickCounter.mapping index 285fdaf7f7..6772f62db5 100644 --- a/mappings/net/minecraft/client/render/RenderTickCounter.mapping +++ b/mappings/net/minecraft/client/render/RenderTickCounter.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_317 net/minecraft/client/render/RenderTickCounter - FIELD field_1968 timeScale F + FIELD field_1968 tickTime F FIELD field_1969 lastFrameDuration F FIELD field_1970 tickDelta F FIELD field_1971 prevTimeMillis J diff --git a/mappings/net/minecraft/client/render/Tessellator.mapping b/mappings/net/minecraft/client/render/Tessellator.mapping index 4f37528184..1e63584252 100644 --- a/mappings/net/minecraft/client/render/Tessellator.mapping +++ b/mappings/net/minecraft/client/render/Tessellator.mapping @@ -5,5 +5,5 @@ CLASS net/minecraft/class_289 net/minecraft/client/render/Tessellator METHOD (I)V ARG 1 bufferCapacity METHOD method_1348 getInstance ()Lnet/minecraft/class_289; - METHOD method_1349 getBufferBuilder ()Lnet/minecraft/class_287; + METHOD method_1349 getBuffer ()Lnet/minecraft/class_287; METHOD method_1350 draw ()V diff --git a/mappings/net/minecraft/client/render/VertexFormats.mapping b/mappings/net/minecraft/client/render/VertexFormats.mapping index ccab3803cc..07f672d356 100644 --- a/mappings/net/minecraft/client/render/VertexFormats.mapping +++ b/mappings/net/minecraft/client/render/VertexFormats.mapping @@ -1,19 +1,19 @@ CLASS net/minecraft/class_290 net/minecraft/client/render/VertexFormats - FIELD field_1575 POSITION_UV_COLOR Lnet/minecraft/class_293; + FIELD field_1575 POSITION_TEXTURE_COLOR Lnet/minecraft/class_293; FIELD field_1576 POSITION_COLOR Lnet/minecraft/class_293; - FIELD field_1577 POSITION_UV_COLOR_NORMAL Lnet/minecraft/class_293; + FIELD field_1577 POSITION_TEXTURE_COLOR_NORMAL Lnet/minecraft/class_293; FIELD field_1578 PADDING_ELEMENT Lnet/minecraft/class_296; FIELD field_1579 NORMAL_ELEMENT Lnet/minecraft/class_296; - FIELD field_1580 POSITION_UV_NORMAL_2 Lnet/minecraft/class_293; + FIELD field_1580 POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL Lnet/minecraft/class_293; FIELD field_1581 COLOR_ELEMENT Lnet/minecraft/class_296; FIELD field_1582 POSITION_COLOR_UV_LMAP Lnet/minecraft/class_293; - FIELD field_1583 LMAP_ELEMENT Lnet/minecraft/class_296; - FIELD field_1584 POSITION_UV_COLOR_LMAP Lnet/minecraft/class_293; - FIELD field_1585 POSITION_UV Lnet/minecraft/class_293; - FIELD field_1586 POSITION_UV_LMAP_COLOR Lnet/minecraft/class_293; + FIELD field_1583 OVERLAY_ELEMENT Lnet/minecraft/class_296; + FIELD field_1584 POSITION_TEXTURE_COLOR_LIGHT Lnet/minecraft/class_293; + FIELD field_1585 POSITION_TEXTURE Lnet/minecraft/class_293; + FIELD field_1586 POSITION_TEXTURE_LIGHT_COLOR Lnet/minecraft/class_293; FIELD field_1587 POSITION_ELEMENT Lnet/minecraft/class_296; FIELD field_1588 POSITION_NORMAL Lnet/minecraft/class_293; FIELD field_1589 POSITION_UV_NORMAL Lnet/minecraft/class_293; - FIELD field_1590 POSITION_COLOR_UV_NORMAL Lnet/minecraft/class_293; - FIELD field_1591 UV_ELEMENT Lnet/minecraft/class_296; + FIELD field_1590 POSITION_COLOR_TEXTURE_LIGHT_NORMAL Lnet/minecraft/class_293; + FIELD field_1591 TEXTURE_ELEMENT Lnet/minecraft/class_296; FIELD field_1592 POSITION Lnet/minecraft/class_293; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index ae349107f8..ea8f64d589 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -3,23 +3,23 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4124 renderer Lnet/minecraft/class_851; METHOD (Lnet/minecraft/class_761;Lnet/minecraft/class_851;Lnet/minecraft/class_2350;I)V ARG 1 renderer - FIELD field_4055 blockEntities Ljava/util/Set; + FIELD field_4055 noCullingBlockEntities Ljava/util/Set; FIELD field_4056 forcedFrustum Lnet/minecraft/class_857; FIELD field_4057 textureManager Lnet/minecraft/class_1060; FIELD field_4058 partiallyBrokenBlocks Ljava/util/Map; FIELD field_4059 entityOutlineShader Lnet/minecraft/class_279; FIELD field_4060 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_4061 END_SKY_TEX Lnet/minecraft/class_2960; + FIELD field_4061 END_SKY Lnet/minecraft/class_2960; FIELD field_4062 renderDistance I FIELD field_4063 vertexBufferObjectsEnabled Z FIELD field_4064 lastCameraYaw D FIELD field_4068 destroyStages [Lnet/minecraft/class_1058; FIELD field_4069 lastCameraX D FIELD field_4070 lastCameraChunkUpdateZ D - FIELD field_4071 FORCEFIELD_TEX Lnet/minecraft/class_2960; + FIELD field_4071 FORCEFIELD Lnet/minecraft/class_2960; FIELD field_4073 ticks I - FIELD field_4075 chunkRenderers Ljava/util/Set; - FIELD field_4077 terrainUpdateNecessary Z + FIELD field_4075 chunksToRebuild Ljava/util/Set; + FIELD field_4077 needsTerrainUpdate Z FIELD field_4078 chunkRendererFactory Lnet/minecraft/class_850; FIELD field_4081 lastCameraY D FIELD field_4083 lastTranslucentSortX D @@ -28,25 +28,25 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4086 chunkInfos Ljava/util/List; FIELD field_4088 client Lnet/minecraft/class_310; FIELD field_4089 regularEntityCount I - FIELD field_4090 entityOutlinesUpdateNecessary Z - FIELD field_4091 forcedFrustumPosition Lnet/minecraft/class_1161; + FIELD field_4090 shouldCaptureFrustum Z + FIELD field_4091 capturedFrustumPosition Lnet/minecraft/class_1161; FIELD field_4092 chunkRendererList Lnet/minecraft/class_752; FIELD field_4094 cloudsBuffer Lnet/minecraft/class_291; FIELD field_4095 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_4096 lastCameraZ D - FIELD field_4098 MOON_PHASES_TEX Lnet/minecraft/class_2960; + FIELD field_4098 MOON_PHASES Lnet/minecraft/class_2960; FIELD field_4099 starsDisplayList I FIELD field_4101 entityOutlinesFramebuffer Lnet/minecraft/class_276; FIELD field_4103 lastTranslucentSortY D FIELD field_4104 lastCameraChunkUpdateX D FIELD field_4105 cameraChunkY I - FIELD field_4106 chunkBatcher Lnet/minecraft/class_846; + FIELD field_4106 chunkBuilder Lnet/minecraft/class_846; FIELD field_4107 cloudsDirty Z - FIELD field_4108 CLOUDS_TEX Lnet/minecraft/class_2960; + FIELD field_4108 CLOUDS Lnet/minecraft/class_2960; FIELD field_4109 entityRenderDispatcher Lnet/minecraft/class_898; FIELD field_4110 blockEntityCount I - FIELD field_4111 SUN_TEX Lnet/minecraft/class_2960; - FIELD field_4112 chunkRenderDispatcher Lnet/minecraft/class_769; + FIELD field_4111 SUN Lnet/minecraft/class_2960; + FIELD field_4112 chunks Lnet/minecraft/class_769; FIELD field_4113 starsBuffer Lnet/minecraft/class_291; FIELD field_4114 cloudsDisplayList I FIELD field_4115 lastCameraPitch D @@ -58,6 +58,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 client METHOD method_16037 scheduleSectionRender (Lnet/minecraft/class_2338;Z)V ARG 1 pos + ARG 2 important METHOD method_18145 scheduleBlockRenders (III)V ARG 1 x ARG 2 y @@ -70,6 +71,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 5 maxY ARG 6 maxZ METHOD method_3239 renderClouds (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)V + ARG 1 builder + ARG 2 x + ARG 4 y + ARG 6 z ARG 8 color METHOD method_3240 drawDebugShapeOutline (Lnet/minecraft/class_265;DDDFFFF)V ARG 0 shape @@ -88,10 +93,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3243 renderWorldBorder (Lnet/minecraft/class_4184;F)V ARG 2 delta METHOD method_3244 setWorld (Lnet/minecraft/class_638;)V - METHOD method_3245 updateBlockEntities (Ljava/util/Collection;Ljava/util/Collection;)V + METHOD method_3245 updateNoCullingBlockEntities (Ljava/util/Collection;Ljava/util/Collection;)V ARG 1 removed ARG 2 added - METHOD method_3246 getChunkNumber ()I + METHOD method_3246 getCompletedChunkCount ()I METHOD method_3247 updateEntitiesForSong (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V ARG 1 world ARG 2 pos @@ -121,14 +126,14 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 builder METHOD method_3257 renderSky (F)V ARG 1 tickDelta - METHOD method_3258 buildBoxOutline (Lnet/minecraft/class_287;DDDDDDFFFF)V + METHOD method_3258 drawBox (Lnet/minecraft/class_287;DDDDDDFFFF)V ARG 0 buffer - ARG 1 minX - ARG 3 minY - ARG 5 minZ - ARG 7 maxX - ARG 9 maxY - ARG 11 maxZ + ARG 1 x1 + ARG 3 y1 + ARG 5 z1 + ARG 7 x2 + ARG 9 y2 + ARG 11 z2 ARG 13 red ARG 14 green ARG 15 blue @@ -156,7 +161,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; ARG 1 canSpawnOnMinimal METHOD method_3269 updateChunks (J)V - ARG 1 endTime + ARG 1 limitTime METHOD method_3270 canDrawEntityOutlines ()Z METHOD method_3271 renderEntities (Lnet/minecraft/class_4184;Lnet/minecraft/class_856;F)V ARG 3 tickDelta @@ -183,10 +188,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 9 velocityX ARG 11 velocityY ARG 13 velocityZ - METHOD method_3283 (Lnet/minecraft/class_287;FZ)V - ARG 1 bufferBuilder + METHOD method_3283 renderSkyHalf (Lnet/minecraft/class_287;FZ)V + ARG 1 buffer ARG 2 y - ARG 3 flipX + ARG 3 bottom METHOD method_3285 getOpenChunkFaces (Lnet/minecraft/class_2338;)Ljava/util/Set; ARG 1 pos METHOD method_3287 renderLayer (Lnet/minecraft/class_1921;)V @@ -222,10 +227,11 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 x ARG 2 y ARG 3 z + ARG 4 important METHOD method_3296 loadEntityOutlineShader ()V METHOD method_8562 playSong (Lnet/minecraft/class_3414;Lnet/minecraft/class_2338;)V ARG 1 song - ARG 2 pos + ARG 2 songPosition METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V ARG 1 parameters ARG 2 shouldAlwaysSpawn @@ -237,6 +243,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 12 velocityY ARG 14 velocityY METHOD method_8564 playGlobalEvent (ILnet/minecraft/class_2338;I)V + ARG 1 eventId + ARG 2 pos METHOD method_8567 playLevelEvent (Lnet/minecraft/class_1657;ILnet/minecraft/class_2338;I)V ARG 1 source ARG 2 type @@ -251,9 +259,16 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 9 velocityX ARG 11 velocityY ARG 13 velocityZ - METHOD method_8569 setBlockBreakingProgress (ILnet/minecraft/class_2338;I)V - METHOD method_8570 updateBlock (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V + METHOD method_8569 setBlockBreakingInfo (ILnet/minecraft/class_2338;I)V + ARG 1 entityId ARG 2 pos + ARG 3 stage + METHOD method_8570 updateBlock (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V + ARG 1 view + ARG 2 pos + ARG 3 oldState + ARG 4 newState + ARG 5 flags METHOD method_8571 scheduleBlockRender (III)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index cd7af146d2..04bba49dd9 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -51,11 +51,14 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender ARG 5 quads ARG 6 faceShape ARG 7 shapeState - METHOD method_3364 updateShape (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;[ILnet/minecraft/class_2350;[FLjava/util/BitSet;)V - ARG 3 state + METHOD method_3364 getQuadDimensions (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;[ILnet/minecraft/class_2350;[FLjava/util/BitSet;)V + ARG 1 world + ARG 2 state + ARG 3 pos ARG 4 vertexData - ARG 5 facing - ARG 6 faceShape + ARG 5 face + ARG 6 box + ARG 7 flags METHOD method_3365 renderQuad (FFFFLjava/util/List;)V ARG 1 colorMultiplier ARG 2 red diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index 571a46e21e..9cb9c72b95 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManag FIELD field_4167 fluidRenderer Lnet/minecraft/class_775; FIELD field_4168 models Lnet/minecraft/class_773; FIELD field_4169 random Ljava/util/Random; - FIELD field_4170 renderer Lnet/minecraft/class_778; + FIELD field_4170 blockModelRenderer Lnet/minecraft/class_778; FIELD field_4171 dynamicRenderer Lnet/minecraft/class_774; METHOD (Lnet/minecraft/class_773;Lnet/minecraft/class_324;)V ARG 1 models diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping index bf106c94ec..d0dc8e381b 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher FIELD field_4340 renderOffsetZ D FIELD field_4341 renderOffsetY D - FIELD field_4342 fontRenderer Lnet/minecraft/class_327; + FIELD field_4342 textRenderer Lnet/minecraft/class_327; FIELD field_4343 renderOffsetX D - FIELD field_4344 cameraEntity Lnet/minecraft/class_4184; + FIELD field_4344 camera Lnet/minecraft/class_4184; FIELD field_4345 renderers Ljava/util/Map; FIELD field_4346 INSTANCE Lnet/minecraft/class_824; FIELD field_4347 textureManager Lnet/minecraft/class_1060; FIELD field_4348 world Lnet/minecraft/class_1937; - FIELD field_4350 hitResult Lnet/minecraft/class_239; + FIELD field_4350 crosshairTarget Lnet/minecraft/class_239; METHOD method_3548 renderEntity (Lnet/minecraft/class_2586;DDDF)V ARG 1 blockEntity ARG 2 xOffset @@ -16,6 +16,11 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti ARG 6 zOffset ARG 8 tickDelta METHOD method_3549 configure (Lnet/minecraft/class_1937;Lnet/minecraft/class_1060;Lnet/minecraft/class_327;Lnet/minecraft/class_4184;Lnet/minecraft/class_239;)V + ARG 1 world + ARG 2 textureManager + ARG 3 textRenderer + ARG 4 camera + ARG 5 crosshairTarget METHOD method_3550 get (Ljava/lang/Class;)Lnet/minecraft/class_827; METHOD method_3551 setWorld (Lnet/minecraft/class_1937;)V METHOD method_3552 renderEntity (Lnet/minecraft/class_2586;)V @@ -29,4 +34,4 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti METHOD method_3555 render (Lnet/minecraft/class_2586;FI)V ARG 2 tickDelta ARG 3 blockBreakStage - METHOD method_3556 getFontRenderer ()Lnet/minecraft/class_327; + METHOD method_3556 getTextRenderer ()Lnet/minecraft/class_327; diff --git a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping b/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping similarity index 91% rename from mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping rename to mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping index 314a06c676..698b0fcef0 100644 --- a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_750 net/minecraft/client/render/chunk/BlockLayeredBufferBuilder +CLASS net/minecraft/class_750 net/minecraft/client/render/chunk/BlockBufferBuilderStorage FIELD field_3951 layerBuilders [Lnet/minecraft/class_287; METHOD method_3154 get (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; ARG 1 layer diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping similarity index 97% rename from mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping rename to mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 94509295d3..900bc38dc7 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBatcher +CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_847 ChunkUploadTask FIELD field_4446 task Lcom/google/common/util/concurrent/ListenableFutureTask; FIELD field_4447 priority D @@ -14,7 +14,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBatcher FIELD field_4440 workerThreads Ljava/util/List; FIELD field_4441 vboBufferRenderer Lnet/minecraft/class_294; FIELD field_4442 bufferCount I - FIELD field_4443 pendingUploads Ljava/util/Queue; + FIELD field_4443 uploadQueue Ljava/util/Queue; FIELD field_4444 workers Ljava/util/List; FIELD field_4445 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_19419 setCameraPosition (Lnet/minecraft/class_243;)V diff --git a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraph.mapping b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionData.mapping similarity index 96% rename from mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraph.mapping rename to mappings/net/minecraft/client/render/chunk/ChunkOcclusionData.mapping index aa1d65d2e7..f6a1748366 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraph.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionData.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_854 net/minecraft/client/render/chunk/ChunkOcclusionGraph +CLASS net/minecraft/class_854 net/minecraft/client/render/chunk/ChunkOcclusionData FIELD field_4491 DIRECTION_COUNT I FIELD field_4492 visibility Ljava/util/BitSet; METHOD method_3692 setVisibleThrough (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;Z)V diff --git a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraphBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping similarity index 96% rename from mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraphBuilder.mapping rename to mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping index 373bf25a5a..c3aaa69c78 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraphBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_852 net/minecraft/client/render/chunk/ChunkOcclusionGraphBuilder +CLASS net/minecraft/class_852 net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder FIELD field_4473 openCount I FIELD field_4474 EDGE_POINTS [I FIELD field_4475 STEP_Y I diff --git a/mappings/net/minecraft/client/render/debug/VoxelDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/CollisionDebugRenderer.mapping similarity index 73% rename from mappings/net/minecraft/client/render/debug/VoxelDebugRenderer.mapping rename to mappings/net/minecraft/client/render/debug/CollisionDebugRenderer.mapping index bd7fbc32aa..ccb832eb1b 100644 --- a/mappings/net/minecraft/client/render/debug/VoxelDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/CollisionDebugRenderer.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_865 net/minecraft/client/render/debug/VoxelDebugRenderer +CLASS net/minecraft/class_865 net/minecraft/client/render/debug/CollisionDebugRenderer diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index bda825e9e7..da240dcfe5 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer CLASS class_864 Renderer METHOD method_3715 render (J)V - FIELD field_18777 pointsOfInterestDebugRenderer Lnet/minecraft/class_4207; + FIELD field_18777 villageDebugRenderer Lnet/minecraft/class_4207; FIELD field_18778 goalSelectorDebugRenderer Lnet/minecraft/class_4205; FIELD field_19325 raidCenterDebugRenderer Lnet/minecraft/class_4304; FIELD field_4517 blockOutlineDebugRenderer Lnet/minecraft/class_863$class_864; @@ -11,7 +11,7 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer FIELD field_4531 showChunkBorder Z FIELD field_4532 chunkBorderDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4533 chunkLoadingDebugRenderer Lnet/minecraft/class_863$class_864; - FIELD field_4534 voxelDebugRenderer Lnet/minecraft/class_863$class_864; + FIELD field_4534 collisionDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4535 neighborUpdateDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4536 skyLightDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4537 worldGenAttemptDebugRenderer Lnet/minecraft/class_863$class_864; diff --git a/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping similarity index 69% rename from mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping rename to mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping index 76562c58c9..ba405983ba 100644 --- a/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping @@ -1,5 +1,6 @@ -CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/PointOfInterestDebugRenderer +CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRenderer FIELD field_18787 pointsOfInterest Ljava/util/Map; - METHOD method_19432 addPointOfInterest (Lnet/minecraft/class_4207$class_4232;)V + METHOD method_19432 addBrain (Lnet/minecraft/class_4207$class_4232;)V + ARG 1 brain METHOD method_19434 removePointOfInterest (Lnet/minecraft/class_2338;)V METHOD method_19706 getCamera ()Lnet/minecraft/class_4184; diff --git a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping index 3ec4d6a9fb..01e5c5520e 100644 --- a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_895 net/minecraft/client/render/entity/EnderDragonEntityRenderer - FIELD field_4668 CRYSTAL_BEAM Lnet/minecraft/class_2960; + FIELD field_4668 CRYSTAL_BEAM_TEX Lnet/minecraft/class_2960; FIELD field_4669 EXPLOSION_TEX Lnet/minecraft/class_2960; FIELD field_4670 SKIN Lnet/minecraft/class_2960; METHOD method_3917 renderCrystalBeam (DDDFDDDIDDD)V diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index 96525f646b..da09f08da3 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis METHOD method_3943 setRenderOutlines (Z)V ARG 1 renderOutlines METHOD method_3944 setWorld (Lnet/minecraft/class_1937;)V + ARG 1 world METHOD method_3946 render (Lnet/minecraft/class_1297;FZ)V ARG 1 entity ARG 2 tickDelta @@ -54,7 +55,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis METHOD method_3956 renderHitbox (Lnet/minecraft/class_1297;DDDFF)V METHOD method_3957 getRenderer (Lnet/minecraft/class_1297;)Lnet/minecraft/class_897; METHOD method_3958 shouldRenderHitboxes ()Z - METHOD method_3959 squaredDistanceToCamera (DDD)D + METHOD method_3959 getSquaredDistanceToCamera (DDD)D ARG 1 x ARG 3 y ARG 5 z diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 4b8265fcc5..d5c81215ff 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer METHOD method_17146 applyLightmapCoordinates (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_3921 hasLabel (Lnet/minecraft/class_1297;)Z + COMMENT Determines whether the passed entity should render with a nameplate above its head. + COMMENT + COMMENT

Checks for a custom nametag on living entities, and for teams/team visibilities for players.

ARG 1 entity METHOD method_3922 renderBox (Lnet/minecraft/class_238;DDD)V ARG 0 box @@ -40,7 +43,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 6 z ARG 8 text METHOD method_3931 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; - ARG 1 boat + ARG 1 entity METHOD method_3932 getFontRenderer ()Lnet/minecraft/class_327; METHOD method_3933 isVisible (Lnet/minecraft/class_1297;Lnet/minecraft/class_856;DDD)Z ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping index ffdf07b1fb..1ec8384392 100644 --- a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_916 net/minecraft/client/render/entity/ItemEntityRende FIELD field_4725 random Ljava/util/Random; FIELD field_4726 itemRenderer Lnet/minecraft/class_918; METHOD (Lnet/minecraft/class_898;Lnet/minecraft/class_918;)V - ARG 1 renderManager + ARG 1 dispatcher + ARG 2 renderer METHOD method_3998 getRenderedAmount (Lnet/minecraft/class_1799;)I ARG 1 stack diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index 77b18a592b..06f59c2e08 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen FIELD field_4741 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_4742 colorOverlayTexture Lnet/minecraft/class_1043; METHOD method_4039 getLyingAngle (Lnet/minecraft/class_1309;)F + ARG 1 entity METHOD method_4040 disableOverlayColor ()V METHOD method_4042 scale (Lnet/minecraft/class_1309;F)V ARG 1 entity @@ -13,10 +14,13 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen METHOD method_4044 getHandSwingProgress (Lnet/minecraft/class_1309;F)F ARG 1 entity ARG 2 tickDelta - METHOD method_4045 getAge (Lnet/minecraft/class_1309;F)F + METHOD method_4045 getAnimationProgress (Lnet/minecraft/class_1309;F)F + COMMENT This value is passed to other methods when calculating angles for animation. + COMMENT It's typically just the sum of the entity's age (in ticks) and the passed in tickDelta. ARG 1 entity ARG 2 tickDelta METHOD method_4046 addFeature (Lnet/minecraft/class_3887;)Z + ARG 1 feature METHOD method_4047 applyOverlayColor (Lnet/minecraft/class_1309;FZ)Z ARG 1 entity ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index d05ab5d3dc..6918419a6a 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/Featur ARG 1 context METHOD method_17163 applyLightmapCoordinates (Lnet/minecraft/class_1297;)V METHOD method_17164 bindTexture (Lnet/minecraft/class_2960;)V - METHOD method_17165 getModel ()Lnet/minecraft/class_583; + METHOD method_17165 getContextModel ()Lnet/minecraft/class_583; METHOD method_4199 render (Lnet/minecraft/class_1297;FFFFFFF)V ARG 1 entity METHOD method_4200 hasHurtOverlay ()Z diff --git a/mappings/net/minecraft/client/render/entity/feature/ShulkerSomethingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ShulkerHeadFeatureRenderer.mapping similarity index 75% rename from mappings/net/minecraft/client/render/entity/feature/ShulkerSomethingFeatureRenderer.mapping rename to mappings/net/minecraft/client/render/entity/feature/ShulkerHeadFeatureRenderer.mapping index ab8d585f4c..5c6b9d018c 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ShulkerSomethingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ShulkerHeadFeatureRenderer.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_944 net/minecraft/client/render/entity/feature/ShulkerSomethingFeatureRenderer +CLASS net/minecraft/class_944 net/minecraft/client/render/entity/feature/ShulkerHeadFeatureRenderer METHOD (Lnet/minecraft/class_3883;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/model/ArmorStandArmorEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ArmorStandArmorEntityModel.mapping index 1ef739d74f..550d2f933f 100644 --- a/mappings/net/minecraft/client/render/entity/model/ArmorStandArmorEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ArmorStandArmorEntityModel.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_548 net/minecraft/client/render/entity/model/ArmorStan METHOD (FII)V ARG 1 scale ARG 2 textureWidth + ARG 3 textureHeight diff --git a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping index ae295512f4..7d6aafba84 100644 --- a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEntityModel CLASS class_573 ArmPose FIELD field_3390 leftArm Lnet/minecraft/class_630; - FIELD field_3391 body Lnet/minecraft/class_630; + FIELD field_3391 torso Lnet/minecraft/class_630; FIELD field_3392 rightLeg Lnet/minecraft/class_630; - FIELD field_3394 headwear Lnet/minecraft/class_630; + FIELD field_3394 helmet Lnet/minecraft/class_630; FIELD field_3395 rightArmPose Lnet/minecraft/class_572$class_573; FIELD field_3397 leftLeg Lnet/minecraft/class_630; FIELD field_3398 head Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping index b8efe958c5..f7cb7ee8c4 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_583 net/minecraft/client/render/entity/model/EntityModel FIELD field_3447 handSwingProgress F - FIELD field_3448 isChild Z - FIELD field_3449 isRiding Z + FIELD field_3448 child Z + FIELD field_3449 riding Z METHOD method_17080 setAngles (Lnet/minecraft/class_1297;FFFFFF)V ARG 1 entity ARG 2 limbAngle diff --git a/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping index 21d6a78d66..dabe5c00ae 100644 --- a/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_4041 net/minecraft/client/render/entity/model/FoxEntityModel FIELD field_18015 head Lnet/minecraft/class_630; - FIELD field_18016 leftEar Lnet/minecraft/class_630; - FIELD field_18017 rightEar Lnet/minecraft/class_630; + FIELD field_18016 rightEar Lnet/minecraft/class_630; + FIELD field_18017 leftEar Lnet/minecraft/class_630; FIELD field_18018 nose Lnet/minecraft/class_630; - FIELD field_18019 body Lnet/minecraft/class_630; - FIELD field_18020 frontLeftLeg Lnet/minecraft/class_630; - FIELD field_18021 frontRightLeg Lnet/minecraft/class_630; - FIELD field_18022 rearLeftLeg Lnet/minecraft/class_630; - FIELD field_18023 rearRightLeg Lnet/minecraft/class_630; + FIELD field_18019 torso Lnet/minecraft/class_630; + FIELD field_18020 rightBackLeg Lnet/minecraft/class_630; + FIELD field_18021 leftBackLeg Lnet/minecraft/class_630; + FIELD field_18022 rightFrontLeg Lnet/minecraft/class_630; + FIELD field_18023 leftFrontLeg Lnet/minecraft/class_630; FIELD field_18024 tail Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/EvilVillagerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/IllagerEntityModel.mapping similarity index 67% rename from mappings/net/minecraft/client/render/entity/model/EvilVillagerEntityModel.mapping rename to mappings/net/minecraft/client/render/entity/model/IllagerEntityModel.mapping index 7596825129..87d206f5e9 100644 --- a/mappings/net/minecraft/client/render/entity/model/EvilVillagerEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/IllagerEntityModel.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_575 net/minecraft/client/render/entity/model/EvilVillagerEntityModel +CLASS net/minecraft/class_575 net/minecraft/client/render/entity/model/IllagerEntityModel diff --git a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping index 69c0c18455..5b0b1e2703 100644 --- a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_582 net/minecraft/client/render/entity/model/OcelotEntityModel FIELD field_3434 animationState I FIELD field_3435 head Lnet/minecraft/class_630; - FIELD field_3436 tail1 Lnet/minecraft/class_630; - FIELD field_3437 body Lnet/minecraft/class_630; - FIELD field_3438 backLegRight Lnet/minecraft/class_630; - FIELD field_3439 frontLegLeft Lnet/minecraft/class_630; - FIELD field_3440 backLegLeft Lnet/minecraft/class_630; - FIELD field_3441 frontLegRight Lnet/minecraft/class_630; - FIELD field_3442 tail2 Lnet/minecraft/class_630; + FIELD field_3436 upperTail Lnet/minecraft/class_630; + FIELD field_3437 torso Lnet/minecraft/class_630; + FIELD field_3438 rightFrontLeg Lnet/minecraft/class_630; + FIELD field_3439 leftBackLeg Lnet/minecraft/class_630; + FIELD field_3440 leftFrontLeg Lnet/minecraft/class_630; + FIELD field_3441 rightBackLeg Lnet/minecraft/class_630; + FIELD field_3442 lowerTail Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping index ec9d1e3127..4b34fe1ae0 100644 --- a/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_588 net/minecraft/client/render/entity/model/PhantomEntityModel - FIELD field_3475 head Lnet/minecraft/class_630; + FIELD field_3475 body Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping index cb8420003a..277b73f040 100644 --- a/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_591 net/minecraft/client/render/entity/model/PlayerEntityModel - FIELD field_3479 rightLegOverlay Lnet/minecraft/class_630; + FIELD field_3479 rightPantLeg Lnet/minecraft/class_630; FIELD field_3480 thinArms Z FIELD field_3481 ears Lnet/minecraft/class_630; - FIELD field_3482 leftLegOverlay Lnet/minecraft/class_630; - FIELD field_3483 bodyOverlay Lnet/minecraft/class_630; - FIELD field_3484 leftArmOverlay Lnet/minecraft/class_630; + FIELD field_3482 leftPantLeg Lnet/minecraft/class_630; + FIELD field_3483 jacket Lnet/minecraft/class_630; + FIELD field_3484 leftSleeve Lnet/minecraft/class_630; FIELD field_3485 cape Lnet/minecraft/class_630; - FIELD field_3486 rightArmOverlay Lnet/minecraft/class_630; + FIELD field_3486 rightSleeve Lnet/minecraft/class_630; METHOD (FZ)V ARG 1 scale ARG 2 thinArms diff --git a/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping index e7b3f8df4b..bb412a9bc7 100644 --- a/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_597 net/minecraft/client/render/entity/model/QuadrupedEntityModel - FIELD field_3533 leg3 Lnet/minecraft/class_630; - FIELD field_3534 leg2 Lnet/minecraft/class_630; + FIELD field_3533 frontRightLeg Lnet/minecraft/class_630; + FIELD field_3534 backLeftLeg Lnet/minecraft/class_630; FIELD field_3535 head Lnet/minecraft/class_630; - FIELD field_3536 leg1 Lnet/minecraft/class_630; - FIELD field_3538 body Lnet/minecraft/class_630; - FIELD field_3539 leg4 Lnet/minecraft/class_630; + FIELD field_3536 backRightLeg Lnet/minecraft/class_630; + FIELD field_3538 torso Lnet/minecraft/class_630; + FIELD field_3539 frontLeftLeg Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/StrayEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping similarity index 70% rename from mappings/net/minecraft/client/render/entity/model/StrayEntityModel.mapping rename to mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping index 4785e66220..5150980935 100644 --- a/mappings/net/minecraft/client/render/entity/model/StrayEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_606 net/minecraft/client/render/entity/model/StrayEntityModel +CLASS net/minecraft/class_606 net/minecraft/client/render/entity/model/SkeletonEntityModel diff --git a/mappings/net/minecraft/client/render/entity/model/VillagerResemblingModel.mapping b/mappings/net/minecraft/client/render/entity/model/VillagerResemblingModel.mapping index 84b5d5a837..5c350c17f5 100644 --- a/mappings/net/minecraft/client/render/entity/model/VillagerResemblingModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/VillagerResemblingModel.mapping @@ -2,11 +2,11 @@ CLASS net/minecraft/class_620 net/minecraft/client/render/entity/model/VillagerR FIELD field_17141 headOverlay Lnet/minecraft/class_630; FIELD field_17142 hat Lnet/minecraft/class_630; FIELD field_17143 robe Lnet/minecraft/class_630; - FIELD field_3606 rightLeg Lnet/minecraft/class_630; - FIELD field_3607 leftLeg Lnet/minecraft/class_630; + FIELD field_3606 leftLeg Lnet/minecraft/class_630; + FIELD field_3607 rightLeg Lnet/minecraft/class_630; FIELD field_3608 head Lnet/minecraft/class_630; FIELD field_3609 arms Lnet/minecraft/class_630; - FIELD field_3610 body Lnet/minecraft/class_630; + FIELD field_3610 torso Lnet/minecraft/class_630; FIELD field_3611 nose Lnet/minecraft/class_630; METHOD (F)V ARG 1 scale diff --git a/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping similarity index 90% rename from mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping rename to mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping index 3d3e9d7b64..32daa6c6b5 100644 --- a/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_756 net/minecraft/client/render/item/ItemDynamicRenderer +CLASS net/minecraft/class_756 net/minecraft/client/render/item/BuiltinModelItemRenderer FIELD field_3976 renderChestNormal Lnet/minecraft/class_2595; FIELD field_3977 renderChestEnder Lnet/minecraft/class_2611; FIELD field_3978 renderChestTrapped Lnet/minecraft/class_2595; diff --git a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping similarity index 95% rename from mappings/net/minecraft/client/render/FirstPersonRenderer.mapping rename to mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping index ba52cddec1..27748ede98 100644 --- a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_759 net/minecraft/client/render/FirstPersonRenderer +CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer FIELD field_4043 equipProgressMainHand F FIELD field_4044 itemRenderer Lnet/minecraft/class_918; FIELD field_4045 UNDERWATER_TEX Lnet/minecraft/class_2960; @@ -15,6 +15,7 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/FirstPersonRenderer METHOD method_3214 applyCameraAngles (F)V ARG 1 tickDelta METHOD method_3215 resetEquipProgress (Lnet/minecraft/class_1268;)V + ARG 1 hand METHOD method_3216 renderArm (Lnet/minecraft/class_1306;)V METHOD method_3218 applyEatOrDrinkTransformation (FLnet/minecraft/class_1306;Lnet/minecraft/class_1799;)V ARG 1 tickDelta @@ -36,6 +37,7 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/FirstPersonRenderer ARG 1 tickDelta METHOD method_3226 renderBlock (Lnet/minecraft/class_1058;)V METHOD method_3227 getMapAngle (F)F + ARG 1 tickDelta METHOD method_3228 renderFirstPersonItem (Lnet/minecraft/class_742;FFLnet/minecraft/class_1268;FLnet/minecraft/class_1799;F)V ARG 1 player ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 1fd611c8ff..0be35cf0e5 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -6,12 +6,15 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer FIELD field_4732 models Lnet/minecraft/class_763; FIELD field_4733 colorMap Lnet/minecraft/class_325; METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_1092;Lnet/minecraft/class_325;)V + ARG 1 manager + ARG 2 bakery ARG 3 colorMap METHOD method_4002 renderQuad (Lnet/minecraft/class_287;Lnet/minecraft/class_777;I)V ARG 3 color METHOD method_4003 postNormalQuad (Lnet/minecraft/class_287;Lnet/minecraft/class_777;)V ARG 1 buffer METHOD method_4004 renderGuiQuad (Lnet/minecraft/class_287;IIIIIIII)V + ARG 1 buffer ARG 2 x ARG 3 y ARG 4 width @@ -48,12 +51,18 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 2 stack METHOD method_4019 getHeldItemModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1087; ARG 1 stack + ARG 2 world + ARG 3 entity METHOD method_4020 getOverriddenModel (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1087; + ARG 1 model ARG 2 stack + ARG 3 world + ARG 4 entity METHOD method_4021 renderGuiItemModel (Lnet/minecraft/class_1799;IILnet/minecraft/class_1087;)V - ARG 1 itemStack + ARG 1 stack ARG 2 x ARG 3 y + ARG 4 model METHOD method_4022 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V ARG 1 fontRenderer ARG 2 stack @@ -74,6 +83,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 3 x ARG 4 y METHOD method_4026 renderGuiItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;II)V + ARG 1 entity ARG 2 itemStack ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/render/model/BakedModel.mapping b/mappings/net/minecraft/client/render/model/BakedModel.mapping index 05769297d2..0eeb91c7dc 100644 --- a/mappings/net/minecraft/client/render/model/BakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModel.mapping @@ -7,5 +7,5 @@ CLASS net/minecraft/class_1087 net/minecraft/client/render/model/BakedModel METHOD method_4709 getTransformation ()Lnet/minecraft/class_809; METHOD method_4710 getItemPropertyOverrides ()Lnet/minecraft/class_806; METHOD method_4711 getSprite ()Lnet/minecraft/class_1058; - METHOD method_4712 hasDepthInGui ()Z + METHOD method_4712 hasDepth ()Z METHOD method_4713 isBuiltin ()Z diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index b4f0183de9..2da7225914 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManager FIELD field_20277 colorMap Lnet/minecraft/class_324; FIELD field_5407 missingModel Lnet/minecraft/class_1087; - FIELD field_5408 modelMap Ljava/util/Map; + FIELD field_5408 models Ljava/util/Map; FIELD field_5409 spriteAtlas Lnet/minecraft/class_1059; - FIELD field_5410 blockStateMaps Lnet/minecraft/class_773; + FIELD field_5410 blockModelCache Lnet/minecraft/class_773; METHOD (Lnet/minecraft/class_1059;Lnet/minecraft/class_324;)V ARG 1 spriteAtlas ARG 2 colorMap METHOD method_4742 getModel (Lnet/minecraft/class_1091;)Lnet/minecraft/class_1087; ARG 1 id - METHOD method_4743 getBlockStateMaps ()Lnet/minecraft/class_773; + METHOD method_4743 getBlockModels ()Lnet/minecraft/class_773; METHOD method_4744 getMissingModel ()Lnet/minecraft/class_1087; diff --git a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping index af3d8266f0..7a0697e4b8 100644 --- a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/class_1093 net/minecraft/client/render/model/BasicBakedModel ARG 1 quad FIELD field_5411 quads Ljava/util/List; FIELD field_5412 itemPropertyOverrides Lnet/minecraft/class_806; - FIELD field_5413 depthInGui Z + FIELD field_5413 hasDepth Z FIELD field_5414 faceQuads Ljava/util/Map; FIELD field_5415 usesAo Z FIELD field_5416 sprite Lnet/minecraft/class_1058; diff --git a/mappings/net/minecraft/client/render/model/CubeFace.mapping b/mappings/net/minecraft/client/render/model/CubeFace.mapping index 7cd9fb4ad4..d92319c874 100644 --- a/mappings/net/minecraft/client/render/model/CubeFace.mapping +++ b/mappings/net/minecraft/client/render/model/CubeFace.mapping @@ -12,3 +12,4 @@ CLASS net/minecraft/class_753 net/minecraft/client/render/model/CubeFace FIELD field_3975 xSide I FIELD field_3959 corners [Lnet/minecraft/class_753$class_755; METHOD method_3162 getCorner (I)Lnet/minecraft/class_753$class_755; + ARG 1 corner diff --git a/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping b/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping index 52f6fe48b9..10c28e81c2 100644 --- a/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping +++ b/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3665 net/minecraft/client/render/model/ModelBakeSettings METHOD method_3509 getRotation ()Lnet/minecraft/class_1086; - METHOD method_3512 isUvLocked ()Z + METHOD method_3512 isShaded ()Z diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index 7ddb387acb..1954924e6a 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -39,7 +39,6 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_1059;Lnet/minecraft/class_324;Lnet/minecraft/class_3695;)V ARG 2 spriteAtlas METHOD method_15878 bake (Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087; - ARG 1 id ARG 2 settings METHOD method_18177 upload (Lnet/minecraft/class_3695;)V ARG 1 profiler diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index 25a1bf6d13..03bcb05e6f 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -42,7 +42,7 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 6 transformations ARG 7 overrides METHOD method_3430 deserialize (Ljava/lang/String;)Lnet/minecraft/class_793; - ARG 0 string + ARG 0 json METHOD method_3431 getRootModel ()Lnet/minecraft/class_793; METHOD method_3432 textureExists (Ljava/lang/String;)Z ARG 1 name @@ -51,8 +51,9 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked METHOD method_3436 resolveTexture (Ljava/lang/String;)Ljava/lang/String; ARG 1 name METHOD method_3437 deserialize (Ljava/io/Reader;)Lnet/minecraft/class_793; - ARG 0 reader + ARG 0 input METHOD method_3438 getTransformation (Lnet/minecraft/class_809$class_811;)Lnet/minecraft/class_804; + ARG 1 renderMode METHOD method_3439 isTextureReference (Ljava/lang/String;)Z ARG 1 name METHOD method_3440 compileOverrides (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;)Lnet/minecraft/class_806; diff --git a/mappings/net/minecraft/client/render/model/json/ModelElement.mapping b/mappings/net/minecraft/client/render/model/json/ModelElement.mapping index 3bf244c5a5..6b541d3a83 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelElement.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelElement.mapping @@ -36,5 +36,6 @@ CLASS net/minecraft/class_785 net/minecraft/client/render/model/json/ModelElemen ARG 3 faces ARG 4 rotation ARG 5 shade - METHOD method_3401 getUvs (Lnet/minecraft/class_2350;)[F - METHOD method_3402 setUvs ()V + METHOD method_3401 getRotatedMatrix (Lnet/minecraft/class_2350;)[F + ARG 1 direction + METHOD method_3402 initTextures ()V diff --git a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping index f0e0ec96e6..9d0a322b8e 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping @@ -45,9 +45,9 @@ CLASS net/minecraft/class_809 net/minecraft/client/render/model/json/ModelTransf METHOD method_3500 applyGl (Lnet/minecraft/class_809$class_811;)V ARG 1 type METHOD method_3501 isTransformationDefined (Lnet/minecraft/class_809$class_811;)Z - ARG 1 type + ARG 1 renderMode METHOD method_3502 applyGl (Lnet/minecraft/class_804;Z)V ARG 0 transform ARG 1 leftyFlip METHOD method_3503 getTransformation (Lnet/minecraft/class_809$class_811;)Lnet/minecraft/class_804; - ARG 1 type + ARG 1 renderMode diff --git a/mappings/net/minecraft/client/render/model/json/Transformation.mapping b/mappings/net/minecraft/client/render/model/json/Transformation.mapping index a8bb6d8178..e6ce4b7ff3 100644 --- a/mappings/net/minecraft/client/render/model/json/Transformation.mapping +++ b/mappings/net/minecraft/client/render/model/json/Transformation.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_804 net/minecraft/client/render/model/json/Transformat ARG 1 json ARG 2 key ARG 3 default_ - FIELD field_4284 NONE Lnet/minecraft/class_804; + FIELD field_4284 IDENTITY Lnet/minecraft/class_804; FIELD field_4285 scale Lnet/minecraft/class_1160; FIELD field_4286 translation Lnet/minecraft/class_1160; FIELD field_4287 rotation Lnet/minecraft/class_1160; diff --git a/mappings/net/minecraft/client/resource/ClientResourcePackCreator.mapping b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping similarity index 97% rename from mappings/net/minecraft/client/resource/ClientResourcePackCreator.mapping rename to mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping index 2eac7b440b..8cab6918d5 100644 --- a/mappings/net/minecraft/client/resource/ClientResourcePackCreator.mapping +++ b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientResourcePackCreator +CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResourcePackProvider FIELD field_16263 index Lnet/minecraft/class_1064; FIELD field_5292 serverPacksRoot Ljava/io/File; FIELD field_5293 pack Lnet/minecraft/class_3268; diff --git a/mappings/net/minecraft/client/resource/ClientResourcePackContainer.mapping b/mappings/net/minecraft/client/resource/ClientResourcePackProfile.mapping similarity index 80% rename from mappings/net/minecraft/client/resource/ClientResourcePackContainer.mapping rename to mappings/net/minecraft/client/resource/ClientResourcePackProfile.mapping index 8632783ee3..fae27760d6 100644 --- a/mappings/net/minecraft/client/resource/ClientResourcePackContainer.mapping +++ b/mappings/net/minecraft/client/resource/ClientResourcePackProfile.mapping @@ -1,8 +1,15 @@ -CLASS net/minecraft/class_1075 net/minecraft/client/resource/ClientResourcePackContainer +CLASS net/minecraft/class_1075 net/minecraft/client/resource/ClientResourcePackProfile FIELD field_5320 iconId Lnet/minecraft/class_2960; FIELD field_5321 icon Lnet/minecraft/class_1011; METHOD (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_3281;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_1011;)V ARG 1 name + ARG 2 alwaysEnabled + ARG 3 packFactory + ARG 4 displayName + ARG 5 description + ARG 6 compatibility + ARG 8 pinned + ARG 9 icon METHOD (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3262;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;)V ARG 1 name ARG 2 notSorting @@ -11,3 +18,4 @@ CLASS net/minecraft/class_1075 net/minecraft/client/resource/ClientResourcePackC ARG 5 metadata ARG 6 direction METHOD method_4664 drawIcon (Lnet/minecraft/class_1060;)V + ARG 1 manager diff --git a/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping b/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping index dd2804dbf9..a3abaa85c5 100644 --- a/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping +++ b/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_1070 net/minecraft/client/resource/FoliageColormapResourceSupplier - FIELD field_5303 FOLIAGE_COLORMAP_LOC Lnet/minecraft/class_2960; + FIELD field_5303 FOLIAGE_COLORMAP Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/resource/RedirectedResourcePack.mapping b/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping similarity index 79% rename from mappings/net/minecraft/client/resource/RedirectedResourcePack.mapping rename to mappings/net/minecraft/client/resource/Format3ResourcePack.mapping index d72c78b4da..0ec0b515c5 100644 --- a/mappings/net/minecraft/client/resource/RedirectedResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1073 net/minecraft/client/resource/RedirectedResourcePack +CLASS net/minecraft/class_1073 net/minecraft/client/resource/Format3ResourcePack FIELD field_5316 parent Lnet/minecraft/class_3262; FIELD field_5317 NEW_TO_OLD_MAP Ljava/util/Map; FIELD field_5318 idMap Ljava/util/Map; diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping index 2522241d07..03d88251d7 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1080 net/minecraft/client/resource/metadata/AnimationF FIELD field_5341 index I METHOD (II)V ARG 1 index + ARG 2 time METHOD method_4689 usesDefaultFrameTime ()Z METHOD method_4690 getIndex ()I METHOD method_4691 getTime ()I diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping index 906c277a9b..fba146f72a 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping @@ -10,10 +10,14 @@ CLASS net/minecraft/class_1079 net/minecraft/client/resource/metadata/AnimationR ARG 2 width ARG 3 height ARG 4 defaultFrameTime + ARG 5 interpolate METHOD method_4680 getFrameIndex (I)I + ARG 1 frameIndex METHOD method_4681 getFrame (I)Lnet/minecraft/class_1080; + ARG 1 frameIndex METHOD method_4682 getFrameCount ()I METHOD method_4683 getFrameTime (I)I + ARG 1 frameIndex METHOD method_4684 getDefaultFrameTime ()I METHOD method_4685 shouldInterpolate ()Z METHOD method_4686 getHeight ()I diff --git a/mappings/net/minecraft/client/search/SuffixArray.mapping b/mappings/net/minecraft/client/search/SuffixArray.mapping index 493f988a93..60620f328a 100644 --- a/mappings/net/minecraft/client/search/SuffixArray.mapping +++ b/mappings/net/minecraft/client/search/SuffixArray.mapping @@ -9,5 +9,5 @@ CLASS net/minecraft/class_1128 net/minecraft/client/search/SuffixArray METHOD method_4806 add (Ljava/lang/Object;Ljava/lang/String;)V ARG 1 object ARG 2 text - METHOD method_4807 reload ()V - METHOD method_4809 debugPrintArray ()V + METHOD method_4807 sort ()V + METHOD method_4809 printArray ()V diff --git a/mappings/net/minecraft/client/sound/SoundManager.mapping b/mappings/net/minecraft/client/sound/SoundManager.mapping index d5f0f52987..fa7f82f9af 100644 --- a/mappings/net/minecraft/client/sound/SoundManager.mapping +++ b/mappings/net/minecraft/client/sound/SoundManager.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager ARG 1 sound ARG 2 delay METHOD method_4873 play (Lnet/minecraft/class_1113;)V + ARG 1 sound METHOD method_4875 stopSounds (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;)V METHOD method_4876 updateListenerPosition (Lnet/minecraft/class_4184;)V METHOD method_4877 isPlaying (Lnet/minecraft/class_1113;)Z diff --git a/mappings/net/minecraft/client/texture/MissingSprite.mapping b/mappings/net/minecraft/client/texture/MissingSprite.mapping index 21ee7e0758..7b9ae26e75 100644 --- a/mappings/net/minecraft/client/texture/MissingSprite.mapping +++ b/mappings/net/minecraft/client/texture/MissingSprite.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1047 net/minecraft/client/texture/MissingSprite FIELD field_5219 MISSINGNO Lnet/minecraft/class_2960; - FIELD field_5220 TEXTURE Lnet/minecraft/class_1043; + FIELD field_5220 texture Lnet/minecraft/class_1043; FIELD field_5221 IMAGE Lnet/minecraft/class_3528; METHOD method_4539 getMissingSpriteId ()Lnet/minecraft/class_2960; METHOD method_4540 getMissingSpriteTexture ()Lnet/minecraft/class_1043; diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index af0dc345dd..f044a851c2 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -87,8 +87,8 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 5 targetImage METHOD method_4301 upload (IIIZ)V ARG 1 level - ARG 2 xOffset - ARG 3 yOffset + ARG 2 offsetX + ARG 3 offsetY ARG 4 mipmap METHOD method_4302 untrack ()V METHOD method_4303 read (Lnet/minecraft/class_1011$class_1012;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_1011; @@ -101,7 +101,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 6 height ARG 7 flipX ARG 8 flipY - METHOD method_4305 setPixelRGBA (III)V + METHOD method_4305 setPixelRgba (III)V ARG 1 x ARG 2 y ARG 3 color @@ -128,7 +128,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4313 setTextureClamp (Z)V ARG 0 clamp METHOD method_4314 writeFile (Ljava/nio/file/Path;)V - METHOD method_4315 getPixelRGBA (II)I + METHOD method_4315 getPixelRgba (II)I ARG 1 x ARG 2 y METHOD method_4316 makeGlyphBitmapSubpixel (Lorg/lwjgl/stb/STBTTFontinfo;IIIFFFFII)V diff --git a/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping b/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping index 4b71069861..a7ee974793 100644 --- a/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping +++ b/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_1043 net/minecraft/client/texture/NativeImageBackedTex METHOD method_4524 upload ()V METHOD method_4525 getImage ()Lnet/minecraft/class_1011; METHOD method_4526 setImage (Lnet/minecraft/class_1011;)V + ARG 1 image diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index 67ad2e0ca6..7da2355f10 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider ARG 2 callback ARG 3 requireSecure METHOD method_4654 getTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; - ARG 1 gameProfile + ARG 1 profile METHOD method_4656 loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/class_2960; ARG 1 profileTexture ARG 2 type diff --git a/mappings/net/minecraft/client/texture/ResourceTexture.mapping b/mappings/net/minecraft/client/texture/ResourceTexture.mapping index 1555e17e32..fed16ffc39 100644 --- a/mappings/net/minecraft/client/texture/ResourceTexture.mapping +++ b/mappings/net/minecraft/client/texture/ResourceTexture.mapping @@ -17,3 +17,4 @@ CLASS net/minecraft/class_1049 net/minecraft/client/texture/ResourceTexture METHOD (Lnet/minecraft/class_2960;)V ARG 1 location METHOD method_18153 loadTextureData (Lnet/minecraft/class_3300;)Lnet/minecraft/class_1049$class_4006; + ARG 1 resourceManager diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 1223f3aef7..9bd1076e9c 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -24,7 +24,8 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite ARG 1 animationMetadataHeight ARG 2 width ARG 3 height - METHOD method_4570 getV (D)F + METHOD method_4570 getFrameV (D)F + ARG 1 frame METHOD method_4571 lerp (DII)I ARG 1 multiplier ARG 3 first @@ -39,7 +40,11 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite METHOD method_4577 getMaxU ()F METHOD method_4578 getWidth ()I METHOD method_4579 upload (II[Lnet/minecraft/class_1011;)V - METHOD method_4580 getU (D)F + ARG 1 frameX + ARG 2 frameY + ARG 3 output + METHOD method_4580 getFrameU (D)F + ARG 1 frame METHOD method_4581 blendPixels (IIIIZ)I ARG 0 colorTopLeft ARG 1 colorTopRight diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasHolder.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasHolder.mapping index 6ac1458f5f..9b04cbef24 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasHolder.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasHolder.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_4075 net/minecraft/client/texture/SpriteAtlasHolder FIELD field_18230 atlas Lnet/minecraft/class_1059; METHOD method_18665 getSprites ()Ljava/lang/Iterable; METHOD method_18667 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058; + ARG 1 objectId diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index 216a9533ba..c021d29110 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -26,6 +26,8 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture METHOD method_18159 upload (Lnet/minecraft/class_1059$class_4007;)V METHOD method_18163 stitch (Lnet/minecraft/class_3300;Ljava/lang/Iterable;Lnet/minecraft/class_3695;)Lnet/minecraft/class_1059$class_4007; METHOD method_18164 loadSprites (Lnet/minecraft/class_3300;Ljava/util/Set;)Ljava/util/Collection; + ARG 1 resourceManager + ARG 2 ids METHOD method_4601 clear ()V METHOD method_4603 getTexturePath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; METHOD method_4604 loadSprite (Lnet/minecraft/class_3300;Lnet/minecraft/class_1058;)Z @@ -34,4 +36,5 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture ARG 1 mipLevel METHOD method_4607 getSprite (Ljava/lang/String;)Lnet/minecraft/class_1058; METHOD method_4608 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058; + ARG 1 id METHOD method_4612 tickAnimatedSprites ()V diff --git a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping index 4ce672e487..359353b681 100644 --- a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping +++ b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_4074 net/minecraft/client/texture/StatusEffectSpriteManager METHOD method_18663 getSprite (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1058; + ARG 1 effect diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index ae09a84cc9..0712544631 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -6,12 +6,17 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager FIELD field_5287 resourceContainer Lnet/minecraft/class_3300; FIELD field_5288 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_18168 loadTextureAsync (Lnet/minecraft/class_2960;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 id + ARG 2 executor METHOD method_4615 destroyTexture (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_4616 registerTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1062;)Z ARG 1 id METHOD method_4617 registerDynamicTexture (Ljava/lang/String;Lnet/minecraft/class_1043;)Lnet/minecraft/class_2960; ARG 1 prefix + ARG 2 texture METHOD method_4618 bindTexture (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_4619 getTexture (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1062; METHOD method_4620 registerTextureUpdateable (Lnet/minecraft/class_2960;Lnet/minecraft/class_1063;)Z ARG 1 id diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping index 7a10aa2338..89afe5489f 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcher.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher ARG 2 maxHeight ARG 3 mipLevel METHOD method_4549 getStitchedSprites ()Ljava/util/List; - METHOD method_4550 tryFit (Lnet/minecraft/class_1055$class_1056;)Z + METHOD method_4550 fit (Lnet/minecraft/class_1055$class_1056;)Z METHOD method_4551 applyMipLevel (II)I ARG 0 size ARG 1 mipLevel diff --git a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping index dcd7112875..644d17eefe 100644 --- a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1152 net/minecraft/client/tutorial/FindTreeTutorialStepHandler FIELD field_5628 DESCRIPTION Lnet/minecraft/class_2561; FIELD field_5629 ticks I - FIELD field_5630 manager Lnet/minecraft/class_1156; + FIELD field_5630 tutorialManager Lnet/minecraft/class_1156; FIELD field_5631 TITLE Lnet/minecraft/class_2561; - FIELD field_5632 MATCHING_BLOCKS Ljava/util/Set; + FIELD field_5632 TREE_BLOCKS Ljava/util/Set; FIELD field_5633 toast Lnet/minecraft/class_372; diff --git a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping index 5cc34c719e..397e95cdfe 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_1156 net/minecraft/client/tutorial/TutorialManager METHOD method_4905 getGameMode ()Lnet/minecraft/class_1934; METHOD method_4906 onSlotUpdate (Lnet/minecraft/class_1799;)V METHOD method_4907 onBlockAttacked (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V + ARG 1 world + ARG 2 pos + ARG 3 state METHOD method_4908 onUpdateMouse (DD)V ARG 1 deltaX ARG 3 deltaY diff --git a/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping index 62faa17bdb..728fb7c7c5 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_1155 net/minecraft/client/tutorial/TutorialStepHandler METHOD method_4897 onSlotUpdate (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_4898 onTarget (Lnet/minecraft/class_638;Lnet/minecraft/class_239;)V ARG 1 world ARG 2 hitResult METHOD method_4899 tick ()V METHOD method_4900 onBlockAttacked (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V + ARG 1 client + ARG 2 pos + ARG 3 state METHOD method_4901 onMouseUpdate (DD)V ARG 1 deltaX ARG 3 deltaY diff --git a/mappings/net/minecraft/client/util/SelectionManager.mapping b/mappings/net/minecraft/client/util/SelectionManager.mapping index 784d804f79..630b5a59bb 100644 --- a/mappings/net/minecraft/client/util/SelectionManager.mapping +++ b/mappings/net/minecraft/client/util/SelectionManager.mapping @@ -2,9 +2,9 @@ CLASS net/minecraft/class_3728 net/minecraft/client/util/SelectionManager FIELD field_16452 selectionEnd I FIELD field_16453 selectionStart I FIELD field_16454 client Lnet/minecraft/class_310; - FIELD field_16456 stringSupplier Ljava/util/function/Supplier; + FIELD field_16456 stringGetter Ljava/util/function/Supplier; FIELD field_16457 fontRenderer Lnet/minecraft/class_327; - FIELD field_16458 stringConsumer Ljava/util/function/Consumer; + FIELD field_16458 stringSetter Ljava/util/function/Consumer; METHOD method_16197 insert (Ljava/lang/String;)V METHOD method_16198 deleteSelectedText ()V METHOD method_16199 insert (C)Z diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index a9a77de1eb..b978c46e1c 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_320 net/minecraft/client/util/Session ARG 1 username ARG 2 uuid ARG 3 accessToken + ARG 4 accountType METHOD method_1673 getUuid ()Ljava/lang/String; METHOD method_1674 getAccessToken ()Ljava/lang/String; METHOD method_1675 getSessionId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/SmoothUtil.mapping b/mappings/net/minecraft/client/util/SmoothUtil.mapping index 28f2659d04..7aab6720dd 100644 --- a/mappings/net/minecraft/client/util/SmoothUtil.mapping +++ b/mappings/net/minecraft/client/util/SmoothUtil.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_3540 net/minecraft/client/util/SmoothUtil METHOD method_15428 clear ()V METHOD method_15429 smooth (DD)D + ARG 1 original + ARG 3 smoother diff --git a/mappings/net/minecraft/client/util/TextFormat.mapping b/mappings/net/minecraft/client/util/TextFormat.mapping index 30a3936e5e..e668760301 100644 --- a/mappings/net/minecraft/client/util/TextFormat.mapping +++ b/mappings/net/minecraft/client/util/TextFormat.mapping @@ -1 +1,38 @@ CLASS net/minecraft/class_4357 net/minecraft/client/util/TextFormat + FIELD field_19609 isFormat Z + FIELD field_19610 toString Ljava/lang/String; + FIELD field_19612 BLACK Lnet/minecraft/class_4357; + FIELD field_19613 DARK_BLUE Lnet/minecraft/class_4357; + FIELD field_19614 DARK_GREEN Lnet/minecraft/class_4357; + FIELD field_19615 DARK_AQUA Lnet/minecraft/class_4357; + FIELD field_19616 DARK_RED Lnet/minecraft/class_4357; + FIELD field_19617 DARK_PURPLE Lnet/minecraft/class_4357; + FIELD field_19618 GOLD Lnet/minecraft/class_4357; + FIELD field_19619 GRAY Lnet/minecraft/class_4357; + FIELD field_19620 DARK_GRAY Lnet/minecraft/class_4357; + FIELD field_19621 BLUE Lnet/minecraft/class_4357; + FIELD field_19622 GREEN Lnet/minecraft/class_4357; + FIELD field_19623 AQUA Lnet/minecraft/class_4357; + FIELD field_19624 RED Lnet/minecraft/class_4357; + FIELD field_19625 LIGHT_PURPLE Lnet/minecraft/class_4357; + FIELD field_19626 YELLOW Lnet/minecraft/class_4357; + FIELD field_19627 WHITE Lnet/minecraft/class_4357; + FIELD field_19628 OBFUSCATED Lnet/minecraft/class_4357; + FIELD field_19629 BOLD Lnet/minecraft/class_4357; + FIELD field_19630 STRIKETHROUGH Lnet/minecraft/class_4357; + FIELD field_19631 UNDERLINE Lnet/minecraft/class_4357; + FIELD field_19632 ITALIC Lnet/minecraft/class_4357; + FIELD field_19633 RESET Lnet/minecraft/class_4357; + FIELD field_19634 FORMATTING_BY_CHAR Ljava/util/Map; + FIELD field_19635 FORMATTING_BY_NAME Ljava/util/Map; + FIELD field_19636 STRIP_FORMATTING_PATTERN Ljava/util/regex/Pattern; + FIELD field_19637 code C + METHOD (Ljava/lang/String;IC)V + ARG 3 code + METHOD (Ljava/lang/String;ICZ)V + ARG 3 code + ARG 4 isFormat + METHOD method_21061 getChar ()C + METHOD method_21063 getName ()Ljava/lang/String; + METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/class_4357; + ARG 0 name diff --git a/mappings/net/minecraft/client/util/TextComponentUtil.mapping b/mappings/net/minecraft/client/util/Texts.mapping similarity index 70% rename from mappings/net/minecraft/client/util/TextComponentUtil.mapping rename to mappings/net/minecraft/client/util/Texts.mapping index 1d2c279a70..17068f72c5 100644 --- a/mappings/net/minecraft/client/util/TextComponentUtil.mapping +++ b/mappings/net/minecraft/client/util/Texts.mapping @@ -1,8 +1,9 @@ -CLASS net/minecraft/class_341 net/minecraft/client/util/TextComponentUtil +CLASS net/minecraft/class_341 net/minecraft/client/util/Texts METHOD method_1849 getRenderChatMessage (Ljava/lang/String;Z)Ljava/lang/String; ARG 0 string ARG 1 forceColor METHOD method_1850 wrapLines (Lnet/minecraft/class_2561;ILnet/minecraft/class_327;ZZ)Ljava/util/List; ARG 0 text ARG 1 width - ARG 2 fontRenderer + ARG 2 textRenderer + ARG 4 forceColor diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index 9d93cfc1bf..d44ebb1e90 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window FIELD field_16238 framerateLimit I - FIELD field_5176 windowEventHandler Lnet/minecraft/class_3678; + FIELD field_5176 eventHandler Lnet/minecraft/class_3678; FIELD field_5178 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5179 scaleFactor D FIELD field_5180 scaledWidth I FIELD field_5181 framebufferWidth I FIELD field_5182 width I - FIELD field_5183 positionX I + FIELD field_5183 x I FIELD field_5187 handle J FIELD field_5190 errorCallback Lorg/lwjgl/glfw/GLFWErrorCallback; FIELD field_5191 fullscreen Z @@ -16,12 +16,13 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window FIELD field_5195 monitorTracker Lnet/minecraft/class_323; FIELD field_5196 framebufferHeight I FIELD field_5197 height I - FIELD field_5198 positionY I + FIELD field_5198 y I METHOD method_15996 waitForFramerateLimit ()V METHOD method_15997 setScaleFactor (D)V ARG 1 scaleFactor METHOD method_15998 setFullscreen (Z)V METHOD method_15999 setFramerateLimit (I)V + ARG 1 framerateLimit METHOD method_16000 getFramerateLimit ()I METHOD method_16001 pollEvents ()V METHOD method_20831 getMonitor ()Lnet/minecraft/class_313; @@ -30,10 +31,13 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window METHOD method_4476 calculateScaleFactor (IZ)I ARG 1 guiScale ARG 2 forceUnicodeFont - METHOD method_4477 getPositionX ()I + METHOD method_4477 getY ()I METHOD method_4478 onWindowPosChanged (JII)V + ARG 1 window + ARG 3 x + ARG 4 y METHOD method_4480 getWidth ()I - METHOD method_4481 throwExceptionOnGlError ()V + METHOD method_4481 throwOnGlError ()V METHOD method_4482 logGlError (IJ)V ARG 1 error ARG 2 description @@ -52,16 +56,20 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window ARG 3 focused METHOD method_4495 getScaleFactor ()D METHOD method_4497 setVsync (Z)V + ARG 1 vsync METHOD method_4498 isFullscreen ()Z - METHOD method_4499 getPositionY ()I + METHOD method_4499 getX ()I METHOD method_4500 toggleFullscreen ()V - METHOD method_4501 throwExceptionForGlError (IJ)V + METHOD method_4501 throwGlError (IJ)V + ARG 0 error + ARG 1 description METHOD method_4502 getScaledHeight ()I METHOD method_4504 onFramebufferSizeChanged (JII)V ARG 1 window ARG 3 width ARG 4 height METHOD method_4505 setVideoMode (Ljava/util/Optional;)V + ARG 1 videoMode METHOD method_4506 getFramebufferHeight ()I METHOD method_4507 getHeight ()I METHOD method_4511 getVideoMode ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/util/math/Matrix4f.mapping b/mappings/net/minecraft/client/util/math/Matrix4f.mapping index a9b0cb5d1d..0b409a0dc3 100644 --- a/mappings/net/minecraft/client/util/math/Matrix4f.mapping +++ b/mappings/net/minecraft/client/util/math/Matrix4f.mapping @@ -11,11 +11,11 @@ CLASS net/minecraft/class_1159 net/minecraft/client/util/math/Matrix4f ARG 1 row ARG 2 col ARG 3 value - METHOD method_4932 putIntoBuffer (Ljava/nio/FloatBuffer;)V + METHOD method_4932 writeToBuffer (Ljava/nio/FloatBuffer;)V ARG 1 buffer METHOD method_4933 projectionMatrix (FFFF)Lnet/minecraft/class_1159; - ARG 0 viewportWidth - ARG 1 viewportHeight + ARG 0 width + ARG 1 height ARG 2 nearPlane ARG 3 farPlane METHOD method_4936 setFromBuffer (Ljava/nio/FloatBuffer;Z)V diff --git a/mappings/net/minecraft/client/render/Vec3d.mapping b/mappings/net/minecraft/client/util/math/Vector3d.mapping similarity index 62% rename from mappings/net/minecraft/client/render/Vec3d.mapping rename to mappings/net/minecraft/client/util/math/Vector3d.mapping index c900c33aab..5fac209724 100644 --- a/mappings/net/minecraft/client/render/Vec3d.mapping +++ b/mappings/net/minecraft/client/util/math/Vector3d.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1161 net/minecraft/client/render/Vec3d +CLASS net/minecraft/class_1161 net/minecraft/client/util/math/Vector3d FIELD field_5659 z D FIELD field_5660 y D FIELD field_5661 x D diff --git a/mappings/net/minecraft/client/util/math/Vector3f.mapping b/mappings/net/minecraft/client/util/math/Vector3f.mapping index 90531dfea6..d42829fcd6 100644 --- a/mappings/net/minecraft/client/util/math/Vector3f.mapping +++ b/mappings/net/minecraft/client/util/math/Vector3f.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f METHOD (FFF)V ARG 1 x ARG 2 y + ARG 3 z METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_16004 clampFloat (FFF)F @@ -10,18 +11,25 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f ARG 1 min ARG 2 max METHOD method_4942 scale (F)V + ARG 1 scale METHOD method_4943 getX ()F METHOD method_4944 subtract (Lnet/minecraft/class_1160;)V + ARG 1 other METHOD method_4945 getY ()F METHOD method_4946 clamp (FF)V ARG 1 min + ARG 2 max METHOD method_4947 getZ ()F METHOD method_4948 add (FFF)V ARG 1 x ARG 2 y + ARG 3 z METHOD method_4949 set (FFF)V ARG 1 x ARG 2 y + ARG 3 z METHOD method_4950 dot (Lnet/minecraft/class_1160;)F + ARG 1 other METHOD method_4951 cross (Lnet/minecraft/class_1160;)V + ARG 1 vector METHOD method_4952 reciprocal ()V diff --git a/mappings/net/minecraft/client/util/math/Vector4f.mapping b/mappings/net/minecraft/client/util/math/Vector4f.mapping index 6c9d3a15d8..1ab9d21f15 100644 --- a/mappings/net/minecraft/client/util/math/Vector4f.mapping +++ b/mappings/net/minecraft/client/util/math/Vector4f.mapping @@ -8,7 +8,8 @@ CLASS net/minecraft/class_1162 net/minecraft/client/util/math/Vector4f METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_4953 getX ()F - METHOD method_4954 multiply (Lnet/minecraft/class_1160;)V + METHOD method_4954 multiplyComponentwise (Lnet/minecraft/class_1160;)V + ARG 1 vector METHOD method_4955 set (FFFF)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 3a65f1ab18..266aa04769 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager ARG 6 updatedSectionsBits ARG 7 clearOld METHOD method_20180 updateLoadDistance (I)V + ARG 1 loadDistance METHOD method_20317 setChunkMapCenter (II)V ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 99b5a73625..7b48d0d060 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -9,8 +9,8 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_3730 ticksUntilCaveAmbientSound I FIELD field_3733 scoreboard Lnet/minecraft/class_269; METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_1940;Lnet/minecraft/class_2874;ILnet/minecraft/class_3695;Lnet/minecraft/class_761;)V - ARG 1 netHandler ARG 2 levelInfo + ARG 4 chunkLoadDistance METHOD method_18107 addPlayer (ILnet/minecraft/class_742;)V ARG 1 id ARG 2 player @@ -20,6 +20,9 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 chunk METHOD method_18112 getEntities ()Ljava/lang/Iterable; METHOD method_18113 scheduleBlockRenders (III)V + ARG 1 x + ARG 2 y + ARG 3 z METHOD method_18114 addEntityPrivate (ILnet/minecraft/class_1297;)V ARG 1 id ARG 2 entity @@ -63,6 +66,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 4 radius ARG 5 random ARG 6 spawnBarrierParticles + ARG 7 pos METHOD method_2944 setScoreboard (Lnet/minecraft/class_269;)V ARG 1 scoreboard METHOD method_2945 removeEntity (I)V diff --git a/mappings/net/minecraft/command/CommandException.mapping b/mappings/net/minecraft/command/CommandException.mapping index b41d076c49..8f2d2ecbab 100644 --- a/mappings/net/minecraft/command/CommandException.mapping +++ b/mappings/net/minecraft/command/CommandException.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_2164 net/minecraft/command/CommandException FIELD field_9813 message Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;)V ARG 1 message - METHOD method_9199 getMessageText ()Lnet/minecraft/class_2561; + METHOD method_9199 getTextMessage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/command/DataCommandObject.mapping b/mappings/net/minecraft/command/DataCommandObject.mapping index c3f6d8efa9..42a78f5a80 100644 --- a/mappings/net/minecraft/command/DataCommandObject.mapping +++ b/mappings/net/minecraft/command/DataCommandObject.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_3162 net/minecraft/command/DataCommandObject - METHOD method_13879 getGetFeedback (Lnet/minecraft/class_2203$class_2209;DI)Lnet/minecraft/class_2561; + METHOD method_13879 feedbackGet (Lnet/minecraft/class_2203$class_2209;DI)Lnet/minecraft/class_2561; + ARG 2 scale + ARG 4 result METHOD method_13880 setTag (Lnet/minecraft/class_2487;)V - METHOD method_13881 getTag ()Lnet/minecraft/class_2487; - METHOD method_13882 getQueryFeedback (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561; ARG 1 tag - METHOD method_13883 getModifiedFeedback ()Lnet/minecraft/class_2561; + METHOD method_13881 getTag ()Lnet/minecraft/class_2487; + METHOD method_13882 feedbackQuery (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561; + ARG 1 tag + METHOD method_13883 feedbackModify ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/command/EntitySelector.mapping b/mappings/net/minecraft/command/EntitySelector.mapping index 2f128dced3..51e9210695 100644 --- a/mappings/net/minecraft/command/EntitySelector.mapping +++ b/mappings/net/minecraft/command/EntitySelector.mapping @@ -6,15 +6,15 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector FIELD field_10824 box Lnet/minecraft/class_238; FIELD field_10825 distance Lnet/minecraft/class_2096$class_2099; FIELD field_10826 sorter Ljava/util/function/BiConsumer; - FIELD field_10827 checkPermissions Z + FIELD field_10827 usesAt Z FIELD field_10828 senderOnly Z FIELD field_10829 localWorldOnly Z - FIELD field_10830 includeNonPlayers Z + FIELD field_10830 includesNonPlayers Z FIELD field_10831 playerName Ljava/lang/String; FIELD field_10832 type Lnet/minecraft/class_1299; METHOD (IZZLjava/util/function/Predicate;Lnet/minecraft/class_2096$class_2099;Ljava/util/function/Function;Lnet/minecraft/class_238;Ljava/util/function/BiConsumer;ZLjava/lang/String;Ljava/util/UUID;Lnet/minecraft/class_1299;Z)V ARG 1 count - ARG 2 includeNonPlayers + ARG 2 includesNonPlayers ARG 3 localWorldOnly ARG 4 basePredicate ARG 5 distance @@ -25,7 +25,7 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector ARG 10 playerName ARG 11 uuid ARG 12 type - ARG 13 checkPermissions + ARG 13 usesAt METHOD method_9809 getEntity (Lnet/minecraft/class_2168;)Lnet/minecraft/class_1297; METHOD method_9811 getPlayer (Lnet/minecraft/class_2168;)Lnet/minecraft/class_3222; METHOD method_9813 getPlayers (Lnet/minecraft/class_2168;)Ljava/util/List; @@ -33,7 +33,7 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector METHOD method_9815 getLimit ()I METHOD method_9816 getEntities (Lnet/minecraft/class_2168;)Ljava/util/List; METHOD method_9817 getPositionPredicate (Lnet/minecraft/class_243;)Ljava/util/function/Predicate; - METHOD method_9818 check (Lnet/minecraft/class_2168;)V + METHOD method_9818 checkSourcePermission (Lnet/minecraft/class_2168;)V METHOD method_9819 includesNonPlayers ()Z METHOD method_9820 isSenderOnly ()Z METHOD method_9821 isLocalWorldOnly ()Z diff --git a/mappings/net/minecraft/command/EntitySelectorOptions.mapping b/mappings/net/minecraft/command/EntitySelectorOptions.mapping index c2e58e381d..8368ef4eac 100644 --- a/mappings/net/minecraft/command/EntitySelectorOptions.mapping +++ b/mappings/net/minecraft/command/EntitySelectorOptions.mapping @@ -14,11 +14,13 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions FIELD field_10892 INVALID_TYPE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10893 NEGATIVE_LEVEL_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_9930 suggestOptions (Lnet/minecraft/class_2303;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V + ARG 0 reader + ARG 1 suggestionBuilder METHOD method_9960 register ()V METHOD method_9961 putOption (Ljava/lang/String;Lnet/minecraft/class_2306$class_2307;Ljava/util/function/Predicate;Lnet/minecraft/class_2561;)V - ARG 0 name + ARG 0 id ARG 1 handler - ARG 2 predicate + ARG 2 condition ARG 3 description METHOD method_9976 getHandler (Lnet/minecraft/class_2303;Ljava/lang/String;I)Lnet/minecraft/class_2306$class_2307; ARG 0 reader diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping index 7961e6ffab..49d6cb9dd3 100644 --- a/mappings/net/minecraft/command/EntitySelectorReader.mapping +++ b/mappings/net/minecraft/command/EntitySelectorReader.mapping @@ -1,43 +1,44 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader FIELD field_10837 UNTERMINATED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_10838 distance Lnet/minecraft/class_2096$class_2099; - FIELD field_10839 offsetZ Ljava/lang/Double; - FIELD field_10840 checkPermissions Z + FIELD field_10839 z Ljava/lang/Double; + FIELD field_10840 usesAt Z FIELD field_10842 levelRange Lnet/minecraft/class_2096$class_2100; - FIELD field_10843 includingNonPlayer Z + FIELD field_10843 includesNonPlayers Z FIELD field_10844 MISSING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_10847 sorter Ljava/util/function/BiConsumer; FIELD field_10848 suggestionProvider Ljava/util/function/BiFunction; FIELD field_10850 RANDOM Ljava/util/function/BiConsumer; - FIELD field_10852 boxY Ljava/lang/Double; + FIELD field_10852 dy Ljava/lang/Double; FIELD field_10853 UNKNOWN_SELECTOR_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10855 VALUELESS_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10856 ARBITRARY Ljava/util/function/BiConsumer; - FIELD field_10857 offsetX Ljava/lang/Double; + FIELD field_10857 x Ljava/lang/Double; FIELD field_10858 limit I FIELD field_10859 yawRange Lnet/minecraft/class_2152; FIELD field_10860 reader Lcom/mojang/brigadier/StringReader; FIELD field_10861 startCursor I - FIELD field_10862 boxX Ljava/lang/Double; + FIELD field_10862 dx Ljava/lang/Double; FIELD field_10863 entityType Lnet/minecraft/class_1299; FIELD field_10866 localWorldOnly Z FIELD field_10867 DEFAULT_SUGGESTION_PROVIDER Ljava/util/function/BiFunction; FIELD field_10869 NEAREST Ljava/util/function/BiConsumer; FIELD field_10870 predicate Ljava/util/function/Predicate; - FIELD field_10872 offsetY Ljava/lang/Double; + FIELD field_10872 y Ljava/lang/Double; FIELD field_10875 INVALID_ENTITY_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_10876 playerName Ljava/lang/String; FIELD field_10877 pitchRange Lnet/minecraft/class_2152; FIELD field_10878 uuid Ljava/util/UUID; FIELD field_10879 senderOnly Z FIELD field_10880 NOT_ALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_10881 boxZ Ljava/lang/Double; + FIELD field_10881 dz Ljava/lang/Double; FIELD field_10882 FURTHEST Ljava/util/function/BiConsumer; METHOD method_9834 suggestSelectorRest (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9835 getReader ()Lcom/mojang/brigadier/StringReader; - METHOD method_9840 getBoxY ()Ljava/lang/Double; - METHOD method_9841 setIncludingNonPlayer (Z)V - ARG 1 includingNonPlayer + METHOD method_9840 getDy ()Ljava/lang/Double; + METHOD method_9841 setIncludesNonPlayers (Z)V + ARG 1 includesNonPlayers METHOD method_9842 setEntityType (Lnet/minecraft/class_1299;)V ARG 1 entityType METHOD method_9845 setSorter (Ljava/util/function/BiConsumer;)V @@ -45,18 +46,20 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9846 setLevelRange (Lnet/minecraft/class_2096$class_2100;)V ARG 1 experienceRange METHOD method_9847 suggestEndNext (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9849 readRegular ()V - METHOD method_9850 setOffsetX (D)V - ARG 1 offsetX - METHOD method_9851 getBoxX ()Ljava/lang/Double; + METHOD method_9850 setX (D)V + ARG 1 x + METHOD method_9851 getDx ()Ljava/lang/Double; METHOD method_9852 setLocalWorldOnly ()V METHOD method_9853 getYawRange ()Lnet/minecraft/class_2152; METHOD method_9855 setYawRange (Lnet/minecraft/class_2152;)V METHOD method_9858 suggestNormal (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9859 rotationPredicate (Lnet/minecraft/class_2152;Ljava/util/function/ToDoubleFunction;)Ljava/util/function/Predicate; - METHOD method_9864 setOffsetY (D)V - ARG 1 offsetY - METHOD method_9868 getOffsetZ ()Ljava/lang/Double; + METHOD method_9864 setY (D)V + ARG 1 y + METHOD method_9868 getZ ()Ljava/lang/Double; METHOD method_9870 setDistance (Lnet/minecraft/class_2096$class_2099;)V ARG 1 distance METHOD method_9871 build ()Lnet/minecraft/class_2300; @@ -64,37 +67,42 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9874 readArguments ()V METHOD method_9875 setSuggestionProvider (Ljava/util/function/BiFunction;)V METHOD method_9878 buildPredicate ()V - METHOD method_9879 setOffsetZ (D)V - ARG 1 offsetZ + METHOD method_9879 setZ (D)V + ARG 1 z METHOD method_9880 suggestSelector (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; - ARG 1 suggestionsBuilder + ARG 1 builder METHOD method_9882 read ()Lnet/minecraft/class_2300; METHOD method_9883 getPitchRange ()Lnet/minecraft/class_2152; - METHOD method_9884 getOffsetY ()Ljava/lang/Double; + METHOD method_9884 getY ()Ljava/lang/Double; METHOD method_9885 isSenderOnly ()Z - METHOD method_9886 hasEntityType ()Z - METHOD method_9891 setBoxX (D)V - ARG 1 boxX + METHOD method_9886 selectsEntityType ()Z + METHOD method_9891 setDx (D)V + ARG 1 dx METHOD method_9892 readNegationCharacter ()Z METHOD method_9893 suggestOpen (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9894 createBox (DDD)Lnet/minecraft/class_238; ARG 1 x ARG 3 y ARG 5 z METHOD method_9895 getLevelRange ()Lnet/minecraft/class_2096$class_2100; METHOD method_9896 suggestSelector (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V + ARG 0 builder METHOD method_9898 setPitchRange (Lnet/minecraft/class_2152;)V METHOD method_9900 setLimit (I)V ARG 1 limit - METHOD method_9902 getOffsetX ()Ljava/lang/Double; - METHOD method_9905 setBoxY (D)V - ARG 1 boxY - METHOD method_9907 getBoxZ ()Ljava/lang/Double; + METHOD method_9902 getX ()Ljava/lang/Double; + METHOD method_9905 setDy (D)V + ARG 1 dy + METHOD method_9907 getDz ()Ljava/lang/Double; METHOD method_9908 listSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9909 suggestOption (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9911 suggestOptionOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9915 readTagCharacter ()Z METHOD method_9916 setPredicate (Ljava/util/function/Predicate;)V METHOD method_9917 readAtVariable ()V - METHOD method_9918 setBoxZ (D)V - ARG 1 boxZ + METHOD method_9918 setDz (D)V + ARG 1 dz diff --git a/mappings/net/minecraft/command/FloatRange.mapping b/mappings/net/minecraft/command/FloatRangeArgument.mapping similarity index 91% rename from mappings/net/minecraft/command/FloatRange.mapping rename to mappings/net/minecraft/command/FloatRangeArgument.mapping index 2d9583ee96..48e263f208 100644 --- a/mappings/net/minecraft/command/FloatRange.mapping +++ b/mappings/net/minecraft/command/FloatRangeArgument.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2152 net/minecraft/command/FloatRange +CLASS net/minecraft/class_2152 net/minecraft/command/FloatRangeArgument FIELD field_9778 min Ljava/lang/Float; FIELD field_9779 max Ljava/lang/Float; FIELD field_9780 ANY Lnet/minecraft/class_2152; diff --git a/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping b/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping index 54189b26c5..bff900712f 100644 --- a/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping @@ -83,9 +83,9 @@ CLASS net/minecraft/class_2203 net/minecraft/command/arguments/NbtPathArgumentTy METHOD method_9358 getNbtPath (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2203$class_2209; ARG 0 context ARG 1 name - METHOD method_9359 getEqualityPredicate (Lnet/minecraft/class_2487;)Ljava/util/function/Predicate; - ARG 0 tag + METHOD method_9359 getPredicate (Lnet/minecraft/class_2487;)Ljava/util/function/Predicate; + ARG 0 filter METHOD method_9360 nbtPath ()Lnet/minecraft/class_2203; METHOD method_9361 parseNode (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/class_2203$class_2210; ARG 0 reader - ARG 1 first + ARG 1 root diff --git a/mappings/net/minecraft/container/ArrayPropertyDelegate.mapping b/mappings/net/minecraft/container/ArrayPropertyDelegate.mapping index e6056faff6..f420305fd6 100644 --- a/mappings/net/minecraft/container/ArrayPropertyDelegate.mapping +++ b/mappings/net/minecraft/container/ArrayPropertyDelegate.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3919 net/minecraft/container/ArrayPropertyDelegate + COMMENT A {@link PropertyDelegate} that is implemented using an int array. FIELD field_17345 data [I METHOD (I)V ARG 1 size diff --git a/mappings/net/minecraft/container/BlockContext.mapping b/mappings/net/minecraft/container/BlockContext.mapping index ef72e19679..6d3f44bfbb 100644 --- a/mappings/net/minecraft/container/BlockContext.mapping +++ b/mappings/net/minecraft/container/BlockContext.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_3914 net/minecraft/container/BlockContext + COMMENT Block contexts allow to get a value using an optionally present {@link World} and {@link BlockPos}. FIELD field_17304 EMPTY Lnet/minecraft/class_3914; METHOD method_17392 create (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3914; - ARG 1 world + ARG 0 world + ARG 1 pos METHOD method_17393 run (Ljava/util/function/BiConsumer;)V ARG 1 function METHOD method_17395 run (Ljava/util/function/BiFunction;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/container/Container.mapping b/mappings/net/minecraft/container/Container.mapping index 5db2663b31..4738d41fd5 100644 --- a/mappings/net/minecraft/container/Container.mapping +++ b/mappings/net/minecraft/container/Container.mapping @@ -5,24 +5,35 @@ CLASS net/minecraft/class_1703 net/minecraft/container/Container FIELD field_7758 actionId S FIELD field_7759 quickCraftButton I FIELD field_7760 restrictedPlayers Ljava/util/Set; - FIELD field_7761 slotList Ljava/util/List; + FIELD field_7761 slots Ljava/util/List; FIELD field_7762 quickCraftStage I FIELD field_7763 syncId I - FIELD field_7764 stackList Lnet/minecraft/class_2371; + FIELD field_7764 trackedStacks Lnet/minecraft/class_2371; + COMMENT A list of item stacks that is used for tracking changes in {@link #sendContentUpdates()}. FIELD field_7765 listeners Ljava/util/List; METHOD (Lnet/minecraft/class_3917;I)V ARG 1 type ARG 2 syncId METHOD method_17358 getType ()Lnet/minecraft/class_3917; METHOD method_17359 checkContainerSize (Lnet/minecraft/class_1263;I)V + COMMENT Checks that the size of the provided inventory is at least as large as the {@code expectedSize}. + COMMENT + COMMENT @throws IllegalArgumentException if the inventory size is smaller than {@code exceptedSize} ARG 1 expectedSize METHOD method_17360 addProperties (Lnet/minecraft/class_3913;)V METHOD method_17361 checkContainerDataCount (Lnet/minecraft/class_3913;I)V + COMMENT Checks that the size of the {@code data} is at least as large as the {@code exceptedCount}. + COMMENT + COMMENT @throws IllegalArgumentException if the {@code data} has a smaller size than {@code exceptedCount} ARG 0 data ARG 1 expectedCount METHOD method_17362 addProperty (Lnet/minecraft/class_3915;)Lnet/minecraft/class_3915; METHOD method_17695 canUse (Lnet/minecraft/class_3914;Lnet/minecraft/class_1657;Lnet/minecraft/class_2248;)Z + ARG 0 context + ARG 1 player + ARG 2 block METHOD method_7590 setPlayerRestriction (Lnet/minecraft/class_1657;Z)V + ARG 1 player ARG 2 unrestricted METHOD method_7591 packClickData (II)I ARG 0 buttonId @@ -53,10 +64,13 @@ CLASS net/minecraft/class_1703 net/minecraft/container/Container ARG 1 player ARG 2 id METHOD method_7605 endQuickCraft ()V - METHOD method_7606 setProperties (II)V - ARG 1 pos - ARG 2 propertyId + METHOD method_7606 setProperty (II)V + ARG 1 id + ARG 2 value METHOD method_7607 dropInventory (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1263;)V + ARG 1 player + ARG 2 world + ARG 3 inventory METHOD method_7608 calculateComparatorOutput (Lnet/minecraft/class_2586;)I ARG 0 entity METHOD method_7609 onContentChanged (Lnet/minecraft/class_1263;)V @@ -64,7 +78,10 @@ CLASS net/minecraft/class_1703 net/minecraft/container/Container METHOD method_7610 updateSlotStacks (Ljava/util/List;)V ARG 1 stacks METHOD method_7611 getSlot (I)Lnet/minecraft/class_1735; + ARG 1 index METHOD method_7612 canStacksCombine (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 0 first + ARG 1 second METHOD method_7613 canInsertIntoSlot (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;)Z ARG 1 stack ARG 2 slot @@ -84,9 +101,12 @@ CLASS net/minecraft/class_1703 net/minecraft/container/Container ARG 0 inventory METHOD method_7619 setStackInSlot (ILnet/minecraft/class_1799;)V ARG 1 slot + ARG 2 stack METHOD method_7620 unpackQuickCraftStage (I)I ARG 0 clickData METHOD method_7621 addSlot (Lnet/minecraft/class_1735;)Lnet/minecraft/class_1735; ARG 1 slot - METHOD method_7622 isRestricted (Lnet/minecraft/class_1657;)Z + METHOD method_7622 isNotRestricted (Lnet/minecraft/class_1657;)Z + ARG 1 player METHOD method_7623 sendContentUpdates ()V + COMMENT Sends updates to listeners if any properties or slot stacks have changed. diff --git a/mappings/net/minecraft/container/ContainerProvider.mapping b/mappings/net/minecraft/container/ContainerFactory.mapping similarity index 95% rename from mappings/net/minecraft/container/ContainerProvider.mapping rename to mappings/net/minecraft/container/ContainerFactory.mapping index d4e5ca59c9..4bdf4d1c61 100644 --- a/mappings/net/minecraft/container/ContainerProvider.mapping +++ b/mappings/net/minecraft/container/ContainerFactory.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1270 net/minecraft/container/ContainerProvider +CLASS net/minecraft/class_1270 net/minecraft/container/ContainerFactory METHOD createMenu (ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 1 syncId ARG 2 inv diff --git a/mappings/net/minecraft/container/ContainerLock.mapping b/mappings/net/minecraft/container/ContainerLock.mapping deleted file mode 100644 index f5b9604356..0000000000 --- a/mappings/net/minecraft/container/ContainerLock.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_1273 net/minecraft/container/ContainerLock - FIELD field_5817 NONE Lnet/minecraft/class_1273; - FIELD field_5818 key Ljava/lang/String; - METHOD method_5472 isEmpty (Lnet/minecraft/class_1799;)Z - METHOD method_5473 deserialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1273; - ARG 0 tag - METHOD method_5474 serialize (Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/container/NameableContainerProvider.mapping b/mappings/net/minecraft/container/NameableContainerFactory.mapping similarity index 88% rename from mappings/net/minecraft/container/NameableContainerProvider.mapping rename to mappings/net/minecraft/container/NameableContainerFactory.mapping index a8668ccb1d..1086e95f67 100644 --- a/mappings/net/minecraft/container/NameableContainerProvider.mapping +++ b/mappings/net/minecraft/container/NameableContainerFactory.mapping @@ -1,2 +1,2 @@ -CLASS net/minecraft/class_3908 net/minecraft/container/NameableContainerProvider +CLASS net/minecraft/class_3908 net/minecraft/container/NameableContainerFactory METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/container/PlayerContainer.mapping b/mappings/net/minecraft/container/PlayerContainer.mapping index b09820a200..3989e5bbda 100644 --- a/mappings/net/minecraft/container/PlayerContainer.mapping +++ b/mappings/net/minecraft/container/PlayerContainer.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_1723 net/minecraft/container/PlayerContainer - FIELD field_7827 local Z + FIELD field_7827 onServer Z FIELD field_7828 owner Lnet/minecraft/class_1657; FIELD field_7829 EMPTY_ARMOR_SLOT_IDS [Ljava/lang/String; - FIELD field_7830 invCraftingResult Lnet/minecraft/class_1731; - FIELD field_7831 invCrafting Lnet/minecraft/class_1715; + FIELD field_7830 craftingResultInventory Lnet/minecraft/class_1731; + FIELD field_7831 craftingInventory Lnet/minecraft/class_1715; FIELD field_7832 EQUIPMENT_SLOT_ORDER [Lnet/minecraft/class_1304; METHOD (Lnet/minecraft/class_1661;ZLnet/minecraft/class_1657;)V ARG 1 inventory - ARG 2 local + ARG 2 onServer + ARG 3 owner diff --git a/mappings/net/minecraft/container/Property.mapping b/mappings/net/minecraft/container/Property.mapping index f3b58a2c5d..80d0b819b5 100644 --- a/mappings/net/minecraft/container/Property.mapping +++ b/mappings/net/minecraft/container/Property.mapping @@ -1,13 +1,25 @@ CLASS net/minecraft/class_3915 net/minecraft/container/Property + COMMENT An integer property that is stored in a {@link Container}. + COMMENT + COMMENT

{@code Property} instances are used for tracking integer properties in property delegates + COMMENT and other sources of integer properties, and sending needed content updates to listeners. + COMMENT + COMMENT @see Container#addProperty CLASS 3 FIELD field_17312 value I FIELD field_17307 oldValue I METHOD method_17403 create ()Lnet/minecraft/class_3915; + COMMENT Creates a new property that is not attached to any other objects. METHOD method_17404 set (I)V ARG 1 value METHOD method_17405 create (Lnet/minecraft/class_3913;I)Lnet/minecraft/class_3915; - ARG 1 key + COMMENT Creates a new property that accesses the {@code index} of the {@code delegate}. + ARG 0 delegate + ARG 1 index METHOD method_17406 create ([II)Lnet/minecraft/class_3915; - ARG 1 key + COMMENT Creates a new property that accesses the {@code index} of the {@code array}. + ARG 0 array + ARG 1 index METHOD method_17407 get ()I - METHOD method_17408 detectChanges ()Z + METHOD method_17408 hasChanged ()Z + COMMENT Returns true if the value of this property has changed since the last call to {@code hasChanged()}. diff --git a/mappings/net/minecraft/container/PropertyDelegate.mapping b/mappings/net/minecraft/container/PropertyDelegate.mapping index f35eba60e3..22c67c90e5 100644 --- a/mappings/net/minecraft/container/PropertyDelegate.mapping +++ b/mappings/net/minecraft/container/PropertyDelegate.mapping @@ -1,7 +1,11 @@ CLASS net/minecraft/class_3913 net/minecraft/container/PropertyDelegate + COMMENT A property delegate represents an indexed list of integer properties. + COMMENT + COMMENT

Property delegates are used for displaying integer values in screens, + COMMENT such as the progress bars in furnaces. METHOD method_17389 size ()I METHOD method_17390 get (I)I - ARG 1 key + ARG 1 index METHOD method_17391 set (II)V - ARG 1 key + ARG 1 index ARG 2 value diff --git a/mappings/net/minecraft/client/network/ClientDummyContainerProvider.mapping b/mappings/net/minecraft/container/SimpleNamedContainerFactory.mapping similarity index 52% rename from mappings/net/minecraft/client/network/ClientDummyContainerProvider.mapping rename to mappings/net/minecraft/container/SimpleNamedContainerFactory.mapping index 0a33532abf..3575993562 100644 --- a/mappings/net/minecraft/client/network/ClientDummyContainerProvider.mapping +++ b/mappings/net/minecraft/container/SimpleNamedContainerFactory.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_747 net/minecraft/client/network/ClientDummyContainerProvider - FIELD field_17280 containerProvider Lnet/minecraft/class_1270; +CLASS net/minecraft/class_747 net/minecraft/container/SimpleNamedContainerFactory + FIELD field_17280 baseFactory Lnet/minecraft/class_1270; FIELD field_3947 name Lnet/minecraft/class_2561; METHOD createMenu (ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 1 syncId diff --git a/mappings/net/minecraft/container/Slot.mapping b/mappings/net/minecraft/container/Slot.mapping index 142c38ee90..fe049a529b 100644 --- a/mappings/net/minecraft/container/Slot.mapping +++ b/mappings/net/minecraft/container/Slot.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1735 net/minecraft/container/Slot FIELD field_7874 id I FIELD field_7875 invSlot I METHOD (Lnet/minecraft/class_1263;III)V + ARG 1 inventory ARG 2 invSlot ARG 3 xPosition ARG 4 yPosition diff --git a/mappings/net/minecraft/datafixers/DataFixTypes.mapping b/mappings/net/minecraft/datafixer/DataFixTypes.mapping similarity index 69% rename from mappings/net/minecraft/datafixers/DataFixTypes.mapping rename to mappings/net/minecraft/datafixer/DataFixTypes.mapping index 4592f1d819..ead3fd7c6d 100644 --- a/mappings/net/minecraft/datafixers/DataFixTypes.mapping +++ b/mappings/net/minecraft/datafixer/DataFixTypes.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_4284 net/minecraft/datafixers/DataFixTypes +CLASS net/minecraft/class_4284 net/minecraft/datafixer/DataFixTypes FIELD field_19222 typeReference Lcom/mojang/datafixers/DSL$TypeReference; METHOD method_20329 getTypeReference ()Lcom/mojang/datafixers/DSL$TypeReference; diff --git a/mappings/net/minecraft/datafixer/NbtOps.mapping b/mappings/net/minecraft/datafixer/NbtOps.mapping new file mode 100644 index 0000000000..19f47d0ada --- /dev/null +++ b/mappings/net/minecraft/datafixer/NbtOps.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_2509 net/minecraft/datafixer/NbtOps + FIELD field_11560 INSTANCE Lnet/minecraft/class_2509; diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping new file mode 100644 index 0000000000..74340d341d --- /dev/null +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas + FIELD field_15775 EMPTY_IDENTIFIER_NORMALIZE Ljava/util/function/BiFunction; + FIELD field_15776 EMPTY Ljava/util/function/BiFunction; + FIELD field_15777 fixer Lcom/mojang/datafixers/DataFixer; + METHOD method_15450 getFixer ()Lcom/mojang/datafixers/DataFixer; + METHOD method_15451 build (Lcom/mojang/datafixers/DataFixerBuilder;)V + ARG 0 builder + METHOD method_15471 create ()Lcom/mojang/datafixers/DataFixer; diff --git a/mappings/net/minecraft/datafixers/TypeReferences.mapping b/mappings/net/minecraft/datafixer/TypeReferences.mapping similarity index 95% rename from mappings/net/minecraft/datafixers/TypeReferences.mapping rename to mappings/net/minecraft/datafixer/TypeReferences.mapping index 891b39c183..1f106a6117 100644 --- a/mappings/net/minecraft/datafixers/TypeReferences.mapping +++ b/mappings/net/minecraft/datafixer/TypeReferences.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1208 net/minecraft/datafixers/TypeReferences +CLASS net/minecraft/class_1208 net/minecraft/datafixer/TypeReferences FIELD field_19224 POI_CHUNK Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5710 LEVEL Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5711 RECIPE Lcom/mojang/datafixers/DSL$TypeReference; diff --git a/mappings/net/minecraft/datafixers/fixes/AddTrappedChestFix.mapping b/mappings/net/minecraft/datafixer/fix/AddTrappedChestFix.mapping similarity index 66% rename from mappings/net/minecraft/datafixers/fixes/AddTrappedChestFix.mapping rename to mappings/net/minecraft/datafixer/fix/AddTrappedChestFix.mapping index dc092b5940..63df6304f6 100644 --- a/mappings/net/minecraft/datafixers/fixes/AddTrappedChestFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/AddTrappedChestFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1215 net/minecraft/datafixers/fixes/AddTrappedChestFix +CLASS net/minecraft/class_1215 net/minecraft/datafixer/fix/AddTrappedChestFix FIELD field_5740 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/AdvancementsFix.mapping b/mappings/net/minecraft/datafixer/fix/AdvancementsFix.mapping similarity index 66% rename from mappings/net/minecraft/datafixers/fixes/AdvancementsFix.mapping rename to mappings/net/minecraft/datafixer/fix/AdvancementsFix.mapping index 07b725d550..d94854180b 100644 --- a/mappings/net/minecraft/datafixers/fixes/AdvancementsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/AdvancementsFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3555 net/minecraft/datafixers/fixes/AdvancementsFix +CLASS net/minecraft/class_3555 net/minecraft/datafixer/fix/AdvancementsFix FIELD field_15788 RENAMED_ADVANCEMENTS Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/BedBlockEntityFix.mapping b/mappings/net/minecraft/datafixer/fix/BedBlockEntityFix.mapping new file mode 100644 index 0000000000..5037a3b8ac --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BedBlockEntityFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3557 net/minecraft/datafixer/fix/BedBlockEntityFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BedItemColorFix.mapping b/mappings/net/minecraft/datafixer/fix/BedItemColorFix.mapping similarity index 55% rename from mappings/net/minecraft/datafixers/fixes/BedItemColorFix.mapping rename to mappings/net/minecraft/datafixer/fix/BedItemColorFix.mapping index eb60235f92..06b334407b 100644 --- a/mappings/net/minecraft/datafixers/fixes/BedItemColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BedItemColorFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3559 net/minecraft/datafixers/fixes/BedItemColorFix +CLASS net/minecraft/class_3559 net/minecraft/datafixer/fix/BedItemColorFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BiomesFix.mapping b/mappings/net/minecraft/datafixer/fix/BiomesFix.mapping similarity index 67% rename from mappings/net/minecraft/datafixers/fixes/BiomesFix.mapping rename to mappings/net/minecraft/datafixer/fix/BiomesFix.mapping index b1c1a7c7ab..e9298353b2 100644 --- a/mappings/net/minecraft/datafixers/fixes/BiomesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BiomesFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3561 net/minecraft/datafixers/fixes/BiomesFix +CLASS net/minecraft/class_3561 net/minecraft/datafixer/fix/BiomesFix FIELD field_15810 RENAMED_BIOMES Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/BlockEntityBannerColorFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping similarity index 82% rename from mappings/net/minecraft/datafixers/fixes/BlockEntityBannerColorFix.mapping rename to mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping index d34d41c193..505ad93a4e 100644 --- a/mappings/net/minecraft/datafixers/fixes/BlockEntityBannerColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3564 net/minecraft/datafixers/fixes/BlockEntityBannerColorFix +CLASS net/minecraft/class_3564 net/minecraft/datafixer/fix/BlockEntityBannerColorFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BlockEntityJukeboxFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityBlockStateFix.mapping similarity index 54% rename from mappings/net/minecraft/datafixers/fixes/BlockEntityJukeboxFix.mapping rename to mappings/net/minecraft/datafixer/fix/BlockEntityBlockStateFix.mapping index d99a75495c..5fb0568a00 100644 --- a/mappings/net/minecraft/datafixers/fixes/BlockEntityJukeboxFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityBlockStateFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3573 net/minecraft/datafixers/fixes/BlockEntityJukeboxFix +CLASS net/minecraft/class_3566 net/minecraft/datafixer/fix/BlockEntityBlockStateFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityCustomNameToComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityCustomNameToComponentFix.mapping new file mode 100644 index 0000000000..691f2f41dd --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityCustomNameToComponentFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3567 net/minecraft/datafixer/fix/BlockEntityCustomNameToComponentFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BlockEntityIdFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityIdFix.mapping similarity index 66% rename from mappings/net/minecraft/datafixers/fixes/BlockEntityIdFix.mapping rename to mappings/net/minecraft/datafixer/fix/BlockEntityIdFix.mapping index 9f78fefbe1..b9582c1d25 100644 --- a/mappings/net/minecraft/datafixers/fixes/BlockEntityIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityIdFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3571 net/minecraft/datafixers/fixes/BlockEntityIdFix +CLASS net/minecraft/class_3571 net/minecraft/datafixer/fix/BlockEntityIdFix FIELD field_15824 RENAMED_BLOCK_ENTITIES Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityJukeboxFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityJukeboxFix.mapping new file mode 100644 index 0000000000..36b324475f --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityJukeboxFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3573 net/minecraft/datafixer/fix/BlockEntityJukeboxFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BlockEntityKeepPacked.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping similarity index 71% rename from mappings/net/minecraft/datafixers/fixes/BlockEntityKeepPacked.mapping rename to mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping index 405672331d..354645dc8c 100644 --- a/mappings/net/minecraft/datafixers/fixes/BlockEntityKeepPacked.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3574 net/minecraft/datafixers/fixes/BlockEntityKeepPacked +CLASS net/minecraft/class_3574 net/minecraft/datafixer/fix/BlockEntityKeepPacked METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityShulkerBoxColorFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityShulkerBoxColorFix.mapping new file mode 100644 index 0000000000..83935959bb --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityShulkerBoxColorFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3575 net/minecraft/datafixer/fix/BlockEntityShulkerBoxColorFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BlockEntitySignTextStrictJsonFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping similarity index 83% rename from mappings/net/minecraft/datafixers/fixes/BlockEntitySignTextStrictJsonFix.mapping rename to mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping index e5be964d7e..cfc203fcc7 100644 --- a/mappings/net/minecraft/datafixers/fixes/BlockEntitySignTextStrictJsonFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3577 net/minecraft/datafixers/fixes/BlockEntitySignTextStrictJsonFix +CLASS net/minecraft/class_3577 net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix CLASS 1 METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson diff --git a/mappings/net/minecraft/datafixers/fixes/BlockNameFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping similarity index 85% rename from mappings/net/minecraft/datafixers/fixes/BlockNameFix.mapping rename to mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping index fdab6db924..308124170b 100644 --- a/mappings/net/minecraft/datafixers/fixes/BlockNameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3579 net/minecraft/datafixers/fixes/BlockNameFix +CLASS net/minecraft/class_3579 net/minecraft/datafixer/fix/BlockNameFix FIELD field_15828 name Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V ARG 1 oldSchema diff --git a/mappings/net/minecraft/datafixers/fixes/ChunkLightRemoveFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockNameFlatteningFix.mapping similarity index 54% rename from mappings/net/minecraft/datafixers/fixes/ChunkLightRemoveFix.mapping rename to mappings/net/minecraft/datafixer/fix/BlockNameFlatteningFix.mapping index aa28eb83b5..413529e8f5 100644 --- a/mappings/net/minecraft/datafixers/fixes/ChunkLightRemoveFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockNameFlatteningFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3755 net/minecraft/datafixers/fixes/ChunkLightRemoveFix +CLASS net/minecraft/class_3578 net/minecraft/datafixer/fix/BlockNameFlatteningFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BlockStateFlattening.mapping b/mappings/net/minecraft/datafixer/fix/BlockStateFlattening.mapping similarity index 50% rename from mappings/net/minecraft/datafixers/fixes/BlockStateFlattening.mapping rename to mappings/net/minecraft/datafixer/fix/BlockStateFlattening.mapping index 999a6d7a15..03360788bd 100644 --- a/mappings/net/minecraft/datafixers/fixes/BlockStateFlattening.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockStateFlattening.mapping @@ -1,19 +1,19 @@ -CLASS net/minecraft/class_3580 net/minecraft/datafixers/fixes/BlockStateFlattening - FIELD field_15830 NEW_IDS_TO_STATES [Lcom/mojang/datafixers/Dynamic; - FIELD field_15831 OLD_STATES_TO_NEW_IDS Lit/unimi/dsi/fastutil/objects/Object2IntMap; +CLASS net/minecraft/class_3580 net/minecraft/datafixer/fix/BlockStateFlattening + FIELD field_15830 ID_TO_NEW_STATE [Lcom/mojang/datafixers/Dynamic; + FIELD field_15831 OLD_STATE_TO_ID Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_15832 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_15833 BLOCKS_TO_DEFAULT_IDS Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_15833 OLD_BLOCK_TO_ID Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD method_15594 lookupState (I)Lcom/mojang/datafixers/Dynamic; ARG 0 stateId METHOD method_15596 putStates (ILjava/lang/String;[Ljava/lang/String;)V - ARG 0 newId + ARG 0 oldId ARG 1 newStateStr ARG 2 oldStateStrings METHOD method_15597 lookupState (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; ARG 0 oldState METHOD method_15598 parseState (Ljava/lang/String;)Lcom/mojang/datafixers/Dynamic; ARG 0 stateStr - METHOD method_15599 lookup (I)Ljava/lang/String; + METHOD method_15599 lookupStateBlock (I)Ljava/lang/String; ARG 0 stateId - METHOD method_15600 lookup (Ljava/lang/String;)Ljava/lang/String; - ARG 0 blockId + METHOD method_15600 lookupBlock (Ljava/lang/String;)Ljava/lang/String; + ARG 0 oldBlockName diff --git a/mappings/net/minecraft/datafixer/fix/BlockStateStructureTemplateFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockStateStructureTemplateFix.mapping new file mode 100644 index 0000000000..4e8cc93cb0 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BlockStateStructureTemplateFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3581 net/minecraft/datafixer/fix/BlockStateStructureTemplateFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/CatTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping similarity index 74% rename from mappings/net/minecraft/datafixers/fixes/CatTypeFix.mapping rename to mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping index df562b131d..d810f28138 100644 --- a/mappings/net/minecraft/datafixers/fixes/CatTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3903 net/minecraft/datafixers/fixes/CatTypeFix +CLASS net/minecraft/class_3903 net/minecraft/datafixer/fix/CatTypeFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ChoiceFix.mapping b/mappings/net/minecraft/datafixer/fix/ChoiceFix.mapping similarity index 86% rename from mappings/net/minecraft/datafixers/fixes/ChoiceFix.mapping rename to mappings/net/minecraft/datafixer/fix/ChoiceFix.mapping index 2142843d5b..f7138332b3 100644 --- a/mappings/net/minecraft/datafixers/fixes/ChoiceFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChoiceFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1197 net/minecraft/datafixers/fixes/ChoiceFix +CLASS net/minecraft/class_1197 net/minecraft/datafixer/fix/ChoiceFix FIELD field_5703 name Ljava/lang/String; FIELD field_5704 type Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5705 choiceName Ljava/lang/String; diff --git a/mappings/net/minecraft/datafixers/fixes/FixChoiceTypes.mapping b/mappings/net/minecraft/datafixer/fix/ChoiceTypesFix.mapping similarity index 72% rename from mappings/net/minecraft/datafixers/fixes/FixChoiceTypes.mapping rename to mappings/net/minecraft/datafixer/fix/ChoiceTypesFix.mapping index e2f9e38cdc..da7ddd9b4d 100644 --- a/mappings/net/minecraft/datafixers/fixes/FixChoiceTypes.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChoiceTypesFix.mapping @@ -1,7 +1,7 @@ -CLASS net/minecraft/class_3553 net/minecraft/datafixers/fixes/FixChoiceTypes +CLASS net/minecraft/class_3553 net/minecraft/datafixer/fix/ChoiceTypesFix FIELD field_15779 name Ljava/lang/String; FIELD field_15780 types Lcom/mojang/datafixers/DSL$TypeReference; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;)V - ARG 1 ouputSchema + ARG 1 outputSchema ARG 2 name ARG 3 types diff --git a/mappings/net/minecraft/datafixer/fix/ChunkLightRemoveFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkLightRemoveFix.mapping new file mode 100644 index 0000000000..b093b3f28f --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ChunkLightRemoveFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3755 net/minecraft/datafixer/fix/ChunkLightRemoveFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ChunkPalettedStorageFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping similarity index 98% rename from mappings/net/minecraft/datafixers/fixes/ChunkPalettedStorageFix.mapping rename to mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping index d457bb22bb..8628bf904a 100644 --- a/mappings/net/minecraft/datafixers/fixes/ChunkPalettedStorageFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3582 net/minecraft/datafixers/fixes/ChunkPalettedStorageFix +CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageFix CLASS class_3583 ChunkNibbleArray FIELD field_15855 contents [B METHOD method_15640 get (III)I diff --git a/mappings/net/minecraft/datafixers/fixes/ChunkStatusFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix.mapping similarity index 56% rename from mappings/net/minecraft/datafixers/fixes/ChunkStatusFix.mapping rename to mappings/net/minecraft/datafixer/fix/ChunkStatusFix.mapping index f9586ec096..d34ab5f938 100644 --- a/mappings/net/minecraft/datafixers/fixes/ChunkStatusFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3589 net/minecraft/datafixers/fixes/ChunkStatusFix +CLASS net/minecraft/class_3589 net/minecraft/datafixer/fix/ChunkStatusFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ChunkStatusFix2.mapping b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping similarity index 64% rename from mappings/net/minecraft/datafixers/fixes/ChunkStatusFix2.mapping rename to mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping index a7cdac605f..07a2041ab6 100644 --- a/mappings/net/minecraft/datafixers/fixes/ChunkStatusFix2.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3788 net/minecraft/datafixers/fixes/ChunkStatusFix2 +CLASS net/minecraft/class_3788 net/minecraft/datafixer/fix/ChunkStatusFix2 FIELD field_16691 statusMap Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/ChunkStructuresTemplateRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping similarity index 64% rename from mappings/net/minecraft/datafixers/fixes/ChunkStructuresTemplateRenameFix.mapping rename to mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping index 457d90b933..30024e6c70 100644 --- a/mappings/net/minecraft/datafixers/fixes/ChunkStructuresTemplateRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3590 net/minecraft/datafixers/fixes/ChunkStructuresTemplateRenameFix +CLASS net/minecraft/class_3590 net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix FIELD field_15889 structures Lcom/google/common/collect/ImmutableMap; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/EntityCatSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping similarity index 55% rename from mappings/net/minecraft/datafixers/fixes/EntityCatSplitFix.mapping rename to mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping index e3be62e3a7..72b45536d7 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityCatSplitFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3725 net/minecraft/datafixers/fixes/EntityCatSplitFix +CLASS net/minecraft/class_3591 net/minecraft/datafixer/fix/ChunkToProtoChunkFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BlockNameFlatteningFix.mapping b/mappings/net/minecraft/datafixer/fix/ColorlessShulkerEntityFix.mapping similarity index 53% rename from mappings/net/minecraft/datafixers/fixes/BlockNameFlatteningFix.mapping rename to mappings/net/minecraft/datafixer/fix/ColorlessShulkerEntityFix.mapping index 20b8b248c7..4def5c2c8a 100644 --- a/mappings/net/minecraft/datafixers/fixes/BlockNameFlatteningFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ColorlessShulkerEntityFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3578 net/minecraft/datafixers/fixes/BlockNameFlatteningFix +CLASS net/minecraft/class_3592 net/minecraft/datafixer/fix/ColorlessShulkerEntityFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityArmorStandSilentFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping similarity index 70% rename from mappings/net/minecraft/datafixers/fixes/EntityArmorStandSilentFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping index 96bdc67d11..5b697dfc6a 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityArmorStandSilentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3594 net/minecraft/datafixers/fixes/EntityArmorStandSilentFix +CLASS net/minecraft/class_3594 net/minecraft/datafixer/fix/EntityArmorStandSilentFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityBlockStateFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityBlockStateFix.mapping similarity index 88% rename from mappings/net/minecraft/datafixers/fixes/EntityBlockStateFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityBlockStateFix.mapping index 30c4bc40c6..9ae6efd3e9 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityBlockStateFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityBlockStateFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3595 net/minecraft/datafixers/fixes/EntityBlockStateFix +CLASS net/minecraft/class_3595 net/minecraft/datafixer/fix/EntityBlockStateFix FIELD field_15891 BLOCK_NAME_TO_ID Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/EntityCatSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityCatSplitFix.mapping new file mode 100644 index 0000000000..c3bbc23c67 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityCatSplitFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3725 net/minecraft/datafixer/fix/EntityCatSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityCodSalmonFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityCodSalmonFix.mapping similarity index 70% rename from mappings/net/minecraft/datafixers/fixes/EntityCodSalmonFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityCodSalmonFix.mapping index d2f6e519a1..eb00529db3 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityCodSalmonFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityCodSalmonFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3596 net/minecraft/datafixers/fixes/EntityCodSalmonFix +CLASS net/minecraft/class_3596 net/minecraft/datafixer/fix/EntityCodSalmonFix FIELD field_15892 ENTITIES Ljava/util/Map; FIELD field_15893 SPAWN_EGGS Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V diff --git a/mappings/net/minecraft/datafixers/fixes/EntityCustomNameToComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityCustomNameToComponentFix.mapping similarity index 69% rename from mappings/net/minecraft/datafixers/fixes/EntityCustomNameToComponentFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityCustomNameToComponentFix.mapping index 89bbd93927..43351d618d 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityCustomNameToComponentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityCustomNameToComponentFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3597 net/minecraft/datafixers/fixes/EntityCustomNameToComponentFix +CLASS net/minecraft/class_3597 net/minecraft/datafixer/fix/EntityCustomNameToComponentFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BlockEntityBlockStateFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityElderGuardianSplitFix.mapping similarity index 53% rename from mappings/net/minecraft/datafixers/fixes/BlockEntityBlockStateFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityElderGuardianSplitFix.mapping index c964808b8a..b4084345d2 100644 --- a/mappings/net/minecraft/datafixers/fixes/BlockEntityBlockStateFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityElderGuardianSplitFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3566 net/minecraft/datafixers/fixes/BlockEntityBlockStateFix +CLASS net/minecraft/class_3598 net/minecraft/datafixer/fix/EntityElderGuardianSplitFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityEquipmentToArmorAndHandFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping similarity index 68% rename from mappings/net/minecraft/datafixers/fixes/EntityEquipmentToArmorAndHandFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping index e679215372..175b4fb864 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityEquipmentToArmorAndHandFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3599 net/minecraft/datafixers/fixes/EntityEquipmentToArmorAndHandFix +CLASS net/minecraft/class_3599 net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityHealthFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping similarity index 76% rename from mappings/net/minecraft/datafixers/fixes/EntityHealthFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping index a18c040e5b..8428231d11 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityHealthFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3600 net/minecraft/datafixers/fixes/EntityHealthFix +CLASS net/minecraft/class_3600 net/minecraft/datafixer/fix/EntityHealthFix FIELD field_15894 ENTITIES Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/BedBlockEntityFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityHorseSaddleFix.mapping similarity index 55% rename from mappings/net/minecraft/datafixers/fixes/BedBlockEntityFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityHorseSaddleFix.mapping index f5ee318892..e56e3693ca 100644 --- a/mappings/net/minecraft/datafixers/fixes/BedBlockEntityFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityHorseSaddleFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3557 net/minecraft/datafixers/fixes/BedBlockEntityFix +CLASS net/minecraft/class_3601 net/minecraft/datafixer/fix/EntityHorseSaddleFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityHorseSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityHorseSplitFix.mapping new file mode 100644 index 0000000000..1c528ea4aa --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityHorseSplitFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3602 net/minecraft/datafixer/fix/EntityHorseSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityIdFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityIdFix.mapping similarity index 67% rename from mappings/net/minecraft/datafixers/fixes/EntityIdFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityIdFix.mapping index c33badc37a..582b083eb7 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityIdFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3603 net/minecraft/datafixers/fixes/EntityIdFix +CLASS net/minecraft/class_3603 net/minecraft/datafixer/fix/EntityIdFix FIELD field_15895 RENAMED_ENTITIES Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/EntityItemFrameDirectionFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping similarity index 72% rename from mappings/net/minecraft/datafixers/fixes/EntityItemFrameDirectionFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping index aa17dc9f07..fa1520c582 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityItemFrameDirectionFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3604 net/minecraft/datafixers/fixes/EntityItemFrameDirectionFix +CLASS net/minecraft/class_3604 net/minecraft/datafixer/fix/EntityItemFrameDirectionFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityMinecartIdentifiersFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityMinecartIdentifiersFix.mapping similarity index 61% rename from mappings/net/minecraft/datafixers/fixes/EntityMinecartIdentifiersFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityMinecartIdentifiersFix.mapping index 7a1218cf0a..349bfe8311 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityMinecartIdentifiersFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityMinecartIdentifiersFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3605 net/minecraft/datafixers/fixes/EntityMinecartIdentifiersFix +CLASS net/minecraft/class_3605 net/minecraft/datafixer/fix/EntityMinecartIdentifiersFix FIELD field_15896 MINECARTS Ljava/util/List; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/EntityPaintingMotiveFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping similarity index 63% rename from mappings/net/minecraft/datafixers/fixes/EntityPaintingMotiveFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping index aba219e4ec..cdd2e13f4b 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityPaintingMotiveFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3607 net/minecraft/datafixers/fixes/EntityPaintingMotiveFix +CLASS net/minecraft/class_3607 net/minecraft/datafixer/fix/EntityPaintingMotiveFix FIELD field_15898 RENAMED_MOTIVES Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/EntityPufferfishRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityPufferfishRenameFix.mapping similarity index 62% rename from mappings/net/minecraft/datafixers/fixes/EntityPufferfishRenameFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityPufferfishRenameFix.mapping index 5dbe0f7771..4d64b34ddc 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityPufferfishRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityPufferfishRenameFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3608 net/minecraft/datafixers/fixes/EntityPufferfishRenameFix +CLASS net/minecraft/class_3608 net/minecraft/datafixer/fix/EntityPufferfishRenameFix FIELD field_15899 RENAMED_FISHES Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/EntityRavagerRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityRavagerRenameFix.mapping similarity index 62% rename from mappings/net/minecraft/datafixers/fixes/EntityRavagerRenameFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityRavagerRenameFix.mapping index 03a4765720..a0b3085edf 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityRavagerRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityRavagerRenameFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3983 net/minecraft/datafixers/fixes/EntityRavagerRenameFix +CLASS net/minecraft/class_3983 net/minecraft/datafixer/fix/EntityRavagerRenameFix FIELD field_17712 ITEMS Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping new file mode 100644 index 0000000000..d90970e6da --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1165 net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityRenameFix.mapping similarity index 76% rename from mappings/net/minecraft/datafixers/fixes/EntityRenameFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityRenameFix.mapping index 6805b8475d..ebdf908c27 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityRenameFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1211 net/minecraft/datafixers/fixes/EntityRenameFix +CLASS net/minecraft/class_1211 net/minecraft/datafixer/fix/EntityRenameFix FIELD field_5734 name Ljava/lang/String; METHOD (Ljava/lang/String;Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 name diff --git a/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping new file mode 100644 index 0000000000..0db2e18f59 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1166 net/minecraft/datafixer/fix/EntityRidingToPassengerFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping new file mode 100644 index 0000000000..528081c0ce --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1169 net/minecraft/datafixer/fix/EntityShulkerColorFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntitySimpleTransformFix.mapping b/mappings/net/minecraft/datafixer/fix/EntitySimpleTransformFix.mapping similarity index 74% rename from mappings/net/minecraft/datafixers/fixes/EntitySimpleTransformFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntitySimpleTransformFix.mapping index 7ecc35ba81..57cd5842f7 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntitySimpleTransformFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntitySimpleTransformFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1212 net/minecraft/datafixers/fixes/EntitySimpleTransformFix +CLASS net/minecraft/class_1212 net/minecraft/datafixer/fix/EntitySimpleTransformFix METHOD (Ljava/lang/String;Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 name ARG 2 oldSchema diff --git a/mappings/net/minecraft/datafixer/fix/EntitySkeletonSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/EntitySkeletonSplitFix.mapping new file mode 100644 index 0000000000..86a8d36b51 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntitySkeletonSplitFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1168 net/minecraft/datafixer/fix/EntitySkeletonSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityStringUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityStringUuidFix.mapping new file mode 100644 index 0000000000..033c82072a --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityStringUuidFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1171 net/minecraft/datafixer/fix/EntityStringUuidFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityTheRenameningBlock.mapping b/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlock.mapping similarity index 71% rename from mappings/net/minecraft/datafixers/fixes/EntityTheRenameningBlock.mapping rename to mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlock.mapping index 47a8f34712..9617217bef 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityTheRenameningBlock.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlock.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1170 net/minecraft/datafixers/fixes/EntityTheRenameningBlock +CLASS net/minecraft/class_1170 net/minecraft/datafixer/fix/EntityTheRenameningBlock FIELD field_5671 ENTITIES Ljava/util/Map; FIELD field_5672 BLOCKS Ljava/util/Map; FIELD field_5673 ITEMS Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/fix/EntityTippedArrowFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityTippedArrowFix.mapping new file mode 100644 index 0000000000..7c860016a9 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityTippedArrowFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1173 net/minecraft/datafixer/fix/EntityTippedArrowFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityTransformFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityTransformFix.mapping similarity index 84% rename from mappings/net/minecraft/datafixers/fixes/EntityTransformFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityTransformFix.mapping index bdd497f833..30d1408223 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityTransformFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityTransformFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1167 net/minecraft/datafixers/fixes/EntityTransformFix +CLASS net/minecraft/class_1167 net/minecraft/datafixer/fix/EntityTransformFix FIELD field_5670 name Ljava/lang/String; METHOD (Ljava/lang/String;Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 name diff --git a/mappings/net/minecraft/datafixers/fixes/EntityWolfColorFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping similarity index 72% rename from mappings/net/minecraft/datafixers/fixes/EntityWolfColorFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping index 9724d4ac75..a5c2c18eb3 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityWolfColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1172 net/minecraft/datafixers/fixes/EntityWolfColorFix +CLASS net/minecraft/class_1172 net/minecraft/datafixer/fix/EntityWolfColorFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityZombieSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityZombieSplitFix.mapping new file mode 100644 index 0000000000..de17bfd18a --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityZombieSplitFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1175 net/minecraft/datafixer/fix/EntityZombieSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityZombieVillagerTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping similarity index 77% rename from mappings/net/minecraft/datafixers/fixes/EntityZombieVillagerTypeFix.mapping rename to mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping index 9e5f656d47..506b5272cb 100644 --- a/mappings/net/minecraft/datafixers/fixes/EntityZombieVillagerTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1174 net/minecraft/datafixers/fixes/EntityZombieVillagerTypeFix +CLASS net/minecraft/class_1174 net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix FIELD field_5674 RANDOM Ljava/util/Random; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/HangingEntityFix.mapping b/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping similarity index 78% rename from mappings/net/minecraft/datafixers/fixes/HangingEntityFix.mapping rename to mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping index 00ef5d17e5..22d49b9baa 100644 --- a/mappings/net/minecraft/datafixers/fixes/HangingEntityFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3606 net/minecraft/datafixers/fixes/HangingEntityFix +CLASS net/minecraft/class_3606 net/minecraft/datafixer/fix/HangingEntityFix FIELD field_15897 OFFSETS [[I METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/HeightmapRenamingFix.mapping b/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping similarity index 72% rename from mappings/net/minecraft/datafixers/fixes/HeightmapRenamingFix.mapping rename to mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping index 3f3722cab4..c2146a40c0 100644 --- a/mappings/net/minecraft/datafixers/fixes/HeightmapRenamingFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1177 net/minecraft/datafixers/fixes/HeightmapRenamingFix +CLASS net/minecraft/class_1177 net/minecraft/datafixer/fix/HeightmapRenamingFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/IglooMetadataRemovalFix.mapping b/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping similarity index 82% rename from mappings/net/minecraft/datafixers/fixes/IglooMetadataRemovalFix.mapping rename to mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping index 9fe712581d..2b9c882d52 100644 --- a/mappings/net/minecraft/datafixers/fixes/IglooMetadataRemovalFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1176 net/minecraft/datafixers/fixes/IglooMetadataRemovalFix +CLASS net/minecraft/class_1176 net/minecraft/datafixer/fix/IglooMetadataRemovalFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ItemBannerColorFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemBannerColorFix.mapping new file mode 100644 index 0000000000..2cadb90d31 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ItemBannerColorFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1179 net/minecraft/datafixer/fix/ItemBannerColorFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ItemCustomNameToComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping similarity index 69% rename from mappings/net/minecraft/datafixers/fixes/ItemCustomNameToComponentFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping index af42d55181..5c7d2aaa7a 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemCustomNameToComponentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1178 net/minecraft/datafixers/fixes/ItemCustomNameToComponentFix +CLASS net/minecraft/class_1178 net/minecraft/datafixer/fix/ItemCustomNameToComponentFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ItemIdFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemIdFix.mapping similarity index 77% rename from mappings/net/minecraft/datafixers/fixes/ItemIdFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemIdFix.mapping index 20f88a00b9..93f2574636 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemIdFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1181 net/minecraft/datafixers/fixes/ItemIdFix +CLASS net/minecraft/class_1181 net/minecraft/datafixer/fix/ItemIdFix FIELD field_5675 NUMERICAL_ID_TO_STRING_ID_MAP Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/ItemInstanceMapIdFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemInstanceMapIdFix.mapping new file mode 100644 index 0000000000..652441cf0d --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ItemInstanceMapIdFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1186 net/minecraft/datafixer/fix/ItemInstanceMapIdFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ItemInstanceSpawnEggFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemInstanceSpawnEggFix.mapping similarity index 63% rename from mappings/net/minecraft/datafixers/fixes/ItemInstanceSpawnEggFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemInstanceSpawnEggFix.mapping index 2bc852eb8e..cac2ec8d0c 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemInstanceSpawnEggFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemInstanceSpawnEggFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1189 net/minecraft/datafixers/fixes/ItemInstanceSpawnEggFix +CLASS net/minecraft/class_1189 net/minecraft/datafixer/fix/ItemInstanceSpawnEggFix FIELD field_5685 ENTITY_SPAWN_EGGS Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/ItemInstanceTheFlatteningFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemInstanceTheFlatteningFix.mapping similarity index 79% rename from mappings/net/minecraft/datafixers/fixes/ItemInstanceTheFlatteningFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemInstanceTheFlatteningFix.mapping index 735c1e9ed8..02f4d47947 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemInstanceTheFlatteningFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemInstanceTheFlatteningFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1188 net/minecraft/datafixers/fixes/ItemInstanceTheFlatteningFix +CLASS net/minecraft/class_1188 net/minecraft/datafixer/fix/ItemInstanceTheFlatteningFix FIELD field_5682 DAMAGABLE_ITEMS Ljava/util/Set; FIELD field_5683 ORIGINAL_ITEM_NAMES Ljava/util/Set; FIELD field_5684 FLATTENING_MAP Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixers/fixes/ItemLoreToComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemLoreToComponentFix.mapping similarity index 76% rename from mappings/net/minecraft/datafixers/fixes/ItemLoreToComponentFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemLoreToComponentFix.mapping index 33dea0ca07..fd30fa717a 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemLoreToComponentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemLoreToComponentFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1180 net/minecraft/datafixers/fixes/ItemLoreToComponentFix +CLASS net/minecraft/class_1180 net/minecraft/datafixer/fix/ItemLoreToComponentFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/FixItemName.mapping b/mappings/net/minecraft/datafixer/fix/ItemNameFix.mapping similarity index 84% rename from mappings/net/minecraft/datafixers/fixes/FixItemName.mapping rename to mappings/net/minecraft/datafixer/fix/ItemNameFix.mapping index 1935cdb74c..62faafcc1a 100644 --- a/mappings/net/minecraft/datafixers/fixes/FixItemName.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemNameFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1182 net/minecraft/datafixers/fixes/FixItemName +CLASS net/minecraft/class_1182 net/minecraft/datafixer/fix/ItemNameFix FIELD field_5676 name Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/ItemPotionFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemPotionFix.mapping similarity index 66% rename from mappings/net/minecraft/datafixers/fixes/ItemPotionFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemPotionFix.mapping index e539b0e33e..668ef8480d 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemPotionFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemPotionFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1183 net/minecraft/datafixers/fixes/ItemPotionFix +CLASS net/minecraft/class_1183 net/minecraft/datafixer/fix/ItemPotionFix FIELD field_5678 ID_TO_POTIONS [Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/ItemShulkerBoxColorFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemShulkerBoxColorFix.mapping similarity index 65% rename from mappings/net/minecraft/datafixers/fixes/ItemShulkerBoxColorFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemShulkerBoxColorFix.mapping index 3792a9b799..d17264ea97 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemShulkerBoxColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemShulkerBoxColorFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1185 net/minecraft/datafixers/fixes/ItemShulkerBoxColorFix +CLASS net/minecraft/class_1185 net/minecraft/datafixer/fix/ItemShulkerBoxColorFix FIELD field_5680 COLORED_SHULKER_BOX_IDS [Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/ItemSpawnEggFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping similarity index 66% rename from mappings/net/minecraft/datafixers/fixes/ItemSpawnEggFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping index 8f8b4a494a..d4e9d8cc35 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemSpawnEggFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1184 net/minecraft/datafixers/fixes/ItemSpawnEggFix +CLASS net/minecraft/class_1184 net/minecraft/datafixer/fix/ItemSpawnEggFix FIELD field_5679 DAMAGE_TO_ENTITY_IDS [Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/ItemStackEnchantmentFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping similarity index 77% rename from mappings/net/minecraft/datafixers/fixes/ItemStackEnchantmentFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping index 5ee6cfa29f..65ad7d8ee8 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemStackEnchantmentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1187 net/minecraft/datafixers/fixes/ItemStackEnchantmentFix +CLASS net/minecraft/class_1187 net/minecraft/datafixer/fix/ItemStackEnchantmentFix FIELD field_5681 ID_TO_ENCHANTMENTS_MAP Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/ItemWaterPotionFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemWaterPotionFix.mapping new file mode 100644 index 0000000000..32f58a032c --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ItemWaterPotionFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1190 net/minecraft/datafixer/fix/ItemWaterPotionFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ItemWrittenBookPagesStrictJsonFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping similarity index 68% rename from mappings/net/minecraft/datafixers/fixes/ItemWrittenBookPagesStrictJsonFix.mapping rename to mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping index b0337c8f73..7bb0805bc6 100644 --- a/mappings/net/minecraft/datafixers/fixes/ItemWrittenBookPagesStrictJsonFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1194 net/minecraft/datafixers/fixes/ItemWrittenBookPagesStrictJsonFix +CLASS net/minecraft/class_1194 net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping b/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping new file mode 100644 index 0000000000..1fd4274bd0 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1191 net/minecraft/datafixer/fix/LeavesFix diff --git a/mappings/net/minecraft/datafixers/fixes/LevelDataGeneratorOptionsFix.mapping b/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping similarity index 85% rename from mappings/net/minecraft/datafixers/fixes/LevelDataGeneratorOptionsFix.mapping rename to mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping index ce32d9683c..7fae0ff980 100644 --- a/mappings/net/minecraft/datafixers/fixes/LevelDataGeneratorOptionsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1196 net/minecraft/datafixers/fixes/LevelDataGeneratorOptionsFix +CLASS net/minecraft/class_1196 net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix FIELD field_5702 NUMERICAL_IDS_TO_BIOME_IDS Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/LevelFlatGeneratorInfoFix.mapping b/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping similarity index 88% rename from mappings/net/minecraft/datafixers/fixes/LevelFlatGeneratorInfoFix.mapping rename to mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping index 153ebf7a8e..c58bd0aa43 100644 --- a/mappings/net/minecraft/datafixers/fixes/LevelFlatGeneratorInfoFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1195 net/minecraft/datafixers/fixes/LevelFlatGeneratorInfoFix +CLASS net/minecraft/class_1195 net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix FIELD field_5697 SPLIT_ON_COLON Lcom/google/common/base/Splitter; FIELD field_5698 SPLIT_ON_ASTERISK Lcom/google/common/base/Splitter; FIELD field_5699 SPLIT_ON_LOWER_X Lcom/google/common/base/Splitter; diff --git a/mappings/net/minecraft/datafixers/fixes/MapIdFix.mapping b/mappings/net/minecraft/datafixer/fix/MapIdFix.mapping similarity index 58% rename from mappings/net/minecraft/datafixers/fixes/MapIdFix.mapping rename to mappings/net/minecraft/datafixer/fix/MapIdFix.mapping index 577bac8c73..acb300d073 100644 --- a/mappings/net/minecraft/datafixers/fixes/MapIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/MapIdFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3970 net/minecraft/datafixers/fixes/MapIdFix +CLASS net/minecraft/class_3970 net/minecraft/datafixer/fix/MapIdFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/MobSpawnerEntityIdentifiersFix.mapping b/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping similarity index 69% rename from mappings/net/minecraft/datafixers/fixes/MobSpawnerEntityIdentifiersFix.mapping rename to mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping index 186db1efed..e83ff1e821 100644 --- a/mappings/net/minecraft/datafixers/fixes/MobSpawnerEntityIdentifiersFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1198 net/minecraft/datafixers/fixes/MobSpawnerEntityIdentifiersFix +CLASS net/minecraft/class_1198 net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/NewVillageFix.mapping b/mappings/net/minecraft/datafixer/fix/NewVillageFix.mapping similarity index 56% rename from mappings/net/minecraft/datafixers/fixes/NewVillageFix.mapping rename to mappings/net/minecraft/datafixer/fix/NewVillageFix.mapping index 8280e1f6f5..78d7a27081 100644 --- a/mappings/net/minecraft/datafixers/fixes/NewVillageFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/NewVillageFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3904 net/minecraft/datafixers/fixes/NewVillageFix +CLASS net/minecraft/class_3904 net/minecraft/datafixer/fix/NewVillageFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ObjectiveDisplayNameFix.mapping b/mappings/net/minecraft/datafixer/fix/ObjectiveDisplayNameFix.mapping new file mode 100644 index 0000000000..405dd157da --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ObjectiveDisplayNameFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1200 net/minecraft/datafixer/fix/ObjectiveDisplayNameFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ObjectiveRenderTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping similarity index 71% rename from mappings/net/minecraft/datafixers/fixes/ObjectiveRenderTypeFix.mapping rename to mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping index c01d13ba95..924c41fcb5 100644 --- a/mappings/net/minecraft/datafixers/fixes/ObjectiveRenderTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1199 net/minecraft/datafixers/fixes/ObjectiveRenderTypeFix +CLASS net/minecraft/class_1199 net/minecraft/datafixer/fix/ObjectiveRenderTypeFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/OminousBannerBlockEntityRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping similarity index 67% rename from mappings/net/minecraft/datafixers/fixes/OminousBannerBlockEntityRenameFix.mapping rename to mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping index 1ccf46ec3b..9e45e8e53b 100644 --- a/mappings/net/minecraft/datafixers/fixes/OminousBannerBlockEntityRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4299 net/minecraft/datafixers/fixes/OminousBannerBlockEntityRenameFix +CLASS net/minecraft/class_4299 net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/OminousBannerItemRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping similarity index 70% rename from mappings/net/minecraft/datafixers/fixes/OminousBannerItemRenameFix.mapping rename to mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping index 11e4ffe9a1..b37ffc39f1 100644 --- a/mappings/net/minecraft/datafixers/fixes/OminousBannerItemRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4294 net/minecraft/datafixers/fixes/OminousBannerItemRenameFix +CLASS net/minecraft/class_4294 net/minecraft/datafixer/fix/OminousBannerItemRenameFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/OptionsAddTextBackgroundFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsAddTextBackgroundFix.mapping similarity index 68% rename from mappings/net/minecraft/datafixers/fixes/OptionsAddTextBackgroundFix.mapping rename to mappings/net/minecraft/datafixer/fix/OptionsAddTextBackgroundFix.mapping index c4d8786379..d7d507169e 100644 --- a/mappings/net/minecraft/datafixers/fixes/OptionsAddTextBackgroundFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OptionsAddTextBackgroundFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4092 net/minecraft/datafixers/fixes/OptionsAddTextBackgroundFix +CLASS net/minecraft/class_4092 net/minecraft/datafixer/fix/OptionsAddTextBackgroundFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/OptionsForceVBOFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsForceVBOFix.mapping new file mode 100644 index 0000000000..07f4b6c53c --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/OptionsForceVBOFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1202 net/minecraft/datafixer/fix/OptionsForceVBOFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/OptionsKeyLwjgl3Fix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping similarity index 69% rename from mappings/net/minecraft/datafixers/fixes/OptionsKeyLwjgl3Fix.mapping rename to mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping index ef7ebf21c9..15fbd2f724 100644 --- a/mappings/net/minecraft/datafixers/fixes/OptionsKeyLwjgl3Fix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1201 net/minecraft/datafixers/fixes/OptionsKeyLwjgl3Fix +CLASS net/minecraft/class_1201 net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix FIELD field_5706 NUMERICAL_KEY_IDS_TO_KEY_NAMES Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/OptionsKeyTranslationFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsKeyTranslationFix.mapping new file mode 100644 index 0000000000..617e4642ef --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/OptionsKeyTranslationFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1204 net/minecraft/datafixer/fix/OptionsKeyTranslationFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/OptionsLowerCaseLanguageFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsLowerCaseLanguageFix.mapping new file mode 100644 index 0000000000..c46a3a3570 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/OptionsLowerCaseLanguageFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1203 net/minecraft/datafixer/fix/OptionsLowerCaseLanguageFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/PointOfInterestReorganizationFix.mapping b/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping similarity index 68% rename from mappings/net/minecraft/datafixers/fixes/PointOfInterestReorganizationFix.mapping rename to mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping index 86c45e46ea..5805506d0e 100644 --- a/mappings/net/minecraft/datafixers/fixes/PointOfInterestReorganizationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4285 net/minecraft/datafixers/fixes/PointOfInterestReorganizationFix +CLASS net/minecraft/class_4285 net/minecraft/datafixer/fix/PointOfInterestReorganizationFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/RecipeFix.mapping b/mappings/net/minecraft/datafixer/fix/RecipeFix.mapping similarity index 66% rename from mappings/net/minecraft/datafixers/fixes/RecipeFix.mapping rename to mappings/net/minecraft/datafixer/fix/RecipeFix.mapping index 21955ad581..543eaf9608 100644 --- a/mappings/net/minecraft/datafixers/fixes/RecipeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RecipeFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1206 net/minecraft/datafixers/fixes/RecipeFix +CLASS net/minecraft/class_1206 net/minecraft/datafixer/fix/RecipeFix FIELD field_5708 recipes Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/RecipeRenamingFix.mapping b/mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping similarity index 63% rename from mappings/net/minecraft/datafixers/fixes/RecipeRenamingFix.mapping rename to mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping index c97ddefd0a..4a2343e2c5 100644 --- a/mappings/net/minecraft/datafixers/fixes/RecipeRenamingFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1205 net/minecraft/datafixers/fixes/RecipeRenamingFix +CLASS net/minecraft/class_1205 net/minecraft/datafixer/fix/RecipeRenamingFix FIELD field_5707 recipes Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/SavedDataVillageCropFix.mapping b/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping similarity index 90% rename from mappings/net/minecraft/datafixers/fixes/SavedDataVillageCropFix.mapping rename to mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping index 759dbfde62..637b1b0c6d 100644 --- a/mappings/net/minecraft/datafixers/fixes/SavedDataVillageCropFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1209 net/minecraft/datafixers/fixes/SavedDataVillageCropFix +CLASS net/minecraft/class_1209 net/minecraft/datafixer/fix/SavedDataVillageCropFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/StatsCounterFix.mapping b/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping similarity index 86% rename from mappings/net/minecraft/datafixers/fixes/StatsCounterFix.mapping rename to mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping index 3a204c57de..23a2c5515f 100644 --- a/mappings/net/minecraft/datafixers/fixes/StatsCounterFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1214 net/minecraft/datafixers/fixes/StatsCounterFix +CLASS net/minecraft/class_1214 net/minecraft/datafixer/fix/StatsCounterFix FIELD field_5735 RENAMED_ENTITIES Ljava/util/Map; FIELD field_5736 RENAMED_ENTITY_STATS Ljava/util/Map; FIELD field_5737 RENAMED_GENERAL_STATS Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/fix/SwimStatsRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/SwimStatsRenameFix.mapping new file mode 100644 index 0000000000..b98d95cad8 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/SwimStatsRenameFix.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1213 net/minecraft/datafixer/fix/SwimStatsRenameFix diff --git a/mappings/net/minecraft/datafixer/fix/TeamDisplayNameFix.mapping b/mappings/net/minecraft/datafixer/fix/TeamDisplayNameFix.mapping new file mode 100644 index 0000000000..5e5585ac38 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/TeamDisplayNameFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1217 net/minecraft/datafixer/fix/TeamDisplayNameFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/VillagerProfessionFix.mapping b/mappings/net/minecraft/datafixer/fix/VillagerProfessionFix.mapping similarity index 70% rename from mappings/net/minecraft/datafixers/fixes/VillagerProfessionFix.mapping rename to mappings/net/minecraft/datafixer/fix/VillagerProfessionFix.mapping index a979f69650..dfe151cd26 100644 --- a/mappings/net/minecraft/datafixers/fixes/VillagerProfessionFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/VillagerProfessionFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3845 net/minecraft/datafixers/fixes/VillagerProfessionFix +CLASS net/minecraft/class_3845 net/minecraft/datafixer/fix/VillagerProfessionFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V ARG 1 outputSchema METHOD method_16897 convertProfessionId (II)Ljava/lang/String; diff --git a/mappings/net/minecraft/datafixers/fixes/VillagerTradeFix.mapping b/mappings/net/minecraft/datafixer/fix/VillagerTradeFix.mapping similarity index 74% rename from mappings/net/minecraft/datafixers/fixes/VillagerTradeFix.mapping rename to mappings/net/minecraft/datafixer/fix/VillagerTradeFix.mapping index 9c98d60f14..8cd302ba83 100644 --- a/mappings/net/minecraft/datafixers/fixes/VillagerTradeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/VillagerTradeFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1219 net/minecraft/datafixers/fixes/VillagerTradeFix +CLASS net/minecraft/class_1219 net/minecraft/datafixer/fix/VillagerTradeFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/VillagerXpRebuildFix.mapping b/mappings/net/minecraft/datafixer/fix/VillagerXpRebuildFix.mapping similarity index 50% rename from mappings/net/minecraft/datafixers/fixes/VillagerXpRebuildFix.mapping rename to mappings/net/minecraft/datafixer/fix/VillagerXpRebuildFix.mapping index 9f5a52564f..fb6d1fdaef 100644 --- a/mappings/net/minecraft/datafixers/fixes/VillagerXpRebuildFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/VillagerXpRebuildFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4300 net/minecraft/datafixers/fixes/VillagerXpRebuildFix +CLASS net/minecraft/class_4300 net/minecraft/datafixer/fix/VillagerXpRebuildFix FIELD field_19285 LEVEL_TO_XP [I METHOD method_20482 levelToXp (I)I ARG 0 level diff --git a/mappings/net/minecraft/datafixers/fixes/WriteAndReadFix.mapping b/mappings/net/minecraft/datafixer/fix/WriteAndReadFix.mapping similarity index 77% rename from mappings/net/minecraft/datafixers/fixes/WriteAndReadFix.mapping rename to mappings/net/minecraft/datafixer/fix/WriteAndReadFix.mapping index e4b2d9090c..af619c6278 100644 --- a/mappings/net/minecraft/datafixers/fixes/WriteAndReadFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/WriteAndReadFix.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1218 net/minecraft/datafixers/fixes/WriteAndReadFix +CLASS net/minecraft/class_1218 net/minecraft/datafixer/fix/WriteAndReadFix FIELD field_5742 name Ljava/lang/String; FIELD field_5743 type Lcom/mojang/datafixers/DSL$TypeReference; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;)V diff --git a/mappings/net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix.mapping b/mappings/net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix.mapping new file mode 100644 index 0000000000..a6fdfe3b59 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4301 net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/mapping/LegacyCoralBlockMapping.mapping b/mappings/net/minecraft/datafixer/mapping/LegacyCoralBlockMapping.mapping new file mode 100644 index 0000000000..5cfae67ba3 --- /dev/null +++ b/mappings/net/minecraft/datafixer/mapping/LegacyCoralBlockMapping.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1210 net/minecraft/datafixer/mapping/LegacyCoralBlockMapping + FIELD field_5733 MAP Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/mapping/LegacyCoralFanBlockMapping.mapping b/mappings/net/minecraft/datafixer/mapping/LegacyCoralFanBlockMapping.mapping new file mode 100644 index 0000000000..b8fe555b6f --- /dev/null +++ b/mappings/net/minecraft/datafixer/mapping/LegacyCoralFanBlockMapping.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1207 net/minecraft/datafixer/mapping/LegacyCoralFanBlockMapping + FIELD field_5709 MAP Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/mapping/LegacyDyeItemMapping.mapping b/mappings/net/minecraft/datafixer/mapping/LegacyDyeItemMapping.mapping new file mode 100644 index 0000000000..fcf141ee19 --- /dev/null +++ b/mappings/net/minecraft/datafixer/mapping/LegacyDyeItemMapping.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_3593 net/minecraft/datafixer/mapping/LegacyDyeItemMapping + FIELD field_15890 MAP Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping b/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping new file mode 100644 index 0000000000..9a95195273 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1220 net/minecraft/datafixer/schema/IdentifierNormalizingSchema + METHOD method_5193 normalize (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id diff --git a/mappings/net/minecraft/datafixer/schema/Schema100.mapping b/mappings/net/minecraft/datafixer/schema/Schema100.mapping new file mode 100644 index 0000000000..00696c9b12 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema100.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1222 net/minecraft/datafixer/schema/Schema100 diff --git a/mappings/net/minecraft/datafixer/schema/Schema102.mapping b/mappings/net/minecraft/datafixer/schema/Schema102.mapping new file mode 100644 index 0000000000..4e877415df --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema102.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1221 net/minecraft/datafixer/schema/Schema102 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1022.mapping b/mappings/net/minecraft/datafixer/schema/Schema1022.mapping new file mode 100644 index 0000000000..32bb3cf13f --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1022.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1224 net/minecraft/datafixer/schema/Schema1022 diff --git a/mappings/net/minecraft/datafixer/schema/Schema106.mapping b/mappings/net/minecraft/datafixer/schema/Schema106.mapping new file mode 100644 index 0000000000..13b3fad897 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema106.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1223 net/minecraft/datafixer/schema/Schema106 diff --git a/mappings/net/minecraft/datafixer/schema/Schema107.mapping b/mappings/net/minecraft/datafixer/schema/Schema107.mapping new file mode 100644 index 0000000000..4253970abd --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema107.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1226 net/minecraft/datafixer/schema/Schema107 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1125.mapping b/mappings/net/minecraft/datafixer/schema/Schema1125.mapping new file mode 100644 index 0000000000..3d78454ee7 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1125.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1225 net/minecraft/datafixer/schema/Schema1125 diff --git a/mappings/net/minecraft/datafixer/schema/Schema135.mapping b/mappings/net/minecraft/datafixer/schema/Schema135.mapping new file mode 100644 index 0000000000..c9088a590a --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema135.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1228 net/minecraft/datafixer/schema/Schema135 diff --git a/mappings/net/minecraft/datafixer/schema/Schema143.mapping b/mappings/net/minecraft/datafixer/schema/Schema143.mapping new file mode 100644 index 0000000000..fe3459e5b1 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema143.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1227 net/minecraft/datafixer/schema/Schema143 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451.mapping new file mode 100644 index 0000000000..f847809873 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1451.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1230 net/minecraft/datafixer/schema/Schema1451 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v1.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v1.mapping new file mode 100644 index 0000000000..77997d0a24 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v1.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1229 net/minecraft/datafixer/schema/Schema1451v1 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v2.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v2.mapping new file mode 100644 index 0000000000..5e718bdea1 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v2.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1232 net/minecraft/datafixer/schema/Schema1451v2 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v3.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v3.mapping new file mode 100644 index 0000000000..ccf7d4b65e --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v3.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1231 net/minecraft/datafixer/schema/Schema1451v3 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v4.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v4.mapping new file mode 100644 index 0000000000..4f04969b53 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v4.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1234 net/minecraft/datafixer/schema/Schema1451v4 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v5.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v5.mapping new file mode 100644 index 0000000000..a84a87b477 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v5.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1233 net/minecraft/datafixer/schema/Schema1451v5 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping new file mode 100644 index 0000000000..a24f251994 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1236 net/minecraft/datafixer/schema/Schema1451v6 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping new file mode 100644 index 0000000000..b00dd9056d --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1235 net/minecraft/datafixer/schema/Schema1451v7 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1460.mapping b/mappings/net/minecraft/datafixer/schema/Schema1460.mapping new file mode 100644 index 0000000000..3af1541a4f --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1460.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1238 net/minecraft/datafixer/schema/Schema1460 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1466.mapping b/mappings/net/minecraft/datafixer/schema/Schema1466.mapping new file mode 100644 index 0000000000..24fda49fc7 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1466.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1237 net/minecraft/datafixer/schema/Schema1466 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1470.mapping b/mappings/net/minecraft/datafixer/schema/Schema1470.mapping new file mode 100644 index 0000000000..e6e4ca6a7e --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1470.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1240 net/minecraft/datafixer/schema/Schema1470 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1481.mapping b/mappings/net/minecraft/datafixer/schema/Schema1481.mapping new file mode 100644 index 0000000000..03b8cb91fd --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1481.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1239 net/minecraft/datafixer/schema/Schema1481 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1483.mapping b/mappings/net/minecraft/datafixer/schema/Schema1483.mapping new file mode 100644 index 0000000000..4c43ce5d79 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1483.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1242 net/minecraft/datafixer/schema/Schema1483 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1486.mapping b/mappings/net/minecraft/datafixer/schema/Schema1486.mapping new file mode 100644 index 0000000000..43ee161c9e --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1486.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1241 net/minecraft/datafixer/schema/Schema1486 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1510.mapping b/mappings/net/minecraft/datafixer/schema/Schema1510.mapping new file mode 100644 index 0000000000..682c4fd27d --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1510.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1243 net/minecraft/datafixer/schema/Schema1510 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1800.mapping b/mappings/net/minecraft/datafixer/schema/Schema1800.mapping new file mode 100644 index 0000000000..2e7e6c474d --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1800.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1245 net/minecraft/datafixer/schema/Schema1800 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1801.mapping b/mappings/net/minecraft/datafixer/schema/Schema1801.mapping new file mode 100644 index 0000000000..013af4dfa7 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1801.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1244 net/minecraft/datafixer/schema/Schema1801 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1904.mapping b/mappings/net/minecraft/datafixer/schema/Schema1904.mapping new file mode 100644 index 0000000000..0791623ecd --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1904.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3686 net/minecraft/datafixer/schema/Schema1904 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1906.mapping b/mappings/net/minecraft/datafixer/schema/Schema1906.mapping new file mode 100644 index 0000000000..fa066f0652 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1906.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3687 net/minecraft/datafixer/schema/Schema1906 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1909.mapping b/mappings/net/minecraft/datafixer/schema/Schema1909.mapping new file mode 100644 index 0000000000..1a130eec41 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1909.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3743 net/minecraft/datafixer/schema/Schema1909 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1920.mapping b/mappings/net/minecraft/datafixer/schema/Schema1920.mapping new file mode 100644 index 0000000000..90f50d847e --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1920.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3905 net/minecraft/datafixer/schema/Schema1920 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1928.mapping b/mappings/net/minecraft/datafixer/schema/Schema1928.mapping new file mode 100644 index 0000000000..a567fc52b7 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1928.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3984 net/minecraft/datafixer/schema/Schema1928 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1929.mapping b/mappings/net/minecraft/datafixer/schema/Schema1929.mapping new file mode 100644 index 0000000000..148b145381 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1929.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3985 net/minecraft/datafixer/schema/Schema1929 diff --git a/mappings/net/minecraft/datafixer/schema/Schema1931.mapping b/mappings/net/minecraft/datafixer/schema/Schema1931.mapping new file mode 100644 index 0000000000..5fca515ec2 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1931.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4016 net/minecraft/datafixer/schema/Schema1931 diff --git a/mappings/net/minecraft/datafixer/schema/Schema501.mapping b/mappings/net/minecraft/datafixer/schema/Schema501.mapping new file mode 100644 index 0000000000..b2cf148329 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema501.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1247 net/minecraft/datafixer/schema/Schema501 diff --git a/mappings/net/minecraft/datafixer/schema/Schema700.mapping b/mappings/net/minecraft/datafixer/schema/Schema700.mapping new file mode 100644 index 0000000000..33cebe30d5 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema700.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1246 net/minecraft/datafixer/schema/Schema700 diff --git a/mappings/net/minecraft/datafixer/schema/Schema701.mapping b/mappings/net/minecraft/datafixer/schema/Schema701.mapping new file mode 100644 index 0000000000..eca56e010a --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema701.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1249 net/minecraft/datafixer/schema/Schema701 diff --git a/mappings/net/minecraft/datafixer/schema/Schema702.mapping b/mappings/net/minecraft/datafixer/schema/Schema702.mapping new file mode 100644 index 0000000000..8a17c12bdf --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema702.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1248 net/minecraft/datafixer/schema/Schema702 diff --git a/mappings/net/minecraft/datafixer/schema/Schema703.mapping b/mappings/net/minecraft/datafixer/schema/Schema703.mapping new file mode 100644 index 0000000000..6aa94f9635 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema703.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1251 net/minecraft/datafixer/schema/Schema703 diff --git a/mappings/net/minecraft/datafixer/schema/Schema704.mapping b/mappings/net/minecraft/datafixer/schema/Schema704.mapping new file mode 100644 index 0000000000..491bd8babe --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema704.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1250 net/minecraft/datafixer/schema/Schema704 diff --git a/mappings/net/minecraft/datafixer/schema/Schema705.mapping b/mappings/net/minecraft/datafixer/schema/Schema705.mapping new file mode 100644 index 0000000000..061eb8a3b0 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema705.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1253 net/minecraft/datafixer/schema/Schema705 diff --git a/mappings/net/minecraft/datafixer/schema/Schema808.mapping b/mappings/net/minecraft/datafixer/schema/Schema808.mapping new file mode 100644 index 0000000000..bf1a562823 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema808.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1252 net/minecraft/datafixer/schema/Schema808 diff --git a/mappings/net/minecraft/datafixer/schema/Schema99.mapping b/mappings/net/minecraft/datafixer/schema/Schema99.mapping new file mode 100644 index 0000000000..0a0643c7fd --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema99.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1254 net/minecraft/datafixer/schema/Schema99 diff --git a/mappings/net/minecraft/datafixers/NbtOps.mapping b/mappings/net/minecraft/datafixers/NbtOps.mapping deleted file mode 100644 index 12dca133eb..0000000000 --- a/mappings/net/minecraft/datafixers/NbtOps.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_2509 net/minecraft/datafixers/NbtOps - FIELD field_11560 INSTANCE Lnet/minecraft/class_2509; diff --git a/mappings/net/minecraft/datafixers/Schemas.mapping b/mappings/net/minecraft/datafixers/Schemas.mapping deleted file mode 100644 index cd7111dafe..0000000000 --- a/mappings/net/minecraft/datafixers/Schemas.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/class_3551 net/minecraft/datafixers/Schemas - CLASS 1 - METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)V - ARG 1 outputSchema - ARG 2 changesType - ARG 3 name - ARG 4 type - CLASS 2 - METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)V - ARG 1 outputSchema - ARG 2 changesType - ARG 3 name - ARG 4 type - FIELD field_15775 identNormalize Ljava/util/function/BiFunction; - FIELD field_15776 empty Ljava/util/function/BiFunction; - FIELD field_15777 fixer Lcom/mojang/datafixers/DataFixer; - METHOD method_15450 getFixer ()Lcom/mojang/datafixers/DataFixer; - METHOD method_15451 build (Lcom/mojang/datafixers/DataFixerBuilder;)V - ARG 0 builder - METHOD method_15471 create ()Lcom/mojang/datafixers/DataFixer; diff --git a/mappings/net/minecraft/datafixers/fixes/BlockEntityCustomNameToComponentFix.mapping b/mappings/net/minecraft/datafixers/fixes/BlockEntityCustomNameToComponentFix.mapping deleted file mode 100644 index f2d0105f99..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/BlockEntityCustomNameToComponentFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3567 net/minecraft/datafixers/fixes/BlockEntityCustomNameToComponentFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BlockEntityShulkerBoxColorFix.mapping b/mappings/net/minecraft/datafixers/fixes/BlockEntityShulkerBoxColorFix.mapping deleted file mode 100644 index 4db6e6a379..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/BlockEntityShulkerBoxColorFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3575 net/minecraft/datafixers/fixes/BlockEntityShulkerBoxColorFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/BlockStateStructureTemplateFix.mapping b/mappings/net/minecraft/datafixers/fixes/BlockStateStructureTemplateFix.mapping deleted file mode 100644 index c6e1aecfa4..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/BlockStateStructureTemplateFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3581 net/minecraft/datafixers/fixes/BlockStateStructureTemplateFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ChunkToProtoChunkFix.mapping b/mappings/net/minecraft/datafixers/fixes/ChunkToProtoChunkFix.mapping deleted file mode 100644 index 70f6c4859a..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/ChunkToProtoChunkFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3591 net/minecraft/datafixers/fixes/ChunkToProtoChunkFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ColorlessShulkerEntityFix.mapping b/mappings/net/minecraft/datafixers/fixes/ColorlessShulkerEntityFix.mapping deleted file mode 100644 index 97b8a409bd..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/ColorlessShulkerEntityFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3592 net/minecraft/datafixers/fixes/ColorlessShulkerEntityFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityElderGuardianSplitFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityElderGuardianSplitFix.mapping deleted file mode 100644 index 2d0db634cf..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntityElderGuardianSplitFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3598 net/minecraft/datafixers/fixes/EntityElderGuardianSplitFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityHorseSaddleFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityHorseSaddleFix.mapping deleted file mode 100644 index 167eb2c65d..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntityHorseSaddleFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3601 net/minecraft/datafixers/fixes/EntityHorseSaddleFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityHorseSplitFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityHorseSplitFix.mapping deleted file mode 100644 index 3c3fb72d33..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntityHorseSplitFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3602 net/minecraft/datafixers/fixes/EntityHorseSplitFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityRedundantChanceTagsFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityRedundantChanceTagsFix.mapping deleted file mode 100644 index 32ac68c682..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntityRedundantChanceTagsFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1165 net/minecraft/datafixers/fixes/EntityRedundantChanceTagsFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityRidingToPassengerFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityRidingToPassengerFix.mapping deleted file mode 100644 index 16332bd258..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntityRidingToPassengerFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1166 net/minecraft/datafixers/fixes/EntityRidingToPassengerFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityShulkerColorFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityShulkerColorFix.mapping deleted file mode 100644 index de7af63971..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntityShulkerColorFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1169 net/minecraft/datafixers/fixes/EntityShulkerColorFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntitySkeletonSplitFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntitySkeletonSplitFix.mapping deleted file mode 100644 index 5cfa291658..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntitySkeletonSplitFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1168 net/minecraft/datafixers/fixes/EntitySkeletonSplitFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityStringUuidFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityStringUuidFix.mapping deleted file mode 100644 index 606dd491f6..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntityStringUuidFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1171 net/minecraft/datafixers/fixes/EntityStringUuidFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityTippedArrowFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityTippedArrowFix.mapping deleted file mode 100644 index abd3dc527a..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntityTippedArrowFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1173 net/minecraft/datafixers/fixes/EntityTippedArrowFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/EntityZombieSplitFix.mapping b/mappings/net/minecraft/datafixers/fixes/EntityZombieSplitFix.mapping deleted file mode 100644 index 6f0ddd5081..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/EntityZombieSplitFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1175 net/minecraft/datafixers/fixes/EntityZombieSplitFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ItemBannerColorFix.mapping b/mappings/net/minecraft/datafixers/fixes/ItemBannerColorFix.mapping deleted file mode 100644 index 73c54b4e54..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/ItemBannerColorFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1179 net/minecraft/datafixers/fixes/ItemBannerColorFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ItemInstanceMapIdFix.mapping b/mappings/net/minecraft/datafixers/fixes/ItemInstanceMapIdFix.mapping deleted file mode 100644 index 9972d6c876..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/ItemInstanceMapIdFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1186 net/minecraft/datafixers/fixes/ItemInstanceMapIdFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ItemWaterPotionFix.mapping b/mappings/net/minecraft/datafixers/fixes/ItemWaterPotionFix.mapping deleted file mode 100644 index 1eb0092d1a..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/ItemWaterPotionFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1190 net/minecraft/datafixers/fixes/ItemWaterPotionFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/LeavesFix.mapping b/mappings/net/minecraft/datafixers/fixes/LeavesFix.mapping deleted file mode 100644 index bf66289ae4..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/LeavesFix.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1191 net/minecraft/datafixers/fixes/LeavesFix diff --git a/mappings/net/minecraft/datafixers/fixes/ObjectiveDisplayNameFix.mapping b/mappings/net/minecraft/datafixers/fixes/ObjectiveDisplayNameFix.mapping deleted file mode 100644 index bec370aa24..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/ObjectiveDisplayNameFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1200 net/minecraft/datafixers/fixes/ObjectiveDisplayNameFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/OptionsForceVBOFix.mapping b/mappings/net/minecraft/datafixers/fixes/OptionsForceVBOFix.mapping deleted file mode 100644 index 71089fe439..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/OptionsForceVBOFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1202 net/minecraft/datafixers/fixes/OptionsForceVBOFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/OptionsKeyTranslationFix.mapping b/mappings/net/minecraft/datafixers/fixes/OptionsKeyTranslationFix.mapping deleted file mode 100644 index 08536fa1e9..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/OptionsKeyTranslationFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1204 net/minecraft/datafixers/fixes/OptionsKeyTranslationFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/OptionsLowerCaseLanguageFix.mapping b/mappings/net/minecraft/datafixers/fixes/OptionsLowerCaseLanguageFix.mapping deleted file mode 100644 index 1163b46d94..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/OptionsLowerCaseLanguageFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1203 net/minecraft/datafixers/fixes/OptionsLowerCaseLanguageFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/SwimStatsRenameFix.mapping b/mappings/net/minecraft/datafixers/fixes/SwimStatsRenameFix.mapping deleted file mode 100644 index ba989fa873..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/SwimStatsRenameFix.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1213 net/minecraft/datafixers/fixes/SwimStatsRenameFix diff --git a/mappings/net/minecraft/datafixers/fixes/TeamDisplayNameFix.mapping b/mappings/net/minecraft/datafixers/fixes/TeamDisplayNameFix.mapping deleted file mode 100644 index c3f7957a18..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/TeamDisplayNameFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1217 net/minecraft/datafixers/fixes/TeamDisplayNameFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/fixes/ZombieVillagerXpRebuildFix.mapping b/mappings/net/minecraft/datafixers/fixes/ZombieVillagerXpRebuildFix.mapping deleted file mode 100644 index de82630301..0000000000 --- a/mappings/net/minecraft/datafixers/fixes/ZombieVillagerXpRebuildFix.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_4301 net/minecraft/datafixers/fixes/ZombieVillagerXpRebuildFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/datafixers/mapping/LegacyCoralBlockMapping.mapping b/mappings/net/minecraft/datafixers/mapping/LegacyCoralBlockMapping.mapping deleted file mode 100644 index 35311dd32a..0000000000 --- a/mappings/net/minecraft/datafixers/mapping/LegacyCoralBlockMapping.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1210 net/minecraft/datafixers/mapping/LegacyCoralBlockMapping - FIELD field_5733 MAP Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixers/mapping/LegacyCoralFanBlockMapping.mapping b/mappings/net/minecraft/datafixers/mapping/LegacyCoralFanBlockMapping.mapping deleted file mode 100644 index 0b4240f8ac..0000000000 --- a/mappings/net/minecraft/datafixers/mapping/LegacyCoralFanBlockMapping.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1207 net/minecraft/datafixers/mapping/LegacyCoralFanBlockMapping - FIELD field_5709 MAP Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixers/mapping/LegacyDyeItemMapping.mapping b/mappings/net/minecraft/datafixers/mapping/LegacyDyeItemMapping.mapping deleted file mode 100644 index 054a3fa473..0000000000 --- a/mappings/net/minecraft/datafixers/mapping/LegacyDyeItemMapping.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_3593 net/minecraft/datafixers/mapping/LegacyDyeItemMapping - FIELD field_15890 MAP Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixers/schemas/Schema100.mapping b/mappings/net/minecraft/datafixers/schemas/Schema100.mapping deleted file mode 100644 index 3b76b25414..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema100.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1222 net/minecraft/datafixers/schemas/Schema100 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema102.mapping b/mappings/net/minecraft/datafixers/schemas/Schema102.mapping deleted file mode 100644 index f11fd27582..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema102.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1221 net/minecraft/datafixers/schemas/Schema102 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1022.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1022.mapping deleted file mode 100644 index 9091e306bc..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1022.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1224 net/minecraft/datafixers/schemas/Schema1022 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema106.mapping b/mappings/net/minecraft/datafixers/schemas/Schema106.mapping deleted file mode 100644 index dbd7fdf799..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema106.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1223 net/minecraft/datafixers/schemas/Schema106 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema107.mapping b/mappings/net/minecraft/datafixers/schemas/Schema107.mapping deleted file mode 100644 index 4a168c9b60..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema107.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1226 net/minecraft/datafixers/schemas/Schema107 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1125.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1125.mapping deleted file mode 100644 index f10ac5995c..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1125.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1225 net/minecraft/datafixers/schemas/Schema1125 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema135.mapping b/mappings/net/minecraft/datafixers/schemas/Schema135.mapping deleted file mode 100644 index c8cf318d2f..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema135.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1228 net/minecraft/datafixers/schemas/Schema135 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema143.mapping b/mappings/net/minecraft/datafixers/schemas/Schema143.mapping deleted file mode 100644 index 2bd44c40af..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema143.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1227 net/minecraft/datafixers/schemas/Schema143 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1451.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1451.mapping deleted file mode 100644 index f341eabfbb..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1451.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1230 net/minecraft/datafixers/schemas/Schema1451 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1451v1.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1451v1.mapping deleted file mode 100644 index 7565ce40b7..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1451v1.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1229 net/minecraft/datafixers/schemas/Schema1451v1 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1451v2.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1451v2.mapping deleted file mode 100644 index 0cb28d2512..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1451v2.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1232 net/minecraft/datafixers/schemas/Schema1451v2 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1451v3.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1451v3.mapping deleted file mode 100644 index c474931091..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1451v3.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1231 net/minecraft/datafixers/schemas/Schema1451v3 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1451v4.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1451v4.mapping deleted file mode 100644 index 520bb6f080..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1451v4.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1234 net/minecraft/datafixers/schemas/Schema1451v4 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1451v5.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1451v5.mapping deleted file mode 100644 index 49982ffe31..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1451v5.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1233 net/minecraft/datafixers/schemas/Schema1451v5 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1451v6.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1451v6.mapping deleted file mode 100644 index 4b63d3e5f7..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1451v6.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1236 net/minecraft/datafixers/schemas/Schema1451v6 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1451v7.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1451v7.mapping deleted file mode 100644 index 3488f4b376..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1451v7.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1235 net/minecraft/datafixers/schemas/Schema1451v7 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1460.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1460.mapping deleted file mode 100644 index 4eb817af81..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1460.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1238 net/minecraft/datafixers/schemas/Schema1460 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1466.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1466.mapping deleted file mode 100644 index 2a6bb0164f..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1466.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1237 net/minecraft/datafixers/schemas/Schema1466 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1470.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1470.mapping deleted file mode 100644 index 89344bfe53..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1470.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1240 net/minecraft/datafixers/schemas/Schema1470 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1481.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1481.mapping deleted file mode 100644 index 530b7a4e91..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1481.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1239 net/minecraft/datafixers/schemas/Schema1481 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1483.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1483.mapping deleted file mode 100644 index 20d34b7a14..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1483.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1242 net/minecraft/datafixers/schemas/Schema1483 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1486.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1486.mapping deleted file mode 100644 index b397c25cb2..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1486.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1241 net/minecraft/datafixers/schemas/Schema1486 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1510.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1510.mapping deleted file mode 100644 index c9aaa7c1b9..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1510.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1243 net/minecraft/datafixers/schemas/Schema1510 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1800.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1800.mapping deleted file mode 100644 index 713b4ab08c..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1800.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1245 net/minecraft/datafixers/schemas/Schema1800 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1801.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1801.mapping deleted file mode 100644 index 41a45f44c2..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1801.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1244 net/minecraft/datafixers/schemas/Schema1801 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1904.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1904.mapping deleted file mode 100644 index e0f9155edf..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1904.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3686 net/minecraft/datafixers/schemas/Schema1904 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1906.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1906.mapping deleted file mode 100644 index 778530751d..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1906.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3687 net/minecraft/datafixers/schemas/Schema1906 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1909.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1909.mapping deleted file mode 100644 index ec648543e2..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1909.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3743 net/minecraft/datafixers/schemas/Schema1909 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1920.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1920.mapping deleted file mode 100644 index b5fad9a484..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1920.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3905 net/minecraft/datafixers/schemas/Schema1920 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1928.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1928.mapping deleted file mode 100644 index 15eb87ba94..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1928.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3984 net/minecraft/datafixers/schemas/Schema1928 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1929.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1929.mapping deleted file mode 100644 index caf46967ab..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1929.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3985 net/minecraft/datafixers/schemas/Schema1929 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema1931.mapping b/mappings/net/minecraft/datafixers/schemas/Schema1931.mapping deleted file mode 100644 index d7e6b312f4..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema1931.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4016 net/minecraft/datafixers/schemas/Schema1931 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema501.mapping b/mappings/net/minecraft/datafixers/schemas/Schema501.mapping deleted file mode 100644 index f1bfb0a402..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema501.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1247 net/minecraft/datafixers/schemas/Schema501 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema700.mapping b/mappings/net/minecraft/datafixers/schemas/Schema700.mapping deleted file mode 100644 index ee0dd1e45f..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema700.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1246 net/minecraft/datafixers/schemas/Schema700 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema701.mapping b/mappings/net/minecraft/datafixers/schemas/Schema701.mapping deleted file mode 100644 index 77006e1ae5..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema701.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1249 net/minecraft/datafixers/schemas/Schema701 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema702.mapping b/mappings/net/minecraft/datafixers/schemas/Schema702.mapping deleted file mode 100644 index 4226be2d0c..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema702.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1248 net/minecraft/datafixers/schemas/Schema702 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema703.mapping b/mappings/net/minecraft/datafixers/schemas/Schema703.mapping deleted file mode 100644 index 4acbe54795..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema703.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1251 net/minecraft/datafixers/schemas/Schema703 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema704.mapping b/mappings/net/minecraft/datafixers/schemas/Schema704.mapping deleted file mode 100644 index b6752e5833..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema704.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1250 net/minecraft/datafixers/schemas/Schema704 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema705.mapping b/mappings/net/minecraft/datafixers/schemas/Schema705.mapping deleted file mode 100644 index 9d738ff8a6..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema705.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1253 net/minecraft/datafixers/schemas/Schema705 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema808.mapping b/mappings/net/minecraft/datafixers/schemas/Schema808.mapping deleted file mode 100644 index 27d121addb..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema808.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1252 net/minecraft/datafixers/schemas/Schema808 diff --git a/mappings/net/minecraft/datafixers/schemas/Schema99.mapping b/mappings/net/minecraft/datafixers/schemas/Schema99.mapping deleted file mode 100644 index e33ebe08e0..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/Schema99.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1254 net/minecraft/datafixers/schemas/Schema99 diff --git a/mappings/net/minecraft/datafixers/schemas/SchemaIdentifierNormalize.mapping b/mappings/net/minecraft/datafixers/schemas/SchemaIdentifierNormalize.mapping deleted file mode 100644 index 10fd68d3a8..0000000000 --- a/mappings/net/minecraft/datafixers/schemas/SchemaIdentifierNormalize.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1220 net/minecraft/datafixers/schemas/SchemaIdentifierNormalize - METHOD method_5193 normalize (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping index ef9e8430be..854879729f 100644 --- a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_1900 net/minecraft/enchantment/ProtectionEnchantment ARG 5 powerPerLevel METHOD method_8239 getPowerPerLevel ()I METHOD method_8240 getBasePower ()I - FIELD field_9133 type Lnet/minecraft/class_1900$class_1901; + FIELD field_9133 protectionType Lnet/minecraft/class_1900$class_1901; METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1900$class_1901;[Lnet/minecraft/class_1304;)V ARG 1 weight ARG 2 type diff --git a/mappings/net/minecraft/entity/Bird.mapping b/mappings/net/minecraft/entity/Bird.mapping deleted file mode 100644 index 33d08bcab6..0000000000 --- a/mappings/net/minecraft/entity/Bird.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1432 net/minecraft/entity/Bird diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 27fc977395..5c6b60054b 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -10,21 +10,21 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_5953 firstUpdate Z FIELD field_5954 trackedZ J FIELD field_5955 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_5956 fireTime I - FIELD field_5957 insideWater Z + FIELD field_5956 fireTicks I + FIELD field_5957 touchingWater Z FIELD field_5958 glowing Z FIELD field_5959 chunkY I FIELD field_5960 noClip Z FIELD field_5961 type Lnet/minecraft/class_1299; FIELD field_5962 SILENT Lnet/minecraft/class_2940; - FIELD field_5963 inPortal Z + FIELD field_5963 inNetherPortal Z FIELD field_5964 waterHeight D FIELD field_5965 pitch F FIELD field_5966 teleportRequested Z FIELD field_5968 pushSpeedReduction F FIELD field_5969 prevZ D - FIELD field_5971 prevRenderY D - FIELD field_5972 portalTime I + FIELD field_5971 lastRenderY D + FIELD field_5972 netherPortalTime I FIELD field_5973 horizontalSpeed F FIELD field_5974 random Ljava/util/Random; FIELD field_5975 NAME_VISIBLE Lnet/minecraft/class_2940; @@ -39,19 +39,19 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_5986 entityId I FIELD field_5987 x D FIELD field_5988 removed Z - FIELD field_5989 prevRenderZ D + FIELD field_5989 lastRenderZ D FIELD field_5990 FLAGS Lnet/minecraft/class_2940; - FIELD field_5991 lastPortalPosition Lnet/minecraft/class_2338; + FIELD field_5991 lastNetherPortalPosition Lnet/minecraft/class_2338; FIELD field_5992 verticalCollision Z FIELD field_5993 pistonMovementDelta [D - FIELD field_5994 distanceWalked F + FIELD field_5994 distanceTraveled F FIELD field_5995 NO_GRAVITY Lnet/minecraft/class_2940; FIELD field_5996 pistonMovementTick J FIELD field_5999 renderDistanceMultiplier D - FIELD field_6000 inWater Z + FIELD field_6000 submergedInWater Z FIELD field_6001 trackedX J FIELD field_6002 world Lnet/minecraft/class_1937; - FIELD field_6003 nextStepDistance F + FIELD field_6003 nextStepSoundDistance F FIELD field_6004 prevPitch F FIELD field_6005 entityBounds Lnet/minecraft/class_238; FIELD field_6007 velocityDirty Z @@ -65,26 +65,26 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6015 collided Z FIELD field_6016 updateNeeded Z FIELD field_6017 fallDistance F - FIELD field_6018 portalCooldown I - FIELD field_6020 lastPortalDirectionVector Lnet/minecraft/class_243; + FIELD field_6018 netherPortalCooldown I + FIELD field_6020 lastNetherPortalDirectionVector Lnet/minecraft/class_243; FIELD field_6021 uuid Ljava/util/UUID; - FIELD field_6022 aerialStepDelta F + FIELD field_6022 nextFlySoundDistance F FIELD field_6023 trackedY J FIELD field_6024 chunkX I FIELD field_6025 NULL_BOX Lnet/minecraft/class_238; FIELD field_6026 dimension Lnet/minecraft/class_2874; FIELD field_6027 CUSTOM_NAME Lnet/minecraft/class_2940; - FIELD field_6028 lastPortalDirection Lnet/minecraft/class_2350; + FIELD field_6028 lastNetherPortalDirection Lnet/minecraft/class_2350; FIELD field_6029 scoreboardTags Ljava/util/Set; FIELD field_6030 EMPTY_STACK_LIST Ljava/util/List; FIELD field_6031 yaw F - FIELD field_6032 BREATH Lnet/minecraft/class_2940; + FIELD field_6032 AIR Lnet/minecraft/class_2940; FIELD field_6033 inanimate Z FIELD field_6034 vehicle Lnet/minecraft/class_1297; FIELD field_6035 z D FIELD field_6036 prevY D FIELD field_6037 velocityModified Z - FIELD field_6038 prevRenderX D + FIELD field_6038 lastRenderX D FIELD field_6039 prevHorizontalSpeed F METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type @@ -99,8 +99,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 world ARG 3 context ARG 4 collisions - METHOD method_17835 handleCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; - ARG 1 motionOffset + METHOD method_17835 adjustMovementForCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 movement METHOD method_17996 squaredHorizontalLength (Lnet/minecraft/class_243;)D ARG 0 vector METHOD method_18002 createSpawnPacket ()Lnet/minecraft/class_2596; @@ -115,22 +115,23 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_18378 getEyeHeight (Lnet/minecraft/class_4050;Lnet/minecraft/class_4048;)F ARG 1 pose ARG 2 dimensions - METHOD method_18379 tickPortal ()V + METHOD method_18379 tickNetherPortal ()V METHOD method_18380 setPose (Lnet/minecraft/class_4050;)V ARG 1 pose METHOD method_18381 getEyeHeight (Lnet/minecraft/class_4050;)F ARG 1 pose METHOD method_18382 calculateDimensions ()V - METHOD method_18794 applyPistonMovement (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; - ARG 1 offset + METHOD method_18794 adjustMovementForPiston (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 movement METHOD method_18795 movementInputToVelocity (Lnet/minecraft/class_243;FF)Lnet/minecraft/class_243; ARG 0 movementInput ARG 1 speed ARG 2 yaw - METHOD method_18796 clipSneakingMovement (Lnet/minecraft/class_243;Lnet/minecraft/class_1313;)Lnet/minecraft/class_243; - ARG 1 offset + METHOD method_18796 adjustMovementForSneaking (Lnet/minecraft/class_243;Lnet/minecraft/class_1313;)Lnet/minecraft/class_243; + ARG 1 movement ARG 2 type METHOD method_18797 calculatePistonMovementFactor (Lnet/minecraft/class_2350$class_2351;D)D + ARG 1 axis ARG 2 offsetFactor METHOD method_18798 getVelocity ()Lnet/minecraft/class_243; METHOD method_18799 setVelocity (Lnet/minecraft/class_243;)V @@ -157,10 +158,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 destX ARG 3 destY ARG 5 destZ - METHOD method_20736 calculateMotionVector (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; - ARG 0 subject - ARG 1 collisionVector - ARG 2 observerBounds + METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; + ARG 0 entity + ARG 1 movement + ARG 2 entityBoundingBox ARG 3 world ARG 4 context ARG 5 collisions @@ -170,8 +171,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5623 fall (DZLnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V ARG 1 heightDifference ARG 3 onGround - ARG 4 blockState - ARG 5 blockPos + ARG 4 landedState + ARG 5 landedPosition METHOD method_5624 isSprinting ()Z METHOD method_5625 getSplashSound ()Lnet/minecraft/class_3414; METHOD method_5626 hasPassenger (Lnet/minecraft/class_1297;)Z @@ -181,7 +182,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5628 getEntityId ()I METHOD method_5629 doesNotCollide (Lnet/minecraft/class_238;)Z ARG 1 box - METHOD method_5630 updateWetState ()V + METHOD method_5630 updateSubmergedInWaterState ()V METHOD method_5631 getRotationVector (FF)Lnet/minecraft/class_243; ARG 1 pitch ARG 2 yaw @@ -193,13 +194,18 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5635 getLightmapCoordinates ()I METHOD method_5636 setYaw (F)V ARG 1 yaw - METHOD method_5637 isTouchingWater ()Z + METHOD method_5637 isWet ()Z + COMMENT Returns whether this entity is touching water, or is being rained on, or is inside a bubble column... + COMMENT + COMMENT @see net.minecraft.entity.Entity#isTouchingWater() + COMMENT @see net.minecraft.entity.Entity#isBeingRainedOn() + COMMENT @see net.minecraft.entity.Entity#isInsideBubbleColumn() METHOD method_5638 shouldSetPositionOnLoad ()Z METHOD method_5639 setOnFireFor (I)V ARG 1 seconds - METHOD method_5640 shouldRenderAtDistance (D)Z + METHOD method_5640 shouldRender (D)Z ARG 1 distance - METHOD method_5641 setPositionAnglesAndUpdate (DDDFF)V + METHOD method_5641 updatePositionAndAngles (DDDFF)V ARG 1 x ARG 3 y ARG 5 z @@ -233,7 +239,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 offsetY ARG 5 offsetZ METHOD method_5655 isInvulnerable ()Z - METHOD method_5656 getLastPortalDirectionVector ()Lnet/minecraft/class_243; + METHOD method_5656 getLastNetherPortalDirectionVector ()Lnet/minecraft/class_243; METHOD method_5657 getPistonBehavior ()Lnet/minecraft/class_3619; METHOD method_5658 canClimb ()Z METHOD method_5659 isImmuneToExplosion ()Z @@ -252,11 +258,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5666 attemptSprintingParticles ()V METHOD method_5667 getUuid ()Ljava/util/UUID; METHOD method_5668 getRootVehicle ()Lnet/minecraft/class_1297; - METHOD method_5669 getBreath ()I + METHOD method_5669 getAir ()I METHOD method_5670 baseTick ()V METHOD method_5671 getCommandSource ()Lnet/minecraft/class_2168; METHOD method_5672 getHighSpeedSplashSound ()Lnet/minecraft/class_3414; - METHOD method_5673 setEquippedStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V + METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V @@ -301,7 +307,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 drag METHOD method_5701 isSilent ()Z METHOD method_5702 lookAt (Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_243;)V - ARG 1 anchor + ARG 1 anchorPoint ARG 2 target METHOD method_5703 hasPassengerType (Ljava/lang/Class;)Z ARG 1 clazz @@ -331,13 +337,13 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 killer ARG 2 score ARG 3 damageSource - METHOD method_5717 setInPortal (Lnet/minecraft/class_2338;)V + METHOD method_5717 setInNetherPortal (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_5718 getBrightnessAtEyes ()F METHOD method_5719 copyPositionAndRotation (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_5720 getRotationVector ()Lnet/minecraft/class_243; - METHOD method_5721 isInsideWaterOrRain ()Z + METHOD method_5721 isTouchingWaterOrRain ()Z METHOD method_5722 isTeammate (Lnet/minecraft/class_1297;)Z ARG 1 other METHOD method_5723 dealDamage (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;)V @@ -346,16 +352,16 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5724 updateVelocity (FLnet/minecraft/class_243;)V ARG 1 speed ARG 2 movementInput - METHOD method_5725 setPositionAndAngles (Lnet/minecraft/class_2338;FF)V + METHOD method_5725 refreshPositionAndAngles (Lnet/minecraft/class_2338;FF)V ARG 1 pos ARG 2 yaw ARG 3 pitch METHOD method_5726 toListTag ([F)Lnet/minecraft/class_2499; ARG 1 values - METHOD method_5727 shouldRenderFrom (DDD)Z - ARG 1 x - ARG 3 y - ARG 5 z + METHOD method_5727 shouldRender (DDD)Z + ARG 1 cameraX + ARG 3 cameraY + ARG 5 cameraZ METHOD method_5728 setSprinting (Z)V ARG 1 sprinting METHOD method_5729 setFlag (IZ)V @@ -376,7 +382,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5739 distanceTo (Lnet/minecraft/class_1297;)F ARG 1 entity METHOD method_5740 hasNoGravity ()Z - METHOD method_5741 getMaxPortalTime ()I + METHOD method_5741 getMaxNetherPortalTime ()I METHOD method_5742 onStoppedTrackingBy (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_5743 getItemsEquipped ()Ljava/lang/Iterable; @@ -391,7 +397,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5747 handleFallDamage (FF)V ARG 1 fallDistance ARG 2 damageMultiplier - METHOD method_5748 getMaxBreath ()I + METHOD method_5748 getMaxAir ()I METHOD method_5749 readCustomDataFromTag (Lnet/minecraft/class_2487;)V ARG 1 tag METHOD method_5750 setVelocityClient (DDD)V @@ -403,7 +409,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5753 isFireImmune ()Z METHOD method_5754 teleportRequested ()Z METHOD method_5755 getMovementDirection ()Lnet/minecraft/class_2350; - METHOD method_5756 canSeePlayer (Lnet/minecraft/class_1657;)Z + METHOD method_5756 isInvisibleTo (Lnet/minecraft/class_1657;)Z ARG 1 player METHOD method_5757 isInsideWall ()Z METHOD method_5758 equip (ILnet/minecraft/class_1799;)Z @@ -417,7 +423,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 8 pitch ARG 9 interpolationSteps ARG 10 interpolate - METHOD method_5760 tickPortalCooldown ()V + METHOD method_5760 tickNetherPortalCooldown ()V METHOD method_5762 addVelocity (DDD)V ARG 1 deltaX ARG 3 deltaY @@ -458,7 +464,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 pitch METHOD method_5784 move (Lnet/minecraft/class_1313;Lnet/minecraft/class_243;)V ARG 1 type - ARG 2 offset + ARG 2 movement METHOD method_5785 scheduleVelocityUpdate ()V METHOD method_5786 saveSelfToTag (Lnet/minecraft/class_2487;)Z ARG 1 tag @@ -476,10 +482,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5796 setSwimming (Z)V ARG 1 swimming METHOD method_5798 isInsideBubbleColumn ()Z - METHOD method_5799 isInsideWater ()Z + METHOD method_5799 isTouchingWater ()Z + COMMENT Returns whether this entity's hitbox is touching water fluid. METHOD method_5800 onStruckByLightning (Lnet/minecraft/class_1538;)V ARG 1 lightning - METHOD method_5801 calculateAerialStepDelta (F)F + METHOD method_5801 playFlySound (F)F ARG 1 distance METHOD method_5802 getRotationClient ()Lnet/minecraft/class_241; METHOD method_5803 setSilent (Z)V @@ -487,9 +494,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5804 startRiding (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_5805 isAlive ()Z - METHOD method_5806 getDefaultPortalCooldown ()I + METHOD method_5806 getDefaultNetherPortalCooldown ()I METHOD method_5807 isCustomNameVisible ()Z - METHOD method_5808 setPositionAndAngles (DDDFF)V + METHOD method_5808 refreshPositionAndAngles (DDDFF)V ARG 1 x ARG 3 y ARG 5 z @@ -498,7 +505,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5809 isOnFire ()Z METHOD method_5810 isPushable ()Z METHOD method_5812 getPosVector ()Lnet/minecraft/class_243; - METHOD method_5814 setPosition (DDD)V + METHOD method_5814 updatePosition (DDD)V ARG 1 x ARG 3 y ARG 5 z @@ -538,10 +545,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 0 value METHOD method_5841 getDataTracker ()Lnet/minecraft/class_2945; METHOD method_5842 tickRiding ()V - METHOD method_5843 getLastPortalDirection ()Lnet/minecraft/class_2350; + METHOD method_5843 getLastNetherPortalDirection ()Lnet/minecraft/class_2350; METHOD method_5844 slowMovement (Lnet/minecraft/class_2680;Lnet/minecraft/class_243;)V ARG 1 state - ARG 2 multipliers + ARG 2 multiplier METHOD method_5845 getUuidAsString ()Ljava/lang/String; METHOD method_5846 toListTag ([D)Lnet/minecraft/class_2499; ARG 1 values @@ -558,8 +565,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 4 state ARG 5 explosionPower METHOD method_5854 getVehicle ()Lnet/minecraft/class_1297; - METHOD method_5855 setBreath (I)V - ARG 1 breath + METHOD method_5855 setAir (I)V + ARG 1 air METHOD method_5856 removeClickEvents (Lnet/minecraft/class_2561;)V ARG 0 textComponent METHOD method_5857 setBoundingBox (Lnet/minecraft/class_238;)V @@ -580,11 +587,12 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 passenger METHOD method_5866 setWorld (Lnet/minecraft/class_1937;)V ARG 1 world - METHOD method_5867 calculateStepDelta ()F + METHOD method_5867 calculateNextStepSoundDistance ()F METHOD method_5868 collectPassengers (ZLjava/util/Set;)V ARG 1 playersOnly ARG 2 output - METHOD method_5869 isInWater ()Z + METHOD method_5869 isSubmergedInWater ()Z + COMMENT Returns whether this entity's hitbox is fully submerged in water. METHOD method_5870 dropItem (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_1542; ARG 1 item ARG 2 yOffset @@ -599,7 +607,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 other METHOD method_5875 setNoGravity (Z)V ARG 1 noGravity - METHOD method_5876 updateInWater ()V + METHOD method_5876 updateWaterState ()V METHOD method_5877 getItemsHand ()Ljava/lang/Iterable; METHOD method_5878 copyFrom (Lnet/minecraft/class_1297;)V ARG 1 original diff --git a/mappings/net/minecraft/entity/EntityContext.mapping b/mappings/net/minecraft/entity/EntityContext.mapping index bbc16ac14e..294afe2ff0 100644 --- a/mappings/net/minecraft/entity/EntityContext.mapping +++ b/mappings/net/minecraft/entity/EntityContext.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_3726 net/minecraft/entity/EntityContext ARG 1 shape ARG 2 pos ARG 3 defaultValue - METHOD method_16193 isSneaking ()Z + METHOD method_16193 isDescending ()Z METHOD method_16194 absent ()Lnet/minecraft/class_3726; METHOD method_16195 of (Lnet/minecraft/class_1297;)Lnet/minecraft/class_3726; ARG 0 entity diff --git a/mappings/net/minecraft/entity/EntityContextImpl.mapping b/mappings/net/minecraft/entity/EntityContextImpl.mapping index 638785a2db..0b8119509a 100644 --- a/mappings/net/minecraft/entity/EntityContextImpl.mapping +++ b/mappings/net/minecraft/entity/EntityContextImpl.mapping @@ -1,14 +1,11 @@ CLASS net/minecraft/class_3727 net/minecraft/entity/EntityContextImpl - CLASS 1 - METHOD (ZDLnet/minecraft/class_1792;)V - ARG 1 sneaking FIELD field_16450 minY D - FIELD field_16451 sneaking Z + FIELD field_16451 descending Z FIELD field_17593 ABSENT Lnet/minecraft/class_3726; FIELD field_17594 heldItem Lnet/minecraft/class_1792; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD (ZDLnet/minecraft/class_1792;)V - ARG 1 sneaking + ARG 1 descending ARG 2 minY ARG 4 heldItem diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 8e73181d25..1352ae2178 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -39,6 +39,10 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLnet/minecraft/class_4048;)V ARG 1 factory ARG 2 category + ARG 3 saveable + ARG 4 summonable + ARG 5 fireImmune + ARG 6 spawnableFarFromPlayer ARG 7 dimensions METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960; METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238; @@ -85,6 +89,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 5 pos ARG 6 spawnType ARG 7 alignPosition + ARG 8 invertY METHOD method_5889 createInstanceFromId (ILnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 0 type ARG 1 world @@ -101,6 +106,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 3 player ARG 4 pos ARG 5 spawnType + ARG 6 alignPosition + ARG 7 invertY METHOD method_5895 register (Ljava/lang/String;Lnet/minecraft/class_1299$class_1300;)Lnet/minecraft/class_1299; ARG 0 id ARG 1 type @@ -115,3 +122,5 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 4 player ARG 5 pos ARG 6 spawnType + ARG 7 alignPosition + ARG 8 invertY diff --git a/mappings/net/minecraft/entity/Flutterer.mapping b/mappings/net/minecraft/entity/Flutterer.mapping new file mode 100644 index 0000000000..e73000e50b --- /dev/null +++ b/mappings/net/minecraft/entity/Flutterer.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1432 net/minecraft/entity/Flutterer diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 0ba13c0c58..7879a0b908 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6213 deathTime I FIELD field_6214 POTION_SWIRLS_AMBIENT Lnet/minecraft/class_2940; FIELD field_6218 stuckArrowTimer I - FIELD field_6219 STUCK_ARROWS Lnet/minecraft/class_2940; + FIELD field_6219 STUCK_ARROW_COUNT Lnet/minecraft/class_2940; FIELD field_6222 itemUseTimeLeft I FIELD field_6225 limbDistance F FIELD field_6227 upwardSpeed F @@ -32,7 +32,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6257 LIVING_FLAGS Lnet/minecraft/class_2940; FIELD field_6258 attackingPlayer Lnet/minecraft/class_1657; FIELD field_6259 prevHeadYaw F - FIELD field_6260 attributeContainer Lnet/minecraft/class_1325; + FIELD field_6260 attributes Lnet/minecraft/class_1325; FIELD field_6266 preferredHand Lnet/minecraft/class_1268; FIELD field_6268 lastBlockPos Lnet/minecraft/class_2338; FIELD field_6270 lastAttackTime I @@ -47,20 +47,24 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6287 movementSpeed F METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type + ARG 2 world METHOD method_16077 dropLoot (Lnet/minecraft/class_1282;Z)V ARG 1 source - ARG 2 killedByPlayer + ARG 2 causedByPlayer METHOD method_16078 dropInventory ()V METHOD method_16079 getLootContextBuilder (ZLnet/minecraft/class_1282;)Lnet/minecraft/class_47$class_48; - ARG 1 killedByPlayer + ARG 1 causedByPlayer + ARG 2 source METHOD method_16080 drop (Lnet/minecraft/class_1282;)V + ARG 1 source METHOD method_16826 setDespawnCounter (I)V ARG 1 despawnCounter METHOD method_17825 getScaleFactor ()F METHOD method_18390 getAttackDistanceScalingFactor (Lnet/minecraft/class_1297;)D + ARG 1 entity METHOD method_18391 isTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_4051;)Z - ARG 1 target - ARG 2 targetPredicate + ARG 1 entity + ARG 2 predicate METHOD method_18392 setPositionInBed (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_18394 getActiveEyeHeight (Lnet/minecraft/class_4050;Lnet/minecraft/class_4048;)F @@ -75,6 +79,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_18400 wakeUp ()V METHOD method_18401 getSleepingDirection ()Lnet/minecraft/class_2350; METHOD method_18402 setSleepingPosition (Lnet/minecraft/class_2338;)V + ARG 1 pos METHOD method_18403 sleep (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_18406 isSleepingInBed ()Z @@ -82,49 +87,67 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 stack METHOD method_18808 getArrowType (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; METHOD method_18865 applyFoodEffects (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V + ARG 1 stack + ARG 2 world + ARG 3 targetEntity METHOD method_18866 eatFood (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + ARG 1 world + ARG 2 stack METHOD method_18867 deserializeBrain (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095; + ARG 1 dynamic METHOD method_18868 getBrain ()Lnet/minecraft/class_4095; METHOD method_18869 getEatSound (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3414; ARG 1 stack METHOD method_20235 sendEquipmentBreakStatus (Lnet/minecraft/class_1304;)V ARG 1 slot METHOD method_20236 sendToolBreakStatus (Lnet/minecraft/class_1268;)V + ARG 1 hand METHOD method_20237 getEquipmentBreakStatus (Lnet/minecraft/class_1304;)B + ARG 0 slot METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; + ARG 1 attribute METHOD method_5997 attackLivingEntity (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_5998 getStackInHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1799; + ARG 1 hand METHOD method_5999 isUndead ()Z METHOD method_6001 initAttributes ()V METHOD method_6002 getDeathSound ()Lnet/minecraft/class_3414; METHOD method_6005 takeKnockback (Lnet/minecraft/class_1297;FDD)V - ARG 1 source - ARG 2 scale - ARG 3 x - ARG 5 z + ARG 1 attacker + ARG 2 speed + ARG 3 xMovement + ARG 5 zMovement METHOD method_6006 setNearbySongPlaying (Lnet/minecraft/class_2338;Z)V - ARG 1 songSource + ARG 1 songPosition ARG 2 playing METHOD method_6007 tickMovement ()V METHOD method_6010 swimUpward (Lnet/minecraft/class_3494;)V ARG 1 fluid METHOD method_6011 getHurtSound (Lnet/minecraft/class_1282;)Lnet/minecraft/class_3414; ARG 1 source - METHOD method_6012 clearPotionEffects ()Z + METHOD method_6012 clearStatusEffects ()Z METHOD method_6013 playHurtSound (Lnet/minecraft/class_1282;)V - ARG 1 damageSource + ARG 1 source METHOD method_6014 getItemUseTimeLeft ()I METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V ARG 1 attacker METHOD method_6016 removeStatusEffect (Lnet/minecraft/class_1291;)Z + COMMENT Removes a status effect from this entity. + COMMENT + COMMENT

Calling this method will call cleanup methods on the status effect and trigger synchronization of effect particles with watching clients. If this entity is a player, + COMMENT the change in the list of effects will also be synchronized with the corresponding client. + COMMENT + COMMENT @return {@code true} if a {@link net.minecraft.entity.effect.StatusEffectInstance} with the given type was in effect before the removal. + ARG 1 type METHOD method_6017 getSoundPitch ()F METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V + ARG 1 hand METHOD method_6021 clearActiveItem ()V - METHOD method_6022 getStuckArrows ()I + METHOD method_6022 getStuckArrowCount ()I METHOD method_6023 tickNewAi ()V METHOD method_6025 heal (F)V ARG 1 amount @@ -133,29 +156,31 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6028 getHandSwingDuration ()I METHOD method_6029 getMovementSpeed ()F METHOD method_6030 getActiveItem ()Lnet/minecraft/class_1799; - METHOD method_6031 (FF)F - ARG 1 yaw + METHOD method_6031 turnHead (FF)F + ARG 1 bodyRotation + ARG 2 headRotation METHOD method_6032 getHealth ()F METHOD method_6033 setHealth (F)V + ARG 1 health METHOD method_6034 canMoveVoluntarily ()Z METHOD method_6036 applyEnchantmentsToDamage (Lnet/minecraft/class_1282;F)F ARG 1 source ARG 2 amount METHOD method_6037 spawnItemParticles (Lnet/minecraft/class_1799;I)V - ARG 1 item + ARG 1 stack ARG 2 count METHOD method_6041 getFallSound (I)Lnet/minecraft/class_3414; - ARG 1 fallDistance + ARG 1 distance METHOD method_6043 jump ()V METHOD method_6045 playEquipmentBreakEffects (Lnet/minecraft/class_1799;)V - ARG 1 item + ARG 1 stack METHOD method_6046 getGroup ()Lnet/minecraft/class_1310; METHOD method_6047 getMainHandStack ()Lnet/minecraft/class_1799; METHOD method_6048 getItemUseTime ()I - METHOD method_6049 isPotionEffective (Lnet/minecraft/class_1293;)Z + METHOD method_6049 canHaveStatusEffect (Lnet/minecraft/class_1293;)Z ARG 1 effect - METHOD method_6050 spawnPotionParticles ()V - METHOD method_6051 getRand ()Ljava/util/Random; + METHOD method_6050 tickStatusEffects ()V + METHOD method_6051 getRandom ()Ljava/util/Random; METHOD method_6052 getAttacking ()Lnet/minecraft/class_1309; METHOD method_6053 initAi ()V METHOD method_6054 canDropLootAndXp ()Z @@ -167,27 +192,28 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 entity METHOD method_6058 getActiveHand ()Lnet/minecraft/class_1268; METHOD method_6059 hasStatusEffect (Lnet/minecraft/class_1291;)Z + ARG 1 effect METHOD method_6060 knockback (Lnet/minecraft/class_1309;)V ARG 1 target - METHOD method_6062 cannotMove ()Z - METHOD method_6063 getHealthMaximum ()F - METHOD method_6064 getNextBreathInAir (I)I - ARG 1 breath + METHOD method_6062 isImmobile ()Z + METHOD method_6063 getMaximumHealth ()F + METHOD method_6064 getNextAirOnLand (I)I + ARG 1 air METHOD method_6065 getAttacker ()Lnet/minecraft/class_1309; METHOD method_6066 getDamageTracker ()Lnet/minecraft/class_1283; METHOD method_6067 getAbsorptionAmount ()F METHOD method_6068 getMainArm ()Lnet/minecraft/class_1306; METHOD method_6069 clearPotionSwirls ()V - METHOD method_6070 tickPushing ()V + METHOD method_6070 tickCramming ()V METHOD method_6071 shouldAlwaysDropXp ()Z METHOD method_6073 setAbsorptionAmount (F)V ARG 1 amount METHOD method_6074 applyDamage (Lnet/minecraft/class_1282;F)V ARG 1 source - ARG 2 damage + ARG 2 amount METHOD method_6075 stopUsingItem ()V METHOD method_6078 onDeath (Lnet/minecraft/class_1282;)V - ARG 1 damageSource + ARG 1 source METHOD method_6079 getOffHandStack ()Lnet/minecraft/class_1799; METHOD method_6081 getRecentDamageSource ()Lnet/minecraft/class_1282; METHOD method_6082 teleport (DDDZ)Z @@ -196,31 +222,34 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 5 z ARG 7 particleEffects METHOD method_6083 getLastAttackTime ()I - METHOD method_6084 isEquippedStackValid (Lnet/minecraft/class_1304;)Z + METHOD method_6084 hasStackEquipped (Lnet/minecraft/class_1304;)Z + ARG 1 slot METHOD method_6085 setLivingFlag (IZ)V ARG 1 mask ARG 2 value METHOD method_6086 isAffectedBySplashPotions ()Z METHOD method_6087 pushAway (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_6088 getActiveStatusEffects ()Ljava/util/Map; METHOD method_6089 containsOnlyAmbientEffects (Ljava/util/Collection;)Z ARG 0 effects METHOD method_6090 takeShieldHit (Lnet/minecraft/class_1309;)V - ARG 1 source + ARG 1 attacker METHOD method_6091 travel (Lnet/minecraft/class_243;)V ARG 1 movementInput - METHOD method_6092 addPotionEffect (Lnet/minecraft/class_1293;)Z + METHOD method_6092 addStatusEffect (Lnet/minecraft/class_1293;)Z ARG 1 effect METHOD method_6094 canBreatheInWater ()Z METHOD method_6096 getArmor ()I - METHOD method_6097 setStuckArrows (I)V + METHOD method_6097 setStuckArrowCount (I)V + ARG 1 stuckArrowCount METHOD method_6098 spawnConsumptionEffects (Lnet/minecraft/class_1799;I)V - ARG 1 item + ARG 1 stack ARG 2 particleCount METHOD method_6099 dropEquipment (Lnet/minecraft/class_1282;IZ)V - ARG 1 damageSource - ARG 2 addedDropChance - ARG 3 dropAllowed + ARG 1 source + ARG 2 lootingMultiplier + ARG 3 allowDrops METHOD method_6100 setJumping (Z)V ARG 1 jumping METHOD method_6101 isClimbing ()Z @@ -228,6 +257,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 item ARG 2 count METHOD method_6104 swingHand (Lnet/minecraft/class_1268;)V + ARG 1 hand METHOD method_6105 damageArmor (F)V ARG 1 amount METHOD method_6106 getJumpVelocity ()F @@ -236,10 +266,17 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6109 isBaby ()Z METHOD method_6110 getCurrentExperience (Lnet/minecraft/class_1657;)I ARG 1 player - METHOD method_6111 removePotionEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; + METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; + COMMENT Removes a status effect from this entity without calling any listener. + COMMENT + COMMENT

This method does not perform any cleanup or synchronization operation. + COMMENT Under most circumstances, calling {@link net.minecraft.entity.LivingEntity#removeStatusEffect(net.minecraft.entity.effect.StatusEffect)} is highly preferable. + ARG 1 type METHOD method_6112 getStatusEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; + ARG 1 effect METHOD method_6113 isSleeping ()Z METHOD method_6114 onAttacking (Lnet/minecraft/class_1297;)V + ARG 1 target METHOD method_6115 isUsingItem ()Z METHOD method_6116 onEquipStack (Lnet/minecraft/class_1799;)V ARG 1 stack @@ -252,16 +289,17 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 target METHOD method_6122 setStackInHand (Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)V ARG 1 hand + ARG 2 stack METHOD method_6123 isUsingRiptide ()Z METHOD method_6125 setMovementSpeed (F)V ARG 1 movementSpeed METHOD method_6126 applyFrostWalker (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_6127 getAttributeContainer ()Lnet/minecraft/class_1325; + METHOD method_6127 getAttributes ()Lnet/minecraft/class_1325; METHOD method_6128 isFallFlying ()Z - METHOD method_6130 getNextBreathInWater (I)I - ARG 1 breath + METHOD method_6130 getNextAirUnderwater (I)I + ARG 1 air METHOD method_6131 getDespawnCounter ()I METHOD method_6132 applyArmorToDamage (Lnet/minecraft/class_1282;F)F ARG 1 source - ARG 2 damage + ARG 2 amount diff --git a/mappings/net/minecraft/entity/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping index 3466d912cd..21add495ae 100644 --- a/mappings/net/minecraft/entity/SpawnRestriction.mapping +++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping @@ -6,9 +6,13 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction ARG 1 heightMapType ARG 2 location CLASS class_1319 Location - FIELD field_6313 mapping Ljava/util/Map; - METHOD method_20637 setRestrictions (Lnet/minecraft/class_1299;Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_4306;)V + FIELD field_6313 RESTRICTIONS Ljava/util/Map; + METHOD method_20637 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_4306;)V + ARG 0 type + ARG 1 location + ARG 2 heightmapType + ARG 3 predicate METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1317$class_1319; ARG 0 type - METHOD method_6160 getHeightMapType (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2902$class_2903; + METHOD method_6160 getHeightmapType (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2902$class_2903; ARG 0 type diff --git a/mappings/net/minecraft/entity/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/WaterCreatureEntity.mapping deleted file mode 100644 index c247b59ee8..0000000000 --- a/mappings/net/minecraft/entity/WaterCreatureEntity.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_1480 net/minecraft/entity/WaterCreatureEntity - METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V - ARG 1 type - METHOD method_6673 tickBreath (I)V - ARG 1 breath diff --git a/mappings/net/minecraft/entity/ai/PathfindingUtil.mapping b/mappings/net/minecraft/entity/ai/PathfindingUtil.mapping deleted file mode 100644 index ab5e36160b..0000000000 --- a/mappings/net/minecraft/entity/ai/PathfindingUtil.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_1414 net/minecraft/entity/ai/PathfindingUtil - METHOD method_19108 findTargetStraight (Lnet/minecraft/class_1314;IILjava/util/function/ToDoubleFunction;)Lnet/minecraft/class_243; - METHOD method_6371 findTarget (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;ZDLjava/util/function/ToDoubleFunction;)Lnet/minecraft/class_243; - METHOD method_6375 findTarget (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; - METHOD method_6376 findTarget (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;)Lnet/minecraft/class_243; - METHOD method_6378 findTargetStraight (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; - METHOD method_6380 isWater (Lnet/minecraft/class_2338;Lnet/minecraft/class_1314;)Z diff --git a/mappings/net/minecraft/entity/ai/TargetFinder.mapping b/mappings/net/minecraft/entity/ai/TargetFinder.mapping new file mode 100644 index 0000000000..328efef0e7 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/TargetFinder.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_1414 net/minecraft/entity/ai/TargetFinder + METHOD method_19108 findGroundTarget (Lnet/minecraft/class_1314;IILjava/util/function/ToDoubleFunction;)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 pathfindingFavor + METHOD method_6371 findTarget (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;ZDLjava/util/function/ToDoubleFunction;)Lnet/minecraft/class_243; + METHOD method_6375 findTarget (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + METHOD method_6376 findTarget (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;)Lnet/minecraft/class_243; + METHOD method_6378 findGroundTarget (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + METHOD method_6380 isWater (Lnet/minecraft/class_2338;Lnet/minecraft/class_1314;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/Activity.mapping b/mappings/net/minecraft/entity/ai/brain/Activity.mapping index 87976ee3d6..0bfe43032b 100644 --- a/mappings/net/minecraft/entity/ai/brain/Activity.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Activity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4168 net/minecraft/entity/ai/brain/Activity FIELD field_18600 id Ljava/lang/String; METHOD method_19210 register (Ljava/lang/String;)Lnet/minecraft/class_4168; + ARG 0 id METHOD method_19634 getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/ai/brain/LookTarget.mapping b/mappings/net/minecraft/entity/ai/brain/LookTarget.mapping index ce1ed4d5d8..c4a2a553ee 100644 --- a/mappings/net/minecraft/entity/ai/brain/LookTarget.mapping +++ b/mappings/net/minecraft/entity/ai/brain/LookTarget.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4115 net/minecraft/entity/ai/brain/LookTarget METHOD method_18989 getBlockPos ()Lnet/minecraft/class_2338; METHOD method_18990 isSeenBy (Lnet/minecraft/class_1309;)Z + ARG 1 entity METHOD method_18991 getPos ()Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping b/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping index 41cc6955d3..38d2c78e1d 100644 --- a/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping +++ b/mappings/net/minecraft/entity/ai/brain/MemoryModuleType.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_4140 net/minecraft/entity/ai/brain/MemoryModuleType FIELD field_18454 factory Ljava/util/Optional; METHOD method_19092 register (Ljava/lang/String;Ljava/util/Optional;)Lnet/minecraft/class_4140; + ARG 0 id + ARG 1 factory METHOD method_19093 getFactory ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/entity/ai/brain/Schedule.mapping b/mappings/net/minecraft/entity/ai/brain/Schedule.mapping index c0254026bb..b6b94d2d8f 100644 --- a/mappings/net/minecraft/entity/ai/brain/Schedule.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Schedule.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_4170 net/minecraft/entity/ai/brain/Schedule METHOD method_19218 getRule (Lnet/minecraft/class_4168;)Lnet/minecraft/class_4173; ARG 1 activity METHOD method_19219 getOtherRules (Lnet/minecraft/class_4168;)Ljava/util/List; + ARG 1 activity diff --git a/mappings/net/minecraft/entity/ai/brain/ScheduleRule.mapping b/mappings/net/minecraft/entity/ai/brain/ScheduleRule.mapping index a2aa3fa661..82ed5dd8b6 100644 --- a/mappings/net/minecraft/entity/ai/brain/ScheduleRule.mapping +++ b/mappings/net/minecraft/entity/ai/brain/ScheduleRule.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4173 net/minecraft/entity/ai/brain/ScheduleRule FIELD field_18612 entries Ljava/util/List; METHOD method_19226 getPriority (I)F ARG 1 time - METHOD method_19227 withEntry (IF)Lnet/minecraft/class_4173; + METHOD method_19227 add (IF)Lnet/minecraft/class_4173; ARG 1 startTime ARG 2 priority METHOD method_19229 sort ()V diff --git a/mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping b/mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping index ec685ea8ff..8f032708ac 100644 --- a/mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping +++ b/mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping @@ -8,9 +8,10 @@ CLASS net/minecraft/class_4142 net/minecraft/entity/ai/brain/WalkTarget ARG 3 completionRange METHOD (Lnet/minecraft/class_243;FI)V ARG 1 pos - ARG 2 speedFactor + ARG 2 speed ARG 3 completionRange METHOD (Lnet/minecraft/class_4115;FI)V + ARG 1 lookTarget ARG 2 speed ARG 3 completionRange METHOD method_19094 getLookTarget ()Lnet/minecraft/class_4115; diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping index 36aa61421d..7f5f2e3fab 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInterestTask - FIELD field_18332 lastRunTime J + FIELD field_18332 positionExpireTimeLimit J FIELD field_18854 onlyRunIfChild Z FIELD field_19287 poiType Lnet/minecraft/class_4158; METHOD (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;Z)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping index c3b59f8e72..683ff0ee2d 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping @@ -5,8 +5,8 @@ CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/FollowMobTask ARG 1 mobType ARG 2 maxDistance METHOD (Lnet/minecraft/class_1299;F)V - ARG 1 mobType + ARG 1 entityType ARG 2 maxDistance METHOD (Lnet/minecraft/class_1311;F)V - ARG 1 mobCategory + ARG 1 entityCategory ARG 2 maxDistance diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping index 1e3c3a7a06..56f9b0dd0b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping @@ -2,4 +2,5 @@ CLASS net/minecraft/class_4128 net/minecraft/entity/ai/brain/task/ForgetComplete FIELD field_18390 memoryModule Lnet/minecraft/class_4140; FIELD field_18391 condition Ljava/util/function/Predicate; METHOD (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;)V + ARG 1 poiType ARG 2 memoryModule diff --git a/mappings/net/minecraft/entity/ai/tasks/GoToNearbyPositionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping similarity index 59% rename from mappings/net/minecraft/entity/ai/tasks/GoToNearbyPositionTask.mapping rename to mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping index 0eca559d09..735eed6b23 100644 --- a/mappings/net/minecraft/entity/ai/tasks/GoToNearbyPositionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4219 net/minecraft/entity/ai/tasks/GoToNearbyPositionTask +CLASS net/minecraft/class_4219 net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask FIELD field_18862 memoryModuleType Lnet/minecraft/class_4140; FIELD field_18864 maxDistance I FIELD field_18865 nextRunTime J diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping new file mode 100644 index 0000000000..98a34a8d5e --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_4458 net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask + FIELD field_20288 speed F + FIELD field_20289 completionRange I + METHOD (FI)V + ARG 1 speed + ARG 2 completionRange diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping index 599c52fa77..d0bfe2983f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping @@ -1,12 +1,31 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_19548 lookAtAndWalkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V + ARG 0 first + ARG 1 second METHOD method_19550 canSee (Lnet/minecraft/class_4095;Lnet/minecraft/class_1309;)Z + ARG 0 brain + ARG 1 target METHOD method_19551 canSee (Lnet/minecraft/class_4095;Lnet/minecraft/class_4140;Lnet/minecraft/class_1299;)Z + ARG 0 brain + ARG 1 memoryModuleType + ARG 2 entityType METHOD method_19552 lookAtEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V + ARG 0 first + ARG 1 second METHOD method_19554 lookAt (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V + ARG 0 entity + ARG 1 target METHOD method_19555 walkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V + ARG 0 first + ARG 1 second METHOD method_19556 walkTowards (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;I)V + ARG 0 entity + ARG 1 target + ARG 2 completionRange METHOD method_19949 give (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)V + ARG 0 entity + ARG 1 stack + ARG 2 target METHOD method_20419 getPosClosestToOccupiedPointOfInterest (Lnet/minecraft/class_3218;Lnet/minecraft/class_4076;I)Lnet/minecraft/class_4076; ARG 0 world ARG 1 center diff --git a/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping index c8e72e32d5..02adc911f8 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4218 net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask METHOD method_19576 getInteractionTarget (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; + ARG 1 entity METHOD method_19577 isInteractionTargetOf (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 entity ARG 2 other @@ -12,3 +13,4 @@ CLASS net/minecraft/class_4218 net/minecraft/entity/ai/brain/task/PlayWithVillag METHOD method_19593 hasInteractionTarget (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_19594 getVisibleVillagerBabies (Lnet/minecraft/class_1314;)Ljava/util/List; + ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/StopPanicingTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StopPanickingTask.mapping similarity index 79% rename from mappings/net/minecraft/entity/ai/brain/task/StopPanicingTask.mapping rename to mappings/net/minecraft/entity/ai/brain/task/StopPanickingTask.mapping index e19a383305..0765d88868 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StopPanicingTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StopPanickingTask.mapping @@ -1,2 +1,3 @@ -CLASS net/minecraft/class_4100 net/minecraft/entity/ai/brain/task/StopPanicingTask +CLASS net/minecraft/class_4100 net/minecraft/entity/ai/brain/task/StopPanickingTask METHOD method_19557 wasHurtByNearbyEntity (Lnet/minecraft/class_1646;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping index d89629454a..8bc745a62e 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_4097 net/minecraft/entity/ai/brain/task/Task ARG 2 entity ARG 3 time METHOD method_18923 tick (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V + ARG 1 world + ARG 2 entity ARG 3 time METHOD method_18924 keepRunning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V ARG 1 world @@ -39,6 +41,8 @@ CLASS net/minecraft/class_4097 net/minecraft/entity/ai/brain/task/Task ARG 2 entity ARG 3 time METHOD method_18926 finishRunning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V + ARG 1 world + ARG 2 entity ARG 3 time METHOD method_18927 shouldKeepRunning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z ARG 1 world diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping index 7d2efdd985..3b2c78ca01 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_4122 net/minecraft/entity/ai/brain/task/VillagerWalkTo ARG 1 destination ARG 2 speed ARG 3 completionRange + ARG 4 maxRange ARG 5 maxRunTime METHOD method_19988 reachedDestination (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_4208;)Z ARG 1 world diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping index 9432520c32..726cacfb4f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_4290 net/minecraft/entity/ai/brain/task/WalkHomeTask - FIELD field_19260 lastRunTime J + FIELD field_19260 expiryTimeLimit J METHOD (F)V ARG 1 speed diff --git a/mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping b/mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping index a20d6c66c6..4fbf7d8d87 100644 --- a/mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_1332 net/minecraft/entity/ai/control/DolphinLookControl METHOD (Lnet/minecraft/class_1308;I)V ARG 1 entity + ARG 2 maxYawDifference diff --git a/mappings/net/minecraft/entity/ai/control/FlightMoveControl.mapping b/mappings/net/minecraft/entity/ai/control/FlightMoveControl.mapping new file mode 100644 index 0000000000..bd4ab8443e --- /dev/null +++ b/mappings/net/minecraft/entity/ai/control/FlightMoveControl.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1331 net/minecraft/entity/ai/control/FlightMoveControl diff --git a/mappings/net/minecraft/entity/ai/control/LookControl.mapping b/mappings/net/minecraft/entity/ai/control/LookControl.mapping index 4700b0181d..e40538118f 100644 --- a/mappings/net/minecraft/entity/ai/control/LookControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/LookControl.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_1333 net/minecraft/entity/ai/control/LookControl ARG 3 y ARG 5 z METHOD method_20249 getLookingHeightFor (Lnet/minecraft/class_1297;)D + ARG 0 entity METHOD method_20250 getTargetPitch ()F METHOD method_20251 getTargetYaw ()F METHOD method_6225 getLookX ()D diff --git a/mappings/net/minecraft/entity/ai/control/ParrotMoveControl.mapping b/mappings/net/minecraft/entity/ai/control/ParrotMoveControl.mapping deleted file mode 100644 index a198191b2c..0000000000 --- a/mappings/net/minecraft/entity/ai/control/ParrotMoveControl.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1331 net/minecraft/entity/ai/control/ParrotMoveControl diff --git a/mappings/net/minecraft/entity/ai/goal/BreakDoorGoal.mapping b/mappings/net/minecraft/entity/ai/goal/BreakDoorGoal.mapping index 222e83b10b..90675259ef 100644 --- a/mappings/net/minecraft/entity/ai/goal/BreakDoorGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/BreakDoorGoal.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_1339 net/minecraft/entity/ai/goal/BreakDoorGoal FIELD field_6398 breakProgress I METHOD (Lnet/minecraft/class_1308;ILjava/util/function/Predicate;)V ARG 1 mob + ARG 2 maxProgress ARG 3 difficultySufficientPredicate METHOD (Lnet/minecraft/class_1308;Ljava/util/function/Predicate;)V ARG 1 mob diff --git a/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping b/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping index 8550510660..19fea5d100 100644 --- a/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping @@ -4,7 +4,13 @@ CLASS net/minecraft/class_1357 net/minecraft/entity/ai/goal/DolphinJumpGoal METHOD (Lnet/minecraft/class_1433;I)V ARG 1 dolphin ARG 2 chance - METHOD method_6282 isAir (Lnet/minecraft/class_2338;III)Z + METHOD method_6282 isAirAbove (Lnet/minecraft/class_2338;III)Z ARG 1 pos + ARG 2 xOffset + ARG 3 zOffset + ARG 4 multiplier METHOD method_6284 isWater (Lnet/minecraft/class_2338;III)Z ARG 1 pos + ARG 2 xOffset + ARG 3 zOffset + ARG 4 multiplier diff --git a/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping b/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping index 3153ba856c..c7b24b6219 100644 --- a/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping @@ -6,6 +6,6 @@ CLASS net/minecraft/class_1343 net/minecraft/entity/ai/goal/DoorInteractGoal ARG 1 mob METHOD method_19995 setDoorOpen (Z)V ARG 1 open - METHOD method_6254 getDoor (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + METHOD method_6254 isWoodenDoor (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping index 55afeaf266..6175aedb6c 100644 --- a/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping @@ -20,9 +20,12 @@ CLASS net/minecraft/class_1338 net/minecraft/entity/ai/goal/FleeEntityGoal ARG 3 fleeDistance ARG 4 fleeSlowSpeed ARG 6 fleeFastSpeed + ARG 8 inclusionSelector METHOD (Lnet/minecraft/class_1314;Ljava/lang/Class;Ljava/util/function/Predicate;FDDLjava/util/function/Predicate;)V ARG 1 mob ARG 2 fleeFromType + ARG 3 extraInclusionSelector ARG 4 distance ARG 5 slowSpeed ARG 7 fastSpeed + ARG 9 inclusionSelector diff --git a/mappings/net/minecraft/entity/ai/goal/FlyAroundGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FlyAroundGoal.mapping deleted file mode 100644 index caa0126c12..0000000000 --- a/mappings/net/minecraft/entity/ai/goal/FlyAroundGoal.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1395 net/minecraft/entity/ai/goal/FlyAroundGoal diff --git a/mappings/net/minecraft/entity/ai/goal/FlyOntoTreeGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FlyOntoTreeGoal.mapping new file mode 100644 index 0000000000..8d92f9c272 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/FlyOntoTreeGoal.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1395 net/minecraft/entity/ai/goal/FlyOntoTreeGoal diff --git a/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping index 201dad87c1..e3fd4cf74d 100644 --- a/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping @@ -6,4 +6,5 @@ CLASS net/minecraft/class_1362 net/minecraft/entity/ai/goal/FormCaravanGoal ARG 1 llama ARG 2 speed METHOD method_6285 canFollow (Lnet/minecraft/class_1501;I)Z + ARG 1 llama ARG 2 length diff --git a/mappings/net/minecraft/entity/ai/goal/Goal.mapping b/mappings/net/minecraft/entity/ai/goal/Goal.mapping index 834ce75ebd..38c5f5e83f 100644 --- a/mappings/net/minecraft/entity/ai/goal/Goal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/Goal.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1352 net/minecraft/entity/ai/goal/Goal FIELD field_6451 controls Ljava/util/EnumSet; METHOD method_6264 canStart ()Z METHOD method_6265 setControls (Ljava/util/EnumSet;)V + ARG 1 controls METHOD method_6266 shouldContinue ()Z METHOD method_6267 canStop ()Z METHOD method_6268 tick ()V diff --git a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping index 2aac57bd1d..bb76f7391b 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping @@ -8,11 +8,15 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector FIELD field_6466 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_19048 getRunningGoals ()Ljava/util/stream/Stream; METHOD method_6273 enableControl (Lnet/minecraft/class_1352$class_4134;)V + ARG 1 control METHOD method_6274 disableControl (Lnet/minecraft/class_1352$class_4134;)V + ARG 1 control METHOD method_6275 tick ()V METHOD method_6276 setControlEnabled (Lnet/minecraft/class_1352$class_4134;Z)V ARG 1 control ARG 2 enabled METHOD method_6277 add (ILnet/minecraft/class_1352;)V ARG 1 weight + ARG 2 goal METHOD method_6280 remove (Lnet/minecraft/class_1352;)V + ARG 1 goal diff --git a/mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping b/mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping index 31beaa9bc2..156428c795 100644 --- a/mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_4255 net/minecraft/entity/ai/goal/LongDoorInteractGoal FIELD field_19005 ticksLeft I METHOD (Lnet/minecraft/class_1308;Z)V ARG 1 mob + ARG 2 delayedClose diff --git a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping index d75e30baf7..e999f12f0e 100644 --- a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1366 net/minecraft/entity/ai/goal/MeleeAttackGoal METHOD (Lnet/minecraft/class_1314;DZ)V ARG 1 mob ARG 2 speed + ARG 4 pauseWhenMobIdle METHOD method_6288 attack (Lnet/minecraft/class_1309;D)V ARG 1 target ARG 2 squaredDistance diff --git a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping index 9d8eb6a826..4bd1fe452e 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_1368 net/minecraft/entity/ai/goal/MoveThroughVillageGo ARG 1 mob ARG 2 speed ARG 4 requiresNighttime + ARG 5 distance + ARG 6 doorPassingThroughGetter diff --git a/mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping index 3276671865..471f6223a5 100644 --- a/mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping @@ -8,8 +8,11 @@ CLASS net/minecraft/class_1381 net/minecraft/entity/ai/goal/ProjectileAttackGoal METHOD (Lnet/minecraft/class_1603;DIF)V ARG 1 mob ARG 2 mobSpeed + ARG 4 intervalTicks ARG 5 maxShootRange METHOD (Lnet/minecraft/class_1603;DIIF)V ARG 1 mob ARG 2 mobSpeed + ARG 4 minIntervalTicks + ARG 5 maxIntervalTicks ARG 6 maxShootRange diff --git a/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulder.mapping b/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.mapping similarity index 93% rename from mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulder.mapping rename to mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.mapping index 214b644daa..b6ae2fcbc6 100644 --- a/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulder.mapping +++ b/mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1360 net/minecraft/entity/ai/goal/SitOnOwnerShoulder +CLASS net/minecraft/class_1360 net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal FIELD field_6478 tameable Lnet/minecraft/class_1471; FIELD field_6479 owner Lnet/minecraft/class_3222; FIELD field_6480 mounted Z diff --git a/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping index dfd38027fb..d91d1de99a 100644 --- a/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_1396 net/minecraft/entity/ai/goal/ZombieAttackGoal METHOD (Lnet/minecraft/class_1642;DZ)V ARG 1 zombie ARG 2 speed + ARG 4 pauseWhenMobIdle diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index e2f4b73bcc..e304597827 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -9,12 +9,17 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation FIELD field_6681 currentPath Lnet/minecraft/class_11; FIELD field_6684 entity Lnet/minecraft/class_1308; FIELD field_6685 lastRecalculateTime J - METHOD method_18416 findPathTo (Ljava/util/Set;IZI)Lnet/minecraft/class_11; + METHOD method_18416 findPathToAny (Ljava/util/Set;IZI)Lnet/minecraft/class_11; + ARG 1 positions + ARG 2 range + ARG 4 distance METHOD method_6333 isValidPosition (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_6334 startMovingAlong (Lnet/minecraft/class_11;D)Z + ARG 1 path ARG 2 speed METHOD method_6335 startMovingTo (Lnet/minecraft/class_1297;D)Z + ARG 1 entity ARG 2 speed METHOD method_6336 createPathNodeNavigator (I)Lnet/minecraft/class_13; METHOD method_6337 startMovingTo (DDDD)Z @@ -37,13 +42,18 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation METHOD method_6345 getCurrentPath ()Lnet/minecraft/class_11; METHOD method_6347 getPos ()Lnet/minecraft/class_243; METHOD method_6348 findPathTo (Lnet/minecraft/class_2338;I)Lnet/minecraft/class_11; + ARG 1 target + ARG 2 distance METHOD method_6349 findPathTo (Lnet/minecraft/class_1297;I)Lnet/minecraft/class_11; + ARG 1 entity + ARG 2 distance METHOD method_6350 canSwim ()Z METHOD method_6351 isInLiquid ()Z METHOD method_6352 findPathTo (DDDI)Lnet/minecraft/class_11; ARG 1 x ARG 3 y ARG 5 z + ARG 7 distance METHOD method_6354 setCanSwim (Z)V ARG 1 canSwim METHOD method_6355 getTargetPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping index 92bae583a4..c7fcde3258 100644 --- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker FIELD field_63 waterPathNodeTypeWeight F - METHOD method_57 getPathNodeType (Lnet/minecraft/class_1308;III)Lnet/minecraft/class_7; + METHOD method_57 getNodeType (Lnet/minecraft/class_1308;III)Lnet/minecraft/class_7; ARG 1 entity ARG 2 x ARG 3 y @@ -13,5 +13,7 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 2 y ARG 3 z ARG 4 maxYStep - METHOD method_63 getPathNodeType (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; + ARG 5 height + ARG 7 direction + METHOD method_63 getNodeType (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/pathing/Path.mapping b/mappings/net/minecraft/entity/ai/pathing/Path.mapping index e7592c2952..48886ec8bb 100644 --- a/mappings/net/minecraft/entity/ai/pathing/Path.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/Path.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path ARG 0 buffer METHOD method_35 getCurrentPosition ()Lnet/minecraft/class_243; METHOD method_36 setLength (I)V + ARG 1 length METHOD method_38 getLength ()I METHOD method_39 getCurrentNodeIndex ()I METHOD method_40 getNode (I)Lnet/minecraft/class_9; diff --git a/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping b/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping index d6a2e5c3e6..760613d229 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5 net/minecraft/entity/ai/pathing/PathMinHeap FIELD field_1 pathNodes [Lnet/minecraft/class_9; FIELD field_2 count I METHOD method_2 push (Lnet/minecraft/class_9;)Lnet/minecraft/class_9; + ARG 1 node METHOD method_3 setNodeWeight (Lnet/minecraft/class_9;F)V ARG 1 node METHOD method_4 shiftUp (I)V diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping index 4efdff2c37..f4b7ebbef3 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping @@ -19,9 +19,11 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode METHOD method_27 isInHeap ()Z METHOD method_28 fromBuffer (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9; ARG 0 buffer - METHOD method_30 calculateHashCode (III)I + METHOD method_30 hash (III)I ARG 0 x ARG 1 y ARG 2 z - METHOD method_31 distance (Lnet/minecraft/class_9;)F - METHOD method_32 distanceSquared (Lnet/minecraft/class_9;)F + METHOD method_31 getDistance (Lnet/minecraft/class_9;)F + ARG 1 node + METHOD method_32 getSquaredDistance (Lnet/minecraft/class_9;)F + ARG 1 node diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping index 133b06a164..1314fd2920 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping @@ -1,40 +1,46 @@ CLASS net/minecraft/class_8 net/minecraft/entity/ai/pathing/PathNodeMaker - FIELD field_25 swims Z + FIELD field_25 canSwim Z FIELD field_26 blockView Lnet/minecraft/class_1941; - FIELD field_27 pathsThroughDoors Z - FIELD field_29 entersOpenDoors Z + FIELD field_27 canOpenDoors Z + FIELD field_29 canEnterOpenDoors Z FIELD field_32 pathNodeCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_33 entity Lnet/minecraft/class_1308; METHOD method_12 init (Lnet/minecraft/class_1941;Lnet/minecraft/class_1308;)V - METHOD method_13 getPathNode (III)Lnet/minecraft/class_9; + METHOD method_13 getNode (III)Lnet/minecraft/class_9; ARG 1 x ARG 2 y + ARG 3 z METHOD method_14 setCanSwim (Z)V + ARG 1 canSwim METHOD method_15 setCanEnterOpenDoors (Z)V - METHOD method_16 getPathNode (DDD)Lnet/minecraft/class_4459; + ARG 1 canEnterOpenDoors + METHOD method_16 getNode (DDD)Lnet/minecraft/class_4459; ARG 1 x ARG 3 y ARG 5 z - METHOD method_17 getPathNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;IIIZZ)Lnet/minecraft/class_7; - ARG 1 blockView + METHOD method_17 getNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;IIIZZ)Lnet/minecraft/class_7; + ARG 1 world ARG 2 x ARG 3 y ARG 4 z - ARG 5 entity - ARG 6 xSize - ARG 7 ySize - ARG 8 zSize - ARG 9 canPathThroughDoors - METHOD method_18 getPathNodes ([Lnet/minecraft/class_9;Lnet/minecraft/class_9;)I - ARG 1 nodes - ARG 2 startNode + ARG 5 mob + ARG 6 sizeX + ARG 7 sizeY + ARG 8 sizeZ + ARG 9 canOpenDoors + ARG 10 canEnterOpenDoors + METHOD method_18 getSuccessors ([Lnet/minecraft/class_9;Lnet/minecraft/class_9;)I + ARG 1 successors + ARG 2 node METHOD method_19 clear ()V - METHOD method_20 setCanPathThroughDoors (Z)V + METHOD method_20 setCanOpenDoors (Z)V + ARG 1 canOpenDoors METHOD method_21 getStart ()Lnet/minecraft/class_9; METHOD method_22 canSwim ()Z METHOD method_23 canEnterOpenDoors ()Z - METHOD method_24 canPathThroughDoors ()Z - METHOD method_25 getPathNodeType (Lnet/minecraft/class_1922;III)Lnet/minecraft/class_7; - ARG 1 blockView + METHOD method_24 canOpenDoors ()Z + METHOD method_25 getNodeType (Lnet/minecraft/class_1922;III)Lnet/minecraft/class_7; + ARG 1 world ARG 2 x ARG 3 y + ARG 4 z diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping index 720866555b..14eabbffb7 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_7 net/minecraft/entity/ai/pathing/PathNodeType - FIELD field_13 weight F - METHOD method_11 getWeight ()F + FIELD field_13 defaultPenalty F + METHOD method_11 getDefaultPenalty ()F diff --git a/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping new file mode 100644 index 0000000000..42f2d63e05 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_4459 net/minecraft/entity/ai/pathing/TargetPathNode + FIELD field_20304 nearestNodeDistance F + FIELD field_20305 nearestNode Lnet/minecraft/class_9; + FIELD field_20306 reached Z + METHOD (III)V + ARG 1 x + ARG 2 y + ARG 3 z + METHOD (Lnet/minecraft/class_9;)V + ARG 1 node + METHOD method_21662 updateNearestNode (FLnet/minecraft/class_9;)V + ARG 1 distance + ARG 2 node + METHOD method_21663 fromBuffer (Lnet/minecraft/class_2540;)Lnet/minecraft/class_4459; + ARG 0 buffer + METHOD method_21664 getNearestNode ()Lnet/minecraft/class_9; + METHOD method_21665 markReached ()V + METHOD method_21666 isReached ()Z diff --git a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping index 6c648b96c8..67a355125f 100644 --- a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_12 net/minecraft/entity/ai/pathing/WaterPathNodeMaker - METHOD method_50 getPathNodeType (III)Lnet/minecraft/class_7; + METHOD method_50 getNodeType (III)Lnet/minecraft/class_7; ARG 1 x ARG 2 y METHOD method_51 getPathNodeInWater (III)Lnet/minecraft/class_9; diff --git a/mappings/net/minecraft/entity/boss/WitherEntity.mapping b/mappings/net/minecraft/entity/boss/WitherEntity.mapping index b824be2f32..dc2da0cdb4 100644 --- a/mappings/net/minecraft/entity/boss/WitherEntity.mapping +++ b/mappings/net/minecraft/entity/boss/WitherEntity.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/class_1528 net/minecraft/entity/boss/WitherEntity ARG 1 headIndex METHOD method_6883 canDestroy (Lnet/minecraft/class_2680;)Z ARG 0 block - METHOD method_6884 getInvulTimer ()I + METHOD method_6884 getInvulnerableTimer ()I METHOD method_6886 getNextAngle (FFF)F ARG 1 prevAngle ARG 2 desiredAngle diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index 4c1ce41476..69f90bcb04 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource FIELD field_5854 ON_FIRE Lnet/minecraft/class_1282; FIELD field_5855 IN_WALL Lnet/minecraft/class_1282; FIELD field_5856 DRAGON_BREATH Lnet/minecraft/class_1282; - FIELD field_5857 damageToCreative Z + FIELD field_5857 outOfWorld Z FIELD field_5858 HOT_FLOOR Lnet/minecraft/class_1282; FIELD field_5859 DROWN Lnet/minecraft/class_1282; FIELD field_5860 FIREWORKS Lnet/minecraft/class_1282; @@ -34,7 +34,7 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource METHOD (Ljava/lang/String;)V ARG 1 name METHOD method_5504 isUnblockable ()Z - METHOD method_5505 setDamageToCreative ()Lnet/minecraft/class_1282; + METHOD method_5505 setOutOfWorld ()Lnet/minecraft/class_1282; METHOD method_5506 getDeathMessage (Lnet/minecraft/class_1309;)Lnet/minecraft/class_2561; METHOD method_5507 setFire ()Lnet/minecraft/class_1282; METHOD method_5508 setBypassesArmor ()Lnet/minecraft/class_1282; @@ -81,4 +81,4 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource ARG 0 magic ARG 1 attacker METHOD method_5537 bypassesArmor ()Z - METHOD method_5538 doesDamageToCreative ()Z + METHOD method_5538 isOutOfWorld ()Z diff --git a/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping index a84138d4b5..77a60342e8 100644 --- a/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping @@ -1,12 +1,16 @@ CLASS net/minecraft/class_1530 net/minecraft/entity/decoration/AbstractDecorationEntity FIELD field_7098 PREDICATE Ljava/util/function/Predicate; FIELD field_7099 facing Lnet/minecraft/class_2350; - FIELD field_7100 blockPos Lnet/minecraft/class_2338; + FIELD field_7100 attachmentPos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 1 world + ARG 1 type + ARG 2 world + ARG 3 pos METHOD method_6889 onBreak (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_6891 getHeightPixels ()I METHOD method_6892 setFacing (Lnet/minecraft/class_2350;)V + ARG 1 facing METHOD method_6894 onPlace ()V METHOD method_6896 getDecorationBlockPos ()Lnet/minecraft/class_2338; METHOD method_6897 getWidthPixels ()I diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index ffb7b7b4c4..5cb10e71fd 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/Painting METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V ARG 1 world ARG 2 pos + ARG 3 direction diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping index c830f756ff..bfbe7bbca6 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping @@ -3,4 +3,7 @@ CLASS net/minecraft/class_1535 net/minecraft/entity/decoration/painting/Painting FIELD field_7151 width I METHOD method_6943 getHeight ()I METHOD method_6944 register (Ljava/lang/String;II)Lnet/minecraft/class_1535; + ARG 0 id + ARG 1 width + ARG 2 height METHOD method_6945 getWidth ()I diff --git a/mappings/net/minecraft/entity/effect/DamageModifierStatusEffect.mapping b/mappings/net/minecraft/entity/effect/DamageModifierStatusEffect.mapping index 498e8eb736..4c16689a52 100644 --- a/mappings/net/minecraft/entity/effect/DamageModifierStatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/DamageModifierStatusEffect.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1287 net/minecraft/entity/effect/DamageModifierStatusEffect FIELD field_5881 modifier D METHOD (Lnet/minecraft/class_4081;ID)V + ARG 1 type ARG 2 color + ARG 3 modifier diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 5b91af6acf..9d44d61a59 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect METHOD method_18792 getType ()Lnet/minecraft/class_4081; METHOD method_5552 canApplyUpdateEffect (II)Z ARG 1 duration + ARG 2 amplifier METHOD method_5554 getRawId (Lnet/minecraft/class_1291;)I ARG 0 type METHOD method_5556 getColor ()I @@ -15,6 +16,7 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 2 attacker ARG 3 target ARG 4 amplifier + ARG 5 proximity METHOD method_5565 getAttributeModifiers ()Ljava/util/Map; METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_1320;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291; ARG 1 attribute @@ -26,3 +28,4 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 0 rawId METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)V ARG 1 entity + ARG 2 amplifier diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 3ae6d79ee2..8a9d1f6bcd 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -10,14 +10,17 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5897 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type + ARG 2 duration METHOD (Lnet/minecraft/class_1291;II)V ARG 1 type ARG 2 duration + ARG 3 amplifier METHOD (Lnet/minecraft/class_1291;IIZZ)V - ARG 1 effect + ARG 1 type ARG 2 duration ARG 3 amplifier - ARG 5 showParticles + ARG 4 ambient + ARG 5 visible METHOD (Lnet/minecraft/class_1291;IIZZZ)V ARG 1 type ARG 2 duration @@ -30,16 +33,20 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_5578 getAmplifier ()I METHOD method_5579 getEffectType ()Lnet/minecraft/class_1291; METHOD method_5580 setPermanent (Z)V + ARG 1 permanent METHOD method_5581 shouldShowParticles ()Z - METHOD method_5582 serialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - METHOD method_5583 deserialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; + METHOD method_5582 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 tag + METHOD method_5583 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; ARG 0 tag METHOD method_5584 getDuration ()I METHOD method_5585 update (Lnet/minecraft/class_1309;)Z METHOD method_5586 getTranslationKey ()Ljava/lang/String; METHOD method_5588 updateDuration ()I METHOD method_5589 applyUpdateEffect (Lnet/minecraft/class_1309;)V + ARG 1 entity METHOD method_5590 upgrade (Lnet/minecraft/class_1293;)Z + ARG 1 that METHOD method_5591 isAmbient ()Z METHOD method_5592 shouldShowIcon ()Z METHOD method_5593 isPermanent ()Z diff --git a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping index 53e85f7013..c1ee84bafa 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_1292 net/minecraft/entity/effect/StatusEffectUtil METHOD method_5574 hasWaterBreathing (Lnet/minecraft/class_1309;)Z + ARG 0 entity METHOD method_5575 getHasteAmplifier (Lnet/minecraft/class_1309;)I + ARG 0 entity METHOD method_5576 hasHaste (Lnet/minecraft/class_1309;)Z + ARG 0 entity METHOD method_5577 durationToString (Lnet/minecraft/class_1293;F)Ljava/lang/String; ARG 0 effect ARG 1 multiplier diff --git a/mappings/net/minecraft/entity/effect/StatusEffects.mapping b/mappings/net/minecraft/entity/effect/StatusEffects.mapping index 8c3dfc2606..775c4383a1 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffects.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffects.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1294 net/minecraft/entity/effect/StatusEffects METHOD method_5594 register (ILjava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; + ARG 0 rawId + ARG 1 id + ARG 2 entry diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 93fd32aa90..7f285080d0 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity - FIELD field_18074 walkTarget Lnet/minecraft/class_2338; - FIELD field_18075 walkTargetRange F + FIELD field_18074 positionTarget Lnet/minecraft/class_2338; + FIELD field_18075 positionTargetRange F FIELD field_18279 holdingEntityId I FIELD field_6184 lootTableSeed J FIELD field_6185 targetSelector Lnet/minecraft/class_1355; @@ -14,7 +14,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_6193 MOB_FLAGS Lnet/minecraft/class_2940; FIELD field_6194 experiencePoints I FIELD field_6195 handItems Lnet/minecraft/class_2371; - FIELD field_6196 pathNodeTypeWeights Ljava/util/Map; + FIELD field_6196 pathfindingPenalties Ljava/util/Map; FIELD field_6198 lootTable Lnet/minecraft/class_2960; FIELD field_6199 target Lnet/minecraft/class_1309; FIELD field_6200 persistent Z @@ -31,12 +31,15 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 1 yaw METHOD method_17326 cannotDespawn ()Z METHOD method_18407 isInWalkTargetRange (Lnet/minecraft/class_2338;)Z - METHOD method_18408 setWalkTarget (Lnet/minecraft/class_2338;I)V + ARG 1 pos + METHOD method_18408 setPositionTarget (Lnet/minecraft/class_2338;I)V + ARG 1 target + ARG 2 range METHOD method_18409 sendAiDebugData ()V - METHOD method_18410 hasWalkTargetRange ()Z + METHOD method_18410 hasPositionTarget ()Z METHOD method_18411 isInWalkTargetRange ()Z - METHOD method_18412 getWalkTarget ()Lnet/minecraft/class_2338; - METHOD method_18413 getWalkTargetRange ()F + METHOD method_18412 getPositionTarget ()Lnet/minecraft/class_2338; + METHOD method_18413 getPositionTargetRange ()F METHOD method_18809 isHolding (Lnet/minecraft/class_1792;)Z METHOD method_18810 setHoldingEntityId (I)V ARG 1 id @@ -61,10 +64,11 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5938 setSidewaysSpeed (F)V ARG 1 sidewaysMovement METHOD method_5939 canPickupItem (Lnet/minecraft/class_1799;)Z + ARG 1 stack METHOD method_5940 deserializeLeashTag ()V - METHOD method_5941 setPathNodeTypeWeight (Lnet/minecraft/class_7;F)V - ARG 1 type - ARG 2 weight + METHOD method_5941 setPathfindingPenalty (Lnet/minecraft/class_7;F)V + ARG 1 nodeType + ARG 2 penalty METHOD method_5942 getNavigation ()Lnet/minecraft/class_1408; METHOD method_5943 initialize (Lnet/minecraft/class_1936;Lnet/minecraft/class_1266;Lnet/minecraft/class_3730;Lnet/minecraft/class_1315;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1315; ARG 1 world @@ -72,8 +76,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 3 spawnType ARG 4 entityData ARG 5 entityTag - METHOD method_5944 getPathNodeTypeWeight (Lnet/minecraft/class_7;)F - ARG 1 type + METHOD method_5944 getPathfindingPenalty (Lnet/minecraft/class_7;)F + ARG 1 nodeType METHOD method_5945 getLimitPerChunk ()I METHOD method_5946 setEquipmentDropChance (Lnet/minecraft/class_1304;F)V ARG 1 slot diff --git a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping new file mode 100644 index 0000000000..049c8ed146 --- /dev/null +++ b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_1480 net/minecraft/entity/mob/WaterCreatureEntity + METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V + ARG 1 type + METHOD method_6673 tickWaterBreathingAir (I)V + ARG 1 air diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 99d6ccd2a6..4903468a9a 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -25,7 +25,9 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity METHOD method_7211 canBreakDoors ()Z METHOD method_7212 shouldBreakDoors ()Z METHOD method_7213 setTicksUntilWaterConversion (I)V + ARG 1 ticksUntilWaterConversion METHOD method_7215 getSkull ()Lnet/minecraft/class_1799; METHOD method_7216 burnsInDaylight ()Z - METHOD method_7217 setChild (Z)V + METHOD method_7217 setBaby (Z)V + ARG 1 baby METHOD method_7218 convertInWater ()V diff --git a/mappings/net/minecraft/entity/passive/FishEntity.mapping b/mappings/net/minecraft/entity/passive/FishEntity.mapping index 45b5c43d44..c75bb0b706 100644 --- a/mappings/net/minecraft/entity/passive/FishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FishEntity.mapping @@ -11,6 +11,11 @@ CLASS net/minecraft/class_1422 net/minecraft/entity/passive/FishEntity METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type METHOD method_20662 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z + ARG 0 type + ARG 1 world + ARG 2 spawnType + ARG 3 pos + ARG 4 random METHOD method_6452 getFishBucketItem ()Lnet/minecraft/class_1799; METHOD method_6453 isFromBucket ()Z METHOD method_6454 setFromBucket (Z)V diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 372892093f..0f26a3f177 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -125,7 +125,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity METHOD method_18280 addTypeSpecificGoals ()V METHOD method_18281 getTrustedUuids ()Ljava/util/List; METHOD method_18282 isAggressive ()Z - METHOD method_18283 wakeUp ()V + METHOD method_18283 stopSleeping ()V METHOD method_18284 stopActions ()V METHOD method_18285 wantsToPickupItem ()Z METHOD method_18289 spit (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping index e61663cf44..d1cf0ebf8e 100644 --- a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_1439 net/minecraft/entity/passive/IronGolemEntity FIELD field_6763 IRON_GOLEM_FLAGS Lnet/minecraft/class_2940; METHOD method_6496 isPlayerCreated ()Z METHOD method_6499 setPlayerCreated (Z)V + ARG 1 playerCreated diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 51515511c2..8b9dbb94c8 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -12,10 +12,12 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity ARG 0 color METHOD method_6796 initializeStrength ()V METHOD method_6798 setVariant (I)V + ARG 1 variant METHOD method_6799 setCarpetColor (Lnet/minecraft/class_1767;)V ARG 1 color METHOD method_6800 getCarpetColor ()Lnet/minecraft/class_1767; METHOD method_6802 setStrength (I)V + ARG 1 strength METHOD method_6803 getStrength ()I METHOD method_6805 isFollowing ()Z METHOD method_6806 getFollowing ()Lnet/minecraft/class_1501; diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 138ff1be9a..d6d691e5be 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity METHOD method_6720 isScaredOf (Lnet/minecraft/class_1501;)Z ARG 1 llama FIELD field_18004 FOLLOW_TAMED_PREDICATE Ljava/util/function/Predicate; - FIELD field_6944 wet Z + FIELD field_6944 furWet Z FIELD field_6945 lastShakeProgress F FIELD field_6946 BEGGING Lnet/minecraft/class_2940; FIELD field_6947 shakeProgress F @@ -19,13 +19,23 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity FIELD field_6950 COLLAR_COLOR Lnet/minecraft/class_2940; FIELD field_6951 canShakeWaterOff Z FIELD field_6952 begAnimationProgress F - METHOD method_6707 getWetBrightnessMultiplier (F)F + METHOD method_6707 getFurWetBrightnessMultiplier (F)F + COMMENT Returns this wolf's brightness multiplier based on the fur wetness. + COMMENT

+ COMMENT The brightness multiplier represents how much darker the wolf gets while its fur is wet. The multiplier changes (from 0.75 to 1.0 incrementally) when a wolf shakes. + COMMENT + COMMENT @param tickDelta Progress for linearly interpolating between the previous and current game state. + COMMENT @return Brightness as a float value between 0.75 and 1.0. + COMMENT @see net.minecraft.client.render.entity.model.TintableAnimalModel#setColorMultiplier(float, float, float) ARG 1 tickDelta METHOD method_6708 setCollarColor (Lnet/minecraft/class_1767;)V ARG 1 color METHOD method_6709 isAngry ()Z METHOD method_6710 isBegging ()Z - METHOD method_6711 isWet ()Z + METHOD method_6711 isFurWet ()Z + COMMENT Returns whether this wolf's fur is wet. + COMMENT

+ COMMENT The wolf's fur will remain wet until the wolf shakes. METHOD method_6712 setBegging (Z)V ARG 1 begging METHOD method_6713 getCollarColor ()Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping index ba38c6b299..74a5948049 100644 --- a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping +++ b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping @@ -10,11 +10,15 @@ CLASS net/minecraft/class_1796 net/minecraft/entity/player/ItemCooldownManager METHOD method_7900 remove (Lnet/minecraft/class_1792;)V ARG 1 item METHOD method_7901 onCooldownUpdate (Lnet/minecraft/class_1792;)V + ARG 1 item METHOD method_7902 onCooldownUpdate (Lnet/minecraft/class_1792;I)V ARG 1 item + ARG 2 duration METHOD method_7903 update ()V METHOD method_7904 isCoolingDown (Lnet/minecraft/class_1792;)Z + ARG 1 item METHOD method_7905 getCooldownProgress (Lnet/minecraft/class_1792;F)F + ARG 1 item ARG 2 partialTicks METHOD method_7906 set (Lnet/minecraft/class_1792;I)V ARG 1 item diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 1b3724278a..10548b6b0d 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730; FIELD field_7487 sleepTimer I FIELD field_7488 MAIN_ARM Lnet/minecraft/class_2940; - FIELD field_7490 isInWater Z + FIELD field_7490 isSubmergedInWater Z FIELD field_7491 ABSORPTION_AMOUNT Lnet/minecraft/class_2940; FIELD field_7493 hungerManager Lnet/minecraft/class_1702; FIELD field_7494 enchantmentTableSeed I @@ -29,7 +29,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_7513 fishHook Lnet/minecraft/class_1536; FIELD field_7514 inventory Lnet/minecraft/class_1661; FIELD field_7515 spawnForced Z - FIELD field_7518 PLAYER_MODEL_BIT_MASK Lnet/minecraft/class_2940; + FIELD field_7518 PLAYER_MODEL_PARTS Lnet/minecraft/class_2940; FIELD field_7520 experienceLevel I FIELD field_7523 reducedDebugInfo Z FIELD field_7525 selectedItem Lnet/minecraft/class_1799; @@ -116,7 +116,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7292 getLuck ()F METHOD method_7293 vanishCursedItems ()V METHOD method_7294 canModifyWorld ()Z - METHOD method_7295 updateInWater ()Z + METHOD method_7295 updateWaterSubmersionState ()Z METHOD method_7297 getSleepTimer ()I METHOD method_7298 addShoulderEntity (Lnet/minecraft/class_2487;)Z ARG 1 tag @@ -184,7 +184,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7345 setShoulderEntityRight (Lnet/minecraft/class_2487;)V ARG 1 entityTag METHOD method_7346 closeContainer ()V - METHOD method_7348 isSkinOverlayVisible (Lnet/minecraft/class_1664;)Z + METHOD method_7348 isPartVisible (Lnet/minecraft/class_1664;)Z ARG 1 modelPart METHOD method_7349 getNextLevelExperience ()I METHOD method_7350 resetLastAttackedTicks ()V diff --git a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping index 3f46049464..a0cf3c1842 100644 --- a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEntity CLASS class_1537 State FIELD field_7165 hookedEntity Lnet/minecraft/class_1297; - FIELD field_7168 luckOfTheSeaLevel I + FIELD field_7168 lureLevel I FIELD field_7170 HOOK_ENTITY_ID Lnet/minecraft/class_2940; - FIELD field_7171 lureLevel I + FIELD field_7171 luckOfTheSeaLevel I FIELD field_7175 state Lnet/minecraft/class_1536$class_1537; FIELD field_7177 owner Lnet/minecraft/class_1657; METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;II)V diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 54a3b12d77..5e44979a03 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -28,13 +28,19 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/ProjectileEntity ARG 1 type METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V METHOD method_7433 setNoClip (Z)V + ARG 1 noClip METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966; + ARG 1 currentPosition + ARG 2 nextPosition METHOD method_7436 getDragInWater ()F METHOD method_7438 setDamage (D)V + ARG 1 damage METHOD method_7439 setCritical (Z)V - METHOD method_7440 getSound ()Lnet/minecraft/class_3414; + ARG 1 critical + METHOD method_7440 getHitSound ()Lnet/minecraft/class_3414; METHOD method_7441 isNoClip ()Z METHOD method_7442 setShotFromCrossbow (Z)V + ARG 1 shotFromCrossbow METHOD method_7443 isCritical ()Z METHOD method_7444 setSound (Lnet/minecraft/class_3414;)V ARG 1 sound @@ -45,14 +51,19 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/ProjectileEntity METHOD method_7450 onHit (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_7451 setPierceLevel (B)V + ARG 1 level METHOD method_7452 getOwner ()Lnet/minecraft/class_1297; METHOD method_7453 clearPiercingStatus ()V METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V METHOD method_7455 setProjectileFlag (IZ)V ARG 1 index + ARG 2 flag METHOD method_7456 isShotFromCrossbow ()Z METHOD method_7457 onHit (Lnet/minecraft/class_239;)V METHOD method_7474 setProperties (Lnet/minecraft/class_1297;FFFFF)V ARG 1 user ARG 2 pitch ARG 3 yaw + ARG 4 roll + ARG 5 modifierZ + ARG 6 modifierXYZ diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index ceccc041c1..2b9e5fdfec 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti ARG 1 x ARG 2 y ARG 3 z + ARG 4 powered METHOD method_7507 getDamageWobbleTicks ()I METHOD method_7509 setDamageWobbleTicks (I)V ARG 1 wobbleTicks diff --git a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping index 3d572e3d15..9f21c0fb4a 100644 --- a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping @@ -59,7 +59,7 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity METHOD method_7542 setDamageWobbleStrength (F)V ARG 1 wobbleStrength METHOD method_7543 getDamageWobbleSide ()I - METHOD method_7545 checKBoatInWater ()Z + METHOD method_7545 checkBoatInWater ()Z METHOD method_7546 copyEntityData (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_7547 interpolateBubbleWobble (F)F diff --git a/mappings/net/minecraft/fluid/BaseFluid.mapping b/mappings/net/minecraft/fluid/BaseFluid.mapping index bb6662a934..07832e8fe6 100644 --- a/mappings/net/minecraft/fluid/BaseFluid.mapping +++ b/mappings/net/minecraft/fluid/BaseFluid.mapping @@ -2,7 +2,11 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid FIELD field_15900 LEVEL Lnet/minecraft/class_2758; FIELD field_15902 FALLING Lnet/minecraft/class_2746; FIELD field_17587 shapeCache Ljava/util/Map; - METHOD method_15725 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)V + METHOD method_15725 tryFlow (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)V + ARG 1 world + ARG 2 fluidPos + ARG 3 state + METHOD method_15726 getSpread (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Ljava/util/Map; ARG 1 world ARG 2 pos ARG 3 state @@ -27,21 +31,45 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid ARG 5 fromPos ARG 6 fromState METHOD method_15737 isInfinite ()Z + METHOD method_15738 canFlow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Lnet/minecraft/class_3611;)Z + ARG 1 world + ARG 2 fluidPos + ARG 3 fluidBlockState + ARG 4 flowDirection + ARG 5 flowTo + ARG 6 flowToBlockState METHOD method_15739 getLevelDecreasePerBlock (Lnet/minecraft/class_1941;)I ARG 1 world METHOD method_15745 flow (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_3610;)V ARG 1 world ARG 2 pos ARG 3 state + ARG 4 direction ARG 5 fluidState + METHOD method_15746 canFlowThrough (Lnet/minecraft/class_1922;Lnet/minecraft/class_3611;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z + ARG 1 world + ARG 2 fluid + ARG 3 pos + ARG 4 state + ARG 5 face + ARG 6 fromPos + ARG 7 fromState + ARG 8 fluidState METHOD method_15750 getFlowing ()Lnet/minecraft/class_3611; METHOD method_15751 getStill ()Lnet/minecraft/class_3611; + METHOD method_15752 isMatchingAndStill (Lnet/minecraft/class_3610;)Z + ARG 1 state METHOD method_15753 getNextTickDelay (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_3610;)I ARG 1 world ARG 2 pos ARG 3 oldState ARG 4 newState + METHOD method_15754 canFill (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)Z + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 fluid METHOD method_17774 isFluidAboveEqual (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 state - ARG 1 view + ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index c9dbac1cf5..bd7db26634 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -1,32 +1,57 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid FIELD field_15903 defaultState Lnet/minecraft/class_3610; FIELD field_15904 STATE_IDS Lnet/minecraft/class_2361; - FIELD field_15905 stateFactory Lnet/minecraft/class_2689; + FIELD field_15905 stateManager Lnet/minecraft/class_2689; METHOD method_15774 getBucketItem ()Lnet/minecraft/class_1792; METHOD method_15775 appendProperties (Lnet/minecraft/class_2689$class_2690;)V METHOD method_15776 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 random + METHOD method_15777 canBeReplacedWith (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;Lnet/minecraft/class_2350;)Z + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 fluid + ARG 5 direction METHOD method_15778 onScheduledTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)V ARG 1 world ARG 2 pos ARG 3 state METHOD method_15779 getLevel (Lnet/minecraft/class_3610;)I + ARG 1 state METHOD method_15780 matchesType (Lnet/minecraft/class_3611;)Z + ARG 1 fluid METHOD method_15781 setDefaultState (Lnet/minecraft/class_3610;)V + ARG 1 state METHOD method_15782 getVelocity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_243; ARG 1 world ARG 2 pos ARG 3 state - METHOD method_15783 getStateFactory ()Lnet/minecraft/class_2689; + METHOD method_15783 getStateManager ()Lnet/minecraft/class_2689; METHOD method_15784 getBlastResistance ()F METHOD method_15785 getDefaultState ()Lnet/minecraft/class_3610; METHOD method_15786 getRenderLayer ()Lnet/minecraft/class_1921; METHOD method_15787 getParticle ()Lnet/minecraft/class_2394; METHOD method_15788 getHeight (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_15789 getTickRate (Lnet/minecraft/class_1941;)I METHOD method_15790 toBlockState (Lnet/minecraft/class_3610;)Lnet/minecraft/class_2680; + ARG 1 state METHOD method_15791 matches (Lnet/minecraft/class_3494;)Z + ARG 1 tag METHOD method_15792 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V + ARG 1 world + ARG 2 pos + ARG 3 state METHOD method_15793 isStill (Lnet/minecraft/class_3610;)Z + ARG 1 state METHOD method_15794 isEmpty ()Z METHOD method_15795 hasRandomTicks ()Z METHOD method_17775 getShape (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; + ARG 1 state + ARG 2 world + ARG 3 pos diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 0d1f415d29..541afed96f 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD method_15757 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V + ARG 1 world + ARG 2 pos + ARG 3 random METHOD method_15758 getVelocity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; ARG 1 world ARG 2 pos @@ -8,13 +11,21 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD method_15761 getLevel ()I METHOD method_15762 getRenderLayer ()Lnet/minecraft/class_1921; METHOD method_15763 getHeight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F + ARG 1 world + ARG 2 pos METHOD method_15765 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3610; ARG 0 dynamic METHOD method_15766 getParticle ()Lnet/minecraft/class_2394; METHOD method_15767 matches (Lnet/minecraft/class_3494;)Z + ARG 1 tag METHOD method_15768 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V + ARG 1 world + ARG 2 pos + ARG 3 random METHOD method_15769 isEmpty ()Z METHOD method_15770 onScheduledTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos METHOD method_15771 isStill ()Z METHOD method_15772 getFluid ()Lnet/minecraft/class_3611; METHOD method_15773 hasRandomTicks ()Z @@ -22,3 +33,5 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState ARG 0 ops ARG 1 state METHOD method_17776 getShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/fluid/LavaFluid.mapping b/mappings/net/minecraft/fluid/LavaFluid.mapping index 80f84c88b1..07829fa933 100644 --- a/mappings/net/minecraft/fluid/LavaFluid.mapping +++ b/mappings/net/minecraft/fluid/LavaFluid.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_3616 net/minecraft/fluid/LavaFluid + METHOD method_15817 hasBurnableBlock (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos + METHOD method_15818 playExtinguishEvent (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos + METHOD method_15819 canLightFire (Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos CLASS class_3617 Flowing CLASS class_3618 Still diff --git a/mappings/net/minecraft/inventory/ContainerLock.mapping b/mappings/net/minecraft/inventory/ContainerLock.mapping new file mode 100644 index 0000000000..df02ef37d8 --- /dev/null +++ b/mappings/net/minecraft/inventory/ContainerLock.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_1273 net/minecraft/inventory/ContainerLock + FIELD field_5817 EMPTY Lnet/minecraft/class_1273; + COMMENT An empty container lock that can always be opened. + FIELD field_5818 key Ljava/lang/String; + METHOD method_5472 canOpen (Lnet/minecraft/class_1799;)Z + COMMENT Returns true if this lock can be opened with the key item stack. + COMMENT

+ COMMENT An item stack is a valid key if the stack name matches the key string of this lock, + COMMENT or if the key string is empty. + ARG 1 stack + COMMENT the key item stack + METHOD method_5473 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1273; + COMMENT Creates a new {@code ContainerLock} from the {@code Lock} key of the compound tag. + COMMENT

+ COMMENT If the {@code Lock} key is not present, returns an empty lock. + ARG 0 tag + METHOD method_5474 toTag (Lnet/minecraft/class_2487;)V + COMMENT Inserts the key string of this lock into the {@code Lock} key of the compound tag. + ARG 1 tag diff --git a/mappings/net/minecraft/item/ItemUsageContext.mapping b/mappings/net/minecraft/item/ItemUsageContext.mapping index 8b2a1fd50a..2b2bafe75c 100644 --- a/mappings/net/minecraft/item/ItemUsageContext.mapping +++ b/mappings/net/minecraft/item/ItemUsageContext.mapping @@ -23,4 +23,4 @@ CLASS net/minecraft/class_1838 net/minecraft/item/ItemUsageContext METHOD method_8042 getPlayerFacing ()Lnet/minecraft/class_2350; METHOD method_8044 getPlayerYaw ()F METHOD method_8045 getWorld ()Lnet/minecraft/class_1937; - METHOD method_8046 isPlayerSneaking ()Z + METHOD method_8046 shouldCancelInteraction ()Z diff --git a/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping b/mappings/net/minecraft/loot/BinomialLootTableRange.mapping similarity index 87% rename from mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping rename to mappings/net/minecraft/loot/BinomialLootTableRange.mapping index b1e6967826..e7538c96f0 100644 --- a/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping +++ b/mappings/net/minecraft/loot/BinomialLootTableRange.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_40 net/minecraft/world/loot/BinomialLootTableRange +CLASS net/minecraft/class_40 net/minecraft/loot/BinomialLootTableRange CLASS class_41 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping b/mappings/net/minecraft/loot/ConstantLootTableRange.mapping similarity index 87% rename from mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping rename to mappings/net/minecraft/loot/ConstantLootTableRange.mapping index a1bb2f6d7b..a94544790c 100644 --- a/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping +++ b/mappings/net/minecraft/loot/ConstantLootTableRange.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_44 net/minecraft/world/loot/ConstantLootTableRange +CLASS net/minecraft/class_44 net/minecraft/loot/ConstantLootTableRange CLASS class_45 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/world/loot/LootChoice.mapping b/mappings/net/minecraft/loot/LootChoice.mapping similarity index 71% rename from mappings/net/minecraft/world/loot/LootChoice.mapping rename to mappings/net/minecraft/loot/LootChoice.mapping index bc1df587e6..86f38dcd5f 100644 --- a/mappings/net/minecraft/world/loot/LootChoice.mapping +++ b/mappings/net/minecraft/loot/LootChoice.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_82 net/minecraft/world/loot/LootChoice +CLASS net/minecraft/class_82 net/minecraft/loot/LootChoice METHOD method_426 drop (Ljava/util/function/Consumer;Lnet/minecraft/class_47;)V ARG 1 itemDropper ARG 2 context diff --git a/mappings/net/minecraft/world/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping similarity index 92% rename from mappings/net/minecraft/world/loot/LootManager.mapping rename to mappings/net/minecraft/loot/LootManager.mapping index 344ff3dce0..499d52ada8 100644 --- a/mappings/net/minecraft/world/loot/LootManager.mapping +++ b/mappings/net/minecraft/loot/LootManager.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_60 net/minecraft/world/loot/LootManager +CLASS net/minecraft/class_60 net/minecraft/loot/LootManager FIELD field_970 suppliers Ljava/util/Map; FIELD field_974 GSON Lcom/google/gson/Gson; FIELD field_975 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/world/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping similarity index 97% rename from mappings/net/minecraft/world/loot/LootPool.mapping rename to mappings/net/minecraft/loot/LootPool.mapping index 8f65509faf..27080a3f32 100644 --- a/mappings/net/minecraft/world/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_55 net/minecraft/world/loot/LootPool +CLASS net/minecraft/class_55 net/minecraft/loot/LootPool CLASS class_56 Builder FIELD field_959 rollsRange Lnet/minecraft/class_59; FIELD field_960 entries Ljava/util/List; diff --git a/mappings/net/minecraft/world/loot/LootSupplier.mapping b/mappings/net/minecraft/loot/LootTable.mapping similarity index 96% rename from mappings/net/minecraft/world/loot/LootSupplier.mapping rename to mappings/net/minecraft/loot/LootTable.mapping index 408449fa96..b7b0f89889 100644 --- a/mappings/net/minecraft/world/loot/LootSupplier.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_52 net/minecraft/world/loot/LootSupplier +CLASS net/minecraft/class_52 net/minecraft/loot/LootTable CLASS class_53 Builder FIELD field_949 pools Ljava/util/List; FIELD field_950 type Lnet/minecraft/class_176; @@ -25,7 +25,7 @@ CLASS net/minecraft/class_52 net/minecraft/world/loot/LootSupplier FIELD field_947 GENERIC Lnet/minecraft/class_176; FIELD field_948 EMPTY Lnet/minecraft/class_52; METHOD (Lnet/minecraft/class_176;[Lnet/minecraft/class_55;[Lnet/minecraft/class_117;)V - ARG 1 contextType + ARG 1 type ARG 2 pools ARG 3 functions METHOD method_319 getDrops (Lnet/minecraft/class_47;)Ljava/util/List; diff --git a/mappings/net/minecraft/world/loot/LootTableRange.mapping b/mappings/net/minecraft/loot/LootTableRange.mapping similarity index 79% rename from mappings/net/minecraft/world/loot/LootTableRange.mapping rename to mappings/net/minecraft/loot/LootTableRange.mapping index 3363704b86..335b0fbfb1 100644 --- a/mappings/net/minecraft/world/loot/LootTableRange.mapping +++ b/mappings/net/minecraft/loot/LootTableRange.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_59 net/minecraft/world/loot/LootTableRange +CLASS net/minecraft/class_59 net/minecraft/loot/LootTableRange FIELD field_967 UNIFORM Lnet/minecraft/class_2960; FIELD field_968 CONSTANT Lnet/minecraft/class_2960; FIELD field_969 BINOMIAL Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/loot/LootTableRanges.mapping b/mappings/net/minecraft/loot/LootTableRanges.mapping new file mode 100644 index 0000000000..46dbf039ea --- /dev/null +++ b/mappings/net/minecraft/loot/LootTableRanges.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_63 net/minecraft/loot/LootTableRanges + FIELD field_978 types Ljava/util/Map; + METHOD method_383 fromJson (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_59; + ARG 0 json + ARG 1 context + METHOD method_384 toJson (Lnet/minecraft/class_59;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; + ARG 0 range + ARG 1 context diff --git a/mappings/net/minecraft/world/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping similarity index 88% rename from mappings/net/minecraft/world/loot/LootTableReporter.mapping rename to mappings/net/minecraft/loot/LootTableReporter.mapping index cb2af9dfd1..9e86e0e0bd 100644 --- a/mappings/net/minecraft/world/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_58 net/minecraft/world/loot/LootTableReporter +CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter FIELD field_964 name Ljava/lang/String; FIELD field_965 messages Lcom/google/common/collect/Multimap; FIELD field_966 nameFactory Ljava/util/function/Supplier; diff --git a/mappings/net/minecraft/world/loot/LootTables.mapping b/mappings/net/minecraft/loot/LootTables.mapping similarity index 97% rename from mappings/net/minecraft/world/loot/LootTables.mapping rename to mappings/net/minecraft/loot/LootTables.mapping index c596505ae5..c06e7bbdcd 100644 --- a/mappings/net/minecraft/world/loot/LootTables.mapping +++ b/mappings/net/minecraft/loot/LootTables.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_39 net/minecraft/world/loot/LootTables +CLASS net/minecraft/class_39 net/minecraft/loot/LootTables FIELD field_16748 VILLAGE_PLAINS_CHEST Lnet/minecraft/class_2960; FIELD field_16749 VILLAGE_TAIGA_HOUSE_CHEST Lnet/minecraft/class_2960; FIELD field_16750 VILLAGE_TANNERY_CHEST Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping b/mappings/net/minecraft/loot/UniformLootTableRange.mapping similarity index 91% rename from mappings/net/minecraft/world/loot/UniformLootTableRange.mapping rename to mappings/net/minecraft/loot/UniformLootTableRange.mapping index 6cbe84fe7f..755c8103ef 100644 --- a/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping +++ b/mappings/net/minecraft/loot/UniformLootTableRange.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_61 net/minecraft/world/loot/UniformLootTableRange +CLASS net/minecraft/class_61 net/minecraft/loot/UniformLootTableRange CLASS class_62 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping similarity index 84% rename from mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping rename to mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping index 916e3b9b37..72c551aa2e 100644 --- a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_186 net/minecraft/world/loot/condition/AlternativeLootCondition +CLASS net/minecraft/class_186 net/minecraft/loot/condition/AlternativeLootCondition CLASS class_187 Builder FIELD field_1248 terms Ljava/util/List; METHOD ([Lnet/minecraft/class_209$class_210;)V diff --git a/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping similarity index 93% rename from mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping rename to mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping index aea19786fc..3fd3d95b59 100644 --- a/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_212 net/minecraft/world/loot/condition/BlockStatePropertyLootCondition +CLASS net/minecraft/class_212 net/minecraft/loot/condition/BlockStatePropertyLootCondition CLASS class_213 Builder FIELD field_1289 availableProperties Ljava/util/Set; FIELD field_1290 block Lnet/minecraft/class_2248; diff --git a/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping similarity index 75% rename from mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping rename to mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping index 97121b720b..d04aa933ac 100644 --- a/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_190 net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition +CLASS net/minecraft/class_190 net/minecraft/loot/condition/DamageSourcePropertiesLootCondition CLASS class_191 Factory FIELD field_1256 predicate Lnet/minecraft/class_2022; METHOD (Lnet/minecraft/class_2022;)V diff --git a/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping similarity index 86% rename from mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping rename to mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping index 20e470776e..c5b425c8bd 100644 --- a/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_215 net/minecraft/world/loot/condition/EntityPropertiesLootCondition +CLASS net/minecraft/class_215 net/minecraft/loot/condition/EntityPropertiesLootCondition CLASS class_216 Factory FIELD field_1292 entity Lnet/minecraft/class_47$class_50; FIELD field_1293 predicate Lnet/minecraft/class_2048; diff --git a/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping similarity index 84% rename from mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping rename to mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping index 60e94aae0d..6fbbd74047 100644 --- a/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_199 net/minecraft/world/loot/condition/EntityScoresLootCondition +CLASS net/minecraft/class_199 net/minecraft/loot/condition/EntityScoresLootCondition CLASS class_200 Factory FIELD field_1278 target Lnet/minecraft/class_47$class_50; FIELD field_1279 scores Ljava/util/Map; diff --git a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping similarity index 77% rename from mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping rename to mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping index 584bef6a72..34c70e12a3 100644 --- a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_207 net/minecraft/world/loot/condition/InvertedLootCondition +CLASS net/minecraft/class_207 net/minecraft/loot/condition/InvertedLootCondition CLASS class_208 Factory FIELD field_1283 term Lnet/minecraft/class_209; METHOD (Lnet/minecraft/class_209;)V diff --git a/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping similarity index 67% rename from mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping rename to mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping index a7200bd204..aec5fa5e71 100644 --- a/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_221 net/minecraft/world/loot/condition/KilledByPlayerLootCondition +CLASS net/minecraft/class_221 net/minecraft/loot/condition/KilledByPlayerLootCondition CLASS class_222 Factory FIELD field_1297 INSTANCE Lnet/minecraft/class_221; METHOD method_939 builder ()Lnet/minecraft/class_209$class_210; diff --git a/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping similarity index 77% rename from mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping rename to mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping index 8e75ff87d1..6aa1a0f069 100644 --- a/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_205 net/minecraft/world/loot/condition/LocationCheckLootCondition +CLASS net/minecraft/class_205 net/minecraft/loot/condition/LocationCheckLootCondition CLASS class_206 Factory FIELD field_1282 predicate Lnet/minecraft/class_2090; METHOD (Lnet/minecraft/class_2090;)V diff --git a/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping b/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping similarity index 63% rename from mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping rename to mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping index cc1360bf5b..cce69d4cdd 100644 --- a/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_192 net/minecraft/world/loot/ConditionConsumerBuilder +CLASS net/minecraft/class_192 net/minecraft/loot/condition/LootConditionConsumingBuilder METHOD method_512 getThis ()Ljava/lang/Object; METHOD method_840 withCondition (Lnet/minecraft/class_209$class_210;)Ljava/lang/Object; ARG 1 builder diff --git a/mappings/net/minecraft/world/loot/condition/LootConditions.mapping b/mappings/net/minecraft/loot/condition/LootConditions.mapping similarity index 94% rename from mappings/net/minecraft/world/loot/condition/LootConditions.mapping rename to mappings/net/minecraft/loot/condition/LootConditions.mapping index 8ce8db5b77..11a74311ef 100644 --- a/mappings/net/minecraft/world/loot/condition/LootConditions.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditions.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_217 net/minecraft/world/loot/condition/LootConditions +CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditions CLASS class_218 Factory METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping similarity index 78% rename from mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping rename to mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping index 42839940cd..d9f2a98a09 100644 --- a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_223 net/minecraft/world/loot/condition/MatchToolLootCondition +CLASS net/minecraft/class_223 net/minecraft/loot/condition/MatchToolLootCondition CLASS class_224 Factory FIELD field_1298 predicate Lnet/minecraft/class_2073; METHOD (Lnet/minecraft/class_2073;)V diff --git a/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping similarity index 70% rename from mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping rename to mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping index 692edc2246..5f7665c82b 100644 --- a/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_219 net/minecraft/world/loot/condition/RandomChanceLootCondition +CLASS net/minecraft/class_219 net/minecraft/loot/condition/RandomChanceLootCondition CLASS class_220 Factory FIELD field_1296 chance F METHOD (F)V diff --git a/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping similarity index 75% rename from mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping rename to mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping index 047f334f88..350f950f41 100644 --- a/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_225 net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition +CLASS net/minecraft/class_225 net/minecraft/loot/condition/RandomChanceWithLootingLootCondition CLASS class_226 Factory FIELD field_1299 lootingMultiplier F FIELD field_1300 chance F diff --git a/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping similarity index 66% rename from mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping rename to mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping index 47cea66fb1..ba401c13db 100644 --- a/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_201 net/minecraft/world/loot/condition/SurvivesExplosionLootCondition +CLASS net/minecraft/class_201 net/minecraft/loot/condition/SurvivesExplosionLootCondition CLASS class_202 Factory FIELD field_1280 INSTANCE Lnet/minecraft/class_201; METHOD method_871 builder ()Lnet/minecraft/class_209$class_210; diff --git a/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping similarity index 80% rename from mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping rename to mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping index e795a3c191..1863409070 100644 --- a/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_182 net/minecraft/world/loot/condition/TableBonusLootCondition +CLASS net/minecraft/class_182 net/minecraft/loot/condition/TableBonusLootCondition CLASS class_183 Factory FIELD field_1234 enchantment Lnet/minecraft/class_1887; FIELD field_1235 chances [F diff --git a/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping similarity index 74% rename from mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping rename to mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping index 029dce5171..2cff4f48a1 100644 --- a/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_227 net/minecraft/world/loot/condition/WeatherCheckLootCondition +CLASS net/minecraft/class_227 net/minecraft/loot/condition/WeatherCheckLootCondition CLASS class_228 Factory FIELD field_1301 thundering Ljava/lang/Boolean; FIELD field_1302 raining Ljava/lang/Boolean; diff --git a/mappings/net/minecraft/world/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping similarity index 97% rename from mappings/net/minecraft/world/loot/context/LootContext.mapping rename to mappings/net/minecraft/loot/context/LootContext.mapping index 4bcf965470..e9bdf7cf56 100644 --- a/mappings/net/minecraft/world/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_47 net/minecraft/world/loot/context/LootContext +CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext CLASS class_48 Builder FIELD field_930 world Lnet/minecraft/class_3218; FIELD field_931 luck F diff --git a/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping b/mappings/net/minecraft/loot/context/LootContextAware.mapping similarity index 76% rename from mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping rename to mappings/net/minecraft/loot/context/LootContextAware.mapping index 1f0c1c4086..f47dfe2a7f 100644 --- a/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping +++ b/mappings/net/minecraft/loot/context/LootContextAware.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_46 net/minecraft/world/loot/context/ParameterConsumer +CLASS net/minecraft/class_46 net/minecraft/loot/context/LootContextAware METHOD method_292 check (Lnet/minecraft/class_58;Ljava/util/function/Function;Ljava/util/Set;Lnet/minecraft/class_176;)V ARG 1 reporter ARG 2 supplierGetter diff --git a/mappings/net/minecraft/world/loot/context/LootContextParameter.mapping b/mappings/net/minecraft/loot/context/LootContextParameter.mapping similarity index 66% rename from mappings/net/minecraft/world/loot/context/LootContextParameter.mapping rename to mappings/net/minecraft/loot/context/LootContextParameter.mapping index 78d4f6cf65..ceb7dbbd89 100644 --- a/mappings/net/minecraft/world/loot/context/LootContextParameter.mapping +++ b/mappings/net/minecraft/loot/context/LootContextParameter.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_169 net/minecraft/world/loot/context/LootContextParameter +CLASS net/minecraft/class_169 net/minecraft/loot/context/LootContextParameter FIELD field_1162 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id diff --git a/mappings/net/minecraft/world/loot/context/LootContextParameters.mapping b/mappings/net/minecraft/loot/context/LootContextParameters.mapping similarity index 50% rename from mappings/net/minecraft/world/loot/context/LootContextParameters.mapping rename to mappings/net/minecraft/loot/context/LootContextParameters.mapping index a93c6c3df3..1598948b45 100644 --- a/mappings/net/minecraft/world/loot/context/LootContextParameters.mapping +++ b/mappings/net/minecraft/loot/context/LootContextParameters.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_181 net/minecraft/world/loot/context/LootContextParameters +CLASS net/minecraft/class_181 net/minecraft/loot/context/LootContextParameters METHOD method_798 register (Ljava/lang/String;)Lnet/minecraft/class_169; ARG 0 name diff --git a/mappings/net/minecraft/world/loot/context/LootContextType.mapping b/mappings/net/minecraft/loot/context/LootContextType.mapping similarity index 91% rename from mappings/net/minecraft/world/loot/context/LootContextType.mapping rename to mappings/net/minecraft/loot/context/LootContextType.mapping index 7b1fa0691b..5c1f6620b4 100644 --- a/mappings/net/minecraft/world/loot/context/LootContextType.mapping +++ b/mappings/net/minecraft/loot/context/LootContextType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_176 net/minecraft/world/loot/context/LootContextType +CLASS net/minecraft/class_176 net/minecraft/loot/context/LootContextType CLASS class_177 Builder FIELD field_1217 allowed Ljava/util/Set; FIELD field_1218 required Ljava/util/Set; diff --git a/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping similarity index 92% rename from mappings/net/minecraft/world/loot/context/LootContextTypes.mapping rename to mappings/net/minecraft/loot/context/LootContextTypes.mapping index 3b2ae13211..1a02753945 100644 --- a/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_173 net/minecraft/world/loot/context/LootContextTypes +CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes FIELD field_1178 MAP Lcom/google/common/collect/BiMap; METHOD method_15970 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder diff --git a/mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping similarity index 83% rename from mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping rename to mappings/net/minecraft/loot/entry/AlternativeEntry.mapping index cc603aa59d..115d2b37ed 100644 --- a/mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping +++ b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_65 net/minecraft/world/loot/entry/AlternativeEntry +CLASS net/minecraft/class_65 net/minecraft/loot/entry/AlternativeEntry CLASS class_66 Builder FIELD field_979 children Ljava/util/List; METHOD ([Lnet/minecraft/class_79$class_80;)V diff --git a/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping similarity index 92% rename from mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping rename to mappings/net/minecraft/loot/entry/CombinedEntry.mapping index 5d39386935..19b614f8cd 100644 --- a/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_69 net/minecraft/world/loot/entry/CombinedEntry +CLASS net/minecraft/class_69 net/minecraft/loot/entry/CombinedEntry CLASS class_70 Factory METHOD create ([Lnet/minecraft/class_79;[Lnet/minecraft/class_209;)Lnet/minecraft/class_69; ARG 1 children diff --git a/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping similarity index 89% rename from mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping rename to mappings/net/minecraft/loot/entry/DynamicEntry.mapping index b639bae14b..8809df9222 100644 --- a/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping +++ b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_67 net/minecraft/world/loot/entry/DynamicEntry +CLASS net/minecraft/class_67 net/minecraft/loot/entry/DynamicEntry CLASS class_68 Serializer FIELD field_980 name Lnet/minecraft/class_2960; FIELD field_981 instance Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping similarity index 76% rename from mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping rename to mappings/net/minecraft/loot/entry/EmptyEntry.mapping index 92fbee8e52..c2134e0c0c 100644 --- a/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping +++ b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_73 net/minecraft/world/loot/entry/EmptyEntry +CLASS net/minecraft/class_73 net/minecraft/loot/entry/EmptyEntry CLASS class_74 Serializer METHOD (II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)V ARG 1 weight diff --git a/mappings/net/minecraft/world/loot/entry/EntryCombiner.mapping b/mappings/net/minecraft/loot/entry/EntryCombiner.mapping similarity index 90% rename from mappings/net/minecraft/world/loot/entry/EntryCombiner.mapping rename to mappings/net/minecraft/loot/entry/EntryCombiner.mapping index d1b068b918..188db1b14b 100644 --- a/mappings/net/minecraft/world/loot/entry/EntryCombiner.mapping +++ b/mappings/net/minecraft/loot/entry/EntryCombiner.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_64 net/minecraft/world/loot/entry/EntryCombiner +CLASS net/minecraft/class_64 net/minecraft/loot/entry/EntryCombiner FIELD field_16883 ALWAYS_FALSE Lnet/minecraft/class_64; FIELD field_16884 ALWAYS_TRUE Lnet/minecraft/class_64; METHOD method_16776 doExpand (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z diff --git a/mappings/net/minecraft/world/loot/entry/GroupEntry.mapping b/mappings/net/minecraft/loot/entry/GroupEntry.mapping similarity index 81% rename from mappings/net/minecraft/world/loot/entry/GroupEntry.mapping rename to mappings/net/minecraft/loot/entry/GroupEntry.mapping index 1b4576e1c9..7649f23903 100644 --- a/mappings/net/minecraft/world/loot/entry/GroupEntry.mapping +++ b/mappings/net/minecraft/loot/entry/GroupEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_72 net/minecraft/world/loot/entry/GroupEntry +CLASS net/minecraft/class_72 net/minecraft/loot/entry/GroupEntry METHOD method_399 (Lnet/minecraft/class_64;Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 2 context ARG 3 lootChoiceExpander diff --git a/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping b/mappings/net/minecraft/loot/entry/ItemEntry.mapping similarity index 88% rename from mappings/net/minecraft/world/loot/entry/ItemEntry.mapping rename to mappings/net/minecraft/loot/entry/ItemEntry.mapping index 26194be246..776ce734b8 100644 --- a/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping +++ b/mappings/net/minecraft/loot/entry/ItemEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_77 net/minecraft/world/loot/entry/ItemEntry +CLASS net/minecraft/class_77 net/minecraft/loot/entry/ItemEntry CLASS class_78 Serializer FIELD field_987 item Lnet/minecraft/class_1792; METHOD (Lnet/minecraft/class_1792;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)V diff --git a/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/loot/entry/LeafEntry.mapping similarity index 95% rename from mappings/net/minecraft/world/loot/entry/LeafEntry.mapping rename to mappings/net/minecraft/loot/entry/LeafEntry.mapping index a4eb8026d5..383be21af8 100644 --- a/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LeafEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_85 net/minecraft/world/loot/entry/LeafEntry +CLASS net/minecraft/class_85 net/minecraft/loot/entry/LeafEntry CLASS class_86 Builder FIELD field_1000 quality I FIELD field_1001 weight I diff --git a/mappings/net/minecraft/world/loot/entry/LootEntries.mapping b/mappings/net/minecraft/loot/entry/LootEntries.mapping similarity index 90% rename from mappings/net/minecraft/world/loot/entry/LootEntries.mapping rename to mappings/net/minecraft/loot/entry/LootEntries.mapping index 5579bb9fcb..36dd36cadb 100644 --- a/mappings/net/minecraft/world/loot/entry/LootEntries.mapping +++ b/mappings/net/minecraft/loot/entry/LootEntries.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_75 net/minecraft/world/loot/entry/LootEntries +CLASS net/minecraft/class_75 net/minecraft/loot/entry/LootEntries CLASS class_76 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping b/mappings/net/minecraft/loot/entry/LootEntry.mapping similarity index 95% rename from mappings/net/minecraft/world/loot/entry/LootEntry.mapping rename to mappings/net/minecraft/loot/entry/LootEntry.mapping index 68e5248f6b..a302a899a8 100644 --- a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_79 net/minecraft/world/loot/entry/LootEntry +CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootEntry CLASS class_80 Builder FIELD field_990 children Ljava/util/List; METHOD method_417 withChild (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_65$class_66; diff --git a/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping similarity index 87% rename from mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping rename to mappings/net/minecraft/loot/entry/LootTableEntry.mapping index 473ff4aada..b8b9d6edf9 100644 --- a/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_83 net/minecraft/world/loot/entry/LootTableEntry +CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry CLASS class_84 Serializer FIELD field_993 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_209;[Lnet/minecraft/class_117;)V diff --git a/mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping similarity index 66% rename from mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping rename to mappings/net/minecraft/loot/entry/SequenceEntry.mapping index e8296bd169..f2d2393a88 100644 --- a/mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping +++ b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_93 net/minecraft/world/loot/entry/SequenceEntry +CLASS net/minecraft/class_93 net/minecraft/loot/entry/SequenceEntry METHOD method_452 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander diff --git a/mappings/net/minecraft/world/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping similarity index 91% rename from mappings/net/minecraft/world/loot/entry/TagEntry.mapping rename to mappings/net/minecraft/loot/entry/TagEntry.mapping index eb81f9bb5c..63cdb56507 100644 --- a/mappings/net/minecraft/world/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_91 net/minecraft/world/loot/entry/TagEntry +CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry CLASS class_92 Serializer FIELD field_1005 name Lnet/minecraft/class_3494; FIELD field_1006 expand Z diff --git a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping similarity index 97% rename from mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping rename to mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 81d3c0b4cc..94f2627880 100644 --- a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_94 net/minecraft/world/loot/function/ApplyBonusLootFunction +CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction CLASS class_95 BinomialWithBonusCount FIELD field_1012 probability F FIELD field_1013 ID Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping similarity index 92% rename from mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping rename to mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping index 876bc5550c..d59ea2e2cc 100644 --- a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_120 net/minecraft/world/loot/function/ConditionalLootFunction +CLASS net/minecraft/class_120 net/minecraft/loot/function/ConditionalLootFunction CLASS class_121 Builder FIELD field_1049 conditionList Ljava/util/List; METHOD method_523 getThisBuilder ()Lnet/minecraft/class_120$class_121; diff --git a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping similarity index 90% rename from mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping rename to mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping index ca31e27213..509adee691 100644 --- a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_101 net/minecraft/world/loot/function/CopyNameLootFunction +CLASS net/minecraft/class_101 net/minecraft/loot/function/CopyNameLootFunction CLASS class_102 Source FIELD field_1024 parameter Lnet/minecraft/class_169; FIELD field_1025 name Ljava/lang/String; diff --git a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping similarity index 97% rename from mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping rename to mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping index bea570dede..a41b0cd423 100644 --- a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3837 net/minecraft/world/loot/function/CopyNbtLootFunction +CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction CLASS class_3838 Builder FIELD field_17017 source Lnet/minecraft/class_3837$class_3840; FIELD field_17018 operations Ljava/util/List; diff --git a/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping similarity index 81% rename from mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping rename to mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index 58f3b07060..3a3978f610 100644 --- a/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_109 net/minecraft/world/loot/function/EnchantRandomlyLootFunction +CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFunction CLASS class_110 Factory FIELD field_1030 enchantments Ljava/util/List; FIELD field_1031 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping similarity index 87% rename from mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping rename to mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping index b6814c5b49..8373ae408d 100644 --- a/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_106 net/minecraft/world/loot/function/EnchantWithLevelsLootFunction +CLASS net/minecraft/class_106 net/minecraft/loot/function/EnchantWithLevelsLootFunction CLASS class_107 Builder FIELD field_1028 range Lnet/minecraft/class_59; FIELD field_1029 treasureEnchantmentsAllowed Z diff --git a/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping similarity index 93% rename from mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping rename to mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index 8725dea66d..6d1d412e4b 100644 --- a/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_111 net/minecraft/world/loot/function/ExplorationMapLootFunction +CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunction CLASS class_112 Builder FIELD field_1039 destination Ljava/lang/String; FIELD field_1040 searchRadius I diff --git a/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping similarity index 62% rename from mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping rename to mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping index a3f826cbaa..3e50750a9c 100644 --- a/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_104 net/minecraft/world/loot/function/ExplosionDecayLootFunction +CLASS net/minecraft/class_104 net/minecraft/loot/function/ExplosionDecayLootFunction CLASS class_105 Factory METHOD ([Lnet/minecraft/class_209;)V ARG 1 conditions diff --git a/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping similarity index 68% rename from mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping rename to mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping index 35c50e7a2b..c077a1ab6f 100644 --- a/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3668 net/minecraft/world/loot/function/FillPlayerHeadLootFunction +CLASS net/minecraft/class_3668 net/minecraft/loot/function/FillPlayerHeadLootFunction CLASS class_3669 Factory FIELD field_16227 entity Lnet/minecraft/class_47$class_50; METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_47$class_50;)V diff --git a/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping similarity index 70% rename from mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping rename to mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping index c0aeeb743a..d9bdbe62f8 100644 --- a/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_165 net/minecraft/world/loot/function/FurnaceSmeltLootFunction +CLASS net/minecraft/class_165 net/minecraft/loot/function/FurnaceSmeltLootFunction CLASS class_166 Factory FIELD field_1159 LOGGER Lorg/apache/logging/log4j/Logger; METHOD ([Lnet/minecraft/class_209;)V diff --git a/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping similarity index 81% rename from mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping rename to mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping index 821dcf41a3..7fc8ff0923 100644 --- a/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_114 net/minecraft/world/loot/function/LimitCountLootFunction +CLASS net/minecraft/class_114 net/minecraft/loot/function/LimitCountLootFunction CLASS class_115 Factory FIELD field_1044 limit Lnet/minecraft/class_42; METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_42;)V diff --git a/mappings/net/minecraft/world/loot/function/LootFunction.mapping b/mappings/net/minecraft/loot/function/LootFunction.mapping similarity index 93% rename from mappings/net/minecraft/world/loot/function/LootFunction.mapping rename to mappings/net/minecraft/loot/function/LootFunction.mapping index 428baaa2d2..811f7235a1 100644 --- a/mappings/net/minecraft/world/loot/function/LootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_117 net/minecraft/world/loot/function/LootFunction +CLASS net/minecraft/class_117 net/minecraft/loot/function/LootFunction CLASS class_118 Builder METHOD method_515 build ()Lnet/minecraft/class_117; CLASS class_119 Factory diff --git a/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping b/mappings/net/minecraft/loot/function/LootFunctionConsumingBuilder.mapping similarity index 65% rename from mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping rename to mappings/net/minecraft/loot/function/LootFunctionConsumingBuilder.mapping index f7a1bc42b9..d04b269669 100644 --- a/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionConsumingBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_116 net/minecraft/world/loot/FunctionConsumerBuilder +CLASS net/minecraft/class_116 net/minecraft/loot/function/LootFunctionConsumingBuilder METHOD method_511 withFunction (Lnet/minecraft/class_117$class_118;)Ljava/lang/Object; ARG 1 lootFunctionBuilder METHOD method_512 getThis ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/loot/function/LootFunctions.mapping b/mappings/net/minecraft/loot/function/LootFunctions.mapping similarity index 94% rename from mappings/net/minecraft/world/loot/function/LootFunctions.mapping rename to mappings/net/minecraft/loot/function/LootFunctions.mapping index cc0653d692..011abd2f31 100644 --- a/mappings/net/minecraft/world/loot/function/LootFunctions.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctions.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_131 net/minecraft/world/loot/function/LootFunctions +CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctions CLASS class_132 Factory METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping similarity index 87% rename from mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping rename to mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping index d5a164caf0..1460f83829 100644 --- a/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_125 net/minecraft/world/loot/function/LootingEnchantLootFunction +CLASS net/minecraft/class_125 net/minecraft/loot/function/LootingEnchantLootFunction CLASS class_126 Builder FIELD field_1084 countRange Lnet/minecraft/class_61; FIELD field_1085 limit I diff --git a/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping similarity index 93% rename from mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index 41008130e7..b375322c8d 100644 --- a/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_137 net/minecraft/world/loot/function/SetAttributesLootFunction +CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunction CLASS class_138 Attribute FIELD field_1107 name Ljava/lang/String; FIELD field_1108 amountRange Lnet/minecraft/class_61; diff --git a/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping similarity index 87% rename from mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index a7e40a9205..e8f95793e4 100644 --- a/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_134 net/minecraft/world/loot/function/SetContentsLootFunction +CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunction CLASS class_135 Builer FIELD field_1104 entries Ljava/util/List; METHOD method_602 withEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_134$class_135; diff --git a/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping similarity index 82% rename from mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetCountLootFunction.mapping index 4fa2d99654..d9e4a5a504 100644 --- a/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_141 net/minecraft/world/loot/function/SetCountLootFunction +CLASS net/minecraft/class_141 net/minecraft/loot/function/SetCountLootFunction CLASS class_142 Factory FIELD field_1114 countRange Lnet/minecraft/class_59; METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_59;)V diff --git a/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping similarity index 84% rename from mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping index cc6ffeab20..1f136eb242 100644 --- a/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_149 net/minecraft/world/loot/function/SetDamageLootFunction +CLASS net/minecraft/class_149 net/minecraft/loot/function/SetDamageLootFunction CLASS class_150 Factory FIELD field_1120 durabilityRange Lnet/minecraft/class_61; FIELD field_1121 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping similarity index 70% rename from mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping index bdd21c2141..044e867753 100644 --- a/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_144 net/minecraft/world/loot/function/SetLootTableLootFunction +CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFunction CLASS class_145 Factory FIELD field_1116 id Lnet/minecraft/class_2960; FIELD field_1117 seed J diff --git a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping similarity index 83% rename from mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index 06e8a8f3bb..84e1ca7d73 100644 --- a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3671 net/minecraft/world/loot/function/SetLoreLootFunction +CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction CLASS class_3672 Factory FIELD field_16231 lore Ljava/util/List; FIELD field_16232 replace Z diff --git a/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping similarity index 90% rename from mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetNameLootFunction.mapping index 39f4593dc7..89243f0693 100644 --- a/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3670 net/minecraft/world/loot/function/SetNameLootFunction +CLASS net/minecraft/class_3670 net/minecraft/loot/function/SetNameLootFunction CLASS class_147 Factory FIELD field_16228 name Lnet/minecraft/class_2561; FIELD field_16229 entity Lnet/minecraft/class_47$class_50; diff --git a/mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping similarity index 82% rename from mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index fa0708d16f..a7bae722fd 100644 --- a/mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_159 net/minecraft/world/loot/function/SetNbtLootFunction +CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction CLASS class_160 Builder FIELD field_1138 tag Lnet/minecraft/class_2487; METHOD ([Lnet/minecraft/class_209;Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping similarity index 83% rename from mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index 12298dd8d7..e6267a7284 100644 --- a/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_152 net/minecraft/world/loot/function/SetStewEffectLootFunction +CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunction CLASS class_153 Builder FIELD field_1123 map Ljava/util/Map; METHOD method_640 withEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_61;)Lnet/minecraft/class_152$class_153; diff --git a/mappings/net/minecraft/nbt/AbstractListTag.mapping b/mappings/net/minecraft/nbt/AbstractListTag.mapping index b2e9772164..8fcd4fc2f3 100644 --- a/mappings/net/minecraft/nbt/AbstractListTag.mapping +++ b/mappings/net/minecraft/nbt/AbstractListTag.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractListTag ARG 1 value METHOD method_10533 addTag (ILnet/minecraft/class_2520;)Z ARG 1 index + ARG 2 tag METHOD method_10535 setTag (ILnet/minecraft/class_2520;)Z ARG 1 index + ARG 2 tag METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 1 index diff --git a/mappings/net/minecraft/nbt/CompoundTag.mapping b/mappings/net/minecraft/nbt/CompoundTag.mapping index d4f6d56237..2a56eea2f7 100644 --- a/mappings/net/minecraft/nbt/CompoundTag.mapping +++ b/mappings/net/minecraft/nbt/CompoundTag.mapping @@ -5,73 +5,106 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_10537 getLong (Ljava/lang/String;)J + ARG 1 key METHOD method_10538 putLongArray (Ljava/lang/String;Ljava/util/List;)V ARG 1 key + ARG 2 value METHOD method_10539 putIntArray (Ljava/lang/String;[I)V ARG 1 key + ARG 2 value METHOD method_10540 getType (Ljava/lang/String;)B + ARG 1 key METHOD method_10541 getKeys ()Ljava/util/Set; METHOD method_10542 readByte (Ljava/io/DataInput;Lnet/minecraft/class_2505;)B ARG 0 input ARG 1 tracker METHOD method_10543 copyFrom (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 source METHOD method_10544 putLong (Ljava/lang/String;J)V ARG 1 key - METHOD method_10545 containsKey (Ljava/lang/String;)Z + ARG 2 value + METHOD method_10545 contains (Ljava/lang/String;)Z + ARG 1 key METHOD method_10546 getSize ()I METHOD method_10547 getByteArray (Ljava/lang/String;)[B + ARG 1 key METHOD method_10548 putFloat (Ljava/lang/String;F)V ARG 1 key + ARG 2 value METHOD method_10549 putDouble (Ljava/lang/String;D)V ARG 1 key + ARG 2 value METHOD method_10550 getInt (Ljava/lang/String;)I + ARG 1 key METHOD method_10551 remove (Ljava/lang/String;)V + ARG 1 key METHOD method_10552 readString (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Ljava/lang/String; ARG 0 input ARG 1 tracker METHOD method_10554 getList (Ljava/lang/String;I)Lnet/minecraft/class_2499; ARG 1 key + ARG 2 type METHOD method_10555 write (Ljava/lang/String;Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V ARG 0 key ARG 1 tag ARG 2 output METHOD method_10556 putBoolean (Ljava/lang/String;Z)V ARG 1 key + ARG 2 value METHOD method_10557 prettyPrintTagKey (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 key METHOD method_10558 getString (Ljava/lang/String;)Ljava/lang/String; + ARG 1 key METHOD method_10559 createCrashReport (Ljava/lang/String;ILjava/lang/ClassCastException;)Lnet/minecraft/class_128; ARG 1 key ARG 2 type METHOD method_10560 putUuid (Ljava/lang/String;Ljava/util/UUID;)V ARG 1 key + ARG 2 uuid METHOD method_10561 getIntArray (Ljava/lang/String;)[I + ARG 1 key METHOD method_10562 getCompound (Ljava/lang/String;)Lnet/minecraft/class_2487; + ARG 1 key METHOD method_10564 putLongArray (Ljava/lang/String;[J)V ARG 1 key + ARG 2 value METHOD method_10565 getLongArray (Ljava/lang/String;)[J + ARG 1 key METHOD method_10566 put (Ljava/lang/String;Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520; ARG 1 key + ARG 2 tag METHOD method_10567 putByte (Ljava/lang/String;B)V ARG 1 key + ARG 2 value METHOD method_10568 getShort (Ljava/lang/String;)S + ARG 1 key METHOD method_10569 putInt (Ljava/lang/String;I)V ARG 1 key + ARG 2 value METHOD method_10570 putByteArray (Ljava/lang/String;[B)V ARG 1 key + ARG 2 value METHOD method_10571 getByte (Ljava/lang/String;)B + ARG 1 key METHOD method_10572 putIntArray (Ljava/lang/String;Ljava/util/List;)V ARG 1 key - METHOD method_10573 containsKey (Ljava/lang/String;I)Z + ARG 2 value + METHOD method_10573 contains (Ljava/lang/String;I)Z ARG 1 key + ARG 2 type METHOD method_10574 getDouble (Ljava/lang/String;)D + ARG 1 key METHOD method_10575 putShort (Ljava/lang/String;S)V ARG 1 key - METHOD method_10576 hasUuid (Ljava/lang/String;)Z + ARG 2 value + METHOD method_10576 containsUuid (Ljava/lang/String;)Z + ARG 1 key METHOD method_10577 getBoolean (Ljava/lang/String;)Z + ARG 1 key METHOD method_10578 escapeTagKey (Ljava/lang/String;)Ljava/lang/String; ARG 0 key - METHOD method_10580 getTag (Ljava/lang/String;)Lnet/minecraft/class_2520; + METHOD method_10580 get (Ljava/lang/String;)Lnet/minecraft/class_2520; + ARG 1 key METHOD method_10581 createTag (BLjava/lang/String;Ljava/io/DataInput;ILnet/minecraft/class_2505;)Lnet/minecraft/class_2520; ARG 0 type ARG 1 key @@ -80,5 +113,8 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 4 tracker METHOD method_10582 putString (Ljava/lang/String;Ljava/lang/String;)V ARG 1 key + ARG 2 value METHOD method_10583 getFloat (Ljava/lang/String;)F + ARG 1 key METHOD method_10584 getUuid (Ljava/lang/String;)Ljava/util/UUID; + ARG 1 key diff --git a/mappings/net/minecraft/nbt/ListTag.mapping b/mappings/net/minecraft/nbt/ListTag.mapping index 562ab4ed11..f7723aaca2 100644 --- a/mappings/net/minecraft/nbt/ListTag.mapping +++ b/mappings/net/minecraft/nbt/ListTag.mapping @@ -6,15 +6,23 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/ListTag METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_10600 getInt (I)I - METHOD method_10601 getListType ()I - METHOD method_10602 getCompoundTag (I)Lnet/minecraft/class_2487; - METHOD method_10603 getListTag (I)Lnet/minecraft/class_2499; + METHOD method_10601 getElementType ()I + METHOD method_10602 getCompound (I)Lnet/minecraft/class_2487; + ARG 1 index + METHOD method_10603 getList (I)Lnet/minecraft/class_2499; + ARG 1 index METHOD method_10604 getFloat (I)F + ARG 1 index METHOD method_10605 canAdd (Lnet/minecraft/class_2520;)Z + ARG 1 tag METHOD method_10608 getString (I)Ljava/lang/String; + ARG 1 index METHOD method_10609 getShort (I)S + ARG 1 index METHOD method_10610 getIntArray (I)[I + ARG 1 index METHOD method_10611 getDouble (I)D + ARG 1 index METHOD method_17809 forgetTypeIfEmpty ()V METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 1 index diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping new file mode 100644 index 0000000000..d062df0b2d --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtHelper.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper + FIELD field_11582 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_10681 toBlockState (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680; + ARG 0 tag + METHOD method_10682 withProperty (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2688; + ARG 0 state + ARG 1 property + ARG 2 key + ARG 3 propertiesTag + ARG 4 mainTag + METHOD method_10683 toGameProfile (Lnet/minecraft/class_2487;)Lcom/mojang/authlib/GameProfile; + ARG 0 tag + METHOD method_10684 fromGameProfile (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2487; + ARG 0 tag + ARG 1 profile + METHOD method_10685 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; + ARG 0 property + ARG 1 value + METHOD method_10686 fromBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2487; + ARG 0 state + METHOD method_10687 matches (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;Z)Z + ARG 0 standard + ARG 1 subject + ARG 2 equalValue + METHOD method_10688 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487; + ARG 0 fixer + ARG 1 fixTypes + ARG 2 tag + ARG 3 oldVersion + METHOD method_10689 fromUuid (Ljava/util/UUID;)Lnet/minecraft/class_2487; + ARG 0 uuid + METHOD method_10690 toUuid (Lnet/minecraft/class_2487;)Ljava/util/UUID; + ARG 0 tag + METHOD method_10691 toBlockPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338; + ARG 0 tag + METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; + ARG 0 pos + METHOD method_10693 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;II)Lnet/minecraft/class_2487; + ARG 0 fixer + ARG 1 fixTypes + ARG 2 tag + ARG 3 oldVersion + ARG 4 currentVersion diff --git a/mappings/net/minecraft/nbt/PositionTracker.mapping b/mappings/net/minecraft/nbt/PositionTracker.mapping index 9a870142a4..f84b8f1f35 100644 --- a/mappings/net/minecraft/nbt/PositionTracker.mapping +++ b/mappings/net/minecraft/nbt/PositionTracker.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_2505 net/minecraft/nbt/PositionTracker FIELD field_11556 DEFAULT Lnet/minecraft/class_2505; FIELD field_11557 max J METHOD method_10623 add (J)V + ARG 1 bits diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping index d8209578e8..f0d0010e29 100644 --- a/mappings/net/minecraft/nbt/StringNbtReader.mapping +++ b/mappings/net/minecraft/nbt/StringNbtReader.mapping @@ -27,3 +27,4 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader METHOD method_10728 readArray (BB)Ljava/util/List; METHOD method_10729 parseListTag ()Lnet/minecraft/class_2520; METHOD method_10731 parsePrimitive (Ljava/lang/String;)Lnet/minecraft/class_2520; + ARG 1 input diff --git a/mappings/net/minecraft/nbt/StringTag.mapping b/mappings/net/minecraft/nbt/StringTag.mapping index 60f21d4e2e..77148448b0 100644 --- a/mappings/net/minecraft/nbt/StringTag.mapping +++ b/mappings/net/minecraft/nbt/StringTag.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_2519 net/minecraft/nbt/StringTag METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_10706 escape (Ljava/lang/String;)Ljava/lang/String; + ARG 0 value diff --git a/mappings/net/minecraft/nbt/Tag.mapping b/mappings/net/minecraft/nbt/Tag.mapping index 928d86ba55..db625d2ff3 100644 --- a/mappings/net/minecraft/nbt/Tag.mapping +++ b/mappings/net/minecraft/nbt/Tag.mapping @@ -12,9 +12,11 @@ CLASS net/minecraft/class_2520 net/minecraft/nbt/Tag ARG 2 depth METHOD method_10710 toText (Ljava/lang/String;I)Lnet/minecraft/class_2561; ARG 1 indent + ARG 2 depth METHOD method_10711 getType ()B METHOD method_10712 idToString (I)Ljava/lang/String; ARG 0 id METHOD method_10713 write (Ljava/io/DataOutput;)V + ARG 1 output METHOD method_10714 asString ()Ljava/lang/String; METHOD method_10715 toText ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 4ec88e4326..a7dc1f3b33 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -31,10 +31,11 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 1 disconnectReason METHOD method_10748 getDisconnectReason ()Lnet/minecraft/class_2561; METHOD method_10750 setState (Lnet/minecraft/class_2539;)V + ARG 1 state METHOD method_10751 sendQueuedPackets ()V METHOD method_10752 send (Lnet/minecraft/class_2596;Lio/netty/util/concurrent/GenericFutureListener;)V ARG 1 packet - ARG 2 listener + ARG 2 callback METHOD method_10753 connect (Ljava/net/InetAddress;IZ)Lnet/minecraft/class_2535; ARG 0 address ARG 1 port @@ -47,14 +48,16 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_10759 handlePacket (Lnet/minecraft/class_2596;Lnet/minecraft/class_2547;)V ARG 0 packet ARG 1 listener - METHOD method_10760 setMinCompressedSize (I)V + METHOD method_10760 setCompressionThreshold (I)V + ARG 1 compressionThreshold METHOD method_10762 getAveragePacketsReceived ()F METHOD method_10763 setPacketListener (Lnet/minecraft/class_2547;)V + ARG 1 listener METHOD method_10764 sendImmediately (Lnet/minecraft/class_2596;Lio/netty/util/concurrent/GenericFutureListener;)V ARG 1 packet - ARG 2 listener + ARG 2 callback METHOD method_10768 handleDisconnection ()V - METHOD method_10769 connect (Ljava/net/SocketAddress;)Lnet/minecraft/class_2535; + METHOD method_10769 connectLocal (Ljava/net/SocketAddress;)Lnet/minecraft/class_2535; ARG 0 address METHOD method_10771 isEncrypted ()Z METHOD method_10772 hasChannel ()Z diff --git a/mappings/net/minecraft/network/NetworkState.mapping b/mappings/net/minecraft/network/NetworkState.mapping index f7b6ca4621..22e0937a36 100644 --- a/mappings/net/minecraft/network/NetworkState.mapping +++ b/mappings/net/minecraft/network/NetworkState.mapping @@ -5,10 +5,12 @@ CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState FIELD field_11693 STATES [Lnet/minecraft/class_2539; METHOD method_10781 getPacketId (Lnet/minecraft/class_2598;Lnet/minecraft/class_2596;)Ljava/lang/Integer; ARG 1 side + ARG 2 packet METHOD method_10782 byId (I)Lnet/minecraft/class_2539; ARG 0 id METHOD method_10783 getPacketHandler (Lnet/minecraft/class_2598;I)Lnet/minecraft/class_2596; ARG 1 side + ARG 2 packetId METHOD method_10784 addPacket (Lnet/minecraft/class_2598;Ljava/lang/Class;)Lnet/minecraft/class_2539; ARG 1 receivingSide ARG 2 packetClass diff --git a/mappings/net/minecraft/network/NetworkThreadUtils.mapping b/mappings/net/minecraft/network/NetworkThreadUtils.mapping index fa6c57ea8b..ffeb96cc8a 100644 --- a/mappings/net/minecraft/network/NetworkThreadUtils.mapping +++ b/mappings/net/minecraft/network/NetworkThreadUtils.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_2600 net/minecraft/network/NetworkThreadUtils METHOD method_11073 forceMainThread (Lnet/minecraft/class_2596;Lnet/minecraft/class_2547;Lnet/minecraft/class_3218;)V + ARG 0 packet + ARG 1 listener + ARG 2 world METHOD method_11074 forceMainThread (Lnet/minecraft/class_2596;Lnet/minecraft/class_2547;Lnet/minecraft/class_1255;)V - ARG 2 thread + ARG 0 packet + ARG 1 listener + ARG 2 engine diff --git a/mappings/net/minecraft/network/Packet.mapping b/mappings/net/minecraft/network/Packet.mapping index 8ca8b88ca4..42360f1d61 100644 --- a/mappings/net/minecraft/network/Packet.mapping +++ b/mappings/net/minecraft/network/Packet.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2596 net/minecraft/network/Packet - METHOD method_11051 isErrorFatal ()Z + METHOD method_11051 isWritingErrorSkippable ()Z + COMMENT Returns whether a throwable in writing of this packet allows the + COMMENT connection to simply skip the packet's sending than disconnecting. METHOD method_11052 write (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11053 read (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/PacketInflater.mapping b/mappings/net/minecraft/network/PacketInflater.mapping index 3b2be34c68..4ea1b8d9f8 100644 --- a/mappings/net/minecraft/network/PacketInflater.mapping +++ b/mappings/net/minecraft/network/PacketInflater.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2532 net/minecraft/network/PacketInflater FIELD field_11622 inflater Ljava/util/zip/Inflater; - FIELD field_11623 minCompressedSize I + FIELD field_11623 compressionThreshold I METHOD method_10739 setCompressionThreshold (I)V + ARG 1 compressionThreshold diff --git a/mappings/net/minecraft/network/listener/ClientLoginPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientLoginPacketListener.mapping index 89355c89fa..b7cb1a4be6 100644 --- a/mappings/net/minecraft/network/listener/ClientLoginPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientLoginPacketListener.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_2896 net/minecraft/network/listener/ClientLoginPacketL METHOD method_12587 onHello (Lnet/minecraft/class_2905;)V ARG 1 packet METHOD method_12588 onLoginSuccess (Lnet/minecraft/class_2901;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 093486ad3c..da6cd29c1f 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11088 onMapUpdate (Lnet/minecraft/class_2683;)V ARG 1 packet - METHOD method_11089 onGuiOpen (Lnet/minecraft/class_2648;)V + METHOD method_11089 onOpenHorseContainer (Lnet/minecraft/class_2648;)V ARG 1 packet METHOD method_11090 onCraftFailedResponse (Lnet/minecraft/class_2695;)V ARG 1 packet @@ -49,7 +49,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11101 onExperienceBarUpdate (Lnet/minecraft/class_2748;)V ARG 1 packet - METHOD method_11102 onGuiClose (Lnet/minecraft/class_2645;)V + METHOD method_11102 onCloseContainer (Lnet/minecraft/class_2645;)V ARG 1 packet METHOD method_11103 onTitle (Lnet/minecraft/class_2762;)V ARG 1 packet @@ -63,7 +63,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11108 onSignEditorOpen (Lnet/minecraft/class_2693;)V ARG 1 packet - METHOD method_11109 onGuiSlotUpdate (Lnet/minecraft/class_2653;)V + METHOD method_11109 onContainerSlotUpdate (Lnet/minecraft/class_2653;)V ARG 1 packet METHOD method_11110 onEntityAttach (Lnet/minecraft/class_2740;)V ARG 1 packet @@ -107,7 +107,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11130 onAdvancements (Lnet/minecraft/class_2779;)V ARG 1 packet - METHOD method_11131 onGuiUpdate (Lnet/minecraft/class_2651;)V + METHOD method_11131 onContainerPropertyUpdate (Lnet/minecraft/class_2651;)V ARG 1 packet METHOD method_11132 onVelocityUpdate (Lnet/minecraft/class_2743;)V ARG 1 packet @@ -173,7 +173,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_17587 onOpenContainer (Lnet/minecraft/class_3944;)V ARG 1 packet - METHOD method_20203 handleChunkLoadDistance (Lnet/minecraft/class_4273;)V + METHOD method_20203 onChunkLoadDistance (Lnet/minecraft/class_4273;)V ARG 1 packet - METHOD method_20320 handleChunkRenderDistanceCenter (Lnet/minecraft/class_4282;)V + METHOD method_20320 onChunkRenderDistanceCenter (Lnet/minecraft/class_4282;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping index 0a01c749b8..dba61f832f 100644 --- a/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2921 net/minecraft/network/listener/ClientQueryPacketListener METHOD method_12666 onPong (Lnet/minecraft/class_2923;)V + ARG 1 packet METHOD method_12667 onResponse (Lnet/minecraft/class_2924;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerHandshakePacketListener.mapping b/mappings/net/minecraft/network/listener/ServerHandshakePacketListener.mapping index 14679b81b5..f87a3f9a7e 100644 --- a/mappings/net/minecraft/network/listener/ServerHandshakePacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerHandshakePacketListener.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_2890 net/minecraft/network/listener/ServerHandshakePacketListener METHOD method_12576 onHandshake (Lnet/minecraft/class_2889;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping index 3927f70cf1..811e13c7f2 100644 --- a/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_2911 net/minecraft/network/listener/ServerLoginPacketListener METHOD method_12640 onQueryResponse (Lnet/minecraft/class_2913;)V + ARG 1 packet METHOD method_12641 onHello (Lnet/minecraft/class_2915;)V + ARG 1 packet METHOD method_12642 onKey (Lnet/minecraft/class_2917;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 0798a5e46c..0e9eb27ce8 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -82,4 +82,6 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi METHOD method_16383 onJigsawUpdate (Lnet/minecraft/class_3753;)V ARG 1 packet METHOD method_19475 onUpdateDifficulty (Lnet/minecraft/class_4210;)V + ARG 1 packet METHOD method_19476 onUpdateDifficultyLock (Lnet/minecraft/class_4211;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping index 947f004c3f..c506f4ff0f 100644 --- a/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2933 net/minecraft/network/listener/ServerQueryPacketListener METHOD method_12697 onPing (Lnet/minecraft/class_2935;)V + ARG 1 packet METHOD method_12698 onRequest (Lnet/minecraft/class_2937;)V + ARG 1 packet diff --git a/mappings/net/minecraft/server/network/packet/HandshakeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping similarity index 56% rename from mappings/net/minecraft/server/network/packet/HandshakeC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping index 02e1f47129..aa10116f26 100644 --- a/mappings/net/minecraft/server/network/packet/HandshakeC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping @@ -1,10 +1,11 @@ -CLASS net/minecraft/class_2889 net/minecraft/server/network/packet/HandshakeC2SPacket - FIELD field_13156 state Lnet/minecraft/class_2539; +CLASS net/minecraft/class_2889 net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket + FIELD field_13156 intendedState Lnet/minecraft/class_2539; FIELD field_13157 port I - FIELD field_13158 version I + FIELD field_13158 protocolVersion I FIELD field_13159 address Ljava/lang/String; METHOD (Ljava/lang/String;ILnet/minecraft/class_2539;)V ARG 1 address ARG 2 port + ARG 3 intendedState METHOD method_12573 getIntendedState ()Lnet/minecraft/class_2539; METHOD method_12574 getProtocolVersion ()I diff --git a/mappings/net/minecraft/server/network/packet/LoginHelloC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping similarity index 58% rename from mappings/net/minecraft/server/network/packet/LoginHelloC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping index 89f92e3358..e5edefc187 100644 --- a/mappings/net/minecraft/server/network/packet/LoginHelloC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_2915 net/minecraft/server/network/packet/LoginHelloC2SPacket +CLASS net/minecraft/class_2915 net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket FIELD field_13271 profile Lcom/mojang/authlib/GameProfile; METHOD method_12650 getProfile ()Lcom/mojang/authlib/GameProfile; diff --git a/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping similarity index 75% rename from mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping index 5a865bada0..f2e1ed666d 100644 --- a/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2917 net/minecraft/server/network/packet/LoginKeyC2SPacket +CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket FIELD field_13273 encryptedNonce [B FIELD field_13274 encryptedSecretKey [B METHOD method_12654 decryptSecretKey (Ljava/security/PrivateKey;)Ljavax/crypto/SecretKey; diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping new file mode 100644 index 0000000000..6673e7c3c3 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket + FIELD field_13258 response Lnet/minecraft/class_2540; + FIELD field_13259 queryId I diff --git a/mappings/net/minecraft/server/network/packet/AdvancementTabC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping similarity index 84% rename from mappings/net/minecraft/server/network/packet/AdvancementTabC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping index 5322db9402..ad3b823522 100644 --- a/mappings/net/minecraft/server/network/packet/AdvancementTabC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2859 net/minecraft/server/network/packet/AdvancementTabC2SPacket +CLASS net/minecraft/class_2859 net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket CLASS class_2860 Action FIELD field_13020 tabToOpen Lnet/minecraft/class_2960; FIELD field_13021 action Lnet/minecraft/class_2859$class_2860; diff --git a/mappings/net/minecraft/server/network/packet/BoatPaddleStateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping similarity index 69% rename from mappings/net/minecraft/server/network/packet/BoatPaddleStateC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping index 01e2bdf446..616061ef62 100644 --- a/mappings/net/minecraft/server/network/packet/BoatPaddleStateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2836 net/minecraft/server/network/packet/BoatPaddleStateC2SPacket +CLASS net/minecraft/class_2836 net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket FIELD field_12906 rightPaddling Z FIELD field_12907 leftPaddling Z METHOD (ZZ)V diff --git a/mappings/net/minecraft/server/network/packet/BookUpdateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping similarity index 81% rename from mappings/net/minecraft/server/network/packet/BookUpdateC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping index cb61615a98..ccd0b9e1cb 100644 --- a/mappings/net/minecraft/server/network/packet/BookUpdateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2820 net/minecraft/server/network/packet/BookUpdateC2SPacket +CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket FIELD field_12863 book Lnet/minecraft/class_1799; FIELD field_12864 signed Z FIELD field_12865 hand Lnet/minecraft/class_1268; diff --git a/mappings/net/minecraft/server/network/packet/ButtonClickC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping similarity index 67% rename from mappings/net/minecraft/server/network/packet/ButtonClickC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping index 42c8452750..49c0b23e18 100644 --- a/mappings/net/minecraft/server/network/packet/ButtonClickC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2811 net/minecraft/server/network/packet/ButtonClickC2SPacket +CLASS net/minecraft/class_2811 net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket FIELD field_12812 buttonId I FIELD field_12813 syncId I METHOD (II)V diff --git a/mappings/net/minecraft/server/network/packet/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping similarity index 64% rename from mappings/net/minecraft/server/network/packet/ChatMessageC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index 021ac65663..332117d33c 100644 --- a/mappings/net/minecraft/server/network/packet/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2797 net/minecraft/server/network/packet/ChatMessageC2SPacket +CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket FIELD field_12764 chatMessage Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 chatMessage diff --git a/mappings/net/minecraft/server/network/packet/ClickWindowC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket.mapping similarity index 86% rename from mappings/net/minecraft/server/network/packet/ClickWindowC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket.mapping index 4929005e9f..accf365816 100644 --- a/mappings/net/minecraft/server/network/packet/ClickWindowC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2813 net/minecraft/server/network/packet/ClickWindowC2SPacket +CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket FIELD field_12815 actionType Lnet/minecraft/class_1713; FIELD field_12816 stack Lnet/minecraft/class_1799; FIELD field_12817 button I diff --git a/mappings/net/minecraft/server/network/packet/ClientCommandC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping similarity index 74% rename from mappings/net/minecraft/server/network/packet/ClientCommandC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping index bb1302f04a..191a3eb695 100644 --- a/mappings/net/minecraft/server/network/packet/ClientCommandC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2848 net/minecraft/server/network/packet/ClientCommandC2SPacket +CLASS net/minecraft/class_2848 net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket CLASS class_2849 Mode FIELD field_12976 mountJumpHeight I FIELD field_12977 entityId I diff --git a/mappings/net/minecraft/server/network/packet/ClientSettingsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping similarity index 85% rename from mappings/net/minecraft/server/network/packet/ClientSettingsC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping index 55500d41a8..3c75503913 100644 --- a/mappings/net/minecraft/server/network/packet/ClientSettingsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2803 net/minecraft/server/network/packet/ClientSettingsC2SPacket +CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket FIELD field_12777 language Ljava/lang/String; FIELD field_12778 playerModelBitMask I FIELD field_12780 viewDistance I @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2803 net/minecraft/server/network/packet/ClientSetting ARG 1 language ARG 2 viewDistance ARG 3 chatVisibility + ARG 4 chatColors ARG 5 modelBitMask ARG 6 mainArm METHOD method_12131 getLanguage ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/network/packet/ClientStatusC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping similarity index 71% rename from mappings/net/minecraft/server/network/packet/ClientStatusC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping index df9aad42e1..e6a5e4ea20 100644 --- a/mappings/net/minecraft/server/network/packet/ClientStatusC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2799 net/minecraft/server/network/packet/ClientStatusC2SPacket +CLASS net/minecraft/class_2799 net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket CLASS class_2800 Mode FIELD field_12773 mode Lnet/minecraft/class_2799$class_2800; METHOD (Lnet/minecraft/class_2799$class_2800;)V diff --git a/mappings/net/minecraft/server/network/packet/GuiActionConfirmC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping similarity index 71% rename from mappings/net/minecraft/server/network/packet/GuiActionConfirmC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping index b744b1b8d7..5a17102da7 100644 --- a/mappings/net/minecraft/server/network/packet/GuiActionConfirmC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2809 net/minecraft/server/network/packet/GuiActionConfirmC2SPacket +CLASS net/minecraft/class_2809 net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket FIELD field_12809 actionId S FIELD field_12810 accepted Z FIELD field_12811 windowId I diff --git a/mappings/net/minecraft/server/network/packet/CraftRequestC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping similarity index 78% rename from mappings/net/minecraft/server/network/packet/CraftRequestC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping index 09ac794583..6ee23f57d1 100644 --- a/mappings/net/minecraft/server/network/packet/CraftRequestC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2840 net/minecraft/server/network/packet/CraftRequestC2SPacket +CLASS net/minecraft/class_2840 net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket FIELD field_12931 recipe Lnet/minecraft/class_2960; FIELD field_12932 craftAll Z FIELD field_12933 syncId I diff --git a/mappings/net/minecraft/server/network/packet/CreativeInventoryActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping similarity index 63% rename from mappings/net/minecraft/server/network/packet/CreativeInventoryActionC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping index ad866c5d41..666055eb48 100644 --- a/mappings/net/minecraft/server/network/packet/CreativeInventoryActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2873 net/minecraft/server/network/packet/CreativeInventoryActionC2SPacket +CLASS net/minecraft/class_2873 net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket FIELD field_13070 stack Lnet/minecraft/class_1799; FIELD field_13071 slot I METHOD method_12479 getItemStack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/server/network/packet/CustomPayloadC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.mapping similarity index 72% rename from mappings/net/minecraft/server/network/packet/CustomPayloadC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.mapping index 8326742dba..12482000ab 100644 --- a/mappings/net/minecraft/server/network/packet/CustomPayloadC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2817 net/minecraft/server/network/packet/CustomPayloadC2SPacket +CLASS net/minecraft/class_2817 net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket FIELD field_12830 channel Lnet/minecraft/class_2960; FIELD field_12831 BRAND Lnet/minecraft/class_2960; FIELD field_12832 data Lnet/minecraft/class_2540; diff --git a/mappings/net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket.mapping new file mode 100644 index 0000000000..c95e0493a7 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_2815 net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket + FIELD field_12827 id I diff --git a/mappings/net/minecraft/server/network/packet/HandSwingC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping similarity index 65% rename from mappings/net/minecraft/server/network/packet/HandSwingC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping index 1da1b385ca..75eb9854b5 100644 --- a/mappings/net/minecraft/server/network/packet/HandSwingC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2879 net/minecraft/server/network/packet/HandSwingC2SPacket +CLASS net/minecraft/class_2879 net/minecraft/network/packet/c2s/play/HandSwingC2SPacket FIELD field_13102 hand Lnet/minecraft/class_1268; METHOD (Lnet/minecraft/class_1268;)V ARG 1 hand diff --git a/mappings/net/minecraft/network/packet/c2s/play/KeepAliveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/KeepAliveC2SPacket.mapping new file mode 100644 index 0000000000..d23b282774 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/KeepAliveC2SPacket.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_2827 net/minecraft/network/packet/c2s/play/KeepAliveC2SPacket + FIELD field_12883 id J + METHOD (J)V + ARG 1 id + METHOD method_12267 getId ()J diff --git a/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping new file mode 100644 index 0000000000..3f4fd64e9d --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_2838 net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket + FIELD field_12908 slot I + METHOD (I)V + ARG 1 slot + METHOD method_12293 getSlot ()I diff --git a/mappings/net/minecraft/server/network/packet/PlayerActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping similarity index 80% rename from mappings/net/minecraft/server/network/packet/PlayerActionC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping index 76447e4a05..35bb2f6a7b 100644 --- a/mappings/net/minecraft/server/network/packet/PlayerActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2846 net/minecraft/server/network/packet/PlayerActionC2SPacket +CLASS net/minecraft/class_2846 net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket CLASS class_2847 Action FIELD field_12965 direction Lnet/minecraft/class_2350; FIELD field_12966 action Lnet/minecraft/class_2846$class_2847; diff --git a/mappings/net/minecraft/server/network/packet/PlayerInputC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping similarity index 79% rename from mappings/net/minecraft/server/network/packet/PlayerInputC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping index 9b133fe2df..19705a78bd 100644 --- a/mappings/net/minecraft/server/network/packet/PlayerInputC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2851 net/minecraft/server/network/packet/PlayerInputC2SPacket +CLASS net/minecraft/class_2851 net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket FIELD field_12994 forward F FIELD field_12995 sideways F FIELD field_12996 sneaking Z diff --git a/mappings/net/minecraft/server/network/packet/PlayerInteractBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping similarity index 63% rename from mappings/net/minecraft/server/network/packet/PlayerInteractBlockC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping index 0d0bb1d892..efe4c13865 100644 --- a/mappings/net/minecraft/server/network/packet/PlayerInteractBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2885 net/minecraft/server/network/packet/PlayerInteractBlockC2SPacket +CLASS net/minecraft/class_2885 net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket FIELD field_13134 hand Lnet/minecraft/class_1268; METHOD method_12543 getHitY ()Lnet/minecraft/class_3965; METHOD method_12546 getHand ()Lnet/minecraft/class_1268; diff --git a/mappings/net/minecraft/server/network/packet/PlayerInteractEntityC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping similarity index 83% rename from mappings/net/minecraft/server/network/packet/PlayerInteractEntityC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping index 2c58f8e27d..7591c9d11a 100644 --- a/mappings/net/minecraft/server/network/packet/PlayerInteractEntityC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2824 net/minecraft/server/network/packet/PlayerInteractEntityC2SPacket +CLASS net/minecraft/class_2824 net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket CLASS class_2825 InteractionType FIELD field_12869 hand Lnet/minecraft/class_1268; FIELD field_12870 entityId I diff --git a/mappings/net/minecraft/server/network/packet/PlayerInteractItemC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping similarity index 52% rename from mappings/net/minecraft/server/network/packet/PlayerInteractItemC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping index cfe1fd918c..986dc6cb60 100644 --- a/mappings/net/minecraft/server/network/packet/PlayerInteractItemC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_2886 net/minecraft/server/network/packet/PlayerInteractItemC2SPacket +CLASS net/minecraft/class_2886 net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket FIELD field_13136 hand Lnet/minecraft/class_1268; METHOD method_12551 getHand ()Lnet/minecraft/class_1268; diff --git a/mappings/net/minecraft/server/network/packet/PlayerMoveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping similarity index 89% rename from mappings/net/minecraft/server/network/packet/PlayerMoveC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping index 54c6262cae..4d8f54b84c 100644 --- a/mappings/net/minecraft/server/network/packet/PlayerMoveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2828 net/minecraft/server/network/packet/PlayerMoveC2SPacket +CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket CLASS class_2829 PositionOnly METHOD (DDDZ)V ARG 1 x diff --git a/mappings/net/minecraft/server/network/packet/QueryBlockNbtC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping similarity index 66% rename from mappings/net/minecraft/server/network/packet/QueryBlockNbtC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping index 1aec74b72f..6c4e346413 100644 --- a/mappings/net/minecraft/server/network/packet/QueryBlockNbtC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2795 net/minecraft/server/network/packet/QueryBlockNbtC2SPacket +CLASS net/minecraft/class_2795 net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket FIELD field_12762 transactionId I FIELD field_12763 pos Lnet/minecraft/class_2338; METHOD method_12094 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/server/network/packet/QueryEntityNbtC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping similarity index 60% rename from mappings/net/minecraft/server/network/packet/QueryEntityNbtC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping index 2540106508..f31a7b1a99 100644 --- a/mappings/net/minecraft/server/network/packet/QueryEntityNbtC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2822 net/minecraft/server/network/packet/QueryEntityNbtC2SPacket +CLASS net/minecraft/class_2822 net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket FIELD field_12867 entityId I FIELD field_12868 transactionId I METHOD method_12244 getEntityId ()I diff --git a/mappings/net/minecraft/server/network/packet/RecipeBookDataC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping similarity index 91% rename from mappings/net/minecraft/server/network/packet/RecipeBookDataC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping index 79c0daf743..fabefd3fa1 100644 --- a/mappings/net/minecraft/server/network/packet/RecipeBookDataC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2853 net/minecraft/server/network/packet/RecipeBookDataC2SPacket +CLASS net/minecraft/class_2853 net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket CLASS class_2854 Mode FIELD field_13004 recipeId Lnet/minecraft/class_2960; FIELD field_13005 furnaceFilteringCraftable Z diff --git a/mappings/net/minecraft/server/network/packet/RenameItemC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping similarity index 53% rename from mappings/net/minecraft/server/network/packet/RenameItemC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping index 7af82e52c5..c42d8f72d4 100644 --- a/mappings/net/minecraft/server/network/packet/RenameItemC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_2855 net/minecraft/server/network/packet/RenameItemC2SPacket +CLASS net/minecraft/class_2855 net/minecraft/network/packet/c2s/play/RenameItemC2SPacket FIELD field_13013 itemName Ljava/lang/String; METHOD method_12407 getItemName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/network/packet/RequestCommandCompletionsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping similarity index 72% rename from mappings/net/minecraft/server/network/packet/RequestCommandCompletionsC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping index 79494df265..ddd2bf61a6 100644 --- a/mappings/net/minecraft/server/network/packet/RequestCommandCompletionsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2805 net/minecraft/server/network/packet/RequestCommandCompletionsC2SPacket +CLASS net/minecraft/class_2805 net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket FIELD field_12784 completionId I FIELD field_12785 partialCommand Ljava/lang/String; METHOD (ILjava/lang/String;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/ResourcePackStatusC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ResourcePackStatusC2SPacket.mapping new file mode 100644 index 0000000000..48f6b3090c --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/ResourcePackStatusC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_2856 net/minecraft/network/packet/c2s/play/ResourcePackStatusC2SPacket + CLASS class_2857 Status + FIELD field_13014 status Lnet/minecraft/class_2856$class_2857; diff --git a/mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping new file mode 100644 index 0000000000..2ad539e668 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_2863 net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket + FIELD field_13036 tradeId I diff --git a/mappings/net/minecraft/server/network/packet/SpectatorTeleportC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping similarity index 67% rename from mappings/net/minecraft/server/network/packet/SpectatorTeleportC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping index 633d73ed7d..c5d6088930 100644 --- a/mappings/net/minecraft/server/network/packet/SpectatorTeleportC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2884 net/minecraft/server/network/packet/SpectatorTeleportC2SPacket +CLASS net/minecraft/class_2884 net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket FIELD field_13129 targetUuid Ljava/util/UUID; METHOD (Ljava/util/UUID;)V ARG 1 targetUuid diff --git a/mappings/net/minecraft/server/network/packet/TeleportConfirmC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping similarity index 53% rename from mappings/net/minecraft/server/network/packet/TeleportConfirmC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping index 66b2c4edce..b69bbbbefe 100644 --- a/mappings/net/minecraft/server/network/packet/TeleportConfirmC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2793 net/minecraft/server/network/packet/TeleportConfirmC2SPacket +CLASS net/minecraft/class_2793 net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket FIELD field_12758 teleportId I METHOD (I)V ARG 1 teleportId diff --git a/mappings/net/minecraft/server/network/packet/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping similarity index 64% rename from mappings/net/minecraft/server/network/packet/UpdateBeaconC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 0e887dbd52..3a90efd7eb 100644 --- a/mappings/net/minecraft/server/network/packet/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2866 net/minecraft/server/network/packet/UpdateBeaconC2SPacket +CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket FIELD field_13049 secondaryEffectId I FIELD field_13050 primaryEffectId I METHOD method_12435 getSecondaryEffectId ()I diff --git a/mappings/net/minecraft/server/network/packet/UpdateCommandBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping similarity index 85% rename from mappings/net/minecraft/server/network/packet/UpdateCommandBlockC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping index f51ed7fa2a..11b82a41e3 100644 --- a/mappings/net/minecraft/server/network/packet/UpdateCommandBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2870 net/minecraft/server/network/packet/UpdateCommandBlockC2SPacket +CLASS net/minecraft/class_2870 net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket FIELD field_13060 type Lnet/minecraft/class_2593$class_2594; FIELD field_13061 alwaysActive Z FIELD field_13062 conditional Z diff --git a/mappings/net/minecraft/server/network/packet/UpdateCommandBlockMinecartC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping similarity index 74% rename from mappings/net/minecraft/server/network/packet/UpdateCommandBlockMinecartC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping index fb6176c76b..b818b404ab 100644 --- a/mappings/net/minecraft/server/network/packet/UpdateCommandBlockMinecartC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2871 net/minecraft/server/network/packet/UpdateCommandBlockMinecartC2SPacket +CLASS net/minecraft/class_2871 net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket FIELD field_13066 trackOutput Z FIELD field_13067 entityId I FIELD field_13068 command Ljava/lang/String; diff --git a/mappings/net/minecraft/server/network/packet/UpdateDifficultyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping similarity index 56% rename from mappings/net/minecraft/server/network/packet/UpdateDifficultyC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping index 651576c26a..29b87db973 100644 --- a/mappings/net/minecraft/server/network/packet/UpdateDifficultyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_4210 net/minecraft/server/network/packet/UpdateDifficultyC2SPacket +CLASS net/minecraft/class_4210 net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket FIELD field_18805 difficulty Lnet/minecraft/class_1267; METHOD method_19478 getDifficulty ()Lnet/minecraft/class_1267; diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping new file mode 100644 index 0000000000..b8cdaeb8cf --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4211 net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket + FIELD field_18806 difficultyLocked Z + METHOD method_19485 isDifficultyLocked ()Z diff --git a/mappings/net/minecraft/server/network/packet/UpdateJigsawC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping similarity index 87% rename from mappings/net/minecraft/server/network/packet/UpdateJigsawC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping index 68363b3352..c50f8eb6b9 100644 --- a/mappings/net/minecraft/server/network/packet/UpdateJigsawC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3753 net/minecraft/server/network/packet/UpdateJigsawC2SPacket +CLASS net/minecraft/class_3753 net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket FIELD field_16563 attachmentType Lnet/minecraft/class_2960; FIELD field_16564 finalState Ljava/lang/String; FIELD field_16565 pos Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/server/network/packet/UpdatePlayerAbilitiesC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping similarity index 86% rename from mappings/net/minecraft/server/network/packet/UpdatePlayerAbilitiesC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping index 891fb3abb2..7bbc48ea46 100644 --- a/mappings/net/minecraft/server/network/packet/UpdatePlayerAbilitiesC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2842 net/minecraft/server/network/packet/UpdatePlayerAbilitiesC2SPacket +CLASS net/minecraft/class_2842 net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket FIELD field_12944 walkSpeed F FIELD field_12945 flySpeed F FIELD field_12946 creativeMode Z diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping new file mode 100644 index 0000000000..a280b20338 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_2868 net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket + FIELD field_13052 selectedSlot I + METHOD method_12442 getSelectedSlot ()I diff --git a/mappings/net/minecraft/server/network/packet/UpdateSignC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping similarity index 69% rename from mappings/net/minecraft/server/network/packet/UpdateSignC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping index 158f9a4c5b..61a02ba6aa 100644 --- a/mappings/net/minecraft/server/network/packet/UpdateSignC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2877 net/minecraft/server/network/packet/UpdateSignC2SPacket +CLASS net/minecraft/class_2877 net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket FIELD field_13100 text [Ljava/lang/String; FIELD field_13101 pos Lnet/minecraft/class_2338; METHOD method_12508 getText ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/server/network/packet/UpdateStructureBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping similarity index 94% rename from mappings/net/minecraft/server/network/packet/UpdateStructureBlockC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping index 492d4099f5..feb3428d6a 100644 --- a/mappings/net/minecraft/server/network/packet/UpdateStructureBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2875 net/minecraft/server/network/packet/UpdateStructureBlockC2SPacket +CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket FIELD field_13080 structureName Ljava/lang/String; FIELD field_13081 mirror Lnet/minecraft/class_2415; FIELD field_13082 action Lnet/minecraft/class_2633$class_2634; diff --git a/mappings/net/minecraft/server/network/packet/VehicleMoveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping similarity index 78% rename from mappings/net/minecraft/server/network/packet/VehicleMoveC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping index 63227e6e79..40440db718 100644 --- a/mappings/net/minecraft/server/network/packet/VehicleMoveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2833 net/minecraft/server/network/packet/VehicleMoveC2SPacket +CLASS net/minecraft/class_2833 net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket FIELD field_12895 z D FIELD field_12896 pitch F FIELD field_12897 y D diff --git a/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping new file mode 100644 index 0000000000..6f1bdb31e5 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_2935 net/minecraft/network/packet/c2s/query/QueryPingC2SPacket + FIELD field_13292 startTime J + METHOD method_12700 getStartTime ()J diff --git a/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping new file mode 100644 index 0000000000..ee31f471bb --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2937 net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket diff --git a/mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping similarity index 59% rename from mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping index fa26f6d4de..e25ce2901a 100644 --- a/mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2907 net/minecraft/client/network/packet/LoginCompressionS2CPacket +CLASS net/minecraft/class_2907 net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket FIELD field_13232 compressionThreshold I METHOD (I)V ARG 1 compressionThreshold diff --git a/mappings/net/minecraft/client/network/packet/LoginDisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping similarity index 64% rename from mappings/net/minecraft/client/network/packet/LoginDisconnectS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping index f61849e770..b920731766 100644 --- a/mappings/net/minecraft/client/network/packet/LoginDisconnectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2909 net/minecraft/client/network/packet/LoginDisconnectS2CPacket +CLASS net/minecraft/class_2909 net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket FIELD field_13243 reason Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;)V ARG 1 reason diff --git a/mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping similarity index 81% rename from mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping index a3224d2fb5..14873e74b0 100644 --- a/mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2905 net/minecraft/client/network/packet/LoginHelloS2CPacket +CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket FIELD field_13209 serverId Ljava/lang/String; FIELD field_13210 nonce [B FIELD field_13211 publicKey Ljava/security/PublicKey; diff --git a/mappings/net/minecraft/client/network/packet/LoginQueryRequestS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping similarity index 64% rename from mappings/net/minecraft/client/network/packet/LoginQueryRequestS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping index 610268c779..e72385ffc2 100644 --- a/mappings/net/minecraft/client/network/packet/LoginQueryRequestS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2899 net/minecraft/client/network/packet/LoginQueryRequestS2CPacket +CLASS net/minecraft/class_2899 net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket FIELD field_13187 channel Lnet/minecraft/class_2960; FIELD field_13188 queryId I FIELD field_13189 payload Lnet/minecraft/class_2540; diff --git a/mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping similarity index 67% rename from mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping index ebf6aca607..e208232431 100644 --- a/mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2901 net/minecraft/client/network/packet/LoginSuccessS2CPacket +CLASS net/minecraft/class_2901 net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket FIELD field_13190 profile Lcom/mojang/authlib/GameProfile; METHOD (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile diff --git a/mappings/net/minecraft/client/network/packet/AdvancementUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping similarity index 85% rename from mappings/net/minecraft/client/network/packet/AdvancementUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping index 9424d185bc..7aec85d9ce 100644 --- a/mappings/net/minecraft/client/network/packet/AdvancementUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2779 net/minecraft/client/network/packet/AdvancementUpdateS2CPacket +CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket FIELD field_12715 toRemove Ljava/util/Set; FIELD field_12716 toSetProgress Ljava/util/Map; FIELD field_12717 toEarn Ljava/util/Map; diff --git a/mappings/net/minecraft/client/network/packet/BlockActionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockActionS2CPacket.mapping similarity index 83% rename from mappings/net/minecraft/client/network/packet/BlockActionS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/BlockActionS2CPacket.mapping index fa31370681..8a7f7a8c98 100644 --- a/mappings/net/minecraft/client/network/packet/BlockActionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockActionS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2623 net/minecraft/client/network/packet/BlockActionS2CPacket +CLASS net/minecraft/class_2623 net/minecraft/network/packet/s2c/play/BlockActionS2CPacket FIELD field_12041 data I FIELD field_12042 type I FIELD field_12043 block Lnet/minecraft/class_2248; diff --git a/mappings/net/minecraft/client/network/packet/BlockBreakingProgressS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping similarity index 76% rename from mappings/net/minecraft/client/network/packet/BlockBreakingProgressS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping index 6d9ad352a6..6f97c0b48a 100644 --- a/mappings/net/minecraft/client/network/packet/BlockBreakingProgressS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2620 net/minecraft/client/network/packet/BlockBreakingProgressS2CPacket +CLASS net/minecraft/class_2620 net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket FIELD field_12032 progress I FIELD field_12033 entityId I FIELD field_12034 pos Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/client/network/packet/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping similarity index 61% rename from mappings/net/minecraft/client/network/packet/BlockEntityUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping index 4aa9f0f716..05ec79bdb4 100644 --- a/mappings/net/minecraft/client/network/packet/BlockEntityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_2622 net/minecraft/client/network/packet/BlockEntityUpdateS2CPacket - FIELD field_12038 actionId I +CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket + FIELD field_12038 blockEntityType I FIELD field_12039 tag Lnet/minecraft/class_2487; FIELD field_12040 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2338;ILnet/minecraft/class_2487;)V ARG 1 pos - ARG 2 action + ARG 2 blockEntityType ARG 3 tag METHOD method_11290 getCompoundTag ()Lnet/minecraft/class_2487; - METHOD method_11291 getActionId ()I + METHOD method_11291 getBlockEntityType ()I METHOD method_11293 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/client/network/packet/BlockUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping similarity index 77% rename from mappings/net/minecraft/client/network/packet/BlockUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping index 0c25c5a8ce..758e6a1a7c 100644 --- a/mappings/net/minecraft/client/network/packet/BlockUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2626 net/minecraft/client/network/packet/BlockUpdateS2CPacket +CLASS net/minecraft/class_2626 net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket FIELD field_12051 state Lnet/minecraft/class_2680; FIELD field_12052 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/client/network/packet/BossBarS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping similarity index 92% rename from mappings/net/minecraft/client/network/packet/BossBarS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping index eb1d191240..c5a578e06d 100644 --- a/mappings/net/minecraft/client/network/packet/BossBarS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2629 net/minecraft/client/network/packet/BossBarS2CPacket +CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CPacket CLASS class_2630 Type FIELD field_12068 thickenFog Z FIELD field_12069 percent F diff --git a/mappings/net/minecraft/client/network/packet/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping similarity index 82% rename from mappings/net/minecraft/client/network/packet/ChatMessageS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping index c16b621cbc..b4133d021f 100644 --- a/mappings/net/minecraft/client/network/packet/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2635 net/minecraft/client/network/packet/ChatMessageS2CPacket +CLASS net/minecraft/class_2635 net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket FIELD field_12112 message Lnet/minecraft/class_2561; FIELD field_12113 location Lnet/minecraft/class_2556; METHOD (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/network/packet/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping similarity index 87% rename from mappings/net/minecraft/client/network/packet/ChunkDataS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping index bf194c7c54..2142c7aea0 100644 --- a/mappings/net/minecraft/client/network/packet/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2672 net/minecraft/client/network/packet/ChunkDataS2CPacket +CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket FIELD field_12233 isFullChunk Z FIELD field_12234 verticalStripBitmask I FIELD field_12235 chunkZ I @@ -11,6 +11,8 @@ CLASS net/minecraft/class_2672 net/minecraft/client/network/packet/ChunkDataS2CP ARG 2 includedSectionsMask METHOD method_11521 getReadBuffer ()Lnet/minecraft/class_2540; METHOD method_11522 getDataSize (Lnet/minecraft/class_2818;I)I + ARG 1 chunk + ARG 2 includedSectionsMark METHOD method_11523 getX ()I METHOD method_11524 getZ ()I METHOD method_11525 getBlockEntityTagList ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/network/packet/ChunkDeltaUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping similarity index 87% rename from mappings/net/minecraft/client/network/packet/ChunkDeltaUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping index fc46da3ef4..40bfb5d36a 100644 --- a/mappings/net/minecraft/client/network/packet/ChunkDeltaUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2637 net/minecraft/client/network/packet/ChunkDeltaUpdateS2CPacket +CLASS net/minecraft/class_2637 net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket CLASS class_2638 ChunkDeltaRecord FIELD field_12118 pos S FIELD field_12119 state Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/client/network/packet/ChunkLoadDistanceS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping similarity index 52% rename from mappings/net/minecraft/client/network/packet/ChunkLoadDistanceS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping index 12cabf5b29..2f8dc25de3 100644 --- a/mappings/net/minecraft/client/network/packet/ChunkLoadDistanceS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4273 net/minecraft/client/network/packet/ChunkLoadDistanceS2CPacket +CLASS net/minecraft/class_4273 net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket FIELD field_19146 distance I METHOD (I)V ARG 1 distance diff --git a/mappings/net/minecraft/client/network/packet/ChunkRenderDistanceCenterS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping similarity index 61% rename from mappings/net/minecraft/client/network/packet/ChunkRenderDistanceCenterS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping index 4ddae14507..36f74508d2 100644 --- a/mappings/net/minecraft/client/network/packet/ChunkRenderDistanceCenterS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4282 net/minecraft/client/network/packet/ChunkRenderDistanceCenterS2CPacket +CLASS net/minecraft/class_4282 net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket FIELD field_19206 chunkX I FIELD field_19207 chunkZ I METHOD (II)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/CloseContainerS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CloseContainerS2CPacket.mapping new file mode 100644 index 0000000000..c6afc9d6bc --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/CloseContainerS2CPacket.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_2645 net/minecraft/network/packet/s2c/play/CloseContainerS2CPacket + FIELD field_12137 syncId I + METHOD (I)V + ARG 1 syncId diff --git a/mappings/net/minecraft/client/network/packet/CombatEventS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CombatEventS2CPacket.mapping similarity index 80% rename from mappings/net/minecraft/client/network/packet/CombatEventS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/CombatEventS2CPacket.mapping index dac42cc80a..04e04066b8 100644 --- a/mappings/net/minecraft/client/network/packet/CombatEventS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CombatEventS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2698 net/minecraft/client/network/packet/CombatEventS2CPacket +CLASS net/minecraft/class_2698 net/minecraft/network/packet/s2c/play/CombatEventS2CPacket CLASS class_2699 Type FIELD field_12345 timeSinceLastAttack I FIELD field_12346 deathMessage Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/network/packet/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping similarity index 77% rename from mappings/net/minecraft/client/network/packet/CommandSuggestionsS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping index e5d440819c..31a6bdf0f6 100644 --- a/mappings/net/minecraft/client/network/packet/CommandSuggestionsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2639 net/minecraft/client/network/packet/CommandSuggestionsS2CPacket +CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket FIELD field_12121 suggestions Lcom/mojang/brigadier/suggestion/Suggestions; FIELD field_12122 completionId I METHOD (ILcom/mojang/brigadier/suggestion/Suggestions;)V diff --git a/mappings/net/minecraft/client/network/packet/CommandTreeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping similarity index 92% rename from mappings/net/minecraft/client/network/packet/CommandTreeS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping index 56cb59b7c0..4f649862fc 100644 --- a/mappings/net/minecraft/client/network/packet/CommandTreeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2641 net/minecraft/client/network/packet/CommandTreeS2CPacket +CLASS net/minecraft/class_2641 net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket CLASS class_2642 CommandNodeData FIELD field_12124 flags B FIELD field_12125 childNodeIndices [I diff --git a/mappings/net/minecraft/client/network/packet/ConfirmGuiActionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping similarity index 72% rename from mappings/net/minecraft/client/network/packet/ConfirmGuiActionS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping index 934e30acc8..7dd5257cb1 100644 --- a/mappings/net/minecraft/client/network/packet/ConfirmGuiActionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2644 net/minecraft/client/network/packet/ConfirmGuiActionS2CPacket +CLASS net/minecraft/class_2644 net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket FIELD field_12134 actionId S FIELD field_12135 accepted Z FIELD field_12136 id I diff --git a/mappings/net/minecraft/client/network/packet/GuiUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ContainerPropertyUpdateS2CPacket.mapping similarity index 50% rename from mappings/net/minecraft/client/network/packet/GuiUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ContainerPropertyUpdateS2CPacket.mapping index 4c38a61fca..3411cc0910 100644 --- a/mappings/net/minecraft/client/network/packet/GuiUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ContainerPropertyUpdateS2CPacket.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_2651 net/minecraft/client/network/packet/GuiUpdateS2CPacket +CLASS net/minecraft/class_2651 net/minecraft/network/packet/s2c/play/ContainerPropertyUpdateS2CPacket FIELD field_12148 value I FIELD field_12149 propertyId I - FIELD field_12150 id I + FIELD field_12150 syncId I METHOD (III)V - ARG 1 window + ARG 1 syncId ARG 2 propertyId ARG 3 value METHOD method_11445 getPropertyId ()I METHOD method_11446 getValue ()I - METHOD method_11448 getId ()I + METHOD method_11448 getSyncId ()I diff --git a/mappings/net/minecraft/client/network/packet/GuiSlotUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ContainerSlotUpdateS2CPacket.mapping similarity index 58% rename from mappings/net/minecraft/client/network/packet/GuiSlotUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ContainerSlotUpdateS2CPacket.mapping index c09ac66800..3bbb46df9e 100644 --- a/mappings/net/minecraft/client/network/packet/GuiSlotUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ContainerSlotUpdateS2CPacket.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_2653 net/minecraft/client/network/packet/GuiSlotUpdateS2CPacket +CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ContainerSlotUpdateS2CPacket FIELD field_12151 slot I - FIELD field_12152 id I + FIELD field_12152 syncId I FIELD field_12153 stack Lnet/minecraft/class_1799; METHOD (IILnet/minecraft/class_1799;)V - ARG 1 id + ARG 1 syncId ARG 2 slot ARG 3 stack METHOD method_11449 getItemStack ()Lnet/minecraft/class_1799; METHOD method_11450 getSlot ()I - METHOD method_11452 getId ()I + METHOD method_11452 getSyncId ()I diff --git a/mappings/net/minecraft/client/network/packet/CooldownUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping similarity index 73% rename from mappings/net/minecraft/client/network/packet/CooldownUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping index 983665cf1c..f8c4b67942 100644 --- a/mappings/net/minecraft/client/network/packet/CooldownUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2656 net/minecraft/client/network/packet/CooldownUpdateS2CPacket +CLASS net/minecraft/class_2656 net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket FIELD field_12154 item Lnet/minecraft/class_1792; FIELD field_12155 cooldown I METHOD (Lnet/minecraft/class_1792;I)V diff --git a/mappings/net/minecraft/client/network/packet/CraftFailedResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping similarity index 71% rename from mappings/net/minecraft/client/network/packet/CraftFailedResponseS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping index 15a8090f20..a9edb5be7a 100644 --- a/mappings/net/minecraft/client/network/packet/CraftFailedResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2695 net/minecraft/client/network/packet/CraftFailedResponseS2CPacket +CLASS net/minecraft/class_2695 net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket FIELD field_12332 recipeId Lnet/minecraft/class_2960; FIELD field_12333 syncId I METHOD (ILnet/minecraft/class_1860;)V diff --git a/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket.mapping similarity index 92% rename from mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket.mapping index d2a978f93c..f59650245d 100644 --- a/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2658 net/minecraft/client/network/packet/CustomPayloadS2CPacket +CLASS net/minecraft/class_2658 net/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket FIELD field_12156 DEBUG_CAVES Lnet/minecraft/class_2960; FIELD field_12157 DEBUG_NEIGHBORS_UPDATE Lnet/minecraft/class_2960; FIELD field_12158 BRAND Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/network/packet/DifficultyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping similarity index 76% rename from mappings/net/minecraft/client/network/packet/DifficultyS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping index 54c39d271a..349b10db5c 100644 --- a/mappings/net/minecraft/client/network/packet/DifficultyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2632 net/minecraft/client/network/packet/DifficultyS2CPacket +CLASS net/minecraft/class_2632 net/minecraft/network/packet/s2c/play/DifficultyS2CPacket FIELD field_12090 difficulty Lnet/minecraft/class_1267; FIELD field_12091 difficultyLocked Z METHOD (Lnet/minecraft/class_1267;Z)V diff --git a/mappings/net/minecraft/client/network/packet/DisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DisconnectS2CPacket.mapping similarity index 66% rename from mappings/net/minecraft/client/network/packet/DisconnectS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/DisconnectS2CPacket.mapping index 017b402c9f..ac97fd523f 100644 --- a/mappings/net/minecraft/client/network/packet/DisconnectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DisconnectS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2661 net/minecraft/client/network/packet/DisconnectS2CPacket +CLASS net/minecraft/class_2661 net/minecraft/network/packet/s2c/play/DisconnectS2CPacket FIELD field_12173 reason Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;)V ARG 1 reason diff --git a/mappings/net/minecraft/client/network/packet/EntitiesDestroyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping similarity index 53% rename from mappings/net/minecraft/client/network/packet/EntitiesDestroyS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping index 1f16fccd9e..4310436d2b 100644 --- a/mappings/net/minecraft/client/network/packet/EntitiesDestroyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2716 net/minecraft/client/network/packet/EntitiesDestroyS2CPacket +CLASS net/minecraft/class_2716 net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket FIELD field_12422 entityIds [I METHOD ([I)V ARG 1 entityIds diff --git a/mappings/net/minecraft/client/network/packet/EntityAnimationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping similarity index 68% rename from mappings/net/minecraft/client/network/packet/EntityAnimationS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping index 1b5069608a..538bf5ded0 100644 --- a/mappings/net/minecraft/client/network/packet/EntityAnimationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2616 net/minecraft/client/network/packet/EntityAnimationS2CPacket +CLASS net/minecraft/class_2616 net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket FIELD field_12028 animationId I FIELD field_12029 id I METHOD (Lnet/minecraft/class_1297;I)V diff --git a/mappings/net/minecraft/client/network/packet/EntityAttachS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping similarity index 74% rename from mappings/net/minecraft/client/network/packet/EntityAttachS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping index 1fb0ff9065..bdad7ad7b8 100644 --- a/mappings/net/minecraft/client/network/packet/EntityAttachS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2740 net/minecraft/client/network/packet/EntityAttachS2CPacket +CLASS net/minecraft/class_2740 net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket FIELD field_12478 holdingId I FIELD field_12479 attachedId I METHOD (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/client/network/packet/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping similarity index 87% rename from mappings/net/minecraft/client/network/packet/EntityAttributesS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping index 3b3aa15eac..2ea9c261ca 100644 --- a/mappings/net/minecraft/client/network/packet/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2781 net/minecraft/client/network/packet/EntityAttributesS2CPacket +CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket CLASS class_2782 Entry FIELD field_12722 baseValue D FIELD field_12723 modifiers Ljava/util/Collection; diff --git a/mappings/net/minecraft/client/network/packet/EntityEquipmentUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping similarity index 79% rename from mappings/net/minecraft/client/network/packet/EntityEquipmentUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping index 6a513a4593..5fbefec2c3 100644 --- a/mappings/net/minecraft/client/network/packet/EntityEquipmentUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2744 net/minecraft/client/network/packet/EntityEquipmentUpdateS2CPacket +CLASS net/minecraft/class_2744 net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket FIELD field_12565 id I FIELD field_12566 stack Lnet/minecraft/class_1799; FIELD field_12567 slot Lnet/minecraft/class_1304; diff --git a/mappings/net/minecraft/client/network/packet/EntityPassengersSetS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping similarity index 57% rename from mappings/net/minecraft/client/network/packet/EntityPassengersSetS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping index aca9a69e90..7566318a9a 100644 --- a/mappings/net/minecraft/client/network/packet/EntityPassengersSetS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2752 net/minecraft/client/network/packet/EntityPassengersSetS2CPacket +CLASS net/minecraft/class_2752 net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket FIELD field_12593 passengerIds [I FIELD field_12594 id I METHOD method_11840 getPassengerIds ()[I diff --git a/mappings/net/minecraft/client/network/packet/EntityPositionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping similarity index 81% rename from mappings/net/minecraft/client/network/packet/EntityPositionS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping index eb2136b053..c955bb85c4 100644 --- a/mappings/net/minecraft/client/network/packet/EntityPositionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2777 net/minecraft/client/network/packet/EntityPositionS2CPacket +CLASS net/minecraft/class_2777 net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket FIELD field_12701 z D FIELD field_12702 y D FIELD field_12703 x D diff --git a/mappings/net/minecraft/client/network/packet/EntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping similarity index 91% rename from mappings/net/minecraft/client/network/packet/EntityS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping index 041e63ba8c..ee140ef426 100644 --- a/mappings/net/minecraft/client/network/packet/EntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2684 net/minecraft/client/network/packet/EntityS2CPacket +CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPacket CLASS class_2685 MoveRelative CLASS class_2686 RotateAndMoveRelative CLASS class_2687 Rotate diff --git a/mappings/net/minecraft/client/network/packet/EntitySetHeadYawS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping similarity index 72% rename from mappings/net/minecraft/client/network/packet/EntitySetHeadYawS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping index 60d572001c..fcff3ddd6c 100644 --- a/mappings/net/minecraft/client/network/packet/EntitySetHeadYawS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2726 net/minecraft/client/network/packet/EntitySetHeadYawS2CPacket +CLASS net/minecraft/class_2726 net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket FIELD field_12436 headYaw B FIELD field_12437 entity I METHOD (Lnet/minecraft/class_1297;B)V diff --git a/mappings/net/minecraft/client/network/packet/EntitySpawnGlobalS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnGlobalS2CPacket.mapping similarity index 75% rename from mappings/net/minecraft/client/network/packet/EntitySpawnGlobalS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntitySpawnGlobalS2CPacket.mapping index d762f7f04b..fc9a4fe56f 100644 --- a/mappings/net/minecraft/client/network/packet/EntitySpawnGlobalS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnGlobalS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2607 net/minecraft/client/network/packet/EntitySpawnGlobalS2CPacket +CLASS net/minecraft/class_2607 net/minecraft/network/packet/s2c/play/EntitySpawnGlobalS2CPacket FIELD field_11975 z D FIELD field_11976 y D FIELD field_11977 x D diff --git a/mappings/net/minecraft/client/network/packet/EntitySpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping similarity index 93% rename from mappings/net/minecraft/client/network/packet/EntitySpawnS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping index aa02b04ba4..0cdbbc796c 100644 --- a/mappings/net/minecraft/client/network/packet/EntitySpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2604 net/minecraft/client/network/packet/EntitySpawnS2CPacket +CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket FIELD field_11946 y D FIELD field_11947 pitch I FIELD field_11948 x D diff --git a/mappings/net/minecraft/client/network/packet/EntityPotionEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping similarity index 84% rename from mappings/net/minecraft/client/network/packet/EntityPotionEffectS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index 4bfedc97e4..4dc53e033e 100644 --- a/mappings/net/minecraft/client/network/packet/EntityPotionEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2783 net/minecraft/client/network/packet/EntityPotionEffectS2CPacket +CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket FIELD field_12725 effectId B FIELD field_12726 duration I FIELD field_12727 entityId I diff --git a/mappings/net/minecraft/client/network/packet/EntityStatusS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping similarity index 73% rename from mappings/net/minecraft/client/network/packet/EntityStatusS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping index a3ca300db4..5460389f01 100644 --- a/mappings/net/minecraft/client/network/packet/EntityStatusS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2663 net/minecraft/client/network/packet/EntityStatusS2CPacket +CLASS net/minecraft/class_2663 net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket FIELD field_12174 status B FIELD field_12175 id I METHOD (Lnet/minecraft/class_1297;B)V diff --git a/mappings/net/minecraft/client/network/packet/EntityTrackerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping similarity index 70% rename from mappings/net/minecraft/client/network/packet/EntityTrackerUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping index f955511139..5d5a2d9b23 100644 --- a/mappings/net/minecraft/client/network/packet/EntityTrackerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2739 net/minecraft/client/network/packet/EntityTrackerUpdateS2CPacket +CLASS net/minecraft/class_2739 net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket FIELD field_12476 id I FIELD field_12477 trackedValues Ljava/util/List; METHOD (ILnet/minecraft/class_2945;Z)V diff --git a/mappings/net/minecraft/client/network/packet/EntityVelocityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping similarity index 76% rename from mappings/net/minecraft/client/network/packet/EntityVelocityUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping index defbebb4de..4c60937855 100644 --- a/mappings/net/minecraft/client/network/packet/EntityVelocityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2743 net/minecraft/client/network/packet/EntityVelocityUpdateS2CPacket +CLASS net/minecraft/class_2743 net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket FIELD field_12561 velocityZ I FIELD field_12562 velocityY I FIELD field_12563 velocityX I diff --git a/mappings/net/minecraft/client/network/packet/ExperienceBarUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping similarity index 75% rename from mappings/net/minecraft/client/network/packet/ExperienceBarUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping index e158f9820b..e8a75e55bd 100644 --- a/mappings/net/minecraft/client/network/packet/ExperienceBarUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2748 net/minecraft/client/network/packet/ExperienceBarUpdateS2CPacket +CLASS net/minecraft/class_2748 net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket FIELD field_12580 barProgress F FIELD field_12581 experience I FIELD field_12582 experienceLevel I diff --git a/mappings/net/minecraft/client/network/packet/ExperienceOrbSpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping similarity index 74% rename from mappings/net/minecraft/client/network/packet/ExperienceOrbSpawnS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping index 2229fe6977..54c633df1a 100644 --- a/mappings/net/minecraft/client/network/packet/ExperienceOrbSpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2606 net/minecraft/client/network/packet/ExperienceOrbSpawnS2CPacket +CLASS net/minecraft/class_2606 net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket FIELD field_11970 z D FIELD field_11971 y D FIELD field_11972 x D diff --git a/mappings/net/minecraft/client/network/packet/ExplosionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping similarity index 89% rename from mappings/net/minecraft/client/network/packet/ExplosionS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping index 3cbdddc4e2..111a4906d1 100644 --- a/mappings/net/minecraft/client/network/packet/ExplosionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2664 net/minecraft/client/network/packet/ExplosionS2CPacket +CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2CPacket FIELD field_12176 playerVelocityX F FIELD field_12177 z D FIELD field_12178 y D diff --git a/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping similarity index 91% rename from mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 8e9016256e..1162316446 100644 --- a/mappings/net/minecraft/client/network/packet/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2678 net/minecraft/client/network/packet/GameJoinS2CPacket +CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2CPacket FIELD field_12277 generatorType Lnet/minecraft/class_1942; FIELD field_12278 reducedDebugInfo Z FIELD field_12279 maxPlayers I diff --git a/mappings/net/minecraft/client/network/packet/GameStateChangeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping similarity index 70% rename from mappings/net/minecraft/client/network/packet/GameStateChangeS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping index 067e00a5e0..52127fe5b4 100644 --- a/mappings/net/minecraft/client/network/packet/GameStateChangeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2668 net/minecraft/client/network/packet/GameStateChangeS2CPacket +CLASS net/minecraft/class_2668 net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket FIELD field_12198 value F FIELD field_12199 reason I FIELD field_12200 REASON_MESSAGES [Ljava/lang/String; diff --git a/mappings/net/minecraft/client/network/packet/HealthUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping similarity index 74% rename from mappings/net/minecraft/client/network/packet/HealthUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping index 463f15a35a..7f894f4eb9 100644 --- a/mappings/net/minecraft/client/network/packet/HealthUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2749 net/minecraft/client/network/packet/HealthUpdateS2CPacket +CLASS net/minecraft/class_2749 net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket FIELD field_12583 saturation F FIELD field_12584 health F FIELD field_12585 food I diff --git a/mappings/net/minecraft/network/packet/s2c/play/HeldItemChangeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/HeldItemChangeS2CPacket.mapping new file mode 100644 index 0000000000..660ed2ec0f --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/HeldItemChangeS2CPacket.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_2735 net/minecraft/network/packet/s2c/play/HeldItemChangeS2CPacket + FIELD field_12463 slot I + METHOD (I)V + ARG 1 slot + METHOD method_11803 getSlot ()I diff --git a/mappings/net/minecraft/client/network/packet/InventoryS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping similarity index 73% rename from mappings/net/minecraft/client/network/packet/InventoryS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping index 410d45827d..6d8351d3f0 100644 --- a/mappings/net/minecraft/client/network/packet/InventoryS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2649 net/minecraft/client/network/packet/InventoryS2CPacket +CLASS net/minecraft/class_2649 net/minecraft/network/packet/s2c/play/InventoryS2CPacket FIELD field_12146 guiId I FIELD field_12147 slotStackList Ljava/util/List; METHOD (ILnet/minecraft/class_2371;)V diff --git a/mappings/net/minecraft/client/network/packet/ItemPickupAnimationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ItemPickupAnimationS2CPacket.mapping similarity index 75% rename from mappings/net/minecraft/client/network/packet/ItemPickupAnimationS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ItemPickupAnimationS2CPacket.mapping index 2cdd21489b..b1b149477d 100644 --- a/mappings/net/minecraft/client/network/packet/ItemPickupAnimationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ItemPickupAnimationS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2775 net/minecraft/client/network/packet/ItemPickupAnimationS2CPacket +CLASS net/minecraft/class_2775 net/minecraft/network/packet/s2c/play/ItemPickupAnimationS2CPacket FIELD field_12692 stackAmount I FIELD field_12693 collectorEntityId I FIELD field_12694 entityId I diff --git a/mappings/net/minecraft/network/packet/s2c/play/KeepAliveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/KeepAliveS2CPacket.mapping new file mode 100644 index 0000000000..b3dea8063c --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/KeepAliveS2CPacket.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_2670 net/minecraft/network/packet/s2c/play/KeepAliveS2CPacket + FIELD field_12211 id J + METHOD (J)V + ARG 1 id + METHOD method_11517 getId ()J diff --git a/mappings/net/minecraft/client/network/packet/LightUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping similarity index 90% rename from mappings/net/minecraft/client/network/packet/LightUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping index f80e32831f..4b52cda8db 100644 --- a/mappings/net/minecraft/client/network/packet/LightUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2676 net/minecraft/client/network/packet/LightUpdateS2CPacket +CLASS net/minecraft/class_2676 net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket FIELD field_12261 blockLightUpdates Ljava/util/List; FIELD field_12262 blockLightMask I FIELD field_12263 skyLightMask I diff --git a/mappings/net/minecraft/client/network/packet/LookAtS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping similarity index 89% rename from mappings/net/minecraft/client/network/packet/LookAtS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping index fb821fe84a..9a791c73a6 100644 --- a/mappings/net/minecraft/client/network/packet/LookAtS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2707 net/minecraft/client/network/packet/LookAtS2CPacket +CLASS net/minecraft/class_2707 net/minecraft/network/packet/s2c/play/LookAtS2CPacket FIELD field_12383 targetZ D FIELD field_12384 targetY D FIELD field_12385 selfAnchor Lnet/minecraft/class_2183$class_2184; diff --git a/mappings/net/minecraft/client/network/packet/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping similarity index 86% rename from mappings/net/minecraft/client/network/packet/MapUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index e5138c682d..b7dbee8487 100644 --- a/mappings/net/minecraft/client/network/packet/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2683 net/minecraft/client/network/packet/MapUpdateS2CPacket +CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket FIELD field_12296 scale B FIELD field_12297 height I FIELD field_12298 colors [B diff --git a/mappings/net/minecraft/client/network/packet/MobSpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MobSpawnS2CPacket.mapping similarity index 50% rename from mappings/net/minecraft/client/network/packet/MobSpawnS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/MobSpawnS2CPacket.mapping index 07fc58d64d..e38ee3c8f3 100644 --- a/mappings/net/minecraft/client/network/packet/MobSpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MobSpawnS2CPacket.mapping @@ -1,27 +1,29 @@ -CLASS net/minecraft/class_2610 net/minecraft/client/network/packet/MobSpawnS2CPacket +CLASS net/minecraft/class_2610 net/minecraft/network/packet/s2c/play/MobSpawnS2CPacket FIELD field_11990 x D - FIELD field_11991 headPitch I - FIELD field_11992 pitch I - FIELD field_11993 yaw I + FIELD field_12003 y D + FIELD field_12002 z D + FIELD field_11991 velocityZ I + FIELD field_11992 velocityY I + FIELD field_11993 velocityX I FIELD field_11994 dataTracker Lnet/minecraft/class_2945; FIELD field_11995 entityTypeId I FIELD field_11996 id I FIELD field_11997 uuid Ljava/util/UUID; - FIELD field_11998 velocityZ B - FIELD field_11999 velocityY B - FIELD field_12000 velocityX B + FIELD field_11998 headYaw B + FIELD field_11999 pitch B + FIELD field_12000 yaw B FIELD field_12001 trackedValues Ljava/util/List; - FIELD field_12002 z D - FIELD field_12003 y D - METHOD method_11204 getVelocityZ ()B - METHOD method_11205 getVelocityX ()B - METHOD method_11206 getVelocityY ()B + METHOD (Lnet/minecraft/class_1309;)V + ARG 1 entity + METHOD method_11204 getHeadYaw ()B + METHOD method_11205 getYaw ()B + METHOD method_11206 getPitch ()B METHOD method_11207 getId ()I METHOD method_11208 getTrackedValues ()Ljava/util/List; - METHOD method_11209 getHeadPitch ()I + METHOD method_11209 getVelocityZ ()I METHOD method_11210 getEntityTypeId ()I - METHOD method_11211 getPitch ()I - METHOD method_11212 getYaw ()I + METHOD method_11211 getVelocityY ()I + METHOD method_11212 getVelocityX ()I METHOD method_11213 getUuid ()Ljava/util/UUID; METHOD method_11214 getX ()D METHOD method_11215 getY ()D diff --git a/mappings/net/minecraft/client/network/packet/OpenContainerPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenContainerS2CPacket.mapping similarity index 80% rename from mappings/net/minecraft/client/network/packet/OpenContainerPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/OpenContainerS2CPacket.mapping index 2c485a4c06..df86e10726 100644 --- a/mappings/net/minecraft/client/network/packet/OpenContainerPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenContainerS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3944 net/minecraft/client/network/packet/OpenContainerPacket +CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenContainerS2CPacket FIELD field_17436 syncId I FIELD field_17437 containerId I FIELD field_17438 name Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenHorseContainerS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseContainerS2CPacket.mapping new file mode 100644 index 0000000000..e3409affb2 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseContainerS2CPacket.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_2648 net/minecraft/network/packet/s2c/play/OpenHorseContainerS2CPacket + FIELD field_12142 horseId I + FIELD field_12143 slotCount I + FIELD field_12144 syncId I + METHOD (III)V + ARG 1 syncId + ARG 2 slotCount + ARG 3 horseId + METHOD method_11432 getSyncId ()I + METHOD method_11433 getHorseId ()I + METHOD method_11434 getSlotCount ()I diff --git a/mappings/net/minecraft/client/network/packet/OpenWrittenBookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping similarity index 53% rename from mappings/net/minecraft/client/network/packet/OpenWrittenBookS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping index c03d26aa3d..cf8e1d4742 100644 --- a/mappings/net/minecraft/client/network/packet/OpenWrittenBookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_3895 net/minecraft/client/network/packet/OpenWrittenBookS2CPacket +CLASS net/minecraft/class_3895 net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket FIELD field_17199 hand Lnet/minecraft/class_1268; METHOD method_17188 getHand ()Lnet/minecraft/class_1268; diff --git a/mappings/net/minecraft/client/network/packet/PaintingSpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PaintingSpawnS2CPacket.mapping similarity index 80% rename from mappings/net/minecraft/client/network/packet/PaintingSpawnS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PaintingSpawnS2CPacket.mapping index c4a7175da7..b89fef6ba0 100644 --- a/mappings/net/minecraft/client/network/packet/PaintingSpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PaintingSpawnS2CPacket.mapping @@ -1,7 +1,7 @@ -CLASS net/minecraft/class_2612 net/minecraft/client/network/packet/PaintingSpawnS2CPacket +CLASS net/minecraft/class_2612 net/minecraft/network/packet/s2c/play/PaintingSpawnS2CPacket FIELD field_12008 pos Lnet/minecraft/class_2338; FIELD field_12009 uuid Ljava/util/UUID; - FIELD field_12010 motive I + FIELD field_12010 motiveId I FIELD field_12011 facing Lnet/minecraft/class_2350; FIELD field_12012 id I METHOD (Lnet/minecraft/class_1534;)V diff --git a/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping similarity index 92% rename from mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping index 9c62e7e898..bf020121b5 100644 --- a/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2675 net/minecraft/client/network/packet/ParticleS2CPacket +CLASS net/minecraft/class_2675 net/minecraft/network/packet/s2c/play/ParticleS2CPacket FIELD field_12251 offsetZ F FIELD field_12252 offsetY F FIELD field_12253 count I diff --git a/mappings/net/minecraft/client/network/packet/PlaySoundFromEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping similarity index 85% rename from mappings/net/minecraft/client/network/packet/PlaySoundFromEntityS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping index 16f6d990c2..72a8133f98 100644 --- a/mappings/net/minecraft/client/network/packet/PlaySoundFromEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2765 net/minecraft/client/network/packet/PlaySoundFromEntityS2CPacket +CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket FIELD field_12638 pitch F FIELD field_12639 volume F FIELD field_12640 entityId I diff --git a/mappings/net/minecraft/client/network/packet/PlaySoundIdS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping similarity index 88% rename from mappings/net/minecraft/client/network/packet/PlaySoundIdS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping index 38d139fee9..9f6043a58c 100644 --- a/mappings/net/minecraft/client/network/packet/PlaySoundIdS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2660 net/minecraft/client/network/packet/PlaySoundIdS2CPacket +CLASS net/minecraft/class_2660 net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket FIELD field_12166 volume F FIELD field_12167 fixedZ I FIELD field_12168 fixedY I diff --git a/mappings/net/minecraft/client/network/packet/PlaySoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping similarity index 88% rename from mappings/net/minecraft/client/network/packet/PlaySoundS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping index a79bdf9c1a..9d3e2dc76e 100644 --- a/mappings/net/minecraft/client/network/packet/PlaySoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2767 net/minecraft/client/network/packet/PlaySoundS2CPacket +CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket FIELD field_12656 volume F FIELD field_12657 fixedZ I FIELD field_12658 fixedY I diff --git a/mappings/net/minecraft/client/network/packet/PlayerAbilitiesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping similarity index 87% rename from mappings/net/minecraft/client/network/packet/PlayerAbilitiesS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping index aa08e5128d..2e668a33f8 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerAbilitiesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2696 net/minecraft/client/network/packet/PlayerAbilitiesS2CPacket +CLASS net/minecraft/class_2696 net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket FIELD field_12334 fovModifier F FIELD field_12335 flySpeed F FIELD field_12336 creativeMode Z diff --git a/mappings/net/minecraft/client/network/packet/BlockPlayerActionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping similarity index 84% rename from mappings/net/minecraft/client/network/packet/BlockPlayerActionS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping index 4a35bb1fa3..c60df790a1 100644 --- a/mappings/net/minecraft/client/network/packet/BlockPlayerActionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4463 net/minecraft/client/network/packet/BlockPlayerActionS2CPacket +CLASS net/minecraft/class_4463 net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket FIELD field_20319 action Lnet/minecraft/class_2846$class_2847; FIELD field_20320 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_20321 pos Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/client/network/packet/PlayerListHeaderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping similarity index 70% rename from mappings/net/minecraft/client/network/packet/PlayerListHeaderS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping index 78c6d96912..d620719469 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerListHeaderS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2772 net/minecraft/client/network/packet/PlayerListHeaderS2CPacket +CLASS net/minecraft/class_2772 net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket FIELD field_12683 header Lnet/minecraft/class_2561; FIELD field_12684 footer Lnet/minecraft/class_2561; METHOD method_11906 getFooter ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/network/packet/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping similarity index 91% rename from mappings/net/minecraft/client/network/packet/PlayerListS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping index 328b441206..fdbd33311a 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerListS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2703 net/minecraft/client/network/packet/PlayerListS2CPacket +CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS2CPacket CLASS class_2704 Action CLASS class_2705 Entry FIELD field_12377 displayName Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/network/packet/PlayerPositionLookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping similarity index 89% rename from mappings/net/minecraft/client/network/packet/PlayerPositionLookS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping index 58c66b8818..b4b533cd4f 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerPositionLookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2708 net/minecraft/client/network/packet/PlayerPositionLookS2CPacket +CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket CLASS class_2709 Flag FIELD field_12399 shift I METHOD (Ljava/lang/String;II)V diff --git a/mappings/net/minecraft/client/network/packet/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping similarity index 84% rename from mappings/net/minecraft/client/network/packet/PlayerRespawnS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index 4c1f01ad59..8359666420 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2724 net/minecraft/client/network/packet/PlayerRespawnS2CPacket +CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket FIELD field_12431 dimension Lnet/minecraft/class_2874; FIELD field_12432 generatorType Lnet/minecraft/class_1942; FIELD field_12434 gameMode Lnet/minecraft/class_1934; diff --git a/mappings/net/minecraft/client/network/packet/PlayerSpawnPositionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping similarity index 62% rename from mappings/net/minecraft/client/network/packet/PlayerSpawnPositionS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping index e74a98b10f..fc429f2e1f 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerSpawnPositionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2759 net/minecraft/client/network/packet/PlayerSpawnPositionS2CPacket +CLASS net/minecraft/class_2759 net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket FIELD field_12615 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2338;)V ARG 1 pos diff --git a/mappings/net/minecraft/client/network/packet/PlayerSpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnS2CPacket.mapping similarity index 87% rename from mappings/net/minecraft/client/network/packet/PlayerSpawnS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnS2CPacket.mapping index 6778692063..8b284a3865 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerSpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2613 net/minecraft/client/network/packet/PlayerSpawnS2CPacket +CLASS net/minecraft/class_2613 net/minecraft/network/packet/s2c/play/PlayerSpawnS2CPacket FIELD field_12013 y D FIELD field_12014 x D FIELD field_12015 uuid Ljava/util/UUID; diff --git a/mappings/net/minecraft/client/network/packet/RemoveEntityEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping similarity index 75% rename from mappings/net/minecraft/client/network/packet/RemoveEntityEffectS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping index f529754136..7273713c9c 100644 --- a/mappings/net/minecraft/client/network/packet/RemoveEntityEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2718 net/minecraft/client/network/packet/RemoveEntityEffectS2CPacket +CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket FIELD field_12424 entityId I FIELD field_12425 effectType Lnet/minecraft/class_1291; METHOD (ILnet/minecraft/class_1291;)V diff --git a/mappings/net/minecraft/client/network/packet/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping similarity index 73% rename from mappings/net/minecraft/client/network/packet/ResourcePackSendS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping index 46162e58b5..fac719c753 100644 --- a/mappings/net/minecraft/client/network/packet/ResourcePackSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2720 net/minecraft/client/network/packet/ResourcePackSendS2CPacket +CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket FIELD field_12427 url Ljava/lang/String; FIELD field_12428 hash Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping similarity index 68% rename from mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping index 50cf2c2036..faafb78a27 100644 --- a/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2736 net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket +CLASS net/minecraft/class_2736 net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket FIELD field_12464 slot I FIELD field_12465 name Ljava/lang/String; METHOD (ILnet/minecraft/class_266;)V diff --git a/mappings/net/minecraft/client/network/packet/ScoreboardObjectiveUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping similarity index 81% rename from mappings/net/minecraft/client/network/packet/ScoreboardObjectiveUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping index 27b7b2d596..f3c4c42f63 100644 --- a/mappings/net/minecraft/client/network/packet/ScoreboardObjectiveUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2751 net/minecraft/client/network/packet/ScoreboardObjectiveUpdateS2CPacket +CLASS net/minecraft/class_2751 net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket FIELD field_12589 name Ljava/lang/String; FIELD field_12590 mode I FIELD field_12591 displayName Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/network/packet/ScoreboardPlayerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping similarity index 84% rename from mappings/net/minecraft/client/network/packet/ScoreboardPlayerUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping index 07b58f1251..264fcdef08 100644 --- a/mappings/net/minecraft/client/network/packet/ScoreboardPlayerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2757 net/minecraft/client/network/packet/ScoreboardPlayerUpdateS2CPacket +CLASS net/minecraft/class_2757 net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket FIELD field_12610 playerName Ljava/lang/String; FIELD field_12611 score I FIELD field_12612 mode Lnet/minecraft/class_2995$class_2996; diff --git a/mappings/net/minecraft/client/network/packet/SelectAdvancementTabS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping similarity index 63% rename from mappings/net/minecraft/client/network/packet/SelectAdvancementTabS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping index 48c4886bcb..4e1f9d49f1 100644 --- a/mappings/net/minecraft/client/network/packet/SelectAdvancementTabS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2729 net/minecraft/client/network/packet/SelectAdvancementTabS2CPacket +CLASS net/minecraft/class_2729 net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket FIELD field_12440 tabId Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 tabId diff --git a/mappings/net/minecraft/client/network/packet/SetCameraEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping similarity index 53% rename from mappings/net/minecraft/client/network/packet/SetCameraEntityS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping index 9df0f857ea..ae82ca7ecd 100644 --- a/mappings/net/minecraft/client/network/packet/SetCameraEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_2734 net/minecraft/client/network/packet/SetCameraEntityS2CPacket +CLASS net/minecraft/class_2734 net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket FIELD field_12462 id I METHOD method_11800 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/client/network/packet/SetTradeOffersPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping similarity index 86% rename from mappings/net/minecraft/client/network/packet/SetTradeOffersPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping index f3a2ff9290..9a6f3ce910 100644 --- a/mappings/net/minecraft/client/network/packet/SetTradeOffersPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3943 net/minecraft/client/network/packet/SetTradeOffersPacket +CLASS net/minecraft/class_3943 net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket FIELD field_17434 syncId I FIELD field_17435 recipes Lnet/minecraft/class_1916; FIELD field_18801 levelProgress I diff --git a/mappings/net/minecraft/client/network/packet/SignEditorOpenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping similarity index 63% rename from mappings/net/minecraft/client/network/packet/SignEditorOpenS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping index 45be2cba93..e1edb658a8 100644 --- a/mappings/net/minecraft/client/network/packet/SignEditorOpenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2693 net/minecraft/client/network/packet/SignEditorOpenS2CPacket +CLASS net/minecraft/class_2693 net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket FIELD field_12325 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2338;)V ARG 1 pos diff --git a/mappings/net/minecraft/client/network/packet/StatisticsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping similarity index 80% rename from mappings/net/minecraft/client/network/packet/StatisticsS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping index d2e958fc27..4275721993 100644 --- a/mappings/net/minecraft/client/network/packet/StatisticsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2617 net/minecraft/client/network/packet/StatisticsS2CPacket +CLASS net/minecraft/class_2617 net/minecraft/network/packet/s2c/play/StatisticsS2CPacket FIELD field_12030 stats Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntMap;)V ARG 1 stats diff --git a/mappings/net/minecraft/client/network/packet/StopSoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping similarity index 79% rename from mappings/net/minecraft/client/network/packet/StopSoundS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping index d457c1454a..ecc67d61f7 100644 --- a/mappings/net/minecraft/client/network/packet/StopSoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2770 net/minecraft/client/network/packet/StopSoundS2CPacket +CLASS net/minecraft/class_2770 net/minecraft/network/packet/s2c/play/StopSoundS2CPacket FIELD field_12676 soundId Lnet/minecraft/class_2960; FIELD field_12677 category Lnet/minecraft/class_3419; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;)V diff --git a/mappings/net/minecraft/client/network/packet/SynchronizeRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping similarity index 79% rename from mappings/net/minecraft/client/network/packet/SynchronizeRecipesS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping index 14b763c0c3..f21c7f0f64 100644 --- a/mappings/net/minecraft/client/network/packet/SynchronizeRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2788 net/minecraft/client/network/packet/SynchronizeRecipesS2CPacket +CLASS net/minecraft/class_2788 net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket FIELD field_12751 recipes Ljava/util/List; METHOD (Ljava/util/Collection;)V ARG 1 recipes diff --git a/mappings/net/minecraft/client/network/packet/SynchronizeTagsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping similarity index 66% rename from mappings/net/minecraft/client/network/packet/SynchronizeTagsS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping index 742a33a1fa..2077276e79 100644 --- a/mappings/net/minecraft/client/network/packet/SynchronizeTagsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2790 net/minecraft/client/network/packet/SynchronizeTagsS2CPacket +CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket FIELD field_12757 tagManager Lnet/minecraft/class_3505; METHOD (Lnet/minecraft/class_3505;)V ARG 1 tagManager diff --git a/mappings/net/minecraft/client/network/packet/TagQueryResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket.mapping similarity index 73% rename from mappings/net/minecraft/client/network/packet/TagQueryResponseS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket.mapping index 3a5eb5b831..7805ff164d 100644 --- a/mappings/net/minecraft/client/network/packet/TagQueryResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2774 net/minecraft/client/network/packet/TagQueryResponseS2CPacket +CLASS net/minecraft/class_2774 net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket FIELD field_12690 tag Lnet/minecraft/class_2487; FIELD field_12691 transactionId I METHOD (ILnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/client/network/packet/TeamS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping similarity index 93% rename from mappings/net/minecraft/client/network/packet/TeamS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping index afe76beb8a..f14b419684 100644 --- a/mappings/net/minecraft/client/network/packet/TeamS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2755 net/minecraft/client/network/packet/TeamS2CPacket +CLASS net/minecraft/class_2755 net/minecraft/network/packet/s2c/play/TeamS2CPacket FIELD field_12597 suffix Lnet/minecraft/class_2561; FIELD field_12598 color Lnet/minecraft/class_124; FIELD field_12599 mode I diff --git a/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping similarity index 90% rename from mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping index 9a7ab4425e..e45e99d0f2 100644 --- a/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2762 net/minecraft/client/network/packet/TitleS2CPacket +CLASS net/minecraft/class_2762 net/minecraft/network/packet/s2c/play/TitleS2CPacket CLASS class_2763 Action FIELD field_12622 fadeOutTicks I FIELD field_12623 stayTicks I diff --git a/mappings/net/minecraft/client/network/packet/UnloadChunkS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping similarity index 62% rename from mappings/net/minecraft/client/network/packet/UnloadChunkS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping index 389c4cc412..ed5a5dae6f 100644 --- a/mappings/net/minecraft/client/network/packet/UnloadChunkS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2666 net/minecraft/client/network/packet/UnloadChunkS2CPacket +CLASS net/minecraft/class_2666 net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket FIELD field_12194 z I FIELD field_12195 x I METHOD (II)V diff --git a/mappings/net/minecraft/client/network/packet/UnlockRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping similarity index 91% rename from mappings/net/minecraft/client/network/packet/UnlockRecipesS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping index 8c87912711..79cf3de86d 100644 --- a/mappings/net/minecraft/client/network/packet/UnlockRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2713 net/minecraft/client/network/packet/UnlockRecipesS2CPacket +CLASS net/minecraft/class_2713 net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket CLASS class_2714 Action FIELD field_12408 action Lnet/minecraft/class_2713$class_2714; FIELD field_12409 recipeIdsToInit Ljava/util/List; diff --git a/mappings/net/minecraft/client/network/packet/VehicleMoveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping similarity index 75% rename from mappings/net/minecraft/client/network/packet/VehicleMoveS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping index aa45a55bcc..8397af889b 100644 --- a/mappings/net/minecraft/client/network/packet/VehicleMoveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2692 net/minecraft/client/network/packet/VehicleMoveS2CPacket +CLASS net/minecraft/class_2692 net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket FIELD field_12320 z D FIELD field_12321 pitch F FIELD field_12322 y D diff --git a/mappings/net/minecraft/client/network/packet/WorldBorderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderS2CPacket.mapping similarity index 84% rename from mappings/net/minecraft/client/network/packet/WorldBorderS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/WorldBorderS2CPacket.mapping index 188303c3bc..625305f984 100644 --- a/mappings/net/minecraft/client/network/packet/WorldBorderS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2730 net/minecraft/client/network/packet/WorldBorderS2CPacket +CLASS net/minecraft/class_2730 net/minecraft/network/packet/s2c/play/WorldBorderS2CPacket CLASS class_2731 Type FIELD field_12441 centerZ D FIELD field_12442 warningBlocks I diff --git a/mappings/net/minecraft/client/network/packet/WorldEventS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping similarity index 81% rename from mappings/net/minecraft/client/network/packet/WorldEventS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping index 31d713868c..66b3ab0f4b 100644 --- a/mappings/net/minecraft/client/network/packet/WorldEventS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2673 net/minecraft/client/network/packet/WorldEventS2CPacket +CLASS net/minecraft/class_2673 net/minecraft/network/packet/s2c/play/WorldEventS2CPacket FIELD field_12239 data I FIELD field_12240 global Z FIELD field_12241 eventId I diff --git a/mappings/net/minecraft/client/network/packet/WorldTimeUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping similarity index 65% rename from mappings/net/minecraft/client/network/packet/WorldTimeUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping index e360d015b8..6416dc0d19 100644 --- a/mappings/net/minecraft/client/network/packet/WorldTimeUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2761 net/minecraft/client/network/packet/WorldTimeUpdateS2CPacket +CLASS net/minecraft/class_2761 net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket FIELD field_12620 timeOfDay J FIELD field_12621 time J METHOD (JJZ)V diff --git a/mappings/net/minecraft/network/packet/s2c/query/QueryPongS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/QueryPongS2CPacket.mapping new file mode 100644 index 0000000000..66c4da5907 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/query/QueryPongS2CPacket.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_2923 net/minecraft/network/packet/s2c/query/QueryPongS2CPacket + FIELD field_13280 startTime J + METHOD (J)V + ARG 1 startTime diff --git a/mappings/net/minecraft/client/network/packet/QueryResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping similarity index 71% rename from mappings/net/minecraft/client/network/packet/QueryResponseS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping index be132b8284..ba571af324 100644 --- a/mappings/net/minecraft/client/network/packet/QueryResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2924 net/minecraft/client/network/packet/QueryResponseS2CPacket +CLASS net/minecraft/class_2924 net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket FIELD field_13281 metadata Lnet/minecraft/class_2926; FIELD field_13282 GSON Lcom/google/gson/Gson; METHOD (Lnet/minecraft/class_2926;)V diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping index f2b0a8cdc7..374e7d3dce 100644 --- a/mappings/net/minecraft/particle/DustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect - FIELD field_11184 alpha F + FIELD field_11184 scale F FIELD field_11185 blue F FIELD field_11186 green F FIELD field_11187 red F @@ -9,8 +9,8 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect ARG 1 red ARG 2 green ARG 3 blue - ARG 4 alpha - METHOD method_10283 getAlpha ()F + ARG 4 scale + METHOD method_10283 getScale ()F METHOD method_10284 getBlue ()F METHOD method_10285 getRed ()F METHOD method_10286 getGreen ()F diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index 14de15996f..b175154e4c 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion - FIELD field_8954 name Ljava/lang/String; - FIELD field_8955 effectList Lcom/google/common/collect/ImmutableList; + FIELD field_8954 baseName Ljava/lang/String; + FIELD field_8955 effects Lcom/google/common/collect/ImmutableList; METHOD (Ljava/lang/String;[Lnet/minecraft/class_1293;)V - ARG 1 name + ARG 1 baseName ARG 2 effects METHOD ([Lnet/minecraft/class_1293;)V ARG 1 effects @@ -10,4 +10,5 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion ARG 0 id METHOD method_8049 getEffects ()Ljava/util/List; METHOD method_8050 hasInstantEffect ()Z - METHOD method_8051 getName (Ljava/lang/String;)Ljava/lang/String; + METHOD method_8051 finishTranslationKey (Ljava/lang/String;)Ljava/lang/String; + ARG 1 prefix diff --git a/mappings/net/minecraft/predicate/DamagePredicate.mapping b/mappings/net/minecraft/predicate/DamagePredicate.mapping index af282dc137..c787d327c8 100644 --- a/mappings/net/minecraft/predicate/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/DamagePredicate.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/class_2019 net/minecraft/predicate/DamagePredicate ARG 2 taken ARG 3 sourceEntity ARG 4 blocked + ARG 5 type METHOD method_8838 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z ARG 1 player ARG 2 source diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index eaa97e0164..37c840219a 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -2,10 +2,13 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate FIELD field_9715 tag Lnet/minecraft/class_2487; FIELD field_9716 ANY Lnet/minecraft/class_2105; METHOD method_9072 test (Lnet/minecraft/class_1297;)Z - METHOD method_9073 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2105; - ARG 0 element + ARG 1 entity + METHOD method_9073 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2105; + ARG 0 json METHOD method_9074 test (Lnet/minecraft/class_1799;)Z - METHOD method_9075 serialize ()Lcom/google/gson/JsonElement; + ARG 1 stack + METHOD method_9075 toJson ()Lcom/google/gson/JsonElement; METHOD method_9076 entityToTag (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487; ARG 0 entity METHOD method_9077 test (Lnet/minecraft/class_2520;)Z + ARG 1 tag diff --git a/mappings/net/minecraft/util/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping similarity index 89% rename from mappings/net/minecraft/util/NumberRange.mapping rename to mappings/net/minecraft/predicate/NumberRange.mapping index 5b8033e84f..add9cbc382 100644 --- a/mappings/net/minecraft/util/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2096 net/minecraft/util/NumberRange +CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange CLASS class_2097 Factory CLASS class_2099 FloatRange FIELD field_9703 minSquared Ljava/lang/Double; @@ -49,18 +49,26 @@ CLASS net/minecraft/class_2096 net/minecraft/util/NumberRange METHOD (Ljava/lang/Number;Ljava/lang/Number;)V ARG 1 min ARG 2 max - METHOD method_9035 applyIfNonNull (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; + METHOD method_9035 map (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; ARG 0 object ARG 1 function - METHOD method_9036 serialize ()Lcom/google/gson/JsonElement; + METHOD method_9036 toJson ()Lcom/google/gson/JsonElement; METHOD method_9037 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/lang/Number; + ARG 0 reader + ARG 1 converter + ARG 2 exceptionTypeSupplier METHOD method_9038 getMin ()Ljava/lang/Number; METHOD method_9039 fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/class_2096;Ljava/util/function/BiFunction;Lnet/minecraft/class_2096$class_2097;)Lnet/minecraft/class_2096; ARG 0 json - ARG 1 defaultValue + ARG 1 fallback + ARG 2 asNumber ARG 3 factory METHOD method_9040 isNextCharValid (Lcom/mojang/brigadier/StringReader;)Z ARG 0 reader METHOD method_9041 isDummy ()Z METHOD method_9042 getMax ()Ljava/lang/Number; METHOD method_9043 parse (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2096$class_2098;Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/util/function/Function;)Lnet/minecraft/class_2096; + ARG 0 commandReader + ARG 2 converter + ARG 3 exceptionTypeSupplier + ARG 4 mapper diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 7611d739c0..6385a313cb 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -42,12 +42,12 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate METHOD method_8909 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 1 world ARG 2 pos - METHOD method_8910 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2048; + METHOD method_8910 fromJsonArray (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2048; ARG 0 element METHOD method_8911 serializeAll ([Lnet/minecraft/class_2048;)Lcom/google/gson/JsonElement; ARG 0 predicates METHOD method_8912 serialize ()Lcom/google/gson/JsonElement; - METHOD method_8913 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048; + METHOD method_8913 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048; ARG 0 el METHOD method_8914 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Z ARG 1 player diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index fa4103ccdc..eae9dbca65 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -29,12 +29,15 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate METHOD method_9018 test (Lnet/minecraft/class_3218;DDD)Z ARG 1 world ARG 2 x - METHOD method_9019 serialize ()Lcom/google/gson/JsonElement; + ARG 4 y + ARG 6 z + METHOD method_9019 toJson ()Lcom/google/gson/JsonElement; METHOD method_9020 test (Lnet/minecraft/class_3218;FFF)Z ARG 1 world ARG 2 x ARG 3 y - METHOD method_9021 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2090; + ARG 4 z + METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2090; ARG 0 element METHOD method_9022 biome (Lnet/minecraft/class_1959;)Lnet/minecraft/class_2090; ARG 0 biome diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index e239757447..724456b917 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -30,9 +30,10 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate ARG 4 durability ARG 5 enchantments ARG 6 potion - METHOD method_8969 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2073; + METHOD method_8969 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2073; ARG 0 el METHOD method_8970 test (Lnet/minecraft/class_1799;)Z - METHOD method_8971 serialize ()Lcom/google/gson/JsonElement; + ARG 1 stack + METHOD method_8971 toJson ()Lcom/google/gson/JsonElement; METHOD method_8972 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2073; ARG 0 el diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 312cbdabf5..b0e2c340a9 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient METHOD method_8109 toJson ()Lcom/google/gson/JsonObject; FIELD field_9016 ids Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_9017 EMPTY Lnet/minecraft/class_1856; - FIELD field_9018 stackArray [Lnet/minecraft/class_1799; + FIELD field_9018 matchingStacks [Lnet/minecraft/class_1799; FIELD field_9019 entries [Lnet/minecraft/class_1856$class_1859; FIELD field_9020 NON_EMPTY Ljava/util/function/Predicate; METHOD (Ljava/util/stream/Stream;)V @@ -19,15 +19,20 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient ARG 1 buf METHOD method_8089 toJson ()Lcom/google/gson/JsonElement; METHOD method_8091 ofItems ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_1856; + ARG 0 items METHOD method_8092 ofEntries (Ljava/util/stream/Stream;)Lnet/minecraft/class_1856; - METHOD method_8096 createStackArray ()V + ARG 0 entries + METHOD method_8096 cacheMatchingStacks ()V METHOD method_8100 getIds ()Lit/unimi/dsi/fastutil/ints/IntList; METHOD method_8101 ofStacks ([Lnet/minecraft/class_1799;)Lnet/minecraft/class_1856; + ARG 0 stacks METHOD method_8102 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_1856; - ARG 0 element + ARG 0 json METHOD method_8103 isEmpty ()Z - METHOD method_8105 getStackArray ()[Lnet/minecraft/class_1799; + METHOD method_8105 getMatchingStacksClient ()[Lnet/minecraft/class_1799; METHOD method_8106 fromTag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_1856; + ARG 0 tag METHOD method_8107 entryFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1856$class_1859; + ARG 0 json METHOD test (Ljava/lang/Object;)Z ARG 1 stack diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index 954137560b..55ed6f564f 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -1,15 +1,23 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager FIELD field_19359 GSON Lcom/google/gson/Gson; - FIELD field_9023 recipeMap Ljava/util/Map; - FIELD field_9024 hadErrors Z + FIELD field_9023 recipes Ljava/util/Map; + FIELD field_9024 errored Z FIELD field_9027 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_17717 getAllForType (Lnet/minecraft/class_3956;)Ljava/util/Map; + METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map; + ARG 1 type METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1860; ARG 0 id ARG 1 json METHOD method_17877 getAllMatches (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/List; + ARG 1 type + ARG 2 inventory + ARG 3 world METHOD method_8126 values ()Ljava/util/Collection; METHOD method_8127 keys ()Ljava/util/stream/Stream; METHOD method_8128 getRemainingStacks (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Lnet/minecraft/class_2371; METHOD method_8130 get (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 id METHOD method_8132 getFirstMatch (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/Optional; + ARG 1 type + ARG 2 inventory + ARG 3 world diff --git a/mappings/net/minecraft/recipe/book/RecipeBook.mapping b/mappings/net/minecraft/recipe/book/RecipeBook.mapping index 98aed71441..2a2a867d6e 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBook.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBook.mapping @@ -10,19 +10,29 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook FIELD field_17269 smokerGuiOpen Z FIELD field_17270 smokerFilteringCraftable Z METHOD method_14875 copyFrom (Lnet/minecraft/class_3439;)V + ARG 1 book METHOD method_14876 add (Lnet/minecraft/class_1860;)V + ARG 1 recipe METHOD method_14877 display (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_14878 contains (Lnet/minecraft/class_1860;)Z + ARG 1 recipe METHOD method_14879 remove (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_14880 isFilteringCraftable (Lnet/minecraft/class_1729;)Z + ARG 1 container METHOD method_14881 add (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_14882 setFurnaceGuiOpen (Z)V ARG 1 furnaceGuiOpen METHOD method_14883 shouldDisplay (Lnet/minecraft/class_1860;)Z + ARG 1 recipe METHOD method_14884 setGuiOpen (Z)V ARG 1 guiOpen METHOD method_14885 display (Lnet/minecraft/class_1860;)V + ARG 1 recipe METHOD method_14886 onRecipeDisplayed (Lnet/minecraft/class_1860;)V + ARG 1 recipe METHOD method_14887 isGuiOpen ()Z METHOD method_14888 setFurnaceFilteringCraftable (Z)V ARG 1 furnaceFilteringCraftable @@ -32,6 +42,7 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook METHOD method_14891 isFurnaceGuiOpen ()Z METHOD method_14892 isFurnaceFilteringCraftable ()Z METHOD method_14893 remove (Lnet/minecraft/class_1860;)V + ARG 1 recipe METHOD method_17317 isBlastFurnaceGuiOpen ()Z METHOD method_17318 setBlastFurnaceGuiOpen (Z)V ARG 1 blastFurnaceGuiOpen diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index 315b2e0523..11c1e3247c 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack FIELD field_14193 namespaces Ljava/util/Set; - FIELD field_14194 RESOURCE_CLASS Ljava/lang/Class; + FIELD field_14194 resourceClass Ljava/lang/Class; FIELD field_14195 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_14196 RESOURCE_PATH Ljava/nio/file/Path; + FIELD field_14196 resourcePath Ljava/nio/file/Path; FIELD field_17917 typeToFileSystem Ljava/util/Map; METHOD ([Ljava/lang/String;)V ARG 1 namespaces diff --git a/mappings/net/minecraft/resource/DefaultResourcePackCreator.mapping b/mappings/net/minecraft/resource/DefaultResourcePackCreator.mapping deleted file mode 100644 index 67c8fc1176..0000000000 --- a/mappings/net/minecraft/resource/DefaultResourcePackCreator.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_3286 net/minecraft/resource/DefaultResourcePackCreator - FIELD field_14269 pack Lnet/minecraft/class_3268; diff --git a/mappings/net/minecraft/resource/FileResourcePackCreator.mapping b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping similarity index 95% rename from mappings/net/minecraft/resource/FileResourcePackCreator.mapping rename to mappings/net/minecraft/resource/FileResourcePackProvider.mapping index 91d4549da7..2bfb8d1b19 100644 --- a/mappings/net/minecraft/resource/FileResourcePackCreator.mapping +++ b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackCreator +CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider FIELD field_14217 POSSIBLE_PACK Ljava/io/FileFilter; FIELD field_14218 packsFolder Ljava/io/File; METHOD (Ljava/io/File;)V diff --git a/mappings/net/minecraft/resource/ResourcePackContainerManager.mapping b/mappings/net/minecraft/resource/ResourcePackContainerManager.mapping deleted file mode 100644 index a5f918f209..0000000000 --- a/mappings/net/minecraft/resource/ResourcePackContainerManager.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackContainerManager - FIELD field_14225 enabledContainers Ljava/util/List; - FIELD field_14226 nameToContainer Ljava/util/Map; - FIELD field_14227 creators Ljava/util/Set; - FIELD field_14228 factory Lnet/minecraft/class_3288$class_3290; - METHOD (Lnet/minecraft/class_3288$class_3290;)V - ARG 1 factory - METHOD method_14441 getAlphabeticallyOrderedContainers ()Ljava/util/Collection; - METHOD method_14442 getDisabledContainers ()Ljava/util/Collection; - METHOD method_14443 addCreator (Lnet/minecraft/class_3285;)V - ARG 1 creator - METHOD method_14444 getEnabledContainers ()Ljava/util/Collection; - METHOD method_14445 callCreators ()V - METHOD method_14447 setEnabled (Ljava/util/Collection;)V - ARG 1 enabled - METHOD method_14448 sortMapByName ()V - METHOD method_14449 getContainer (Ljava/lang/String;)Lnet/minecraft/class_3288; - ARG 1 name diff --git a/mappings/net/minecraft/resource/ResourcePackCreator.mapping b/mappings/net/minecraft/resource/ResourcePackCreator.mapping deleted file mode 100644 index 248a7d9f97..0000000000 --- a/mappings/net/minecraft/resource/ResourcePackCreator.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3285 net/minecraft/resource/ResourcePackCreator - METHOD method_14453 registerContainer (Ljava/util/Map;Lnet/minecraft/class_3288$class_3290;)V - ARG 1 registry - ARG 2 factory diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping new file mode 100644 index 0000000000..93e7a8e93a --- /dev/null +++ b/mappings/net/minecraft/resource/ResourcePackManager.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager + FIELD field_14225 enabled Ljava/util/List; + FIELD field_14226 profiles Ljava/util/Map; + FIELD field_14227 providers Ljava/util/Set; + FIELD field_14228 profileFactory Lnet/minecraft/class_3288$class_3290; + METHOD (Lnet/minecraft/class_3288$class_3290;)V + ARG 1 factory + METHOD method_14441 getProfiles ()Ljava/util/Collection; + METHOD method_14442 getDisabledProfiles ()Ljava/util/Collection; + METHOD method_14443 registerProvider (Lnet/minecraft/class_3285;)V + ARG 1 provider + METHOD method_14444 getEnabledProfiles ()Ljava/util/Collection; + METHOD method_14445 scanPacks ()V + METHOD method_14447 setEnabledProfiles (Ljava/util/Collection;)V + ARG 1 enabled + METHOD method_14448 sort ()V + METHOD method_14449 getProfile (Ljava/lang/String;)Lnet/minecraft/class_3288; + ARG 1 name diff --git a/mappings/net/minecraft/resource/ResourcePackContainer.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping similarity index 87% rename from mappings/net/minecraft/resource/ResourcePackContainer.mapping rename to mappings/net/minecraft/resource/ResourcePackProfile.mapping index 7fff6e1539..6828d858ae 100644 --- a/mappings/net/minecraft/resource/ResourcePackContainer.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackContainer +CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile CLASS class_3289 InsertionPosition METHOD method_14467 inverse ()Lnet/minecraft/class_3288$class_3289; METHOD method_14468 insert (Ljava/util/List;Ljava/lang/Object;Ljava/util/function/Function;Z)I @@ -14,10 +14,10 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackContainer ARG 4 pack ARG 5 meta ARG 6 insertionPosition - FIELD field_14270 positionFixed Z - FIELD field_14271 notSorting Z + FIELD field_14270 pinned Z + FIELD field_14271 alwaysEnabled Z FIELD field_14272 name Ljava/lang/String; - FIELD field_14273 packCreator Ljava/util/function/Supplier; + FIELD field_14273 packGetter Ljava/util/function/Supplier; FIELD field_14274 displayName Lnet/minecraft/class_2561; FIELD field_14275 description Lnet/minecraft/class_2561; FIELD field_14276 BROKEN_PACK_META Lnet/minecraft/class_3272; @@ -26,17 +26,17 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackContainer FIELD field_14279 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_3281;Lnet/minecraft/class_3288$class_3289;Z)V ARG 1 name - ARG 2 notSorting - ARG 3 packCreator + ARG 2 alwaysEnabled + ARG 3 packFactory ARG 4 displayName ARG 5 description ARG 6 compatibility ARG 7 direction - ARG 8 tillEnd + ARG 8 pinned METHOD (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3262;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;)V ARG 1 name - ARG 2 notSorting - ARG 3 packCreator + ARG 2 alwaysEnabled + ARG 3 packFactory ARG 4 pack ARG 5 metadata ARG 6 direction @@ -44,7 +44,7 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackContainer ARG 1 o METHOD method_14456 of (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3288$class_3290;Lnet/minecraft/class_3288$class_3289;)Lnet/minecraft/class_3288; ARG 0 name - ARG 1 alwaysCreatePack + ARG 1 alwaysEnabled ARG 2 packFactory ARG 3 containerFactory ARG 4 insertionPosition @@ -53,7 +53,8 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackContainer 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_14463 getName ()Ljava/lang/String; - METHOD method_14464 canBeSorted ()Z - METHOD method_14465 isPositionFixed ()Z + METHOD method_14464 isAlwaysEnabled ()Z + METHOD method_14465 isPinned ()Z METHOD method_14466 getInitialPosition ()Lnet/minecraft/class_3288$class_3289; diff --git a/mappings/net/minecraft/resource/ResourcePackProvider.mapping b/mappings/net/minecraft/resource/ResourcePackProvider.mapping new file mode 100644 index 0000000000..fd246e2e6b --- /dev/null +++ b/mappings/net/minecraft/resource/ResourcePackProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3285 net/minecraft/resource/ResourcePackProvider + METHOD method_14453 register (Ljava/util/Map;Lnet/minecraft/class_3288$class_3290;)V + ARG 1 registry + ARG 2 factory diff --git a/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping b/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping index 41d966c5ce..e0fc083473 100644 --- a/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping +++ b/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4011 net/minecraft/resource/ResourceReloadMonitor METHOD method_18229 getProgress ()F METHOD method_18364 whenComplete ()Ljava/util/concurrent/CompletableFuture; - METHOD method_18786 isLoadStageComplete ()Z + METHOD method_18786 isPrepareStageComplete ()Z METHOD method_18787 isApplyStageComplete ()Z METHOD method_18849 throwExceptions ()V diff --git a/mappings/net/minecraft/resource/ResourceType.mapping b/mappings/net/minecraft/resource/ResourceType.mapping index a0be18793e..8ee9c05dae 100644 --- a/mappings/net/minecraft/resource/ResourceType.mapping +++ b/mappings/net/minecraft/resource/ResourceType.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3264 net/minecraft/resource/ResourceType - FIELD field_14189 name Ljava/lang/String; + FIELD field_14189 directory Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name - METHOD method_14413 getName ()Ljava/lang/String; + METHOD method_14413 getDirectory ()Ljava/lang/String; diff --git a/mappings/net/minecraft/resource/SinglePreparationResourceReloadListener.mapping b/mappings/net/minecraft/resource/SinglePreparationResourceReloadListener.mapping index d744450009..9f597527f9 100644 --- a/mappings/net/minecraft/resource/SinglePreparationResourceReloadListener.mapping +++ b/mappings/net/minecraft/resource/SinglePreparationResourceReloadListener.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4080 net/minecraft/resource/SinglePreparationResourceReloadListener METHOD method_18788 apply (Ljava/lang/Object;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)V - ARG 1 preparedObject + ARG 1 loader ARG 2 manager ARG 3 profiler METHOD method_18789 prepare (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping new file mode 100644 index 0000000000..74ff28dd5c --- /dev/null +++ b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider + FIELD field_14269 pack Lnet/minecraft/class_3268; diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 13018c32cd..009ab595c5 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager FIELD field_14343 WHITELIST_FILE Ljava/io/File; FIELD field_14344 bannedProfiles Lnet/minecraft/class_3335; FIELD field_14345 bannedIps Lnet/minecraft/class_3317; - FIELD field_14346 advancementManagerMap Ljava/util/Map; + FIELD field_14346 advancementTrackers Ljava/util/Map; FIELD field_14347 maxPlayers I FIELD field_14348 OPERATORS_FILE Ljava/io/File; FIELD field_14349 LOGGER Lorg/apache/logging/log4j/Logger; @@ -52,7 +52,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 player METHOD method_14577 savePlayerData (Lnet/minecraft/class_3222;)V ARG 1 player - METHOD method_14578 getAdvancementManager (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2985; + METHOD method_14578 getAdvancementTracker (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2985; ARG 1 player METHOD method_14579 areCheatsAllowed ()Z METHOD method_14580 getPlayerNames ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping index 49cf68ff87..6ff6ec9296 100644 --- a/mappings/net/minecraft/server/command/CommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -12,9 +12,11 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager ARG 3 source ARG 4 resultNodes METHOD method_9241 sendCommandTree (Lnet/minecraft/class_3222;)V + ARG 1 player METHOD method_9244 argument (Ljava/lang/String;Lcom/mojang/brigadier/arguments/ArgumentType;)Lcom/mojang/brigadier/builder/RequiredArgumentBuilder; ARG 0 name ARG 1 type METHOD method_9247 literal (Ljava/lang/String;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; METHOD method_9249 execute (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 1 commandSource + ARG 2 command diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index fee47aa5c9..95eaadaf9d 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand METHOD method_13925 addArgumentsToBuilder (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 1 argument ARG 2 argumentAdder - FIELD field_13790 OBJECT_TYPES Ljava/util/List; + FIELD field_13790 OBJECT_TYPE_FACTORIES Ljava/util/List; FIELD field_13791 GET_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13792 SOURCE_OBJECT_TYPES Ljava/util/List; FIELD field_13793 GET_UNKNOWN_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index 79ca6ad2c7..7509e857b0 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -18,8 +18,10 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction FIELD field_9806 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;[Lnet/minecraft/class_2158$class_2161;)V ARG 1 id + ARG 2 elements METHOD method_9193 getElements ()[Lnet/minecraft/class_2158$class_2161; METHOD method_9194 getId ()Lnet/minecraft/class_2960; METHOD method_9195 create (Lnet/minecraft/class_2960;Lnet/minecraft/class_2991;Ljava/util/List;)Lnet/minecraft/class_2158; ARG 0 id + ARG 1 commandFunctionManager ARG 2 fileLines diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 080f550821..02275f6955 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -23,18 +23,22 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana FIELD field_19332 pending Ljava/util/List; METHOD (Lnet/minecraft/server/MinecraftServer;)V ARG 1 server - METHOD method_12899 getFunctionCommandSource ()Lnet/minecraft/class_2168; + METHOD method_12899 getTaggedFunctionSource ()Lnet/minecraft/class_2168; METHOD method_12900 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_12901 getTags ()Lnet/minecraft/class_3503; METHOD method_12902 getMaxCommandChainLength ()I METHOD method_12903 load (Lnet/minecraft/class_2158;Ljava/lang/Throwable;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2158; ARG 1 function ARG 2 exception + ARG 3 id METHOD method_12904 execute (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)I ARG 1 function ARG 2 source METHOD method_12905 getFunction (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 id METHOD method_12906 readLines (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)Ljava/util/List; + ARG 0 resourceManager + ARG 1 id METHOD method_12907 getServer ()Lnet/minecraft/server/MinecraftServer; METHOD method_12912 getFunctions ()Ljava/util/Map; METHOD method_18699 tick ()V diff --git a/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping b/mappings/net/minecraft/server/network/DebugInfoSender.mapping similarity index 77% rename from mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping rename to mappings/net/minecraft/server/network/DebugInfoSender.mapping index 1d4b4c596f..987ab6e931 100644 --- a/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping +++ b/mappings/net/minecraft/server/network/DebugInfoSender.mapping @@ -1,14 +1,25 @@ -CLASS net/minecraft/class_4209 net/minecraft/client/network/DebugRendererInfoManager +CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender FIELD field_18961 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_19469 sendGoalSelector (Lnet/minecraft/class_1937;Lnet/minecraft/class_1308;Lnet/minecraft/class_1355;)V ARG 0 world ARG 1 mob ARG 2 goalSelector METHOD method_19470 sendPathfindingData (Lnet/minecraft/class_1937;Lnet/minecraft/class_1308;Lnet/minecraft/class_11;F)V + ARG 0 world + ARG 1 mob + ARG 2 path + ARG 3 nodeReachProximity METHOD method_19472 sendNeighborUpdate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 pos METHOD method_19474 sendStructureStart (Lnet/minecraft/class_1936;Lnet/minecraft/class_3449;)V + ARG 0 world + ARG 1 structureStart METHOD method_19774 sendVillagerAiDebugData (Lnet/minecraft/class_1309;)V + ARG 0 living METHOD method_19778 sendPointOfInterest (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 pos METHOD method_20575 sendRaids (Lnet/minecraft/class_3218;Ljava/util/Collection;)V ARG 0 server ARG 1 raids diff --git a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping index eb64ad4863..d8ecf4c35d 100644 --- a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping +++ b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping @@ -12,8 +12,14 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry FIELD field_14059 lastHeadPitch I FIELD field_14060 lastYaw I METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;IZLjava/util/function/Consumer;)V + ARG 1 world + ARG 2 entity ARG 3 tickInterval + ARG 4 alwaysUpdateVelocity + ARG 5 receiver METHOD method_14302 stopTracking (Lnet/minecraft/class_3222;)V + ARG 1 player METHOD method_18757 sendPackets (Ljava/util/function/Consumer;)V ARG 1 sender METHOD method_18760 startTracking (Lnet/minecraft/class_3222;)V + ARG 1 player diff --git a/mappings/net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler.mapping b/mappings/net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler.mapping index b451c2b9fa..8e03f20f3e 100644 --- a/mappings/net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3240 net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler - FIELD field_14103 client Lnet/minecraft/class_2535; + FIELD field_14103 connection Lnet/minecraft/class_2535; FIELD field_14104 server Lnet/minecraft/server/MinecraftServer; diff --git a/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping index cc8dada95d..f90929030f 100644 --- a/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3246 net/minecraft/server/network/ServerHandshakeNetworkHandler - FIELD field_14153 client Lnet/minecraft/class_2535; + FIELD field_14153 connection Lnet/minecraft/class_2535; FIELD field_14154 server Lnet/minecraft/server/MinecraftServer; diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 5d4525feb4..b62e21fd52 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa CLASS class_3249 State FIELD field_14156 loginTicks I FIELD field_14157 authenticatorThreadId Ljava/util/concurrent/atomic/AtomicInteger; - FIELD field_14158 client Lnet/minecraft/class_2535; + FIELD field_14158 connection Lnet/minecraft/class_2535; FIELD field_14159 secretKey Ljavax/crypto/SecretKey; FIELD field_14160 profile Lcom/mojang/authlib/GameProfile; FIELD field_14161 clientEntity Lnet/minecraft/class_3222; @@ -12,6 +12,7 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_14166 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_14167 nonce [B METHOD method_14375 toOfflineProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; + ARG 1 profile METHOD method_14380 disconnect (Lnet/minecraft/class_2561;)V ARG 1 reason METHOD method_14383 getConnectionInfo ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index a2bd5ce8ad..c04c2d194c 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_14124 lastTickRiddenY D FIELD field_14125 waitingForKeepAlive Z FIELD field_14126 updatedY D - FIELD field_14127 client Lnet/minecraft/class_2535; + FIELD field_14127 connection Lnet/minecraft/class_2535; FIELD field_14128 lastTickZ D FIELD field_14129 ridingEntity Z FIELD field_14130 lastTickX D @@ -47,6 +47,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 8 pitch METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V METHOD method_14367 disconnect (Lnet/minecraft/class_2561;)V + ARG 1 reason METHOD method_14369 sendPacket (Lnet/minecraft/class_2596;Lio/netty/util/concurrent/GenericFutureListener;)V METHOD method_14370 executeCommand (Ljava/lang/String;)V METHOD method_14371 validateVehicleMove (Lnet/minecraft/class_2833;)Z diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 9c2c11d1e8..41cab80488 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_13966 statHandler Lnet/minecraft/class_3442; FIELD field_13967 pingMilliseconds I FIELD field_13969 seenCredits Z - FIELD field_13970 advancementManager Lnet/minecraft/class_2985; + FIELD field_13970 advancementTracker Lnet/minecraft/class_2985; FIELD field_13974 interactionManager Lnet/minecraft/class_3225; FIELD field_13975 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13976 lastActionTime J @@ -36,7 +36,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14228 setExperiencePoints (I)V METHOD method_14232 getCameraPosition ()Lnet/minecraft/class_4076; METHOD method_14234 updateLastActionTime ()V - METHOD method_14236 getAdvancementManager ()Lnet/minecraft/class_2985; + METHOD method_14236 getAdvancementTracker ()Lnet/minecraft/class_2985; METHOD method_14237 incrementContainerSyncId ()V METHOD method_14238 getClientChatVisibility ()Lnet/minecraft/class_1659; METHOD method_14240 onTeleportationDone ()V @@ -45,6 +45,12 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14248 getStatHandler ()Lnet/minecraft/class_3442; METHOD method_14249 onStoppedTracking (Lnet/minecraft/class_1297;)V METHOD method_14251 teleport (Lnet/minecraft/class_3218;DDDFF)V + ARG 1 targetWorld + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 yaw + ARG 9 pitch METHOD method_14252 setExperienceLevel (I)V ARG 1 level METHOD method_14253 getRecipeBook ()Lnet/minecraft/class_3441; diff --git a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping index ab75cd6772..03a3f829e1 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerInteractionManager.mapping @@ -3,8 +3,13 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract FIELD field_14007 world Lnet/minecraft/class_3218; FIELD field_14008 player Lnet/minecraft/class_3222; METHOD method_14256 interactItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; + ARG 1 player + ARG 2 world + ARG 3 stack + ARG 4 hand METHOD method_14257 getGameMode ()Lnet/minecraft/class_1934; METHOD method_14259 setWorld (Lnet/minecraft/class_3218;)V + ARG 1 world METHOD method_14260 setGameModeIfNotPresent (Lnet/minecraft/class_1934;)V METHOD method_14261 setGameMode (Lnet/minecraft/class_1934;)V METHOD method_14262 interactBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; @@ -12,6 +17,7 @@ CLASS net/minecraft/class_3225 net/minecraft/server/network/ServerPlayerInteract ARG 2 world ARG 3 stack ARG 4 hand + ARG 5 hitResult METHOD method_14264 update ()V METHOD method_14266 tryBreakBlock (Lnet/minecraft/class_2338;)Z METHOD method_14267 isSurvivalLike ()Z diff --git a/mappings/net/minecraft/server/network/ServerQueryNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerQueryNetworkHandler.mapping index 06e5b89020..0e40625121 100644 --- a/mappings/net/minecraft/server/network/ServerQueryNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerQueryNetworkHandler.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3251 net/minecraft/server/network/ServerQueryNetworkHandler FIELD field_14177 responseSent Z - FIELD field_14178 client Lnet/minecraft/class_2535; + FIELD field_14178 connection Lnet/minecraft/class_2535; FIELD field_14179 REQUEST_HANDLED Lnet/minecraft/class_2561; FIELD field_14180 server Lnet/minecraft/server/MinecraftServer; diff --git a/mappings/net/minecraft/server/network/ServerRecipeBook.mapping b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping index 6ecc44bd2f..cbc0c3a941 100644 --- a/mappings/net/minecraft/server/network/ServerRecipeBook.mapping +++ b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping @@ -2,8 +2,17 @@ CLASS net/minecraft/class_3441 net/minecraft/server/network/ServerRecipeBook FIELD field_15303 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_15304 manager Lnet/minecraft/class_1863; METHOD method_14899 sendUnlockRecipesPacket (Lnet/minecraft/class_2713$class_2714;Lnet/minecraft/class_3222;Ljava/util/List;)V + ARG 1 action + ARG 2 player + ARG 3 recipeIds METHOD method_14900 lockRecipes (Ljava/util/Collection;Lnet/minecraft/class_3222;)I + ARG 1 recipes + ARG 2 player METHOD method_14901 fromTag (Lnet/minecraft/class_2487;)V + ARG 1 tag METHOD method_14902 toTag ()Lnet/minecraft/class_2487; METHOD method_14903 unlockRecipes (Ljava/util/Collection;Lnet/minecraft/class_3222;)I + ARG 1 recipes + ARG 2 player METHOD method_14904 sendInitRecipesPacket (Lnet/minecraft/class_3222;)V + ARG 1 player diff --git a/mappings/net/minecraft/server/network/packet/GuiCloseC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/GuiCloseC2SPacket.mapping deleted file mode 100644 index 8e97c838e0..0000000000 --- a/mappings/net/minecraft/server/network/packet/GuiCloseC2SPacket.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_2815 net/minecraft/server/network/packet/GuiCloseC2SPacket - FIELD field_12827 id I diff --git a/mappings/net/minecraft/server/network/packet/KeepAliveC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/KeepAliveC2SPacket.mapping deleted file mode 100644 index a1f17a84a4..0000000000 --- a/mappings/net/minecraft/server/network/packet/KeepAliveC2SPacket.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2827 net/minecraft/server/network/packet/KeepAliveC2SPacket - FIELD field_12883 id J - METHOD (J)V - ARG 1 id - METHOD method_12267 getId ()J diff --git a/mappings/net/minecraft/server/network/packet/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/LoginQueryResponseC2SPacket.mapping deleted file mode 100644 index bd795a7790..0000000000 --- a/mappings/net/minecraft/server/network/packet/LoginQueryResponseC2SPacket.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2913 net/minecraft/server/network/packet/LoginQueryResponseC2SPacket - FIELD field_13258 response Lnet/minecraft/class_2540; - FIELD field_13259 queryId I diff --git a/mappings/net/minecraft/server/network/packet/PickFromInventoryC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/PickFromInventoryC2SPacket.mapping deleted file mode 100644 index ebfa6b904c..0000000000 --- a/mappings/net/minecraft/server/network/packet/PickFromInventoryC2SPacket.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2838 net/minecraft/server/network/packet/PickFromInventoryC2SPacket - FIELD field_12908 slot I - METHOD (I)V - ARG 1 slot - METHOD method_12293 getSlot ()I diff --git a/mappings/net/minecraft/server/network/packet/QueryPingC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/QueryPingC2SPacket.mapping deleted file mode 100644 index 3f923c38fe..0000000000 --- a/mappings/net/minecraft/server/network/packet/QueryPingC2SPacket.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2935 net/minecraft/server/network/packet/QueryPingC2SPacket - FIELD field_13292 startTime J - METHOD method_12700 getStartTime ()J diff --git a/mappings/net/minecraft/server/network/packet/QueryRequestC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/QueryRequestC2SPacket.mapping deleted file mode 100644 index c08a3330fd..0000000000 --- a/mappings/net/minecraft/server/network/packet/QueryRequestC2SPacket.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2937 net/minecraft/server/network/packet/QueryRequestC2SPacket diff --git a/mappings/net/minecraft/server/network/packet/ResourcePackStatusC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/ResourcePackStatusC2SPacket.mapping deleted file mode 100644 index 5ae4a4f9ca..0000000000 --- a/mappings/net/minecraft/server/network/packet/ResourcePackStatusC2SPacket.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2856 net/minecraft/server/network/packet/ResourcePackStatusC2SPacket - CLASS class_2857 Status - FIELD field_13014 status Lnet/minecraft/class_2856$class_2857; diff --git a/mappings/net/minecraft/server/network/packet/SelectVillagerTradeC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/SelectVillagerTradeC2SPacket.mapping deleted file mode 100644 index f8e66d6be3..0000000000 --- a/mappings/net/minecraft/server/network/packet/SelectVillagerTradeC2SPacket.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_2863 net/minecraft/server/network/packet/SelectVillagerTradeC2SPacket - FIELD field_13036 tradeId I diff --git a/mappings/net/minecraft/server/network/packet/UpdateDifficultyLockC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/UpdateDifficultyLockC2SPacket.mapping deleted file mode 100644 index 1c9096f615..0000000000 --- a/mappings/net/minecraft/server/network/packet/UpdateDifficultyLockC2SPacket.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4211 net/minecraft/server/network/packet/UpdateDifficultyLockC2SPacket - FIELD field_18806 difficultyLocked Z - METHOD method_19485 isDifficultyLocked ()Z diff --git a/mappings/net/minecraft/server/network/packet/UpdateSelectedSlotC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/UpdateSelectedSlotC2SPacket.mapping deleted file mode 100644 index 34bfd1e59f..0000000000 --- a/mappings/net/minecraft/server/network/packet/UpdateSelectedSlotC2SPacket.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2868 net/minecraft/server/network/packet/UpdateSelectedSlotC2SPacket - FIELD field_13052 selectedSlot I - METHOD method_12442 getSelectedSlot ()I diff --git a/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping b/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping index 4d9c5deac2..e0bf0612c6 100644 --- a/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping +++ b/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping @@ -21,17 +21,19 @@ CLASS net/minecraft/class_3900 net/minecraft/server/world/ChunkTaskPrioritySyste METHOD method_17282 execute (Lnet/minecraft/class_3906;Ljava/util/function/Function;JLjava/util/function/IntSupplier;Z)V ARG 1 actor ARG 5 lastLevelUpdatedToProvider - METHOD method_17614 createSortingActor (Lnet/minecraft/class_3906;)Lnet/minecraft/class_3906; - ARG 1 actor + METHOD method_17614 createSorterExecutor (Lnet/minecraft/class_3906;)Lnet/minecraft/class_3906; + ARG 1 executor METHOD method_17615 sort (Lnet/minecraft/class_3906;JLjava/lang/Runnable;Z)V - METHOD method_17622 createExecutingActor (Lnet/minecraft/class_3906;Z)Lnet/minecraft/class_3906; - ARG 1 actor - METHOD method_17626 createRunnableMessage (Ljava/lang/Runnable;JLjava/util/function/IntSupplier;)Lnet/minecraft/class_3900$class_3946; + METHOD method_17622 createExecutor (Lnet/minecraft/class_3906;Z)Lnet/minecraft/class_3906; + ARG 1 executor + METHOD method_17626 createMessage (Ljava/lang/Runnable;JLjava/util/function/IntSupplier;)Lnet/minecraft/class_3900$class_3946; ARG 0 runnable ARG 1 pos ARG 3 lastLevelUpdatedToProvider METHOD method_17627 createSorterMessage (Ljava/lang/Runnable;JZ)Lnet/minecraft/class_3900$class_3947; - METHOD method_17629 createExecutorMessage (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)Lnet/minecraft/class_3900$class_3946; + ARG 0 runnable + ARG 1 pos + METHOD method_17629 createMessage (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)Lnet/minecraft/class_3900$class_3946; ARG 0 holder ARG 1 runnable METHOD method_17630 (Lnet/minecraft/class_3899;Lnet/minecraft/class_3906;)V diff --git a/mappings/net/minecraft/server/world/ChunkTicket.mapping b/mappings/net/minecraft/server/world/ChunkTicket.mapping index 244ee8800a..2725aee644 100644 --- a/mappings/net/minecraft/server/world/ChunkTicket.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicket.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3228 net/minecraft/server/world/ChunkTicket FIELD field_14022 argument Ljava/lang/Object; FIELD field_14023 type Lnet/minecraft/class_3230; - FIELD field_14024 location J + FIELD field_14024 tickCreated J FIELD field_14025 level I METHOD (Lnet/minecraft/class_3230;ILjava/lang/Object;J)V ARG 1 type diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index 6058508b2b..0e983f6843 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 5 withinViewDistance METHOD method_17664 isWithinViewDistance (I)Z ARG 1 distance - FIELD field_13894 location J + FIELD field_13894 age J FIELD field_13895 ticketsByPosition Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; FIELD field_16210 chunkHolders Ljava/util/Set; FIELD field_16211 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/server/world/ChunkTicketType.mapping b/mappings/net/minecraft/server/world/ChunkTicketType.mapping index 31892824e2..ffbd496a5e 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketType.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketType.mapping @@ -3,5 +3,7 @@ CLASS net/minecraft/class_3230 net/minecraft/server/world/ChunkTicketType FIELD field_14034 name Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/util/Comparator;J)V ARG 1 name + ARG 3 expiryTicks METHOD method_14291 create (Ljava/lang/String;Ljava/util/Comparator;)Lnet/minecraft/class_3230; + ARG 0 name METHOD method_14292 getArgumentComparator ()Ljava/util/Comparator; diff --git a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping index ae36a8fceb..04262eabae 100644 --- a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping +++ b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping @@ -3,12 +3,12 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider FIELD field_17255 processor Lnet/minecraft/class_3846; FIELD field_17256 pendingTasks Lit/unimi/dsi/fastutil/objects/ObjectList; FIELD field_17257 chunkStorage Lnet/minecraft/class_3898; - FIELD field_17259 actor Lnet/minecraft/class_3906; + FIELD field_17259 executor Lnet/minecraft/class_3906; FIELD field_17260 taskBatchSize I METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_3898;ZLnet/minecraft/class_3846;Lnet/minecraft/class_3906;)V ARG 2 chunkStorage ARG 4 processor - ARG 5 actor + ARG 5 executor METHOD a (Lnet/minecraft/class_2338;I)V ARG 1 pos METHOD method_14277 runTasks ()V @@ -27,3 +27,4 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider ARG 3 stage ARG 4 task METHOD method_17310 light (Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunk diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 4bb081a949..eef60b6314 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -90,12 +90,14 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 pos METHOD method_18214 loadEntity (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_18215 respawnPlayer (Lnet/minecraft/class_3222;)V + METHOD method_18215 onPlayerRespawned (Lnet/minecraft/class_3222;)V + ARG 1 player METHOD method_18219 getMobCountsByCategory ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD method_18762 tickEntity (Lnet/minecraft/class_1297;)V METHOD method_18764 unloadEntities (Lnet/minecraft/class_2818;)V ARG 1 chunk METHOD method_18765 tick (Ljava/util/function/BooleanSupplier;)V + ARG 1 shouldKeepTicking METHOD method_18766 getPlayers (Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 predicate METHOD method_18767 checkChunk (Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 932a2031f6..cacd3f6bc7 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -34,8 +34,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_17221 unloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_17222 chunkHolderListDirty Z FIELD field_17223 chunkTaskPrioritySystem Lnet/minecraft/class_3900; - FIELD field_17224 worldgenActor Lnet/minecraft/class_3906; - FIELD field_17226 mainActor Lnet/minecraft/class_3906; + FIELD field_17224 worldgenExecutor Lnet/minecraft/class_3906; + FIELD field_17226 mainExecutor Lnet/minecraft/class_3906; FIELD field_17228 ticketManager Lnet/minecraft/class_3898$class_3216; FIELD field_17230 totalChunksLoadedCount Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_17442 worldGenerationProgressListener Lnet/minecraft/class_3949; @@ -52,6 +52,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 3 dataFixer ARG 5 workerExecutor ARG 6 mainThreadExecutor + ARG 7 chunkProvider ARG 8 chunkGenerator ARG 9 worldGenerationProgressListener METHOD method_17212 getLightProvider ()Lnet/minecraft/class_3227; @@ -75,6 +76,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 centerChunkTargetStatus ARG 2 distance METHOD method_17233 tick (Ljava/util/function/BooleanSupplier;)V + ARG 1 shouldKeepTicking METHOD method_17235 createTickingFuture (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture; METHOD method_17236 createChunkFuture (Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture; METHOD method_17241 sendWatchPackets (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;[Lnet/minecraft/class_2596;ZZ)V diff --git a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping b/mappings/net/minecraft/state/AbstractState.mapping similarity index 93% rename from mappings/net/minecraft/state/AbstractPropertyContainer.mapping rename to mappings/net/minecraft/state/AbstractState.mapping index 8961c1b174..4348dd107d 100644 --- a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping +++ b/mappings/net/minecraft/state/AbstractState.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2679 net/minecraft/state/AbstractPropertyContainer +CLASS net/minecraft/class_2679 net/minecraft/state/AbstractState CLASS 1 METHOD method_11575 valueToString (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; ARG 1 property @@ -15,6 +15,7 @@ CLASS net/minecraft/class_2679 net/minecraft/state/AbstractPropertyContainer ARG 1 o METHOD method_11569 getProperties ()Ljava/util/Collection; METHOD method_11570 contains (Lnet/minecraft/class_2769;)Z + ARG 1 property METHOD method_11571 createWithTable (Ljava/util/Map;)V ARG 1 states METHOD method_11572 cycle (Lnet/minecraft/class_2769;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/state/PropertyContainer.mapping b/mappings/net/minecraft/state/State.mapping similarity index 51% rename from mappings/net/minecraft/state/PropertyContainer.mapping rename to mappings/net/minecraft/state/State.mapping index 8021fdea8d..04e99bb9e3 100644 --- a/mappings/net/minecraft/state/PropertyContainer.mapping +++ b/mappings/net/minecraft/state/State.mapping @@ -1,15 +1,17 @@ -CLASS net/minecraft/class_2688 net/minecraft/state/PropertyContainer +CLASS net/minecraft/class_2688 net/minecraft/state/State FIELD field_12313 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_11654 get (Lnet/minecraft/class_2769;)Ljava/lang/Comparable; - METHOD method_11655 deserialize (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2688; + ARG 1 property + METHOD method_11655 tryRead (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2688; ARG 0 state ARG 1 property ARG 2 propertyName ARG 3 input - ARG 4 value + ARG 4 valueName METHOD method_11656 getEntries ()Lcom/google/common/collect/ImmutableMap; METHOD method_11657 with (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/Object; ARG 1 property - METHOD method_16551 getValueAsString (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; + ARG 2 value + METHOD method_16551 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; ARG 0 property - ARG 1 comparable + ARG 1 value diff --git a/mappings/net/minecraft/state/StateFactory.mapping b/mappings/net/minecraft/state/StateManager.mapping similarity index 73% rename from mappings/net/minecraft/state/StateFactory.mapping rename to mappings/net/minecraft/state/StateManager.mapping index 25a553a816..03b77aea41 100644 --- a/mappings/net/minecraft/state/StateFactory.mapping +++ b/mappings/net/minecraft/state/StateManager.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2689 net/minecraft/state/StateFactory +CLASS net/minecraft/class_2689 net/minecraft/state/StateManager CLASS class_2690 Builder FIELD field_12318 baseObject Ljava/lang/Object; FIELD field_12319 propertyMap Ljava/util/Map; @@ -8,14 +8,16 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateFactory CLASS class_2691 Factory METHOD create (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;)Lnet/minecraft/class_2679; ARG 1 propertyMap - FIELD field_12314 NAME_MATCHER Ljava/util/regex/Pattern; + FIELD field_12314 VALID_NAME_PATTERN Ljava/util/regex/Pattern; FIELD field_12315 states Lcom/google/common/collect/ImmutableList; - FIELD field_12316 propertyMap Lcom/google/common/collect/ImmutableSortedMap; - FIELD field_12317 baseObject Ljava/lang/Object; + FIELD field_12316 properties Lcom/google/common/collect/ImmutableSortedMap; + FIELD field_12317 owner Ljava/lang/Object; METHOD (Ljava/lang/Object;Lnet/minecraft/class_2689$class_2691;Ljava/util/Map;)V - ARG 1 baseObject + ARG 1 owner + ARG 3 namedProperties METHOD method_11659 getProperties ()Ljava/util/Collection; - METHOD method_11660 getBaseObject ()Ljava/lang/Object; + METHOD method_11660 getOwner ()Ljava/lang/Object; METHOD method_11662 getStates ()Lcom/google/common/collect/ImmutableList; METHOD method_11663 getProperty (Ljava/lang/String;)Lnet/minecraft/class_2769; + ARG 1 name METHOD method_11664 getDefaultState ()Lnet/minecraft/class_2688; diff --git a/mappings/net/minecraft/state/property/Property.mapping b/mappings/net/minecraft/state/property/Property.mapping index 894154a208..86875d3339 100644 --- a/mappings/net/minecraft/state/property/Property.mapping +++ b/mappings/net/minecraft/state/property/Property.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_2769 net/minecraft/state/property/Property METHOD method_11898 getValues ()Ljava/util/Collection; METHOD method_11899 getName ()Ljava/lang/String; - METHOD method_11900 getValue (Ljava/lang/String;)Ljava/util/Optional; + METHOD method_11900 parse (Ljava/lang/String;)Ljava/util/Optional; ARG 1 name - METHOD method_11901 getName (Ljava/lang/Comparable;)Ljava/lang/String; + METHOD method_11901 name (Ljava/lang/Comparable;)Ljava/lang/String; ARG 1 value - METHOD method_11902 getValueType ()Ljava/lang/Class; + METHOD method_11902 getType ()Ljava/lang/Class; diff --git a/mappings/net/minecraft/structure/StructureManager.mapping b/mappings/net/minecraft/structure/StructureManager.mapping index 807a809b7b..05831a9c1f 100644 --- a/mappings/net/minecraft/structure/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureManager.mapping @@ -10,9 +10,10 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager ARG 3 dataFixer METHOD method_15085 getStructurePath (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id - ARG 2 string + ARG 2 extension METHOD method_15086 getAndCheckStructurePath (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id + ARG 2 extension METHOD method_15087 unloadStructure (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_15088 loadStructureFromResource (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3499; diff --git a/mappings/net/minecraft/structure/rule/AbstractRuleTest.mapping b/mappings/net/minecraft/structure/rule/AbstractRuleTest.mapping deleted file mode 100644 index 3f838f89c8..0000000000 --- a/mappings/net/minecraft/structure/rule/AbstractRuleTest.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3825 net/minecraft/structure/rule/AbstractRuleTest - METHOD method_16766 getRuleTest ()Lnet/minecraft/class_3827; - METHOD method_16768 test (Lnet/minecraft/class_2680;Ljava/util/Random;)Z - METHOD method_16769 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/structure/rule/RuleTest.mapping b/mappings/net/minecraft/structure/rule/RuleTest.mapping index df6bf2e59f..cb6ccc90a3 100644 --- a/mappings/net/minecraft/structure/rule/RuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/RuleTest.mapping @@ -1,4 +1,10 @@ -CLASS net/minecraft/class_3827 net/minecraft/structure/rule/RuleTest - METHOD method_16821 register (Ljava/lang/String;Lnet/minecraft/class_3827;)Lnet/minecraft/class_3827; - ARG 0 id - ARG 1 test +CLASS net/minecraft/class_3825 net/minecraft/structure/rule/RuleTest + COMMENT Rule tests are used in structure generation to check if a block state matches some condition. + METHOD method_16766 getType ()Lnet/minecraft/class_3827; + METHOD method_16767 serializeWithId (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops + METHOD method_16768 test (Lnet/minecraft/class_2680;Ljava/util/Random;)Z + ARG 1 state + ARG 2 random + METHOD method_16769 serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; + ARG 1 ops diff --git a/mappings/net/minecraft/structure/rule/RuleTestType.mapping b/mappings/net/minecraft/structure/rule/RuleTestType.mapping new file mode 100644 index 0000000000..36136fa7f4 --- /dev/null +++ b/mappings/net/minecraft/structure/rule/RuleTestType.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3827 net/minecraft/structure/rule/RuleTestType + METHOD method_16821 register (Ljava/lang/String;Lnet/minecraft/class_3827;)Lnet/minecraft/class_3827; + ARG 0 id + ARG 1 test diff --git a/mappings/net/minecraft/tag/RegistryTagContainer.mapping b/mappings/net/minecraft/tag/RegistryTagContainer.mapping index f4725a624b..c811352d0f 100644 --- a/mappings/net/minecraft/tag/RegistryTagContainer.mapping +++ b/mappings/net/minecraft/tag/RegistryTagContainer.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_3493 net/minecraft/tag/RegistryTagContainer METHOD method_15136 fromPacket (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_15137 toPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/tag/Tag.mapping b/mappings/net/minecraft/tag/Tag.mapping index 3e49b0d98b..1d2aba718c 100644 --- a/mappings/net/minecraft/tag/Tag.mapping +++ b/mappings/net/minecraft/tag/Tag.mapping @@ -1,4 +1,14 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag + COMMENT A tag is a set of objects. + COMMENT + COMMENT

Tags simplifies reference to multiple objects, especially for + COMMENT predicate (testing against) purposes. + COMMENT + COMMENT

A tag is immutable by design. It has a builder, which is a mutable + COMMENT equivalent. + COMMENT + COMMENT

Its entries' iteration may be ordered + COMMENT or unordered, depending on the configuration from the tag builder. CLASS class_3495 Builder FIELD field_15581 ordered Z FIELD field_15582 entries Ljava/util/Set; @@ -34,7 +44,9 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag METHOD method_15138 values ()Ljava/util/Collection; METHOD method_15139 entries ()Ljava/util/Collection; METHOD method_15140 toJson (Ljava/util/function/Function;)Lcom/google/gson/JsonObject; + ARG 1 idGetter METHOD method_15141 contains (Ljava/lang/Object;)Z ARG 1 entry METHOD method_15142 getRandom (Ljava/util/Random;)Ljava/lang/Object; + ARG 1 random METHOD method_15143 getId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/tag/TagContainer.mapping b/mappings/net/minecraft/tag/TagContainer.mapping index d8eeb0a866..6023073a58 100644 --- a/mappings/net/minecraft/tag/TagContainer.mapping +++ b/mappings/net/minecraft/tag/TagContainer.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagContainer FIELD field_15601 ordered Z - FIELD field_15602 idMap Ljava/util/Map; + FIELD field_15602 entries Ljava/util/Map; FIELD field_15603 JSON_EXTENSION_LENGTH I FIELD field_15605 dataType Ljava/lang/String; FIELD field_15606 entryType Ljava/lang/String; diff --git a/mappings/net/minecraft/util/Actor.mapping b/mappings/net/minecraft/util/Actor.mapping deleted file mode 100644 index e287adfcd9..0000000000 --- a/mappings/net/minecraft/util/Actor.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_3906 net/minecraft/util/Actor - METHOD method_16898 getName ()Ljava/lang/String; - METHOD method_16901 send (Ljava/lang/Object;)V - ARG 1 message - METHOD method_17344 createConsumerActor (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/class_3906; - METHOD method_17345 createAndSendFutureActor (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/util/ChunkPosLevelPropagator.mapping b/mappings/net/minecraft/util/ChunkPosDistanceLevelPropagator.mapping similarity index 56% rename from mappings/net/minecraft/util/ChunkPosLevelPropagator.mapping rename to mappings/net/minecraft/util/ChunkPosDistanceLevelPropagator.mapping index d91f6c5832..8ebafa170a 100644 --- a/mappings/net/minecraft/util/ChunkPosLevelPropagator.mapping +++ b/mappings/net/minecraft/util/ChunkPosDistanceLevelPropagator.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_3196 net/minecraft/util/ChunkPosLevelPropagator +CLASS net/minecraft/class_3196 net/minecraft/util/ChunkPosDistanceLevelPropagator METHOD (III)V ARG 1 levelCount ARG 2 initLevelCapacity ARG 3 initTotalCapacity - METHOD method_14027 update (JIZ)V + METHOD method_14027 updateLevel (JIZ)V ARG 1 chunkPos ARG 3 distance - ARG 4 playerPresent + ARG 4 decrease METHOD method_14028 getInitialLevel (J)I ARG 1 id diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index d362bc5084..7429c5ab97 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier + COMMENT The namespace and path must contain only lowercase letters ([a-z]), digits ([0-9]), or the characters '_', '.', and '-'. The path can also contain the standard path separator '/'. CLASS class_2961 Serializer FIELD field_13353 namespace Ljava/lang/String; FIELD field_13354 COMMAND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; diff --git a/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping b/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping index ea2414effb..1d10dd94f1 100644 --- a/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping +++ b/mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3530 net/minecraft/util/LowercaseEnumTypeAdapterFactory - METHOD method_15334 toString (Ljava/lang/Object;)Ljava/lang/String; + METHOD method_15334 getKey (Ljava/lang/Object;)Ljava/lang/String; ARG 1 o diff --git a/mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping b/mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping deleted file mode 100644 index ae7495376d..0000000000 --- a/mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4093 net/minecraft/util/NonBlockingThreadExecutor - FIELD field_18320 runningTasks I - METHOD method_18860 hasRunningTasks ()Z diff --git a/mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping b/mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping similarity index 53% rename from mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping rename to mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping index b802220d4c..1531d3e3ba 100644 --- a/mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping +++ b/mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping @@ -1,7 +1,7 @@ -CLASS net/minecraft/class_4079 net/minecraft/util/SectionRelativeLevelPropagator +CLASS net/minecraft/class_4079 net/minecraft/util/SectionDistanceLevelPropagator METHOD method_18749 getInitialLevel (J)I ARG 1 id METHOD method_18750 update (JIZ)V ARG 1 id - ARG 3 limitLevel - ARG 4 mergeAsMin + ARG 3 level + ARG 4 decrease diff --git a/mappings/net/minecraft/util/TagHelper.mapping b/mappings/net/minecraft/util/TagHelper.mapping deleted file mode 100644 index ed0e3e31f1..0000000000 --- a/mappings/net/minecraft/util/TagHelper.mapping +++ /dev/null @@ -1,30 +0,0 @@ -CLASS net/minecraft/class_2512 net/minecraft/util/TagHelper - FIELD field_11582 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_10681 deserializeBlockState (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680; - ARG 0 tag - METHOD method_10682 withProperty (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2688; - ARG 0 state - ARG 1 property - METHOD method_10683 deserializeProfile (Lnet/minecraft/class_2487;)Lcom/mojang/authlib/GameProfile; - ARG 0 tag - METHOD method_10684 serializeProfile (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2487; - ARG 0 tag - ARG 1 profile - METHOD method_10685 getPropertyValueAsString (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; - ARG 0 property - ARG 1 value - METHOD method_10686 serializeBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2487; - METHOD method_10687 areTagsEqual (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;Z)Z - ARG 0 tag1 - ARG 1 tag2 - ARG 2 deepCheck - METHOD method_10688 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487; - METHOD method_10689 serializeUuid (Ljava/util/UUID;)Lnet/minecraft/class_2487; - ARG 0 uuid - METHOD method_10690 deserializeUuid (Lnet/minecraft/class_2487;)Ljava/util/UUID; - ARG 0 tag - METHOD method_10691 deserializeBlockPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338; - ARG 0 tag - METHOD method_10692 serializeBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; - ARG 0 pos - METHOD method_10693 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;II)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/util/TaskPriority.mapping b/mappings/net/minecraft/util/TaskPriority.mapping deleted file mode 100644 index 5a34390277..0000000000 --- a/mappings/net/minecraft/util/TaskPriority.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_1953 net/minecraft/util/TaskPriority - FIELD field_9308 priorityIndex I - METHOD (Ljava/lang/String;II)V - ARG 3 priorityIndex - METHOD method_8680 getByIndex (I)Lnet/minecraft/class_1953; - ARG 0 priorityIndex - METHOD method_8681 getPriorityIndex ()I diff --git a/mappings/net/minecraft/util/ThreadExecutor.mapping b/mappings/net/minecraft/util/ThreadExecutor.mapping deleted file mode 100644 index bbf5220092..0000000000 --- a/mappings/net/minecraft/util/ThreadExecutor.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/class_1255 net/minecraft/util/ThreadExecutor - FIELD field_18318 name Ljava/lang/String; - FIELD field_18319 waitCount I - FIELD field_5750 taskQueue Ljava/util/Queue; - FIELD field_5751 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_16075 executeQueuedTask ()Z - METHOD method_16211 prepareRunnable (Ljava/lang/Runnable;)Ljava/lang/Runnable; - METHOD method_18854 isOnThread ()Z - METHOD method_18855 clear ()V - METHOD method_18856 canRun (Ljava/lang/Runnable;)Z - ARG 1 task - METHOD method_18857 waitFor (Ljava/util/function/BooleanSupplier;)V - METHOD method_18859 runSafely (Ljava/lang/Runnable;)V - METHOD method_19537 executeSync (Ljava/lang/Runnable;)V - ARG 1 runnable - METHOD method_3777 getThread ()Ljava/lang/Thread; - METHOD method_5382 executeFuture (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; - ARG 1 runnable - METHOD method_5383 executeTaskQueue ()V - METHOD method_5384 shouldRunAsync ()Z - METHOD method_5385 executeFuture (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/util/SystemUtil.mapping b/mappings/net/minecraft/util/Util.mapping similarity index 87% rename from mappings/net/minecraft/util/SystemUtil.mapping rename to mappings/net/minecraft/util/Util.mapping index be15627b72..760791eb35 100644 --- a/mappings/net/minecraft/util/SystemUtil.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_156 net/minecraft/util/SystemUtil +CLASS net/minecraft/class_156 net/minecraft/util/Util CLASS class_157 IdentityHashStrategy CLASS class_158 OperatingSystem METHOD method_669 open (Ljava/net/URL;)V @@ -32,12 +32,14 @@ CLASS net/minecraft/class_156 net/minecraft/util/SystemUtil METHOD method_648 getMeasuringTimeNano ()J METHOD method_650 getValueAsString (Lnet/minecraft/class_2769;Ljava/lang/Object;)Ljava/lang/String; METHOD method_651 getJVMFlags ()Ljava/util/stream/Stream; - METHOD method_652 thenCombine (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + METHOD method_652 combine (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 0 futures - METHOD method_654 consume (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; + METHOD method_654 make (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; + ARG 0 object + ARG 1 initializer METHOD method_655 identityHashStrategy ()Lit/unimi/dsi/fastutil/Hash$Strategy; - METHOD method_656 get (Ljava/util/function/Supplier;)Ljava/lang/Object; - ARG 0 supplier + METHOD method_656 make (Ljava/util/function/Supplier;)Ljava/lang/Object; + ARG 0 factory METHOD method_658 getMeasuringTimeMs ()J METHOD method_659 getEpochTimeMs ()J METHOD method_660 next (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/crash/CrashReport.mapping b/mappings/net/minecraft/util/crash/CrashReport.mapping index e204894d6d..2824a444d0 100644 --- a/mappings/net/minecraft/util/crash/CrashReport.mapping +++ b/mappings/net/minecraft/util/crash/CrashReport.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport METHOD method_555 addStackTrace (Ljava/lang/StringBuilder;)V METHOD method_556 addElement (Ljava/lang/String;I)Lnet/minecraft/class_129; ARG 1 name + ARG 2 ignoredStackTraceCallCount METHOD method_557 getCauseAsString ()Ljava/lang/String; METHOD method_559 fillSystemDetails ()V METHOD method_560 create (Ljava/lang/Throwable;Ljava/lang/String;)Lnet/minecraft/class_128; @@ -19,6 +20,7 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport ARG 1 title METHOD method_561 getMessage ()Ljava/lang/String; METHOD method_562 addElement (Ljava/lang/String;)Lnet/minecraft/class_129; + ARG 1 name METHOD method_564 getCause ()Ljava/lang/Throwable; METHOD method_567 getSystemDetailsSection ()Lnet/minecraft/class_129; METHOD method_568 asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/crash/CrashReportSection.mapping b/mappings/net/minecraft/util/crash/CrashReportSection.mapping index c8852d112b..b0fff21322 100644 --- a/mappings/net/minecraft/util/crash/CrashReportSection.mapping +++ b/mappings/net/minecraft/util/crash/CrashReportSection.mapping @@ -15,7 +15,8 @@ CLASS net/minecraft/class_129 net/minecraft/util/crash/CrashReportSection METHOD method_577 add (Ljava/lang/String;Lnet/minecraft/class_133;)Lnet/minecraft/class_129; METHOD method_578 add (Ljava/lang/String;Ljava/lang/Object;)Lnet/minecraft/class_129; ARG 1 name - METHOD method_579 trimStackTrace (I)I + METHOD method_579 initStackTrace (I)I + ARG 1 ignoredCallCount METHOD method_581 createPositionString (III)Ljava/lang/String; ARG 0 x ARG 1 y diff --git a/mappings/net/minecraft/util/hit/BlockHitResult.mapping b/mappings/net/minecraft/util/hit/BlockHitResult.mapping index 05875eb15c..4784b93db9 100644 --- a/mappings/net/minecraft/util/hit/BlockHitResult.mapping +++ b/mappings/net/minecraft/util/hit/BlockHitResult.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_3965 net/minecraft/util/hit/BlockHitResult ARG 2 pos ARG 3 side ARG 4 blockPos + ARG 5 insideBlock METHOD method_17777 getBlockPos ()Lnet/minecraft/class_2338; METHOD method_17778 createMissed (Lnet/minecraft/class_243;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3965; ARG 0 pos diff --git a/mappings/net/minecraft/util/math/AxisCycleDirection.mapping b/mappings/net/minecraft/util/math/AxisCycleDirection.mapping index 249f30dbf2..93e383fba1 100644 --- a/mappings/net/minecraft/util/math/AxisCycleDirection.mapping +++ b/mappings/net/minecraft/util/math/AxisCycleDirection.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/class_2335 net/minecraft/util/math/AxisCycleDirection FIELD field_10961 AXES [Lnet/minecraft/class_2350$class_2351; METHOD method_10055 opposite ()Lnet/minecraft/class_2335; METHOD method_10056 choose (IIILnet/minecraft/class_2350$class_2351;)I + ARG 1 x + ARG 2 y + ARG 3 z ARG 4 axis METHOD method_10057 between (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_2350$class_2351;)Lnet/minecraft/class_2335; ARG 0 from diff --git a/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping b/mappings/net/minecraft/util/math/BlockBox.mapping similarity index 74% rename from mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping rename to mappings/net/minecraft/util/math/BlockBox.mapping index c72146abce..f6c61dd834 100644 --- a/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping +++ b/mappings/net/minecraft/util/math/BlockBox.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3341 net/minecraft/util/math/MutableIntBoundingBox +CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox FIELD field_14376 maxZ I FIELD field_14377 maxY I FIELD field_14378 maxX I @@ -27,9 +27,9 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/MutableIntBoundingBox METHOD method_14657 intersects (Lnet/minecraft/class_3341;)Z ARG 1 other METHOD method_14658 toNbt ()Lnet/minecraft/class_2495; - METHOD method_14659 getSize ()Lnet/minecraft/class_2382; + METHOD method_14659 getDimensions ()Lnet/minecraft/class_2382; METHOD method_14660 getBlockCountX ()I - METHOD method_14661 translate (III)V + METHOD method_14661 offset (III)V ARG 1 dx ARG 2 dy ARG 3 dz @@ -45,13 +45,19 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/MutableIntBoundingBox ARG 3 x2 ARG 4 y2 ARG 5 z2 - METHOD method_14667 createRotated (IIIIIIIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; + METHOD method_14667 rotated (IIIIIIIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; ARG 0 x ARG 1 y ARG 2 z + ARG 3 offsetX + ARG 4 offsetY + ARG 5 offsetZ + ARG 6 sizeX + ARG 7 sizeY + ARG 8 sizeZ ARG 9 facing - METHOD method_14668 setFrom (Lnet/minecraft/class_3341;)V - ARG 1 source + METHOD method_14668 encompass (Lnet/minecraft/class_3341;)V + ARG 1 region METHOD method_14669 intersectsXZ (IIII)Z ARG 1 minX ARG 2 minZ diff --git a/mappings/net/minecraft/util/math/Box.mapping b/mappings/net/minecraft/util/math/Box.mapping index d801c12b3e..2327bced5f 100644 --- a/mappings/net/minecraft/util/math/Box.mapping +++ b/mappings/net/minecraft/util/math/Box.mapping @@ -1,19 +1,23 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box - FIELD field_1320 maxX D - FIELD field_1321 minZ D - FIELD field_1322 minY D - FIELD field_1323 minX D - FIELD field_1324 maxZ D - FIELD field_1325 maxY D + FIELD field_1320 x2 D + FIELD field_1321 z1 D + FIELD field_1322 y1 D + FIELD field_1323 x1 D + FIELD field_1324 z2 D + FIELD field_1325 y2 D METHOD (DDDDDD)V ARG 1 x1 ARG 3 y1 ARG 5 z1 + ARG 7 x2 + ARG 9 y2 + ARG 11 z2 METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V - ARG 1 min + ARG 1 pos1 + ARG 2 pos2 METHOD (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V - ARG 1 min - ARG 2 max + ARG 1 pos1 + ARG 2 pos2 METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_1001 getMin (Lnet/minecraft/class_2350$class_2351;)D @@ -44,7 +48,7 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 0 boxes ARG 1 from ARG 2 to - ARG 3 blockPos + ARG 3 pos METHOD method_1011 contract (D)Lnet/minecraft/class_238; ARG 1 value METHOD method_1012 stretch (DDD)Lnet/minecraft/class_238; @@ -54,11 +58,13 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box METHOD method_1013 isValid ()Z METHOD method_1014 expand (D)Lnet/minecraft/class_238; ARG 1 value - METHOD method_17939 getXSize ()D - METHOD method_17940 getYSize ()D - METHOD method_17941 getZSize ()D + METHOD method_17939 getXLength ()D + METHOD method_17940 getYLength ()D + METHOD method_17941 getZLength ()D METHOD method_18804 stretch (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; + ARG 1 scale METHOD method_19316 from (Lnet/minecraft/class_3341;)Lnet/minecraft/class_238; + ARG 0 mutable METHOD method_989 offset (DDD)Lnet/minecraft/class_238; ARG 1 x ARG 3 y @@ -66,15 +72,34 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box METHOD method_990 getMax (Lnet/minecraft/class_2350$class_2351;)D ARG 1 axis METHOD method_991 union (Lnet/minecraft/class_238;)Lnet/minecraft/class_238; + ARG 1 box METHOD method_992 rayTrace (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Ljava/util/Optional; + ARG 1 min + ARG 2 max METHOD method_993 intersects (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z + ARG 1 from + ARG 2 to METHOD method_994 intersects (Lnet/minecraft/class_238;)Z ARG 1 box - METHOD method_995 averageDimension ()D + METHOD method_995 getAverageSideLength ()D METHOD method_996 offset (Lnet/minecraft/class_2338;)Lnet/minecraft/class_238; ARG 1 blockPos METHOD method_997 offset (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; ARG 1 vec3d - METHOD method_998 ([DLnet/minecraft/class_2350;DDDDDDDDLnet/minecraft/class_2350;DDD)Lnet/minecraft/class_2350; - ARG 18 maxZ + METHOD method_998 traceCollisionSide ([DLnet/minecraft/class_2350;DDDDDDDDLnet/minecraft/class_2350;DDD)Lnet/minecraft/class_2350; + ARG 0 traceDistanceResult + ARG 1 approachDirection + ARG 2 xDelta + ARG 4 yDelta + ARG 6 zDelta + ARG 8 begin + ARG 10 minX + ARG 12 maxX + ARG 14 minZ + ARG 16 maxZ + ARG 18 resultDirection + ARG 19 startX + ARG 21 startY + ARG 23 startZ METHOD method_999 intersection (Lnet/minecraft/class_238;)Lnet/minecraft/class_238; + ARG 1 box diff --git a/mappings/net/minecraft/util/math/ChunkPos.mapping b/mappings/net/minecraft/util/math/ChunkPos.mapping index 9a66e31bdf..3d409b2e63 100644 --- a/mappings/net/minecraft/util/math/ChunkPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkPos.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos FIELD field_18684 position Lnet/minecraft/class_1923; METHOD tryAdvance (Ljava/util/function/Consumer;)Z ARG 1 consumer - FIELD field_17348 INVALID J + FIELD field_17348 MARKER J FIELD field_9180 z I FIELD field_9181 x I METHOD (II)V diff --git a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping index 86adb94ad1..e9b9f6ee4f 100644 --- a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping @@ -7,8 +7,8 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos ARG 1 x ARG 2 y ARG 3 z - METHOD method_18674 getChunkX ()I - METHOD method_18675 toChunkCoord (I)I + METHOD method_18674 getSectionX ()I + METHOD method_18675 getSectionCoord (I)I ARG 0 coord METHOD method_18676 from (III)Lnet/minecraft/class_4076; ARG 0 x @@ -16,43 +16,45 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos ARG 2 z METHOD method_18677 from (J)Lnet/minecraft/class_4076; ARG 0 packed - METHOD method_18678 offsetPacked (JIII)J + METHOD method_18678 offset (JIII)J ARG 0 packed ARG 2 x ARG 3 y ARG 4 z - METHOD method_18679 offsetPacked (JLnet/minecraft/class_2350;)J + METHOD method_18679 offset (JLnet/minecraft/class_2350;)J ARG 0 packed ARG 2 direction METHOD method_18680 from (Lnet/minecraft/class_1297;)Lnet/minecraft/class_4076; + ARG 0 entity METHOD method_18681 from (Lnet/minecraft/class_1923;I)Lnet/minecraft/class_4076; ARG 0 chunkPos ARG 1 y METHOD method_18682 from (Lnet/minecraft/class_2338;)Lnet/minecraft/class_4076; ARG 0 pos - METHOD method_18683 getChunkY ()I - METHOD method_18684 toLocalCoord (I)I + METHOD method_18683 getSectionY ()I + METHOD method_18684 getLocalCoord (I)I ARG 0 coord METHOD method_18685 asLong (III)J ARG 0 x ARG 1 y ARG 2 z - METHOD method_18686 unpackLongX (J)I + METHOD method_18686 getX (J)I ARG 0 packed - METHOD method_18687 getChunkZ ()I - METHOD method_18688 fromChunkCoord (I)I - ARG 0 coord - METHOD method_18689 unpackLongY (J)I + METHOD method_18687 getSectionZ ()I + METHOD method_18688 getWorldCoord (I)I + ARG 0 chunkCoord + METHOD method_18689 getY (J)I ARG 0 packed - METHOD method_18690 unpackLongZ (J)I + METHOD method_18690 getZ (J)I ARG 0 packed - METHOD method_18691 toChunkLong (J)J + METHOD method_18691 fromGlobalPos (J)J ARG 0 globalLong METHOD method_18692 toChunkPos ()Lnet/minecraft/class_1923; - METHOD method_18693 toLightStorageIndex (J)J + METHOD method_18693 withZeroZ (J)J ARG 0 pos METHOD method_18694 asLong ()J - METHOD method_19454 packToShort (Lnet/minecraft/class_2338;)S + METHOD method_19454 getPackedLocalPos (Lnet/minecraft/class_2338;)S + ARG 0 pos METHOD method_19527 getMinX ()I METHOD method_19528 getMinY ()I METHOD method_19529 getMinZ ()I diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index 050940a438..c5b20b3e09 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction FIELD field_11030 idHorizontal I FIELD field_11031 idOpposite I FIELD field_11032 id I - FIELD field_11038 ID_TO_DIRECTION [Lnet/minecraft/class_2350; + FIELD field_11038 VALUES [Lnet/minecraft/class_2350; FIELD field_11040 ALL [Lnet/minecraft/class_2350; FIELD field_11041 HORIZONTAL [Lnet/minecraft/class_2350; FIELD field_11042 vector Lnet/minecraft/class_2382; @@ -93,3 +93,6 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction METHOD method_10170 rotateYClockwise ()Lnet/minecraft/class_2350; METHOD method_10171 getDirection ()Lnet/minecraft/class_2350$class_2352; METHOD method_16365 fromVector (III)Lnet/minecraft/class_2350; + ARG 0 x + ARG 1 y + ARG 2 z diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 6b5e6c0df4..53f5fed122 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper FIELD field_15722 COSINE_TABLE [D - FIELD field_15723 MULTIPLY_DE_BRUJIN_BIT_POSITION [I + FIELD field_15723 MULTIPLY_DE_BRUIJN_BIT_POSITION [I FIELD field_15724 SQUARE_ROOT_OF_TWO F FIELD field_15725 SINE_TABLE [F FIELD field_15726 RANDOM Ljava/util/Random; @@ -14,7 +14,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 1 min ARG 2 max METHOD method_15341 floorMod (FF)F - METHOD method_15342 log2DeBrujin (I)I + METHOD method_15342 log2DeBruijn (I)I METHOD method_15343 parseInt (Ljava/lang/String;I)I ARG 0 string ARG 1 fallback @@ -23,9 +23,11 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 1 min ARG 2 max METHOD method_15345 fastInverseSqrt (D)D - ARG 0 value + ARG 0 x METHOD method_15346 floorDiv (II)I - METHOD method_15347 equalsApproximate (FF)Z + METHOD method_15347 approximatelyEquals (FF)Z + ARG 0 a + ARG 1 b METHOD method_15349 atan2 (DD)D METHOD method_15350 clamp (DDD)D ARG 0 value @@ -141,7 +143,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 1 first ARG 2 second METHOD method_17822 sign (D)I - METHOD method_20306 (FFF)F + METHOD method_20306 capRotation (FFF)F ARG 0 start ARG 1 end ARG 2 speed diff --git a/mappings/net/minecraft/util/math/Quaternion.mapping b/mappings/net/minecraft/util/math/Quaternion.mapping index 7e688a8203..9907f70c97 100644 --- a/mappings/net/minecraft/util/math/Quaternion.mapping +++ b/mappings/net/minecraft/util/math/Quaternion.mapping @@ -1,20 +1,20 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion FIELD field_5656 components [F METHOD (FFFF)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 w + ARG 1 b + ARG 2 c + ARG 3 d + ARG 4 a METHOD (FFFZ)V ARG 1 x ARG 2 y ARG 3 z - ARG 4 w + ARG 4 degrees METHOD (Lnet/minecraft/class_1158;)V ARG 1 other METHOD (Lnet/minecraft/class_1160;FZ)V ARG 1 axis - ARG 2 angle + ARG 2 rotationAngle ARG 3 degrees METHOD equals (Ljava/lang/Object;)Z ARG 1 o @@ -22,10 +22,10 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion ARG 0 value METHOD method_16003 cos (F)F ARG 0 value - METHOD method_4921 getX ()F - METHOD method_4922 getY ()F - METHOD method_4923 getZ ()F - METHOD method_4924 getW ()F - METHOD method_4925 copyFrom (Lnet/minecraft/class_1158;)V + METHOD method_4921 getB ()F + METHOD method_4922 getC ()F + METHOD method_4923 getD ()F + METHOD method_4924 getA ()F + METHOD method_4925 hamiltonProduct (Lnet/minecraft/class_1158;)V ARG 1 other - METHOD method_4926 reverse ()V + METHOD method_4926 conjugate ()V diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index c870cd9d84..ccfa8fa42b 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d METHOD method_1022 distanceTo (Lnet/minecraft/class_243;)D METHOD method_1023 subtract (DDD)Lnet/minecraft/class_243; ARG 1 x + ARG 3 y + ARG 5 z METHOD method_1024 rotateY (F)Lnet/minecraft/class_243; METHOD method_1025 squaredDistanceTo (Lnet/minecraft/class_243;)D METHOD method_1026 dotProduct (Lnet/minecraft/class_243;)D diff --git a/mappings/net/minecraft/util/profiler/ProfileResult.mapping b/mappings/net/minecraft/util/profiler/ProfileResult.mapping index c3792146db..9a9542cbb1 100644 --- a/mappings/net/minecraft/util/profiler/ProfileResult.mapping +++ b/mappings/net/minecraft/util/profiler/ProfileResult.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_3696 net/minecraft/util/profiler/ProfileResult METHOD method_16067 getTimings (Ljava/lang/String;)Ljava/util/List; - ARG 1 parentTiming + ARG 1 parentPath METHOD method_16068 getStartTime ()J - METHOD method_16069 saveToFile (Ljava/io/File;)Z + METHOD method_16069 save (Ljava/io/File;)Z + ARG 1 file METHOD method_16070 getEndTick ()I METHOD method_16071 getTimeSpan ()J METHOD method_16072 getStartTick ()I diff --git a/mappings/net/minecraft/util/profiler/Profiler.mapping b/mappings/net/minecraft/util/profiler/Profiler.mapping index cacc45cd77..cdb342e0d1 100644 --- a/mappings/net/minecraft/util/profiler/Profiler.mapping +++ b/mappings/net/minecraft/util/profiler/Profiler.mapping @@ -1,8 +1,12 @@ CLASS net/minecraft/class_3695 net/minecraft/util/profiler/Profiler METHOD method_15396 push (Ljava/lang/String;)V + ARG 1 location METHOD method_15400 push (Ljava/util/function/Supplier;)V + ARG 1 locationGetter METHOD method_15403 swap (Ljava/util/function/Supplier;)V + ARG 1 locationGetter METHOD method_15405 swap (Ljava/lang/String;)V + ARG 1 location METHOD method_15407 pop ()V METHOD method_16065 startTick ()V METHOD method_16066 endTick ()V diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping index 9356f66403..eb29811bd6 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -4,5 +4,5 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem FIELD field_15733 tickStarted Z FIELD field_15734 location Ljava/lang/String; FIELD field_15735 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_15736 nameList Ljava/util/List; + FIELD field_15736 path Ljava/util/List; FIELD field_16267 TIMEOUT_NANOSECONDS J diff --git a/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping b/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping index 62751d3c1e..4c2fb61f24 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping @@ -4,4 +4,7 @@ CLASS net/minecraft/class_3534 net/minecraft/util/profiler/ProfilerTiming FIELD field_15739 parentSectionUsagePercentage D METHOD (Ljava/lang/String;DDJ)V ARG 1 name + ARG 2 parentUsagePercentage + ARG 4 totalUsagePercentage + ARG 6 visitCount METHOD method_15409 getColor ()I diff --git a/mappings/net/minecraft/util/profiler/ReadableProfiler.mapping b/mappings/net/minecraft/util/profiler/ReadableProfiler.mapping index 5a623b1187..a4a8d7a8be 100644 --- a/mappings/net/minecraft/util/profiler/ReadableProfiler.mapping +++ b/mappings/net/minecraft/util/profiler/ReadableProfiler.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_3693 net/minecraft/util/profiler/ReadableProfiler - METHOD method_16064 getResults ()Lnet/minecraft/class_3696; + METHOD method_16064 getResult ()Lnet/minecraft/class_3696; diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 5509ea29b1..b4abbec93c 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -12,7 +12,8 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_11147 SURFACE_BUILDER Lnet/minecraft/class_2378; FIELD field_11148 DECORATOR Lnet/minecraft/class_2378; FIELD field_11149 CHUNK_GENERATOR_TYPE Lnet/minecraft/class_2378; - FIELD field_11150 MOTIVE Lnet/minecraft/class_2348; + FIELD field_11150 PAINTING_MOTIVE Lnet/minecraft/class_2348; + COMMENT The painting motive (theme, motif) registry FIELD field_11151 BIOME_SOURCE_TYPE Lnet/minecraft/class_2378; FIELD field_11152 STAT_TYPE Lnet/minecraft/class_2378; FIELD field_11153 BIOME Lnet/minecraft/class_2378; @@ -63,7 +64,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 3 entry METHOD method_10235 getIds ()Ljava/util/Set; METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object; - ARG 1 rand + ARG 1 random METHOD method_10247 create (Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; ARG 0 id METHOD method_10249 getRawId (Ljava/lang/Object;)I diff --git a/mappings/net/minecraft/util/shape/DisjointDoubleListPair.mapping b/mappings/net/minecraft/util/shape/DisjointPairList.mapping similarity index 77% rename from mappings/net/minecraft/util/shape/DisjointDoubleListPair.mapping rename to mappings/net/minecraft/util/shape/DisjointPairList.mapping index 82bbbf5fe5..6ba82f995b 100644 --- a/mappings/net/minecraft/util/shape/DisjointDoubleListPair.mapping +++ b/mappings/net/minecraft/util/shape/DisjointPairList.mapping @@ -1,8 +1,9 @@ -CLASS net/minecraft/class_257 net/minecraft/util/shape/DisjointDoubleListPair +CLASS net/minecraft/class_257 net/minecraft/util/shape/DisjointPairList FIELD field_1379 second Lit/unimi/dsi/fastutil/doubles/DoubleList; FIELD field_1381 first Lit/unimi/dsi/fastutil/doubles/DoubleList; METHOD (Lit/unimi/dsi/fastutil/doubles/DoubleList;Lit/unimi/dsi/fastutil/doubles/DoubleList;Z)V ARG 1 first ARG 2 second + ARG 3 inverted METHOD getDouble (I)D ARG 1 position diff --git a/mappings/net/minecraft/util/shape/DoubleListPair.mapping b/mappings/net/minecraft/util/shape/DoubleListPair.mapping deleted file mode 100644 index 50c6a0ad0e..0000000000 --- a/mappings/net/minecraft/util/shape/DoubleListPair.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_255 net/minecraft/util/shape/DoubleListPair - CLASS class_256 SectionPairPredicate - METHOD method_1065 forAllOverlappingSections (Lnet/minecraft/class_255$class_256;)Z - ARG 1 predicate - METHOD method_1066 getMergedList ()Lit/unimi/dsi/fastutil/doubles/DoubleList; diff --git a/mappings/net/minecraft/util/shape/FractionalDoubleListPair.mapping b/mappings/net/minecraft/util/shape/FractionalPairList.mapping similarity index 94% rename from mappings/net/minecraft/util/shape/FractionalDoubleListPair.mapping rename to mappings/net/minecraft/util/shape/FractionalPairList.mapping index 4445e7d905..0bd7b098eb 100644 --- a/mappings/net/minecraft/util/shape/FractionalDoubleListPair.mapping +++ b/mappings/net/minecraft/util/shape/FractionalPairList.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_248 net/minecraft/util/shape/FractionalDoubleListPair +CLASS net/minecraft/class_248 net/minecraft/util/shape/FractionalPairList FIELD field_1367 mergedList Lnet/minecraft/class_246; FIELD field_1368 gcd I FIELD field_1369 secondSectionCount I diff --git a/mappings/net/minecraft/util/shape/IdentityListMerger.mapping b/mappings/net/minecraft/util/shape/IdentityListMerger.mapping deleted file mode 100644 index 957bbfe5e5..0000000000 --- a/mappings/net/minecraft/util/shape/IdentityListMerger.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_250 net/minecraft/util/shape/IdentityListMerger - FIELD field_1371 merged Lit/unimi/dsi/fastutil/doubles/DoubleList; diff --git a/mappings/net/minecraft/util/shape/IdentityPairList.mapping b/mappings/net/minecraft/util/shape/IdentityPairList.mapping new file mode 100644 index 0000000000..02e1b1b37f --- /dev/null +++ b/mappings/net/minecraft/util/shape/IdentityPairList.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_250 net/minecraft/util/shape/IdentityPairList + FIELD field_1371 merged Lit/unimi/dsi/fastutil/doubles/DoubleList; diff --git a/mappings/net/minecraft/util/shape/PairList.mapping b/mappings/net/minecraft/util/shape/PairList.mapping new file mode 100644 index 0000000000..fddedf5212 --- /dev/null +++ b/mappings/net/minecraft/util/shape/PairList.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_255 net/minecraft/util/shape/PairList + CLASS class_256 SectionPairPredicate + METHOD method_1065 forEachPair (Lnet/minecraft/class_255$class_256;)Z + ARG 1 predicate + METHOD method_1066 getPairs ()Lit/unimi/dsi/fastutil/doubles/DoubleList; diff --git a/mappings/net/minecraft/util/shape/SimpleDoubleListPair.mapping b/mappings/net/minecraft/util/shape/SimplePairList.mapping similarity index 54% rename from mappings/net/minecraft/util/shape/SimpleDoubleListPair.mapping rename to mappings/net/minecraft/util/shape/SimplePairList.mapping index e5c651582a..0f23afbf7e 100644 --- a/mappings/net/minecraft/util/shape/SimpleDoubleListPair.mapping +++ b/mappings/net/minecraft/util/shape/SimplePairList.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_254 net/minecraft/util/shape/SimpleDoubleListPair - FIELD field_1377 mergedList Lit/unimi/dsi/fastutil/doubles/DoubleArrayList; +CLASS net/minecraft/class_254 net/minecraft/util/shape/SimplePairList + FIELD field_1377 valueIndices Lit/unimi/dsi/fastutil/doubles/DoubleArrayList; METHOD (Lit/unimi/dsi/fastutil/doubles/DoubleList;Lit/unimi/dsi/fastutil/doubles/DoubleList;ZZ)V ARG 1 first ARG 2 second diff --git a/mappings/net/minecraft/util/shape/SliceVoxelShape.mapping b/mappings/net/minecraft/util/shape/SlicedVoxelShape.mapping similarity index 67% rename from mappings/net/minecraft/util/shape/SliceVoxelShape.mapping rename to mappings/net/minecraft/util/shape/SlicedVoxelShape.mapping index 531e97fcd6..8160307da0 100644 --- a/mappings/net/minecraft/util/shape/SliceVoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/SlicedVoxelShape.mapping @@ -1,9 +1,11 @@ -CLASS net/minecraft/class_263 net/minecraft/util/shape/SliceVoxelShape - FIELD field_1395 points Lit/unimi/dsi/fastutil/doubles/DoubleList; +CLASS net/minecraft/class_263 net/minecraft/util/shape/SlicedVoxelShape + FIELD field_1395 POINTS Lit/unimi/dsi/fastutil/doubles/DoubleList; FIELD field_1396 axis Lnet/minecraft/class_2350$class_2351; FIELD field_1397 shape Lnet/minecraft/class_265; METHOD (Lnet/minecraft/class_265;Lnet/minecraft/class_2350$class_2351;I)V ARG 1 shape ARG 2 axis + ARG 3 sliceWidth METHOD method_1088 createVoxelSet (Lnet/minecraft/class_251;Lnet/minecraft/class_2350$class_2351;I)Lnet/minecraft/class_251; ARG 0 voxelSet + ARG 2 sliceWidth diff --git a/mappings/net/minecraft/util/shape/VoxelSet.mapping b/mappings/net/minecraft/util/shape/VoxelSet.mapping index 4282d75042..3f8f7d3a50 100644 --- a/mappings/net/minecraft/util/shape/VoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/VoxelSet.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_251 net/minecraft/util/shape/VoxelSet METHOD method_1051 getSize (Lnet/minecraft/class_2350$class_2351;)I ARG 1 axis METHOD method_1052 forEachEdge (Lnet/minecraft/class_251$class_253;Lnet/minecraft/class_2335;Z)V + ARG 2 direction METHOD method_1053 forEachBox (Lnet/minecraft/class_251$class_253;Z)V ARG 1 consumer ARG 2 largest @@ -39,6 +40,9 @@ CLASS net/minecraft/class_251 net/minecraft/util/shape/VoxelSet METHOD method_1056 isEmpty ()Z METHOD method_1057 contains (Lnet/minecraft/class_2335;III)Z ARG 1 cycle + ARG 2 x + ARG 3 y + ARG 4 z METHOD method_1059 isColumnFull (IIII)Z ARG 1 minZ ARG 2 maxZ diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index 1813fcdb70..0e4683822b 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 2 index METHOD method_1100 getCoordIndex (Lnet/minecraft/class_2350$class_2351;D)I ARG 2 coord - METHOD method_1103 (Lnet/minecraft/class_2335;Lnet/minecraft/class_238;D)D + METHOD method_1103 calculateMaxDistance (Lnet/minecraft/class_2335;Lnet/minecraft/class_238;D)D ARG 1 axisCycle ARG 2 box ARG 3 maxDist @@ -35,9 +35,10 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape METHOD method_1105 getMaximum (Lnet/minecraft/class_2350$class_2351;)D ARG 1 axis METHOD method_1107 getBoundingBox ()Lnet/minecraft/class_238; - METHOD method_1108 (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;D)D + METHOD method_1108 calculateMaxDistance (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;D)D ARG 1 axis ARG 2 box + ARG 3 maxDist METHOD method_1109 getPointPositions (Lnet/minecraft/class_2350$class_2351;)Lit/unimi/dsi/fastutil/doubles/DoubleList; ARG 1 axis METHOD method_1110 isEmpty ()Z diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index 0a6797bff1..5acb33a1c3 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -31,6 +31,8 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes METHOD method_1078 cuboid (Lnet/minecraft/class_238;)Lnet/minecraft/class_265; ARG 0 box METHOD method_1079 lcm (II)J + ARG 0 a + ARG 1 b METHOD method_1081 cuboid (DDDDDD)Lnet/minecraft/class_265; ARG 0 xMin ARG 2 yMin @@ -39,6 +41,9 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes ARG 8 yMax ARG 10 zMax METHOD method_1082 combine (Lnet/minecraft/class_265;Lnet/minecraft/class_265;Lnet/minecraft/class_247;)Lnet/minecraft/class_265; + ARG 0 one + ARG 1 two + ARG 2 function METHOD method_1084 union (Lnet/minecraft/class_265;Lnet/minecraft/class_265;)Lnet/minecraft/class_265; ARG 0 first ARG 1 second @@ -46,6 +51,7 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes ARG 0 axis ARG 1 box ARG 2 shapes + ARG 3 maxDist METHOD method_1086 findRequiredBitResolution (DD)I ARG 0 min ARG 2 max diff --git a/mappings/net/minecraft/util/thread/MessageListener.mapping b/mappings/net/minecraft/util/thread/MessageListener.mapping new file mode 100644 index 0000000000..78823e7f2b --- /dev/null +++ b/mappings/net/minecraft/util/thread/MessageListener.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_3906 net/minecraft/util/thread/MessageListener + METHOD method_16898 getName ()Ljava/lang/String; + METHOD method_16901 send (Ljava/lang/Object;)V + ARG 1 message + METHOD method_17344 create (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/class_3906; + ARG 0 name + ARG 1 action + METHOD method_17345 ask (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; + ARG 1 messageProvider diff --git a/mappings/net/minecraft/util/thread/ReentrantThreadExecutor.mapping b/mappings/net/minecraft/util/thread/ReentrantThreadExecutor.mapping new file mode 100644 index 0000000000..1fc4fedaf7 --- /dev/null +++ b/mappings/net/minecraft/util/thread/ReentrantThreadExecutor.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4093 net/minecraft/util/thread/ReentrantThreadExecutor + FIELD field_18320 runningTasks I + METHOD method_18860 hasRunningTasks ()Z diff --git a/mappings/net/minecraft/util/MailboxProcessor.mapping b/mappings/net/minecraft/util/thread/TaskExecutor.mapping similarity index 62% rename from mappings/net/minecraft/util/MailboxProcessor.mapping rename to mappings/net/minecraft/util/thread/TaskExecutor.mapping index 9d3285ef08..8dff7483f0 100644 --- a/mappings/net/minecraft/util/MailboxProcessor.mapping +++ b/mappings/net/minecraft/util/thread/TaskExecutor.mapping @@ -1,20 +1,21 @@ -CLASS net/minecraft/class_3846 net/minecraft/util/MailboxProcessor - FIELD field_17039 mailbox Lnet/minecraft/class_3847; +CLASS net/minecraft/class_3846 net/minecraft/util/thread/TaskExecutor + FIELD field_17039 queue Lnet/minecraft/class_3847; FIELD field_17040 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_17041 stateFlags Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_17042 executor Ljava/util/concurrent/Executor; FIELD field_17043 name Ljava/lang/String; METHOD (Lnet/minecraft/class_3847;Ljava/util/concurrent/Executor;Ljava/lang/String;)V - ARG 1 mailbox + ARG 1 queue + ARG 2 executor ARG 3 name - METHOD method_16900 run (Lit/unimi/dsi/fastutil/ints/Int2BooleanFunction;)I - ARG 1 keepRunningProvider + METHOD method_16900 runWhile (Lit/unimi/dsi/fastutil/ints/Int2BooleanFunction;)I + ARG 1 condition METHOD method_16902 create (Ljava/util/concurrent/Executor;Ljava/lang/String;)Lnet/minecraft/class_3846; ARG 0 executor ARG 1 name - METHOD method_16903 lock ()Z - METHOD method_16904 unlock ()V + METHOD method_16903 unpause ()Z + METHOD method_16904 pause ()V METHOD method_16905 hasMessages ()Z - METHOD method_16906 isLocked ()Z + METHOD method_16906 isUnpaused ()Z METHOD method_16907 runNext ()Z METHOD method_16908 execute ()V diff --git a/mappings/net/minecraft/util/Mailbox.mapping b/mappings/net/minecraft/util/thread/TaskQueue.mapping similarity index 87% rename from mappings/net/minecraft/util/Mailbox.mapping rename to mappings/net/minecraft/util/thread/TaskQueue.mapping index 7c32077ee0..6b9ccdcb6f 100644 --- a/mappings/net/minecraft/util/Mailbox.mapping +++ b/mappings/net/minecraft/util/thread/TaskQueue.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3847 net/minecraft/util/Mailbox +CLASS net/minecraft/class_3847 net/minecraft/util/thread/TaskQueue CLASS class_3848 PrioritizedQueueMailbox FIELD field_17044 queues Ljava/util/List; METHOD (I)V @@ -14,4 +14,5 @@ CLASS net/minecraft/class_3847 net/minecraft/util/Mailbox METHOD method_17347 getPriority ()I METHOD method_16909 poll ()Ljava/lang/Object; METHOD method_16910 add (Ljava/lang/Object;)Z + ARG 1 message METHOD method_16911 isEmpty ()Z diff --git a/mappings/net/minecraft/util/thread/ThreadExecutor.mapping b/mappings/net/minecraft/util/thread/ThreadExecutor.mapping new file mode 100644 index 0000000000..818bcd5e7e --- /dev/null +++ b/mappings/net/minecraft/util/thread/ThreadExecutor.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_1255 net/minecraft/util/thread/ThreadExecutor + FIELD field_18318 name Ljava/lang/String; + FIELD field_18319 executionsInProgress I + FIELD field_5750 tasks Ljava/util/Queue; + FIELD field_5751 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_16075 runTask ()Z + METHOD method_16211 createTask (Ljava/lang/Runnable;)Ljava/lang/Runnable; + ARG 1 runnable + METHOD method_18854 isOnThread ()Z + METHOD method_18855 cancelTasks ()V + METHOD method_18856 canExecute (Ljava/lang/Runnable;)Z + ARG 1 task + METHOD method_18857 runTasks (Ljava/util/function/BooleanSupplier;)V + ARG 1 stopCondition + METHOD method_18859 executeTask (Ljava/lang/Runnable;)V + ARG 1 task + METHOD method_19537 submitAndJoin (Ljava/lang/Runnable;)V + ARG 1 runnable + METHOD method_3777 getThread ()Ljava/lang/Thread; + METHOD method_5382 submitAsync (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; + ARG 1 runnable + METHOD method_5383 runTasks ()V + METHOD method_5384 shouldExecuteAsync ()Z + METHOD method_5385 submit (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; + ARG 1 task diff --git a/mappings/net/minecraft/village/ZombieSiegeManager.mapping b/mappings/net/minecraft/village/ZombieSiegeManager.mapping index d151471e5d..a4a91ad87c 100644 --- a/mappings/net/minecraft/village/ZombieSiegeManager.mapping +++ b/mappings/net/minecraft/village/ZombieSiegeManager.mapping @@ -7,7 +7,14 @@ CLASS net/minecraft/class_1419 net/minecraft/village/ZombieSiegeManager FIELD field_6722 countdown I FIELD field_6723 remaining I FIELD field_6725 spawned Z - METHOD method_6445 tick (Lnet/minecraft/class_3218;ZZ)I + METHOD method_6445 spawn (Lnet/minecraft/class_3218;ZZ)I + ARG 1 world + ARG 2 spawnMonsters + ARG 3 spawnAnimals METHOD method_6446 spawn (Lnet/minecraft/class_3218;)Z + ARG 1 world METHOD method_6447 trySpawnZombie (Lnet/minecraft/class_3218;)V + ARG 1 world METHOD method_6448 getSpawnVector (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/world/ExtendedBlockView.mapping b/mappings/net/minecraft/world/BlockRenderView.mapping similarity index 78% rename from mappings/net/minecraft/world/ExtendedBlockView.mapping rename to mappings/net/minecraft/world/BlockRenderView.mapping index d3c37f3985..44544f9e0a 100644 --- a/mappings/net/minecraft/world/ExtendedBlockView.mapping +++ b/mappings/net/minecraft/world/BlockRenderView.mapping @@ -1,7 +1,9 @@ -CLASS net/minecraft/class_1920 net/minecraft/world/ExtendedBlockView +CLASS net/minecraft/class_1920 net/minecraft/world/BlockRenderView METHOD method_8310 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; METHOD method_8311 isSkyVisible (Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_8313 getLightmapIndex (Lnet/minecraft/class_2338;I)I ARG 1 pos METHOD method_8314 getLightLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_2338;)I ARG 1 type + ARG 2 pos diff --git a/mappings/net/minecraft/world/BlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping index a1ea278fcd..23d49415f6 100644 --- a/mappings/net/minecraft/world/BlockView.mapping +++ b/mappings/net/minecraft/world/BlockView.mapping @@ -1,7 +1,15 @@ CLASS net/minecraft/class_1922 net/minecraft/world/BlockView METHOD method_17742 rayTrace (Lnet/minecraft/class_3959;)Lnet/minecraft/class_3965; + ARG 1 context METHOD method_17744 rayTrace (Lnet/minecraft/class_3959;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Ljava/lang/Object; + ARG 1 context + ARG 2 blockRaytracer METHOD method_17745 rayTraceBlock (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2338;Lnet/minecraft/class_265;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3965; + ARG 1 start + ARG 2 end + ARG 3 pos + ARG 4 shape + ARG 5 state METHOD method_8315 getMaxLightLevel ()I METHOD method_8316 getFluidState (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3610; ARG 1 pos diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/CollisionView.mapping similarity index 90% rename from mappings/net/minecraft/world/ViewableWorld.mapping rename to mappings/net/minecraft/world/CollisionView.mapping index e183700881..72b709219f 100644 --- a/mappings/net/minecraft/world/ViewableWorld.mapping +++ b/mappings/net/minecraft/world/CollisionView.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld +CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView METHOD method_16955 getChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2791; ARG 1 pos METHOD method_16956 getChunk (IILnet/minecraft/class_2806;)Lnet/minecraft/class_2791; @@ -6,7 +6,9 @@ CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld ARG 2 chunkZ ARG 3 requiredState METHOD method_17892 doesNotCollide (Lnet/minecraft/class_1297;)Z + ARG 1 entity METHOD method_18026 doesNotCollide (Lnet/minecraft/class_238;)Z + ARG 1 box METHOD method_20311 getLeastChunkStatusForCollisionCalculation ()Lnet/minecraft/class_2806; METHOD method_8392 getChunk (II)Lnet/minecraft/class_2791; ARG 1 chunkX @@ -23,7 +25,7 @@ CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld ARG 1 pos METHOD method_8587 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity - ARG 2 entityBoundingBox + ARG 2 box METHOD method_8589 getTop (Lnet/minecraft/class_2902$class_2903;II)I ARG 1 type ARG 2 x @@ -40,7 +42,10 @@ CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld METHOD method_8598 getTopPosition (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 1 type METHOD method_8599 intersectsFluid (Lnet/minecraft/class_238;)Z - METHOD method_8600 getCollisionShapes (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream; + METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream; + ARG 1 entity + ARG 2 box + ARG 3 excluded METHOD method_8602 getLightLevel (Lnet/minecraft/class_2338;)I METHOD method_8603 (Lnet/minecraft/class_2338;I)I ARG 2 darkness @@ -67,3 +72,4 @@ CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld METHOD method_8628 canPlace (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Z ARG 1 state ARG 2 pos + ARG 3 context diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 896042e2f1..5cb6fa42a4 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -21,25 +21,35 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView ARG 1 entity ARG 2 maxDistance METHOD method_18461 getClosestPlayer (Lnet/minecraft/class_4051;DDD)Lnet/minecraft/class_1657; + ARG 1 targetPredicate ARG 2 x ARG 4 y ARG 6 z METHOD method_18462 getClosestPlayer (Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1657; + ARG 1 targetPredicate + ARG 2 entity METHOD method_18463 getClosestPlayer (Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDD)Lnet/minecraft/class_1657; + ARG 1 targetPredicate + ARG 2 entity ARG 3 x ARG 5 y ARG 7 z - METHOD method_18464 getPlayersInBox (Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;Lnet/minecraft/class_238;)Ljava/util/List; + METHOD method_18464 getPlayers (Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;Lnet/minecraft/class_238;)Ljava/util/List; + ARG 1 targetPredicate + ARG 2 entity + ARG 3 box METHOD method_18466 getTargets (Ljava/lang/Class;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;Lnet/minecraft/class_238;)Ljava/util/List; ARG 1 entityClass ARG 2 targetPredicate ARG 3 targettingEntity ARG 4 box - METHOD method_18467 getEntities (Ljava/lang/Class;Lnet/minecraft/class_238;)Ljava/util/List; + METHOD method_18467 getNonSpectatingEntities (Ljava/lang/Class;Lnet/minecraft/class_238;)Ljava/util/List; ARG 1 entityClass ARG 2 box METHOD method_18468 getClosestEntity (Ljava/util/List;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDD)Lnet/minecraft/class_1309; ARG 1 entityList + ARG 2 targetPredicate + ARG 3 entity ARG 4 x ARG 6 y ARG 8 z diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index a93095e8cf..1ba15ca16d 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -77,10 +77,10 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules METHOD method_20782 getThis ()Lnet/minecraft/class_1928$class_4315; FIELD field_19410 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_9196 rules Ljava/util/Map; - FIELD field_9197 RULES Ljava/util/Map; - METHOD method_20744 forEach (Lnet/minecraft/class_1928$class_4311;)V - ARG 0 consumer - METHOD method_20745 consumeTyped (Lnet/minecraft/class_1928$class_4311;Lnet/minecraft/class_1928$class_4313;Lnet/minecraft/class_1928$class_4314;)V + FIELD field_9197 RULE_TYPES Ljava/util/Map; + METHOD method_20744 forEachType (Lnet/minecraft/class_1928$class_4311;)V + ARG 0 action + METHOD method_20745 accept (Lnet/minecraft/class_1928$class_4311;Lnet/minecraft/class_1928$class_4313;Lnet/minecraft/class_1928$class_4314;)V ARG 0 consumer ARG 1 key ARG 2 type @@ -103,7 +103,7 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules ARG 1 rule METHOD method_8356 getInt (Lnet/minecraft/class_1928$class_4313;)I ARG 1 rule - METHOD method_8357 fromNbt (Lnet/minecraft/class_2487;)V + METHOD method_8357 load (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_8358 toNbt ()Lnet/minecraft/class_2487; METHOD method_8359 register (Ljava/lang/String;Lnet/minecraft/class_1928$class_4314;)Lnet/minecraft/class_1928$class_4313; diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index 81c550c6f3..fd03651da2 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_1936 net/minecraft/world/IWorld METHOD method_8397 getBlockTickScheduler ()Lnet/minecraft/class_1951; METHOD method_8398 getChunkManager ()Lnet/minecraft/class_2802; METHOD method_8400 getSkyAngle (F)F - ARG 1 delta + ARG 1 tickDelta METHOD method_8401 getLevelProperties ()Lnet/minecraft/class_31; METHOD method_8404 getLocalDifficulty (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1266; ARG 1 pos @@ -27,6 +27,8 @@ CLASS net/minecraft/class_1936 net/minecraft/world/IWorld ARG 12 velocityZ METHOD method_8407 getDifficulty ()Lnet/minecraft/class_1267; METHOD method_8408 updateNeighbors (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V + ARG 1 pos + ARG 2 block METHOD method_8409 getRandom ()Ljava/util/Random; METHOD method_8410 getWorld ()Lnet/minecraft/class_1937; METHOD method_8412 getSeed ()J diff --git a/mappings/net/minecraft/world/ModifiableWorld.mapping b/mappings/net/minecraft/world/ModifiableWorld.mapping index 8447cbaf6c..9cfe94ea4e 100644 --- a/mappings/net/minecraft/world/ModifiableWorld.mapping +++ b/mappings/net/minecraft/world/ModifiableWorld.mapping @@ -1,9 +1,32 @@ CLASS net/minecraft/class_1945 net/minecraft/world/ModifiableWorld METHOD method_8649 spawnEntity (Lnet/minecraft/class_1297;)Z - METHOD method_8650 clearBlockState (Lnet/minecraft/class_2338;Z)Z + ARG 1 entity + METHOD method_8650 removeBlock (Lnet/minecraft/class_2338;Z)Z + ARG 1 pos + ARG 2 move METHOD method_8651 breakBlock (Lnet/minecraft/class_2338;Z)Z ARG 1 pos METHOD method_8652 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Z + COMMENT Updates the block state at a position, calling appropriate callbacks. + COMMENT + COMMENT

When called on the server, the new block state is stored and propagated to clients and listeners as dictated + COMMENT by the supplied flags. Note that calling this on the client will update the world locally, but may not see the + COMMENT change persisted across loads. It's recommended to check whether this world is client before + COMMENT interacting with the world in this way.

+ COMMENT + COMMENT

Accepted values of the flags are a bitset combination of the following:

+ COMMENT
    + COMMENT
  • 0b0000001 // 1 - PROPAGATE_CHANGE - Propagates a change event to surrounding blocks.
    • + COMMENT
  • 0b0000010 // 2 - NOTIFY_LISTENERS - Notifies listeners and clients who need to react when the block changes
    • + COMMENT
  • 0b0000100 // 4 - NO_REDRAW - Used in conjunction with NOTIFY_LISTENERS to suppress the render pass on clients.
    • + COMMENT
  • 0b0001000 // 8 - REDRAW_ON_MAIN_THREAD - Forces a synchronous redraw on clients.
    • + COMMENT
  • 0b0010000 // 16 - FORCE_STATE - Bypass virtual blockstate changes and forces the passed state to be stored as-is.
    • + COMMENT
  • 0b0100000 // 32 - SKIP_DROPS - Prevents the previous block (container) from dropping items when destroyed.
    • + COMMENT
  • 0b1000000 // 64 - MECHANICAL_UPDATE - Signals that this is a mechanical update, usually caused by pistons moving blocks.
    • + COMMENT
ARG 1 pos + COMMENT the target position ARG 2 state + COMMENT the block state to set ARG 3 flags + COMMENT the bitwise flag combination, as described above diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index 281fe94a11..8e944005f1 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -6,12 +6,14 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V ARG 1 directory ARG 2 dataFixer - METHOD method_120 get (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; + METHOD method_120 readFromFile (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; ARG 1 factory ARG 2 id METHOD method_123 set (Lnet/minecraft/class_18;)V + ARG 1 state METHOD method_125 save ()V METHOD method_17922 getFile (Ljava/lang/String;)Ljava/io/File; ARG 1 id METHOD method_17924 getOrCreate (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; ARG 1 factory + ARG 2 id diff --git a/mappings/net/minecraft/world/PortalForcer.mapping b/mappings/net/minecraft/world/PortalForcer.mapping index 856d6ee010..04efbdf048 100644 --- a/mappings/net/minecraft/world/PortalForcer.mapping +++ b/mappings/net/minecraft/world/PortalForcer.mapping @@ -14,7 +14,6 @@ CLASS net/minecraft/class_1946 net/minecraft/world/PortalForcer METHOD (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_18475 getPortal (Lnet/minecraft/class_2338;Lnet/minecraft/class_243;Lnet/minecraft/class_2350;DDZ)Lnet/minecraft/class_2700$class_4297; - ARG 1 pos ARG 4 x ARG 6 y ARG 8 canActivate diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index 75d58ec5b0..31b7605316 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 2 chunkX ARG 3 chunkZ METHOD method_8662 isClearForSpawn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z + ARG 0 blockView + ARG 1 pos + ARG 2 state METHOD method_8663 spawnEntitiesInChunk (Lnet/minecraft/class_1311;Lnet/minecraft/class_1937;Lnet/minecraft/class_2818;Lnet/minecraft/class_2338;)V ARG 0 category ARG 1 world diff --git a/mappings/net/minecraft/world/BlockViewWithStructures.mapping b/mappings/net/minecraft/world/StructureHolder.mapping similarity index 74% rename from mappings/net/minecraft/world/BlockViewWithStructures.mapping rename to mappings/net/minecraft/world/StructureHolder.mapping index cbb341ce4a..36b725b8b6 100644 --- a/mappings/net/minecraft/world/BlockViewWithStructures.mapping +++ b/mappings/net/minecraft/world/StructureHolder.mapping @@ -1,14 +1,14 @@ -CLASS net/minecraft/class_2810 net/minecraft/world/BlockViewWithStructures +CLASS net/minecraft/class_2810 net/minecraft/world/StructureHolder METHOD method_12179 getStructureReferences ()Ljava/util/Map; METHOD method_12180 getStructureReferences (Ljava/lang/String;)Lit/unimi/dsi/fastutil/longs/LongSet; - ARG 1 structureId + ARG 1 structure METHOD method_12181 getStructureStart (Ljava/lang/String;)Lnet/minecraft/class_3449; - ARG 1 structureId + ARG 1 structure METHOD method_12182 addStructureReference (Ljava/lang/String;J)V - ARG 1 structureId + ARG 1 structure ARG 2 reference METHOD method_12183 setStructureReferences (Ljava/util/Map;)V ARG 1 structureReferences METHOD method_12184 setStructureStart (Ljava/lang/String;Lnet/minecraft/class_3449;)V - ARG 1 structureId - ARG 2 structureStart + ARG 1 structure + ARG 2 start diff --git a/mappings/net/minecraft/world/TickPriority.mapping b/mappings/net/minecraft/world/TickPriority.mapping new file mode 100644 index 0000000000..2b2093baf4 --- /dev/null +++ b/mappings/net/minecraft/world/TickPriority.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_1953 net/minecraft/world/TickPriority + FIELD field_9308 index I + METHOD (Ljava/lang/String;II)V + ARG 3 index + METHOD method_8680 byIndex (I)Lnet/minecraft/class_1953; + ARG 0 index + METHOD method_8681 getIndex ()I diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 20917c7739..c9669580f2 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -30,7 +30,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 4 profiler ARG 5 isClient METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695; - METHOD method_16109 scheduleBlockRender (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V + METHOD method_16109 checkBlockRerender (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 old + ARG 3 updated METHOD method_17452 addImportantParticle (Lnet/minecraft/class_2394;ZDDDDDD)V ARG 1 parameters ARG 2 alwaysSpawn @@ -56,6 +59,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 2 oldBlock ARG 3 newBlock METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V + ARG 1 pos + ARG 2 oldState + ARG 3 newState + ARG 4 flags METHOD method_8419 isRaining ()Z METHOD method_8421 sendEntityStatus (Lnet/minecraft/class_1297;B)V ARG 1 entity @@ -106,7 +113,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8455 updateHorizontalAdjacent (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos METHOD method_8456 getEffectiveHeight ()I - METHOD method_8457 getChunkProviderStatus ()Ljava/lang/String; + METHOD method_8457 getDebugString ()Ljava/lang/String; METHOD method_8458 isSavingDisabled ()Z METHOD method_8459 isEmittingRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 pos @@ -140,7 +147,8 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 2 block METHOD method_8476 isHeightInvalid (I)Z ARG 0 y - METHOD method_8477 isHeightValidAndBlockLoaded (Lnet/minecraft/class_2338;)Z + METHOD method_8477 canSetBlock (Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_8478 getThunderGradient (F)F METHOD method_8479 isReceivingRedstonePower (Lnet/minecraft/class_2338;)Z METHOD method_8480 hasHighHumidity (Lnet/minecraft/class_2338;)Z @@ -157,8 +165,9 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 4 skipExistingChunks METHOD method_8488 getReceivedStrongRedstonePower (Lnet/minecraft/class_2338;)I METHOD method_8492 updateNeighbor (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V - ARG 1 pos + ARG 1 sourcePos ARG 2 sourceBlock + ARG 3 neighborPos METHOD method_8494 addImportantParticle (Lnet/minecraft/class_2394;DDDDDD)V ARG 1 parameters ARG 2 x @@ -182,15 +191,17 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8508 updateNeighborsExcept (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2350;)V ARG 1 pos ARG 2 sourceBlock - METHOD method_8509 setTicksSinceLightning (I)V - ARG 1 ticksSinceLightning + METHOD method_8509 setLightningTicksLeft (I)V + ARG 1 lightningTicksLeft METHOD method_8510 getTime ()J METHOD method_8513 setDefaultSpawnClient ()V METHOD method_8514 getTagManager ()Lnet/minecraft/class_3505; - METHOD method_8515 doesBlockHaveSolidTopSurface (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z + METHOD method_8515 isTopSolid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z + ARG 1 pos + ARG 2 entity METHOD method_8516 setTime (J)V ARG 1 time - METHOD method_8517 setBlockBreakingProgress (ILnet/minecraft/class_2338;I)V + METHOD method_8517 setBlockBreakingInfo (ILnet/minecraft/class_2338;I)V ARG 1 entityId ARG 2 pos ARG 3 progress @@ -209,7 +220,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 pos METHOD method_8527 getGeneratorType ()Lnet/minecraft/class_1942; METHOD method_8529 getTicksSinceLightning ()I - METHOD method_8530 isDaylight ()Z + METHOD method_8530 isDay ()Z METHOD method_8532 getTimeOfDay ()J METHOD method_8533 calculateAmbientDarkness ()V METHOD method_8534 isAreaNotEmpty (Lnet/minecraft/class_238;)Z diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 66b691daef..a006042e26 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -115,7 +115,14 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 2 decorator ARG 3 decoratorConfig METHOD method_8700 getEntitySpawnList (Lnet/minecraft/class_1311;)Ljava/util/List; + ARG 1 category METHOD method_8702 generateFeatureStep (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_2794;Lnet/minecraft/class_1936;JLnet/minecraft/class_2919;Lnet/minecraft/class_2338;)V + ARG 1 step + ARG 2 chunkGenerator + ARG 3 world + ARG 4 seed + ARG 6 random + ARG 7 pos METHOD method_8703 buildSurface (Ljava/util/Random;Lnet/minecraft/class_2791;IIIDLnet/minecraft/class_2680;Lnet/minecraft/class_2680;IJ)V ARG 1 random ARG 2 chunk @@ -146,7 +153,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 0 carver ARG 1 config METHOD method_8715 getRainfall ()F - METHOD method_8716 getParentBiome (Lnet/minecraft/class_1959;)Lnet/minecraft/class_1959; + METHOD method_8716 getModifiedBiome (Lnet/minecraft/class_1959;)Lnet/minecraft/class_1959; ARG 0 biome METHOD method_8717 getCarversForStep (Lnet/minecraft/class_2893$class_2894;)Ljava/util/List; METHOD method_8718 getFlowerFeatures ()Ljava/util/List; diff --git a/mappings/net/minecraft/world/biome/ColdOceanBiome.mapping b/mappings/net/minecraft/world/biome/ColdOceanBiome.mapping new file mode 100644 index 0000000000..8f8137ec69 --- /dev/null +++ b/mappings/net/minecraft/world/biome/ColdOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1975 net/minecraft/world/biome/ColdOceanBiome diff --git a/mappings/net/minecraft/world/biome/DeepColdOceanBiome.mapping b/mappings/net/minecraft/world/biome/DeepColdOceanBiome.mapping new file mode 100644 index 0000000000..05e3e67870 --- /dev/null +++ b/mappings/net/minecraft/world/biome/DeepColdOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1980 net/minecraft/world/biome/DeepColdOceanBiome diff --git a/mappings/net/minecraft/world/biome/DeepFrozenOceanBiome.mapping b/mappings/net/minecraft/world/biome/DeepFrozenOceanBiome.mapping new file mode 100644 index 0000000000..481c96dce1 --- /dev/null +++ b/mappings/net/minecraft/world/biome/DeepFrozenOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1979 net/minecraft/world/biome/DeepFrozenOceanBiome diff --git a/mappings/net/minecraft/world/biome/DeepLukewarmOceanBiome.mapping b/mappings/net/minecraft/world/biome/DeepLukewarmOceanBiome.mapping new file mode 100644 index 0000000000..fa6acbc24a --- /dev/null +++ b/mappings/net/minecraft/world/biome/DeepLukewarmOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1982 net/minecraft/world/biome/DeepLukewarmOceanBiome diff --git a/mappings/net/minecraft/world/biome/DeepWarmOceanBiome.mapping b/mappings/net/minecraft/world/biome/DeepWarmOceanBiome.mapping new file mode 100644 index 0000000000..1013202924 --- /dev/null +++ b/mappings/net/minecraft/world/biome/DeepWarmOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1984 net/minecraft/world/biome/DeepWarmOceanBiome diff --git a/mappings/net/minecraft/world/biome/LukewarmOceanBiome.mapping b/mappings/net/minecraft/world/biome/LukewarmOceanBiome.mapping new file mode 100644 index 0000000000..6ac2b3f82d --- /dev/null +++ b/mappings/net/minecraft/world/biome/LukewarmOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2042 net/minecraft/world/biome/LukewarmOceanBiome diff --git a/mappings/net/minecraft/world/biome/OceanColdBiome.mapping b/mappings/net/minecraft/world/biome/OceanColdBiome.mapping deleted file mode 100644 index 7ab7919215..0000000000 --- a/mappings/net/minecraft/world/biome/OceanColdBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1975 net/minecraft/world/biome/OceanColdBiome diff --git a/mappings/net/minecraft/world/biome/OceanDeepColdBiome.mapping b/mappings/net/minecraft/world/biome/OceanDeepColdBiome.mapping deleted file mode 100644 index 50cb6e5978..0000000000 --- a/mappings/net/minecraft/world/biome/OceanDeepColdBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1980 net/minecraft/world/biome/OceanDeepColdBiome diff --git a/mappings/net/minecraft/world/biome/OceanDeepFrozenBiome.mapping b/mappings/net/minecraft/world/biome/OceanDeepFrozenBiome.mapping deleted file mode 100644 index 53e75f2de2..0000000000 --- a/mappings/net/minecraft/world/biome/OceanDeepFrozenBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1979 net/minecraft/world/biome/OceanDeepFrozenBiome diff --git a/mappings/net/minecraft/world/biome/OceanDeepLukewarmBiome.mapping b/mappings/net/minecraft/world/biome/OceanDeepLukewarmBiome.mapping deleted file mode 100644 index 0c3d139d48..0000000000 --- a/mappings/net/minecraft/world/biome/OceanDeepLukewarmBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1982 net/minecraft/world/biome/OceanDeepLukewarmBiome diff --git a/mappings/net/minecraft/world/biome/OceanDeepWarmBiome.mapping b/mappings/net/minecraft/world/biome/OceanDeepWarmBiome.mapping deleted file mode 100644 index b4a51fd07b..0000000000 --- a/mappings/net/minecraft/world/biome/OceanDeepWarmBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1984 net/minecraft/world/biome/OceanDeepWarmBiome diff --git a/mappings/net/minecraft/world/biome/OceanLukewarmBiome.mapping b/mappings/net/minecraft/world/biome/OceanLukewarmBiome.mapping deleted file mode 100644 index 9e6382dc46..0000000000 --- a/mappings/net/minecraft/world/biome/OceanLukewarmBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2042 net/minecraft/world/biome/OceanLukewarmBiome diff --git a/mappings/net/minecraft/world/biome/OceanWarmBiome.mapping b/mappings/net/minecraft/world/biome/OceanWarmBiome.mapping deleted file mode 100644 index 73d30ce9a5..0000000000 --- a/mappings/net/minecraft/world/biome/OceanWarmBiome.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2174 net/minecraft/world/biome/OceanWarmBiome diff --git a/mappings/net/minecraft/world/biome/WarmOceanBiome.mapping b/mappings/net/minecraft/world/biome/WarmOceanBiome.mapping new file mode 100644 index 0000000000..0177f3e447 --- /dev/null +++ b/mappings/net/minecraft/world/biome/WarmOceanBiome.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2174 net/minecraft/world/biome/WarmOceanBiome diff --git a/mappings/net/minecraft/world/biome/layer/IdentityCoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/IdentityCoordinateTransformer.mapping deleted file mode 100644 index bfd5ae9f90..0000000000 --- a/mappings/net/minecraft/world/biome/layer/IdentityCoordinateTransformer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3740 net/minecraft/world/biome/layer/IdentityCoordinateTransformer diff --git a/mappings/net/minecraft/world/biome/layer/IdentitySamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/IdentitySamplingLayer.mapping deleted file mode 100644 index 73daff71ce..0000000000 --- a/mappings/net/minecraft/world/biome/layer/IdentitySamplingLayer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3661 net/minecraft/world/biome/layer/IdentitySamplingLayer - METHOD method_15866 sample (Lnet/minecraft/class_3630;I)I - ARG 1 context - ARG 2 value diff --git a/mappings/net/minecraft/world/biome/layer/LayerFactory.mapping b/mappings/net/minecraft/world/biome/layer/LayerFactory.mapping deleted file mode 100644 index 85e726c735..0000000000 --- a/mappings/net/minecraft/world/biome/layer/LayerFactory.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3627 net/minecraft/world/biome/layer/LayerFactory diff --git a/mappings/net/minecraft/world/biome/layer/LayerOperator.mapping b/mappings/net/minecraft/world/biome/layer/LayerOperator.mapping deleted file mode 100644 index 9d6f37251f..0000000000 --- a/mappings/net/minecraft/world/biome/layer/LayerOperator.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_4 net/minecraft/world/biome/layer/LayerOperator - METHOD apply (II)I - ARG 1 x - ARG 2 z diff --git a/mappings/net/minecraft/world/biome/layer/LayerSampler.mapping b/mappings/net/minecraft/world/biome/layer/LayerSampler.mapping deleted file mode 100644 index dcd76d981b..0000000000 --- a/mappings/net/minecraft/world/biome/layer/LayerSampler.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3625 net/minecraft/world/biome/layer/LayerSampler - METHOD method_15825 sample (II)I - ARG 1 x - ARG 2 z diff --git a/mappings/net/minecraft/world/biome/layer/NorthWestCoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/NorthWestCoordinateTransformer.mapping deleted file mode 100644 index 0de8104404..0000000000 --- a/mappings/net/minecraft/world/biome/layer/NorthWestCoordinateTransformer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3739 net/minecraft/world/biome/layer/NorthWestCoordinateTransformer diff --git a/mappings/net/minecraft/world/biome/layer/SouthEastSamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/SouthEastSamplingLayer.mapping deleted file mode 100644 index b4b587eb4a..0000000000 --- a/mappings/net/minecraft/world/biome/layer/SouthEastSamplingLayer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3664 net/minecraft/world/biome/layer/SouthEastSamplingLayer - METHOD method_15869 sample (Lnet/minecraft/class_3630;I)I - ARG 1 context - ARG 2 se diff --git a/mappings/net/minecraft/world/biome/layer/CrossSamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/CrossSamplingLayer.mapping similarity index 60% rename from mappings/net/minecraft/world/biome/layer/CrossSamplingLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/CrossSamplingLayer.mapping index 1b942dccae..a986586583 100644 --- a/mappings/net/minecraft/world/biome/layer/CrossSamplingLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/CrossSamplingLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3663 net/minecraft/world/biome/layer/CrossSamplingLayer +CLASS net/minecraft/class_3663 net/minecraft/world/biome/layer/type/CrossSamplingLayer METHOD method_15868 sample (Lnet/minecraft/class_3630;IIIII)I ARG 1 context ARG 2 n diff --git a/mappings/net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/DiagonalCrossSamplingLayer.mapping similarity index 59% rename from mappings/net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/DiagonalCrossSamplingLayer.mapping index ffb1311da4..dc0e7e9074 100644 --- a/mappings/net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/DiagonalCrossSamplingLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3662 net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer +CLASS net/minecraft/class_3662 net/minecraft/world/biome/layer/type/DiagonalCrossSamplingLayer METHOD method_15867 sample (Lnet/minecraft/class_3630;IIIII)I ARG 1 context ARG 2 sw diff --git a/mappings/net/minecraft/world/biome/layer/type/IdentitySamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/IdentitySamplingLayer.mapping new file mode 100644 index 0000000000..f8a26bf260 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/type/IdentitySamplingLayer.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3661 net/minecraft/world/biome/layer/type/IdentitySamplingLayer + METHOD method_15866 sample (Lnet/minecraft/class_3630;I)I + ARG 1 context + ARG 2 value diff --git a/mappings/net/minecraft/world/biome/layer/InitLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/InitLayer.mapping similarity index 77% rename from mappings/net/minecraft/world/biome/layer/InitLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/InitLayer.mapping index c510881211..8073a6dff4 100644 --- a/mappings/net/minecraft/world/biome/layer/InitLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/InitLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3658 net/minecraft/world/biome/layer/InitLayer +CLASS net/minecraft/class_3658 net/minecraft/world/biome/layer/type/InitLayer METHOD method_15854 create (Lnet/minecraft/class_3628;)Lnet/minecraft/class_3627; ARG 1 context METHOD method_15855 sample (Lnet/minecraft/class_3630;II)I diff --git a/mappings/net/minecraft/world/biome/layer/MergingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping similarity index 81% rename from mappings/net/minecraft/world/biome/layer/MergingLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping index c5f315460e..aeb97195b0 100644 --- a/mappings/net/minecraft/world/biome/layer/MergingLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/MergingLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3659 net/minecraft/world/biome/layer/MergingLayer +CLASS net/minecraft/class_3659 net/minecraft/world/biome/layer/type/MergingLayer METHOD method_15860 create (Lnet/minecraft/class_3628;Lnet/minecraft/class_3627;Lnet/minecraft/class_3627;)Lnet/minecraft/class_3627; ARG 1 context ARG 2 layer1 diff --git a/mappings/net/minecraft/world/biome/layer/ParentedLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping similarity index 77% rename from mappings/net/minecraft/world/biome/layer/ParentedLayer.mapping rename to mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping index b2c93f4bab..8523c7e68e 100644 --- a/mappings/net/minecraft/world/biome/layer/ParentedLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/type/ParentedLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3660 net/minecraft/world/biome/layer/ParentedLayer +CLASS net/minecraft/class_3660 net/minecraft/world/biome/layer/type/ParentedLayer METHOD method_15862 create (Lnet/minecraft/class_3628;Lnet/minecraft/class_3627;)Lnet/minecraft/class_3627; ARG 1 context ARG 2 parent diff --git a/mappings/net/minecraft/world/biome/layer/type/SouthEastSamplingLayer.mapping b/mappings/net/minecraft/world/biome/layer/type/SouthEastSamplingLayer.mapping new file mode 100644 index 0000000000..1e8b782a09 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/type/SouthEastSamplingLayer.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3664 net/minecraft/world/biome/layer/type/SouthEastSamplingLayer + METHOD method_15869 sample (Lnet/minecraft/class_3630;I)I + ARG 1 context + ARG 2 se diff --git a/mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping b/mappings/net/minecraft/world/biome/layer/util/CachingLayerContext.mapping similarity index 81% rename from mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping rename to mappings/net/minecraft/world/biome/layer/util/CachingLayerContext.mapping index 7938833bc4..af4db7dadd 100644 --- a/mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/CachingLayerContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3631 net/minecraft/world/biome/layer/CachingLayerContext +CLASS net/minecraft/class_3631 net/minecraft/world/biome/layer/util/CachingLayerContext FIELD field_16044 cacheCapacity I FIELD field_16045 cache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; FIELD field_16729 localSeed J diff --git a/mappings/net/minecraft/world/biome/layer/CachingLayerSampler.mapping b/mappings/net/minecraft/world/biome/layer/util/CachingLayerSampler.mapping similarity index 80% rename from mappings/net/minecraft/world/biome/layer/CachingLayerSampler.mapping rename to mappings/net/minecraft/world/biome/layer/util/CachingLayerSampler.mapping index 03bd6d553f..38ba64f55a 100644 --- a/mappings/net/minecraft/world/biome/layer/CachingLayerSampler.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/CachingLayerSampler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3626 net/minecraft/world/biome/layer/CachingLayerSampler +CLASS net/minecraft/class_3626 net/minecraft/world/biome/layer/util/CachingLayerSampler FIELD field_16035 operator Lnet/minecraft/class_4; FIELD field_16036 cacheCapacity I FIELD field_16038 cache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; diff --git a/mappings/net/minecraft/world/biome/layer/CoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/util/CoordinateTransformer.mapping similarity index 51% rename from mappings/net/minecraft/world/biome/layer/CoordinateTransformer.mapping rename to mappings/net/minecraft/world/biome/layer/util/CoordinateTransformer.mapping index 69c536ec9f..a88403e422 100644 --- a/mappings/net/minecraft/world/biome/layer/CoordinateTransformer.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/CoordinateTransformer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3741 net/minecraft/world/biome/layer/CoordinateTransformer +CLASS net/minecraft/class_3741 net/minecraft/world/biome/layer/util/CoordinateTransformer METHOD method_16342 transformX (I)I ARG 1 x METHOD method_16343 transformZ (I)I diff --git a/mappings/net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer.mapping new file mode 100644 index 0000000000..e28191ee98 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3740 net/minecraft/world/biome/layer/util/IdentityCoordinateTransformer diff --git a/mappings/net/minecraft/world/biome/layer/util/LayerFactory.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerFactory.mapping new file mode 100644 index 0000000000..2b4d627f00 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/LayerFactory.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3627 net/minecraft/world/biome/layer/util/LayerFactory diff --git a/mappings/net/minecraft/world/biome/layer/util/LayerOperator.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerOperator.mapping new file mode 100644 index 0000000000..747196f0c5 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/LayerOperator.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4 net/minecraft/world/biome/layer/util/LayerOperator + METHOD apply (II)I + ARG 1 x + ARG 2 z diff --git a/mappings/net/minecraft/world/biome/layer/LayerRandomnessSource.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerRandomnessSource.mapping similarity index 55% rename from mappings/net/minecraft/world/biome/layer/LayerRandomnessSource.mapping rename to mappings/net/minecraft/world/biome/layer/util/LayerRandomnessSource.mapping index e5e066345b..4f4c771a3f 100644 --- a/mappings/net/minecraft/world/biome/layer/LayerRandomnessSource.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/LayerRandomnessSource.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3630 net/minecraft/world/biome/layer/LayerRandomnessSource +CLASS net/minecraft/class_3630 net/minecraft/world/biome/layer/util/LayerRandomnessSource METHOD method_15834 nextInt (I)I ARG 1 bound METHOD method_15835 getNoiseSampler ()Lnet/minecraft/class_3756; diff --git a/mappings/net/minecraft/world/biome/layer/LayerSampleContext.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping similarity index 87% rename from mappings/net/minecraft/world/biome/layer/LayerSampleContext.mapping rename to mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping index 23aaa5c892..38aa6834c4 100644 --- a/mappings/net/minecraft/world/biome/layer/LayerSampleContext.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3628 net/minecraft/world/biome/layer/LayerSampleContext +CLASS net/minecraft/class_3628 net/minecraft/world/biome/layer/util/LayerSampleContext METHOD method_15828 createSampler (Lnet/minecraft/class_4;Lnet/minecraft/class_3625;Lnet/minecraft/class_3625;)Lnet/minecraft/class_3625; ARG 1 operator METHOD method_15830 initSeed (JJ)V diff --git a/mappings/net/minecraft/world/biome/layer/util/LayerSampler.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerSampler.mapping new file mode 100644 index 0000000000..a466acdaf0 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/LayerSampler.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3625 net/minecraft/world/biome/layer/util/LayerSampler + METHOD method_15825 sample (II)I + ARG 1 x + ARG 2 z diff --git a/mappings/net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer.mapping b/mappings/net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer.mapping new file mode 100644 index 0000000000..b71a45c9cd --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3739 net/minecraft/world/biome/layer/util/NorthWestCoordinateTransformer diff --git a/mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping b/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping similarity index 84% rename from mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping rename to mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping index 1689379a39..4f0c65897f 100644 --- a/mappings/net/minecraft/world/biome/layer/BiomeLayerSampler.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3642 net/minecraft/world/biome/layer/BiomeLayerSampler +CLASS net/minecraft/class_3642 net/minecraft/world/biome/source/BiomeLayerSampler FIELD field_16516 sampler Lnet/minecraft/class_3626; FIELD field_16592 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_3627;)V diff --git a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping index 6bf24bd978..b0c3dcb059 100644 --- a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1973 net/minecraft/world/biome/source/CheckerboardBiomeSource FIELD field_9480 gridSize I - FIELD field_9481 biomes [Lnet/minecraft/class_1959; + FIELD field_9481 biomeArray [Lnet/minecraft/class_1959; METHOD (Lnet/minecraft/class_1976;)V ARG 1 config diff --git a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping index 52d18a12b1..3f83a29491 100644 --- a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2088 net/minecraft/world/biome/source/VanillaLayeredBiomeSource FIELD field_9677 biomes [Lnet/minecraft/class_1959; FIELD field_9679 biomeLayer Lnet/minecraft/class_3642; - FIELD field_9680 noiseLayer Lnet/minecraft/class_3642; + FIELD field_9680 biomeSampler Lnet/minecraft/class_3642; METHOD (Lnet/minecraft/class_2084;)V ARG 1 config diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index fc4d64bd10..d548afe217 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -37,7 +37,9 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder FIELD field_12737 centerZ D FIELD field_12738 centerX D METHOD method_11951 contains (Lnet/minecraft/class_1923;)Z + ARG 1 pos METHOD method_11952 contains (Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_11953 getDamagePerBlock ()D METHOD method_11954 getTargetSize ()D METHOD method_11955 setDamagePerBlock (D)V @@ -49,12 +51,15 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder ARG 5 time METHOD method_11958 getBoundNorth ()D METHOD method_11959 getMaxWorldBorderRadius ()I - METHOD method_11961 contains (DD)D + METHOD method_11961 getDistanceInsideBorder (DD)D + ARG 1 x + ARG 3 z METHOD method_11962 getTargetRemainingTime ()J METHOD method_11963 getBoundEast ()D METHOD method_11964 getCenterX ()D METHOD method_11965 getSize ()D METHOD method_11966 contains (Lnet/minecraft/class_238;)Z + ARG 1 box METHOD method_11967 setWarningBlocks (I)V ARG 1 warningBlocks METHOD method_11968 getStage ()Lnet/minecraft/class_2789; @@ -72,7 +77,8 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder METHOD method_11978 setCenter (DD)V ARG 1 x ARG 3 z - METHOD method_11979 contains (Lnet/minecraft/class_1297;)D + METHOD method_11979 getDistanceInsideBorder (Lnet/minecraft/class_1297;)D + ARG 1 entity METHOD method_11980 getCenterZ ()D METHOD method_11981 setBuffer (D)V ARG 1 buffer diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping index 5edc67fb99..8c80a7d98d 100644 --- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager ARG 2 z ARG 3 leastStatus ARG 4 create - METHOD method_12122 getStatus ()Ljava/lang/String; + METHOD method_12122 getDebugString ()Ljava/lang/String; METHOD method_12123 isChunkLoaded (II)Z ARG 1 x ARG 2 z @@ -13,7 +13,11 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager ARG 2 forced METHOD method_12125 shouldTickEntity (Lnet/minecraft/class_1297;)Z METHOD method_12126 getWorldChunk (IIZ)Lnet/minecraft/class_2818; + ARG 1 chunkX + ARG 2 chunkZ + ARG 3 create METHOD method_12127 tick (Ljava/util/function/BooleanSupplier;)V + ARG 1 shouldKeepTicking METHOD method_12128 setMobSpawnOptions (ZZ)V ARG 1 spawnMonsters ARG 2 spawnAnimals diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index d8f1452d4c..f1fcfb5a52 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -13,27 +13,27 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 4 chunk FIELD field_12787 chunkType Lnet/minecraft/class_2806$class_2808; FIELD field_12788 STATUS_TO_TARGET_GENERATION_RADIUS Lit/unimi/dsi/fastutil/ints/IntList; - FIELD field_12789 name Ljava/lang/String; + FIELD field_12789 id Ljava/lang/String; FIELD field_12791 DISTANCE_TO_TARGET_GENERATION_STATUS Ljava/util/List; FIELD field_12792 task Lnet/minecraft/class_2806$class_2807; - FIELD field_12793 surfaceGenerated Ljava/util/EnumSet; + FIELD field_12793 heightMapTypes Ljava/util/EnumSet; FIELD field_12802 taskMargin I FIELD field_16646 index I FIELD field_16647 previous Lnet/minecraft/class_2806; FIELD field_19159 PRE_CARVER_HEIGHTMAPS Ljava/util/EnumSet; FIELD field_19160 POST_CARVER_HEIGHTMAPS Ljava/util/EnumSet; METHOD (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V - ARG 1 name + ARG 1 id ARG 2 previous ARG 3 taskMargin - ARG 4 surfaceGenerated - ARG 5 type + ARG 4 heightMapTypes + ARG 5 chunkType ARG 6 task METHOD method_12152 getTaskMargin ()I METHOD method_12154 runTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 2 chunkGenerator METHOD method_12155 getMaxTargetGenerationRadius ()I - METHOD method_12160 isSurfaceGenerated ()Ljava/util/EnumSet; + METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 getTargetGenerationStatus (I)Lnet/minecraft/class_2806; ARG 0 distance METHOD method_12164 getChunkType ()Lnet/minecraft/class_2806$class_2808; @@ -41,11 +41,23 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 1 chunk METHOD method_12168 get (Ljava/lang/String;)Lnet/minecraft/class_2806; ARG 0 id - METHOD method_12172 getName ()Ljava/lang/String; + METHOD method_12172 getId ()Ljava/lang/String; METHOD method_12175 getTargetGenerationRadius (Lnet/minecraft/class_2806;)I ARG 0 status METHOD method_16555 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_3768;)Lnet/minecraft/class_2806; + ARG 0 id + ARG 1 previous + ARG 2 taskMargin + ARG 3 heightMapTypes + ARG 4 chunkType + ARG 5 task METHOD method_16557 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;)Lnet/minecraft/class_2806; + ARG 0 id + ARG 1 previous + ARG 2 taskMargin + ARG 3 heightMapTypes + ARG 4 chunkType + ARG 5 task METHOD method_16558 createOrderedList ()Ljava/util/List; METHOD method_16559 getIndex ()I METHOD method_16560 getPrevious ()Lnet/minecraft/class_2806; diff --git a/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping b/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping new file mode 100644 index 0000000000..fff8aea535 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_3556 net/minecraft/world/chunk/ChunkToNibbleArrayMap + FIELD field_15789 cachePositions [J + FIELD field_15790 cacheArrays [Lnet/minecraft/class_2804; + FIELD field_15791 arrays Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; + FIELD field_16447 cacheEnabled Z + METHOD (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V + ARG 1 arrays + METHOD method_15499 put (JLnet/minecraft/class_2804;)V + ARG 1 pos + ARG 3 data + METHOD method_15500 removeChunk (J)Lnet/minecraft/class_2804; + ARG 1 chunkPos + METHOD method_15501 get (J)Lnet/minecraft/class_2804; + ARG 1 chunkPos + METHOD method_15502 replaceWithCopy (J)V + ARG 1 pos + METHOD method_15503 containsKey (J)Z + ARG 1 chunkPos + METHOD method_15504 copy ()Lnet/minecraft/class_3556; + METHOD method_15505 clearCache ()V + METHOD method_16188 disableCache ()V diff --git a/mappings/net/minecraft/world/chunk/UpgradeData.mapping b/mappings/net/minecraft/world/chunk/UpgradeData.mapping index 73a5f92b99..7c5c39af50 100644 --- a/mappings/net/minecraft/world/chunk/UpgradeData.mapping +++ b/mappings/net/minecraft/world/chunk/UpgradeData.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData FIELD field_12950 NO_UPGRADE_DATA Lnet/minecraft/class_2843; - FIELD field_12951 sides Ljava/util/EnumSet; - FIELD field_12955 indices [[I + FIELD field_12951 sidesToUpgrade Ljava/util/EnumSet; + FIELD field_12955 centerIndicesToUpgrade [[I FIELD field_12956 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_2487;)V ARG 1 tag diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 54d790336f..0be0e32a75 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12203 remove (Lnet/minecraft/class_1297;)V METHOD method_12204 loadBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; ARG 1 pos - METHOD method_12205 appendEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V + METHOD method_12205 getEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 except ARG 2 box ARG 3 entityList @@ -40,10 +40,11 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12207 setLevelTypeProvider (Ljava/util/function/Supplier;)V ARG 1 levelTypeProvider METHOD method_12208 createBlockEntity (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586; - METHOD method_12210 appendEntities (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V + METHOD method_12210 getEntities (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 entityClass ARG 2 box - ARG 3 entityList + ARG 3 result + ARG 4 predicate METHOD method_12214 getBlockEntities ()Ljava/util/Map; METHOD method_12215 getEntitySectionArray ()[Lnet/minecraft/class_3509; METHOD method_12216 addBlockEntity (Lnet/minecraft/class_2586;)V @@ -65,7 +66,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610; ARG 1 x ARG 2 y - METHOD method_18029 appendEntities (Lnet/minecraft/class_1299;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V + METHOD method_18029 getEntities (Lnet/minecraft/class_1299;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 type ARG 2 box ARG 3 list diff --git a/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping b/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping deleted file mode 100644 index b66158628f..0000000000 --- a/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/class_3556 net/minecraft/world/chunk/WorldNibbleStorage - FIELD field_15789 cachedCoords [J - FIELD field_15790 cachedData [Lnet/minecraft/class_2804; - FIELD field_15791 arraysByChunk Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; - FIELD field_16447 hasCache Z - METHOD (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V - ARG 1 map - METHOD method_15499 addForChunk (JLnet/minecraft/class_2804;)V - ARG 1 chunkPos - ARG 3 data - METHOD method_15500 removeChunk (J)Lnet/minecraft/class_2804; - ARG 1 chunkPos - METHOD method_15501 getDataForChunk (J)Lnet/minecraft/class_2804; - ARG 1 chunkPos - METHOD method_15502 cloneChunkData (J)V - ARG 1 chunkPos - METHOD method_15503 hasChunk (J)Z - ARG 1 chunkPos - METHOD method_15504 copy ()Lnet/minecraft/class_3556; - METHOD method_15505 clearCache ()V - METHOD method_16188 disableCache ()V diff --git a/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping index 35df597377..3acc35ee5a 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3552 net/minecraft/world/chunk/light/ChunkBlockLightProvider - FIELD field_15778 DIRECTIONS_BLOCKLIGHT [Lnet/minecraft/class_2350; + FIELD field_15778 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_16511 mutablePos Lnet/minecraft/class_2338$class_2339; METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index 9fb515ea84..b702624301 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -7,14 +7,19 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide ARG 1 chunkProvider ARG 2 type ARG 3 lightStorage - METHOD method_15513 queueLightCheck (Lnet/minecraft/class_2338;)V - METHOD method_15515 setSection (JLnet/minecraft/class_2804;)V + METHOD method_15513 checkBlock (Lnet/minecraft/class_2338;)V + ARG 1 pos + METHOD method_15515 setLightArray (JLnet/minecraft/class_2804;)V + ARG 1 pos + ARG 3 lightArray METHOD method_15516 doLightUpdates (IZZ)I - ARG 1 stepCount + ARG 1 maxSteps + ARG 2 doSkylight + ARG 3 skipEdgeLightPropagation METHOD method_15517 getCurrentLevelFromArray (Lnet/minecraft/class_2804;J)I ARG 1 array ARG 2 blockPos METHOD method_15518 hasUpdates ()Z - METHOD method_17529 (II)Lnet/minecraft/class_1922; + METHOD method_17529 getChunk (II)Lnet/minecraft/class_1922; ARG 1 chunkX ARG 2 chunkZ diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping index 7a7af12e39..5202cd3918 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3562 net/minecraft/world/chunk/light/ChunkLightingView CLASS class_3563 Empty METHOD method_15543 getLightLevel (Lnet/minecraft/class_2338;)I - METHOD method_15544 getChunkLightArray (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; + METHOD method_15544 getLightArray (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; + ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping index 0493208fa9..e617ca93c9 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3572 net/minecraft/world/chunk/light/ChunkSkyLightProvider FIELD field_15825 HORIZONTAL_DIRECTIONS [Lnet/minecraft/class_2350; - FIELD field_15826 DIRECTIONS_SKYLIGHT [Lnet/minecraft/class_2350; + FIELD field_15826 DIRECTIONS [Lnet/minecraft/class_2350; METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider diff --git a/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping b/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping index 319482e55c..62764c9f52 100644 --- a/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping +++ b/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping @@ -5,69 +5,69 @@ CLASS net/minecraft/class_3554 net/minecraft/world/chunk/light/LevelPropagator CLASS 2 METHOD rehash (I)V ARG 1 newN - FIELD field_15781 minLevel I - FIELD field_15782 hasUpdates Z + FIELD field_15781 minPendingLevel I + FIELD field_15782 hasPendingUpdates Z FIELD field_15783 levelCount I FIELD field_15784 idToLevel Lit/unimi/dsi/fastutil/longs/Long2ByteFunction; - FIELD field_15785 levelToIds [Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; + FIELD field_15785 pendingIdUpdatesByLevel [Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; METHOD (III)V ARG 1 levelCount - ARG 2 initLevelCapacity - ARG 3 initTotalCapacity - METHOD method_15478 update (JJIZ)V - ARG 1 causingId + ARG 2 expectedLevelSize + ARG 3 expectedTotalSize + METHOD method_15478 updateLevel (JJIZ)V + ARG 1 sourceId ARG 3 id ARG 5 level - ARG 6 mergeAsMin - METHOD method_15479 add (JII)V + ARG 6 decrease + METHOD method_15479 addPendingUpdate (JII)V ARG 1 id ARG 3 level ARG 4 targetLevel METHOD method_15480 getLevel (J)I ARG 1 id - METHOD method_15481 updateMinLevel (I)V - ARG 1 limitLevel - METHOD method_15482 update (JJIIIZ)V - ARG 1 causingId - ARG 3 id - ARG 5 level - ARG 6 currentLevel - ARG 7 previousLevel - ARG 8 mergeAsMin - METHOD method_15483 remove (J)V - ARG 1 id - METHOD method_15484 updateRecursively (JJIZ)V + METHOD method_15481 increaseMinPendingLevel (I)V + ARG 1 maxLevel + METHOD method_15482 updateLevel (JJIIIZ)V ARG 1 sourceId ARG 3 id ARG 5 level - ARG 6 mergeAsMin + ARG 6 currentLevel + ARG 7 pendingLevel + ARG 8 decrease + METHOD method_15483 removePendingUpdate (J)V + ARG 1 id + METHOD method_15484 propagateLevel (JJIZ)V + ARG 1 sourceId + ARG 3 targetId + ARG 5 level + ARG 6 decrease METHOD method_15485 setLevel (JI)V ARG 1 id ARG 3 level - METHOD method_15486 getMergedLevel (JJI)I + METHOD method_15486 recalculateLevel (JJI)I ARG 1 id - ARG 3 sourceId - ARG 5 limitLevel - METHOD method_15487 updateNeighborsRecursively (JIZ)V - ARG 1 id - ARG 3 targetLevel - ARG 4 mergeAsMin - METHOD method_15488 getPropagatedLevel (JJI)I - ARG 1 fromId - ARG 3 toId - ARG 5 currentLevel - METHOD method_15489 hasLevelUpdates ()Z - METHOD method_15490 min (II)I - ARG 1 a - ARG 2 b - METHOD method_15491 fullyUpdate (J)V - ARG 1 id - METHOD method_15492 updateAllRecursively (I)I - ARG 1 maxSteps - METHOD method_15493 removeFromLevel (JIIZ)V + ARG 3 excludedId + ARG 5 maxLevel + METHOD method_15487 propagateLevel (JIZ)V ARG 1 id ARG 3 level - ARG 4 maxLevel - ARG 5 removeFromLevelMap - METHOD method_15494 isInvalid (J)Z + ARG 4 decrease + METHOD method_15488 getPropagatedLevel (JJI)I + ARG 1 sourceId + ARG 3 targetId + ARG 5 level + METHOD method_15489 hasPendingUpdates ()Z + METHOD method_15490 minLevel (II)I + ARG 1 a + ARG 2 b + METHOD method_15491 resetLevel (J)V + ARG 1 id + METHOD method_15492 applyPendingUpdates (I)I + ARG 1 maxSteps + METHOD method_15493 removePendingUpdate (JIIZ)V + ARG 1 id + ARG 3 level + ARG 4 levelCount + ARG 5 removeFully + METHOD method_15494 isMarker (J)Z ARG 1 id diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index 01541962f5..226738e0a5 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -1,44 +1,45 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage - FIELD field_15796 dataStorage Lnet/minecraft/class_3556; - FIELD field_15798 toRemove Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_15796 lightArrays Lnet/minecraft/class_3556; + FIELD field_15798 lightArraysToRemove Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_15799 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_15800 hasLightUpdates Z FIELD field_15801 EMPTY Lnet/minecraft/class_2804; FIELD field_15803 chunkProvider Lnet/minecraft/class_2823; FIELD field_15805 lightType Lnet/minecraft/class_1944; - FIELD field_15806 dataStorageUncached Lnet/minecraft/class_3556; - FIELD field_15807 toUpdate Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; - FIELD field_16448 toNotify Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_15806 uncachedLightArrays Lnet/minecraft/class_3556; + FIELD field_15807 lightArraysToAdd Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_16448 dirtySections Lit/unimi/dsi/fastutil/longs/LongSet; METHOD (Lnet/minecraft/class_1944;Lnet/minecraft/class_2823;Lnet/minecraft/class_3556;)V ARG 1 lightType ARG 2 chunkProvider ARG 3 lightData - METHOD method_15522 getDataForChunk (JZ)Lnet/minecraft/class_2804; - ARG 1 chunkPos + METHOD method_15522 getLightArray (JZ)Lnet/minecraft/class_2804; + ARG 1 sectionPos ARG 3 cached - METHOD method_15523 (J)V + METHOD method_15523 onLightArrayCreated (J)V ARG 1 blockPos - METHOD method_15524 hasChunk (J)Z - ARG 1 chunkPos + METHOD method_15524 hasLight (J)Z + ARG 1 sectionPos METHOD method_15525 set (JI)V ARG 1 blockPos ARG 3 value - METHOD method_15526 scheduleChunkLightUpdate (JZ)V - ARG 1 chunkBlockPos - ARG 3 isEmpty - METHOD method_15527 processUpdates (Lnet/minecraft/class_3558;ZZ)V + METHOD method_15526 updateSectionStatus (JZ)V + ARG 1 pos + ARG 3 empty + METHOD method_15527 updateLightArrays (Lnet/minecraft/class_3558;ZZ)V ARG 1 lightProvider ARG 2 doSkylight - ARG 3 doEdgeLightPropagation + ARG 3 skipEdgeLightPropagation METHOD method_15528 hasLightUpdates ()Z - METHOD method_15529 getDataForChunk (J)Lnet/minecraft/class_2804; + METHOD method_15529 createLightArray (J)Lnet/minecraft/class_2804; + ARG 1 pos METHOD method_15530 notifyChunkProvider ()V - METHOD method_15532 scheduleToUpdate (JLnet/minecraft/class_2804;)V - ARG 1 blockChunkPos + METHOD method_15532 setLightArray (JLnet/minecraft/class_2804;)V + ARG 1 pos ARG 3 array - METHOD method_15533 getDataForChunk (Lnet/minecraft/class_3556;J)Lnet/minecraft/class_2804; + METHOD method_15533 getLightArray (Lnet/minecraft/class_3556;J)Lnet/minecraft/class_2804; ARG 1 storage - ARG 2 chunkPos + ARG 2 sectionPos METHOD method_15534 onChunkRemoved (J)V METHOD method_15536 removeChunkData (Lnet/minecraft/class_3558;J)V ARG 1 storage diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index 95058252e9..e622cb9472 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -5,14 +5,20 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider ARG 1 chunkProvider ARG 2 hasBlockLight ARG 3 hasSkyLight - METHOD method_15557 suppressLight (Lnet/minecraft/class_1923;Z)V + METHOD method_15557 setLightEnabled (Lnet/minecraft/class_1923;Z)V + ARG 1 pos + ARG 2 lightEnabled METHOD method_15558 queueData (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;Lnet/minecraft/class_2804;)V ARG 1 lightType - METHOD method_15559 enqueueLightUpdate (Lnet/minecraft/class_2338;)V + METHOD method_15559 checkBlock (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_15560 (Lnet/minecraft/class_2338;I)V + METHOD method_15560 addLightSource (Lnet/minecraft/class_2338;I)V ARG 1 pos + ARG 2 level METHOD method_15561 hasUpdates ()Z METHOD method_15562 get (Lnet/minecraft/class_1944;)Lnet/minecraft/class_3562; + ARG 1 lightType METHOD method_15563 doLightUpdates (IZZ)I ARG 1 maxUpdateCount + ARG 2 doSkylight + ARG 3 skipEdgeLightPropagation diff --git a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping index 1f69b120e5..e4ff2dd89b 100644 --- a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3569 net/minecraft/world/chunk/light/SkyLightStorage CLASS class_3570 Data FIELD field_15821 heightMap Lit/unimi/dsi/fastutil/longs/Long2IntOpenHashMap; FIELD field_15822 defaultHeight I - FIELD field_15818 DIRECTIONS_SKYLIGHT [Lnet/minecraft/class_2350; + FIELD field_15818 LIGHT_REDUCTION_DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_15819 hasSkyLightUpdates Z METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider diff --git a/mappings/net/minecraft/world/dimension/Dimension.mapping b/mappings/net/minecraft/world/dimension/Dimension.mapping index 92c99b263f..b53bc25166 100644 --- a/mappings/net/minecraft/world/dimension/Dimension.mapping +++ b/mappings/net/minecraft/world/dimension/Dimension.mapping @@ -27,9 +27,9 @@ CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension METHOD method_12452 getSpawningBlockInChunk (Lnet/minecraft/class_1923;Z)Lnet/minecraft/class_2338; ARG 1 chunkPos ARG 2 checkMobSpawnValidity - METHOD method_12453 shouldRenderFog (II)Z - ARG 1 entityX - ARG 2 entityZ + METHOD method_12453 isFogThick (II)Z + ARG 1 x + ARG 2 z METHOD method_12454 getMoonPhase (J)I ARG 1 time METHOD method_12455 getCloudHeight ()F @@ -41,7 +41,7 @@ CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension METHOD method_12463 createWorldBorder ()Lnet/minecraft/class_2784; METHOD method_12464 getSkyAngle (JF)F ARG 1 timeOfDay - ARG 3 delta + ARG 3 tickDelta METHOD method_12465 doesWaterVaporize ()Z METHOD method_12466 getForcedSpawnPoint ()Lnet/minecraft/class_2338; METHOD method_12467 isNether ()Z diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 9c6830e961..4025581b00 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -18,7 +18,8 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 0 id ARG 1 dimension METHOD method_12487 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_2869; - METHOD method_12488 getFile (Ljava/io/File;)Ljava/io/File; + METHOD method_12488 getSaveDirectory (Ljava/io/File;)Ljava/io/File; + ARG 1 root METHOD method_12489 getSuffix ()Ljava/lang/String; METHOD method_12490 byRawId (I)Lnet/minecraft/class_2874; METHOD method_12491 hasSkyLight ()Z diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index c56e781d9c..cc0fbe5fb7 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -39,8 +39,8 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver METHOD method_12707 canCarveBranch (IIDDIIF)Z ARG 1 mainChunkX ARG 2 mainChunkZ - ARG 3 relativeX - ARG 5 relativeZ + ARG 3 x + ARG 5 z ARG 7 branch ARG 8 branchCount ARG 9 baseWidth diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 99253fe475..d6fbb8e81a 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_12097 hasStructure (Lnet/minecraft/class_1959;Lnet/minecraft/class_3195;)Z METHOD method_12098 getBiomeSource ()Lnet/minecraft/class_1966; METHOD method_12099 spawnEntities (Lnet/minecraft/class_3218;ZZ)V + ARG 1 world ARG 2 spawnMonsters ARG 3 spawnAnimals METHOD method_12100 getSpawnHeight ()I diff --git a/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping index fafe868981..b788d62a8a 100644 --- a/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping @@ -1,6 +1,6 @@ -CLASS net/minecraft/class_3267 net/minecraft/world/gen/decorator/ChanceDecoratorConfig - FIELD field_14192 chance I +CLASS net/minecraft/class_3297 net/minecraft/world/gen/decorator/ChanceDecoratorConfig + FIELD field_14289 chance I METHOD (I)V ARG 1 chance - METHOD method_14415 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3267; + METHOD method_14479 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3297; ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/LakeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/LakeDecoratorConfig.mapping deleted file mode 100644 index 39516e350f..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/LakeDecoratorConfig.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_3297 net/minecraft/world/gen/decorator/LakeDecoratorConfig - FIELD field_14289 chance I - METHOD (I)V - ARG 1 chance - METHOD method_14479 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3297; - ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping similarity index 77% rename from mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping rename to mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping index 6bdf2b23f8..523fa18366 100644 --- a/mappings/net/minecraft/world/gen/decorator/LakeLakeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_3293 net/minecraft/world/gen/decorator/LakeLakeDecorator +CLASS net/minecraft/class_3293 net/minecraft/world/gen/decorator/LavaLakeDecorator diff --git a/mappings/net/minecraft/world/gen/feature/BushFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping similarity index 71% rename from mappings/net/minecraft/world/gen/feature/BushFeatureConfig.mapping rename to mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping index 3480a26db3..221eb72f13 100644 --- a/mappings/net/minecraft/world/gen/feature/BushFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SingleStateFeatureConfig.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2963 net/minecraft/world/gen/feature/BushFeatureConfig +CLASS net/minecraft/class_2963 net/minecraft/world/gen/feature/SingleStateFeatureConfig FIELD field_13356 state Lnet/minecraft/class_2680; METHOD (Lnet/minecraft/class_2680;)V ARG 1 state diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/DefaultSurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/DefaultSurfaceBuilder.mapping index c184bdfdd7..6e0a2c8ad3 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/DefaultSurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/DefaultSurfaceBuilder.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3510 net/minecraft/world/gen/surfacebuilder/DefaultSur ARG 3 biome ARG 4 x ARG 5 z - ARG 6 worldHeight + ARG 6 height ARG 7 noise ARG 9 defaultBlock ARG 10 fluidBlock diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index a5ebad8ff8..aa6ee9b649 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -33,7 +33,7 @@ CLASS net/minecraft/class_3523 net/minecraft/world/gen/surfacebuilder/SurfaceBui ARG 3 biome ARG 4 x ARG 5 z - ARG 6 worldHeight + ARG 6 height ARG 7 noise ARG 9 defaultBlock ARG 10 defaultFluid diff --git a/mappings/net/minecraft/world/level/LevelGeneratorType.mapping b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping index 2d38e70f22..a76f257cf2 100644 --- a/mappings/net/minecraft/world/level/LevelGeneratorType.mapping +++ b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping @@ -33,6 +33,7 @@ CLASS net/minecraft/class_1942 net/minecraft/world/level/LevelGeneratorType METHOD method_8631 setCustomizable (Z)Lnet/minecraft/class_1942; ARG 1 customizable METHOD method_8632 getTypeForVersion (I)Lnet/minecraft/class_1942; + ARG 1 version METHOD method_8633 setVisible (Z)Lnet/minecraft/class_1942; ARG 1 visible METHOD method_8634 setVersioned ()Lnet/minecraft/class_1942; diff --git a/mappings/net/minecraft/world/loot/LootTableRanges.mapping b/mappings/net/minecraft/world/loot/LootTableRanges.mapping deleted file mode 100644 index 5f0f0bb01c..0000000000 --- a/mappings/net/minecraft/world/loot/LootTableRanges.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_63 net/minecraft/world/loot/LootTableRanges - FIELD field_978 types Ljava/util/Map; - METHOD method_383 deserialize (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_59; - ARG 0 json - ARG 1 context - METHOD method_384 serialize (Lnet/minecraft/class_59;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 0 range - ARG 1 context diff --git a/mappings/net/minecraft/village/PointOfInterest.mapping b/mappings/net/minecraft/world/poi/PointOfInterest.mapping similarity index 92% rename from mappings/net/minecraft/village/PointOfInterest.mapping rename to mappings/net/minecraft/world/poi/PointOfInterest.mapping index e77084ca2e..ca76bced92 100644 --- a/mappings/net/minecraft/village/PointOfInterest.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterest.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4156 net/minecraft/village/PointOfInterest +CLASS net/minecraft/class_4156 net/minecraft/world/poi/PointOfInterest FIELD field_18492 pos Lnet/minecraft/class_2338; FIELD field_18493 type Lnet/minecraft/class_4158; FIELD field_18494 freeTickets I diff --git a/mappings/net/minecraft/village/PointOfInterestSet.mapping b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping similarity index 91% rename from mappings/net/minecraft/village/PointOfInterestSet.mapping rename to mappings/net/minecraft/world/poi/PointOfInterestSet.mapping index 9a054db11c..ad393cbb04 100644 --- a/mappings/net/minecraft/village/PointOfInterestSet.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4157 net/minecraft/village/PointOfInterestSet +CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet FIELD field_18496 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_18497 pointsOfInterestByPos Lit/unimi/dsi/fastutil/shorts/Short2ObjectMap; FIELD field_18498 pointsOfInterestByType Ljava/util/Map; @@ -9,6 +9,8 @@ CLASS net/minecraft/class_4157 net/minecraft/village/PointOfInterestSet METHOD method_19145 remove (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_19146 add (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V + ARG 1 pos + ARG 2 type METHOD method_19147 test (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z ARG 1 pos ARG 2 predicate diff --git a/mappings/net/minecraft/village/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping similarity index 95% rename from mappings/net/minecraft/village/PointOfInterestStorage.mapping rename to mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index 0580a04a7a..e747125683 100644 --- a/mappings/net/minecraft/village/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4153 net/minecraft/village/PointOfInterestStorage +CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage CLASS class_4154 PointOfInterestDistanceTracker FIELD field_18486 distances Lit/unimi/dsi/fastutil/longs/Long2ByteMap; METHOD method_19134 update ()V @@ -36,7 +36,10 @@ CLASS net/minecraft/class_4153 net/minecraft/village/PointOfInterestStorage ARG 4 radius METHOD method_19127 getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/Optional; ARG 1 typePredicate + ARG 2 posPredicate + ARG 3 pos ARG 4 radius + ARG 5 occupationStatus METHOD method_19129 releaseTicket (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_19132 getType (Lnet/minecraft/class_2338;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/village/PointOfInterestType.mapping b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping similarity index 89% rename from mappings/net/minecraft/village/PointOfInterestType.mapping rename to mappings/net/minecraft/world/poi/PointOfInterestType.mapping index 8f4f7efc09..65cf05a97a 100644 --- a/mappings/net/minecraft/village/PointOfInterestType.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4158 net/minecraft/village/PointOfInterestType +CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType FIELD field_18500 IS_USED_BY_PROFESSION Ljava/util/function/Predicate; FIELD field_18501 ALWAYS_TRUE Ljava/util/function/Predicate; FIELD field_18519 id Ljava/lang/String; @@ -6,15 +6,17 @@ CLASS net/minecraft/class_4158 net/minecraft/village/PointOfInterestType FIELD field_18522 sound Lnet/minecraft/class_3414; FIELD field_18523 completionCondition Ljava/util/function/Predicate; FIELD field_18849 BLOCK_STATE_TO_POINT_OF_INTEREST_TYPE Ljava/util/Map; - FIELD field_18850 workStationStates Ljava/util/Set; + FIELD field_18850 blockStates Ljava/util/Set; FIELD field_19227 BED_STATES Ljava/util/Set; METHOD method_19161 getTicketCount ()I METHOD method_19164 getCompletionCondition ()Ljava/util/function/Predicate; METHOD method_19166 getSound ()Lnet/minecraft/class_3414; METHOD method_19516 from (Lnet/minecraft/class_2680;)Ljava/util/Optional; + ARG 0 state METHOD method_19518 getAllAssociatedStates ()Ljava/util/stream/Stream; METHOD method_20354 setup (Lnet/minecraft/class_4158;)Lnet/minecraft/class_4158; METHOD method_20356 getAllStatesOf (Lnet/minecraft/class_2248;)Ljava/util/Set; + ARG 0 block METHOD method_20357 register (Ljava/lang/String;Ljava/util/Set;ILnet/minecraft/class_3414;I)Lnet/minecraft/class_4158; ARG 0 id METHOD method_20358 register (Ljava/lang/String;Ljava/util/Set;ILnet/minecraft/class_3414;Ljava/util/function/Predicate;I)Lnet/minecraft/class_4158; diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index 9c595491f7..6ec1e0d7ac 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile FIELD field_13029 offsets [I FIELD field_13030 sectorFree Ljava/util/List; FIELD field_13031 EMPTY_SECTOR [B - METHOD method_12419 getOffset (Lnet/minecraft/class_1923;)I + METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I ARG 1 pos METHOD method_12420 isChunkPresent (Lnet/minecraft/class_1923;)Z ARG 1 pos @@ -21,5 +21,5 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile METHOD method_12425 getChunkDataOutputStream (Lnet/minecraft/class_1923;)Ljava/io/DataOutputStream; METHOD method_12427 setTimestamp (Lnet/minecraft/class_1923;I)V METHOD method_12428 write (Lnet/minecraft/class_1923;[BI)V - METHOD method_17909 getPackedRegionRelativePosition (Lnet/minecraft/class_1923;)I + METHOD method_17909 getIndex (Lnet/minecraft/class_1923;)I ARG 1 pos diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index d2122434a7..a7fe9b8656 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 1 pos METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V METHOD method_19290 tick (Ljava/util/function/BooleanSupplier;)V + ARG 1 shouldKeepTicking METHOD method_19291 onLoad (J)V ARG 1 pos METHOD method_19292 isPosInvalid (Lnet/minecraft/class_4076;)Z diff --git a/mappings/net/minecraft/world/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping similarity index 83% rename from mappings/net/minecraft/world/VersionedChunkStorage.mapping rename to mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index 2308a2b79c..9bc6cf79be 100644 --- a/mappings/net/minecraft/world/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3977 net/minecraft/world/VersionedChunkStorage +CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage FIELD field_17654 featureUpdater Lnet/minecraft/class_3360; FIELD field_17655 dataFixer Lcom/mojang/datafixers/DataFixer; METHOD method_17907 updateChunkTag (Lnet/minecraft/class_2874;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;