match 24w14a to 1.20.5-pre1

ix0rai · Apr 11, 2024 · 7e5b99d · 7e5b99d
1 parent 39a5976
commit 7e5b99d
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 3 deletions.
diff --git a/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping b/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping
@@ -4,6 +4,8 @@ CLASS net/minecraft/unmapped/C_sridforj net/minecraft/block/dispenser/DispenserB
 	FIELD f_febfgklv CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD f_kigvivjn FACING Lnet/minecraft/unmapped/C_tcujuvjb;
 	FIELD f_mqswtdqm TRIGGERED Lnet/minecraft/unmapped/C_xhwijdsd;
+	METHOD m_fnobacze getBehaviorForItem (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ooeeaffg;
+		ARG 2 stack
 	METHOD m_jiinrsul registerBehavior (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ooeeaffg;)V
 		ARG 0 provider
 		ARG 1 behavior

diff --git a/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping b/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping
@@ -27,3 +27,5 @@ CLASS net/minecraft/unmapped/C_sqxxaglx net/minecraft/block/entity/BrewingStandB
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 blockEntity
+	METHOD m_zxndtyxk canCraft (Lnet/minecraft/unmapped/C_ilssplzn;Lnet/minecraft/unmapped/C_rnrfftze;)Z
+		ARG 1 slots
diff --git a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping
@@ -14,6 +14,7 @@ CLASS net/minecraft/unmapped/C_rdabfjzm net/minecraft/component/type/BundleConte
 	METHOD m_muzauxyd getWeight (Lnet/minecraft/unmapped/C_sddaxwyk;)Lorg/apache/commons/lang3/math/Fraction;
 	METHOD m_nhpzssxx computeContentWeight (Ljava/util/List;)Lorg/apache/commons/lang3/math/Fraction;
 		ARG 0 stacks
+	METHOD m_ofbuniku stream ()Ljava/lang/Iterable;
 	METHOD m_osbljvar (Lnet/minecraft/unmapped/C_rdabfjzm;)Ljava/util/List;
 		ARG 0 component
 	CLASS C_yphifkae Builder

diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping
@@ -7,6 +7,8 @@ CLASS net/minecraft/unmapped/C_qlclfxvn net/minecraft/component/type/ItemEnchant
 	FIELD f_zvqfplck CODEC Lcom/mojang/serialization/Codec;
 	METHOD m_cucglkdc getEnchantments ()Ljava/util/Set;
 	METHOD m_cuvyskeq size ()I
+	METHOD m_djmseype (Lnet/minecraft/unmapped/C_qlclfxvn;)Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;
+		ARG 0 component
 	METHOD m_gpefdzxc isEmpty ()Z
 	METHOD m_oldusysg (Lnet/minecraft/unmapped/C_qlclfxvn;)Ljava/lang/Boolean;
 		ARG 0 component
@@ -18,8 +20,11 @@ CLASS net/minecraft/unmapped/C_qlclfxvn net/minecraft/component/type/ItemEnchant
 		COMMENT @return a map with enchantments as keys and their levels as values
 	METHOD m_ugcgsgdf getLevel (Lnet/minecraft/unmapped/C_jxtrubuh;)I
 		ARG 1 enchantment
+	METHOD m_ylenfqyd (Lnet/minecraft/unmapped/C_qlclfxvn;)Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;
+		ARG 0 component
 	CLASS C_vbojeisc Builder
 		FIELD f_lvvemeqz shownInTooltip Z
+		FIELD f_omibnext enchantments Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;
 		METHOD <init> (Lnet/minecraft/unmapped/C_qlclfxvn;)V
 			ARG 1 component
 		METHOD m_emkouuul addTo (Lnet/minecraft/unmapped/C_jxtrubuh;I)V

diff --git a/mappings/net/minecraft/entity/effect/InfestedStatusEffect.mapping b/mappings/net/minecraft/entity/effect/InfestedStatusEffect.mapping
@@ -1 +1,5 @@
 CLASS net/minecraft/unmapped/C_oqpueoay net/minecraft/entity/effect/InfestedStatusEffect
+	METHOD m_qnqnjewe (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_usxaxydn;DDD)V
+		ARG 3 x
+		ARG 5 y
+		ARG 7 z
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
@@ -114,6 +114,8 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 	METHOD m_gwzgwsrv isEnchantable ()Z
 	METHOD m_hawykozc getMiningSpeedMultiplier (Lnet/minecraft/unmapped/C_txtbiemp;)F
 		ARG 1 state
+	METHOD m_hdopgosb appendTooltip (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_taebrtdw;)V
+		ARG 1 type
 	METHOD m_hmrpegvi onClickedOnOther (Lnet/minecraft/unmapped/C_nhvqfffd;Lnet/minecraft/unmapped/C_qcuteihm;Lnet/minecraft/unmapped/C_jzrpycqo;)Z
 		COMMENT Called when the stack is placed on another {@link ItemStack} in a slot.
 		COMMENT

diff --git a/mappings/net/minecraft/item/ItemUsage.mapping b/mappings/net/minecraft/item/ItemUsage.mapping
@@ -6,6 +6,8 @@ CLASS net/minecraft/unmapped/C_hcavgpph net/minecraft/item/ItemUsage
 		ARG 1 player
 		ARG 2 outputStack
 		ARG 3 creativeOverride
+	METHOD m_jtqrwfrz spawnItemContents (Lnet/minecraft/unmapped/C_uqpzijng;Ljava/lang/Iterable;)V
+		ARG 0 itemEntity
 	METHOD m_ryjfhcxq exchangeStack (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
 		ARG 0 inputStack
 		ARG 1 player

diff --git a/mappings/net/minecraft/item/TooltipAppender.mapping b/mappings/net/minecraft/item/TooltipAppender.mapping
@@ -1 +1,4 @@
 CLASS net/minecraft/unmapped/C_lcgmmrzz net/minecraft/item/TooltipAppender
+	METHOD m_eqoeoqpg appendToTooltip (Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_taebrtdw;)V
+		ARG 2 tooltipConsumer
+		ARG 3 context
diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/unmapped/C_zwjmmlxa net/minecraft/loot/function/SetContentsLootFunction
 	FIELD f_nbcugmpv entries Ljava/util/List;
+	METHOD m_eupdzfta builder (Lnet/minecraft/unmapped/C_vgxbedbz;)Lnet/minecraft/unmapped/C_zwjmmlxa$C_fgnbywgn;
 	CLASS C_fgnbywgn Builder
 		FIELD f_nzftxexh entries Lcom/google/common/collect/ImmutableList$Builder;
 		METHOD m_gqwizxli withEntry (Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)Lnet/minecraft/unmapped/C_zwjmmlxa$C_fgnbywgn;

diff --git a/mappings/net/minecraft/util/UuidUtil.mapping b/mappings/net/minecraft/util/UuidUtil.mapping
@@ -1,13 +1,13 @@
 CLASS net/minecraft/unmapped/C_lnkdxaag net/minecraft/util/UuidUtil
 	FIELD f_gkrkcjdf LINKED_SET_CODEC Lcom/mojang/serialization/Codec;
-	FIELD f_izozosqs strictCodec Lcom/mojang/serialization/Codec;
+	FIELD f_izozosqs STRICT_CODEC Lcom/mojang/serialization/Codec;
 	FIELD f_olthzhei SET_CODEC Lcom/mojang/serialization/Codec;
 	FIELD f_pqcbhakr OFFLINE_PLAYER_UUID_PREFIX Ljava/lang/String;
 	FIELD f_shhnagps STRING_CODEC Lcom/mojang/serialization/Codec;
 	FIELD f_skkpzqgc BYTES I
 	FIELD f_ucvvescp INT_STREAM_CODEC Lcom/mojang/serialization/Codec;
-	FIELD f_vhkeckzh packetCodec Lnet/minecraft/unmapped/C_qsrmwluu;
-	FIELD f_ycyzmtsu codec Lcom/mojang/serialization/Codec;
+	FIELD f_vhkeckzh PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
+	FIELD f_ycyzmtsu CODEC Lcom/mojang/serialization/Codec;
 	METHOD m_athamxxt createOfflinePlayerProfile (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile;
 		ARG 0 username
 	METHOD m_dhjcvmlb toIntArray (JJ)[I

diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping
@@ -96,6 +96,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 		ARG 3 combineFunction
 		ARG 4 leftFunction
 		ARG 5 rightFunction
+	METHOD m_pqmgxbkr (Ljava/util/List;)Lorg/joml/Vector4f;
+		ARG 0 list2
 	METHOD m_sltnwzrc createRangedFloat (FFLjava/util/function/Function;)Lcom/mojang/serialization/Codec;
 		ARG 0 min
 		ARG 1 max
@@ -106,6 +108,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 	METHOD m_wifswwjp object2BooleanMap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 	METHOD m_wnlfxiwt (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
 		ARG 0 list
+	METHOD m_wyxpcupd (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Ljava/util/List;
+		ARG 2 object
 	CLASS C_cuqomsnk ContextRetrievalCodec
 		METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult;
 			ARG 1 ops

diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping
@@ -56,6 +56,8 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers
 			ARG 5 price
 			ARG 6 maxUses
 			ARG 7 experience
+		METHOD m_yldrsluy (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Z
+			ARG 1 potion
 	CLASS C_bcdfyrkn Factory
 		COMMENT A factory to create trade offers.
 		METHOD m_goekcyhx create (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_argwryfu;

diff --git a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
@@ -14,6 +14,7 @@ CLASS net/minecraft/unmapped/C_dmexlawk net/minecraft/world/explosion/ExplosionB
 		ARG 3 pos
 		ARG 4 state
 		ARG 5 power
+	METHOD m_vcortgkd getKnockbackMultiplier (Lnet/minecraft/unmapped/C_astfners;)F
 	METHOD m_vuqczogj shouldDamage (Lnet/minecraft/unmapped/C_aahhrzpf;Lnet/minecraft/unmapped/C_astfners;)Z
 		ARG 1 explosion
 		ARG 2 entity
diff --git a/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping b/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping
@@ -13,6 +13,7 @@ CLASS net/minecraft/unmapped/C_lrgmspwm net/minecraft/world/gen/StructureWeightS
 		ARG 2 z
 	METHOD m_jhbzjwqp ([F)V
 		ARG 0 array
+	METHOD m_pwvckvfg getMagnitudeWeight (DDD)D
 	CLASS C_cwnhqvqb Rigid
 		FIELD f_rvbqrvre box Lnet/minecraft/unmapped/C_hmqypqzz;
 		FIELD f_shhraeev terrainAdjustment Lnet/minecraft/unmapped/C_djexrdop;