mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Status effect stufff (#1068) 

* Minor status effect stuff

Signed-off-by: liach <liach@users.noreply.github.com>

* hiddenEffect

Signed-off-by: liach <liach@users.noreply.github.com>

* Err

Signed-off-by: liach <liach@users.noreply.github.com>
This commit is contained in:
liach 2020-01-24 04:10:35 -06:00 committed by modmuss50
parent 3c381aab9f
commit 4f26ca97bd
5 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/entity/effect/DamageModifierStatusEffect.mapping
View File

@ -1,4 +1,6 @@
CLASS net/minecraft/class_1287 net/minecraft/entity/effect/DamageModifierStatusEffect
FIELD field_5881 modifier D
METHOD <init> (Lnet/minecraft/class_4081;ID)V
ARG 1 type
ARG 2 color
ARG 3 modifier

3
mappings/net/minecraft/entity/effect/StatusEffect.mapping
View File

@ -9,6 +9,7 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
METHOD method_18792 getType ()Lnet/minecraft/class_4081;
METHOD method_5552 canApplyUpdateEffect (II)Z
ARG 1 duration
ARG 2 amplifier
METHOD method_5554 getRawId (Lnet/minecraft/class_1291;)I
ARG 0 type
METHOD method_5555 onApplied (Lnet/minecraft/class_1309;Lnet/minecraft/class_1325;I)V
@ -31,6 +32,7 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
ARG 2 attacker
ARG 3 target
ARG 4 amplifier
ARG 5 proximity
METHOD method_5565 getAttributeModifiers ()Ljava/util/Map;
METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_1320;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291;
ARG 1 attribute
@ -42,4 +44,5 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
ARG 0 rawId
METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)V
ARG 1 entity
ARG 2 amplifier
METHOD method_5573 isBeneficial ()Z

29
mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
View File

@ -1,4 +1,10 @@
CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
FIELD field_21830 hiddenEffect Lnet/minecraft/class_1293;
COMMENT The effect hidden when upgrading effects. Duration decreases with this
COMMENT effect.
COMMENT
COMMENT <p>This exists so that long-duration low-amplifier effects reappears
COMMENT after short-duration high-amplifier effects run out.
FIELD field_5889 showIcon Z
FIELD field_5890 showParticles Z
FIELD field_5891 permanent Z
@ -23,6 +29,13 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
ARG 3 amplifier
ARG 4 ambient
ARG 5 visible
METHOD <init> (Lnet/minecraft/class_1291;IIZZZ)V
ARG 1 type
ARG 2 duration
ARG 3 amplifier
ARG 4 ambient
ARG 5 showParticles
ARG 6 showIcon
METHOD <init> (Lnet/minecraft/class_1291;IIZZZLnet/minecraft/class_1293;)V
ARG 1 type
ARG 2 duration
@ -30,25 +43,37 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
ARG 4 ambient
ARG 5 showParticles
ARG 6 showIcon
ARG 7 hiddenEffect
METHOD <init> (Lnet/minecraft/class_1293;)V
ARG 1 that
METHOD compareTo (Ljava/lang/Object;)I
ARG 1 that
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_24275 fromTag (Lnet/minecraft/class_1291;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293;
ARG 0 type
ARG 1 tag
METHOD method_24276 copyFrom (Lnet/minecraft/class_1293;)V
ARG 1 that
METHOD method_24277 typelessToTag (Lnet/minecraft/class_2487;)V
ARG 1 tag
METHOD method_5578 getAmplifier ()I
METHOD method_5579 getEffectType ()Lnet/minecraft/class_1291;
METHOD method_5580 setPermanent (Z)V
ARG 1 permanent
METHOD method_5581 shouldShowParticles ()Z
METHOD method_5582 serialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
METHOD method_5583 deserialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293;
METHOD method_5582 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
ARG 1 tag
METHOD method_5583 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293;
ARG 0 tag
METHOD method_5584 getDuration ()I
METHOD method_5585 update (Lnet/minecraft/class_1309;Ljava/lang/Runnable;)Z
ARG 1 entity
ARG 2 overwriteCallback
METHOD method_5586 getTranslationKey ()Ljava/lang/String;
METHOD method_5588 updateDuration ()I
METHOD method_5589 applyUpdateEffect (Lnet/minecraft/class_1309;)V
ARG 1 entity
METHOD method_5590 upgrade (Lnet/minecraft/class_1293;)Z
ARG 1 that
METHOD method_5591 isAmbient ()Z

3
mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping
View File

@ -1,7 +1,10 @@
CLASS net/minecraft/class_1292 net/minecraft/entity/effect/StatusEffectUtil
METHOD method_5574 hasWaterBreathing (Lnet/minecraft/class_1309;)Z
ARG 0 entity
METHOD method_5575 getHasteAmplifier (Lnet/minecraft/class_1309;)I
ARG 0 entity
METHOD method_5576 hasHaste (Lnet/minecraft/class_1309;)Z
ARG 0 entity
METHOD method_5577 durationToString (Lnet/minecraft/class_1293;F)Ljava/lang/String;
ARG 0 effect
ARG 1 multiplier

3
mappings/net/minecraft/entity/effect/StatusEffects.mapping
View File

@ -1,2 +1,5 @@
CLASS net/minecraft/class_1294 net/minecraft/entity/effect/StatusEffects
METHOD method_5594 register (ILjava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291;
ARG 0 rawId
ARG 1 id
ARG 2 entry