From 35367baa99a002c20eba10afb29a1a08afde063f Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 30 Mar 2022 18:18:27 +0900 Subject: [PATCH] 22w12a entity (#3060) * 22w12a entity * Fix shnupbups PR conflict --- .../effect/StatusEffectInstance.mapping | 38 +++++++++++++++++++ .../entity/mob/RavagerEntity.mapping | 2 + .../play/EntityStatusEffectS2CPacket.mapping | 2 + 3 files changed, 42 insertions(+) diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index acc171efed..830f8c6873 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -44,6 +44,9 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 5 showParticles ARG 6 showIcon ARG 7 hiddenEffect + ARG 8 factorCalculationData + METHOD (Lnet/minecraft/class_1293;)V + ARG 1 instance METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z @@ -56,6 +59,14 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_24277 writeTypelessNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_42129 getFactorCalculationData ()Ljava/util/Optional; + METHOD method_42130 (ILnet/minecraft/class_1293$class_7247;)V + ARG 2 factorCalculationData + METHOD method_42131 (Lnet/minecraft/class_1293$class_7247;)V + ARG 1 factorCalculationData + METHOD method_42132 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1293$class_7247;)V + ARG 1 factorCalculationData + METHOD method_42133 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 factorCalculationDataNbt METHOD method_5578 getAmplifier ()I METHOD method_5579 getEffectType ()Lnet/minecraft/class_1291; METHOD method_5580 setPermanent (Z)V @@ -79,10 +90,37 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_5592 shouldShowIcon ()Z METHOD method_5593 isPermanent ()Z CLASS class_7247 FactorCalculationData + FIELD field_38085 CODEC Lcom/mojang/serialization/Codec; + FIELD field_38086 paddingDuration I FIELD field_38087 factorTarget F FIELD field_38088 factorCurrent F FIELD field_38089 effectChangedTimestamp I FIELD field_38090 factorPreviousFrame F FIELD field_38091 hadEffectLastTick Z + METHOD (I)V + ARG 1 paddingDuration + METHOD (IFFIFZ)V + ARG 1 paddingDuration + ARG 2 factorTarget + ARG 3 factorCurrent + ARG 4 effectChangedTimestamp + ARG 5 factorPreviousFrame + ARG 6 hadEffectLastTick METHOD method_42134 lerp (F)F + ARG 1 factor + METHOD method_42135 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Boolean; + ARG 0 data METHOD method_42136 update (Lnet/minecraft/class_1293;)V + ARG 1 instance + METHOD method_42137 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_42138 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; + ARG 0 data + METHOD method_42139 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Integer; + ARG 0 data + METHOD method_42140 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; + ARG 0 data + METHOD method_42141 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; + ARG 0 data + METHOD method_42142 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Integer; + ARG 0 data diff --git a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping index 3f8003f1a3..6d92141716 100644 --- a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_1584 net/minecraft/entity/mob/RavagerEntity METHOD method_26920 createRavagerAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_39955 (Lnet/minecraft/class_1309;)Z ARG 0 entity + METHOD method_42168 canBecomePrimaryPassenger (Lnet/minecraft/class_1297;)Z + ARG 1 entity METHOD method_7068 knockBack (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_7069 (Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index b06036da3d..0fc458996d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu FIELD field_33356 AMBIENT_MASK I FIELD field_33357 SHOW_PARTICLES_MASK I FIELD field_33358 SHOW_ICON_MASK I + FIELD field_38364 factorCalculationData Lnet/minecraft/class_1293$class_7247; METHOD (ILnet/minecraft/class_1293;)V ARG 1 entityId ARG 2 effect @@ -20,3 +21,4 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11947 isPermanent ()Z METHOD method_11949 shouldShowParticles ()Z METHOD method_11950 isAmbient ()Z + METHOD method_42625 getFactorCalculationData ()Lnet/minecraft/class_1293$class_7247;