From 3b275d27070aa2df9a979bd4e824cf7bc3a1ab32 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 1 Feb 2024 16:28:20 +0000 Subject: [PATCH] 24w05b --- build.gradle | 2 +- mappings/net/minecraft/class_8181.mapping | 3 --- .../net/minecraft/entity/effect/StatusEffectInstance.mapping | 1 - .../packet/s2c/play/EntityStatusEffectS2CPacket.mapping | 4 ++-- mappings/net/minecraft/util/dynamic/Codecs.mapping | 5 +---- 5 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 mappings/net/minecraft/class_8181.mapping diff --git a/build.gradle b/build.gradle index dd4dcdbb75..1fd1588843 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w05a" +def minecraft_version = "24w05b" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/class_8181.mapping b/mappings/net/minecraft/class_8181.mapping deleted file mode 100644 index 16ba0e32ef..0000000000 --- a/mappings/net/minecraft/class_8181.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_8181 - CLASS class_9210 - METHOD method_54080 asBlockEntity ()Lnet/minecraft/class_2586; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index f3d9260c3d..a530a0cbbb 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -133,7 +133,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 0 effect CLASS class_9195 Parameters FIELD field_48822 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_48823 AMPLIFIER_CODEC Lcom/mojang/serialization/Codec; METHOD method_56669 create (IIZZLjava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_1293$class_9195; ARG 0 amplifier ARG 1 duration diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index 3fd9d1dbc0..b39886878c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu FIELD field_12726 duration I FIELD field_12727 entityId I FIELD field_12728 flags B - FIELD field_12729 amplifier B + FIELD field_12729 amplifier I FIELD field_33356 AMBIENT_MASK I FIELD field_33357 SHOW_PARTICLES_MASK I FIELD field_33358 SHOW_ICON_MASK I @@ -18,7 +18,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11942 shouldShowIcon ()Z METHOD method_11943 getEntityId ()I METHOD method_11944 getDuration ()I - METHOD method_11945 getAmplifier ()B + METHOD method_11945 getAmplifier ()I METHOD method_11946 getEffectId ()Lnet/minecraft/class_6880; METHOD method_11949 shouldShowParticles ()Z METHOD method_11950 isAmbient ()Z diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 83aaa766c1..3160af4da8 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -300,8 +300,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 2 typeCodec ARG 3 typeGetter ARG 4 parametersCodecGetter - METHOD method_56627 createRecursiveMap (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; - ARG 0 codecFunction + METHOD method_56627 createRecursiveMap (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops @@ -488,8 +487,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 map CLASS class_9181 RecursiveMap FIELD field_48804 supplier Ljava/util/function/Supplier; - METHOD (Ljava/util/function/Function;)V - ARG 1 codecFunction METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input