From 1cc1d73e329147423fd518b41aa6616d6aa9323f Mon Sep 17 00:00:00 2001 From: copygirl Date: Sat, 17 Sep 2016 01:21:36 +0200 Subject: [PATCH] Fix conflicting mappings (Always test your merge conflict fixes. I know what I did wrong.) --- .../client/gui/menu/ListEntryLocalScanProgress.mapping | 2 +- .../client/gui/menu/ListEntryRemoteServer.mapping | 2 +- .../net/minecraft/client/gui/menu/WidgetListBase.mapping | 4 ++-- mappings/none/bfb.mapping | 4 ---- mappings/none/bid.mapping | 2 -- mappings/none/bif.mapping | 9 --------- 6 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 mappings/none/bfb.mapping delete mode 100644 mappings/none/bid.mapping delete mode 100644 mappings/none/bif.mapping diff --git a/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping b/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping index c558032a0a..3ae06335ce 100644 --- a/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping +++ b/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping @@ -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 diff --git a/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping b/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping index c562ae334c..48bde2669d 100644 --- a/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping +++ b/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping @@ -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 diff --git a/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping b/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping index 2e328e6af5..ba604773ce 100644 --- a/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping +++ b/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping @@ -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 (Lnone/bdq;IIIII)V - ARG 0 mc + ARG 0 game ARG 1 width ARG 2 height ARG 3 y1 diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping deleted file mode 100644 index c59c8bcd80..0000000000 --- a/mappings/none/bfb.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS none/bfb - FIELD a game Lnone/bdq; - METHOD (Lnone/bdq;IIIII)V - ARG 0 game diff --git a/mappings/none/bid.mapping b/mappings/none/bid.mapping deleted file mode 100644 index bbd5dcfb76..0000000000 --- a/mappings/none/bid.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/bid - FIELD a game Lnone/bdq; diff --git a/mappings/none/bif.mapping b/mappings/none/bif.mapping deleted file mode 100644 index 4827bd04b7..0000000000 --- a/mappings/none/bif.mapping +++ /dev/null @@ -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