From c4f7032d43ce78f550e735a718cd3884f2b250ed Mon Sep 17 00:00:00 2001 From: asie Date: Sat, 17 Nov 2018 08:21:42 +0100 Subject: [PATCH] mapping tweaks --- mappings/awi.mapping | 4 ++++ mappings/net/minecraft/block/Block.mapping | 2 +- mappings/net/minecraft/block/BlockState.mapping | 1 + mappings/net/minecraft/fluid/Fluid.mapping | 1 + .../gui/{CreativeTab.mapping => ItemGroup.mapping} | 5 ++++- mappings/net/minecraft/item/block/ItemBlock.mapping | 3 +++ mappings/net/minecraft/nbt/TagCompound.mapping | 6 +++--- mappings/net/minecraft/util/IdList.mapping | 6 +++++- mappings/ya.mapping | 1 + 9 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 mappings/awi.mapping rename mappings/net/minecraft/gui/{CreativeTab.mapping => ItemGroup.mapping} (95%) diff --git a/mappings/awi.mapping b/mappings/awi.mapping new file mode 100644 index 0000000000..7f0e27b1a2 --- /dev/null +++ b/mappings/awi.mapping @@ -0,0 +1,4 @@ +CLASS awi + METHOD a registerBlockItemMap (Ljava/util/Map;Lava;)V + ARG 1 map + ARG 2 item diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 147ab7230b..827f66a2de 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -27,7 +27,7 @@ CLASS bfg net/minecraft/block/Block FIELD e dropTableId Lpx; FIELD f translationKey Ljava/lang/String; FIELD g LOGGER Lorg/apache/logging/log4j/Logger; - FIELD h BLOCKSTATE_ID_LIST Lfb; + FIELD h STATE_IDS Lfb; FIELD i lightOpacityLevel I FIELD m soundGroup Lbkh; FIELD n material Lccw; diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 252cb12bce..588abbc079 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -1,4 +1,5 @@ CLASS bnz net/minecraft/block/BlockState + CLASS bnz$a METHOD a allowsSpawning (Lagc;)Z METHOD a calcBlockBreakingDelta (Laqa;Lazq;Les;)F METHOD a getBlockBrightness (Lazo;Les;)I diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index f1664f49fa..133e7b7ff0 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -1,5 +1,6 @@ CLASS ccr net/minecraft/fluid/Fluid FIELD a defaultState Lccs; + FIELD c STATE_IDS Lfb; FIELD d stateFactory Lboa; METHOD a getRenderLayer ()Lazr; METHOD a matchesType (Lccr;)Z diff --git a/mappings/net/minecraft/gui/CreativeTab.mapping b/mappings/net/minecraft/gui/ItemGroup.mapping similarity index 95% rename from mappings/net/minecraft/gui/CreativeTab.mapping rename to mappings/net/minecraft/gui/ItemGroup.mapping index 5b1a93a3d8..7269b5eb0a 100644 --- a/mappings/net/minecraft/gui/CreativeTab.mapping +++ b/mappings/net/minecraft/gui/ItemGroup.mapping @@ -1,4 +1,4 @@ -CLASS atw net/minecraft/gui/CreativeTab +CLASS atw net/minecraft/gui/ItemGroup CLASS atw$1 METHOD (ILjava/lang/String;)V ARG 0 id @@ -16,6 +16,7 @@ CLASS atw net/minecraft/gui/CreativeTab METHOD a getStacksForDisplay (Lfg;)V ARG 0 stackList METHOD f getIconItem ()Lavf; + METHOD n isTabRightAligned ()Z CLASS atw$4 METHOD (ILjava/lang/String;)V ARG 0 id @@ -73,6 +74,7 @@ CLASS atw net/minecraft/gui/CreativeTab FIELD j COMBAT Latw; FIELD k BREWING Latw; FIELD l MATERIALS Latw; + FIELD m HOTBAR Latw; FIELD n INVENTORY Latw; FIELD o id I FIELD p unlocalizedName Ljava/lang/String; @@ -97,4 +99,5 @@ CLASS atw net/minecraft/gui/CreativeTab METHOD k setNotUseScrollBar ()Latw; METHOD l getColumn ()I METHOD m isTopRow ()Z + METHOD n isTabRightAligned ()Z METHOD o getEnchantmentTypes ()[Layi; diff --git a/mappings/net/minecraft/item/block/ItemBlock.mapping b/mappings/net/minecraft/item/block/ItemBlock.mapping index 48272f3d9a..dc50d46071 100644 --- a/mappings/net/minecraft/item/block/ItemBlock.mapping +++ b/mappings/net/minecraft/item/block/ItemBlock.mapping @@ -12,4 +12,7 @@ CLASS ati net/minecraft/item/block/ItemBlock ARG 1 player ARG 2 pos ARG 3 stack + METHOD a registerBlockItemMap (Ljava/util/Map;Lava;)V + ARG 1 map + ARG 2 item METHOD d getBlock ()Lbfg; diff --git a/mappings/net/minecraft/nbt/TagCompound.mapping b/mappings/net/minecraft/nbt/TagCompound.mapping index 6220a1d4d6..41609a2be6 100644 --- a/mappings/net/minecraft/nbt/TagCompound.mapping +++ b/mappings/net/minecraft/nbt/TagCompound.mapping @@ -62,7 +62,7 @@ CLASS ho net/minecraft/nbt/TagCompound ARG 1 key METHOD c getKeys ()Ljava/util/Set; METHOD c getTag (Ljava/lang/String;)Lie; - METHOD c hasKey (Ljava/lang/String;I)Z + METHOD c containsKey (Ljava/lang/String;I)Z ARG 1 key METHOD c setLongArray (Ljava/lang/String;Ljava/util/List;)V ARG 1 key @@ -70,7 +70,7 @@ CLASS ho net/minecraft/nbt/TagCompound METHOD d getType (Ljava/lang/String;)B METHOD d getTagList (Ljava/lang/String;I)Lhu; ARG 1 key - METHOD e hasKey (Ljava/lang/String;)Z + METHOD e containsKey (Ljava/lang/String;)Z METHOD f copy ()Lho; METHOD f getByte (Ljava/lang/String;)B METHOD g getShort (Ljava/lang/String;)S @@ -84,7 +84,7 @@ CLASS ho net/minecraft/nbt/TagCompound METHOD o getLongArray (Ljava/lang/String;)[J METHOD p getTagCompound (Ljava/lang/String;)Lho; METHOD q getBoolean (Ljava/lang/String;)Z - METHOD r removeTag (Ljava/lang/String;)V + METHOD r remove (Ljava/lang/String;)V METHOD s escapeTagKey (Ljava/lang/String;)Ljava/lang/String; ARG 0 key METHOD t prettyPrintTagKey (Ljava/lang/String;)Liz; diff --git a/mappings/net/minecraft/util/IdList.mapping b/mappings/net/minecraft/util/IdList.mapping index c2f2efc20e..96f687bce3 100644 --- a/mappings/net/minecraft/util/IdList.mapping +++ b/mappings/net/minecraft/util/IdList.mapping @@ -1,8 +1,12 @@ CLASS fb net/minecraft/util/IdList + FIELD a nextId I FIELD b idMap Ljava/util/IdentityHashMap; FIELD c list Ljava/util/List; METHOD a size ()I METHOD a getInt (I)Ljava/lang/Object; METHOD a getId (Ljava/lang/Object;)I - METHOD a add (Ljava/lang/Object;I)V + METHOD a set (Ljava/lang/Object;I)V + ARG 1 value + ARG 2 id + METHOD b add (Ljava/lang/Object;)V ARG 1 value diff --git a/mappings/ya.mapping b/mappings/ya.mapping index 627b63625e..3804fc0b2d 100644 --- a/mappings/ya.mapping +++ b/mappings/ya.mapping @@ -1,2 +1,3 @@ CLASS ya + METHOD a clear ()V METHOD a getInt (I)Ljava/lang/Object;