24w45a

apple502j · Nov 6, 2024 · d12e55b · d12e55b
1 parent 614c273
commit d12e55b
Show file tree

Hide file tree

Showing 150 changed files with 154 additions and 1,392 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w44a"
+def minecraft_version = "24w45a"
 
 filament {
 	minecraftVersion = minecraft_version

diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -717,7 +717,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		ARG 3 pos
 	METHOD method_9573 getSoundGroup (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2498;
 		ARG 1 state
-	METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799;
+	METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)Lnet/minecraft/class_1799;
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
@@ -1345,7 +1345,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		METHOD method_64025 getInsideCollisionShape (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
 			ARG 1 world
 			ARG 2 pos
-		METHOD method_65171 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1799;
+		METHOD method_65171 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_1799;
 			ARG 1 world
 			ARG 2 pos
 		CLASS class_3752 ShapeCache

diff --git a/mappings/net/minecraft/block/CreakingHeartBlock.mapping b/mappings/net/minecraft/block/CreakingHeartBlock.mapping
@@ -16,7 +16,4 @@ CLASS net/minecraft/class_10319 net/minecraft/block/CreakingHeartBlock
 		ARG 2 pos
 	METHOD method_65147 isNightAndNatural (Lnet/minecraft/class_1937;)Z
 		ARG 0 world
-	METHOD method_65148 dropExperienceOnBreak (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
-		ARG 1 state
-		ARG 2 world
-		ARG 3 pos
+	METHOD method_65148 dropExperienceOnBreak (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping
@@ -18,10 +18,6 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock
 		ARG 1 lootConsumer
 	METHOD method_10525 get (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2248;
 		ARG 0 dyeColor
-	METHOD method_10526 getColor (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1767;
-		ARG 0 block
-	METHOD method_10527 getColor (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1767;
-		ARG 0 item
 	METHOD method_10528 getColor ()Lnet/minecraft/class_1767;
 	METHOD method_10529 getItemStack (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1799;
 		ARG 0 color
@@ -30,8 +26,6 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 entity
-	METHOD method_38234 (Lnet/minecraft/class_1799;Lnet/minecraft/class_4538;Lnet/minecraft/class_2627;)V
-		ARG 2 blockEntity
 	METHOD method_47378 (Ljava/util/EnumMap;)V
 		ARG 0 map
 	METHOD method_54040 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;

diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping
@@ -11,12 +11,8 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1767;)V
 		ARG 1 pos
 		ARG 2 state
-		ARG 3 baseColor
 	METHOD method_10907 getPickStack ()Lnet/minecraft/class_1799;
 	METHOD method_10908 getColorForState ()Lnet/minecraft/class_1767;
-	METHOD method_10913 readFrom (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V
-		ARG 1 stack
-		ARG 2 baseColor
 	METHOD method_57566 (Ljava/lang/String;)V
 		ARG 0 patterns
 	METHOD method_58121 (Lnet/minecraft/class_9307;)V

diff --git a/mappings/net/minecraft/block/entity/BedBlockEntity.mapping b/mappings/net/minecraft/block/entity/BedBlockEntity.mapping
@@ -8,5 +8,3 @@ CLASS net/minecraft/class_2587 net/minecraft/block/entity/BedBlockEntity
 		ARG 2 state
 		ARG 3 color
 	METHOD method_11018 getColor ()Lnet/minecraft/class_1767;
-	METHOD method_11019 setColor (Lnet/minecraft/class_1767;)V
-		ARG 1 color
diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@@ -175,11 +175,6 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT keys to store the position. This is incompatible with {@link
 		COMMENT net.minecraft.nbt.NbtHelper#fromBlockPos} that use uppercase keys.
 		ARG 0 nbt
-	METHOD method_38240 setStackNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_7225$class_7874;)V
-		COMMENT Sets {@code stack}'s {@code net.minecraft.item.BlockItem#BLOCK_ENTITY_TAG_KEY}
-		COMMENT NBT value to {@linkplain #createNbt the block entity's NBT data}.
-		ARG 1 stack
-		ARG 2 registries
 	METHOD method_38241 writeIdToNbt (Lnet/minecraft/class_2487;)V
 		COMMENT Writes the block entity type ID to {@code nbt} under the {@code id} key.
 		COMMENT

diff --git a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping
@@ -10,13 +10,10 @@ CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntit
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_49196 readFrom (Lnet/minecraft/class_1799;)V
-		ARG 1 stack
 	METHOD method_49204 getHorizontalFacing ()Lnet/minecraft/class_2350;
 	METHOD method_51511 getSherds ()Lnet/minecraft/class_8526;
 	METHOD method_52577 getStackWith (Lnet/minecraft/class_8526;)Lnet/minecraft/class_1799;
 		ARG 0 sherds
-	METHOD method_52578 asStack ()Lnet/minecraft/class_1799;
 	METHOD method_54301 wobble (Lnet/minecraft/class_8172$class_8837;)V
 		ARG 1 wobbleType
 	CLASS class_8837 WobbleType

diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping
@@ -39,10 +39,6 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData
 	METHOD method_55188 getSpawnData (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1952;
 		ARG 1 logic
 		ARG 2 random
-	METHOD method_55189 setEntityType (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;Lnet/minecraft/class_1299;)V
-		ARG 1 logic
-		ARG 2 random
-		ARG 3 type
 	METHOD method_55190 setDisplayEntity (Lnet/minecraft/class_8963;Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)Lnet/minecraft/class_1297;
 		ARG 1 logic
 		ARG 2 world

diff --git a/mappings/net/minecraft/class_10415.mapping b/mappings/net/minecraft/class_10415.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_10415
+	METHOD method_44384 renderOverlay (Lnet/minecraft/class_332;)V
+	METHOD method_44386 drawBox (Lnet/minecraft/class_332;)V
+	METHOD method_44389 renderContents (Lnet/minecraft/class_332;IIF)V
+	METHOD method_44391 getContentsHeight ()I
diff --git a/mappings/net/minecraft/class_10526.mapping b/mappings/net/minecraft/class_10526.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_10526
+	METHOD method_62326 resolve (Lnet/minecraft/class_10526$class_10103;)V
+	CLASS class_10103 Resolver
+		METHOD method_62642 resolve (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1100;
+			ARG 1 id
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -110,7 +110,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_1757 resourcePackDir Ljava/nio/file/Path;
 	FIELD field_1758 tutorialManager Lnet/minecraft/class_1156;
 	FIELD field_1759 integratedServerRunning Z
-	FIELD field_1760 itemColors Lnet/minecraft/class_325;
 	FIELD field_1761 interactionManager Lnet/minecraft/class_636;
 	FIELD field_1762 LOGGER Lorg/slf4j/Logger;
 	FIELD field_1763 bakedModelManager Lnet/minecraft/class_1092;
@@ -143,7 +142,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_26842 socialInteractionsManager Lnet/minecraft/class_5520;
 	FIELD field_26843 socialInteractionsToast Lnet/minecraft/class_372;
 	FIELD field_26902 userApiService Lcom/mojang/authlib/minecraft/UserApiService;
-	FIELD field_27387 entityModelLoader Lnet/minecraft/class_5599;
 	FIELD field_27388 blockEntityRenderDispatcher Lnet/minecraft/class_824;
 	FIELD field_29569 recorder Lnet/minecraft/class_5962;
 	FIELD field_32144 wireFrame Z
@@ -186,7 +184,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_52752 mapTextureManager Lnet/minecraft/class_10093;
 	FIELD field_52753 inactivityFpsLimiter Lnet/minecraft/class_9919;
 	FIELD field_53831 shaderLoader Lnet/minecraft/class_10151;
-	FIELD field_54150 equipmentModelLoader Lnet/minecraft/class_10201;
 	FIELD field_54267 tracyFrameCapturer Lnet/minecraft/class_10219;
 	METHOD <init> (Lnet/minecraft/class_542;)V
 		ARG 1 args
@@ -531,7 +528,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_62887 getShaderLoader ()Lnet/minecraft/class_10151;
 	METHOD method_63507 onShaderResourceReloadFailure (Ljava/lang/Exception;)V
 		ARG 1 exception
-	METHOD method_64036 getEquipmentModelLoader ()Lnet/minecraft/class_10201;
 	CLASS 1
 		FIELD field_52756 closed Z
 	CLASS class_5859 ChatRestriction

diff --git a/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping b/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping
diff --git a/mappings/net/minecraft/client/color/item/ItemColors.mapping b/mappings/net/minecraft/client/color/item/ItemColors.mapping
diff --git a/mappings/net/minecraft/client/gui/DrawContext.mapping b/mappings/net/minecraft/client/gui/DrawContext.mapping
@@ -5,7 +5,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 	FIELD field_44659 scissorStack Lnet/minecraft/class_332$class_8214;
 	FIELD field_45337 guiAtlasManager Lnet/minecraft/class_8658;
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;)V
-		ARG 1 client
 		ARG 2 matrices
 		ARG 3 vertexConsumers
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_4597$class_4598;)V
@@ -202,8 +201,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 		ARG 6 seed
 	METHOD method_51425 drawItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;IIII)V
 		ARG 1 entity
-		ARG 2 world
-		ARG 3 stack
 		ARG 4 x
 		ARG 5 y
 		ARG 6 seed

diff --git a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping
@@ -41,10 +41,6 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection
 	CLASS class_5291 ButtonWidget
 		FIELD field_24586 gameMode Lnet/minecraft/class_5289$class_5290;
 		FIELD field_24587 selected Z
-		METHOD <init> (Lnet/minecraft/class_5289;Lnet/minecraft/class_5289$class_5290;II)V
-			ARG 2 gameMode
-			ARG 3 x
-			ARG 4 y
 		METHOD method_28080 drawBackground (Lnet/minecraft/class_332;)V
 			ARG 1 context
 		METHOD method_28082 drawSelectionBox (Lnet/minecraft/class_332;)V

diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping
@@ -227,8 +227,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 			ARG 2 worldType
 		METHOD method_48673 (Lnet/minecraft/class_5676;Lnet/minecraft/class_8100;)V
 			ARG 2 creator
-		METHOD method_48674 (Lnet/minecraft/class_7845$class_7939;Lnet/minecraft/class_8021;)V
-			ARG 1 widget
 		METHOD method_48675 (Lnet/minecraft/class_8096;Lnet/minecraft/class_8100;)V
 			ARG 1 creator
 		METHOD method_48676 (Lnet/minecraft/class_8100;)V

diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_8096 net/minecraft/client/gui/screen/world/WorldScreenOptionGrid
 	FIELD field_42196 BUTTON_WIDTH I
 	FIELD field_42197 options Ljava/util/List;
-	METHOD <init> (Ljava/util/List;)V
+	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_8133;)V
 		ARG 1 options
 	METHOD method_48683 refresh ()V
 	METHOD method_48684 builder (I)Lnet/minecraft/class_8096$class_8097;
@@ -17,8 +17,7 @@ CLASS net/minecraft/class_8096 net/minecraft/client/gui/screen/world/WorldScreen
 			ARG 1 width
 		METHOD method_48685 marginLeft (I)Lnet/minecraft/class_8096$class_8097;
 			ARG 1 marginLeft
-		METHOD method_48686 build (Ljava/util/function/Consumer;)Lnet/minecraft/class_8096;
-			ARG 1 widgetConsumer
+		METHOD method_48686 build ()Lnet/minecraft/class_8096;
 		METHOD method_48687 add (Lnet/minecraft/class_2561;Ljava/util/function/BooleanSupplier;Ljava/util/function/Consumer;)Lnet/minecraft/class_8096$class_8099;
 			ARG 1 text
 			ARG 2 getter

diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping
@@ -42,9 +42,6 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget
 	METHOD method_25358 setWidth (I)V
 		ARG 1 width
 	METHOD method_25360 getNarrationMessage ()Lnet/minecraft/class_5250;
-	METHOD method_25361 clicked (DD)Z
-		ARG 1 mouseX
-		ARG 3 mouseY
 	METHOD method_25367 isSelected ()Z
 	METHOD method_25369 getMessage ()Lnet/minecraft/class_2561;
 	METHOD method_32602 getNarrationMessage (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250;

diff --git a/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping
@@ -50,5 +50,3 @@ CLASS net/minecraft/class_7529 net/minecraft/client/gui/widget/EditBoxWidget
 	METHOD method_44405 getText ()Ljava/lang/String;
 		COMMENT {@return the current text of the edit box}
 	METHOD method_44407 onCursorChange ()V
-	METHOD method_44408 getMaxLinesWithoutOverflow ()D
-		COMMENT {@return the maximum amount of lines the widget can hold without overflowing}
diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping
@@ -5,12 +5,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 	FIELD field_22744 centerListVertically Z
 	FIELD field_22747 renderHeader Z
 	FIELD field_22748 headerHeight I
-	FIELD field_22749 scrollAmount D
-	FIELD field_22750 scrolling Z
 	FIELD field_22751 selected Lnet/minecraft/class_350$class_351;
 	FIELD field_33780 hoveredEntry Lnet/minecraft/class_350$class_351;
-	FIELD field_45908 SCROLLER_TEXTURE Lnet/minecraft/class_2960;
-	FIELD field_49477 SCROLLER_BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_49478 MENU_LIST_BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_49892 INWORLD_MENU_LIST_BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_310;IIII)V
@@ -19,19 +15,11 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 		ARG 3 height
 		ARG 4 y
 		ARG 5 itemHeight
-	METHOD method_25307 setScrollAmount (D)V
-		ARG 1 amount
 	METHOD method_25308 getEntryAtPosition (DD)Lnet/minecraft/class_350$class_351;
 		ARG 1 x
 		ARG 3 y
 	METHOD method_25309 scroll (I)V
 		ARG 1 amount
-	METHOD method_25310 clickedHeader (II)Z
-		COMMENT Called when the header is clicked.
-		COMMENT
-		COMMENT @return {@code true} to indicate that the event handling is successful/valid
-		ARG 1 x
-		ARG 2 y
 	METHOD method_25311 renderList (Lnet/minecraft/class_332;IIF)V
 		ARG 1 context
 		ARG 2 mouseX
@@ -45,14 +33,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 		ARG 1 entry
 	METHOD method_25314 replaceEntries (Ljava/util/Collection;)V
 		ARG 1 newEntries
-	METHOD method_25315 setRenderHeader (ZI)V
-		ARG 1 renderHeader
-		ARG 2 headerHeight
-	METHOD method_25317 getMaxPosition ()I
-	METHOD method_25318 updateScrollingState (DDI)V
-		ARG 1 mouseX
-		ARG 3 mouseY
-		ARG 5 button
 	METHOD method_25319 getRowBottom (I)I
 		ARG 1 index
 	METHOD method_25320 renderDecorations (Lnet/minecraft/class_332;II)V
@@ -68,10 +48,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 		ARG 1 index
 	METHOD method_25328 ensureVisible (Lnet/minecraft/class_350$class_351;)V
 		ARG 1 entry
-	METHOD method_25329 getScrollbarX ()I
 	METHOD method_25330 removeEntry (Lnet/minecraft/class_350$class_351;)Z
 		ARG 1 entry
-	METHOD method_25331 getMaxScroll ()I
 	METHOD method_25332 isSelectedEntry (I)Z
 		ARG 1 index
 	METHOD method_25334 getSelectedOrNull ()Lnet/minecraft/class_350$class_351;
@@ -82,7 +60,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 		ARG 1 index
 	METHOD method_25339 clearEntries ()V
 	METHOD method_25340 getEntryCount ()I
-	METHOD method_25341 getScrollAmount ()D
 	METHOD method_25342 getRowLeft ()I
 	METHOD method_29621 setEntryParentList (Lnet/minecraft/class_350$class_351;)V
 		ARG 1 entry
@@ -126,10 +103,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 		ARG 0 entry
 	METHOD method_49603 enableScissor (Lnet/minecraft/class_332;)V
 		ARG 1 context
-	METHOD method_53812 isSelectButton (I)Z
-		ARG 1 button
-	METHOD method_57710 getBorderBoxLeft ()I
-	METHOD method_57711 getBorderBoxRight ()I
 	METHOD method_57712 position (ILnet/minecraft/class_8132;)V
 		ARG 1 width
 		ARG 2 layout
@@ -141,14 +114,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 		ARG 3 y
 	METHOD method_57715 drawMenuListBackground (Lnet/minecraft/class_332;)V
 		ARG 1 context
-	METHOD method_57716 getScrollbarMarginX ()I
-	METHOD method_57717 isScrollbarVisible ()Z
-	METHOD method_57718 getDefaultScrollbarX ()I
-	METHOD method_60321 setScrollAmountOnly (D)V
-		COMMENT Sets the scroll amount to {@code amount}. Unlike {@link #setScrollAmount},
-		COMMENT this has no side effects (like loading more entries).
-		ARG 1 amount
-	METHOD method_60322 refreshScroll ()V
 	METHOD method_64847 setSelected (I)V
 		ARG 1 index
 	CLASS class_351 Entry