match 24w14a to 24w13a

ix0rai · Apr 3, 2024 · 46d7b2e · 46d7b2e
1 parent ff9c943
commit 46d7b2e
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 3 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ enigma = "2.2.1"
 enigma_plugin = "2.2.0"
 tiny_remapper = "0.7.2"
 stitch = "0.6.1"
-unpick = "3.0.6"
+unpick = "3.0.7"
 mapping_io = "0.3.0"
 javadoc_draftsman = "1.2.3"
 

diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
@@ -263,6 +263,10 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 	METHOD m_xaxtaifj isFaceFullSquare (Lnet/minecraft/unmapped/C_zscvhwbd;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
 		ARG 0 shape
 		ARG 1 side
+	METHOD m_xfcybcsi appendTooltip (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/List;Lnet/minecraft/unmapped/C_taebrtdw;)V
+		ARG 1 stack
+		ARG 3 tooltip
+		ARG 4 options
 	METHOD m_yobbjtvm getJumpVelocityMultiplier ()F
 	METHOD m_yujtcnah appendProperties (Lnet/minecraft/unmapped/C_ezfeikaq$C_mfnsmxhw;)V
 		ARG 1 builder

diff --git a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping
@@ -1,20 +1,28 @@
 CLASS net/minecraft/unmapped/C_rdabfjzm net/minecraft/component/type/BundleContentsComponent
+	FIELD f_ehknovtd weight Lorg/apache/commons/lang3/math/Fraction;
 	FIELD f_jpdcvazc DEFAULT Lnet/minecraft/unmapped/C_rdabfjzm;
 	FIELD f_kbkowtvy NO_STACK_INDEX I
 	FIELD f_pbnmkdnq stacks Ljava/util/List;
+	FIELD f_twsofqzh NESTED_BUNDLE_WEIGHT Lorg/apache/commons/lang3/math/Fraction;
 	METHOD <init> (Ljava/util/List;)V
 		ARG 1 stacks
+	METHOD m_dbhmfful getWeight ()Lorg/apache/commons/lang3/math/Fraction;
 	METHOD m_dpebwpki size ()I
 	METHOD m_kfcysouj isEmpty ()Z
 	METHOD m_ldhjoyix getStack (I)Lnet/minecraft/unmapped/C_sddaxwyk;
 		ARG 1 index
+	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/util/stream/Stream;
 	METHOD m_osbljvar (Lnet/minecraft/unmapped/C_rdabfjzm;)Ljava/util/List;
 		ARG 0 component
 	CLASS C_yphifkae Builder
+		FIELD f_jajsrtxb weight Lorg/apache/commons/lang3/math/Fraction;
 		FIELD f_yhroaggz stacks Ljava/util/List;
 		METHOD <init> (Lnet/minecraft/unmapped/C_rdabfjzm;)V
 			ARG 1 component
+		METHOD m_jgvkdksp getWeight ()Lorg/apache/commons/lang3/math/Fraction;
 		METHOD m_lrhhcvgk build ()Lnet/minecraft/unmapped/C_rdabfjzm;
 		METHOD m_njvlfmlu tryAdd (Lnet/minecraft/unmapped/C_sddaxwyk;)I
 		METHOD m_sycwuodw tryTransfer (Lnet/minecraft/unmapped/C_nhvqfffd;Lnet/minecraft/unmapped/C_jzrpycqo;)I

diff --git a/mappings/net/minecraft/datafixer/fix/ChoiceTypesFix.mapping b/mappings/net/minecraft/datafixer/fix/ChoiceTypesFix.mapping
@@ -5,4 +5,7 @@ CLASS net/minecraft/unmapped/C_wbchwrwe net/minecraft/datafixer/fix/ChoiceTypesF
 		ARG 1 outputSchema
 		ARG 2 name
 		ARG 3 types
+	METHOD m_onsgcccz fixChoiceTypes (Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;)Lcom/mojang/datafixers/TypeRewriteRule;
+		ARG 1 inputChoiceType
+		ARG 2 outputChoiceType
 	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;
diff --git a/mappings/net/minecraft/datafixer/fix/StructuresBecomeConfiguredFix.mapping b/mappings/net/minecraft/datafixer/fix/StructuresBecomeConfiguredFix.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/unmapped/C_ltckbkeg net/minecraft/datafixer/fix/StructuresBecomeConfiguredFix
 	FIELD f_lvcbyunm CONVERSION_MAP Ljava/util/Map;
+	METHOD m_btvnyjkt findUpdatedStructureType (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 	METHOD m_czbnopqr fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 	METHOD m_osmikeed guessConfiguration (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/unmapped/C_ltckbkeg$C_elsucrte;)Ljava/util/Optional;
 		ARG 2 conversion

diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping
@@ -165,11 +165,16 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item
 		ARG 0 world
 		ARG 1 player
 		ARG 2 fluidHandling
+	METHOD m_vlpdhsgt appendTooltip (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/List;Lnet/minecraft/unmapped/C_taebrtdw;)V
+		ARG 1 stack
+		ARG 3 tooltip
+		ARG 4 context
 	METHOD m_vptgdmsr getDrinkSound ()Lnet/minecraft/unmapped/C_avavozay;
 	METHOD m_wanuqhiu isUsedOnRelease (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
 		ARG 1 stack
 	METHOD m_wolmtjeu getItemBarColor (Lnet/minecraft/unmapped/C_sddaxwyk;)I
 		ARG 1 stack
+	METHOD m_xljmpsqi getAttributeModifiers ()Lnet/minecraft/unmapped/C_azfkqhlm;
 	METHOD m_ylkygzjm getComponents ()Lnet/minecraft/unmapped/C_kouhnfig;
 	METHOD m_yvddkccr getUseAction (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_olmwgcft;
 		ARG 1 stack

diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
@@ -296,6 +296,9 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 		COMMENT the resulting stack's item
 		COMMENT the resulting stack's item count
 	METHOD m_yrbtnzbt getRarity ()Lnet/minecraft/unmapped/C_mqmixksm;
+	METHOD m_ywdqmcbk getTooltip (Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_taebrtdw;)Ljava/util/List;
+		ARG 2 player
+		ARG 3 context
 	METHOD m_yzsowcuq (Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism;
 		ARG 1 style
 	METHOD m_zakagwqa set (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Ljava/lang/Object;

diff --git a/mappings/net/minecraft/util/ArrayListDeque.mapping b/mappings/net/minecraft/util/ArrayListDeque.mapping
@@ -8,8 +8,6 @@ CLASS net/minecraft/unmapped/C_scihbqqa net/minecraft/util/ArrayListDeque
 	METHOD add add (ILjava/lang/Object;)V
 		ARG 1 index
 		ARG 2 element
-	METHOD addFirst addFirst (Ljava/lang/Object;)V
-	METHOD addLast addLast (Ljava/lang/Object;)V
 	METHOD descendingIterator descendingIterator ()Ljava/util/Iterator;
 	METHOD forEach forEach (Ljava/util/function/Consumer;)V
 		ARG 1 action