mirror of https://github.com/FabricMC/yarn.git
fix conflicts
This commit is contained in:
parent
f8eac78aa4
commit
8773f5423a
|
@ -1,5 +1,5 @@
|
||||||
CLASS aoi net/minecraft/block/BlockDeadbush
|
CLASS aoi net/minecraft/block/BlockDeadbush
|
||||||
FIELD a BOX Lbfm;
|
FIELD a BOX_DEADBUSH Lbfm;
|
||||||
METHOD a afterBreak (Lali;Lacu;Ldx;Lave;Latu;Lahf;)V
|
METHOD a afterBreak (Lali;Lacu;Ldx;Lave;Latu;Lahf;)V
|
||||||
ARG 0 world
|
ARG 0 world
|
||||||
ARG 1 player
|
ARG 1 player
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
CLASS asd net/minecraft/block/BlockSapling
|
CLASS asd net/minecraft/block/BlockSapling
|
||||||
FIELD a TYPE Lavs;
|
FIELD a TYPE Lavs;
|
||||||
FIELD c STAGE Lavt;
|
FIELD c STAGE Lavt;
|
||||||
FIELD d BOX Lbfm;
|
FIELD d BOX_SAPLING Lbfm;
|
||||||
METHOD a deserializeState (I)Lave;
|
METHOD a deserializeState (I)Lave;
|
||||||
ARG 0 meta
|
ARG 0 meta
|
||||||
METHOD a addStacksForDisplay (Lahd;Lagf;Lem;)V
|
METHOD a addStacksForDisplay (Lahd;Lagf;Lem;)V
|
||||||
|
|
|
@ -5,7 +5,6 @@ CLASS xu net/minecraft/entity/ai/AiGoalTrackTarget
|
||||||
FIELD d timeWithoutVisibility I
|
FIELD d timeWithoutVisibility I
|
||||||
FIELD e entity Lus;
|
FIELD e entity Lus;
|
||||||
FIELD f checkVisibility Z
|
FIELD f checkVisibility Z
|
||||||
FIELD g target Luk;
|
|
||||||
FIELD h maxTimeWithoutVisibility I
|
FIELD h maxTimeWithoutVisibility I
|
||||||
METHOD <init> (Lus;Z)V
|
METHOD <init> (Lus;Z)V
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
|
|
|
@ -139,7 +139,7 @@ CLASS acu net/minecraft/entity/player/EntityPlayer
|
||||||
ARG 0 value
|
ARG 0 value
|
||||||
METHOD c isUsingEffectiveTool (Lave;)Z
|
METHOD c isUsingEffectiveTool (Lave;)Z
|
||||||
ARG 0 state
|
ARG 0 state
|
||||||
METHOD c registerTagUpgraders (Lqv;)V
|
METHOD c registerTagUpgradersServer (Lqv;)V
|
||||||
ARG 0 handler
|
ARG 0 handler
|
||||||
METHOD cA getMainHand ()Luj;
|
METHOD cA getMainHand ()Luj;
|
||||||
METHOD cP getScore ()I
|
METHOD cP getScore ()I
|
||||||
|
|
Loading…
Reference in New Issue