From 3d68fe8bb0954a60043c9a04545409b9972fc618 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 17 Aug 2016 20:57:56 +0200 Subject: [PATCH] fix IInventory mapping --- mappings/net/minecraft/block/tile/IInventory.mapping | 4 ++-- .../net/minecraft/block/tile/impl/TileEntityBeacon.mapping | 4 ++++ .../block/tile/impl/TileEntityBrewingStand.mapping | 5 +++-- .../net/minecraft/block/tile/impl/TileEntityChest.mapping | 6 ++++-- .../minecraft/block/tile/impl/TileEntityDispenser.mapping | 4 ++++ .../net/minecraft/block/tile/impl/TileEntityFurnace.mapping | 4 +++- .../net/minecraft/block/tile/impl/TileEntityHopper.mapping | 4 ++-- .../minecraft/entity/vehicle/EntityStorageMinecart.mapping | 3 +++ .../entity/vehicle/impl/EntityChestMinecart.mapping | 1 + mappings/net/minecraft/inventory/InventoryCrafting.mapping | 4 ++-- mappings/none/aaj.mapping | 4 ++-- mappings/none/acn.mapping | 4 ++-- mappings/none/acr.mapping | 4 ++-- mappings/none/qs.mapping | 6 +++++- mappings/none/ri.mapping | 4 ++-- 15 files changed, 41 insertions(+), 20 deletions(-) diff --git a/mappings/net/minecraft/block/tile/IInventory.mapping b/mappings/net/minecraft/block/tile/IInventory.mapping index 7ea94862f5..47d0151eb9 100644 --- a/mappings/net/minecraft/block/tile/IInventory.mapping +++ b/mappings/net/minecraft/block/tile/IInventory.mapping @@ -1,10 +1,10 @@ CLASS none/qt net/minecraft/block/tile/IInventory METHOD a getInventoryStack (I)Lnone/aeq; - METHOD a setStack (ILnone/aeq;)V + METHOD a setInventoryStack (ILnone/aeq;)V ARG 0 slot ARG 1 stack METHOD b (I)Lnone/aeq; - METHOD b isValidStack (ILnone/aeq;)Z + METHOD b isValidInventoryStack (ILnone/aeq;)Z ARG 0 slot ARG 1 stack METHOD t_ getInventorySize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping index 30916ecbe1..af750e5313 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping @@ -4,10 +4,14 @@ CLASS none/ara net/minecraft/block/tile/impl/TileEntityBeacon FIELD l primary Lnone/rx; FIELD m secondary Lnone/rx; METHOD D_ update ()V + METHOD a getInventoryStack (I)Lnone/aeq; + METHOD a setInventoryStack (ILnone/aeq;)V METHOD a getAvailableSlots (Lnone/cu;)[I ARG 0 facing METHOD a deserializeTag (Lnone/dt;)V + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD c writeToTag ()Lnone/dt; METHOD f getPotionEffectById (I)Lnone/rx; ARG 0 id + METHOD t_ getInventorySize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping index b376d75b5d..063b0aeab9 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping @@ -5,15 +5,16 @@ CLASS none/arc net/minecraft/block/tile/impl/TileEntityBrewingStand FIELD h inventory Lnone/dc; FIELD l name Ljava/lang/String; METHOD D_ update ()V - METHOD a getStack (I)Lnone/aeq; + METHOD a getInventoryStack (I)Lnone/aeq; ARG 0 slot - METHOD a setStack (ILnone/aeq;)V + METHOD a setInventoryStack (ILnone/aeq;)V ARG 0 slot ARG 1 stack METHOD a setName (Ljava/lang/String;)V ARG 0 nam METHOD a getAvailableSlots (Lnone/cu;)[I METHOD a deserializeTag (Lnone/dt;)V + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD h_ ()Ljava/lang/String; METHOD l clearInventory ()V diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping index 05b6fc7065..a76ab4be9a 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping @@ -9,14 +9,16 @@ CLASS none/ard net/minecraft/block/tile/impl/TileEntityChest METHOD (Lnone/ali$a;)V ARG 0 type METHOD D_ update ()V - METHOD a (I)Lnone/aeq; + METHOD a getInventoryStack (I)Lnone/aeq; ARG 0 slot + METHOD a setInventoryStack (ILnone/aeq;)V METHOD a setName (Ljava/lang/String;)V ARG 0 name METHOD a getNeighbor (Lnone/cu;)Lnone/ard; ARG 0 facing METHOD a deserializeTag (Lnone/dt;)V + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD h_ ()Ljava/lang/String; METHOD n_ ()Z - METHOD t_ getSlotCount ()I + METHOD t_ getInventorySize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping index b932a1165a..d0108d7e22 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping @@ -1,10 +1,14 @@ CLASS none/arh net/minecraft/block/tile/impl/TileEntityDispenser FIELD a name Ljava/lang/String; FIELD f RANDOM Ljava/util/Random; + METHOD a getInventoryStack (I)Lnone/aeq; + METHOD a setInventoryStack (ILnone/aeq;)V METHOD a setName (Ljava/lang/String;)V ARG 0 name METHOD a deserializeTag (Lnone/dt;)V + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD h_ ()Ljava/lang/String; METHOD n_ ()Z + METHOD t_ getInventorySize ()I METHOD v_ getMaxStackSize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping index 83c8c0e40d..05c20f55d6 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping @@ -9,14 +9,16 @@ CLASS none/arm net/minecraft/block/tile/impl/TileEntityFurnace FIELD l totalCookTime I FIELD m name Ljava/lang/String; METHOD D_ update ()V - METHOD a getStack (I)Lnone/aeq; + METHOD a getInventoryStack (I)Lnone/aeq; ARG 0 slot + METHOD a setInventoryStack (ILnone/aeq;)V METHOD a setName (Ljava/lang/String;)V ARG 0 name METHOD a getCookTime (Lnone/aeq;)I ARG 0 stack METHOD a getAvailableSlots (Lnone/cu;)[I METHOD a deserializeTag (Lnone/dt;)V + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD b getFuelTime (Lnone/aeq;)I ARG 0 stack METHOD b serializeTag (Lnone/dt;)Lnone/dt; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping index d8eb96be9b..219fd595a6 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping @@ -7,11 +7,11 @@ CLASS none/aro net/minecraft/block/tile/impl/TileEntityHopper METHOD F getHopperY ()D METHOD G getHopperZ ()D METHOD a getInventoryStack (I)Lnone/aeq; - METHOD a setStack (ILnone/aeq;)V + METHOD a setInventoryStack (ILnone/aeq;)V METHOD a setName (Ljava/lang/String;)V ARG 0 name METHOD a deserializeTag (Lnone/dt;)V - METHOD b isValidStack (ILnone/aeq;)Z + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD h_ ()Ljava/lang/String; METHOD l clearInventory ()V diff --git a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping index 49759a928b..957a829ec8 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping @@ -1,4 +1,7 @@ CLASS none/abl net/minecraft/entity/vehicle/EntityStorageMinecart + METHOD a getInventoryStack (I)Lnone/aeq; + METHOD a setInventoryStack (ILnone/aeq;)V METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD b interact (Lnone/aak;Lnone/qz;)Z METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping index 5ccc8c3f63..e6312ac632 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping @@ -1,2 +1,3 @@ CLASS none/abj net/minecraft/entity/vehicle/impl/EntityChestMinecart + METHOD t_ getInventorySize ()I METHOD v getMinecartType ()Lnone/abi$a; diff --git a/mappings/net/minecraft/inventory/InventoryCrafting.mapping b/mappings/net/minecraft/inventory/InventoryCrafting.mapping index 165ef24c3a..fc16ff5df7 100644 --- a/mappings/net/minecraft/inventory/InventoryCrafting.mapping +++ b/mappings/net/minecraft/inventory/InventoryCrafting.mapping @@ -9,9 +9,9 @@ CLASS none/acc net/minecraft/inventory/InventoryCrafting ARG 2 height METHOD a getInventoryStack (I)Lnone/aeq; ARG 0 slot - METHOD a setStack (ILnone/aeq;)V + METHOD a setInventoryStack (ILnone/aeq;)V METHOD b (I)Lnone/aeq; - METHOD b isValidStack (ILnone/aeq;)Z + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD c getInventoryStack (II)Lnone/aeq; ARG 0 x ARG 1 y diff --git a/mappings/none/aaj.mapping b/mappings/none/aaj.mapping index 98edc714ce..87d75779db 100644 --- a/mappings/none/aaj.mapping +++ b/mappings/none/aaj.mapping @@ -1,6 +1,6 @@ CLASS none/aaj METHOD a getInventoryStack (I)Lnone/aeq; - METHOD a setStack (ILnone/aeq;)V + METHOD a setInventoryStack (ILnone/aeq;)V METHOD b (I)Lnone/aeq; - METHOD b isValidStack (ILnone/aeq;)Z + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD t_ getInventorySize ()I diff --git a/mappings/none/acn.mapping b/mappings/none/acn.mapping index 4f0b6e916e..95fecc6a75 100644 --- a/mappings/none/acn.mapping +++ b/mappings/none/acn.mapping @@ -1,6 +1,6 @@ CLASS none/acn METHOD a getInventoryStack (I)Lnone/aeq; - METHOD a setStack (ILnone/aeq;)V + METHOD a setInventoryStack (ILnone/aeq;)V METHOD b (I)Lnone/aeq; - METHOD b isValidStack (ILnone/aeq;)Z + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD t_ getInventorySize ()I diff --git a/mappings/none/acr.mapping b/mappings/none/acr.mapping index ef8a3b76bb..7d173a9424 100644 --- a/mappings/none/acr.mapping +++ b/mappings/none/acr.mapping @@ -1,6 +1,6 @@ CLASS none/acr METHOD a getInventoryStack (I)Lnone/aeq; - METHOD a setStack (ILnone/aeq;)V + METHOD a setInventoryStack (ILnone/aeq;)V METHOD b (I)Lnone/aeq; - METHOD b isValidStack (ILnone/aeq;)Z + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD t_ getInventorySize ()I diff --git a/mappings/none/qs.mapping b/mappings/none/qs.mapping index 7570a9c371..707662a39b 100644 --- a/mappings/none/qs.mapping +++ b/mappings/none/qs.mapping @@ -1,4 +1,8 @@ CLASS none/qs + METHOD a getInventoryStack (I)Lnone/aeq; + METHOD a setInventoryStack (ILnone/aeq;)V + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; - METHOD n_ hasCustomName ()Z + METHOD n_ hasCustomNam ()Z + METHOD t_ getInventorySize ()I diff --git a/mappings/none/ri.mapping b/mappings/none/ri.mapping index a57968f883..d6fd1c5af1 100644 --- a/mappings/none/ri.mapping +++ b/mappings/none/ri.mapping @@ -1,6 +1,6 @@ CLASS none/ri METHOD a getInventoryStack (I)Lnone/aeq; - METHOD a setStack (ILnone/aeq;)V + METHOD a setInventoryStack (ILnone/aeq;)V METHOD b (I)Lnone/aeq; - METHOD b isValidStack (ILnone/aeq;)Z + METHOD b isValidInventoryStack (ILnone/aeq;)Z METHOD t_ getInventorySize ()I