From 2db429f30edb1ea7558f04d7a276ea78c378b202 Mon Sep 17 00:00:00 2001 From: Daniel She Date: Fri, 15 Mar 2019 08:21:29 +0800 Subject: [PATCH] Gui Mappings again for 19w11a (#522) --- mappings/cwu.mapping | 7 +++ .../client/gui/FocusedInputListener.mapping | 1 + .../client/gui/InputListener.mapping | 1 + .../client/gui/MultiInputListener.mapping | 4 ++ .../client/gui/ScreenComponent.mapping | 1 + .../gui/widget/AbstractButtonWidget.mapping | 59 ++++++++++++++++++ .../gui/widget/BookPageButtonWidget.mapping | 4 +- .../client/gui/widget/ButtonWidget.mapping | 60 +------------------ .../gui/widget/LanguageButtonWidget.mapping | 3 +- .../gui/widget/LockButtonWidget.mapping | 3 +- .../gui/widget/OptionButtonWidget.mapping | 8 +-- .../gui/widget/RealmsButtonWidget.mapping | 13 ++-- .../gui/widget/RecipeBookButtonWidget.mapping | 14 +++-- .../client/gui/widget/SliderWidget.mapping | 12 ++++ .../gui/widget/SoundSliderWidget.mapping | 5 ++ 15 files changed, 118 insertions(+), 77 deletions(-) create mode 100644 mappings/cwu.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping diff --git a/mappings/cwu.mapping b/mappings/cwu.mapping new file mode 100644 index 0000000000..a1b5660401 --- /dev/null +++ b/mappings/cwu.mapping @@ -0,0 +1,7 @@ +CLASS cwu + METHOD Z_ isVisible ()Z + METHOD b setEnabled (Z)V + ARG 1 enabled + METHOD c isEnabled ()Z + METHOD c setVisible (Z)V + ARG 1 visible diff --git a/mappings/net/minecraft/client/gui/FocusedInputListener.mapping b/mappings/net/minecraft/client/gui/FocusedInputListener.mapping index aea2fbcf1d..630e26e611 100644 --- a/mappings/net/minecraft/client/gui/FocusedInputListener.mapping +++ b/mappings/net/minecraft/client/gui/FocusedInputListener.mapping @@ -1 +1,2 @@ CLASS cvq net/minecraft/client/gui/FocusedInputListener + METHOD i getFocused ()Lcvp; diff --git a/mappings/net/minecraft/client/gui/InputListener.mapping b/mappings/net/minecraft/client/gui/InputListener.mapping index 249cdce6dc..54652d3591 100644 --- a/mappings/net/minecraft/client/gui/InputListener.mapping +++ b/mappings/net/minecraft/client/gui/InputListener.mapping @@ -4,6 +4,7 @@ CLASS cvp net/minecraft/client/gui/InputListener ARG 1 chr ARG 2 keyCode METHOD a mouseScrolled (DDD)Z + ARG 5 amount METHOD a mouseReleased (DDI)Z ARG 1 mouseX ARG 3 mouseY diff --git a/mappings/net/minecraft/client/gui/MultiInputListener.mapping b/mappings/net/minecraft/client/gui/MultiInputListener.mapping index ad59ad3d6a..2c3029418d 100644 --- a/mappings/net/minecraft/client/gui/MultiInputListener.mapping +++ b/mappings/net/minecraft/client/gui/MultiInputListener.mapping @@ -1,8 +1,12 @@ CLASS cvo net/minecraft/client/gui/MultiInputListener + METHOD Y_ isActive ()Z METHOD a setFocused (Lcvp;)V + ARG 1 focused METHOD a setFocused (Lcvp;I)V ARG 1 focusedListener ARG 2 previousFocusedIndex + METHOD a setActive (Z)V + ARG 1 active METHOD b getInputListeners ()Ljava/util/List; METHOD b focusOn (Lcvp;)V METHOD f getFocused (I)Lcvp; diff --git a/mappings/net/minecraft/client/gui/ScreenComponent.mapping b/mappings/net/minecraft/client/gui/ScreenComponent.mapping index c8ad81924b..a728d32a91 100644 --- a/mappings/net/minecraft/client/gui/ScreenComponent.mapping +++ b/mappings/net/minecraft/client/gui/ScreenComponent.mapping @@ -1,2 +1,3 @@ CLASS cvn net/minecraft/client/gui/ScreenComponent FIELD a focused Lcvp; + FIELD b active Z diff --git a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping new file mode 100644 index 0000000000..538de0d44a --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping @@ -0,0 +1,59 @@ +CLASS cuq net/minecraft/client/gui/widget/AbstractButtonWidget + FIELD a text Ljava/lang/String; + FIELD b focused Z + FIELD g WIDGET_TEX Lqp; + FIELD h width I + FIELD i height I + FIELD j x I + FIELD k y I + FIELD l enabled Z + FIELD m visible Z + FIELD n opacity F + FIELD o nextNarrationTime J + FIELD p hovered Z + METHOD (IIIILjava/lang/String;)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 text + METHOD (IILjava/lang/String;)V + ARG 1 x + ARG 2 y + ARG 3 text + METHOD a onDragged (DDDD)V + ARG 1 mouseX + ARG 3 mouseY + ARG 5 deltaX + ARG 7 deltaY + METHOD a setOpacity (F)V + ARG 1 value + METHOD a setWidth (I)V + ARG 1 value + METHOD a onHover (II)V + ARG 1 mouseX + ARG 2 mouseY + METHOD a drawBackground (Lctp;II)V + ARG 1 client + ARG 2 mouseX + ARG 3 mouseY + METHOD a playPressedSound (Ldwk;)V + METHOD a setText (Ljava/lang/String;)V + ARG 1 value + METHOD a getTextureId (Z)I + ARG 1 hovered + METHOD aa_ narrateIfNecessary ()V + METHOD ab_ getNarrationString ()Ljava/lang/String; + METHOD b drawButton (IIF)V + ARG 1 mouseX + ARG 2 mouseY + ARG 3 delta + METHOD d isHovered ()Z + METHOD e onReleased (DD)V + ARG 1 mouseX + ARG 3 mouseY + METHOD f getWidth ()I + METHOD f isSelected (DD)Z + ARG 1 mouseX + ARG 3 mouseY + METHOD g getText ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/widget/BookPageButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/BookPageButtonWidget.mapping index ab05bd71ff..bcd2bf2257 100644 --- a/mappings/net/minecraft/client/gui/widget/BookPageButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/BookPageButtonWidget.mapping @@ -1,5 +1,5 @@ CLASS dad net/minecraft/client/gui/widget/BookPageButtonWidget FIELD a isNextPageButton Z METHOD (IIZ)V - ARG 1 id - ARG 2 x + ARG 1 x + ARG 2 y diff --git a/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping index d9d805dead..812cade9a2 100644 --- a/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping @@ -1,58 +1,2 @@ -CLASS cuq net/minecraft/client/gui/widget/ButtonWidget - FIELD a text Ljava/lang/String; - FIELD g WIDGET_TEX Lqp; - FIELD h width I - FIELD i height I - FIELD j x I - FIELD k y I - FIELD l enabled Z - FIELD m visible Z - FIELD n opacity F - FIELD o nextNarrationTime J - FIELD p hovered Z - METHOD (IIIILjava/lang/String;)V - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 text - METHOD (IILjava/lang/String;)V - ARG 1 x - ARG 2 y - ARG 3 text - METHOD a onDragged (DDDD)V - ARG 1 mouseX - ARG 3 mouseY - ARG 5 deltaX - ARG 7 deltaY - METHOD a setOpacity (F)V - ARG 1 value - METHOD a setWidth (I)V - ARG 1 value - METHOD a onHover (II)V - ARG 1 mouseX - ARG 2 mouseY - METHOD a drawBackground (Lctp;II)V - ARG 1 client - ARG 2 mouseX - ARG 3 mouseY - METHOD a playPressedSound (Ldwk;)V - METHOD a setText (Ljava/lang/String;)V - ARG 1 value - METHOD a getTextureId (Z)I - ARG 1 hovered - METHOD aa_ narrateIfNecessary ()V - METHOD ab_ getNarrationString ()Ljava/lang/String; - METHOD b drawButton (IIF)V - ARG 1 mouseX - ARG 2 mouseY - ARG 3 delta - METHOD d isHovered ()Z - METHOD e onReleased (DD)V - ARG 1 mouseX - ARG 3 mouseY - METHOD f getWidth ()I - METHOD f isSelected (DD)Z - ARG 1 mouseX - ARG 3 mouseY - METHOD g getText ()Ljava/lang/String; +CLASS cut net/minecraft/client/gui/widget/ButtonWidget + METHOD a onPressed ()V diff --git a/mappings/net/minecraft/client/gui/widget/LanguageButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/LanguageButtonWidget.mapping index dd93e658a2..7fcb95749c 100644 --- a/mappings/net/minecraft/client/gui/widget/LanguageButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/LanguageButtonWidget.mapping @@ -1,3 +1,4 @@ CLASS cva net/minecraft/client/gui/widget/LanguageButtonWidget METHOD (II)V - ARG 1 id + ARG 1 x + ARG 2 y diff --git a/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping index 54dad4f9e2..7f1accc1be 100644 --- a/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping @@ -14,6 +14,7 @@ CLASS cvc net/minecraft/client/gui/widget/LockButtonWidget METHOD b getV ()I FIELD a locked Z METHOD (II)V - ARG 1 id + ARG 1 x + ARG 2 y METHOD c setLocked (Z)V METHOD h isLocked ()Z diff --git a/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping index cb4be06530..f2c887c5a9 100644 --- a/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/OptionButtonWidget.mapping @@ -1,7 +1,7 @@ CLASS cve net/minecraft/client/gui/widget/OptionButtonWidget FIELD a option Lcts; METHOD (IIIILcts;Ljava/lang/String;)V - ARG 1 id - ARG 2 x - ARG 3 y - ARG 4 width + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height diff --git a/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping index f7bc812a26..dccc988dcd 100644 --- a/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping @@ -2,13 +2,16 @@ CLASS cwv net/minecraft/client/gui/widget/RealmsButtonWidget FIELD a realmsButton Lnet/minecraft/realms/RealmsButton; METHOD (Lnet/minecraft/realms/RealmsButton;IILjava/lang/String;)V ARG 1 button - ARG 2 id - ARG 3 x + ARG 2 x + ARG 3 y + ARG 4 text METHOD (Lnet/minecraft/realms/RealmsButton;IILjava/lang/String;II)V ARG 1 button - ARG 2 id - ARG 3 x - ARG 6 width + ARG 2 x + ARG 3 y + ARG 4 text + ARG 5 width + ARG 6 height METHOD d getTexId (Z)I METHOD h getHeight ()I METHOD j getY ()I diff --git a/mappings/net/minecraft/client/gui/widget/RecipeBookButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/RecipeBookButtonWidget.mapping index ffb0752237..e239df7ebb 100644 --- a/mappings/net/minecraft/client/gui/widget/RecipeBookButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/RecipeBookButtonWidget.mapping @@ -4,12 +4,14 @@ CLASS cuy net/minecraft/client/gui/widget/RecipeBookButtonWidget FIELD p v I FIELD q hoverVOffset I METHOD (IIIIIIILqp;)V - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - ARG 6 u - ARG 7 v + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 u + ARG 6 v + ARG 7 hoverVOffset + ARG 8 texture METHOD b setPos (II)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping index e176aad584..d58150c45b 100644 --- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping @@ -1,6 +1,18 @@ CLASS cur net/minecraft/client/gui/widget/SliderWidget FIELD a gameOptions Lctt; FIELD b progress D + METHOD (IIIID)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 progress + METHOD (Lctt;IIIID)V + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + ARG 6 progress METHOD a updateText ()V METHOD a changeProgress (D)V ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping index 1e27b404e2..66537542ef 100644 --- a/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping @@ -1,2 +1,7 @@ CLASS cvl net/minecraft/client/gui/widget/SoundSliderWidget FIELD p category Lyh; + METHOD (Lctp;IILyh;I)V + ARG 1 client + ARG 2 x + ARG 3 y + ARG 5 width