From f1acdf3eedf42e63568abac9c3f4c5c914558dad Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 13:23:33 +1200 Subject: [PATCH 01/17] LanServerQueryManager --- .../minecraft/server/LanServerEntry.mapping | 10 ++++++++++ .../server/LanServerQueryManager.mapping | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 mappings/net/minecraft/server/LanServerEntry.mapping create mode 100644 mappings/net/minecraft/server/LanServerQueryManager.mapping diff --git a/mappings/net/minecraft/server/LanServerEntry.mapping b/mappings/net/minecraft/server/LanServerEntry.mapping new file mode 100644 index 0000000000..5852c68e68 --- /dev/null +++ b/mappings/net/minecraft/server/LanServerEntry.mapping @@ -0,0 +1,10 @@ +CLASS none/can net/minecraft/server/LanServerEntry + FIELD a motd Ljava/lang/String; + FIELD b addressPort Ljava/lang/String; + FIELD c lastTimeMillis J + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 motd + ARG 1 addressPort + METHOD a getMotd ()Ljava/lang/String; + METHOD b getAddressPort ()Ljava/lang/String; + METHOD c updateLastTime ()V diff --git a/mappings/net/minecraft/server/LanServerQueryManager.mapping b/mappings/net/minecraft/server/LanServerQueryManager.mapping new file mode 100644 index 0000000000..920b6922b6 --- /dev/null +++ b/mappings/net/minecraft/server/LanServerQueryManager.mapping @@ -0,0 +1,19 @@ +CLASS none/cao net/minecraft/server/LanServerQueryManager + CLASS none/cao$a LanServerDetector + FIELD a entryList Lnone/cao$b; + FIELD b multicastAddress Ljava/net/InetAddress; + FIELD c socket Ljava/net/MulticastSocket; + METHOD (Lnone/cao$b;)V + ARG 0 entryList + METHOD run run ()V + CLASS none/cao$b LanServerEntryList + FIELD a dirty Z + FIELD b serverEntries Ljava/util/List; + METHOD a needsUpdate ()Z + METHOD a addServer (Ljava/lang/String;Ljava/net/InetAddress;)V + ARG 0 announcement + ARG 1 address + METHOD b markClean ()V + METHOD c getServers ()Ljava/util/List; + FIELD a THREAD_ID Ljava/util/concurrent/atomic/AtomicInteger; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; From 9ad8d2ae0c51add75a56ecd1b2283ef28c8c7a39 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 14:29:47 +1200 Subject: [PATCH 02/17] moved to sortme; GUI tidbits --- .../net/minecraft/server/LanServerPinger.mapping | 12 ++++++++++++ .../net/minecraft/sortme/KeyBindingGui.mapping | 16 ++++++++++++++++ .../{server => sortme}/LanServerEntry.mapping | 2 +- .../LanServerQueryManager.mapping | 2 +- .../minecraft/sortme/WidgetWorldEntry.mapping | 7 +++++++ mappings/net/minecraft/util/ServerEntry.mapping | 1 + mappings/none/bew.mapping | 9 +++++++++ mappings/none/bey.mapping | 9 +++++++++ mappings/none/bez.mapping | 9 +++++++++ mappings/none/bid.mapping | 7 +++++++ mappings/none/bie.mapping | 16 ++++++++++++++++ mappings/none/bif.mapping | 7 +++++++ mappings/none/bik.mapping | 7 +++++++ 13 files changed, 102 insertions(+), 2 deletions(-) rename mappings/net/minecraft/{server => sortme}/LanServerEntry.mapping (85%) rename mappings/net/minecraft/{server => sortme}/LanServerQueryManager.mapping (91%) create mode 100644 mappings/none/bew.mapping create mode 100644 mappings/none/bey.mapping create mode 100644 mappings/none/bez.mapping create mode 100644 mappings/none/bie.mapping diff --git a/mappings/net/minecraft/server/LanServerPinger.mapping b/mappings/net/minecraft/server/LanServerPinger.mapping index 78b83ceb94..9eaa0d631a 100644 --- a/mappings/net/minecraft/server/LanServerPinger.mapping +++ b/mappings/net/minecraft/server/LanServerPinger.mapping @@ -1,7 +1,19 @@ CLASS none/cap net/minecraft/server/LanServerPinger FIELD a THREAD_ID Ljava/util/concurrent/atomic/AtomicInteger; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c motd Ljava/lang/String; FIELD d socket Ljava/net/DatagramSocket; FIELD e isRunning Z + FIELD f addressPort Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 motd + ARG 1 addressPort + METHOD a parseAnnouncementMotd (Ljava/lang/String;)Ljava/lang/String; + ARG 0 announcement + METHOD a makeAnnouncement (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 motd + ARG 1 addressPort + METHOD b parseAnnouncementAddressPort (Ljava/lang/String;)Ljava/lang/String; + ARG 0 announcement METHOD interrupt interrupt ()V METHOD run run ()V diff --git a/mappings/net/minecraft/sortme/KeyBindingGui.mapping b/mappings/net/minecraft/sortme/KeyBindingGui.mapping index 0ff51e1ec7..ca19673083 100644 --- a/mappings/net/minecraft/sortme/KeyBindingGui.mapping +++ b/mappings/net/minecraft/sortme/KeyBindingGui.mapping @@ -1,4 +1,20 @@ CLASS none/bhb net/minecraft/sortme/KeyBindingGui + CLASS none/bhb$a + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY + CLASS none/bhb$b + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY FIELD u gui Lnone/bhc; FIELD v mc Lnone/bdq; METHOD (Lnone/bhc;Lnone/bdq;)V diff --git a/mappings/net/minecraft/server/LanServerEntry.mapping b/mappings/net/minecraft/sortme/LanServerEntry.mapping similarity index 85% rename from mappings/net/minecraft/server/LanServerEntry.mapping rename to mappings/net/minecraft/sortme/LanServerEntry.mapping index 5852c68e68..832f56f3e0 100644 --- a/mappings/net/minecraft/server/LanServerEntry.mapping +++ b/mappings/net/minecraft/sortme/LanServerEntry.mapping @@ -1,4 +1,4 @@ -CLASS none/can net/minecraft/server/LanServerEntry +CLASS none/can net/minecraft/sortme/LanServerEntry FIELD a motd Ljava/lang/String; FIELD b addressPort Ljava/lang/String; FIELD c lastTimeMillis J diff --git a/mappings/net/minecraft/server/LanServerQueryManager.mapping b/mappings/net/minecraft/sortme/LanServerQueryManager.mapping similarity index 91% rename from mappings/net/minecraft/server/LanServerQueryManager.mapping rename to mappings/net/minecraft/sortme/LanServerQueryManager.mapping index 920b6922b6..9bf70ca6df 100644 --- a/mappings/net/minecraft/server/LanServerQueryManager.mapping +++ b/mappings/net/minecraft/sortme/LanServerQueryManager.mapping @@ -1,4 +1,4 @@ -CLASS none/cao net/minecraft/server/LanServerQueryManager +CLASS none/cao net/minecraft/sortme/LanServerQueryManager CLASS none/cao$a LanServerDetector FIELD a entryList Lnone/cao$b; FIELD b multicastAddress Ljava/net/InetAddress; diff --git a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping index 867e793223..de32f5d696 100644 --- a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping +++ b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping @@ -15,4 +15,11 @@ CLASS none/biy net/minecraft/sortme/WidgetWorldEntry METHOD (Lnone/biz;Lnone/bax;Lnone/baw;)V ARG 1 worldSummary ARG 2 worldStorage + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY METHOD f loadIconTexture ()V diff --git a/mappings/net/minecraft/util/ServerEntry.mapping b/mappings/net/minecraft/util/ServerEntry.mapping index 772812c180..23dfd77e0b 100644 --- a/mappings/net/minecraft/util/ServerEntry.mapping +++ b/mappings/net/minecraft/util/ServerEntry.mapping @@ -9,6 +9,7 @@ CLASS none/bmj net/minecraft/util/ServerEntry FIELD b address Ljava/lang/String; FIELD c playerCountLabel Ljava/lang/String; FIELD d label Ljava/lang/String; + FIELD e ping J FIELD f protocolVersion I FIELD g version Ljava/lang/String; FIELD j resourcePackState Lnone/bmj$a; diff --git a/mappings/none/bew.mapping b/mappings/none/bew.mapping new file mode 100644 index 0000000000..8146e78a62 --- /dev/null +++ b/mappings/none/bew.mapping @@ -0,0 +1,9 @@ +CLASS none/bew + CLASS none/bew$a + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY diff --git a/mappings/none/bey.mapping b/mappings/none/bey.mapping new file mode 100644 index 0000000000..1c27d1af7a --- /dev/null +++ b/mappings/none/bey.mapping @@ -0,0 +1,9 @@ +CLASS none/bey + CLASS none/bey$a + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY diff --git a/mappings/none/bez.mapping b/mappings/none/bez.mapping new file mode 100644 index 0000000000..1a907f820c --- /dev/null +++ b/mappings/none/bez.mapping @@ -0,0 +1,9 @@ +CLASS none/bez + CLASS none/bez$d + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY diff --git a/mappings/none/bid.mapping b/mappings/none/bid.mapping index c29dbb0263..49bc35e193 100644 --- a/mappings/none/bid.mapping +++ b/mappings/none/bid.mapping @@ -1,2 +1,9 @@ CLASS none/bid FIELD a mc Lnone/bdq; + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY diff --git a/mappings/none/bie.mapping b/mappings/none/bie.mapping new file mode 100644 index 0000000000..3e9b680658 --- /dev/null +++ b/mappings/none/bie.mapping @@ -0,0 +1,16 @@ +CLASS none/bie + FIELD a mc Lnone/bdq; + FIELD b entry Lnone/can; + FIELD c gui Lnone/bic; + FIELD d lastUpdateMillis J + METHOD (Lnone/bic;Lnone/can;)V + ARG 0 gui + ARG 1 entry + METHOD a getLanServerEntry ()Lnone/can; + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY diff --git a/mappings/none/bif.mapping b/mappings/none/bif.mapping index 28d550bdd1..257f73958e 100644 --- a/mappings/none/bif.mapping +++ b/mappings/none/bif.mapping @@ -6,4 +6,11 @@ CLASS none/bif FIELD e guiMultiplayer Lnone/bic; FIELD f mc Lnone/bdq; FIELD g serverEntry Lnone/bmj; + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY METHOD a drawIcon (IILnone/kp;)V diff --git a/mappings/none/bik.mapping b/mappings/none/bik.mapping index 1d9942815b..3aadbe0e24 100644 --- a/mappings/none/bik.mapping +++ b/mappings/none/bik.mapping @@ -2,3 +2,10 @@ CLASS none/bik CLASS none/bik$1 METHOD a handle (ZI)V ARG 0 result + METHOD a (IIIIIIIZ)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 mouseX + ARG 6 mouseY From 2bff230b908d61e574d8577c6dd046da881b3513 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 16:54:05 +1200 Subject: [PATCH 03/17] mouse mappings for gui (+ server lists) --- .../gui/menu/GuiNewWorldCustomizeFlat.mapping | 7 +++++ .../menu/GuiNewWorldCustomizePresets.mapping | 7 +++++ .../gui/menu/GuiNewWorldPresets.mapping | 7 +++++ .../gui/menu/GuiSettingsLanguage.mapping | 7 +++++ .../gui/menu/GuiSettingsSnooper.mapping | 7 +++++ .../client/gui/menu/GuiStats.mapping | 29 +++++++++++++++++++ .../client/render/VertexFormats.mapping | 1 + .../minecraft/sortme/KeyBindingGui.mapping | 8 +++++ .../minecraft/sortme/WidgetWorldEntry.mapping | 4 +++ mappings/none/bew.mapping | 14 +++++++++ mappings/none/bey.mapping | 4 +++ mappings/none/bez.mapping | 8 +++++ mappings/none/bfb.mapping | 27 +++++++++++++++++ mappings/none/bfj.mapping | 10 +++++++ mappings/none/bfl.mapping | 7 +++++ mappings/none/bfm.mapping | 11 +++++++ mappings/none/bid.mapping | 4 +++ mappings/none/bie.mapping | 4 +++ mappings/none/bif.mapping | 4 +++ mappings/none/big.mapping | 3 ++ mappings/none/bik.mapping | 4 +++ 21 files changed, 177 insertions(+) create mode 100644 mappings/none/bfj.mapping create mode 100644 mappings/none/bfl.mapping create mode 100644 mappings/none/bfm.mapping create mode 100644 mappings/none/big.mapping diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping index cab97b598a..fdec464f6f 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping @@ -1,4 +1,11 @@ CLASS none/bfu net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat + CLASS none/bfu$a + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY FIELD a parent Lnone/biv; METHOD (Lnone/biv;Ljava/lang/String;)V ARG 0 parent diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping index b48f70bdc6..0fa1c99637 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping @@ -1,4 +1,11 @@ CLASS none/bfv net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets + CLASS none/bfv$b + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping index 7b4dc9adb9..bbc9cd629c 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping @@ -1,4 +1,11 @@ CLASS none/bgj net/minecraft/client/gui/menu/GuiNewWorldPresets + CLASS none/bgj$b + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping index 279c3835aa..5bd993d619 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping @@ -1,4 +1,11 @@ CLASS none/bge net/minecraft/client/gui/menu/GuiSettingsLanguage + CLASS none/bge$a + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY FIELD a parent Lnone/bgm; FIELD g settings Lnone/bds; METHOD (Lnone/bgm;Lnone/bds;Lnone/byn;)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping index b0cf86247c..4f93cf0245 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping @@ -1,4 +1,11 @@ CLASS none/bgp net/minecraft/client/gui/menu/GuiSettingsSnooper + CLASS none/bgp$a + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY FIELD a parent Lnone/bgm; FIELD f settings Lnone/bds; METHOD (Lnone/bgm;Lnone/bds;)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping index cb41e6430d..6af3438388 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping @@ -1,4 +1,33 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats + CLASS none/bgy$a + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + CLASS none/bgy$b + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY + CLASS none/bgy$c + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + CLASS none/bgy$d + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY + CLASS none/bgy$e + METHOD a (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY FIELD a parent Lnone/bgm; METHOD (Lnone/bgm;Lnone/nz;)V ARG 0 parent diff --git a/mappings/net/minecraft/client/render/VertexFormats.mapping b/mappings/net/minecraft/client/render/VertexFormats.mapping index 958b6528a5..ff65cf7be0 100644 --- a/mappings/net/minecraft/client/render/VertexFormats.mapping +++ b/mappings/net/minecraft/client/render/VertexFormats.mapping @@ -1,6 +1,7 @@ CLASS none/bxl net/minecraft/client/render/VertexFormats FIELD f POSITION_COLOR Lnone/bxn; FIELD g POSITION_UV Lnone/bxn; + FIELD i POSITION_UV_COLOR Lnone/bxn; FIELD m POSITION Lnone/bxo; FIELD n COLOR Lnone/bxo; FIELD o UV Lnone/bxo; diff --git a/mappings/net/minecraft/sortme/KeyBindingGui.mapping b/mappings/net/minecraft/sortme/KeyBindingGui.mapping index ca19673083..ed07b03d11 100644 --- a/mappings/net/minecraft/sortme/KeyBindingGui.mapping +++ b/mappings/net/minecraft/sortme/KeyBindingGui.mapping @@ -1,5 +1,9 @@ CLASS none/bhb net/minecraft/sortme/KeyBindingGui CLASS none/bhb$a + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y @@ -8,6 +12,10 @@ CLASS none/bhb net/minecraft/sortme/KeyBindingGui ARG 5 mouseX ARG 6 mouseY CLASS none/bhb$b + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping index de32f5d696..5a247e1b1e 100644 --- a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping +++ b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping @@ -15,6 +15,10 @@ CLASS none/biy net/minecraft/sortme/WidgetWorldEntry METHOD (Lnone/biz;Lnone/bax;Lnone/baw;)V ARG 1 worldSummary ARG 2 worldStorage + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y diff --git a/mappings/none/bew.mapping b/mappings/none/bew.mapping index 8146e78a62..0848009f17 100644 --- a/mappings/none/bew.mapping +++ b/mappings/none/bew.mapping @@ -1,5 +1,9 @@ CLASS none/bew CLASS none/bew$a + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y @@ -7,3 +11,13 @@ CLASS none/bew ARG 4 height ARG 5 mouseX ARG 6 mouseY + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY + METHOD b handleMouseClick (III)Z + ARG 0 mouseX + ARG 1 mouseY + ARG 2 mouseButton diff --git a/mappings/none/bey.mapping b/mappings/none/bey.mapping index 1c27d1af7a..33b87d27dc 100644 --- a/mappings/none/bey.mapping +++ b/mappings/none/bey.mapping @@ -1,5 +1,9 @@ CLASS none/bey CLASS none/bey$a + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y diff --git a/mappings/none/bez.mapping b/mappings/none/bez.mapping index 1a907f820c..e8d2a44606 100644 --- a/mappings/none/bez.mapping +++ b/mappings/none/bez.mapping @@ -1,5 +1,9 @@ CLASS none/bez CLASS none/bez$d + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y @@ -7,3 +11,7 @@ CLASS none/bez ARG 4 height ARG 5 mouseX ARG 6 mouseY + METHOD b handleMouseClick (III)Z + ARG 0 mouseX + ARG 1 mouseY + ARG 2 mouseButton diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping index 9a21a6d386..1888e094f7 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/none/bfb.mapping @@ -1,4 +1,31 @@ CLASS none/bfb FIELD a mc Lnone/bdq; + FIELD d y1 I + FIELD e y2 I + FIELD f x2 I + FIELD g x1 I + FIELD i mouseX I + FIELD j mouseY I METHOD (Lnone/bdq;IIIII)V ARG 0 mc + METHOD a (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD a draw (IIF)V + ARG 0 mouseX + ARG 1 mouseY + ARG 2 delta + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY + METHOD b (IIII)V + ARG 2 mouseX + ARG 3 mouseY + METHOD c findEntryIndex (II)I + ARG 0 mouseX + ARG 1 mouseY + METHOD g mouseInRange (I)Z + ARG 0 y diff --git a/mappings/none/bfj.mapping b/mappings/none/bfj.mapping new file mode 100644 index 0000000000..f47c12a198 --- /dev/null +++ b/mappings/none/bfj.mapping @@ -0,0 +1,10 @@ +CLASS none/bfj + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY + METHOD b (IIII)V + ARG 2 mouseX + ARG 3 mouseY diff --git a/mappings/none/bfl.mapping b/mappings/none/bfl.mapping new file mode 100644 index 0000000000..4fbc079089 --- /dev/null +++ b/mappings/none/bfl.mapping @@ -0,0 +1,7 @@ +CLASS none/bfl + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY diff --git a/mappings/none/bfm.mapping b/mappings/none/bfm.mapping new file mode 100644 index 0000000000..acf42904e2 --- /dev/null +++ b/mappings/none/bfm.mapping @@ -0,0 +1,11 @@ +CLASS none/bfm + METHOD a draw (IIF)V + ARG 0 mouseX + ARG 1 mouseY + ARG 2 delta + METHOD a (IIIIII)V + ARG 4 mouseX + ARG 5 mouseY + METHOD a (IZII)V + ARG 2 mouseX + ARG 3 mouseY diff --git a/mappings/none/bid.mapping b/mappings/none/bid.mapping index 49bc35e193..b50ef8cd75 100644 --- a/mappings/none/bid.mapping +++ b/mappings/none/bid.mapping @@ -1,5 +1,9 @@ CLASS none/bid FIELD a mc Lnone/bdq; + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y diff --git a/mappings/none/bie.mapping b/mappings/none/bie.mapping index 3e9b680658..7559735bc9 100644 --- a/mappings/none/bie.mapping +++ b/mappings/none/bie.mapping @@ -7,6 +7,10 @@ CLASS none/bie ARG 0 gui ARG 1 entry METHOD a getLanServerEntry ()Lnone/can; + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y diff --git a/mappings/none/bif.mapping b/mappings/none/bif.mapping index 257f73958e..007d20203f 100644 --- a/mappings/none/bif.mapping +++ b/mappings/none/bif.mapping @@ -6,6 +6,10 @@ CLASS none/bif FIELD e guiMultiplayer Lnone/bic; FIELD f mc Lnone/bdq; FIELD g serverEntry Lnone/bmj; + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y diff --git a/mappings/none/big.mapping b/mappings/none/big.mapping new file mode 100644 index 0000000000..bd5f66326c --- /dev/null +++ b/mappings/none/big.mapping @@ -0,0 +1,3 @@ +CLASS none/big + FIELD v userServers Ljava/util/List; + FIELD w lanServers Ljava/util/List; diff --git a/mappings/none/bik.mapping b/mappings/none/bik.mapping index 3aadbe0e24..edd4fb2227 100644 --- a/mappings/none/bik.mapping +++ b/mappings/none/bik.mapping @@ -2,6 +2,10 @@ CLASS none/bik CLASS none/bik$1 METHOD a handle (ZI)V ARG 0 result + METHOD a (IIIIII)Z + ARG 1 mouseX + ARG 2 mouseY + ARG 3 mouseButton METHOD a (IIIIIIIZ)V ARG 1 x ARG 2 y From f032c59c102003a285ca68e9e3c7b86d0824892d Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 16:57:22 +1200 Subject: [PATCH 04/17] entryCount for gui lists --- .../minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping | 1 + .../client/gui/menu/GuiNewWorldCustomizePresets.mapping | 1 + .../net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping | 1 + .../net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping | 1 + .../net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping | 1 + mappings/net/minecraft/client/gui/menu/GuiStats.mapping | 3 +++ mappings/net/minecraft/sortme/KeyBindingGui.mapping | 1 + mappings/none/bey.mapping | 1 + mappings/none/bez.mapping | 1 + mappings/none/bfb.mapping | 1 + mappings/none/bfj.mapping | 1 + mappings/none/bfl.mapping | 1 + mappings/none/bfm.mapping | 1 + mappings/none/big.mapping | 1 + mappings/none/biq.mapping | 2 ++ mappings/none/biz.mapping | 1 + 16 files changed, 19 insertions(+) create mode 100644 mappings/none/biq.mapping diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping index fdec464f6f..d7d43c031d 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping @@ -6,6 +6,7 @@ CLASS none/bfu net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I FIELD a parent Lnone/biv; METHOD (Lnone/biv;Ljava/lang/String;)V ARG 0 parent diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping index 0fa1c99637..16e3a4a7ec 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping @@ -6,6 +6,7 @@ CLASS none/bfv net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping index bbc9cd629c..7d622a0af7 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping @@ -6,6 +6,7 @@ CLASS none/bgj net/minecraft/client/gui/menu/GuiNewWorldPresets METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping index 5bd993d619..81b8cfd5b6 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping @@ -6,6 +6,7 @@ CLASS none/bge net/minecraft/client/gui/menu/GuiSettingsLanguage METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I FIELD a parent Lnone/bgm; FIELD g settings Lnone/bds; METHOD (Lnone/bgm;Lnone/bds;Lnone/byn;)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping index 4f93cf0245..d91ae1adf4 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping @@ -6,6 +6,7 @@ CLASS none/bgp net/minecraft/client/gui/menu/GuiSettingsSnooper METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I FIELD a parent Lnone/bgm; FIELD f settings Lnone/bds; METHOD (Lnone/bgm;Lnone/bds;)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping index 6af3438388..6045a16466 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping @@ -10,6 +10,7 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I CLASS none/bgy$c METHOD a (IIIIII)V ARG 4 mouseX @@ -21,6 +22,7 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I CLASS none/bgy$e METHOD a (II)V ARG 0 mouseX @@ -28,6 +30,7 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I FIELD a parent Lnone/bgm; METHOD (Lnone/bgm;Lnone/nz;)V ARG 0 parent diff --git a/mappings/net/minecraft/sortme/KeyBindingGui.mapping b/mappings/net/minecraft/sortme/KeyBindingGui.mapping index ed07b03d11..aaea44deba 100644 --- a/mappings/net/minecraft/sortme/KeyBindingGui.mapping +++ b/mappings/net/minecraft/sortme/KeyBindingGui.mapping @@ -28,3 +28,4 @@ CLASS none/bhb net/minecraft/sortme/KeyBindingGui METHOD (Lnone/bhc;Lnone/bdq;)V ARG 0 gui ARG 1 mc + METHOD b entryCount ()I diff --git a/mappings/none/bey.mapping b/mappings/none/bey.mapping index 33b87d27dc..b694f0b904 100644 --- a/mappings/none/bey.mapping +++ b/mappings/none/bey.mapping @@ -11,3 +11,4 @@ CLASS none/bey ARG 4 height ARG 5 mouseX ARG 6 mouseY + METHOD b entryCount ()I diff --git a/mappings/none/bez.mapping b/mappings/none/bez.mapping index e8d2a44606..5774b7a172 100644 --- a/mappings/none/bez.mapping +++ b/mappings/none/bez.mapping @@ -11,6 +11,7 @@ CLASS none/bez ARG 4 height ARG 5 mouseX ARG 6 mouseY + METHOD b entryCount ()I METHOD b handleMouseClick (III)Z ARG 0 mouseX ARG 1 mouseY diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping index 1888e094f7..e02c6daa6f 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/none/bfb.mapping @@ -21,6 +21,7 @@ CLASS none/bfb METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I METHOD b (IIII)V ARG 2 mouseX ARG 3 mouseY diff --git a/mappings/none/bfj.mapping b/mappings/none/bfj.mapping index f47c12a198..cad41a7e57 100644 --- a/mappings/none/bfj.mapping +++ b/mappings/none/bfj.mapping @@ -5,6 +5,7 @@ CLASS none/bfj METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I METHOD b (IIII)V ARG 2 mouseX ARG 3 mouseY diff --git a/mappings/none/bfl.mapping b/mappings/none/bfl.mapping index 4fbc079089..b8bb9686cb 100644 --- a/mappings/none/bfl.mapping +++ b/mappings/none/bfl.mapping @@ -5,3 +5,4 @@ CLASS none/bfl METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I diff --git a/mappings/none/bfm.mapping b/mappings/none/bfm.mapping index acf42904e2..75724d2c7e 100644 --- a/mappings/none/bfm.mapping +++ b/mappings/none/bfm.mapping @@ -9,3 +9,4 @@ CLASS none/bfm METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b entryCount ()I diff --git a/mappings/none/big.mapping b/mappings/none/big.mapping index bd5f66326c..ca2510a198 100644 --- a/mappings/none/big.mapping +++ b/mappings/none/big.mapping @@ -1,3 +1,4 @@ CLASS none/big FIELD v userServers Ljava/util/List; FIELD w lanServers Ljava/util/List; + METHOD b entryCount ()I diff --git a/mappings/none/biq.mapping b/mappings/none/biq.mapping new file mode 100644 index 0000000000..4cf8dd7c67 --- /dev/null +++ b/mappings/none/biq.mapping @@ -0,0 +1,2 @@ +CLASS none/biq + METHOD b entryCount ()I diff --git a/mappings/none/biz.mapping b/mappings/none/biz.mapping index a3a4e90ecb..e295fbbfec 100644 --- a/mappings/none/biz.mapping +++ b/mappings/none/biz.mapping @@ -1,2 +1,3 @@ CLASS none/biz FIELD u LOGGER Lorg/apache/logging/log4j/Logger; + METHOD b entryCount ()I From 6afb5cc306ed350126851acfc175fcdc79654ad5 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 17:12:36 +1200 Subject: [PATCH 05/17] width/height/scroll for bfb --- .../gui/menu/GuiSettingsLanguage.mapping | 1 + .../client/gui/menu/GuiStats.mapping | 2 ++ mappings/none/bfb.mapping | 19 +++++++++++++++++++ mappings/none/bfj.mapping | 1 + mappings/none/bfl.mapping | 1 + mappings/none/bfm.mapping | 1 + 6 files changed, 25 insertions(+) diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping index 81b8cfd5b6..9898c07a03 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping @@ -7,6 +7,7 @@ CLASS none/bge net/minecraft/client/gui/menu/GuiSettingsLanguage ARG 2 mouseX ARG 3 mouseY METHOD b entryCount ()I + METHOD k contentHeight ()I FIELD a parent Lnone/bgm; FIELD g settings Lnone/bds; METHOD (Lnone/bgm;Lnone/bds;Lnone/byn;)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping index 6045a16466..780ffd674f 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping @@ -11,6 +11,7 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats ARG 2 mouseX ARG 3 mouseY METHOD b entryCount ()I + METHOD k contentHeight ()I CLASS none/bgy$c METHOD a (IIIIII)V ARG 4 mouseX @@ -23,6 +24,7 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats ARG 2 mouseX ARG 3 mouseY METHOD b entryCount ()I + METHOD k contentHeight ()I CLASS none/bgy$e METHOD a (II)V ARG 0 mouseX diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping index e02c6daa6f..7346e119ed 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/none/bfb.mapping @@ -1,13 +1,22 @@ CLASS none/bfb FIELD a mc Lnone/bdq; + FIELD b width I + FIELD c height I FIELD d y1 I FIELD e y2 I FIELD f x2 I FIELD g x1 I + FIELD h entryHeight I FIELD i mouseX I FIELD j mouseY I + FIELD n scrollY F METHOD (Lnone/bdq;IIIII)V ARG 0 mc + ARG 1 width + ARG 2 height + ARG 3 y1 + ARG 4 y2 + ARG 5 entryHeight METHOD a (II)V ARG 0 mouseX ARG 1 mouseY @@ -15,6 +24,11 @@ CLASS none/bfb ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD a (IIII)V + ARG 0 width + ARG 1 height + ARG 2 y1 + ARG 3 y2 METHOD a (IIIIII)V ARG 4 mouseX ARG 5 mouseY @@ -30,3 +44,8 @@ CLASS none/bfb ARG 1 mouseY METHOD g mouseInRange (I)Z ARG 0 y + METHOD k contentHeight ()I + METHOD l clampScrollY ()V + METHOD m getMaxScrollY ()I + METHOD n getScrollY ()I + METHOD r getEntryHeight ()I diff --git a/mappings/none/bfj.mapping b/mappings/none/bfj.mapping index cad41a7e57..98ae51b3c3 100644 --- a/mappings/none/bfj.mapping +++ b/mappings/none/bfj.mapping @@ -9,3 +9,4 @@ CLASS none/bfj METHOD b (IIII)V ARG 2 mouseX ARG 3 mouseY + METHOD k contentHeight ()I diff --git a/mappings/none/bfl.mapping b/mappings/none/bfl.mapping index b8bb9686cb..bda890ee83 100644 --- a/mappings/none/bfl.mapping +++ b/mappings/none/bfl.mapping @@ -6,3 +6,4 @@ CLASS none/bfl ARG 2 mouseX ARG 3 mouseY METHOD b entryCount ()I + METHOD k contentHeight ()I diff --git a/mappings/none/bfm.mapping b/mappings/none/bfm.mapping index 75724d2c7e..84da7dd186 100644 --- a/mappings/none/bfm.mapping +++ b/mappings/none/bfm.mapping @@ -10,3 +10,4 @@ CLASS none/bfm ARG 2 mouseX ARG 3 mouseY METHOD b entryCount ()I + METHOD k contentHeight ()I From 7c5a51c6f71600678e2111caad2d4cd55f260d65 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 17:13:28 +1200 Subject: [PATCH 06/17] setLeftPos for bfb --- mappings/none/bfb.mapping | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping index 7346e119ed..5a9ebb5a87 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/none/bfb.mapping @@ -44,6 +44,8 @@ CLASS none/bfb ARG 1 mouseY METHOD g mouseInRange (I)Z ARG 0 y + METHOD i setLeftPos (I)V + ARG 0 x1 METHOD k contentHeight ()I METHOD l clampScrollY ()V METHOD m getMaxScrollY ()I From ab25aaf88917a2ba55e8455c1d34fb3b6fbcfccf Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 17:32:37 +1200 Subject: [PATCH 07/17] scrolls + more mouse stuff (bfb) --- mappings/none/bfb.mapping | 10 ++++++++++ mappings/none/bfj.mapping | 1 + mappings/none/bfl.mapping | 1 + mappings/none/bfm.mapping | 1 + 4 files changed, 13 insertions(+) diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping index 5a9ebb5a87..32e5dd17a1 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/none/bfb.mapping @@ -9,7 +9,11 @@ CLASS none/bfb FIELD h entryHeight I FIELD i mouseX I FIELD j mouseY I + FIELD l scrollLastMouseY I + FIELD m scrollSpeedY F FIELD n scrollY F + FIELD u buttonIdScrollUp I + FIELD v buttonIdScrollDown I METHOD (Lnone/bdq;IIIII)V ARG 0 mc ARG 1 width @@ -42,12 +46,18 @@ CLASS none/bfb METHOD c findEntryIndex (II)I ARG 0 mouseX ARG 1 mouseY + METHOD d setScrollButtonIds (II)V + ARG 0 up + ARG 1 down METHOD g mouseInRange (I)Z ARG 0 y + METHOD h scrollByY (I)V + ARG 0 dy METHOD i setLeftPos (I)V ARG 0 x1 METHOD k contentHeight ()I METHOD l clampScrollY ()V METHOD m getMaxScrollY ()I METHOD n getScrollY ()I + METHOD p handleMouseEvent ()V METHOD r getEntryHeight ()I diff --git a/mappings/none/bfj.mapping b/mappings/none/bfj.mapping index 98ae51b3c3..c6e4639517 100644 --- a/mappings/none/bfj.mapping +++ b/mappings/none/bfj.mapping @@ -10,3 +10,4 @@ CLASS none/bfj ARG 2 mouseX ARG 3 mouseY METHOD k contentHeight ()I + METHOD p handleMouseEvent ()V diff --git a/mappings/none/bfl.mapping b/mappings/none/bfl.mapping index bda890ee83..a39a7a3c56 100644 --- a/mappings/none/bfl.mapping +++ b/mappings/none/bfl.mapping @@ -7,3 +7,4 @@ CLASS none/bfl ARG 3 mouseY METHOD b entryCount ()I METHOD k contentHeight ()I + METHOD p handleMouseEvent ()V diff --git a/mappings/none/bfm.mapping b/mappings/none/bfm.mapping index 84da7dd186..687e9ddf8f 100644 --- a/mappings/none/bfm.mapping +++ b/mappings/none/bfm.mapping @@ -11,3 +11,4 @@ CLASS none/bfm ARG 3 mouseY METHOD b entryCount ()I METHOD k contentHeight ()I + METHOD p handleMouseEvent ()V From 80d275620338f48fdd7dfece6bbcae81d516db0b Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 17:43:32 +1200 Subject: [PATCH 08/17] bfb entryWidth/handleButtonPressed/drawEntries --- mappings/net/minecraft/client/gui/menu/GuiStats.mapping | 1 + mappings/net/minecraft/sortme/KeyBindingGui.mapping | 1 + mappings/none/bey.mapping | 1 + mappings/none/bez.mapping | 1 + mappings/none/bfb.mapping | 6 +++++- mappings/none/bfj.mapping | 4 +++- mappings/none/big.mapping | 1 + mappings/none/biq.mapping | 1 + mappings/none/biz.mapping | 1 + 9 files changed, 15 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping index 780ffd674f..74c96ccf84 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping @@ -33,6 +33,7 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats ARG 2 mouseX ARG 3 mouseY METHOD b entryCount ()I + METHOD c entryWidth ()I FIELD a parent Lnone/bgm; METHOD (Lnone/bgm;Lnone/nz;)V ARG 0 parent diff --git a/mappings/net/minecraft/sortme/KeyBindingGui.mapping b/mappings/net/minecraft/sortme/KeyBindingGui.mapping index aaea44deba..91331bc0cb 100644 --- a/mappings/net/minecraft/sortme/KeyBindingGui.mapping +++ b/mappings/net/minecraft/sortme/KeyBindingGui.mapping @@ -29,3 +29,4 @@ CLASS none/bhb net/minecraft/sortme/KeyBindingGui ARG 0 gui ARG 1 mc METHOD b entryCount ()I + METHOD c entryWidth ()I diff --git a/mappings/none/bey.mapping b/mappings/none/bey.mapping index b694f0b904..527eb228e7 100644 --- a/mappings/none/bey.mapping +++ b/mappings/none/bey.mapping @@ -12,3 +12,4 @@ CLASS none/bey ARG 5 mouseX ARG 6 mouseY METHOD b entryCount ()I + METHOD c entryWidth ()I diff --git a/mappings/none/bez.mapping b/mappings/none/bez.mapping index 5774b7a172..667f267372 100644 --- a/mappings/none/bez.mapping +++ b/mappings/none/bez.mapping @@ -16,3 +16,4 @@ CLASS none/bez ARG 0 mouseX ARG 1 mouseY ARG 2 mouseButton + METHOD c entryWidth ()I diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping index 32e5dd17a1..33a0eca312 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/none/bfb.mapping @@ -39,10 +39,14 @@ CLASS none/bfb METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD a handleButtonPressed (Lnone/bek;)V METHOD b entryCount ()I - METHOD b (IIII)V + METHOD b drawEntries (IIII)V + ARG 0 x + ARG 1 y ARG 2 mouseX ARG 3 mouseY + METHOD c entryWidth ()I METHOD c findEntryIndex (II)I ARG 0 mouseX ARG 1 mouseY diff --git a/mappings/none/bfj.mapping b/mappings/none/bfj.mapping index c6e4639517..4bbe143ce9 100644 --- a/mappings/none/bfj.mapping +++ b/mappings/none/bfj.mapping @@ -6,7 +6,9 @@ CLASS none/bfj ARG 2 mouseX ARG 3 mouseY METHOD b entryCount ()I - METHOD b (IIII)V + METHOD b drawEntries (IIII)V + ARG 0 x + ARG 1 y ARG 2 mouseX ARG 3 mouseY METHOD k contentHeight ()I diff --git a/mappings/none/big.mapping b/mappings/none/big.mapping index ca2510a198..3b964a95b8 100644 --- a/mappings/none/big.mapping +++ b/mappings/none/big.mapping @@ -2,3 +2,4 @@ CLASS none/big FIELD v userServers Ljava/util/List; FIELD w lanServers Ljava/util/List; METHOD b entryCount ()I + METHOD c entryWidth ()I diff --git a/mappings/none/biq.mapping b/mappings/none/biq.mapping index 4cf8dd7c67..f7cfd4d3fd 100644 --- a/mappings/none/biq.mapping +++ b/mappings/none/biq.mapping @@ -1,2 +1,3 @@ CLASS none/biq METHOD b entryCount ()I + METHOD c entryWidth ()I diff --git a/mappings/none/biz.mapping b/mappings/none/biz.mapping index e295fbbfec..7b03c49c33 100644 --- a/mappings/none/biz.mapping +++ b/mappings/none/biz.mapping @@ -1,3 +1,4 @@ CLASS none/biz FIELD u LOGGER Lorg/apache/logging/log4j/Logger; METHOD b entryCount ()I + METHOD c entryWidth ()I From 011be5c344d1d5d0af1ac3dd10025d5114bf6ceb Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 17:47:18 +1200 Subject: [PATCH 09/17] bfb drawEntry --- .../gui/menu/GuiNewWorldCustomizeFlat.mapping | 6 ++++- .../menu/GuiNewWorldCustomizePresets.mapping | 6 ++++- .../gui/menu/GuiNewWorldPresets.mapping | 6 ++++- .../gui/menu/GuiSettingsLanguage.mapping | 6 ++++- .../gui/menu/GuiSettingsSnooper.mapping | 6 ++++- .../client/gui/menu/GuiStats.mapping | 24 +++++++++++++++---- mappings/none/bew.mapping | 6 ++++- mappings/none/bfb.mapping | 6 ++++- mappings/none/bfj.mapping | 6 ++++- mappings/none/bfl.mapping | 6 ++++- mappings/none/bfm.mapping | 6 ++++- 11 files changed, 70 insertions(+), 14 deletions(-) diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping index d7d43c031d..7029f9c665 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping @@ -1,6 +1,10 @@ CLASS none/bfu net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat CLASS none/bfu$a - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping index 16e3a4a7ec..0ccad34aed 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping @@ -1,6 +1,10 @@ CLASS none/bfv net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets CLASS none/bfv$b - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping index 7d622a0af7..8c2bdb8d52 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping @@ -1,6 +1,10 @@ CLASS none/bgj net/minecraft/client/gui/menu/GuiNewWorldPresets CLASS none/bgj$b - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping index 9898c07a03..a65afa0858 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping @@ -1,6 +1,10 @@ CLASS none/bge net/minecraft/client/gui/menu/GuiSettingsLanguage CLASS none/bge$a - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping index d91ae1adf4..6cdf6742d1 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping @@ -1,6 +1,10 @@ CLASS none/bgp net/minecraft/client/gui/menu/GuiSettingsSnooper CLASS none/bgp$a - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping index 74c96ccf84..bdc9139a3f 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping @@ -1,10 +1,18 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats CLASS none/bgy$a - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY CLASS none/bgy$b - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V @@ -13,11 +21,19 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats METHOD b entryCount ()I METHOD k contentHeight ()I CLASS none/bgy$c - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY CLASS none/bgy$d - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/none/bew.mapping b/mappings/none/bew.mapping index 0848009f17..f860075fb0 100644 --- a/mappings/none/bew.mapping +++ b/mappings/none/bew.mapping @@ -11,7 +11,11 @@ CLASS none/bew ARG 4 height ARG 5 mouseX ARG 6 mouseY - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping index 33a0eca312..82252a72f3 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/none/bfb.mapping @@ -33,7 +33,11 @@ CLASS none/bfb ARG 1 height ARG 2 y1 ARG 3 y2 - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/none/bfj.mapping b/mappings/none/bfj.mapping index 4bbe143ce9..b76fe5d4d0 100644 --- a/mappings/none/bfj.mapping +++ b/mappings/none/bfj.mapping @@ -1,5 +1,9 @@ CLASS none/bfj - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/none/bfl.mapping b/mappings/none/bfl.mapping index a39a7a3c56..fc42ec4ea3 100644 --- a/mappings/none/bfl.mapping +++ b/mappings/none/bfl.mapping @@ -1,5 +1,9 @@ CLASS none/bfl - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V diff --git a/mappings/none/bfm.mapping b/mappings/none/bfm.mapping index 687e9ddf8f..43cf6c4315 100644 --- a/mappings/none/bfm.mapping +++ b/mappings/none/bfm.mapping @@ -3,7 +3,11 @@ CLASS none/bfm ARG 0 mouseX ARG 1 mouseY ARG 2 delta - METHOD a (IIIIII)V + METHOD a drawEntry (IIIIII)V + ARG 0 index + ARG 1 x + ARG 2 y + ARG 3 height ARG 4 mouseX ARG 5 mouseY METHOD a (IZII)V From 1ebeaf5dec929468c51ecfd9f6cbcd6d42c85eba Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 18:05:14 +1200 Subject: [PATCH 10/17] starting to decipher none.bew --- .../minecraft/sortme/KeyBindingGui.mapping | 31 ++++++++++++++++--- .../minecraft/sortme/WidgetWorldEntry.mapping | 15 +++++++-- mappings/none/bew.mapping | 20 ++++++++++-- mappings/none/bey.mapping | 17 ++++++++-- mappings/none/bez.mapping | 17 ++++++++-- mappings/none/bfb.mapping | 6 ++++ mappings/none/bid.mapping | 15 +++++++-- mappings/none/bie.mapping | 15 +++++++-- mappings/none/bif.mapping | 15 +++++++-- mappings/none/big.mapping | 1 + mappings/none/bik.mapping | 15 +++++++-- mappings/none/biq.mapping | 2 ++ mappings/none/biz.mapping | 2 ++ 13 files changed, 151 insertions(+), 20 deletions(-) diff --git a/mappings/net/minecraft/sortme/KeyBindingGui.mapping b/mappings/net/minecraft/sortme/KeyBindingGui.mapping index 91331bc0cb..c001693655 100644 --- a/mappings/net/minecraft/sortme/KeyBindingGui.mapping +++ b/mappings/net/minecraft/sortme/KeyBindingGui.mapping @@ -1,32 +1,55 @@ CLASS none/bhb net/minecraft/sortme/KeyBindingGui CLASS none/bhb$a - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver + METHOD b (IIIIII)V + ARG 0 index CLASS none/bhb$b - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver + METHOD b (IIIIII)V + ARG 0 index FIELD u gui Lnone/bhc; FIELD v mc Lnone/bdq; METHOD (Lnone/bhc;Lnone/bdq;)V ARG 0 gui ARG 1 mc METHOD b entryCount ()I + METHOD b get (I)Lnone/bew$a; METHOD c entryWidth ()I diff --git a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping index 5a247e1b1e..0e0430d7e2 100644 --- a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping +++ b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping @@ -15,15 +15,26 @@ CLASS none/biy net/minecraft/sortme/WidgetWorldEntry METHOD (Lnone/biz;Lnone/bax;Lnone/baw;)V ARG 1 worldSummary ARG 2 worldStorage - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver + METHOD b (IIIIII)V + ARG 0 index METHOD f loadIconTexture ()V diff --git a/mappings/none/bew.mapping b/mappings/none/bew.mapping index f860075fb0..fa34643d04 100644 --- a/mappings/none/bew.mapping +++ b/mappings/none/bew.mapping @@ -1,16 +1,31 @@ CLASS none/bew CLASS none/bew$a - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver + METHOD b (IIIIII)V + ARG 0 index + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x @@ -21,6 +36,7 @@ CLASS none/bew METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY + METHOD b get (I)Lnone/bew$a; METHOD b handleMouseClick (III)Z ARG 0 mouseX ARG 1 mouseY diff --git a/mappings/none/bey.mapping b/mappings/none/bey.mapping index 527eb228e7..904318ad15 100644 --- a/mappings/none/bey.mapping +++ b/mappings/none/bey.mapping @@ -1,15 +1,28 @@ CLASS none/bey CLASS none/bey$a - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver + METHOD b (IIIIII)V + ARG 0 index METHOD b entryCount ()I + METHOD b get (I)Lnone/bew$a; METHOD c entryWidth ()I + METHOD c get (I)Lnone/bey$a; diff --git a/mappings/none/bez.mapping b/mappings/none/bez.mapping index 667f267372..3bf1111661 100644 --- a/mappings/none/bez.mapping +++ b/mappings/none/bez.mapping @@ -1,19 +1,32 @@ CLASS none/bez CLASS none/bez$d - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver + METHOD b (IIIIII)V + ARG 0 index METHOD b entryCount ()I + METHOD b get (I)Lnone/bew$a; METHOD b handleMouseClick (III)Z ARG 0 mouseX ARG 1 mouseY ARG 2 mouseButton METHOD c entryWidth ()I + METHOD e get (I)Lnone/bez$d; diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping index 82252a72f3..8ccb6bb921 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/none/bfb.mapping @@ -28,6 +28,10 @@ CLASS none/bfb ARG 0 mouseX ARG 1 mouseY ARG 2 delta + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y METHOD a (IIII)V ARG 0 width ARG 1 height @@ -57,6 +61,7 @@ CLASS none/bfb METHOD d setScrollButtonIds (II)V ARG 0 up ARG 1 down + METHOD d (Z)V METHOD g mouseInRange (I)Z ARG 0 y METHOD h scrollByY (I)V @@ -68,4 +73,5 @@ CLASS none/bfb METHOD m getMaxScrollY ()I METHOD n getScrollY ()I METHOD p handleMouseEvent ()V + METHOD q ()Z METHOD r getEntryHeight ()I diff --git a/mappings/none/bid.mapping b/mappings/none/bid.mapping index b50ef8cd75..24cfd25da0 100644 --- a/mappings/none/bid.mapping +++ b/mappings/none/bid.mapping @@ -1,13 +1,24 @@ CLASS none/bid FIELD a mc Lnone/bdq; - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver + METHOD b (IIIIII)V + ARG 0 index diff --git a/mappings/none/bie.mapping b/mappings/none/bie.mapping index 7559735bc9..18d642f60e 100644 --- a/mappings/none/bie.mapping +++ b/mappings/none/bie.mapping @@ -7,14 +7,25 @@ CLASS none/bie ARG 0 gui ARG 1 entry METHOD a getLanServerEntry ()Lnone/can; - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver + METHOD b (IIIIII)V + ARG 0 index diff --git a/mappings/none/bif.mapping b/mappings/none/bif.mapping index 007d20203f..36693c12bc 100644 --- a/mappings/none/bif.mapping +++ b/mappings/none/bif.mapping @@ -6,15 +6,26 @@ CLASS none/bif FIELD e guiMultiplayer Lnone/bic; FIELD f mc Lnone/bdq; FIELD g serverEntry Lnone/bmj; - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver METHOD a drawIcon (IILnone/kp;)V + METHOD b (IIIIII)V + ARG 0 index diff --git a/mappings/none/big.mapping b/mappings/none/big.mapping index 3b964a95b8..2ae46fc60b 100644 --- a/mappings/none/big.mapping +++ b/mappings/none/big.mapping @@ -2,4 +2,5 @@ CLASS none/big FIELD v userServers Ljava/util/List; FIELD w lanServers Ljava/util/List; METHOD b entryCount ()I + METHOD b get (I)Lnone/bew$a; METHOD c entryWidth ()I diff --git a/mappings/none/bik.mapping b/mappings/none/bik.mapping index edd4fb2227..c8c150291f 100644 --- a/mappings/none/bik.mapping +++ b/mappings/none/bik.mapping @@ -2,14 +2,25 @@ CLASS none/bik CLASS none/bik$1 METHOD a handle (ZI)V ARG 0 result - METHOD a (IIIIII)Z + METHOD a (III)V + ARG 0 index + ARG 1 x + ARG 2 y + METHOD a handleMouseClick (IIIIII)Z + ARG 0 index ARG 1 mouseX ARG 2 mouseY ARG 3 mouseButton - METHOD a (IIIIIIIZ)V + ARG 4 relMouseX + ARG 5 relMouseY + METHOD a drawEntry (IIIIIIIZ)V + ARG 0 index ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 mouseX ARG 6 mouseY + ARG 7 mouseIsOver + METHOD b (IIIIII)V + ARG 0 index diff --git a/mappings/none/biq.mapping b/mappings/none/biq.mapping index f7cfd4d3fd..6c52702d27 100644 --- a/mappings/none/biq.mapping +++ b/mappings/none/biq.mapping @@ -1,3 +1,5 @@ CLASS none/biq METHOD b entryCount ()I + METHOD b get (I)Lnone/bew$a; METHOD c entryWidth ()I + METHOD c get (I)Lnone/bik; diff --git a/mappings/none/biz.mapping b/mappings/none/biz.mapping index 7b03c49c33..f941144990 100644 --- a/mappings/none/biz.mapping +++ b/mappings/none/biz.mapping @@ -1,4 +1,6 @@ CLASS none/biz FIELD u LOGGER Lorg/apache/logging/log4j/Logger; METHOD b entryCount ()I + METHOD b get (I)Lnone/bew$a; METHOD c entryWidth ()I + METHOD c get (I)Lnone/biy; From dae1f114ec8f3d0fe7fc332a0c89ac8931427965 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 18:19:33 +1200 Subject: [PATCH 11/17] add index to a bew.a method --- mappings/net/minecraft/sortme/KeyBindingGui.mapping | 1 + mappings/none/bew.mapping | 1 + mappings/none/bey.mapping | 2 ++ mappings/none/bez.mapping | 2 ++ mappings/none/big.mapping | 1 + mappings/none/biq.mapping | 2 ++ mappings/none/biz.mapping | 2 ++ 7 files changed, 11 insertions(+) diff --git a/mappings/net/minecraft/sortme/KeyBindingGui.mapping b/mappings/net/minecraft/sortme/KeyBindingGui.mapping index c001693655..252483c21a 100644 --- a/mappings/net/minecraft/sortme/KeyBindingGui.mapping +++ b/mappings/net/minecraft/sortme/KeyBindingGui.mapping @@ -52,4 +52,5 @@ CLASS none/bhb net/minecraft/sortme/KeyBindingGui ARG 1 mc METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; + ARG 0 index METHOD c entryWidth ()I diff --git a/mappings/none/bew.mapping b/mappings/none/bew.mapping index fa34643d04..6ef57fe612 100644 --- a/mappings/none/bew.mapping +++ b/mappings/none/bew.mapping @@ -37,6 +37,7 @@ CLASS none/bew ARG 2 mouseX ARG 3 mouseY METHOD b get (I)Lnone/bew$a; + ARG 0 index METHOD b handleMouseClick (III)Z ARG 0 mouseX ARG 1 mouseY diff --git a/mappings/none/bey.mapping b/mappings/none/bey.mapping index 904318ad15..44c285e290 100644 --- a/mappings/none/bey.mapping +++ b/mappings/none/bey.mapping @@ -24,5 +24,7 @@ CLASS none/bey ARG 0 index METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; + ARG 0 index METHOD c entryWidth ()I METHOD c get (I)Lnone/bey$a; + ARG 0 index diff --git a/mappings/none/bez.mapping b/mappings/none/bez.mapping index 3bf1111661..724e5256ea 100644 --- a/mappings/none/bez.mapping +++ b/mappings/none/bez.mapping @@ -24,9 +24,11 @@ CLASS none/bez ARG 0 index METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; + ARG 0 index METHOD b handleMouseClick (III)Z ARG 0 mouseX ARG 1 mouseY ARG 2 mouseButton METHOD c entryWidth ()I METHOD e get (I)Lnone/bez$d; + ARG 0 index diff --git a/mappings/none/big.mapping b/mappings/none/big.mapping index 2ae46fc60b..2228641c80 100644 --- a/mappings/none/big.mapping +++ b/mappings/none/big.mapping @@ -3,4 +3,5 @@ CLASS none/big FIELD w lanServers Ljava/util/List; METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; + ARG 0 index METHOD c entryWidth ()I diff --git a/mappings/none/biq.mapping b/mappings/none/biq.mapping index 6c52702d27..2bd5e71c9e 100644 --- a/mappings/none/biq.mapping +++ b/mappings/none/biq.mapping @@ -1,5 +1,7 @@ CLASS none/biq METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; + ARG 0 index METHOD c entryWidth ()I METHOD c get (I)Lnone/bik; + ARG 0 index diff --git a/mappings/none/biz.mapping b/mappings/none/biz.mapping index f941144990..b49dce744b 100644 --- a/mappings/none/biz.mapping +++ b/mappings/none/biz.mapping @@ -2,5 +2,7 @@ CLASS none/biz FIELD u LOGGER Lorg/apache/logging/log4j/Logger; METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; + ARG 0 index METHOD c entryWidth ()I METHOD c get (I)Lnone/biy; + ARG 0 index From 32ac536be7662fd1cffa4b1e5aac859f677789de Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 18:28:27 +1200 Subject: [PATCH 12/17] bmk -> ServerList (fully deobf'd) --- .../net/minecraft/sortme/ServerList.mapping | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 mappings/net/minecraft/sortme/ServerList.mapping diff --git a/mappings/net/minecraft/sortme/ServerList.mapping b/mappings/net/minecraft/sortme/ServerList.mapping new file mode 100644 index 0000000000..707a08f1f4 --- /dev/null +++ b/mappings/net/minecraft/sortme/ServerList.mapping @@ -0,0 +1,23 @@ +CLASS none/bmk net/minecraft/sortme/ServerList + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b mc Lnone/bdq; + FIELD c serverEntries Ljava/util/List; + METHOD (Lnone/bdq;)V + ARG 0 mc + METHOD a loadServerList ()V + METHOD a get (I)Lnone/bmj; + ARG 0 index + METHOD a swapServerListEntries (II)V + ARG 0 index1 + ARG 1 index2 + METHOD a set (ILnone/bmj;)V + ARG 0 index + ARG 1 e + METHOD a add (Lnone/bmj;)V + ARG 0 e + METHOD b saveServerList ()V + METHOD b remove (I)V + ARG 0 index + METHOD b updateServerListEntry (Lnone/bmj;)V + ARG 0 e + METHOD c size ()I From c9855f3fc64afe27e899c5c3ce6f5b5a2d4e8882 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 18:31:32 +1200 Subject: [PATCH 13/17] starting on none.big --- mappings/none/big.mapping | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mappings/none/big.mapping b/mappings/none/big.mapping index 2228641c80..1d25cccf49 100644 --- a/mappings/none/big.mapping +++ b/mappings/none/big.mapping @@ -1,6 +1,15 @@ CLASS none/big + FIELD u guiMultiplayer Lnone/bic; FIELD v userServers Ljava/util/List; FIELD w lanServers Ljava/util/List; + METHOD (Lnone/bic;Lnone/bdq;IIIII)V + ARG 0 gui + ARG 1 mc + ARG 2 width + ARG 3 height + ARG 4 y1 + ARG 5 y2 + ARG 6 entryHeight METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index From c49c6785a4bf3b12efb923825e81428bc617f6ab Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 18:38:37 +1200 Subject: [PATCH 14/17] index selections for bfb & co --- .../net/minecraft/client/gui/menu/GuiMultiplayer.mapping | 1 + .../client/gui/menu/GuiNewWorldCustomizeFlat.mapping | 2 ++ .../client/gui/menu/GuiNewWorldCustomizePresets.mapping | 2 ++ .../minecraft/client/gui/menu/GuiNewWorldPresets.mapping | 2 ++ .../minecraft/client/gui/menu/GuiSettingsLanguage.mapping | 2 ++ .../minecraft/client/gui/menu/GuiSettingsSnooper.mapping | 2 ++ mappings/net/minecraft/client/gui/menu/GuiStats.mapping | 6 ++++++ mappings/none/bew.mapping | 2 ++ mappings/none/bfb.mapping | 2 ++ mappings/none/bfj.mapping | 2 ++ mappings/none/bfl.mapping | 2 ++ mappings/none/bfm.mapping | 2 ++ mappings/none/big.mapping | 5 +++++ mappings/none/biz.mapping | 2 ++ 14 files changed, 34 insertions(+) diff --git a/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping b/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping index 1911a84d0e..8b4c4e7d43 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping @@ -19,6 +19,7 @@ CLASS none/bic net/minecraft/client/gui/menu/GuiMultiplayer METHOD a handle (ZI)V ARG 0 result METHOD b init ()V + METHOD b setIndex (I)V METHOD e update ()V METHOD k handleMouseEvent ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping index 7029f9c665..26788150b2 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping @@ -1,5 +1,7 @@ CLASS none/bfu net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat CLASS none/bfu$a + METHOD a isSelected (I)Z + ARG 0 index METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping index 0ccad34aed..e8b8df5cd4 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping @@ -1,5 +1,7 @@ CLASS none/bfv net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets CLASS none/bfv$b + METHOD a isSelected (I)Z + ARG 0 index METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping index 8c2bdb8d52..0f31e74d7c 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping @@ -1,5 +1,7 @@ CLASS none/bgj net/minecraft/client/gui/menu/GuiNewWorldPresets CLASS none/bgj$b + METHOD a isSelected (I)Z + ARG 0 index METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping index a65afa0858..93b929f1cb 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping @@ -1,5 +1,7 @@ CLASS none/bge net/minecraft/client/gui/menu/GuiSettingsLanguage CLASS none/bge$a + METHOD a isSelected (I)Z + ARG 0 index METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping index 6cdf6742d1..59d10589ba 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping @@ -1,5 +1,7 @@ CLASS none/bgp net/minecraft/client/gui/menu/GuiSettingsSnooper CLASS none/bgp$a + METHOD a isSelected (I)Z + ARG 0 index METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x diff --git a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping index bdc9139a3f..0c6fe95294 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping @@ -8,6 +8,8 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats ARG 4 mouseX ARG 5 mouseY CLASS none/bgy$b + METHOD a isSelected (I)Z + ARG 0 index METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x @@ -29,6 +31,8 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats ARG 4 mouseX ARG 5 mouseY CLASS none/bgy$d + METHOD a isSelected (I)Z + ARG 0 index METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x @@ -42,6 +46,8 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats METHOD b entryCount ()I METHOD k contentHeight ()I CLASS none/bgy$e + METHOD a isSelected (I)Z + ARG 0 index METHOD a (II)V ARG 0 mouseX ARG 1 mouseY diff --git a/mappings/none/bew.mapping b/mappings/none/bew.mapping index 6ef57fe612..89cc9a13bd 100644 --- a/mappings/none/bew.mapping +++ b/mappings/none/bew.mapping @@ -22,6 +22,8 @@ CLASS none/bew ARG 7 mouseIsOver METHOD b (IIIIII)V ARG 0 index + METHOD a isSelected (I)Z + ARG 0 index METHOD a (III)V ARG 0 index ARG 1 x diff --git a/mappings/none/bfb.mapping b/mappings/none/bfb.mapping index 8ccb6bb921..b26558a3f1 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/none/bfb.mapping @@ -21,6 +21,8 @@ CLASS none/bfb ARG 3 y1 ARG 4 y2 ARG 5 entryHeight + METHOD a isSelected (I)Z + ARG 0 index METHOD a (II)V ARG 0 mouseX ARG 1 mouseY diff --git a/mappings/none/bfj.mapping b/mappings/none/bfj.mapping index b76fe5d4d0..df640c3624 100644 --- a/mappings/none/bfj.mapping +++ b/mappings/none/bfj.mapping @@ -1,4 +1,6 @@ CLASS none/bfj + METHOD a isSelected (I)Z + ARG 0 index METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x diff --git a/mappings/none/bfl.mapping b/mappings/none/bfl.mapping index fc42ec4ea3..4deb8b5823 100644 --- a/mappings/none/bfl.mapping +++ b/mappings/none/bfl.mapping @@ -1,4 +1,6 @@ CLASS none/bfl + METHOD a isSelected (I)Z + ARG 0 index METHOD a drawEntry (IIIIII)V ARG 0 index ARG 1 x diff --git a/mappings/none/bfm.mapping b/mappings/none/bfm.mapping index 43cf6c4315..29863240af 100644 --- a/mappings/none/bfm.mapping +++ b/mappings/none/bfm.mapping @@ -1,4 +1,6 @@ CLASS none/bfm + METHOD a isSelected (I)Z + ARG 0 index METHOD a draw (IIF)V ARG 0 mouseX ARG 1 mouseY diff --git a/mappings/none/big.mapping b/mappings/none/big.mapping index 1d25cccf49..61ee8f14ab 100644 --- a/mappings/none/big.mapping +++ b/mappings/none/big.mapping @@ -2,6 +2,7 @@ CLASS none/big FIELD u guiMultiplayer Lnone/bic; FIELD v userServers Ljava/util/List; FIELD w lanServers Ljava/util/List; + FIELD y selectedIndex I METHOD (Lnone/bic;Lnone/bdq;IIIII)V ARG 0 gui ARG 1 mc @@ -10,7 +11,11 @@ CLASS none/big ARG 4 y1 ARG 5 y2 ARG 6 entryHeight + METHOD a isSelected (I)Z + ARG 0 index METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index METHOD c entryWidth ()I + METHOD c setIndex (I)V + METHOD e getIndex ()I diff --git a/mappings/none/biz.mapping b/mappings/none/biz.mapping index b49dce744b..87935c4cc0 100644 --- a/mappings/none/biz.mapping +++ b/mappings/none/biz.mapping @@ -1,5 +1,7 @@ CLASS none/biz FIELD u LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a isSelected (I)Z + ARG 0 index METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index From dbeb9544a0026589542b1d2121d064e9e2d13395 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 18:40:09 +1200 Subject: [PATCH 15/17] set(User|Lan)Servers for none.big --- mappings/none/big.mapping | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mappings/none/big.mapping b/mappings/none/big.mapping index 61ee8f14ab..52d8459944 100644 --- a/mappings/none/big.mapping +++ b/mappings/none/big.mapping @@ -13,6 +13,10 @@ CLASS none/big ARG 6 entryHeight METHOD a isSelected (I)Z ARG 0 index + METHOD a setLanServers (Ljava/util/List;)V + ARG 0 servers + METHOD a setUserServers (Lnone/bmk;)V + ARG 0 servers METHOD b entryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index From 514ebac1f62f1a3d19ff6f296d74b8211dc3d7c0 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Thu, 15 Sep 2016 22:23:31 +1200 Subject: [PATCH 16/17] quick names for bfb and whatnot --- .../client/gui/menu/ListEntryLocalScanProgress.mapping} | 2 +- .../minecraft/client/gui/menu/ListEntryLocalServer.mapping} | 2 +- .../minecraft/client/gui/menu/ListEntryRemoteServer.mapping} | 2 +- .../minecraft/client/gui/menu/WidgetListBase.mapping} | 2 +- .../minecraft/client/gui/menu/WidgetListMulti.mapping} | 4 ++-- .../minecraft/client/gui/menu/WidgetServerList.mapping} | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) rename mappings/{none/bid.mapping => net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping} (84%) rename mappings/{none/bie.mapping => net/minecraft/client/gui/menu/ListEntryLocalServer.mapping} (89%) rename mappings/{none/bif.mapping => net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping} (90%) rename mappings/{none/bfb.mapping => net/minecraft/client/gui/menu/WidgetListBase.mapping} (96%) rename mappings/{none/bew.mapping => net/minecraft/client/gui/menu/WidgetListMulti.mapping} (90%) rename mappings/{none/big.mapping => net/minecraft/client/gui/menu/WidgetServerList.mapping} (85%) diff --git a/mappings/none/bid.mapping b/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping similarity index 84% rename from mappings/none/bid.mapping rename to mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping index 24cfd25da0..c558032a0a 100644 --- a/mappings/none/bid.mapping +++ b/mappings/net/minecraft/client/gui/menu/ListEntryLocalScanProgress.mapping @@ -1,4 +1,4 @@ -CLASS none/bid +CLASS none/bid net/minecraft/client/gui/menu/ListEntryLocalScanProgress FIELD a mc Lnone/bdq; METHOD a (III)V ARG 0 index diff --git a/mappings/none/bie.mapping b/mappings/net/minecraft/client/gui/menu/ListEntryLocalServer.mapping similarity index 89% rename from mappings/none/bie.mapping rename to mappings/net/minecraft/client/gui/menu/ListEntryLocalServer.mapping index 18d642f60e..80f27b33a1 100644 --- a/mappings/none/bie.mapping +++ b/mappings/net/minecraft/client/gui/menu/ListEntryLocalServer.mapping @@ -1,4 +1,4 @@ -CLASS none/bie +CLASS none/bie net/minecraft/client/gui/menu/ListEntryLocalServer FIELD a mc Lnone/bdq; FIELD b entry Lnone/can; FIELD c gui Lnone/bic; diff --git a/mappings/none/bif.mapping b/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping similarity index 90% rename from mappings/none/bif.mapping rename to mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping index 36693c12bc..1d55ef1a10 100644 --- a/mappings/none/bif.mapping +++ b/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping @@ -1,4 +1,4 @@ -CLASS none/bif +CLASS none/bif net/minecraft/client/gui/menu/ListEntryRemoteServer FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b SERVER_PINGER Ljava/util/concurrent/ThreadPoolExecutor; FIELD c UNKNOWN_SERVER Lnone/kp; diff --git a/mappings/none/bfb.mapping b/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping similarity index 96% rename from mappings/none/bfb.mapping rename to mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping index b26558a3f1..980270974d 100644 --- a/mappings/none/bfb.mapping +++ b/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping @@ -1,4 +1,4 @@ -CLASS none/bfb +CLASS none/bfb net/minecraft/client/gui/menu/WidgetListBase FIELD a mc Lnone/bdq; FIELD b width I FIELD c height I diff --git a/mappings/none/bew.mapping b/mappings/net/minecraft/client/gui/menu/WidgetListMulti.mapping similarity index 90% rename from mappings/none/bew.mapping rename to mappings/net/minecraft/client/gui/menu/WidgetListMulti.mapping index 89cc9a13bd..ede4474df8 100644 --- a/mappings/none/bew.mapping +++ b/mappings/net/minecraft/client/gui/menu/WidgetListMulti.mapping @@ -1,5 +1,5 @@ -CLASS none/bew - CLASS none/bew$a +CLASS none/bew net/minecraft/client/gui/menu/WidgetListMulti + CLASS none/bew$a Entry METHOD a (III)V ARG 0 index ARG 1 x diff --git a/mappings/none/big.mapping b/mappings/net/minecraft/client/gui/menu/WidgetServerList.mapping similarity index 85% rename from mappings/none/big.mapping rename to mappings/net/minecraft/client/gui/menu/WidgetServerList.mapping index 52d8459944..46505f4f03 100644 --- a/mappings/none/big.mapping +++ b/mappings/net/minecraft/client/gui/menu/WidgetServerList.mapping @@ -1,7 +1,8 @@ -CLASS none/big +CLASS none/big net/minecraft/client/gui/menu/WidgetServerList FIELD u guiMultiplayer Lnone/bic; FIELD v userServers Ljava/util/List; FIELD w lanServers Ljava/util/List; + FIELD x localScanWidget Lnone/bew$a; FIELD y selectedIndex I METHOD (Lnone/bic;Lnone/bdq;IIIII)V ARG 0 gui From dbab3002edfb6c2ba4160ee021fbe7b99608a2cf Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Fri, 16 Sep 2016 10:38:47 +1200 Subject: [PATCH 17/17] name tweaks --- .../client/gui/menu/GuiNewWorldCustomizeFlat.mapping | 2 +- .../gui/menu/GuiNewWorldCustomizePresets.mapping | 2 +- .../client/gui/menu/GuiNewWorldPresets.mapping | 2 +- .../client/gui/menu/GuiSettingsLanguage.mapping | 4 ++-- .../client/gui/menu/GuiSettingsSnooper.mapping | 2 +- .../net/minecraft/client/gui/menu/GuiStats.mapping | 12 ++++++------ .../client/gui/menu/ListEntryRemoteServer.mapping | 2 +- .../minecraft/client/gui/menu/WidgetListBase.mapping | 6 +++--- .../client/gui/menu/WidgetServerList.mapping | 4 ++-- .../net/minecraft/server/LanServerPinger.mapping | 2 +- mappings/net/minecraft/sortme/KeyBindingGui.mapping | 4 ++-- mappings/none/bey.mapping | 4 ++-- mappings/none/bez.mapping | 4 ++-- mappings/none/bfj.mapping | 4 ++-- mappings/none/bfl.mapping | 4 ++-- mappings/none/bfm.mapping | 4 ++-- mappings/none/biq.mapping | 4 ++-- mappings/none/biz.mapping | 4 ++-- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping index 26788150b2..322dda65ac 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping @@ -12,7 +12,7 @@ CLASS none/bfu net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I + METHOD b getEntryCount ()I FIELD a parent Lnone/biv; METHOD (Lnone/biv;Ljava/lang/String;)V ARG 0 parent diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping index e8b8df5cd4..52a5b0d711 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping @@ -12,7 +12,7 @@ CLASS none/bfv net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping index 0f31e74d7c..4de5967366 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping @@ -12,7 +12,7 @@ CLASS none/bgj net/minecraft/client/gui/menu/GuiNewWorldPresets METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping index 93b929f1cb..209a646851 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping @@ -12,8 +12,8 @@ CLASS none/bge net/minecraft/client/gui/menu/GuiSettingsLanguage METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I - METHOD k contentHeight ()I + METHOD b getEntryCount ()I + METHOD k getContentHeight ()I FIELD a parent Lnone/bgm; FIELD g settings Lnone/bds; METHOD (Lnone/bgm;Lnone/bds;Lnone/byn;)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping index 59d10589ba..cbf29ae43d 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping @@ -12,7 +12,7 @@ CLASS none/bgp net/minecraft/client/gui/menu/GuiSettingsSnooper METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I + METHOD b getEntryCount ()I FIELD a parent Lnone/bgm; FIELD f settings Lnone/bds; METHOD (Lnone/bgm;Lnone/bds;)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping index 0c6fe95294..6e22ce05f4 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiStats.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping @@ -20,8 +20,8 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I - METHOD k contentHeight ()I + METHOD b getEntryCount ()I + METHOD k getContentHeight ()I CLASS none/bgy$c METHOD a drawEntry (IIIIII)V ARG 0 index @@ -43,8 +43,8 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I - METHOD k contentHeight ()I + METHOD b getEntryCount ()I + METHOD k getContentHeight ()I CLASS none/bgy$e METHOD a isSelected (I)Z ARG 0 index @@ -54,8 +54,8 @@ CLASS none/bgy net/minecraft/client/gui/menu/GuiStats METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I - METHOD c entryWidth ()I + METHOD b getEntryCount ()I + METHOD c getEntryWidth ()I FIELD a parent Lnone/bgm; METHOD (Lnone/bgm;Lnone/nz;)V ARG 0 parent diff --git a/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping b/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping index 1d55ef1a10..c562ae334c 100644 --- a/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping +++ b/mappings/net/minecraft/client/gui/menu/ListEntryRemoteServer.mapping @@ -1,6 +1,6 @@ CLASS none/bif net/minecraft/client/gui/menu/ListEntryRemoteServer FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b SERVER_PINGER Ljava/util/concurrent/ThreadPoolExecutor; + FIELD b PING_THREAD_POOL Ljava/util/concurrent/ThreadPoolExecutor; FIELD c UNKNOWN_SERVER Lnone/kp; FIELD d SERVER_SELECTION Lnone/kp; FIELD e guiMultiplayer Lnone/bic; diff --git a/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping b/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping index 980270974d..2e328e6af5 100644 --- a/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping +++ b/mappings/net/minecraft/client/gui/menu/WidgetListBase.mapping @@ -50,13 +50,13 @@ CLASS none/bfb net/minecraft/client/gui/menu/WidgetListBase ARG 2 mouseX ARG 3 mouseY METHOD a handleButtonPressed (Lnone/bek;)V - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD b drawEntries (IIII)V ARG 0 x ARG 1 y ARG 2 mouseX ARG 3 mouseY - METHOD c entryWidth ()I + METHOD c getEntryWidth ()I METHOD c findEntryIndex (II)I ARG 0 mouseX ARG 1 mouseY @@ -70,7 +70,7 @@ CLASS none/bfb net/minecraft/client/gui/menu/WidgetListBase ARG 0 dy METHOD i setLeftPos (I)V ARG 0 x1 - METHOD k contentHeight ()I + METHOD k getContentHeight ()I METHOD l clampScrollY ()V METHOD m getMaxScrollY ()I METHOD n getScrollY ()I diff --git a/mappings/net/minecraft/client/gui/menu/WidgetServerList.mapping b/mappings/net/minecraft/client/gui/menu/WidgetServerList.mapping index 46505f4f03..63bd68ff3c 100644 --- a/mappings/net/minecraft/client/gui/menu/WidgetServerList.mapping +++ b/mappings/net/minecraft/client/gui/menu/WidgetServerList.mapping @@ -18,9 +18,9 @@ CLASS none/big net/minecraft/client/gui/menu/WidgetServerList ARG 0 servers METHOD a setUserServers (Lnone/bmk;)V ARG 0 servers - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index - METHOD c entryWidth ()I + METHOD c getEntryWidth ()I METHOD c setIndex (I)V METHOD e getIndex ()I diff --git a/mappings/net/minecraft/server/LanServerPinger.mapping b/mappings/net/minecraft/server/LanServerPinger.mapping index 9eaa0d631a..e2c6426f3b 100644 --- a/mappings/net/minecraft/server/LanServerPinger.mapping +++ b/mappings/net/minecraft/server/LanServerPinger.mapping @@ -10,7 +10,7 @@ CLASS none/cap net/minecraft/server/LanServerPinger ARG 1 addressPort METHOD a parseAnnouncementMotd (Ljava/lang/String;)Ljava/lang/String; ARG 0 announcement - METHOD a makeAnnouncement (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + METHOD a createAnnouncement (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 0 motd ARG 1 addressPort METHOD b parseAnnouncementAddressPort (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/sortme/KeyBindingGui.mapping b/mappings/net/minecraft/sortme/KeyBindingGui.mapping index 252483c21a..dc9da3fcc4 100644 --- a/mappings/net/minecraft/sortme/KeyBindingGui.mapping +++ b/mappings/net/minecraft/sortme/KeyBindingGui.mapping @@ -50,7 +50,7 @@ CLASS none/bhb net/minecraft/sortme/KeyBindingGui METHOD (Lnone/bhc;Lnone/bdq;)V ARG 0 gui ARG 1 mc - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index - METHOD c entryWidth ()I + METHOD c getEntryWidth ()I diff --git a/mappings/none/bey.mapping b/mappings/none/bey.mapping index 44c285e290..7cda83faaa 100644 --- a/mappings/none/bey.mapping +++ b/mappings/none/bey.mapping @@ -22,9 +22,9 @@ CLASS none/bey ARG 7 mouseIsOver METHOD b (IIIIII)V ARG 0 index - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index - METHOD c entryWidth ()I + METHOD c getEntryWidth ()I METHOD c get (I)Lnone/bey$a; ARG 0 index diff --git a/mappings/none/bez.mapping b/mappings/none/bez.mapping index 724e5256ea..d75609b9c4 100644 --- a/mappings/none/bez.mapping +++ b/mappings/none/bez.mapping @@ -22,13 +22,13 @@ CLASS none/bez ARG 7 mouseIsOver METHOD b (IIIIII)V ARG 0 index - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index METHOD b handleMouseClick (III)Z ARG 0 mouseX ARG 1 mouseY ARG 2 mouseButton - METHOD c entryWidth ()I + METHOD c getEntryWidth ()I METHOD e get (I)Lnone/bez$d; ARG 0 index diff --git a/mappings/none/bfj.mapping b/mappings/none/bfj.mapping index df640c3624..6b9f2432ee 100644 --- a/mappings/none/bfj.mapping +++ b/mappings/none/bfj.mapping @@ -11,11 +11,11 @@ CLASS none/bfj METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD b drawEntries (IIII)V ARG 0 x ARG 1 y ARG 2 mouseX ARG 3 mouseY - METHOD k contentHeight ()I + METHOD k getContentHeight ()I METHOD p handleMouseEvent ()V diff --git a/mappings/none/bfl.mapping b/mappings/none/bfl.mapping index 4deb8b5823..a54ef31009 100644 --- a/mappings/none/bfl.mapping +++ b/mappings/none/bfl.mapping @@ -11,6 +11,6 @@ CLASS none/bfl METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I - METHOD k contentHeight ()I + METHOD b getEntryCount ()I + METHOD k getContentHeight ()I METHOD p handleMouseEvent ()V diff --git a/mappings/none/bfm.mapping b/mappings/none/bfm.mapping index 29863240af..c43cc4866c 100644 --- a/mappings/none/bfm.mapping +++ b/mappings/none/bfm.mapping @@ -15,6 +15,6 @@ CLASS none/bfm METHOD a (IZII)V ARG 2 mouseX ARG 3 mouseY - METHOD b entryCount ()I - METHOD k contentHeight ()I + METHOD b getEntryCount ()I + METHOD k getContentHeight ()I METHOD p handleMouseEvent ()V diff --git a/mappings/none/biq.mapping b/mappings/none/biq.mapping index 2bd5e71c9e..4f4004edf9 100644 --- a/mappings/none/biq.mapping +++ b/mappings/none/biq.mapping @@ -1,7 +1,7 @@ CLASS none/biq - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index - METHOD c entryWidth ()I + METHOD c getEntryWidth ()I METHOD c get (I)Lnone/bik; ARG 0 index diff --git a/mappings/none/biz.mapping b/mappings/none/biz.mapping index 87935c4cc0..4b4457a99f 100644 --- a/mappings/none/biz.mapping +++ b/mappings/none/biz.mapping @@ -2,9 +2,9 @@ CLASS none/biz FIELD u LOGGER Lorg/apache/logging/log4j/Logger; METHOD a isSelected (I)Z ARG 0 index - METHOD b entryCount ()I + METHOD b getEntryCount ()I METHOD b get (I)Lnone/bew$a; ARG 0 index - METHOD c entryWidth ()I + METHOD c getEntryWidth ()I METHOD c get (I)Lnone/biy; ARG 0 index