From af745071cf4f0f098a6ed4c95c86989d8e723249 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Tue, 30 Aug 2016 22:10:38 +0100 Subject: [PATCH] Inventory and Gui Mappings (#59) * Inventory and Gui Mappings * Inventory and Gui Mappings * Revert Sounds.mapping change that I didnt do * Add back sounds, not sure what is up with this * Fixed some issues with mappings * Enigma is annoying sometimes * Fix field name issue * Fix sound mappings again.. * Fix a few issues --- .../minecraft/client/gui/GuiContainer.mapping | 5 ++++ .../gui/ingame/GuiCreativeInventory.mapping} | 26 ++++++++++++++++--- .../client/gui/ingame/GuiInventory.mapping} | 6 ++++- .../client/gui/widget/WidgetTextField.mapping | 17 ++++++++++++ .../container/impl/ContainerAnvil.mapping | 2 ++ .../net/minecraft/container/slot/Slot.mapping | 2 ++ .../net/minecraft/gui/CreativeTab.mapping | 2 ++ .../minecraft/inventory/Inventory.mapping} | 12 ++++++++- mappings/none/bmd.mapping | 2 ++ 9 files changed, 69 insertions(+), 5 deletions(-) rename mappings/{none/bhl.mapping => net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping} (58%) rename mappings/{none/bht.mapping => net/minecraft/client/gui/ingame/GuiInventory.mapping} (55%) create mode 100644 mappings/net/minecraft/client/gui/widget/WidgetTextField.mapping rename mappings/{none/ri.mapping => net/minecraft/inventory/Inventory.mapping} (72%) create mode 100644 mappings/none/bmd.mapping diff --git a/mappings/net/minecraft/client/gui/GuiContainer.mapping b/mappings/net/minecraft/client/gui/GuiContainer.mapping index 6e345539d6..9ce66a79aa 100644 --- a/mappings/net/minecraft/client/gui/GuiContainer.mapping +++ b/mappings/net/minecraft/client/gui/GuiContainer.mapping @@ -15,6 +15,11 @@ CLASS none/bhc net/minecraft/client/gui/GuiContainer ARG 2 mouseY METHOD a draw (IIF)V METHOD a handleMouseClick (III)V + METHOD a onMouseClick (Lnone/act;IILnone/abz;)V + ARG 0 slot + ARG 1 invSlot + ARG 2 button + ARG 3 type METHOD b init ()V METHOD b drawForeground (II)V ARG 0 mouseX diff --git a/mappings/none/bhl.mapping b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping similarity index 58% rename from mappings/none/bhl.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping index e6524fc6df..d04c43832d 100644 --- a/mappings/none/bhl.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping @@ -1,12 +1,18 @@ -CLASS none/bhl - CLASS none/bhl$a +CLASS none/bhl net/minecraft/client/gui/ingame/GuiCreativeInventory + CLASS none/bhl$a ContainerCreative + FIELD a itemList Lnone/dc; + METHOD (Lnone/aak;)V + ARG 0 player METHOD a canUse (Lnone/aak;)Z ARG 0 player METHOD b getStack (Lnone/aak;I)Lnone/aeq; ARG 0 player ARG 1 slot - CLASS none/bhl$b + CLASS none/bhl$b CreativeSlot + FIELD b slot Lnone/act; METHOD a getMaxStackSize ()I + METHOD a (Lnone/aak;)Z + ARG 0 player METHOD a (Lnone/aeq;)Z ARG 0 stack METHOD a matches (Lnone/qt;I)Z @@ -19,16 +25,30 @@ CLASS none/bhl METHOD d setStack (Lnone/aeq;)V METHOD e hasStack ()Z METHOD f markDirty ()V + FIELD A searchBox Lnone/bem; + FIELD D clearText Z + FIELD u BG_TEX Lnone/kp; + FIELD v inventory Lnone/ri; + FIELD w selectedTab I + METHOD (Lnone/aak;)V + ARG 0 player METHOD a handleKeyPress (CI)V METHOD a drawBackground (FII)V METHOD a draw (IIF)V METHOD a handleMouseClick (III)V + METHOD a onMouseClick (Lnone/act;IILnone/abz;)V + ARG 0 slot + ARG 1 invSlot + ARG 2 button + ARG 3 type METHOD a drawStackTooltip (Lnone/aeq;II)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V METHOD b drawForeground (II)V ARG 0 mouseX ARG 1 mouseY + METHOD b setSelectedTab (Lnone/adq;)V + ARG 0 tab METHOD e update ()V METHOD k handleMouseEvent ()V METHOD m onClosed ()V diff --git a/mappings/none/bht.mapping b/mappings/net/minecraft/client/gui/ingame/GuiInventory.mapping similarity index 55% rename from mappings/none/bht.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiInventory.mapping index f0c0f2f7ad..a20fbd6958 100644 --- a/mappings/none/bht.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiInventory.mapping @@ -1,6 +1,10 @@ -CLASS none/bht +CLASS none/bht net/minecraft/client/gui/ingame/GuiInventory + METHOD (Lnone/aak;)V + ARG 0 player METHOD a drawBackground (FII)V METHOD a draw (IIF)V + METHOD a drawEntity (IIIFFLnone/sn;)V + ARG 5 entity METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V METHOD b drawForeground (II)V diff --git a/mappings/net/minecraft/client/gui/widget/WidgetTextField.mapping b/mappings/net/minecraft/client/gui/widget/WidgetTextField.mapping new file mode 100644 index 0000000000..eb4ad5ca68 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/WidgetTextField.mapping @@ -0,0 +1,17 @@ +CLASS none/bem net/minecraft/client/gui/widget/WidgetTextField + FIELD a x I + FIELD f y I + FIELD g id I + FIELD h fontRenderer Lnone/bec; + FIELD i width I + FIELD j height I + FIELD k text Ljava/lang/String; + METHOD (ILnone/bec;IIII)V + ARG 0 id + ARG 1 fontRenderer + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + METHOD a setText (Ljava/lang/String;)V + ARG 0 text diff --git a/mappings/net/minecraft/container/impl/ContainerAnvil.mapping b/mappings/net/minecraft/container/impl/ContainerAnvil.mapping index 924b256eda..1d6b49cdae 100644 --- a/mappings/net/minecraft/container/impl/ContainerAnvil.mapping +++ b/mappings/net/minecraft/container/impl/ContainerAnvil.mapping @@ -2,6 +2,8 @@ CLASS none/abw net/minecraft/container/impl/ContainerAnvil CLASS none/abw$1 METHOD u_ markDirty ()V CLASS none/abw$2 + METHOD a (Lnone/aak;)Z + ARG 0 player METHOD a (Lnone/aeq;)Z ARG 0 stack FIELD f LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/container/slot/Slot.mapping b/mappings/net/minecraft/container/slot/Slot.mapping index 4d7bb26bd0..965ef7b754 100644 --- a/mappings/net/minecraft/container/slot/Slot.mapping +++ b/mappings/net/minecraft/container/slot/Slot.mapping @@ -6,6 +6,8 @@ CLASS none/act net/minecraft/container/slot/Slot ARG 0 inventory ARG 1 invSlot METHOD a getMaxStackSize ()I + METHOD a (Lnone/aak;)Z + ARG 0 player METHOD a (Lnone/aeq;)Z ARG 0 stack METHOD a matches (Lnone/qt;I)Z diff --git a/mappings/net/minecraft/gui/CreativeTab.mapping b/mappings/net/minecraft/gui/CreativeTab.mapping index ff45973ae3..3688931608 100644 --- a/mappings/net/minecraft/gui/CreativeTab.mapping +++ b/mappings/net/minecraft/gui/CreativeTab.mapping @@ -46,6 +46,8 @@ CLASS none/adq net/minecraft/gui/CreativeTab METHOD a getId ()I METHOD a setTexture (Ljava/lang/String;)Lnone/adq; ARG 0 texture + METHOD a getStacksForDisplay (Lnone/dc;)V + ARG 0 stackList METHOD b getUntranslatedName ()Ljava/lang/String; METHOD c getTranslationKey ()Ljava/lang/String; METHOD d getIconItemStack ()Lnone/aeq; diff --git a/mappings/none/ri.mapping b/mappings/net/minecraft/inventory/Inventory.mapping similarity index 72% rename from mappings/none/ri.mapping rename to mappings/net/minecraft/inventory/Inventory.mapping index fb34db2998..180dffa353 100644 --- a/mappings/none/ri.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -1,4 +1,12 @@ -CLASS none/ri +CLASS none/ri net/minecraft/inventory/Inventory + FIELD a name Ljava/lang/String; + FIELD b size I + FIELD c stackList Lnone/dc; + FIELD e customNamed Z + METHOD (Ljava/lang/String;ZI)V + ARG 0 name + ARG 1 customNamed + ARG 2 size METHOD a getInvStack (I)Lnone/aeq; ARG 0 slot METHOD a takeInvStack (II)Lnone/aeq; @@ -7,6 +15,8 @@ CLASS none/ri METHOD a setInvStack (ILnone/aeq;)V ARG 0 slot ARG 1 stack + METHOD a setName (Ljava/lang/String;)V + ARG 0 name METHOD a canPlayerUseInv (Lnone/aak;)Z ARG 0 player METHOD b removeInvStack (I)Lnone/aeq; diff --git a/mappings/none/bmd.mapping b/mappings/none/bmd.mapping new file mode 100644 index 0000000000..203403a838 --- /dev/null +++ b/mappings/none/bmd.mapping @@ -0,0 +1,2 @@ +CLASS none/bmd + METHOD h isCreativeMode ()Z