diff --git a/mappings/bhq.mapping b/mappings/bhq.mapping deleted file mode 100644 index c95a2734f1..0000000000 --- a/mappings/bhq.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS bhq - METHOD a draw (IIF)V - ARG 0 mouseX - ARG 1 mouseY - ARG 2 delta - METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/GuiContainer.mapping b/mappings/net/minecraft/client/gui/GuiContainer.mapping index 6cfcced5ca..b33a400944 100644 --- a/mappings/net/minecraft/client/gui/GuiContainer.mapping +++ b/mappings/net/minecraft/client/gui/GuiContainer.mapping @@ -8,6 +8,7 @@ CLASS bhf net/minecraft/client/gui/GuiContainer FIELD s slots Ljava/util/Set; METHOD (Labx;)V ARG 0 container + METHOD a calculateOffset ()V METHOD a onKeyPressed (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping b/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping index 937ba01a34..93cb6b4cfa 100644 --- a/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping +++ b/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping @@ -6,6 +6,7 @@ CLASS bhg net/minecraft/client/gui/container/GuiAnvil METHOD (Laal;Laiw;)V ARG 0 playerInv ARG 1 world + METHOD a calculateOffset ()V METHOD a onKeyPressed (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping b/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping index ff0c1cc5d1..f2a042bf59 100644 --- a/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping +++ b/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping @@ -1,5 +1,5 @@ CLASS bhh net/minecraft/client/gui/container/GuiBeacon - CLASS bhh$a + CLASS bhh$a WidgetButtonIconCancel METHOD (Lbhh;III)V ARG 0 invSlot ARG 1 x @@ -7,7 +7,7 @@ CLASS bhh net/minecraft/client/gui/container/GuiBeacon METHOD b pressed (II)V ARG 0 mouseX ARG 1 mouseY - CLASS bhh$b + CLASS bhh$b WidgetButtonIconDone METHOD (Lbhh;III)V ARG 0 invSlot ARG 1 x @@ -15,26 +15,42 @@ CLASS bhh net/minecraft/client/gui/container/GuiBeacon METHOD b pressed (II)V ARG 0 mouseX ARG 1 mouseY - CLASS bhh$c + CLASS bhh$c WidgetButtonIconEffect + FIELD p effect Lrz; + FIELD q level I METHOD (Lbhh;IIILrz;I)V ARG 0 invSlot ARG 1 x ARG 2 y + ARG 3 effect + ARG 4 level METHOD b pressed (II)V ARG 0 mouseX ARG 1 mouseY - CLASS bhh$d + CLASS bhh$d WidgetButtonIcon + FIELD o iconTexture Lkp; + FIELD p iconU I + FIELD q iconV I + FIELD r disabled Z METHOD (IIILkp;II)V ARG 0 invSlot ARG 1 x ARG 2 y + ARG 3 iconTexture + ARG 4 u + ARG 5 v METHOD a draw (Lbdr;II)V ARG 0 game ARG 1 mouseX ARG 2 mouseY + METHOD b setDisabled (Z)V + ARG 0 value + METHOD c isDisabled ()Z FIELD u LOGGER Lorg/apache/logging/log4j/Logger; FIELD v BG_TEX Lkp; FIELD w inventory Lqv; + FIELD x doneButton Lbhh$b; + FIELD y canConsumeGem Z METHOD (Laal;Lqv;)V ARG 0 playerInv ARG 1 inventory diff --git a/mappings/net/minecraft/client/gui/container/GuiGeneric54.mapping b/mappings/net/minecraft/client/gui/container/GuiContainer54.mapping similarity index 82% rename from mappings/net/minecraft/client/gui/container/GuiGeneric54.mapping rename to mappings/net/minecraft/client/gui/container/GuiContainer54.mapping index b0af2d096c..256a15d405 100644 --- a/mappings/net/minecraft/client/gui/container/GuiGeneric54.mapping +++ b/mappings/net/minecraft/client/gui/container/GuiContainer54.mapping @@ -1,4 +1,4 @@ -CLASS bhl net/minecraft/client/gui/container/GuiGeneric54 +CLASS bhl net/minecraft/client/gui/container/GuiContainer54 FIELD u BG_TEX Lkp; FIELD v playerInv Lqv; FIELD w inventory Lqv; diff --git a/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping b/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping index 5ad92b4433..e9bfd50d32 100644 --- a/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping +++ b/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping @@ -7,6 +7,7 @@ CLASS bhs net/minecraft/client/gui/container/GuiEnchanting METHOD (Laal;Laiw;Lri;)V ARG 0 playerInv ARG 1 world + METHOD a calculateOffset ()V METHOD a drawBackground (FII)V ARG 0 delta ARG 1 mouseX diff --git a/mappings/net/minecraft/client/gui/ingame/AbstractGuiInventory.mapping b/mappings/net/minecraft/client/gui/ingame/AbstractGuiInventory.mapping new file mode 100644 index 0000000000..29aeb5ebcf --- /dev/null +++ b/mappings/net/minecraft/client/gui/ingame/AbstractGuiInventory.mapping @@ -0,0 +1,9 @@ +CLASS bhq net/minecraft/client/gui/ingame/AbstractGuiInventory + FIELD u offsetGuiForEffects Z + METHOD a calculateOffset ()V + METHOD a draw (IIF)V + ARG 0 mouseX + ARG 1 mouseY + ARG 2 delta + METHOD b init ()V + METHOD f drawPotionEffects ()V diff --git a/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping index 3e804f68b7..99f3f35713 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping @@ -57,6 +57,7 @@ CLASS bho net/minecraft/client/gui/ingame/GuiCreativeInventory FIELD y isScrolling Z METHOD (Laam;)V ARG 0 player + METHOD a calculateOffset ()V METHOD a onKeyPressed (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/GuiMainMenu.mapping b/mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping similarity index 59% rename from mappings/net/minecraft/client/gui/GuiMainMenu.mapping rename to mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping index c4e03dcf16..a54e54f1ed 100644 --- a/mappings/net/minecraft/client/gui/GuiMainMenu.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping @@ -1,12 +1,27 @@ -CLASS bgu net/minecraft/client/gui/GuiMainMenu +CLASS bgu net/minecraft/client/gui/menu/GuiMainMenu FIELD A SPLASHES_LOC Lkp; FIELD B LOGO_LOC Lkp; FIELD C PANORAMA_LOC [Lkp; + FIELD D warningTextWidth I + FIELD E warningTitleWidth I + FIELD F warningAlignLeft I + FIELD G warningAlignTop I + FIELD H warningAlignRight I + FIELD I warningAlignBottom I + FIELD J bgTexture Lkp; FIELD K realmsButton Lbel; FIELD M realmsNotificationGui Lbgn; + FIELD a OUTDATED_GL_TEXT Ljava/lang/String; FIELD g LOGGER Lorg/apache/logging/log4j/Logger; FIELD h RANDOM Ljava/util/Random; FIELD r splashText Ljava/lang/String; + FIELD s buttonResetDemo Lbel; + FIELD t age I + FIELD u bgDynamicTexture Lbwu; + FIELD w mutex Ljava/lang/Object; + FIELD x warningTitle Ljava/lang/String; + FIELD y warningText Ljava/lang/String; + FIELD z warningLink Ljava/lang/String; METHOD a areRealmsNotificationsEnabled ()Z METHOD a onKeyPressed (CI)V ARG 0 keyChar diff --git a/mappings/net/minecraft/client/gui/GuiYesNo.mapping b/mappings/net/minecraft/client/gui/menu/GuiYesNo.mapping similarity index 94% rename from mappings/net/minecraft/client/gui/GuiYesNo.mapping rename to mappings/net/minecraft/client/gui/menu/GuiYesNo.mapping index b6cae313b0..72bb49f41c 100644 --- a/mappings/net/minecraft/client/gui/GuiYesNo.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiYesNo.mapping @@ -1,4 +1,4 @@ -CLASS bft net/minecraft/client/gui/GuiYesNo +CLASS bft net/minecraft/client/gui/menu/GuiYesNo FIELD a callback Lbfs; FIELD f title Ljava/lang/String; FIELD g yesTranslated Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/widget/WidgetLockButton.mapping b/mappings/net/minecraft/client/gui/widget/WidgetButtonLock.mapping similarity index 90% rename from mappings/net/minecraft/client/gui/widget/WidgetLockButton.mapping rename to mappings/net/minecraft/client/gui/widget/WidgetButtonLock.mapping index 0a8b6d67ae..91043621df 100644 --- a/mappings/net/minecraft/client/gui/widget/WidgetLockButton.mapping +++ b/mappings/net/minecraft/client/gui/widget/WidgetButtonLock.mapping @@ -1,4 +1,4 @@ -CLASS bew net/minecraft/client/gui/widget/WidgetLockButton +CLASS bew net/minecraft/client/gui/widget/WidgetButtonLock CLASS bew$a IconLocation FIELD a LOCKED Lbew$a; FIELD b LOCKED_HOVERED Lbew$a;