Merge branch '24w34a' into registries-param

FabricMC · Aug 23, 2024 · 758e896 · 758e896
2 parents 2955933 + 8970d3f
commit 758e896
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@@ -230,7 +230,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT <p>This <strong>must be called</strong> when something changed in a way that
 		COMMENT affects the saved NBT; otherwise, the game might not save the block entity.
 	METHOD method_57567 addComponents (Lnet/minecraft/class_9323$class_9324;)V
-		ARG 1 componentMapBuilder
+		ARG 1 builder
 	METHOD method_57568 readComponents (Lnet/minecraft/class_2586$class_9473;)V
 		ARG 1 components
 	METHOD method_57569 removeFromCopiedStackNbt (Lnet/minecraft/class_2487;)V

diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -73,8 +73,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		COMMENT Called when a screen should be initialized.
 		COMMENT
 		COMMENT <p>This method is called when this screen is {@linkplain net.minecraft.client.MinecraftClient#setScreen(Screen) opened} or resized.
-		COMMENT
-		COMMENT <p>This should call {@link #setInitialFocus} to set the element that is initially focused.
 	METHOD method_25429 addSelectableChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364;
 		ARG 1 child
 	METHOD method_25430 handleTextClick (Lnet/minecraft/class_2583;)Z
@@ -152,7 +150,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 1 direction
 	METHOD method_48265 setInitialFocus (Lnet/minecraft/class_364;)V
 		COMMENT Sets the initial focus of this screen. This should be called inside the overridden
-		COMMENT {@link #init()} method by screen implementations.
+		COMMENT {@link #setInitialFocus()} method by screen implementations.
 		ARG 1 element
 	METHOD method_48266 getTabNavigation ()Lnet/minecraft/class_8023$class_8026;
 	METHOD method_48267 blur ()V
@@ -168,6 +166,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 1 context
 	METHOD method_53870 getUsageNarrationText ()Lnet/minecraft/class_2561;
 	METHOD method_56131 setInitialFocus ()V
+		COMMENT This should be overriden with a call to {@link #setInitialFocus(Element)} to set the element that is initially focused.
 	METHOD method_57728 renderPanoramaBackground (Lnet/minecraft/class_332;F)V
 		ARG 1 context
 		ARG 2 delta

diff --git a/mappings/net/minecraft/data/server/recipe/RecipeGenerator.mapping b/mappings/net/minecraft/data/server/recipe/RecipeGenerator.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeGenerator
 	FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map;
 	FIELD field_48981 registries Lnet/minecraft/class_7225$class_7874;
 	FIELD field_53721 exporter Lnet/minecraft/class_8790;
-	FIELD field_53722 registryLookup Lnet/minecraft/class_7871;
+	FIELD field_53722 itemLookup Lnet/minecraft/class_7871;
 	METHOD <init> (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8790;)V
 		ARG 1 registries
 		ARG 2 exporter

diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
@@ -13,7 +13,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 	FIELD field_42644 MAX_JUMP_STRENGTH_BONUS F
 	FIELD field_42645 MIN_HEALTH_BONUS F
 	FIELD field_42646 MAX_HEALTH_BONUS F
-	FIELD field_48830 inventory Lnet/minecraft/class_1263;
+	FIELD field_48830 armorInventory Lnet/minecraft/class_1263;
 	FIELD field_6955 temper I
 	FIELD field_6956 IS_BRED_HORSE Ljava/util/function/Predicate;
 	FIELD field_6957 tailWagTicks I
@@ -73,7 +73,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 	METHOD method_49996 isWooden (Lnet/minecraft/class_2498;)Z
 		ARG 1 soundGroup
 	METHOD method_56679 updateSaddledFlag ()V
-	METHOD method_56680 getInventory ()Lnet/minecraft/class_1263;
+	METHOD method_56680 getArmorInventory ()Lnet/minecraft/class_1263;
 	METHOD method_58392 (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
 	METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V

diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
@@ -210,7 +210,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 2 builder
 	METHOD method_57357 canPlaceOn (Lnet/minecraft/class_2694;)Z
 		ARG 1 pos
-	METHOD method_57358 encode (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2520;
+	METHOD method_57358 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2520;
 		ARG 1 registries
 	METHOD method_57359 fromNbtOrEmpty (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1799;
 		ARG 0 registries
@@ -285,9 +285,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 1 pos
 	METHOD method_57374 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult;
 		ARG 0 entry
-	METHOD method_57375 encodeAllowEmpty (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2520;
+	METHOD method_57375 toNbtAllowEmpty (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2520;
 		ARG 1 registries
-	METHOD method_57376 encode (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520;
+	METHOD method_57376 toNbt (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520;
 		ARG 1 registries
 		ARG 2 prefix
 	METHOD method_57377 (Ljava/lang/String;)V

diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping
@@ -27,7 +27,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe
 		COMMENT {@return a preview of the recipe's output}
 		COMMENT
 		COMMENT <p>The returned stack should not be modified. To obtain the actual output,
-		COMMENT call {@link #craft(Inventory, DynamicRegistryManager)}.
+		COMMENT call {@link #craft(RecipeInput, RegistryWrapper.WrapperLookup)}.
 		ARG 1 registries
 	METHOD method_8111 getRemainder (Lnet/minecraft/class_9695;)Lnet/minecraft/class_2371;
 		COMMENT {@return the remaining stacks to be left in the {@code inventory} after the recipe is used}

diff --git a/mappings/net/minecraft/recipe/input/RecipeInput.mapping b/mappings/net/minecraft/recipe/input/RecipeInput.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_9695 net/minecraft/recipe/input/RecipeInput
-	METHOD method_59983 getSize ()I
+	METHOD method_59983 size ()I
 	METHOD method_59984 getStackInSlot (I)Lnet/minecraft/class_1799;
 		ARG 1 slot
 	METHOD method_59987 isEmpty ()Z
diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping
@@ -32,7 +32,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager
 	METHOD method_14042 addTicket (JLnet/minecraft/class_3228;)V
 		ARG 1 position
 		ARG 3 ticket
-	METHOD method_14045 purge ()V
+	METHOD method_14045 purgeExpiredTickets ()V
 	METHOD method_14046 getLevel (Lnet/minecraft/class_4706;)I
 		ARG 0 tickets
 	METHOD method_14048 handleChunkEnter (Lnet/minecraft/class_4076;Lnet/minecraft/class_3222;)V

diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping
@@ -13,7 +13,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor
 	FIELD field_9168 command Ljava/lang/String;
 	FIELD field_9169 DATE_FORMAT Ljava/text/SimpleDateFormat;
 	METHOD method_52175 isEditable ()Z
-	METHOD method_57558 getCustomNameNullable ()Lnet/minecraft/class_2561;
+	METHOD method_57558 getCustomName ()Lnet/minecraft/class_2561;
 	METHOD method_8286 setCommand (Ljava/lang/String;)V
 		ARG 1 command
 	METHOD method_8287 setTrackOutput (Z)V
@@ -37,7 +37,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor
 		ARG 2 registries
 	METHOD method_8298 setSuccessCount (I)V
 		ARG 1 successCount
-	METHOD method_8299 getCustomName ()Lnet/minecraft/class_2561;
+	METHOD method_8299 getName ()Lnet/minecraft/class_2561;
 	METHOD method_8300 getPos ()Lnet/minecraft/class_243;
 	METHOD method_8301 execute (Lnet/minecraft/class_1937;)Z
 		ARG 1 world