Some potion-related names (#1032)

* Change some odd naming in Potion

* Some names in StatusEffectInstance
This commit is contained in:
howtonotwin 2020-01-06 19:55:16 -05:00 committed by modmuss50
parent 80cf8e5ada
commit 805178edc7
2 changed files with 18 additions and 6 deletions

View File

@ -8,16 +8,21 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
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 effect
ARG 1 type
ARG 2 duration
ARG 3 amplifier
ARG 5 showParticles
ARG 4 ambient
ARG 5 visible
METHOD <init> (Lnet/minecraft/class_1291;IIZZZ)V
ARG 1 type
ARG 2 duration
@ -25,11 +30,16 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
ARG 4 ambient
ARG 5 showParticles
ARG 6 showIcon
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_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;
@ -40,6 +50,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
METHOD method_5588 updateDuration ()I
METHOD method_5589 applyUpdateEffect (Lnet/minecraft/class_1309;)V
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

View File

@ -1,8 +1,8 @@
CLASS net/minecraft/class_1842 net/minecraft/potion/Potion
FIELD field_8954 name Ljava/lang/String;
FIELD field_8955 effectList Lcom/google/common/collect/ImmutableList;
FIELD field_8954 baseName Ljava/lang/String;
FIELD field_8955 effects Lcom/google/common/collect/ImmutableList;
METHOD <init> (Ljava/lang/String;[Lnet/minecraft/class_1293;)V
ARG 1 name
ARG 1 baseName
ARG 2 effects
METHOD <init> ([Lnet/minecraft/class_1293;)V
ARG 1 effects
@ -10,4 +10,5 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion
ARG 0 id
METHOD method_8049 getEffects ()Ljava/util/List;
METHOD method_8050 hasInstantEffect ()Z
METHOD method_8051 getName (Ljava/lang/String;)Ljava/lang/String;
METHOD method_8051 finishTranslationKey (Ljava/lang/String;)Ljava/lang/String;
ARG 1 prefix