match 24w19a to 24w18a

QuiltMC · May 11, 2024 · 9d4139a · 9d4139a · github-actions · May 11, 2024
1 parent 91da6e3
commit 9d4139a
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 3 deletions.
diff --git a/mappings/net/minecraft/block/DecoratedPotPatterns.mapping b/mappings/net/minecraft/block/DecoratedPotPatterns.mapping
@@ -2,3 +2,5 @@ CLASS net/minecraft/unmapped/C_hzdaoazh net/minecraft/block/DecoratedPotPatterns
 	FIELD f_tssagzls PATTERNS_BY_SHARDS Ljava/util/Map;
 	METHOD m_aoeizaaw createRegistryKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach;
 		ARG 0 id
+	METHOD m_hoejuqye registerPatterns (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_xtwumkqz;
+		ARG 0 registry
diff --git a/mappings/net/minecraft/block/LecternBlock.mapping b/mappings/net/minecraft/block/LecternBlock.mapping
@@ -13,12 +13,22 @@ CLASS net/minecraft/unmapped/C_ksjrzgfh net/minecraft/block/LecternBlock
 	FIELD f_wkugapry COLLISION_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
 	FIELD f_xjamdfmq SCHEDULED_TICK_DELAY I
 	FIELD f_zxoluqae SOUTH_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
+	METHOD m_kkgqosaq putBookIfAbsent (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+		ARG 4 stack
 	METHOD m_ohsjealo setHasBook (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Z)V
 		ARG 0 entity
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
 		ARG 4 hasBook
+	METHOD m_pjyxggqg putBook (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+		ARG 4 stack
 	METHOD m_prllyoro updateNeighborAlways (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V
 		ARG 0 world
 		ARG 1 pos

diff --git a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping
@@ -28,3 +28,6 @@ CLASS net/minecraft/unmapped/C_wmubauif net/minecraft/block/entity/CampfireBlock
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 campfire
+	METHOD m_yvsijcdr addItem (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sddaxwyk;I)Z
+		ARG 2 item
+		ARG 3 integer
diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping
@@ -48,6 +48,7 @@ CLASS net/minecraft/unmapped/C_vkaoetfp net/minecraft/client/render/TexturedRend
 		ARG 0 color
 	METHOD m_qkzvrnzr getShieldPatterns ()Lnet/minecraft/unmapped/C_tizlwnnv;
 	METHOD m_rhcsizsr getShulkerBoxes ()Lnet/minecraft/unmapped/C_tizlwnnv;
+	METHOD m_sjpjltgh createDecoratedPotPatternTextureId (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_djlixbky;
 	METHOD m_slzkbebv getArmorTrim (Z)Lnet/minecraft/unmapped/C_tizlwnnv;
 		ARG 0 decal
 	METHOD m_tkhoovme createSignTextureId (Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;

diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping
@@ -24,5 +24,6 @@ CLASS net/minecraft/unmapped/C_fdgmxpeq net/minecraft/datafixer/Schemas
 		ARG 0 id
 	METHOD m_njyysqpn (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 id
+	METHOD m_smsigeju create ()Lcom/mojang/datafixers/DataFixerBuilder$Result;
 	METHOD m_wlhblsil (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V
 		ARG 0 map
diff --git a/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping b/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping
@@ -1,10 +1,10 @@
 CLASS net/minecraft/unmapped/C_gdxvnoho net/minecraft/entity/passive/TadpoleEntity
 	FIELD f_epyeeylc tadpoleAge I
 	FIELD f_jetulgup growthAge I
-	FIELD f_jzehaawm hitboxHeight F
+	FIELD f_jzehaawm HITBOX_HEIGHT F
 	FIELD f_lhkulahc MODULES Lcom/google/common/collect/ImmutableList;
 	FIELD f_rfntsubn SENSORS Lcom/google/common/collect/ImmutableList;
-	FIELD f_weptgqet hitboxWidth F
+	FIELD f_weptgqet HITBOX_WIDTH F
 	METHOD m_dsreleic decrementStack (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_sddaxwyk;)V
 		ARG 1 player
 		ARG 2 stack

diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
@@ -296,7 +296,6 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 		COMMENT
 		COMMENT @see #copy
 		COMMENT @see #copyWithCount
-		COMMENT @see #copyComponentsToNewStack
 		ARG 1 item
 			COMMENT the resulting stack's item
 			COMMENT the resulting stack's item count

diff --git a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping
@@ -15,6 +15,7 @@ CLASS net/minecraft/unmapped/C_cbswsmdy net/minecraft/nbt/visitor/NbtTextFormatt
 	FIELD f_ogheuusq ENTRY_SEPARATOR Ljava/lang/String;
 	FIELD f_pgwezafl indentationLevel I
 	FIELD f_rajyruws INLINE_LIST_THRESHOLD I
+	FIELD f_rjnnlqdh result Lnet/minecraft/unmapped/C_npqneive;
 	FIELD f_rzppynhe SIMPLE_NAME Ljava/util/regex/Pattern;
 	FIELD f_sklpsqsb SPACE Ljava/lang/String;
 	FIELD f_uaacerjb CURLY_CLOSE_BRACKET Ljava/lang/String;

diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping
@@ -16,5 +16,8 @@ CLASS net/minecraft/unmapped/C_chysixjg net/minecraft/network/packet/s2c/play/En
 		ARG 1 entity
 	METHOD <init> (Lnet/minecraft/unmapped/C_idfydwco;)V
 		ARG 1 buf
+	METHOD m_iwjvqshx getVelocityZ ()D
 	METHOD m_lvqdezuq write (Lnet/minecraft/unmapped/C_idfydwco;)V
 	METHOD m_wlagaquq getId ()I
+	METHOD m_xnapsrij getVelocityY ()D
+	METHOD m_zzeszuks getVelocityX ()D
diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping
@@ -36,6 +36,8 @@ CLASS net/minecraft/unmapped/C_gkderdjo net/minecraft/server/world/ChunkHolder
 		ARG 2 postRun
 		ARG 3 executor
 		ARG 4 status
+	METHOD m_fnpxnlqk addSaveAction (Ljava/util/concurrent/CompletableFuture;)V
+		ARG 1 action
 	METHOD m_gjochkby getAccessibleFuture ()Ljava/util/concurrent/CompletableFuture;
 	METHOD m_hjqqoeij tick (Lnet/minecraft/unmapped/C_gxrpzacc;Ljava/util/concurrent/Executor;)V
 		ARG 1 chunkManager

diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/unmapped/C_ezymcfey net/minecraft/world/ChunkRegion
+	FIELD f_afffypez chunks Lnet/minecraft/unmapped/C_xgsefppr;
 	FIELD f_avgybjko currentlyGeneratingStructureName Ljava/util/function/Supplier;
 	FIELD f_bnhyiupf world Lnet/minecraft/unmapped/C_bdwnwhiu;
 	FIELD f_fgwyankg seed J

diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping
@@ -44,6 +44,12 @@ CLASS net/minecraft/unmapped/C_kgfalbim net/minecraft/world/gen/chunk/ChunkGener
 		ARG 4 randomState
 	METHOD m_dsmekobm getSettings (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_qbjpvmph;
 		ARG 1 biome
+	METHOD m_evqkkueh populateNoise (Lnet/minecraft/unmapped/C_pfqozslu;Lnet/minecraft/unmapped/C_edfiqifk;Lnet/minecraft/unmapped/C_rhdulivw;Lnet/minecraft/unmapped/C_lwzmmmqr;)Ljava/util/concurrent/CompletableFuture;
+		COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config.
+		ARG 1 blender
+		ARG 2 randomState
+		ARG 3 structureManager
+		ARG 4 chunk
 	METHOD m_eyzuuexw getHeight (IILnet/minecraft/unmapped/C_ybztoekc$C_wkdeqzbn;Lnet/minecraft/unmapped/C_qpninoyb;Lnet/minecraft/unmapped/C_edfiqifk;)I
 		COMMENT Returns the raw noise height of a column for use in structure generation.
 		ARG 1 x
@@ -76,6 +82,11 @@ CLASS net/minecraft/unmapped/C_kgfalbim net/minecraft/world/gen/chunk/ChunkGener
 		ARG 3 heightmap
 		ARG 4 world
 		ARG 5 randomState
+	METHOD m_jkzsezwm populateBiomes (Lnet/minecraft/unmapped/C_edfiqifk;Lnet/minecraft/unmapped/C_pfqozslu;Lnet/minecraft/unmapped/C_rhdulivw;Lnet/minecraft/unmapped/C_lwzmmmqr;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 randomState
+		ARG 2 blender
+		ARG 3 structureManager
+		ARG 4 chunk
 	METHOD m_jnrbhhio findFirst (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_odfnijdo;Lnet/minecraft/unmapped/C_hynzadkk;IZ)Lcom/mojang/datafixers/util/Pair;
 		ARG 2 structures
 		ARG 4 range