Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
public record NameProposalConfig(FieldNameProvider fieldNameProvider) {
// trusted owners, currently for most IDs
private static final Set<String> TRUSTED_ID_OWNERS = Set.of(
"net/minecraft/class_2498",
"net/minecraft/class_3612",
"net/minecraft/class_8057",
"net/minecraft/class_8173",
Expand Down Expand Up @@ -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}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions mappings/net/minecraft/block/Block.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -183,6 +184,8 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
COMMENT @see #onBroken
COMMENT @see AbstractBlock#onStacksDropped
COMMENT @see AbstractBlock#onStateReplaced
ARG 1 world
ARG 2 player
ARG 3 pos
ARG 4 state
ARG 5 blockEntity
Expand Down Expand Up @@ -450,7 +453,9 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
METHOD method_72546 generateBlockInteractLoot (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2586;Lnet/minecraft/class_1_96;Lnet/minecraft/class_1297;Ljava/util/function/BiConsumer;)Z
ARG 0 world
ARG 1 lootTable
ARG 2 pos
ARG 3 state
ARG 4 blockEntity
ARG 5 tool
ARG 6 interactingEntity
ARG 7 lootConsumer
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/block/BlockSoundSet.mapping
Original file line number Diff line number Diff line change
@@ -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 <init> (FFLnet/minecraft/class_1_1844;)V
ARG 1 volume
ARG 2 pitch
ARG 3 sounds
METHOD <init> (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
Expand All @@ -8,6 +12,8 @@ CLASS net/minecraft/class_1_1769 net/minecraft/block/BlockSoundSet
ARG 5 placeSound
ARG 6 hitSound
ARG 7 fallSound
METHOD <init> (Lnet/minecraft/class_1_1844;)V
ARG 1 sounds
METHOD <init> (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
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/block/Blocks.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/block/BrittleIceBlock.mapping
Original file line number Diff line number Diff line change
@@ -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
19 changes: 19 additions & 0 deletions mappings/net/minecraft/block/CrumblingIceBlock.mapping
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/FluidBlock.mapping
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/block/FluidFillable.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
CLASS net/minecraft/class_2402 net/minecraft/block/FluidFillable
METHOD method_10310 canFillWithFluid (Lnet/minecraft/class_1309;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z
ARG 1 user
ARG 2 world
ARG 3 pos
ARG 4 state
ARG 5 fluidState
METHOD method_10311 tryFillWithFluid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z
ARG 1 world
ARG 2 pos
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/block/FrostedIceBlock.mapping
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/JukeboxBlock.mapping
Original file line number Diff line number Diff line change
@@ -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;
32 changes: 32 additions & 0 deletions mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping
Original file line number Diff line number Diff line change
@@ -1,11 +1,43 @@
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;
FIELD field_52066 manager Lnet/minecraft/class_9794;
METHOD <init> (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
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/jukebox/JukeboxManager.mapping
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -7,6 +8,7 @@ CLASS net/minecraft/class_9794 net/minecraft/block/jukebox/JukeboxManager
METHOD <init> (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
Expand Down
2 changes: 0 additions & 2 deletions mappings/net/minecraft/class_1_1825.mapping

This file was deleted.

2 changes: 0 additions & 2 deletions mappings/net/minecraft/class_1_1840.mapping

This file was deleted.

1 change: 1 addition & 0 deletions mappings/net/minecraft/client/MinecraftClient.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/client/gui/Click.mapping
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -15,12 +18,27 @@ 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
ARG 1 button
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 <init> (Lnet/minecraft/class_7743;II)V
ARG 2 width
ARG 3 height
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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 <init> (Lnet/minecraft/class_2625;Lnet/minecraft/class_1_1337;Z)V
ARG 1 sign
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -49,6 +50,10 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget
METHOD <init> (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
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/client/input/MouseInput.mapping
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions mappings/net/minecraft/client/option/GameOptions.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading