From fc580c38c7158245065fa87a9a129d3aec9fb6cc Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 17 Aug 2016 15:52:35 +0200 Subject: [PATCH] apply POMF fix --- mappings/net/minecraft/block/BlockStateFactory.mapping | 1 + mappings/net/minecraft/block/impl/BlockAnvil.mapping | 2 ++ .../net/minecraft/block/impl/BlockCraftingTable.mapping | 3 +++ mappings/net/minecraft/block/tile/TileEntity.mapping | 2 +- .../block/tile/impl/TileEntityBrewingStand.mapping | 4 ++-- .../net/minecraft/block/tile/impl/TileEntityChest.mapping | 4 ++-- .../minecraft/block/tile/impl/TileEntityDispenser.mapping | 4 ++-- .../minecraft/block/tile/impl/TileEntityDropper.mapping | 2 +- .../block/tile/impl/TileEntityEnchantingTable.mapping | 6 +++--- .../minecraft/block/tile/impl/TileEntityFurnace.mapping | 4 ++-- .../net/minecraft/block/tile/impl/TileEntityHopper.mapping | 7 +++++-- .../block/tile/impl/TileEntityStructureBlock.mapping | 2 +- .../entity/vehicle/impl/EntityHopperMinecart.mapping | 1 + mappings/net/minecraft/inventory/InventoryCrafting.mapping | 3 +++ mappings/net/minecraft/util/INameable.mapping | 2 +- mappings/none/arp.mapping | 2 +- 16 files changed, 31 insertions(+), 18 deletions(-) diff --git a/mappings/net/minecraft/block/BlockStateFactory.mapping b/mappings/net/minecraft/block/BlockStateFactory.mapping index 97c32b1e13..3873573dbf 100644 --- a/mappings/net/minecraft/block/BlockStateFactory.mapping +++ b/mappings/net/minecraft/block/BlockStateFactory.mapping @@ -8,6 +8,7 @@ CLASS none/ask net/minecraft/block/BlockStateFactory METHOD a getMaterial ()Lnone/ayo; METHOD a with (Lnone/asz;Ljava/lang/Comparable;)Lnone/asj; METHOD c get (Lnone/asz;)Ljava/lang/Comparable; + METHOD g getMapColor ()Lnone/ayp; METHOD s getValues ()Lcom/google/common/collect/ImmutableMap; FIELD a PROPERTY_NAME_PATTERN Ljava/util/regex/Pattern; METHOD (Lnone/akw;[Lnone/asz;)V diff --git a/mappings/net/minecraft/block/impl/BlockAnvil.mapping b/mappings/net/minecraft/block/impl/BlockAnvil.mapping index f189a60ed3..b4e0cb4dfb 100644 --- a/mappings/net/minecraft/block/impl/BlockAnvil.mapping +++ b/mappings/net/minecraft/block/impl/BlockAnvil.mapping @@ -6,7 +6,9 @@ CLASS none/akn net/minecraft/block/impl/BlockAnvil ARG 0 world ARG 1 pos METHOD h_ getName ()Ljava/lang/String; + METHOD i_ getNameComponent ()Lnone/fa; METHOD k getId ()Ljava/lang/String; + METHOD n_ hasCustomNam ()Z FIELD a FACING Lnone/asw; FIELD b DAMAGE Lnone/asy; FIELD c NORTH_SOUTH_BOX Lnone/bcp; diff --git a/mappings/net/minecraft/block/impl/BlockCraftingTable.mapping b/mappings/net/minecraft/block/impl/BlockCraftingTable.mapping index 0fae34a9b6..8dee1e3819 100644 --- a/mappings/net/minecraft/block/impl/BlockCraftingTable.mapping +++ b/mappings/net/minecraft/block/impl/BlockCraftingTable.mapping @@ -1,4 +1,7 @@ CLASS none/alq net/minecraft/block/impl/BlockCraftingTable CLASS none/alq$a + METHOD h_ getName ()Ljava/lang/String; + METHOD i_ getNameComponent ()Lnone/fa; METHOD k getId ()Ljava/lang/String; + METHOD n_ hasCustomNam ()Z METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z diff --git a/mappings/net/minecraft/block/tile/TileEntity.mapping b/mappings/net/minecraft/block/tile/TileEntity.mapping index 74d8caaec5..89f1560502 100644 --- a/mappings/net/minecraft/block/tile/TileEntity.mapping +++ b/mappings/net/minecraft/block/tile/TileEntity.mapping @@ -23,7 +23,7 @@ CLASS none/arb net/minecraft/block/tile/TileEntity METHOD c writeToTag ()Lnone/dt; METHOD c serializeTileData (Lnone/dt;)Lnone/dt; ARG 0 tag - METHOD i_ getNameComponent ()Lnone/fa; + METHOD i_ ()Lnone/fa; METHOD t hasWorld ()Z METHOD u getBlockMetadata ()I METHOD v getPos ()Lnone/cn; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping index 6bc17945df..b376d75b5d 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping @@ -15,8 +15,8 @@ CLASS none/arc net/minecraft/block/tile/impl/TileEntityBrewingStand METHOD a getAvailableSlots (Lnone/cu;)[I METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD h_ getName ()Ljava/lang/String; + METHOD h_ ()Ljava/lang/String; METHOD l clearInventory ()V - METHOD n_ hasCustomName ()Z + METHOD n_ ()Z METHOD t_ getInventorySize ()I METHOD v_ getMaxStackSize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping index e1481885ff..05b6fc7065 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping @@ -17,6 +17,6 @@ CLASS none/ard net/minecraft/block/tile/impl/TileEntityChest ARG 0 facing METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD h_ getName ()Ljava/lang/String; - METHOD n_ hasCustomName ()Z + METHOD h_ ()Ljava/lang/String; + METHOD n_ ()Z METHOD t_ getSlotCount ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping index 842c334e67..b932a1165a 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping @@ -5,6 +5,6 @@ CLASS none/arh net/minecraft/block/tile/impl/TileEntityDispenser ARG 0 name METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD h_ getName ()Ljava/lang/String; - METHOD n_ hasCustomName ()Z + METHOD h_ ()Ljava/lang/String; + METHOD n_ ()Z METHOD v_ getMaxStackSize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityDropper.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityDropper.mapping index cdbec94f4d..af4e524316 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityDropper.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityDropper.mapping @@ -1,2 +1,2 @@ CLASS none/ari net/minecraft/block/tile/impl/TileEntityDropper - METHOD h_ getName ()Ljava/lang/String; + METHOD h_ ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping index 5b5ef81796..f7261c31bf 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping @@ -6,7 +6,7 @@ CLASS none/arj net/minecraft/block/tile/impl/TileEntityEnchantingTable ARG 0 name METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD h_ getName ()Ljava/lang/String; - METHOD i_ getNameComponent ()Lnone/fa; + METHOD h_ ()Ljava/lang/String; + METHOD i_ ()Lnone/fa; METHOD k getId ()Ljava/lang/String; - METHOD n_ hasCustomName ()Z + METHOD n_ ()Z diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping index c93afad3f5..83c8c0e40d 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping @@ -20,9 +20,9 @@ CLASS none/arm net/minecraft/block/tile/impl/TileEntityFurnace METHOD b getFuelTime (Lnone/aeq;)I ARG 0 stack METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD h_ getName ()Ljava/lang/String; + METHOD h_ ()Ljava/lang/String; METHOD l clearInventory ()V METHOD m isBurning ()Z - METHOD n_ hasCustomName ()Z + METHOD n_ ()Z METHOD t_ getInventorySize ()I METHOD v_ getMaxStackSize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping index ebae405cb4..d8eb96be9b 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping @@ -6,12 +6,15 @@ CLASS none/aro net/minecraft/block/tile/impl/TileEntityHopper METHOD E getHopperX ()D METHOD F getHopperY ()D METHOD G getHopperZ ()D + METHOD a getInventoryStack (I)Lnone/aeq; + METHOD a setStack (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 serializeTag (Lnone/dt;)Lnone/dt; - METHOD h_ getName ()Ljava/lang/String; + METHOD h_ ()Ljava/lang/String; METHOD l clearInventory ()V - METHOD n_ hasCustomName ()Z + METHOD n_ ()Z METHOD t_ getInventorySize ()I METHOD v_ getMaxStackSize ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping index 9a2c67627a..c3bd954099 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping @@ -26,4 +26,4 @@ CLASS none/arv net/minecraft/block/tile/impl/TileEntityStructureBlock METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD c writeToTag ()Lnone/dt; - METHOD i_ getNameComponent ()Lnone/fa; + METHOD i_ ()Lnone/fa; diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping index a0fce17e89..3e6554f871 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping @@ -8,4 +8,5 @@ CLASS none/abn net/minecraft/entity/vehicle/impl/EntityHopperMinecart ARG 0 entityPlayer METHOD b serializeEntityTag (Lnone/dt;)V METHOD m update ()V + 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 832ddeffa8..165ef24c3a 100644 --- a/mappings/net/minecraft/inventory/InventoryCrafting.mapping +++ b/mappings/net/minecraft/inventory/InventoryCrafting.mapping @@ -15,4 +15,7 @@ CLASS none/acc net/minecraft/inventory/InventoryCrafting METHOD c getInventoryStack (II)Lnone/aeq; ARG 0 x ARG 1 y + METHOD h_ getName ()Ljava/lang/String; + METHOD i_ getNameComponent ()Lnone/fa; + METHOD n_ hasCustomNam ()Z METHOD t_ getInventorySize ()I diff --git a/mappings/net/minecraft/util/INameable.mapping b/mappings/net/minecraft/util/INameable.mapping index c2a6664072..9b9f9571e8 100644 --- a/mappings/net/minecraft/util/INameable.mapping +++ b/mappings/net/minecraft/util/INameable.mapping @@ -1,4 +1,4 @@ CLASS none/rg net/minecraft/util/INameable METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; - METHOD n_ hasCustomName ()Z + METHOD n_ hasCustomNam ()Z diff --git a/mappings/none/arp.mapping b/mappings/none/arp.mapping index 16ab1c54b0..c3652a6eb1 100644 --- a/mappings/none/arp.mapping +++ b/mappings/none/arp.mapping @@ -1,4 +1,4 @@ CLASS none/arp METHOD a deserializeTag (Lnone/dt;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD i_ getNameComponent ()Lnone/fa; + METHOD i_ ()Lnone/fa;