mirror of https://github.com/FabricMC/yarn.git
Fix conflicting mappings
(Always test your merge conflict fixes. I know what I did wrong.)
This commit is contained in:
parent
8e0790b382
commit
1cc1d73e32
|
@ -1,5 +1,5 @@
|
|||
CLASS none/bid net/minecraft/client/gui/menu/ListEntryLocalScanProgress
|
||||
FIELD a mc Lnone/bdq;
|
||||
FIELD a game Lnone/bdq;
|
||||
METHOD a (III)V
|
||||
ARG 0 index
|
||||
ARG 1 x
|
||||
|
|
|
@ -4,7 +4,7 @@ CLASS none/bif net/minecraft/client/gui/menu/ListEntryRemoteServer
|
|||
FIELD c UNKNOWN_SERVER Lnone/kp;
|
||||
FIELD d SERVER_SELECTION Lnone/kp;
|
||||
FIELD e guiMultiplayer Lnone/bic;
|
||||
FIELD f mc Lnone/bdq;
|
||||
FIELD f game Lnone/bdq;
|
||||
FIELD g serverEntry Lnone/bmj;
|
||||
METHOD a (III)V
|
||||
ARG 0 index
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
CLASS none/bfb net/minecraft/client/gui/menu/WidgetListBase
|
||||
FIELD a mc Lnone/bdq;
|
||||
FIELD a game Lnone/bdq;
|
||||
FIELD b width I
|
||||
FIELD c height I
|
||||
FIELD d y1 I
|
||||
|
@ -15,7 +15,7 @@ CLASS none/bfb net/minecraft/client/gui/menu/WidgetListBase
|
|||
FIELD u buttonIdScrollUp I
|
||||
FIELD v buttonIdScrollDown I
|
||||
METHOD <init> (Lnone/bdq;IIIII)V
|
||||
ARG 0 mc
|
||||
ARG 0 game
|
||||
ARG 1 width
|
||||
ARG 2 height
|
||||
ARG 3 y1
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
CLASS none/bfb
|
||||
FIELD a game Lnone/bdq;
|
||||
METHOD <init> (Lnone/bdq;IIIII)V
|
||||
ARG 0 game
|
|
@ -1,2 +0,0 @@
|
|||
CLASS none/bid
|
||||
FIELD a game Lnone/bdq;
|
|
@ -1,9 +0,0 @@
|
|||
CLASS none/bif
|
||||
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
|
||||
FIELD b SERVER_PINGER Ljava/util/concurrent/ThreadPoolExecutor;
|
||||
FIELD c UNKNOWN_SERVER Lnone/kp;
|
||||
FIELD d SERVER_SELECTION Lnone/kp;
|
||||
FIELD e guiMultiplayer Lnone/bic;
|
||||
FIELD f game Lnone/bdq;
|
||||
FIELD g serverEntry Lnone/bmj;
|
||||
METHOD a drawIcon (IILnone/kp;)V
|
Loading…
Reference in New Issue