From a9b520515c364a5646cc2ec2b618c5ce6df03987 Mon Sep 17 00:00:00 2001
From: NinjaPhenix <NinjaPhenix@users.noreply.github.com>
Date: Wed, 20 Mar 2019 22:03:39 +0000
Subject: [PATCH] Changed AbstractButtonWidget to use mojang names (#542)

* Changed AbstractButtonWidget to use mojang names

Some minor exceptions:
- renderBackground instead of renderBg
- getTextureId instead of getYImage
- nextNarrationTime instead of nextNarration

* Removed unnecessary mappings(some changes overlap into other classes)

* Missed some methods

* Some more parameter names
---
 .../net/minecraft/client/gui/Drawable.mapping |  2 +-
 .../client/gui/InputListener.mapping          |  6 ++--
 .../gui/widget/AbstractButtonWidget.mapping   | 36 ++++++++-----------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/mappings/net/minecraft/client/gui/Drawable.mapping b/mappings/net/minecraft/client/gui/Drawable.mapping
index 691b18f3b9..954f4336ff 100644
--- a/mappings/net/minecraft/client/gui/Drawable.mapping
+++ b/mappings/net/minecraft/client/gui/Drawable.mapping
@@ -1,5 +1,5 @@
 CLASS cvx net/minecraft/client/gui/Drawable
-	METHOD render draw (IIF)V
+	METHOD render (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
diff --git a/mappings/net/minecraft/client/gui/InputListener.mapping b/mappings/net/minecraft/client/gui/InputListener.mapping
index b02f38a39a..f4314ee321 100644
--- a/mappings/net/minecraft/client/gui/InputListener.mapping
+++ b/mappings/net/minecraft/client/gui/InputListener.mapping
@@ -9,7 +9,9 @@ CLASS cwa net/minecraft/client/gui/InputListener
 	METHOD charTyped (CI)Z
 		ARG 1 chr
 		ARG 2 keyCode
-	METHOD isPartOfFocusCycle hasFocus ()Z
+	METHOD isMouseOver (DD)Z
+		ARG 1 mouseX
+		ARG 3 mouseY
 	METHOD keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
@@ -30,5 +32,5 @@ CLASS cwa net/minecraft/client/gui/InputListener
 		ARG 5 button
 	METHOD mouseScrolled (DDD)Z
 		ARG 5 amount
-	METHOD onFocusChanged setHasFocus (Z)V
+	METHOD onFocusChanged (Z)V
 		ARG 1 hasFocus
diff --git a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping
index ac17de033c..6cfdd225f5 100644
--- a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping
+++ b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping
@@ -1,52 +1,44 @@
 CLASS cvb net/minecraft/client/gui/widget/AbstractButtonWidget
-	FIELD WIDGETS_LOCATION WIDGET_TEX Lqq;
-	FIELD active enabled Z
-	FIELD alpha opacity F
-	FIELD focused hasFocus Z
-	FIELD isHovered hovered Z
-	FIELD message text Ljava/lang/String;
-	FIELD nextNarration nextNarrationTime J
 	METHOD <init> (IIIILjava/lang/String;)V
 		ARG 1 x
 		ARG 2 y
 		ARG 3 width
 		ARG 4 height
-		ARG 5 text
+		ARG 5 message
 	METHOD <init> (IILjava/lang/String;)V
 		ARG 1 x
 		ARG 2 y
 		ARG 3 text
-	METHOD clicked isSelected (DD)Z
+	METHOD clicked (DD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
-	METHOD getMessage getText ()Ljava/lang/String;
-	METHOD getNarrationMessage getNarrationString ()Ljava/lang/String;
-	METHOD getYImage getTextureId (Z)I
-		ARG 1 hovered
-	METHOD narrate narrateIfNecessary ()V
-	METHOD onDrag onDragged (DDDD)V
+	METHOD getYImage (Z)I
+		ARG 1 isHovered
+	METHOD onClick (DD)V
+		ARG 1 mouseX
+		ARG 3 mouseY
+	METHOD onDrag (DDDD)V
 		ARG 1 mouseX
 		ARG 3 mouseY
 		ARG 5 deltaX
 		ARG 7 deltaY
-	METHOD onRelease onReleased (DD)V
+	METHOD onRelease (DD)V
 		ARG 1 mouseX
 		ARG 3 mouseY
-	METHOD playDownSound playPressedSound (Ldwp;)V
-	METHOD renderBg drawBackground (Lcua;II)V
+	METHOD renderBg (Lcua;II)V
 		ARG 1 client
 		ARG 2 mouseX
 		ARG 3 mouseY
-	METHOD renderButton drawButton (IIF)V
+	METHOD renderButton (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD renderToolTip onHover (II)V
+	METHOD renderToolTip (II)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD setAlpha setOpacity (F)V
+	METHOD setAlpha (F)V
 		ARG 1 value
-	METHOD setMessage setText (Ljava/lang/String;)V
+	METHOD setMessage (Ljava/lang/String;)V
 		ARG 1 value
 	METHOD setWidth (I)V
 		ARG 1 value