From 4234895124272c20c1fff70a767a652c34c588b5 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Tue, 13 Oct 2026 19:07:09 -0400 Subject: [PATCH 1/4] Bump Gradle to 9.8.1 This allows running tasks with Java 27. --- gradle/wrapper/gradle-wrapper.jar | Bin 45457 -> 48966 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 5 +---- gradlew.bat | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c75ab801e22807dde59e12a8735a34077..d997cfc60f4cff0e7451d19d49a82fa986695d07 100644 GIT binary patch delta 39724 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ⅆA{k6{Sa_dPB>TF4Im=mf;z@rf2j7Tr#P>Bp9qL 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 delta 36423 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 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 From 73796c445b33cf9940e816d7b95894f35985e74b Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Tue, 13 Oct 2026 21:31:03 -0400 Subject: [PATCH 2/4] 26.4-snapshot-4 --- .../nameproposal/NameProposalConfig.java | 2 + mappings/net/minecraft/block/Block.mapping | 2 + .../net/minecraft/block/BlockSoundSet.mapping | 6 ++ mappings/net/minecraft/block/Blocks.mapping | 5 + .../minecraft/block/BrittleIceBlock.mapping | 5 + .../minecraft/block/CrumblingIceBlock.mapping | 19 ++++ .../net/minecraft/block/FluidFillable.mapping | 5 + .../minecraft/block/FrostedIceBlock.mapping | 7 ++ .../net/minecraft/block/JukeboxBlock.mapping | 1 + .../block/entity/JukeboxBlockEntity.mapping | 32 +++++++ .../block/jukebox/JukeboxManager.mapping | 2 + mappings/net/minecraft/class_1_1825.mapping | 2 - mappings/net/minecraft/class_1_1840.mapping | 2 - .../minecraft/client/MinecraftClient.mapping | 1 + .../net/minecraft/client/gui/Click.mapping | 5 + .../gui/hud/debug/DebugHudEntries.mapping | 5 +- .../ingame/AbstractSignEditScreen.mapping | 18 ++++ .../gui/screen/ingame/HandledScreens.mapping | 5 + .../gui/screen/ingame/JukeboxScreen.mapping | 3 + .../gui/screen/ingame/SignEditScreen.mapping | 2 + .../client/gui/widget/TextFieldWidget.mapping | 5 + .../minecraft/client/input/MouseInput.mapping | 5 + .../client/option/GameOptions.mapping | 4 + .../client/option/SharePresence.mapping | 2 + .../particle/ParticleSpriteManager.mapping | 15 ++- .../client/registry/ClientRegistries.mapping | 9 ++ .../registry/ClientRegistryKeys.mapping | 4 + .../client/render/WorldExtractor.mapping | 10 ++ .../AbstractSignBlockEntityRenderer.mapping | 4 + .../BlockEntityRendererFactories.mapping | 18 ++++ .../client/render/chunk/ChunkBuilder.mapping | 7 +- .../render/entity/EntityRenderer.mapping | 4 + .../entity/EntityRendererFactories.mapping | 93 +++++++++++++++++++ .../sound/PositionedSoundInstance.mapping | 11 +++ .../minecraft/client/window/Window.mapping | 1 + .../type/EquippableComponent.mapping | 1 + .../net/minecraft/datafixer/Schemas.mapping | 4 + .../datafixer/fix/FluidRenamingFix.mapping | 5 + .../datafixer/fix/ItemRenamingFix.mapping | 5 + .../datafixer/fix/RenamingFix.mapping | 18 ++++ .../datafixer/schema/Schema5123.mapping | 5 + .../net/minecraft/entity/LivingEntity.mapping | 10 +- .../net/minecraft/entity/Saddleable.mapping | 3 + .../minecraft/entity/mob/ZombieEntity.mapping | 1 + .../entity/passive/AnimalSoundVariant.mapping | 12 +++ .../net/minecraft/fluid/FlowableFluid.mapping | 12 ++- mappings/net/minecraft/fluid/Fluid.mapping | 5 + .../net/minecraft/fluid/FluidState.mapping | 4 + .../net/minecraft/item/ArmorStandItem.mapping | 3 + .../minecraft/item/FlintAndSteelItem.mapping | 3 + .../predicate/StatePredicate.mapping | 1 + .../net/minecraft/registry/Registries.mapping | 63 +++++++++++++ .../net/minecraft/registry/Registry.mapping | 1 + .../minecraft/registry/RegistryKey.mapping | 6 +- .../minecraft/registry/RegistryRoot.mapping | 40 ++++++++ .../screen/JukeboxScreenHandler.mapping | 12 +++ ...ndGroup.mapping => BlockSoundSets.mapping} | 2 +- .../net/minecraft/sound/SoundEvents.mapping | 29 ++++++ mappings/net/minecraft/sound/SoundSet.mapping | 41 ++++++++ .../state/property/Properties.mapping | 2 + .../minecraft/util/math/MathHelper.mapping | 2 +- .../path/SymlinkValidationException.mapping | 4 + .../net/minecraft/world/CollisionView.mapping | 17 +++- .../world/border/WorldBorder.mapping | 5 + .../debug/gizmo/GizmoCollectorImpl.mapping | 2 + .../gizmo/VisibilityConfigurable.mapping | 1 + .../gen/blockpredicate/BlockPredicate.mapping | 10 +- .../world/gen/feature/CrevasseFeature.mapping | 59 ++++++++++++ 68 files changed, 690 insertions(+), 19 deletions(-) create mode 100644 mappings/net/minecraft/block/BrittleIceBlock.mapping create mode 100644 mappings/net/minecraft/block/CrumblingIceBlock.mapping delete mode 100644 mappings/net/minecraft/class_1_1825.mapping delete mode 100644 mappings/net/minecraft/class_1_1840.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/JukeboxScreen.mapping create mode 100644 mappings/net/minecraft/client/registry/ClientRegistries.mapping create mode 100644 mappings/net/minecraft/client/registry/ClientRegistryKeys.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/FluidRenamingFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/ItemRenamingFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/RenamingFix.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema5123.mapping create mode 100644 mappings/net/minecraft/entity/Saddleable.mapping create mode 100644 mappings/net/minecraft/entity/passive/AnimalSoundVariant.mapping create mode 100644 mappings/net/minecraft/registry/RegistryRoot.mapping create mode 100644 mappings/net/minecraft/screen/JukeboxScreenHandler.mapping rename mappings/net/minecraft/sound/{BlockSoundGroup.mapping => BlockSoundSets.mapping} (99%) create mode 100644 mappings/net/minecraft/sound/SoundSet.mapping create mode 100644 mappings/net/minecraft/world/gen/feature/CrevasseFeature.mapping 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/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index dc3c5123b5..5cfd557901 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -183,6 +183,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 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/FluidFillable.mapping b/mappings/net/minecraft/block/FluidFillable.mapping index 96b6fc3fd3..1c05ff26c4 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 fromState + ARG 5 toState 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/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..7db37a1eb1 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -1,7 +1,7 @@ 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_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 @@ -90,8 +90,9 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 4 newState METHOD method_15754 canFill (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 1 fromPos + ARG 2 fromState + ARG 3 toState 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 @@ -110,8 +111,9 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid 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 1 fromPos + ARG 2 fromState + ARG 3 toState 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..88cd90ea60 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 isFullFlowing ()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..a56b86cd79 100644 --- a/mappings/net/minecraft/sound/SoundEvents.mapping +++ b/mappings/net/minecraft/sound/SoundEvents.mapping @@ -1,10 +1,19 @@ 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_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 +35,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/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/SymlinkValidationException.mapping b/mappings/net/minecraft/util/path/SymlinkValidationException.mapping index 5107e212ee..8ded56904a 100644 --- a/mappings/net/minecraft/util/path/SymlinkValidationException.mapping +++ b/mappings/net/minecraft/util/path/SymlinkValidationException.mapping @@ -2,4 +2,8 @@ CLASS net/minecraft/class_8579 net/minecraft/util/path/SymlinkValidationExceptio FIELD field_44953 path Ljava/nio/file/Path; FIELD field_44954 symlinks Ljava/util/List; METHOD (Ljava/nio/file/Path;Ljava/util/List;)V + ARG 1 path ARG 2 symlinks + METHOD method_1_11693 getSymlinks ()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 From 3ae690dc6520412b7436bb784db6190ea3411663 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 14 Oct 2026 01:54:42 -0400 Subject: [PATCH 3/4] Fix fluid mappings --- mappings/net/minecraft/block/Block.mapping | 3 + .../net/minecraft/block/FluidBlock.mapping | 1 + .../net/minecraft/block/FluidFillable.mapping | 4 +- .../net/minecraft/fluid/FlowableFluid.mapping | 55 ++++++++++--------- .../net/minecraft/fluid/FluidState.mapping | 2 +- .../net/minecraft/sound/SoundEvents.mapping | 1 + mappings/net/minecraft/state/State.mapping | 1 + 7 files changed, 39 insertions(+), 28 deletions(-) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 5cfd557901..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; @@ -452,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/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 1c05ff26c4..2e9796515f 100644 --- a/mappings/net/minecraft/block/FluidFillable.mapping +++ b/mappings/net/minecraft/block/FluidFillable.mapping @@ -3,8 +3,8 @@ CLASS net/minecraft/class_2402 net/minecraft/block/FluidFillable ARG 1 user ARG 2 world ARG 3 pos - ARG 4 fromState - ARG 5 toState + 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/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 7db37a1eb1..5bc2c35248 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -1,6 +1,7 @@ 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_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 @@ -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 @@ -90,9 +92,9 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 4 newState METHOD method_15754 canFill (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z ARG 0 world - ARG 1 fromPos - ARG 2 fromState - ARG 3 toState + 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 @@ -101,19 +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 fromPos - ARG 2 fromState - ARG 3 toState + 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/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 88cd90ea60..1e4a86a29d 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -10,7 +10,7 @@ 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 isFullFlowing ()Z + 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 diff --git a/mappings/net/minecraft/sound/SoundEvents.mapping b/mappings/net/minecraft/sound/SoundEvents.mapping index a56b86cd79..c708479c28 100644 --- a/mappings/net/minecraft/sound/SoundEvents.mapping +++ b/mappings/net/minecraft/sound/SoundEvents.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_3417 net/minecraft/sound/SoundEvents 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; 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; From eb77adcdd6f9745334c86f9d87ed539f685ea0b6 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 14 Oct 2026 02:07:48 -0400 Subject: [PATCH 4/4] Improve symlink-related mappings --- .../client/gui/screen/world/WorldListWidget.mapping | 2 ++ .../net/minecraft/util/path/SymlinkFinder.mapping | 11 ++++++++++- .../util/path/SymlinkValidationException.mapping | 6 +++--- .../world/level/storage/LevelStorage.mapping | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) 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/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 8ded56904a..c627c4fc8c 100644 --- a/mappings/net/minecraft/util/path/SymlinkValidationException.mapping +++ b/mappings/net/minecraft/util/path/SymlinkValidationException.mapping @@ -1,9 +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 1 path - ARG 2 symlinks - METHOD method_1_11693 getSymlinks ()Ljava/util/List; + 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/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;