match 24w05b to 24w05a

QuiltMC · Feb 1, 2024 · e0d7fc1 · e0d7fc1 · github-actions · Feb 1, 2024
1 parent 9fa7916
commit e0d7fc1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectUpdateS2CPacket.mapping
@@ -7,6 +7,7 @@ CLASS net/minecraft/unmapped/C_acpvlppz net/minecraft/network/packet/s2c/play/En
 	FIELD f_vswzayjb effect Lnet/minecraft/unmapped/C_cjzoxshv;
 	FIELD f_wkbihzch SHOW_ICON_MASK I
 	FIELD f_wqrumdqo BLEND_MASK I
+	FIELD f_xctbcvat amplifier I
 	FIELD f_zshtutdu CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
 	METHOD <init> (ILnet/minecraft/unmapped/C_wpfizwve;Z)V
 		ARG 2 statusEffect
@@ -17,6 +18,7 @@ CLASS net/minecraft/unmapped/C_acpvlppz net/minecraft/network/packet/s2c/play/En
 	METHOD m_atyfnwxc write (Lnet/minecraft/unmapped/C_bngyzsts;)V
 		ARG 1 buf
 	METHOD m_dqsdynsy shouldBlend ()Z
+	METHOD m_ejqwrjsm getAmplifier ()I
 	METHOD m_gnnkoxnt getEntityId ()I
 	METHOD m_ippjoudz getDuration ()I
 	METHOD m_npifxzya isAmbient ()Z

diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping
@@ -49,6 +49,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 		ARG 4 parameterCodecGetter
 	METHOD m_dmqewsll (Lorg/joml/Quaternionf;)Ljava/util/List;
 		ARG 0 quaternionf
+	METHOD m_dnfhmcbw (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object;
+		ARG 0 either
 	METHOD m_dujfhivb orElsePartial (Ljava/lang/Object;)Lcom/mojang/serialization/Codec$ResultFunction;
 		ARG 0 partial
 	METHOD m_flhgmmki fromOps (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Codec;
@@ -61,10 +63,14 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 	METHOD m_gtuotoel createStrictUnboundedMap (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_tyjpezxh$C_psivvwhx;
 		ARG 0 keyCodec
 		ARG 1 elementCodec
+	METHOD m_hsukemqs (Ljava/lang/Integer;)Ljava/lang/String;
+		ARG 0 id
 	METHOD m_ifdvuwzy formattedTime (Ljava/time/format/DateTimeFormatter;)Lcom/mojang/serialization/Codec;
 		ARG 0 formatter
 	METHOD m_ihvqsgya retrieveContext (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 retriever
+	METHOD m_izqjachd (Ljava/lang/Object;)Ljava/lang/String;
+		ARG 0 element
 	METHOD m_juozehmq withNonEmptyHolderSet (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 codec
 	METHOD m_kbffjffi exceptionCatchingDecoder (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
@@ -119,6 +125,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 		ARG 0 json
 	METHOD m_mfpnjepb (Ljava/util/List;)Lorg/joml/Vector3f;
 		ARG 0 list1
+	METHOD m_mgvopkql (Lcom/mojang/authlib/properties/PropertyMap;Ljava/lang/String;Ljava/util/List;)V
+		ARG 2 list
 	METHOD m_mrsshdck createEither (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_tyjpezxh$C_utmdutep;
 		ARG 0 first
 		ARG 1 second
@@ -129,6 +137,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 	METHOD m_nuxvjbjt createRangedInt (II)Lcom/mojang/serialization/Codec;
 		ARG 0 min
 		ARG 1 max
+	METHOD m_paojkcnu (Lcom/mojang/authlib/properties/PropertyMap;Ljava/util/List;)V
+		ARG 0 propertyMap
 	METHOD m_pbrvpbbc (Lorg/joml/AxisAngle4f;)Ljava/lang/Float;
 		ARG 0 axisAngle4f
 	METHOD m_pknstmhl createCodecForPairObject (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
@@ -140,6 +150,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 		ARG 5 rightFunction
 	METHOD m_pqmgxbkr (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
 		ARG 0 list
+	METHOD m_qunssoca (Ljava/lang/String;III)Ljava/lang/String;
+		ARG 0 string
 	METHOD m_qwhsnheh (Ljava/lang/Object;)Ljava/lang/Object;
 		ARG 0 object
 	METHOD m_segfvobg createRecursive (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
@@ -173,6 +185,12 @@ 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 (Lorg/joml/Vector3f;)Ljava/util/List;
 		ARG 0 vector3f
+	METHOD m_wxkgkkvl (Ljava/util/function/BiFunction;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+		ARG 1 object
+	METHOD m_yffzvlqa (Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/authlib/properties/Property;
+		ARG 0 key
+	METHOD m_ywccywds (Ljava/lang/String;)Ljava/lang/String;
+		ARG 0 string
 	METHOD m_yxbdjpqp createLazy (Ljava/util/function/Supplier;)Lcom/mojang/serialization/Codec;
 		ARG 0 supplier
 	CLASS C_cuphesbl Xor