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

StatusEffectType -> StatusEffectCategory (#1036) 

StatusEffect -> StatusEffectType
StatusEfectInstance -> StatusEffect
(and related names)
This commit is contained in:
dexman545 2020-05-28 21:52:14 -04:00
parent b4c940c711
commit 07f887a3d2
10 changed files with 136 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/entity/effect/AbsorptionStatusEffect.mapping → mappings/net/minecraft/entity/effect/AbsorptionStatusEffectType.mapping
View File

@ -1 +1 @@
CLASS net/minecraft/class_1288 net/minecraft/entity/effect/AbsorptionStatusEffect
CLASS net/minecraft/class_1288 net/minecraft/entity/effect/AbsorptionStatusEffectType

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

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

2
mappings/net/minecraft/entity/effect/HealthBoostStatusEffect.mapping → mappings/net/minecraft/entity/effect/HealthBoostStatusEffectType.mapping
View File

@ -1 +1 @@
CLASS net/minecraft/class_1290 net/minecraft/entity/effect/HealthBoostStatusEffect
CLASS net/minecraft/class_1290 net/minecraft/entity/effect/HealthBoostStatusEffectType

2
mappings/net/minecraft/entity/effect/InstantStatusEffect.mapping → mappings/net/minecraft/entity/effect/InstantStatusEffectType.mapping
View File

@ -1 +1 @@
CLASS net/minecraft/class_1289 net/minecraft/entity/effect/InstantStatusEffect
CLASS net/minecraft/class_1289 net/minecraft/entity/effect/InstantStatusEffectType

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

@ -1,48 +1,81 @@
CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
FIELD field_18270 type Lnet/minecraft/class_4081;
FIELD field_5883 translationKey Ljava/lang/String;
FIELD field_5885 attributeModifiers Ljava/util/Map;
FIELD field_5886 color I
METHOD <init> (Lnet/minecraft/class_4081;I)V
CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffect
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
FIELD field_5892 ambient Z
FIELD field_5893 amplifier I
FIELD field_5894 splash Z
FIELD field_5895 duration I
FIELD field_5896 type Lnet/minecraft/class_1291;
FIELD field_5897 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD <init> (Lnet/minecraft/class_1291;)V
ARG 1 type
ARG 2 color
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
METHOD <init> (Lnet/minecraft/class_1291;I)V
ARG 1 type
ARG 2 duration
METHOD <init> (Lnet/minecraft/class_1291;II)V
ARG 1 type
ARG 2 duration
ARG 3 amplifier
METHOD <init> (Lnet/minecraft/class_1291;IIZZ)V
ARG 1 type
ARG 2 duration
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
ARG 3 amplifier
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
METHOD method_5555 onApplied (Lnet/minecraft/class_1309;Lnet/minecraft/class_5131;I)V
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 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 attributes
ARG 3 amplifier
METHOD method_5556 getColor ()I
METHOD method_5559 loadTranslationKey ()Ljava/lang/String;
METHOD method_5560 getName ()Lnet/minecraft/class_2561;
METHOD method_5561 isInstant ()Z
METHOD method_5562 onRemoved (Lnet/minecraft/class_1309;Lnet/minecraft/class_5131;I)V
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
ARG 2 attributes
ARG 3 amplifier
METHOD method_5563 adjustModifierAmount (ILnet/minecraft/class_1322;)D
ARG 1 amplifier
ARG 2 modifier
METHOD method_5564 applyInstantEffect (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;ID)V
ARG 1 source
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
ARG 2 uuid
ARG 3 amount
ARG 5 operation
METHOD method_5567 getTranslationKey ()Ljava/lang/String;
METHOD method_5569 byRawId (I)Lnet/minecraft/class_1291;
ARG 0 rawId
METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)V
ARG 1 entity
ARG 2 amplifier
METHOD method_5573 isBeneficial ()Z
METHOD method_5590 upgrade (Lnet/minecraft/class_1293;)Z
ARG 1 that
METHOD method_5591 isAmbient ()Z
METHOD method_5592 shouldShowIcon ()Z
METHOD method_5593 isPermanent ()Z

5
mappings/net/minecraft/entity/effect/StatusEffectCategory.mapping Normal file
View File

@ -0,0 +1,5 @@
CLASS net/minecraft/class_4081 net/minecraft/entity/effect/StatusEffectCategory
FIELD field_18274 formatting Lnet/minecraft/class_124;
METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_124;)V
ARG 3 format
METHOD method_18793 getFormatting ()Lnet/minecraft/class_124;

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

@ -1,81 +0,0 @@
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
FIELD field_5892 ambient Z
FIELD field_5893 amplifier I
FIELD field_5894 splash Z
FIELD field_5895 duration I
FIELD field_5896 type Lnet/minecraft/class_1291;
FIELD field_5897 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD <init> (Lnet/minecraft/class_1291;)V
ARG 1 type
METHOD <init> (Lnet/minecraft/class_1291;I)V
ARG 1 type
ARG 2 duration
METHOD <init> (Lnet/minecraft/class_1291;II)V
ARG 1 type
ARG 2 duration
ARG 3 amplifier
METHOD <init> (Lnet/minecraft/class_1291;IIZZ)V
ARG 1 type
ARG 2 duration
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
ARG 3 amplifier
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 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
METHOD method_5592 shouldShowIcon ()Z
METHOD method_5593 isPermanent ()Z

53
mappings/net/minecraft/entity/effect/StatusEffectType.mapping
View File

@ -1,5 +1,48 @@
CLASS net/minecraft/class_4081 net/minecraft/entity/effect/StatusEffectType
FIELD field_18274 formatting Lnet/minecraft/class_124;
METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_124;)V
ARG 3 format
METHOD method_18793 getFormatting ()Lnet/minecraft/class_124;
CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffectType
FIELD field_18270 type Lnet/minecraft/class_4081;
FIELD field_5883 translationKey Ljava/lang/String;
FIELD field_5885 attributeModifiers Ljava/util/Map;
FIELD field_5886 color I
METHOD <init> (Lnet/minecraft/class_4081;I)V
ARG 1 type
ARG 2 color
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_5131;I)V
ARG 1 entity
ARG 2 attributes
ARG 3 amplifier
METHOD method_5556 getColor ()I
METHOD method_5559 loadTranslationKey ()Ljava/lang/String;
METHOD method_5560 getName ()Lnet/minecraft/class_2561;
METHOD method_5561 isInstant ()Z
METHOD method_5562 onRemoved (Lnet/minecraft/class_1309;Lnet/minecraft/class_5131;I)V
ARG 1 entity
ARG 2 attributes
ARG 3 amplifier
METHOD method_5563 adjustModifierAmount (ILnet/minecraft/class_1322;)D
ARG 1 amplifier
ARG 2 modifier
METHOD method_5564 applyInstantEffect (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;ID)V
ARG 1 source
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
ARG 2 uuid
ARG 3 amount
ARG 5 operation
METHOD method_5567 getTranslationKey ()Ljava/lang/String;
METHOD method_5569 byRawId (I)Lnet/minecraft/class_1291;
ARG 0 rawId
METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)V
ARG 1 entity
ARG 2 amplifier
METHOD method_5573 isBeneficial ()Z

2
mappings/net/minecraft/entity/effect/StatusEffects.mapping → mappings/net/minecraft/entity/effect/StatusEffectTypes.mapping
View File

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

2
mappings/net/minecraft/util/registry/Registry.mapping
View File

@ -18,7 +18,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
FIELD field_11156 SOUND_EVENT Lnet/minecraft/class_2378;
FIELD field_11157 CARVER Lnet/minecraft/class_2378;
FIELD field_11158 CUSTOM_STAT Lnet/minecraft/class_2378;
FIELD field_11159 STATUS_EFFECT Lnet/minecraft/class_2378;
FIELD field_11159 STATUS_EFFECT_TYPE Lnet/minecraft/class_2378;
FIELD field_11160 ENCHANTMENT Lnet/minecraft/class_2378;
FIELD field_16643 CHUNK_STATUS Lnet/minecraft/class_2348;
FIELD field_16644 STRUCTURE_FEATURE Lnet/minecraft/class_2378;