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

Fix conflicting mappings 

(Always test your merge conflict fixes. I know what I did wrong.)
This commit is contained in:
copygirl 2016-09-17 01:21:36 +02:00
parent 8e0790b382
commit 1cc1d73e32
6 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping
View File

@ -1,5 +1,5 @@
CLASS none/bid net/minecraft/client/gui/menu/ListEntryLocalScanProgress CLASS none/bid net/minecraft/client/gui/menu/ListEntryLocalScanProgress
FIELD a mc Lnone/bdq; FIELD a game Lnone/bdq;
METHOD a (III)V METHOD a (III)V
ARG 0 index ARG 0 index
ARG 1 x ARG 1 x

2
mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping
View File

@ -4,7 +4,7 @@ CLASS none/bif net/minecraft/client/gui/menu/ListEntryRemoteServer
FIELD c UNKNOWN_SERVER Lnone/kp; FIELD c UNKNOWN_SERVER Lnone/kp;
FIELD d SERVER_SELECTION Lnone/kp; FIELD d SERVER_SELECTION Lnone/kp;
FIELD e guiMultiplayer Lnone/bic; FIELD e guiMultiplayer Lnone/bic;
FIELD f mc Lnone/bdq; FIELD f game Lnone/bdq;
FIELD g serverEntry Lnone/bmj; FIELD g serverEntry Lnone/bmj;
METHOD a (III)V METHOD a (III)V
ARG 0 index ARG 0 index

4
mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping
View File

@ -1,5 +1,5 @@
CLASS none/bfb net/minecraft/client/gui/menu/WidgetListBase CLASS none/bfb net/minecraft/client/gui/menu/WidgetListBase
FIELD a mc Lnone/bdq; FIELD a game Lnone/bdq;
FIELD b width I FIELD b width I
FIELD c height I FIELD c height I
FIELD d y1 I FIELD d y1 I
@ -15,7 +15,7 @@ CLASS none/bfb net/minecraft/client/gui/menu/WidgetListBase
FIELD u buttonIdScrollUp I FIELD u buttonIdScrollUp I
FIELD v buttonIdScrollDown I FIELD v buttonIdScrollDown I
METHOD <init> (Lnone/bdq;IIIII)V METHOD <init> (Lnone/bdq;IIIII)V
ARG 0 mc ARG 0 game
ARG 1 width ARG 1 width
ARG 2 height ARG 2 height
ARG 3 y1 ARG 3 y1

4
mappings/none/bfb.mapping
View File

@ -1,4 +0,0 @@
CLASS none/bfb
FIELD a game Lnone/bdq;
METHOD <init> (Lnone/bdq;IIIII)V
ARG 0 game

2
mappings/none/bid.mapping
View File

@ -1,2 +0,0 @@
CLASS none/bid
FIELD a game Lnone/bdq;

9
mappings/none/bif.mapping
View File

@ -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