diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java index 979ea47314..c7ffe30399 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/NameProposalConfig.java @@ -34,6 +34,7 @@ public record NameProposalConfig(FieldNameProvider fieldNameProvider) { // trusted owners, currently for most IDs private static final Set TRUSTED_ID_OWNERS = Set.of( + "net/minecraft/class_2498", "net/minecraft/class_3612", "net/minecraft/class_8057", "net/minecraft/class_8173", @@ -73,6 +74,7 @@ public record NameProposalConfig(FieldNameProvider fieldNameProvider) { case "method_1_4732" -> "MUSIC_DISC_" + name; case "method_1_4733" -> name + "_POTTERY_SHERD"; case "method_1_4735" -> name + "_SPAWN_EGG"; + case "method_1_11483", "method_1_11484", "method_1_11485" -> "BLOCK_SOUND_SET_" + name; default -> name; }), // Results of BlockItemTagKey#{block, item} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c75..d997cfc60f 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 c61a118f7d..1a31fd1b83 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index ef07e0162b..739907dfd1 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac207..c4bdd3ab8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index dc3c5123b5..53566d6ef7 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block COMMENT COMMENT @see AbstractBlock COMMENT @see BlockState + FIELD field_1_10568 BY_ID_PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_10638 LOGGER Lorg/slf4j/Logger; FIELD field_10646 defaultState Lnet/minecraft/class_2680; FIELD field_10647 stateManager Lnet/minecraft/class_2689; @@ -183,6 +184,8 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block COMMENT @see #onBroken COMMENT @see AbstractBlock#onStacksDropped COMMENT @see AbstractBlock#onStateReplaced + ARG 1 world + ARG 2 player ARG 3 pos ARG 4 state ARG 5 blockEntity @@ -450,7 +453,9 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_72546 generateBlockInteractLoot (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2586;Lnet/minecraft/class_1_96;Lnet/minecraft/class_1297;Ljava/util/function/BiConsumer;)Z ARG 0 world ARG 1 lootTable + ARG 2 pos ARG 3 state + ARG 4 blockEntity ARG 5 tool ARG 6 interactingEntity ARG 7 lootConsumer diff --git a/mappings/net/minecraft/block/BlockSoundSet.mapping b/mappings/net/minecraft/block/BlockSoundSet.mapping index b67b446653..6a6409ae82 100644 --- a/mappings/net/minecraft/block/BlockSoundSet.mapping +++ b/mappings/net/minecraft/block/BlockSoundSet.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_1_1769 net/minecraft/block/BlockSoundSet FIELD field_1_11521 EMPTY Lnet/minecraft/class_1_1769; + METHOD (FFLnet/minecraft/class_1_1844;)V + ARG 1 volume + ARG 2 pitch + ARG 3 sounds METHOD (FFLnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V ARG 1 volume ARG 2 pitch @@ -8,6 +12,8 @@ CLASS net/minecraft/class_1_1769 net/minecraft/block/BlockSoundSet ARG 5 placeSound ARG 6 hitSound ARG 7 fallSound + METHOD (Lnet/minecraft/class_1_1844;)V + ARG 1 sounds METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V ARG 1 breakSound ARG 2 stepSound diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index d9d1b047b5..967eae13be 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -359,6 +359,11 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 state METHOD method_1_11041 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; ARG 0 settings + METHOD method_1_11490 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z + ARG 0 state + ARG 1 world + ARG 2 pos + ARG 3 entityType METHOD method_9492 register (Lnet/minecraft/class_1_784;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; ARG 0 key ARG 1 settings diff --git a/mappings/net/minecraft/block/BrittleIceBlock.mapping b/mappings/net/minecraft/block/BrittleIceBlock.mapping new file mode 100644 index 0000000000..49c33de1fc --- /dev/null +++ b/mappings/net/minecraft/block/BrittleIceBlock.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_1_1831 net/minecraft/block/BrittleIceBlock + FIELD field_1_11902 CRUMBLE_DELAY I + METHOD method_1_11539 isBrokenBy (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)Z + ARG 1 entity + ARG 2 pos diff --git a/mappings/net/minecraft/block/CrumblingIceBlock.mapping b/mappings/net/minecraft/block/CrumblingIceBlock.mapping new file mode 100644 index 0000000000..aa0c49ae6c --- /dev/null +++ b/mappings/net/minecraft/block/CrumblingIceBlock.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_1_1832 net/minecraft/block/CrumblingIceBlock + FIELD field_1_11905 AGE Lnet/minecraft/class_2758; + FIELD field_1_11906 MAX_AGE I + METHOD method_1_11542 getCrumblingSound ()Lnet/minecraft/class_3414; + METHOD method_1_11543 getCrumbleDelay (Lnet/minecraft/class_5819;)I + ARG 1 random + METHOD method_1_11544 onAdvanceAge (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 state + ARG 2 world + ARG 3 pos + METHOD method_1_11545 crumble (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V + ARG 1 world + ARG 2 pos + ARG 3 random + METHOD method_1_11546 advanceAge (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + COMMENT {@return {@code true} if this block has melted completely} + ARG 1 state + ARG 2 world + ARG 3 pos diff --git a/mappings/net/minecraft/block/FluidBlock.mapping b/mappings/net/minecraft/block/FluidBlock.mapping index 9db1aa352f..428344dd20 100644 --- a/mappings/net/minecraft/block/FluidBlock.mapping +++ b/mappings/net/minecraft/block/FluidBlock.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2404 net/minecraft/block/FluidBlock + FIELD field_1_1009 BUBBLE_COLUMN_TICK_DELAY I FIELD field_11276 statesByLevel Ljava/util/List; FIELD field_11278 LEVEL Lnet/minecraft/class_2758; FIELD field_11279 fluid Lnet/minecraft/class_3609; diff --git a/mappings/net/minecraft/block/FluidFillable.mapping b/mappings/net/minecraft/block/FluidFillable.mapping index 96b6fc3fd3..2e9796515f 100644 --- a/mappings/net/minecraft/block/FluidFillable.mapping +++ b/mappings/net/minecraft/block/FluidFillable.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_2402 net/minecraft/block/FluidFillable METHOD method_10310 canFillWithFluid (Lnet/minecraft/class_1309;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z + ARG 1 user + ARG 2 world + ARG 3 pos + ARG 4 state + ARG 5 fluidState METHOD method_10311 tryFillWithFluid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/FrostedIceBlock.mapping b/mappings/net/minecraft/block/FrostedIceBlock.mapping index 1953c12da8..052b36136b 100644 --- a/mappings/net/minecraft/block/FrostedIceBlock.mapping +++ b/mappings/net/minecraft/block/FrostedIceBlock.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_2360 net/minecraft/block/FrostedIceBlock + FIELD field_1_11903 CRUMBLE_MAX_DELAY I + FIELD field_1_11904 CRUMBLE_MIN_DELAY I FIELD field_31097 NEIGHBORS_CHECKED_ON_SCHEDULED_TICK I FIELD field_31098 NEIGHBORS_CHECKED_ON_NEIGHBOR_UPDATE I + METHOD method_1_11540 shouldStartCrumbling (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 random METHOD method_10202 canMelt (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;I)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/JukeboxBlock.mapping b/mappings/net/minecraft/block/JukeboxBlock.mapping index b5d30bf434..34f3cf3e6f 100644 --- a/mappings/net/minecraft/block/JukeboxBlock.mapping +++ b/mappings/net/minecraft/block/JukeboxBlock.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_2387 net/minecraft/block/JukeboxBlock + FIELD field_1_11899 PLAYLIST_MODE Lnet/minecraft/class_2746; FIELD field_11180 HAS_RECORD Lnet/minecraft/class_2746; diff --git a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping index 8151272243..c19807fa1d 100644 --- a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_2619 net/minecraft/block/entity/JukeboxBlockEntity + FIELD field_1_11929 PLAYLIST_POSITION_INDEX I + FIELD field_1_11930 PLAYLIST_POSITION_DEFAULT I + FIELD field_1_11931 PLAYLIST_POSITION_COUNT I + FIELD field_1_11932 PLAYLIST_POSITION_KEY Ljava/lang/String; + FIELD field_1_11933 propertyDelegate Lnet/minecraft/class_3913; + FIELD field_1_11934 playlistPosition Ljava/util/OptionalInt; FIELD field_46507 recordStack Lnet/minecraft/class_1799; FIELD field_52064 RECORD_ITEM_NBT_KEY Ljava/lang/String; FIELD field_52065 TICKS_SINCE_SONG_STARTED_NBT_KEY Ljava/lang/String; @@ -6,6 +12,32 @@ CLASS net/minecraft/class_2619 net/minecraft/block/entity/JukeboxBlockEntity METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state + METHOD method_1_11634 swapDiscs (Lnet/minecraft/class_1263;I)V + ARG 1 containerInventory + ARG 2 slot + METHOD method_1_11635 createScreenHandlerForContainer (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;)Lnet/minecraft/class_1703; + ARG 1 syncId + ARG 2 playerInventory + ARG 3 containerInventory + METHOD method_1_11636 getNextSlot (Lnet/minecraft/class_1263;I)Ljava/util/OptionalInt; + ARG 0 containerInventory + ARG 1 playlistPosition + METHOD method_1_11637 isBelowJukeboxContainer (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos + METHOD method_1_11638 isPlayable (Lnet/minecraft/class_1799;)Z + ARG 0 stack + METHOD method_1_11639 (Lnet/minecraft/class_1263;I)V + ARG 2 playlistPosition + METHOD method_1_11641 playCurrentDisc ()V + METHOD method_1_11642 shouldRaiseNoteParticles ()Z + METHOD method_1_11643 tickWithPlaylist (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2619;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 blockEntity + METHOD method_1_11644 playNextEntry (Z)V + ARG 1 playCurrentDisc METHOD method_44370 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2619;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/jukebox/JukeboxManager.mapping b/mappings/net/minecraft/block/jukebox/JukeboxManager.mapping index 3766cf732f..8542592b59 100644 --- a/mappings/net/minecraft/block/jukebox/JukeboxManager.mapping +++ b/mappings/net/minecraft/block/jukebox/JukeboxManager.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_9794 net/minecraft/block/jukebox/JukeboxManager + FIELD field_1_11895 raisedPredicate Ljava/util/function/BooleanSupplier; FIELD field_52032 TICKS_PER_SECOND I FIELD field_52033 ticksSinceSongStarted J FIELD field_52034 song Lnet/minecraft/class_6880; @@ -7,6 +8,7 @@ CLASS net/minecraft/class_9794 net/minecraft/block/jukebox/JukeboxManager METHOD (Lnet/minecraft/class_9794$class_9795;Lnet/minecraft/class_2338;Ljava/util/function/BooleanSupplier;)V ARG 1 changeNotifier ARG 2 pos + ARG 3 raisedPredicate METHOD method_60754 isPlaying ()Z METHOD method_60755 stopPlaying (Lnet/minecraft/class_1936;Lnet/minecraft/class_2680;)V ARG 1 world diff --git a/mappings/net/minecraft/class_1_1825.mapping b/mappings/net/minecraft/class_1_1825.mapping deleted file mode 100644 index aad4968a9d..0000000000 --- a/mappings/net/minecraft/class_1_1825.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1_1825 - METHOD method_76103 getSaddleSound ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/class_1_1840.mapping b/mappings/net/minecraft/class_1_1840.mapping deleted file mode 100644 index c5b2a69144..0000000000 --- a/mappings/net/minecraft/class_1_1840.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1_1840 - METHOD method_5022 rename (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 2ea5a8000f..fed6a10fa2 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -218,6 +218,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1_6371 toggleFullscreen ()V METHOD method_1_6428 getPaletteManager ()Lnet/minecraft/class_1_1126; METHOD method_1_11012 getGameProfileResolver ()Lnet/minecraft/class_11755; + METHOD method_1_11478 showWindow ()V METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_1479 getResourcePackDir ()Ljava/nio/file/Path; METHOD method_1481 joinWorld (Lnet/minecraft/class_638;)V diff --git a/mappings/net/minecraft/client/gui/Click.mapping b/mappings/net/minecraft/client/gui/Click.mapping index 65ac5ac6f5..a2cfbb99e9 100644 --- a/mappings/net/minecraft/client/gui/Click.mapping +++ b/mappings/net/minecraft/client/gui/Click.mapping @@ -1,2 +1,7 @@ CLASS net/minecraft/class_11909 net/minecraft/client/gui/Click + METHOD method_1_11514 isLeftClick ()Z + METHOD method_1_11515 isMiddleClick ()Z + METHOD method_1_11516 isSide1Click ()Z + METHOD method_1_11517 isSide2Click ()Z + METHOD method_1_11518 isRightClick ()Z METHOD method_74245 button ()I diff --git a/mappings/net/minecraft/client/gui/hud/debug/DebugHudEntries.mapping b/mappings/net/minecraft/client/gui/hud/debug/DebugHudEntries.mapping index db9f13ec9a..a7226a4390 100644 --- a/mappings/net/minecraft/client/gui/hud/debug/DebugHudEntries.mapping +++ b/mappings/net/minecraft/client/gui/hud/debug/DebugHudEntries.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_11631 net/minecraft/client/gui/hud/debug/DebugHudEntries FIELD field_61557 PROFILES Ljava/util/Map; FIELD field_61583 THREE_DIMENSIONAL_CROSSHAIR Lnet/minecraft/class_5321; - METHOD method_72764 registerVanilla (Ljava/lang/String;)Lnet/minecraft/class_5321; + METHOD method_1_11683 register (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 registry + METHOD method_72764 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 path diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping index 62c3d7d7d2..81cedb0702 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_7743 net/minecraft/client/gui/screen/ingame/AbstractSi FIELD field_1_9275 NUM_LINES I FIELD field_1_9276 side Lnet/minecraft/class_1_1337; FIELD field_1_9277 color I + FIELD field_1_11954 body Lnet/minecraft/class_8667; + FIELD field_1_11955 root Lnet/minecraft/class_8132; + FIELD field_1_11956 lines [Lnet/minecraft/class_7743$class_1_1846; FIELD field_40424 blockEntity Lnet/minecraft/class_2625; FIELD field_40425 messages [Ljava/lang/String; FIELD field_40426 signType Lnet/minecraft/class_4719; @@ -15,6 +18,16 @@ CLASS net/minecraft/class_7743 net/minecraft/client/gui/screen/ingame/AbstractSi ARG 2 side ARG 3 filtered ARG 4 title + METHOD method_1_11696 getLineWidth (Ljava/lang/String;)I + ARG 1 message + METHOD method_1_11697 getLineHeight ()I + METHOD method_1_11698 (Ljava/lang/String;I)Lnet/minecraft/class_5481; + ARG 0 string + ARG 1 firstCharacterIndex + METHOD method_1_11699 (ILjava/lang/String;)V + ARG 2 string + METHOD method_1_11700 (Lnet/minecraft/class_7743;Lnet/minecraft/class_339;)V + ARG 1 child METHOD method_45656 renderSignBackground (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_45657 (Lnet/minecraft/class_4185;)V @@ -22,5 +35,10 @@ CLASS net/minecraft/class_7743 net/minecraft/client/gui/screen/ingame/AbstractSi METHOD method_45662 finishEditing ()V METHOD method_49912 canEdit ()Z METHOD method_49913 setCurrentRowMessage (ILjava/lang/String;)V + ARG 1 row ARG 2 message METHOD method_70927 getYOffset ()I + CLASS class_1_1846 Line + METHOD (Lnet/minecraft/class_7743;II)V + ARG 2 width + ARG 3 height diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping index 4d952b68c2..06350570f5 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_3929 net/minecraft/client/gui/screen/ingame/HandledScreens FIELD field_17408 LOGGER Lorg/slf4j/Logger; + METHOD method_1_11521 register (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3929$class_3930; + ARG 0 registry + METHOD method_1_11523 getKey (Lnet/minecraft/class_3917;)Lnet/minecraft/class_5321; + ARG 0 type METHOD method_17539 isMissingScreens ()Z METHOD method_17540 getProvider (Lnet/minecraft/class_3917;)Lnet/minecraft/class_3929$class_3930; ARG 0 type @@ -9,6 +13,7 @@ CLASS net/minecraft/class_3929 net/minecraft/client/gui/screen/ingame/HandledScr ARG 2 id ARG 3 title METHOD method_17542 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_3917;Lnet/minecraft/class_3929$class_3930;)Lnet/minecraft/class_3929$class_3930; + ARG 0 registry ARG 1 type ARG 2 provider CLASS class_3930 Provider diff --git a/mappings/net/minecraft/client/gui/screen/ingame/JukeboxScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/JukeboxScreen.mapping new file mode 100644 index 0000000000..91d1294cfc --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/JukeboxScreen.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1_1839 net/minecraft/client/gui/screen/ingame/JukeboxScreen + FIELD field_1_11924 PLAYING_NEXT_TEXT Lnet/minecraft/class_2561; + FIELD field_1_11925 screenHandler Lnet/minecraft/class_1_1827; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping index 6147b02430..9b72c9f78d 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_498 net/minecraft/client/gui/screen/ingame/SignEditScreen + FIELD field_1_6731 texture Lnet/minecraft/class_2960; + FIELD field_1_7018 textureHeight I FIELD field_40436 BACKGROUND_SCALE F METHOD (Lnet/minecraft/class_2625;Lnet/minecraft/class_1_1337;Z)V ARG 1 sign diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index f8d3ed104e..d0ff33c9d2 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -89,6 +89,8 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid METHOD method_35740 getLevelDisplayName ()Ljava/lang/String; METHOD method_52205 loadIcon ()V METHOD method_52265 validateIconPath (Lnet/minecraft/class_310;Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 0 client + ARG 1 path METHOD method_54628 (Lnet/minecraft/class_32$class_5143;Z)V ARG 2 edited METHOD method_73465 allowConfirmationByKeyboard ()Z diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index 077a395562..dae6d98a6c 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget FIELD field_1_2068 preEditWidget Lnet/minecraft/class_1_374; + FIELD field_1_11897 maxWidth I FIELD field_2088 changedListener Ljava/util/function/Consumer; FIELD field_2092 text Ljava/lang/String; FIELD field_2094 editable Z @@ -49,6 +50,10 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;)V ARG 1 textRenderer ARG 2 text + METHOD method_1_11512 canSetText (Ljava/lang/String;)Z + ARG 1 text + METHOD method_1_11513 setMaxWidth (I)V + ARG 1 maxWidth METHOD method_1851 drawsBackground ()Z METHOD method_1852 setText (Ljava/lang/String;)V ARG 1 text diff --git a/mappings/net/minecraft/client/input/MouseInput.mapping b/mappings/net/minecraft/client/input/MouseInput.mapping index 37433dbbce..3b80fc56ea 100644 --- a/mappings/net/minecraft/client/input/MouseInput.mapping +++ b/mappings/net/minecraft/client/input/MouseInput.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_11910 net/minecraft/client/input/MouseInput FIELD comp_4801 button I METHOD comp_4801 button ()I + METHOD method_1_11506 isLeftClick ()Z + METHOD method_1_11507 isMiddleClick ()Z + METHOD method_1_11508 isSide1Click ()Z + METHOD method_1_11509 isSide2Click ()Z + METHOD method_1_11510 isRightClick ()Z CLASS class_12147 MouseAction CLASS class_12148 ButtonCode diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 056bd13e3b..8265f43194 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -355,7 +355,11 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 vlaue METHOD method_1_9160 getQuitShortcuts ()Lnet/minecraft/class_7172; METHOD method_1_9759 getCtrlClickEmulatesRightClick ()Lnet/minecraft/class_7172; + METHOD method_1_10223 (Ljava/lang/Boolean;)V + ARG 0 value METHOD method_1_10224 getMacFullscreenMenuVisibility ()Lnet/minecraft/class_7172; + METHOD method_1_11010 (Lnet/minecraft/class_7172$class_7173;)Lnet/minecraft/class_7172$class_1_1729; + ARG 0 callbacks METHOD method_1626 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_1627 addResourcePackProfilesToManager (Lnet/minecraft/class_3283;)V diff --git a/mappings/net/minecraft/client/option/SharePresence.mapping b/mappings/net/minecraft/client/option/SharePresence.mapping index 8dce485f43..b2fa6da1f1 100644 --- a/mappings/net/minecraft/client/option/SharePresence.mapping +++ b/mappings/net/minecraft/client/option/SharePresence.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/class_1_904 net/minecraft/client/option/SharePresence FIELD field_1_6390 name Ljava/lang/String; FIELD field_1_6391 tooltipTranslationKey Lnet/minecraft/class_2561; FIELD field_1_6392 translationKey Lnet/minecraft/class_2561; + FIELD field_1_11108 buttonIcon Lnet/minecraft/class_1_1783; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_1_5485 getTooltipText ()Lnet/minecraft/class_2561; METHOD method_1_5486 getText ()Lnet/minecraft/class_2561; + METHOD method_1_11034 getButtonIcon ()Lnet/minecraft/class_1_1783; diff --git a/mappings/net/minecraft/client/particle/ParticleSpriteManager.mapping b/mappings/net/minecraft/client/particle/ParticleSpriteManager.mapping index fc93fd14f3..8e3b63e3b8 100644 --- a/mappings/net/minecraft/client/particle/ParticleSpriteManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleSpriteManager.mapping @@ -1,10 +1,18 @@ CLASS net/minecraft/class_11939 net/minecraft/client/particle/ParticleSpriteManager + FIELD field_1_11900 SPRITE_PROVIDERS_BY_TYPE Ljava/util/Map; FIELD field_62625 LOGGER Lorg/slf4j/Logger; FIELD field_62626 PARTICLE_RESOURCE_FINDER Lnet/minecraft/class_7654; - FIELD field_62628 particleFactories Ljava/util/Map; + FIELD field_62628 PARTICLE_FACTORIES Ljava/util/Map; FIELD field_62629 onPreparedTask Ljava/lang/Runnable; + METHOD method_1_11533 getParticleFactoriesByType ()Ljava/util/Map; + METHOD method_1_11536 getKey (Lnet/minecraft/class_2396;)Lnet/minecraft/class_5321; + ARG 0 particleType + METHOD method_1_11537 getKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; + ARG 0 particleType METHOD method_74292 getParticleFactories (Lnet/minecraft/class_2394;)Lnet/minecraft/class_707; + ARG 1 effect METHOD method_74293 load (Lnet/minecraft/class_5321;Lnet/minecraft/class_3298;)Ljava/util/Optional; + ARG 1 key ARG 2 resource METHOD method_74295 (Lnet/minecraft/class_7766$class_7767;Ljava/util/Set;Lnet/minecraft/class_1058;Lnet/minecraft/class_11939$class_7759;)V ARG 3 reloadResult @@ -16,12 +24,15 @@ CLASS net/minecraft/class_11939 net/minecraft/client/particle/ParticleSpriteMana METHOD method_74299 (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; ARG 2 resources METHOD method_74300 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2396;Lnet/minecraft/class_707;)Lnet/minecraft/class_707; + ARG 0 registry ARG 1 type ARG 2 factory METHOD method_74301 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2396;Lnet/minecraft/class_11939$class_4091;)Lnet/minecraft/class_707; + ARG 0 registry ARG 1 type ARG 2 factory - METHOD method_74302 init (Lnet/minecraft/class_2378;)Lnet/minecraft/class_707; + METHOD method_74302 register (Lnet/minecraft/class_2378;)Lnet/minecraft/class_707; + ARG 0 registry CLASS class_4090 SimpleSpriteProvider FIELD field_18303 sprites Ljava/util/List; METHOD method_18838 setSprites (Ljava/util/List;)V diff --git a/mappings/net/minecraft/client/registry/ClientRegistries.mapping b/mappings/net/minecraft/client/registry/ClientRegistries.mapping new file mode 100644 index 0000000000..fe9e241623 --- /dev/null +++ b/mappings/net/minecraft/client/registry/ClientRegistries.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_1_1845 net/minecraft/client/registry/ClientRegistries + FIELD field_1_11944 BLOCK_ENTITY_RENDERER Lnet/minecraft/class_2378; + FIELD field_1_11945 ROOT Lnet/minecraft/class_1_1834; + FIELD field_1_11946 DEBUG_SCREEN_ENTRY Lnet/minecraft/class_2378; + FIELD field_1_11947 ENTITY_RENDERER Lnet/minecraft/class_2378; + FIELD field_1_11948 MENU_SCREEN Lnet/minecraft/class_2378; + FIELD field_1_11949 PARTICLE_PROVIDER Lnet/minecraft/class_2378; + FIELD field_1_11950 REGISTRIES Lnet/minecraft/class_2378; + METHOD method_1_11682 bootstrap ()V diff --git a/mappings/net/minecraft/client/registry/ClientRegistryKeys.mapping b/mappings/net/minecraft/client/registry/ClientRegistryKeys.mapping new file mode 100644 index 0000000000..bd4b2acc4a --- /dev/null +++ b/mappings/net/minecraft/client/registry/ClientRegistryKeys.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_1_1836 net/minecraft/client/registry/ClientRegistryKeys + FIELD field_1_11917 ROOT Lnet/minecraft/class_2960; + METHOD method_1_11618 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 path diff --git a/mappings/net/minecraft/client/render/WorldExtractor.mapping b/mappings/net/minecraft/client/render/WorldExtractor.mapping index 53426bc46e..823586d40c 100644 --- a/mappings/net/minecraft/client/render/WorldExtractor.mapping +++ b/mappings/net/minecraft/client/render/WorldExtractor.mapping @@ -128,3 +128,13 @@ CLASS net/minecraft/class_1_816 net/minecraft/client/render/WorldExtractor ARG 1 fact METHOD method_1_10891 (Lnet/minecraft/class_846;Lnet/minecraft/class_1_1714;)V ARG 1 fact + METHOD method_1_11597 filterGizmos (Ljava/util/List;Z)Ljava/util/List; + ARG 0 gizmos + ARG 1 showEntityHitboxes + METHOD method_1_11598 (Lnet/minecraft/class_12185$class_12186;)Z + ARG 0 gizmo + METHOD method_1_11599 (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_1_11600 (Lnet/minecraft/class_746;Lnet/minecraft/class_238;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_7928; + ARG 3 pos + ARG 4 state diff --git a/mappings/net/minecraft/client/render/block/entity/AbstractSignBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/AbstractSignBlockEntityRenderer.mapping index b96b647c3c..ba7ee466fa 100644 --- a/mappings/net/minecraft/client/render/block/entity/AbstractSignBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/AbstractSignBlockEntityRenderer.mapping @@ -1,9 +1,13 @@ CLASS net/minecraft/class_10529 net/minecraft/client/render/block/entity/AbstractSignBlockEntityRenderer + FIELD field_1_10750 GLOWING_COLORS Lnet/minecraft/class_1_727; + FIELD field_1_10751 COLORS Lnet/minecraft/class_1_727; FIELD field_55506 GLOWING_BLACK_TEXT_COLOR I FIELD field_55507 MAX_COLORED_TEXT_OUTLINE_RENDER_DISTANCE I FIELD field_55508 textRenderer Lnet/minecraft/class_327; METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 context + METHOD method_1_10787 (Ljava/lang/Integer;)Ljava/lang/Integer; + ARG 0 color METHOD method_65819 (Lnet/minecraft/class_11971;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5481; ARG 2 textx METHOD method_65827 shouldRenderTextOutline (Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactories.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactories.mapping index ebbd49ed70..c30763cfda 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactories.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactories.mapping @@ -1,5 +1,23 @@ CLASS net/minecraft/class_5616 net/minecraft/client/render/block/entity/BlockEntityRendererFactories + METHOD method_1_11684 getKey (Lnet/minecraft/class_2591;)Lnet/minecraft/class_5321; + ARG 0 type + METHOD method_1_11685 register (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5614; + ARG 0 registry + METHOD method_1_11687 (Lnet/minecraft/class_5614$class_5615;)Lnet/minecraft/class_827; + ARG 0 ctx + METHOD method_1_11688 (Lnet/minecraft/class_5614$class_5615;)Lnet/minecraft/class_827; + ARG 0 ctx + METHOD method_1_11689 (Lnet/minecraft/class_5614$class_5615;)Lnet/minecraft/class_827; + ARG 0 ctx + METHOD method_1_11690 (Lnet/minecraft/class_5614$class_5615;)Lnet/minecraft/class_827; + ARG 0 ctx + METHOD method_1_11691 (Lnet/minecraft/class_5614$class_5615;)Lnet/minecraft/class_827; + ARG 0 ctx + METHOD method_1_11692 (Lnet/minecraft/class_5614$class_5615;)Lnet/minecraft/class_827; + ARG 0 ctx METHOD method_32144 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2591;Lnet/minecraft/class_5614;)Lnet/minecraft/class_5614; + ARG 0 registry ARG 1 type ARG 2 factory METHOD method_32146 reload (Lnet/minecraft/class_5614$class_5615;)Ljava/util/Map; + ARG 0 ctx diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 8bd43f66f0..03f83649d4 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -38,6 +38,8 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_1_342 OffsetGeometryBuffers CLASS class_1_343 GeometryBuffers CLASS class_851 BuiltChunk + FIELD field_1_11940 rebuildTask Ljava/util/concurrent/atomic/AtomicReference; + FIELD field_1_11941 sortTask Ljava/util/concurrent/atomic/AtomicReference; FIELD field_4458 boundingBox Lnet/minecraft/class_238; FIELD field_4467 origin Lnet/minecraft/class_2338$class_2339; FIELD field_29641 index I @@ -101,8 +103,11 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder FIELD field_54169 finished Z METHOD (Lnet/minecraft/class_846$class_851;Z)V ARG 2 prioritized + METHOD method_1_11663 markCancelled ()V + METHOD method_1_11664 run (Lnet/minecraft/class_750;)Lnet/minecraft/class_846$class_851$class_4577$class_4690; + ARG 1 buffers METHOD method_22782 cancel ()V - METHOD method_22783 run (Lnet/minecraft/class_750;)Lnet/minecraft/class_846$class_851$class_4577$class_4690; + METHOD method_22783 doRun (Lnet/minecraft/class_750;)Lnet/minecraft/class_846$class_851$class_4577$class_4690; ARG 1 buffers METHOD method_62976 isPrioritized ()Z METHOD method_62977 getOrigin ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index d4df927c0a..965d0c90a1 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -21,6 +21,10 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 3 tickProgress ARG 4 nameTagDistance ARG 6 belowNameDistance + METHOD method_1_11550 setNameplatePos (Lnet/minecraft/class_1297;Lnet/minecraft/class_10017;F)V + ARG 1 entity + ARG 2 state + ARG 3 tickProgress METHOD method_3921 hasLabel (Lnet/minecraft/class_1297;D)Z COMMENT Determines whether the passed entity should render with a nameplate above its head. COMMENT diff --git a/mappings/net/minecraft/client/render/entity/EntityRendererFactories.mapping b/mappings/net/minecraft/client/render/entity/EntityRendererFactories.mapping index 61a769e79b..e710c8cec9 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRendererFactories.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRendererFactories.mapping @@ -1,9 +1,102 @@ CLASS net/minecraft/class_5619 net/minecraft/client/render/entity/EntityRendererFactories FIELD field_27767 LOGGER Lorg/slf4j/Logger; + METHOD method_1_11551 register (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5617; + ARG 0 registry + METHOD method_1_11552 getMissingRendererFactories ()Ljava/util/List; + METHOD method_1_11553 of (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_5321; + ARG 0 entityType + METHOD method_1_11554 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11555 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11556 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11557 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11558 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11559 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11560 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11561 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11562 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11563 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11564 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11565 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11566 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11567 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11568 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11569 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11570 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11571 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11572 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11573 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11574 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11575 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11576 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11577 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11578 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11579 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11580 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11581 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11582 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11583 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11584 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11585 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11586 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11587 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11588 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11589 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11590 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11591 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11592 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11593 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11594 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11595 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx + METHOD method_1_11596 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 ctx METHOD method_32172 isMissingRendererFactories ()Z METHOD method_32173 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_1299;Lnet/minecraft/class_5617;)Lnet/minecraft/class_5617; + ARG 0 registry ARG 1 type ARG 2 factory METHOD method_32176 reloadEntityRenderers (Lnet/minecraft/class_5617$class_5618;)Ljava/util/Map; + ARG 0 ctx METHOD method_32177 reloadPlayerRenderers (Lnet/minecraft/class_5617$class_5618;)Ljava/util/Map; ARG 0 ctx diff --git a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping index 82992c7a21..f375968919 100644 --- a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping @@ -40,6 +40,17 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 9 x ARG 11 y ARG 13 z + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V + ARG 1 sound + ARG 2 category + ARG 3 volume + ARG 4 pitch + ARG 5 random + ARG 6 pos + METHOD method_1_11633 master (Lnet/minecraft/class_6880;FF)Lnet/minecraft/class_1109; + ARG 0 sound + ARG 1 pitch + ARG 2 volume METHOD method_4757 master (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109; ARG 0 sound ARG 1 pitch diff --git a/mappings/net/minecraft/client/window/Window.mapping b/mappings/net/minecraft/client/window/Window.mapping index 8c3020deca..9ec3d399e3 100644 --- a/mappings/net/minecraft/client/window/Window.mapping +++ b/mappings/net/minecraft/client/window/Window.mapping @@ -105,6 +105,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/window/Window METHOD method_1_10828 setStoredWindowSize (II)V ARG 1 width ARG 2 height + METHOD method_1_11487 show ()V METHOD method_4474 setPhase (Ljava/lang/String;)V ARG 1 phase METHOD method_4475 applyFullscreenVideoMode ()V diff --git a/mappings/net/minecraft/component/type/EquippableComponent.mapping b/mappings/net/minecraft/component/type/EquippableComponent.mapping index 72d68984fa..f20bcfeae1 100644 --- a/mappings/net/minecraft/component/type/EquippableComponent.mapping +++ b/mappings/net/minecraft/component/type/EquippableComponent.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent FIELD field_54145 CODEC Lcom/mojang/serialization/Codec; FIELD field_54146 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_64015 allows (Lnet/minecraft/class_6880;)Z + ARG 1 entityType METHOD method_64016 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_64017 ofCarpet (Lnet/minecraft/class_1767;)Lnet/minecraft/class_10192; diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index 68e6196aeb..bb9fe91d5c 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -26,10 +26,14 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas ARG 0 replacements METHOD method_30071 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String; ARG 1 string + METHOD method_43060 (Lcom/google/common/collect/ImmutableMap;Ljava/lang/String;)Ljava/lang/String; + ARG 1 path METHOD method_43061 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 frogVariants METHOD method_43062 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 catVariants + METHOD method_44184 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String; + ARG 1 id METHOD method_51289 (Ljava/lang/String;)Ljava/lang/String; ARG 0 id METHOD method_57075 replacingRaw (Ljava/util/Map;)Ljava/util/function/UnaryOperator; diff --git a/mappings/net/minecraft/datafixer/fix/FluidRenamingFix.mapping b/mappings/net/minecraft/datafixer/fix/FluidRenamingFix.mapping new file mode 100644 index 0000000000..711182e4d9 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/FluidRenamingFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_1_1830 net/minecraft/datafixer/fix/FluidRenamingFix + METHOD method_1_11538 of (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix; + ARG 0 outputSchema + ARG 1 name + ARG 2 renamer diff --git a/mappings/net/minecraft/datafixer/fix/ItemRenamingFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemRenamingFix.mapping new file mode 100644 index 0000000000..34b3020369 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ItemRenamingFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_1_1829 net/minecraft/datafixer/fix/ItemRenamingFix + METHOD method_1_11531 of (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix; + ARG 0 outputSchema + ARG 1 name + ARG 2 renamer diff --git a/mappings/net/minecraft/datafixer/fix/RenamingFix.mapping b/mappings/net/minecraft/datafixer/fix/RenamingFix.mapping new file mode 100644 index 0000000000..a9c3fffe42 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/RenamingFix.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_1_1840 net/minecraft/datafixer/fix/RenamingFix + FIELD field_1_11936 name Ljava/lang/String; + FIELD field_1_11937 type Lcom/mojang/datafixers/DSL$TypeReference; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)V + ARG 1 outputSchema + ARG 2 type + ARG 3 name + METHOD method_1_11645 of (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix; + ARG 0 outputSchema + ARG 1 type + ARG 2 name + ARG 3 renamer + METHOD method_1_11646 (Lcom/mojang/serialization/DynamicOps;)Ljava/util/function/Function; + ARG 1 dynamicOps + METHOD method_1_11647 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + ARG 1 id + METHOD method_5022 rename (Ljava/lang/String;)Ljava/lang/String; + ARG 1 path diff --git a/mappings/net/minecraft/datafixer/schema/Schema5123.mapping b/mappings/net/minecraft/datafixer/schema/Schema5123.mapping new file mode 100644 index 0000000000..ef2716567e --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema5123.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_1_1826 net/minecraft/datafixer/schema/Schema5123 + METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema + ARG 2 entityTypes + ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index f6812aa36e..9571414193 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -139,7 +139,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 3 y ARG 5 z METHOD method_1_9769 doTeleport (DDDZLjava/util/function/Predicate;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;)Z + ARG 1 x ARG 3 y + ARG 5 z ARG 7 particleEffects ARG 8 cannotTeleportTo ARG 9 destState @@ -160,6 +162,12 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_1_10464 sendEquipmentChanges (Lnet/minecraft/class_3218;Ljava/util/List;)V ARG 1 world ARG 2 equipmentChanges + METHOD method_1_11045 (Lnet/minecraft/class_1_1769;Lnet/minecraft/class_6880;)V + ARG 2 fallSound + METHOD method_1_11492 getHurtSound (Lnet/minecraft/class_1282;)Lnet/minecraft/class_3414; + ARG 1 damageSource + METHOD method_1_11493 setLastDamageSource (Lnet/minecraft/class_1282;)V + ARG 1 damageSource METHOD method_5673 setEquipment (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack @@ -194,7 +202,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 3 source METHOD method_6010 swimUpward (Lnet/minecraft/class_6862;)V ARG 1 fluid - METHOD method_6011 getHurtSound (Lnet/minecraft/class_1282;)Lnet/minecraft/class_3414; + METHOD method_6011 getBaseHurtSound (Lnet/minecraft/class_1282;)Lnet/minecraft/class_3414; ARG 1 source METHOD method_6012 clearStatusEffects ()Z METHOD method_6013 playHurtSound (Lnet/minecraft/class_1282;)V diff --git a/mappings/net/minecraft/entity/Saddleable.mapping b/mappings/net/minecraft/entity/Saddleable.mapping new file mode 100644 index 0000000000..0a6795f2b7 --- /dev/null +++ b/mappings/net/minecraft/entity/Saddleable.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1_1825 net/minecraft/entity/Saddleable + FIELD field_1_11888 DEFAULT_SOUND Lnet/minecraft/class_6880; + METHOD method_76103 getSaddleSound ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 2edf7d0d4e..5039039dee 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity METHOD method_1_11116 (Lnet/minecraft/class_1642;Lnet/minecraft/class_3218;)V ARG 0 mob ARG 1 world + METHOD method_1_11541 isConvertingInPowderSnow ()Z METHOD method_6001 initAttributes ()V METHOD method_7201 setCanBreakDoors (Z)V ARG 1 canBreakDoors diff --git a/mappings/net/minecraft/entity/passive/AnimalSoundVariant.mapping b/mappings/net/minecraft/entity/passive/AnimalSoundVariant.mapping new file mode 100644 index 0000000000..76127a4ff2 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/AnimalSoundVariant.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_1_1837 net/minecraft/entity/passive/AnimalSoundVariant + METHOD method_1_11623 getAdultSounds ()Ljava/lang/Object; + METHOD method_1_11624 getBabySounds ()Ljava/lang/Object; + METHOD method_1_11625 createCodec (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_1_1837$class_1_1838;)Lcom/mojang/serialization/Codec; + ARG 0 subvariantCodec + ARG 1 constructor + METHOD method_1_11626 (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_1_1837$class_1_1838;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance + CLASS class_1_1838 Constructor + METHOD method_1_11627 create (Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/class_1_1837; + ARG 1 adult + ARG 2 baby diff --git a/mappings/net/minecraft/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 1f192bb112..5bc2c35248 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid COMMENT Represents a fluid which can flow. FIELD field_15900 LEVEL Lnet/minecraft/class_2758; - FIELD field_15902 FALLING Lnet/minecraft/class_2746; + FIELD field_15901 NEIGHBOR_FLOW_CACHE Ljava/lang/ThreadLocal; + FIELD field_15902 SOURCE Lnet/minecraft/class_2746; FIELD field_17587 shapeCache Ljava/util/Map; FIELD field_31726 CACHE_SIZE I METHOD method_15725 tryFlow (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)V @@ -26,19 +27,19 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid METHOD method_15732 receivesFlow (Lnet/minecraft/class_2350;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 0 face ARG 1 world - ARG 2 pos - ARG 3 state - ARG 4 fromPos - ARG 5 fromState + ARG 2 fromPos + ARG 3 fromState + ARG 4 toPos + ARG 5 toState METHOD method_15733 getMaxFlowDistance (Lnet/minecraft/class_4538;)I COMMENT {@return the maximum horizontal distance to check for holes the fluid can flow down into} ARG 1 world METHOD method_15736 canFlowDownTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world - ARG 2 pos - ARG 3 state - ARG 4 fromPos - ARG 5 fromState + ARG 2 fromPos + ARG 3 fromState + ARG 4 toPos + ARG 5 toState METHOD method_15737 isInfinite (Lnet/minecraft/class_3218;)Z ARG 1 world METHOD method_15739 getLevelDecreasePerBlock (Lnet/minecraft/class_4538;)I @@ -52,6 +53,7 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid COMMENT Finds the distance to the closest hole the fluid can flow down into starting with the direction specified. ARG 1 world ARG 2 pos + ARG 3 cumulativeDistance ARG 4 direction ARG 5 state ARG 6 spreadCache @@ -66,14 +68,14 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 3 state ARG 4 direction ARG 5 fluidState - METHOD method_15746 (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;)Z + METHOD method_15746 canFlowIntoFillable (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;)Z ARG 1 world - ARG 2 pos - ARG 3 state + ARG 2 fromPos + ARG 3 fromState ARG 4 face - ARG 5 fromPos - ARG 6 fromState - ARG 7 fluidState + ARG 5 toPos + ARG 6 toState + ARG 7 toFluidState METHOD method_15748 isEmptyOrThis (Lnet/minecraft/class_3610;)Z ARG 1 state METHOD method_15749 isFlowBlocked (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z @@ -92,6 +94,7 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 0 world ARG 1 pos ARG 2 state + ARG 3 fluidState METHOD method_17773 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_265; ARG 2 state2 METHOD method_17774 isFluidAboveEqual (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z @@ -100,18 +103,22 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 2 pos METHOD method_61813 canFlowThrough (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;)Z ARG 1 world - ARG 2 pos - ARG 3 state + ARG 2 fromPos + ARG 3 fromState ARG 4 face - ARG 5 fromPos - ARG 6 fromState - ARG 7 fluidState + ARG 5 toPos + ARG 6 toState + ARG 7 toFluidState METHOD method_61814 canFill (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_61815 canFillWithFluid (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z ARG 0 world ARG 1 pos ARG 2 state + ARG 3 fluidState + CLASS 1 1 + METHOD rehash (I)V + ARG 1 size CLASS class_2249 NeighborGroup FIELD comp_3130 self Lnet/minecraft/class_2680; FIELD comp_3131 other Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 3a6acf3d0c..a771091325 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid FIELD field_15904 STATE_IDS Lnet/minecraft/class_2361; FIELD field_15905 stateManager Lnet/minecraft/class_2689; FIELD field_36431 registryEntry Lnet/minecraft/class_6880$class_6883; + METHOD method_1_11497 isFullFlowing (Lnet/minecraft/class_3610;)Z + ARG 1 state + METHOD method_1_11498 source (Lnet/minecraft/class_3610;)Lnet/minecraft/class_3610; + ARG 1 state METHOD method_15774 getBucketItem ()Lnet/minecraft/class_1792; METHOD method_15775 appendProperties (Lnet/minecraft/class_2689$class_2690;)V ARG 1 builder @@ -15,6 +19,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid ARG 1 state ARG 2 world ARG 3 pos + ARG 4 updatedState ARG 5 direction METHOD method_15778 onScheduledTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)V ARG 1 world diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 3827fb12e6..1e4a86a29d 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -10,6 +10,9 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD method_1_10469 getSubmersionHeight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F ARG 1 world ARG 2 pos + METHOD method_1_11529 isFalling ()Z + METHOD method_1_11530 isInAndStill (Lnet/minecraft/class_6862;)Z + ARG 1 fluid METHOD method_15756 canFlowTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos @@ -29,6 +32,7 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD method_15764 canBeReplacedWith (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_2350;)Z ARG 1 world ARG 2 pos + ARG 3 updatedState ARG 4 direction METHOD method_15766 getParticle ()Lnet/minecraft/class_2394; METHOD method_15768 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V diff --git a/mappings/net/minecraft/item/ArmorStandItem.mapping b/mappings/net/minecraft/item/ArmorStandItem.mapping index 61cf838849..4406794403 100644 --- a/mappings/net/minecraft/item/ArmorStandItem.mapping +++ b/mappings/net/minecraft/item/ArmorStandItem.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1742 net/minecraft/item/ArmorStandItem + METHOD method_1_11494 playSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_1531;)V + ARG 0 world + ARG 1 armorStand diff --git a/mappings/net/minecraft/item/FlintAndSteelItem.mapping b/mappings/net/minecraft/item/FlintAndSteelItem.mapping index 59be428126..82488eacb3 100644 --- a/mappings/net/minecraft/item/FlintAndSteelItem.mapping +++ b/mappings/net/minecraft/item/FlintAndSteelItem.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1786 net/minecraft/item/FlintAndSteelItem + METHOD method_1_11511 playSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 pos diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index 10375e1fd1..1c2ca0411c 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate FIELD comp_1830 conditions Ljava/util/List; + FIELD field_1_11951 PASS Lnet/minecraft/class_4559; FIELD field_45777 CODEC Lcom/mojang/serialization/Codec; FIELD field_45778 CONDITION_LIST_CODEC Lcom/mojang/serialization/Codec; FIELD field_49396 PACKET_CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 9df2199373..34f7f98a20 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_1_10376 CONTEXT_INT_PROVIDER_TYPE Lnet/minecraft/class_2378; FIELD field_1_10521 CONTEXT_KEY_SET Lnet/minecraft/class_2378; FIELD field_1_10830 RULE_TEST_TYPE Lnet/minecraft/class_2378; + FIELD field_1_11901 ROOT Lnet/minecraft/class_1_1834; FIELD field_41128 POINT_OF_INTEREST_TYPE Lnet/minecraft/class_2378; FIELD field_41129 MEMORY_MODULE_TYPE Lnet/minecraft/class_7922; FIELD field_41130 SENSOR_TYPE Lnet/minecraft/class_7922; @@ -96,6 +97,68 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_63926 ATTRIBUTE_TYPE Lnet/minecraft/class_2378; FIELD field_64250 SLOT_SOURCE_TYPE Lnet/minecraft/class_2378; FIELD field_64251 GAME_RULE Lnet/minecraft/class_2378; + METHOD method_47453 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47454 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47455 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47456 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47457 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47460 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47461 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47462 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47465 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47466 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47467 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47469 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47470 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47471 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47472 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47474 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47475 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg METHOD method_47476 bootstrap ()V + METHOD method_47492 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47494 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47495 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47496 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47497 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47498 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47501 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47502 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47506 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_47507 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_49927 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg METHOD method_62715 createEntryLookup (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7871; ARG 0 registry + METHOD method_62991 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_66552 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg + METHOD method_74053 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 reg diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index f2eff55981..f3d15290ed 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -133,6 +133,7 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 ops METHOD method_1_819 getReverseComponentLookup ()Lnet/minecraft/class_1_111; + METHOD method_1_11476 getEntries ()Ljava/lang/Iterable; METHOD method_10220 stream ()Ljava/util/stream/Stream; COMMENT {@return a stream of all values of this registry} METHOD method_10221 getId (Ljava/lang/Object;)Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/registry/RegistryKey.mapping b/mappings/net/minecraft/registry/RegistryKey.mapping index 1279aada22..2e910bd5a2 100644 --- a/mappings/net/minecraft/registry/RegistryKey.mapping +++ b/mappings/net/minecraft/registry/RegistryKey.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey COMMENT COMMENT @param the type of the value COMMENT @see Registries#ROOT + FIELD field_1_9324 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_25136 INSTANCES Ljava/util/concurrent/ConcurrentMap; COMMENT A cache of all registry keys ever created. FIELD field_25137 registry Lnet/minecraft/class_2960; @@ -19,6 +20,9 @@ CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey METHOD method_1_4752 adapt (Lnet/minecraft/class_5321;Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_5321; ARG 1 registry ARG 2 pathFunction + METHOD method_1_11488 of (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 registry + ARG 1 value METHOD method_29177 getValue ()Lnet/minecraft/class_2960; METHOD method_29179 of (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; COMMENT Creates a registry key for a value in a registry with a registry key for @@ -43,7 +47,7 @@ CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey COMMENT @param the element type of the registry ARG 0 registry COMMENT the identifier of the registry - METHOD method_29181 of (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + METHOD method_29181 ofImpl (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; ARG 0 registry ARG 1 value METHOD method_29182 (Lnet/minecraft/class_5321$class_7892;)Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/registry/RegistryRoot.mapping b/mappings/net/minecraft/registry/RegistryRoot.mapping new file mode 100644 index 0000000000..b4a32eaf7d --- /dev/null +++ b/mappings/net/minecraft/registry/RegistryRoot.mapping @@ -0,0 +1,40 @@ +CLASS net/minecraft/class_1_1834 net/minecraft/registry/RegistryRoot + FIELD field_1_11908 LOGGER Lorg/slf4j/Logger; + FIELD field_1_11909 bootstraps Ljava/util/Map; + FIELD field_1_11910 root Lnet/minecraft/class_2385; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 id + METHOD method_1_11601 resetTagEntries (Lnet/minecraft/class_2378;)V + ARG 0 child + METHOD method_1_11602 bootstrap ()V + METHOD method_1_11603 getRegistries ()Lnet/minecraft/class_2378; + METHOD method_1_11604 runBootstraps ()V + METHOD method_1_11605 freeze ()V + METHOD method_1_11606 addChild (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_1_1834$class_1_1835;)Lnet/minecraft/class_2385; + ARG 1 key + ARG 2 registry + ARG 3 bootstrap + METHOD method_1_11607 (Lnet/minecraft/class_2960;Ljava/util/function/Supplier;)V + ARG 0 key + ARG 1 bootstrap + METHOD method_1_11610 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V + ARG 1 registry + METHOD method_1_11611 addDefaulted (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_1_1834$class_1_1835;)Lnet/minecraft/class_7922; + ARG 1 key + ARG 2 defaultId + ARG 3 bootstrap + METHOD method_1_11612 addDefaultedIntrusive (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_1_1834$class_1_1835;)Lnet/minecraft/class_7922; + ARG 1 key + ARG 2 defaultId + ARG 3 bootstrap + METHOD method_1_11613 addSimple (Lnet/minecraft/class_5321;Lnet/minecraft/class_1_1834$class_1_1835;)Lnet/minecraft/class_2378; + ARG 1 key + ARG 2 bootstrap + METHOD method_1_11614 addSimpleIntrusive (Lnet/minecraft/class_5321;Lnet/minecraft/class_1_1834$class_1_1835;)Lnet/minecraft/class_2378; + ARG 1 key + ARG 2 bootstrap + METHOD method_1_11615 validate (Lnet/minecraft/class_2378;)V + ARG 0 root + CLASS class_1_1835 Bootstrap + METHOD method_1_11616 bootstrap (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 1 registry diff --git a/mappings/net/minecraft/screen/JukeboxScreenHandler.mapping b/mappings/net/minecraft/screen/JukeboxScreenHandler.mapping new file mode 100644 index 0000000000..c68e48a49c --- /dev/null +++ b/mappings/net/minecraft/screen/JukeboxScreenHandler.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_1_1827 net/minecraft/screen/JukeboxScreenHandler + FIELD field_1_11893 containerInventory Lnet/minecraft/class_1263; + FIELD field_1_11894 propertyDelegate Lnet/minecraft/class_3913; + METHOD (ILnet/minecraft/class_1661;)V + ARG 1 syncId + ARG 2 playerInventory + METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V + ARG 1 syncId + ARG 2 playerInventory + ARG 3 containerInventory + ARG 4 propertyDelegate + METHOD method_1_11502 getNextSlot ()Ljava/util/OptionalInt; diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundSets.mapping similarity index 99% rename from mappings/net/minecraft/sound/BlockSoundGroup.mapping rename to mappings/net/minecraft/sound/BlockSoundSets.mapping index 85ac8df78a..b0622ffacd 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundSets.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup +CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundSets FIELD field_1_3571 CINNABAR Lnet/minecraft/class_5321; FIELD field_1_3572 POTENT_SULFUR Lnet/minecraft/class_5321; FIELD field_1_3573 SULFUR Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/sound/SoundEvents.mapping b/mappings/net/minecraft/sound/SoundEvents.mapping index cf3c6fb883..c708479c28 100644 --- a/mappings/net/minecraft/sound/SoundEvents.mapping +++ b/mappings/net/minecraft/sound/SoundEvents.mapping @@ -1,10 +1,20 @@ CLASS net/minecraft/class_3417 net/minecraft/sound/SoundEvents + FIELD field_1_831 ENTITY_CAT_BABY Lnet/minecraft/class_1_334$class_1_335; + FIELD field_1_835 ENTITY_PIG_BABY Lnet/minecraft/class_1_324$class_1_325; + FIELD field_1_844 ENTITY_WOLF_BABY Lnet/minecraft/class_10823$class_1_82; + FIELD field_1_1393 ENTITY_CHICKEN_BABY Lnet/minecraft/class_1_346$class_1_347; FIELD field_1_1718 CAT_SOUNDS Ljava/util/Map; FIELD field_1_1719 CHICKEN_SOUNDS Ljava/util/Map; FIELD field_1_1721 COW_SOUNDS Ljava/util/Map; FIELD field_1_1726 PIG_SOUNDS Ljava/util/Map; + FIELD field_1_11858 BLOCK_SOUND_SET_GLOW_LICHEN Lnet/minecraft/class_1_1844; + FIELD field_1_11859 BLOCK_SOUND_SET_STEM Lnet/minecraft/class_1_1844; + FIELD field_1_11863 BLOCK_SOUND_SET_NETHER_WART Lnet/minecraft/class_1_1844; + FIELD field_14573 BLOCK_SOUND_SET_CROP Lnet/minecraft/class_1_1844; + FIELD field_21887 BLOCK_SOUND_SET_NETHER_STEM Lnet/minecraft/class_1_1844; FIELD field_39027 GOAT_HORN_SOUND_COUNT I FIELD field_39028 GOAT_HORN_SOUNDS Lcom/google/common/collect/ImmutableList; + FIELD field_42580 BLOCK_SOUND_SET_DECORATED_POT_SHATTER Lnet/minecraft/class_1_1844; FIELD field_57074 WOLF_SOUNDS Ljava/util/Map; METHOD method_1_2127 (Lnet/minecraft/class_1_338$class_1_339;)Lnet/minecraft/class_1_338$class_1_339; ARG 0 type @@ -26,6 +36,26 @@ CLASS net/minecraft/class_3417 net/minecraft/sound/SoundEvents METHOD method_1_2136 createChickenSoundMap ()Ljava/util/Map; METHOD method_1_2137 createCowSoundMap ()Ljava/util/Map; METHOD method_1_2138 createPigSoundMap ()Ljava/util/Map; + METHOD method_1_11479 (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 0 id + METHOD method_1_11480 (Ljava/util/Optional;Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 first + ARG 1 second + METHOD method_1_11481 (Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 id + METHOD method_1_11482 forSoundIds (Lnet/minecraft/class_1_1844;)Lnet/minecraft/class_1_1844; + ARG 0 soundIds + METHOD method_1_11483 forBlockSoundSet (Lnet/minecraft/class_5321;)Lnet/minecraft/class_1_1844; + ARG 0 blockSoundSet + METHOD method_1_11484 forBlockSoundSet (Lnet/minecraft/class_5321;Lnet/minecraft/class_1_1844;)Lnet/minecraft/class_1_1844; + ARG 0 blockSoundSet + ARG 1 filter + METHOD method_1_11485 forBlockSoundSet (Lnet/minecraft/class_5321;Lnet/minecraft/class_1_1844;Lnet/minecraft/class_1_1844;)Lnet/minecraft/class_1_1844; + ARG 0 blockSoundSet + ARG 1 filter + ARG 2 fallback + METHOD method_1_11486 forOptionalSoundIds (Lnet/minecraft/class_1_1844;)Lnet/minecraft/class_1_1844; + ARG 0 soundIds METHOD method_14838 register (Ljava/lang/String;)Lnet/minecraft/class_3414; ARG 0 id METHOD method_43045 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/sound/SoundSet.mapping b/mappings/net/minecraft/sound/SoundSet.mapping new file mode 100644 index 0000000000..205c7b324f --- /dev/null +++ b/mappings/net/minecraft/sound/SoundSet.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_1_1844 net/minecraft/sound/SoundSet + FIELD field_1_11942 TRUE Lnet/minecraft/class_1_1844; + FIELD field_1_11943 FALSE Lnet/minecraft/class_1_1844; + METHOD method_1_11665 of (Ljava/lang/Object;)Lnet/minecraft/class_1_1844; + ARG 0 sound + METHOD method_1_11666 withId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1_1844; + ARG 0 id + METHOD method_1_11667 withKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_1_1844; + ARG 0 key + METHOD method_1_11668 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 path + METHOD method_1_11669 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 path + METHOD method_1_11670 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 path + METHOD method_1_11671 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 path + METHOD method_1_11672 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 path + METHOD method_1_11673 (Ljava/lang/Object;Ljava/lang/Boolean;)Ljava/util/Optional; + ARG 0 sound + ARG 1 retain + METHOD method_1_11674 map (Ljava/util/function/Function;)Lnet/minecraft/class_1_1844; + ARG 1 function + METHOD method_1_11675 filter (Lnet/minecraft/class_1_1844;Lnet/minecraft/class_1_1844;)Lnet/minecraft/class_1_1844; + ARG 0 sounds + ARG 1 filter + METHOD method_1_11676 withBreak (Ljava/lang/Object;)Lnet/minecraft/class_1_1844; + ARG 1 breakSound + METHOD method_1_11677 withFall (Ljava/lang/Object;)Lnet/minecraft/class_1_1844; + ARG 1 fallSound + METHOD method_1_11678 withHit (Ljava/lang/Object;)Lnet/minecraft/class_1_1844; + ARG 1 hitSound + METHOD method_1_11679 withPlace (Ljava/lang/Object;)Lnet/minecraft/class_1_1844; + ARG 1 placeSound + METHOD method_1_11680 withStep (Ljava/lang/Object;)Lnet/minecraft/class_1_1844; + ARG 1 stepSound + METHOD method_1_11681 mapZipped (Lnet/minecraft/class_1_1844;Lnet/minecraft/class_1_1844;Ljava/util/function/BiFunction;)Lnet/minecraft/class_1_1844; + ARG 0 first + ARG 1 second + ARG 2 function diff --git a/mappings/net/minecraft/state/State.mapping b/mappings/net/minecraft/state/State.mapping index fbfe417543..e2f73bc009 100644 --- a/mappings/net/minecraft/state/State.mapping +++ b/mappings/net/minecraft/state/State.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State + FIELD field_1_2479 PROPERTY_NOT_FOUND I FIELD field_1_2480 properties [Lnet/minecraft/class_2769; FIELD field_1_2481 values [Ljava/lang/Comparable; FIELD field_24739 owner Ljava/lang/Object; diff --git a/mappings/net/minecraft/state/property/Properties.mapping b/mappings/net/minecraft/state/property/Properties.mapping index 7313845995..e0bf4c91a6 100644 --- a/mappings/net/minecraft/state/property/Properties.mapping +++ b/mappings/net/minecraft/state/property/Properties.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties COMMENT Contains all block and fluid state properties that Minecraft uses. FIELD field_1_6244 POTENT_SULFUR_STATE Lnet/minecraft/class_2754; + FIELD field_1_11959 PLAYLIST_MODE Lnet/minecraft/class_2746; + FIELD field_1_11960 SOURCE Lnet/minecraft/class_2746; FIELD field_12481 HORIZONTAL_FACING Lnet/minecraft/class_2754; COMMENT A property that specifies the direction a block is facing. COMMENT diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index fecf5e1cd0..a530cdd0a5 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -64,7 +64,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 a ARG 1 b ARG 2 c - METHOD method_1_9360 quaredHypot (FF)F + METHOD method_1_9360 squaredHypot (FF)F ARG 0 a ARG 1 b METHOD method_1_9361 lerp2 (FFFFFF)F diff --git a/mappings/net/minecraft/util/path/SymlinkFinder.mapping b/mappings/net/minecraft/util/path/SymlinkFinder.mapping index 7b478de28a..d6661a5224 100644 --- a/mappings/net/minecraft/util/path/SymlinkFinder.mapping +++ b/mappings/net/minecraft/util/path/SymlinkFinder.mapping @@ -1,14 +1,23 @@ CLASS net/minecraft/class_8580 net/minecraft/util/path/SymlinkFinder + FIELD field_1_11922 WINDOWS_FILE_ATTRIBUTE_REPARSE_POINT I + FIELD field_1_11923 IS_WINDOWS Z FIELD field_44955 matcher Ljava/nio/file/PathMatcher; METHOD (Ljava/nio/file/PathMatcher;)V ARG 1 matcher + METHOD method_1_11631 resolve (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 1 path + METHOD method_1_11632 resolve (Ljava/nio/file/Path;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/Path; + ARG 1 path + ARG 2 attributes METHOD method_52243 collect (Ljava/nio/file/Path;Z)V ARG 1 path ARG 2 resolveSymlink METHOD method_52619 validateRecursively (Ljava/nio/file/Path;)V - ARG 1 path + ARG 1 root CLASS 1 1 METHOD method_52246 validate (Ljava/nio/file/Path;Ljava/nio/file/attribute/BasicFileAttributes;)V + ARG 1 path + ARG 2 attributes METHOD preVisitDirectory (Ljava/lang/Object;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult; ARG 1 path ARG 2 attributes diff --git a/mappings/net/minecraft/util/path/SymlinkValidationException.mapping b/mappings/net/minecraft/util/path/SymlinkValidationException.mapping index 5107e212ee..c627c4fc8c 100644 --- a/mappings/net/minecraft/util/path/SymlinkValidationException.mapping +++ b/mappings/net/minecraft/util/path/SymlinkValidationException.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_8579 net/minecraft/util/path/SymlinkValidationException FIELD field_44953 path Ljava/nio/file/Path; - FIELD field_44954 symlinks Ljava/util/List; + FIELD field_44954 forbiddenSymlinks Ljava/util/List; METHOD (Ljava/nio/file/Path;Ljava/util/List;)V - ARG 2 symlinks + ARG 1 path + ARG 2 forbiddenSymlinks + METHOD method_1_11693 getForbiddenSymlinks ()Ljava/util/List; + METHOD method_1_11694 (Lnet/minecraft/class_8581;)Ljava/lang/String; + ARG 0 symlink diff --git a/mappings/net/minecraft/world/CollisionView.mapping b/mappings/net/minecraft/world/CollisionView.mapping index 5346195388..55b49ded2b 100644 --- a/mappings/net/minecraft/world/CollisionView.mapping +++ b/mappings/net/minecraft/world/CollisionView.mapping @@ -1,4 +1,17 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView + METHOD method_1_11503 doesNotCollideWithWorldBorder (DDLnet/minecraft/class_238;)Z + ARG 1 x + ARG 3 z + ARG 5 box + METHOD method_1_11504 isSpaceEmpty (DDLnet/minecraft/class_238;)Z + ARG 1 x + ARG 3 z + ARG 5 box + METHOD method_1_11505 isSpaceEmpty (DDLnet/minecraft/class_238;Z)Z + ARG 1 x + ARG 3 z + ARG 5 box + ARG 6 checkFluid METHOD method_8587 isSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity ARG 2 box @@ -49,6 +62,8 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView ARG 1 entity ARG 2 box METHOD method_39455 getWorldBorderCollisions (DDLnet/minecraft/class_238;)Lnet/minecraft/class_265; + ARG 1 x + ARG 3 z ARG 5 box METHOD method_51715 (Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_265;)Lnet/minecraft/class_2338; ARG 0 pos @@ -84,7 +99,7 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView METHOD method_76791 isBlockSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Z)Z ARG 1 entity ARG 2 box - ARG 3 blockOrFluid + ARG 3 checkFluid METHOD method_76792 doesNotCollideWithEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity ARG 2 box diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index 3772b89b2e..cfdc1669a9 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -16,6 +16,10 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder FIELD field_63954 initialized Z METHOD (Lnet/minecraft/class_2784$class_5200;)V ARG 1 properties + METHOD method_1_11528 canCollide (DDLnet/minecraft/class_238;)Z + ARG 1 x + ARG 3 z + ARG 5 box METHOD method_11951 contains (Lnet/minecraft/class_1923;)Z ARG 1 chunkPos METHOD method_11952 contains (Lnet/minecraft/class_2338;)Z @@ -111,6 +115,7 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder ARG 5 margin METHOD method_39459 canCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity + ARG 2 box METHOD method_39538 clampFloored (DDD)Lnet/minecraft/class_2338; ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/world/debug/gizmo/GizmoCollectorImpl.mapping b/mappings/net/minecraft/world/debug/gizmo/GizmoCollectorImpl.mapping index 1d1bf1f022..be3e1962b5 100644 --- a/mappings/net/minecraft/world/debug/gizmo/GizmoCollectorImpl.mapping +++ b/mappings/net/minecraft/world/debug/gizmo/GizmoCollectorImpl.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_12185 net/minecraft/world/debug/gizmo/GizmoCollectorIm METHOD method_75856 add (Ljava/util/Collection;)V ARG 1 gizmos CLASS class_12186 Entry + FIELD field_1_11892 entityHitbox Z FIELD field_63662 gizmo Lnet/minecraft/class_12175; FIELD field_63663 ignoreOcclusion Z FIELD field_63930 creationTime J @@ -15,6 +16,7 @@ CLASS net/minecraft/class_12185 net/minecraft/world/debug/gizmo/GizmoCollectorIm FIELD field_63932 fadeOut Z METHOD (Lnet/minecraft/class_12175;)V ARG 1 gizmo + METHOD method_1_11499 isEntityHitbox ()Z METHOD method_75562 ignoresOcclusion ()Z METHOD method_75563 getGizmo ()Lnet/minecraft/class_12175; METHOD method_75857 getOpacity (J)F diff --git a/mappings/net/minecraft/world/debug/gizmo/VisibilityConfigurable.mapping b/mappings/net/minecraft/world/debug/gizmo/VisibilityConfigurable.mapping index e3fa87d4b9..6baba83ac2 100644 --- a/mappings/net/minecraft/world/debug/gizmo/VisibilityConfigurable.mapping +++ b/mappings/net/minecraft/world/debug/gizmo/VisibilityConfigurable.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_12178 net/minecraft/world/debug/gizmo/VisibilityConfigurable + METHOD method_1_11489 entityHitbox ()Lnet/minecraft/class_12178; METHOD method_75533 ignoreOcclusion ()Lnet/minecraft/class_12178; METHOD method_75851 withLifespan (I)Lnet/minecraft/class_12178; ARG 1 lifespan diff --git a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping index ced074689c..fad987c1ba 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredicate + FIELD field_1_11957 IS_ANY_FLUID Lnet/minecraft/class_4559; + FIELD field_1_11958 IS_SOURCE Lnet/minecraft/class_4559; FIELD field_35054 BASE_CODEC Lcom/mojang/serialization/Codec; FIELD field_35696 IS_AIR Lnet/minecraft/class_6646; FIELD field_35697 IS_AIR_OR_WATER Lnet/minecraft/class_6646; @@ -17,6 +19,11 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi ARG 2 match METHOD method_1_10966 belowHeightmap (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_6646; ARG 0 heightmap + METHOD method_1_11701 matchingFluids ([Lnet/minecraft/class_3611;)Lnet/minecraft/class_6646; + ARG 0 fluids + METHOD method_1_11702 matchingSourceFluids (Lnet/minecraft/class_1_1038;[Lnet/minecraft/class_3611;)Lnet/minecraft/class_6646; + ARG 0 offset + ARG 1 fluids METHOD method_38873 getType ()Lnet/minecraft/class_6647; METHOD method_38877 not (Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicate @@ -39,6 +46,7 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi METHOD method_38886 matchingFluids (Lnet/minecraft/class_2382;Ljava/util/List;Lnet/minecraft/class_4559;)Lnet/minecraft/class_6646; ARG 0 offset ARG 1 fluids + ARG 2 statePredicate METHOD method_38887 anyOf ([Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicates METHOD method_39009 wouldSurvive (Lnet/minecraft/class_2248;)Lnet/minecraft/class_6646; @@ -64,7 +72,7 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi ARG 1 fluids METHOD method_43290 matchingBlocks ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_6646; ARG 0 blocks - METHOD method_43291 matchingFluids ([Lnet/minecraft/class_3611;)Lnet/minecraft/class_6646; + METHOD method_43291 matchingSourceFluids ([Lnet/minecraft/class_3611;)Lnet/minecraft/class_6646; ARG 0 fluids METHOD method_45544 noFluid ()Lnet/minecraft/class_6646; METHOD method_60285 unobstructed ()Lnet/minecraft/class_6646; diff --git a/mappings/net/minecraft/world/gen/feature/CrevasseFeature.mapping b/mappings/net/minecraft/world/gen/feature/CrevasseFeature.mapping new file mode 100644 index 0000000000..1440d23f71 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/CrevasseFeature.mapping @@ -0,0 +1,59 @@ +CLASS net/minecraft/class_1_1841 net/minecraft/world/gen/feature/CrevasseFeature + FIELD field_1_11939 MAX_DESCENT I + METHOD method_1_11648 generateArmColumns (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;IIFLnet/minecraft/class_5819;)V + ARG 1 columnsOut + ARG 2 world + ARG 3 origin + ARG 4 length + ARG 5 depth + ARG 6 angle + ARG 7 random + METHOD method_1_11649 carveColumn (Lnet/minecraft/class_5281;Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;Lnet/minecraft/class_1_1841$class_1_1842;ILnet/minecraft/class_5819;)V + ARG 1 world + ARG 2 columns + ARG 3 current + ARG 4 maxFillY + ARG 5 random + METHOD method_1_11650 findTopmostCarvableBlock (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;I)Ljava/util/Optional; + ARG 1 world + ARG 2 pos + ARG 3 cursorSurfaceSearchRange + METHOD method_1_11651 getColumn (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;II)Lnet/minecraft/class_1_1841$class_1_1842; + ARG 1 columns + ARG 2 x + ARG 3 z + METHOD method_1_11652 getMaxFillY (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;II)I + ARG 1 columns + ARG 2 originY + ARG 3 fillDepth + METHOD method_1_11653 hasSteepDescent (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;Lnet/minecraft/class_1_1841$class_1_1842;)Z + ARG 1 columns + ARG 2 current + METHOD method_1_11654 (Lnet/minecraft/class_1_1841$class_1_1842;)I + ARG 0 column + METHOD method_1_11655 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_1_11656 retainContiguousColumns (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;Lnet/minecraft/class_2338;)V + ARG 1 columnsInOut + ARG 2 origin + METHOD method_1_11657 placeNeighbors (Lnet/minecraft/class_5281;Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;Lnet/minecraft/class_1_1841$class_1_1842;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V + ARG 1 world + ARG 2 columns + ARG 3 current + ARG 4 pos + ARG 5 block + METHOD method_1_11658 placeBlock (Lnet/minecraft/class_5281;Lnet/minecraft/class_1_1841$class_1_1842;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V + ARG 1 world + ARG 2 current + ARG 3 pos + ARG 4 block + METHOD method_1_11659 isSurroundedByDryBlocks (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos + CLASS class_1_1842 Column + METHOD compareTo (Ljava/lang/Object;)I + ARG 1 other + METHOD method_1_11661 containsY (I)Z + ARG 1 y + METHOD method_1_11662 getBasePos ()I + CLASS class_1_1843 PosAndState diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 33e52c02e4..e48c59715e 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage + FIELD field_1_7080 FOLDER_ACCESS_TEXT Lnet/minecraft/class_2561; FIELD field_17665 LOGGER Lorg/slf4j/Logger; FIELD field_17666 savesDirectory Ljava/nio/file/Path; FIELD field_17667 backupsDirectory Ljava/nio/file/Path;