From 2351d30ec99350fbebcff0dd30dbad64fd022f81 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 20 Oct 2016 12:06:19 +0200 Subject: [PATCH] map blockstate selectors, fixups --- mappings/bzs.mapping | 5 +++++ mappings/cq.mapping | 5 +++++ .../minecraft/client/gui/hud/HudChat.mapping | 5 ++++- .../ContainerInventoryClient.mapping | 2 +- .../ContainerProviderDummyClient.mapping} | 7 ++++++- .../entity/model/EntityModelEnderman.mapping | 4 ++-- .../BlockStatePredicateFactoryAnd.mapping | 6 ++++++ .../sortme/BlockStatePredicateFactoryOr.mapping | 6 ++++++ ...ckStatePropertyValuePredicateFactory.mapping | 9 +++++++++ .../sortme/IBlockStatePredicateFactory.mapping | 17 +++++++++++++++++ ...rUtils.mapping => SomeGlBufferUtils.mapping} | 2 +- .../minecraft/client/util/ArrayMatrix4f.mapping | 3 +++ .../client/util/IntegerObjectPool.mapping | 4 ++++ .../LockableContainerDouble.mapping} | 2 +- ....mapping => AiGoalFindNearestPlayer.mapping} | 2 +- ... => AiGoalVillagerInteractWithOther.mapping} | 2 +- .../{ => entity}/ai/mob/AiGoalBreakDoor.mapping | 2 +- .../entity/passive/EntityVillager.mapping | 1 + .../entity/player/PlayerPropertiesDemo.mapping | 1 + .../InventoryHorse.mapping} | 2 +- .../net/minecraft/nbt/TagStorageHelper.mapping | 4 ++++ .../net/minecraft/sortme/ArrayMatrix4f.mapping | 3 --- .../minecraft/sortme/JsonParseException.mapping | 1 - .../minecraft/sortme/ShaderException.mapping | 2 ++ .../minecraft/util/JsonParseException.mapping | 3 +++ .../LazySingleton.mapping} | 2 +- 26 files changed, 86 insertions(+), 16 deletions(-) create mode 100644 mappings/cq.mapping rename mappings/net/minecraft/client/{sortme => network}/ContainerInventoryClient.mapping (89%) rename mappings/{boj.mapping => net/minecraft/client/network/ContainerProviderDummyClient.mapping} (55%) create mode 100644 mappings/net/minecraft/client/sortme/BlockStatePredicateFactoryAnd.mapping create mode 100644 mappings/net/minecraft/client/sortme/BlockStatePredicateFactoryOr.mapping create mode 100644 mappings/net/minecraft/client/sortme/BlockStatePropertyValuePredicateFactory.mapping create mode 100644 mappings/net/minecraft/client/sortme/IBlockStatePredicateFactory.mapping rename mappings/net/minecraft/client/sortme/{SomeBufferUtils.mapping => SomeGlBufferUtils.mapping} (78%) create mode 100644 mappings/net/minecraft/client/util/ArrayMatrix4f.mapping create mode 100644 mappings/net/minecraft/client/util/IntegerObjectPool.mapping rename mappings/net/minecraft/{sortme/LockableContainerDoubleChest.mapping => container/LockableContainerDouble.mapping} (95%) rename mappings/net/minecraft/entity/ai/{AiFindNearestPlayer.mapping => AiGoalFindNearestPlayer.mapping} (83%) rename mappings/net/minecraft/entity/ai/interact/{AIVillagerInteractWithOther.mapping => AiGoalVillagerInteractWithOther.mapping} (62%) rename mappings/net/minecraft/{ => entity}/ai/mob/AiGoalBreakDoor.mapping (79%) create mode 100644 mappings/net/minecraft/entity/player/PlayerPropertiesDemo.mapping rename mappings/net/minecraft/{sortme/HorseInventory.mapping => inventory/InventoryHorse.mapping} (58%) delete mode 100644 mappings/net/minecraft/sortme/ArrayMatrix4f.mapping delete mode 100644 mappings/net/minecraft/sortme/JsonParseException.mapping create mode 100644 mappings/net/minecraft/util/JsonParseException.mapping rename mappings/net/minecraft/{sortme/Singleton.mapping => util/LazySingleton.mapping} (78%) diff --git a/mappings/bzs.mapping b/mappings/bzs.mapping index 5d40e9ebdf..ed6deef2b7 100644 --- a/mappings/bzs.mapping +++ b/mappings/bzs.mapping @@ -1,4 +1,9 @@ CLASS bzs + FIELD a ambientOcclusion Z + FIELD b depthInGui Z + FIELD c sprite Lbxe; + FIELD d transformationList Lbqf; + FIELD e itemPropertyOverrides Lbqd; METHOD a useAmbientOcclusion ()Z METHOD a getQuads (Lasm;Lcu;J)Ljava/util/List; ARG 0 state diff --git a/mappings/cq.mapping b/mappings/cq.mapping new file mode 100644 index 0000000000..fee1e33184 --- /dev/null +++ b/mappings/cq.mapping @@ -0,0 +1,5 @@ +CLASS cq + CLASS cq$a + METHOD a apply ([Ljava/lang/Object;)Ljava/util/List; + ARG 0 listArray + METHOD b (Ljava/lang/Iterable;)Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/client/gui/hud/HudChat.mapping b/mappings/net/minecraft/client/gui/hud/HudChat.mapping index b4e3728bf4..de5801a63c 100644 --- a/mappings/net/minecraft/client/gui/hud/HudChat.mapping +++ b/mappings/net/minecraft/client/gui/hud/HudChat.mapping @@ -8,7 +8,10 @@ CLASS bem net/minecraft/client/gui/hud/HudChat METHOD a clear ()V METHOD a clampWidth (F)I ARG 0 width - METHOD a (Lfa;)V + METHOD a addMessage (Lfa;)V + ARG 0 message + METHOD a addMessage (Lfa;I)V + ARG 0 message METHOD b reset ()V METHOD b clampHeight (F)I ARG 0 height diff --git a/mappings/net/minecraft/client/sortme/ContainerInventoryClient.mapping b/mappings/net/minecraft/client/network/ContainerInventoryClient.mapping similarity index 89% rename from mappings/net/minecraft/client/sortme/ContainerInventoryClient.mapping rename to mappings/net/minecraft/client/network/ContainerInventoryClient.mapping index 5e63bab54a..c5cc0b9cba 100644 --- a/mappings/net/minecraft/client/sortme/ContainerInventoryClient.mapping +++ b/mappings/net/minecraft/client/network/ContainerInventoryClient.mapping @@ -1,4 +1,4 @@ -CLASS bok net/minecraft/client/sortme/ContainerInventoryClient +CLASS bok net/minecraft/client/network/ContainerInventoryClient FIELD a id Ljava/lang/String; FIELD b invFields Ljava/util/Map; METHOD (Ljava/lang/String;Lfa;I)V diff --git a/mappings/boj.mapping b/mappings/net/minecraft/client/network/ContainerProviderDummyClient.mapping similarity index 55% rename from mappings/boj.mapping rename to mappings/net/minecraft/client/network/ContainerProviderDummyClient.mapping index 3320c065c0..6d31fb8ebf 100644 --- a/mappings/boj.mapping +++ b/mappings/net/minecraft/client/network/ContainerProviderDummyClient.mapping @@ -1,4 +1,9 @@ -CLASS boj +CLASS boj net/minecraft/client/network/ContainerProviderDummyClient + FIELD a id Ljava/lang/String; + FIELD b name Lfa; + METHOD (Ljava/lang/String;Lfa;)V + ARG 0 id + ARG 1 name METHOD a createContainer (Laal;Laam;)Labx; ARG 0 playerInv ARG 1 player diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelEnderman.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelEnderman.mapping index 47288d24f1..5afcc54932 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelEnderman.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelEnderman.mapping @@ -1,6 +1,6 @@ CLASS bkd net/minecraft/client/render/entity/model/EntityModelEnderman - FIELD a hasItem Z - FIELD b isAngry Z + FIELD a carryingBlock Z + FIELD b angry Z METHOD (F)V ARG 0 scale METHOD a setRotationAngles (FFFFFFLsg;)V diff --git a/mappings/net/minecraft/client/sortme/BlockStatePredicateFactoryAnd.mapping b/mappings/net/minecraft/client/sortme/BlockStatePredicateFactoryAnd.mapping new file mode 100644 index 0000000000..67190f9134 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/BlockStatePredicateFactoryAnd.mapping @@ -0,0 +1,6 @@ +CLASS bqi net/minecraft/client/sortme/BlockStatePredicateFactoryAnd + FIELD c factories Ljava/lang/Iterable; + METHOD (Ljava/lang/Iterable;)V + ARG 0 factories + METHOD a get (Lasn;)Lcom/google/common/base/Predicate; + ARG 0 factory diff --git a/mappings/net/minecraft/client/sortme/BlockStatePredicateFactoryOr.mapping b/mappings/net/minecraft/client/sortme/BlockStatePredicateFactoryOr.mapping new file mode 100644 index 0000000000..3169725a93 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/BlockStatePredicateFactoryOr.mapping @@ -0,0 +1,6 @@ +CLASS bqm net/minecraft/client/sortme/BlockStatePredicateFactoryOr + FIELD c factories Ljava/lang/Iterable; + METHOD (Ljava/lang/Iterable;)V + ARG 0 factories + METHOD a get (Lasn;)Lcom/google/common/base/Predicate; + ARG 0 factory diff --git a/mappings/net/minecraft/client/sortme/BlockStatePropertyValuePredicateFactory.mapping b/mappings/net/minecraft/client/sortme/BlockStatePropertyValuePredicateFactory.mapping new file mode 100644 index 0000000000..2e68778c78 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/BlockStatePropertyValuePredicateFactory.mapping @@ -0,0 +1,9 @@ +CLASS bqk net/minecraft/client/sortme/BlockStatePropertyValuePredicateFactory + FIELD c VALUE_SPLITTER Lcom/google/common/base/Splitter; + FIELD d key Ljava/lang/String; + FIELD e valueString Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 key + ARG 1 value + METHOD a get (Lasn;)Lcom/google/common/base/Predicate; + ARG 0 factory diff --git a/mappings/net/minecraft/client/sortme/IBlockStatePredicateFactory.mapping b/mappings/net/minecraft/client/sortme/IBlockStatePredicateFactory.mapping new file mode 100644 index 0000000000..da1f086b91 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/IBlockStatePredicateFactory.mapping @@ -0,0 +1,17 @@ +CLASS bqj net/minecraft/client/sortme/IBlockStatePredicateFactory + CLASS bqj$1 + CLASS bqj$1$1 + METHOD a test (Lasm;)Z + ARG 0 state + METHOD a get (Lasn;)Lcom/google/common/base/Predicate; + ARG 0 factory + CLASS bqj$2 + CLASS bqj$2$1 + METHOD a test (Lasm;)Z + ARG 0 state + METHOD a get (Lasn;)Lcom/google/common/base/Predicate; + ARG 0 factory + FIELD a ANY Lbqj; + FIELD b NONE Lbqj; + METHOD a get (Lasn;)Lcom/google/common/base/Predicate; + ARG 0 factory diff --git a/mappings/net/minecraft/client/sortme/SomeBufferUtils.mapping b/mappings/net/minecraft/client/sortme/SomeGlBufferUtils.mapping similarity index 78% rename from mappings/net/minecraft/client/sortme/SomeBufferUtils.mapping rename to mappings/net/minecraft/client/sortme/SomeGlBufferUtils.mapping index 58605b813a..8ef976251f 100644 --- a/mappings/net/minecraft/client/sortme/SomeBufferUtils.mapping +++ b/mappings/net/minecraft/client/sortme/SomeGlBufferUtils.mapping @@ -1,4 +1,4 @@ -CLASS bdq net/minecraft/client/sortme/SomeBufferUtils +CLASS bdq net/minecraft/client/sortme/SomeGlBufferUtils METHOD c allocateByteBuffer (I)Ljava/nio/ByteBuffer; ARG 0 size METHOD f allocateIntBuffer (I)Ljava/nio/IntBuffer; diff --git a/mappings/net/minecraft/client/util/ArrayMatrix4f.mapping b/mappings/net/minecraft/client/util/ArrayMatrix4f.mapping new file mode 100644 index 0000000000..1343064a6e --- /dev/null +++ b/mappings/net/minecraft/client/util/ArrayMatrix4f.mapping @@ -0,0 +1,3 @@ +CLASS cbc net/minecraft/client/util/ArrayMatrix4f + METHOD ([F)V + ARG 0 array diff --git a/mappings/net/minecraft/client/util/IntegerObjectPool.mapping b/mappings/net/minecraft/client/util/IntegerObjectPool.mapping new file mode 100644 index 0000000000..a0086daf95 --- /dev/null +++ b/mappings/net/minecraft/client/util/IntegerObjectPool.mapping @@ -0,0 +1,4 @@ +CLASS ol net/minecraft/client/util/IntegerObjectPool + FIELD a CACHE [Ljava/lang/Integer; + METHOD a get (I)Ljava/lang/Integer; + ARG 0 value diff --git a/mappings/net/minecraft/sortme/LockableContainerDoubleChest.mapping b/mappings/net/minecraft/container/LockableContainerDouble.mapping similarity index 95% rename from mappings/net/minecraft/sortme/LockableContainerDoubleChest.mapping rename to mappings/net/minecraft/container/LockableContainerDouble.mapping index 4e76b7c824..1f70c59452 100644 --- a/mappings/net/minecraft/sortme/LockableContainerDoubleChest.mapping +++ b/mappings/net/minecraft/container/LockableContainerDouble.mapping @@ -1,4 +1,4 @@ -CLASS qu net/minecraft/sortme/LockableContainerDoubleChest +CLASS qu net/minecraft/container/LockableContainerDouble FIELD a customName Ljava/lang/String; FIELD b first Lrh; FIELD c second Lrh; diff --git a/mappings/net/minecraft/entity/ai/AiFindNearestPlayer.mapping b/mappings/net/minecraft/entity/ai/AiGoalFindNearestPlayer.mapping similarity index 83% rename from mappings/net/minecraft/entity/ai/AiFindNearestPlayer.mapping rename to mappings/net/minecraft/entity/ai/AiGoalFindNearestPlayer.mapping index 07b5e51853..5963c1332c 100644 --- a/mappings/net/minecraft/entity/ai/AiFindNearestPlayer.mapping +++ b/mappings/net/minecraft/entity/ai/AiGoalFindNearestPlayer.mapping @@ -1,4 +1,4 @@ -CLASS vo net/minecraft/entity/ai/AiFindNearestPlayer +CLASS vo net/minecraft/entity/ai/AiGoalFindNearestPlayer FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b owner Lsq; FIELD c searchCoditions Lcom/google/common/base/Predicate; diff --git a/mappings/net/minecraft/entity/ai/interact/AIVillagerInteractWithOther.mapping b/mappings/net/minecraft/entity/ai/interact/AiGoalVillagerInteractWithOther.mapping similarity index 62% rename from mappings/net/minecraft/entity/ai/interact/AIVillagerInteractWithOther.mapping rename to mappings/net/minecraft/entity/ai/interact/AiGoalVillagerInteractWithOther.mapping index 69c58d93ff..8625689b68 100644 --- a/mappings/net/minecraft/entity/ai/interact/AIVillagerInteractWithOther.mapping +++ b/mappings/net/minecraft/entity/ai/interact/AiGoalVillagerInteractWithOther.mapping @@ -1,4 +1,4 @@ -CLASS vh net/minecraft/entity/ai/interact/AIVillagerInteractWithOther +CLASS vh net/minecraft/entity/ai/interact/AiGoalVillagerInteractWithOther FIELD e delay I FIELD f villager Laah; METHOD (Laah;)V diff --git a/mappings/net/minecraft/ai/mob/AiGoalBreakDoor.mapping b/mappings/net/minecraft/entity/ai/mob/AiGoalBreakDoor.mapping similarity index 79% rename from mappings/net/minecraft/ai/mob/AiGoalBreakDoor.mapping rename to mappings/net/minecraft/entity/ai/mob/AiGoalBreakDoor.mapping index 1b69d9dfee..e911c9299d 100644 --- a/mappings/net/minecraft/ai/mob/AiGoalBreakDoor.mapping +++ b/mappings/net/minecraft/entity/ai/mob/AiGoalBreakDoor.mapping @@ -1,4 +1,4 @@ -CLASS ts net/minecraft/ai/mob/AiGoalBreakDoor +CLASS ts net/minecraft/entity/ai/mob/AiGoalBreakDoor FIELD g breakProgress I FIELD h prevBreakProgress I METHOD (Lsq;)V diff --git a/mappings/net/minecraft/entity/passive/EntityVillager.mapping b/mappings/net/minecraft/entity/passive/EntityVillager.mapping index fd3f1d18cc..dc909661bb 100644 --- a/mappings/net/minecraft/entity/passive/EntityVillager.mapping +++ b/mappings/net/minecraft/entity/passive/EntityVillager.mapping @@ -52,6 +52,7 @@ CLASS aah net/minecraft/entity/passive/EntityVillager METHOD bq getEyeHeight ()F METHOD de getVillagerType ()I METHOD dj getInventory ()Lrk; + METHOD dl ()Z METHOD g setVillagerType (I)V ARG 0 value METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/player/PlayerPropertiesDemo.mapping b/mappings/net/minecraft/entity/player/PlayerPropertiesDemo.mapping new file mode 100644 index 0000000000..e885d6fdd2 --- /dev/null +++ b/mappings/net/minecraft/entity/player/PlayerPropertiesDemo.mapping @@ -0,0 +1 @@ +CLASS lp net/minecraft/entity/player/PlayerPropertiesDemo diff --git a/mappings/net/minecraft/sortme/HorseInventory.mapping b/mappings/net/minecraft/inventory/InventoryHorse.mapping similarity index 58% rename from mappings/net/minecraft/sortme/HorseInventory.mapping rename to mappings/net/minecraft/inventory/InventoryHorse.mapping index 1e68d6473b..d97d0f7db5 100644 --- a/mappings/net/minecraft/sortme/HorseInventory.mapping +++ b/mappings/net/minecraft/inventory/InventoryHorse.mapping @@ -1,4 +1,4 @@ -CLASS acm net/minecraft/sortme/HorseInventory +CLASS acm net/minecraft/inventory/InventoryHorse METHOD (Ljava/lang/String;I)V ARG 0 customName ARG 1 size diff --git a/mappings/net/minecraft/nbt/TagStorageHelper.mapping b/mappings/net/minecraft/nbt/TagStorageHelper.mapping index b8365b203d..32bee35930 100644 --- a/mappings/net/minecraft/nbt/TagStorageHelper.mapping +++ b/mappings/net/minecraft/nbt/TagStorageHelper.mapping @@ -10,10 +10,14 @@ CLASS ec net/minecraft/nbt/TagStorageHelper ARG 1 stream METHOD a writeTag (Leh;Ljava/io/DataOutput;)V ARG 0 tag + ARG 1 output METHOD a readTag (Ljava/io/DataInput;ILeb;)Leh; ARG 0 input + ARG 1 depth + ARG 2 tracker METHOD a readCompoundTag (Ljava/io/DataInput;Leb;)Ldt; ARG 0 input + ARG 1 trakcer METHOD a readCompoundTag (Ljava/io/DataInputStream;)Ldt; ARG 0 stream METHOD a readCompoundTag (Ljava/io/File;)Ldt; diff --git a/mappings/net/minecraft/sortme/ArrayMatrix4f.mapping b/mappings/net/minecraft/sortme/ArrayMatrix4f.mapping deleted file mode 100644 index 286988db91..0000000000 --- a/mappings/net/minecraft/sortme/ArrayMatrix4f.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cbc net/minecraft/sortme/ArrayMatrix4f - METHOD ([F)V - ARG 0 array diff --git a/mappings/net/minecraft/sortme/JsonParseException.mapping b/mappings/net/minecraft/sortme/JsonParseException.mapping deleted file mode 100644 index 790abdeab8..0000000000 --- a/mappings/net/minecraft/sortme/JsonParseException.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ei net/minecraft/sortme/JsonParseException diff --git a/mappings/net/minecraft/sortme/ShaderException.mapping b/mappings/net/minecraft/sortme/ShaderException.mapping index 43d124f7c1..d659e3b20f 100644 --- a/mappings/net/minecraft/sortme/ShaderException.mapping +++ b/mappings/net/minecraft/sortme/ShaderException.mapping @@ -1 +1,3 @@ CLASS kt net/minecraft/sortme/ShaderException + CLASS kt$a + FIELD a file Ljava/lang/String; diff --git a/mappings/net/minecraft/util/JsonParseException.mapping b/mappings/net/minecraft/util/JsonParseException.mapping new file mode 100644 index 0000000000..04be66a3c5 --- /dev/null +++ b/mappings/net/minecraft/util/JsonParseException.mapping @@ -0,0 +1,3 @@ +CLASS ei net/minecraft/util/JsonParseException + METHOD (Ljava/lang/String;)V + ARG 0 message diff --git a/mappings/net/minecraft/sortme/Singleton.mapping b/mappings/net/minecraft/util/LazySingleton.mapping similarity index 78% rename from mappings/net/minecraft/sortme/Singleton.mapping rename to mappings/net/minecraft/util/LazySingleton.mapping index 03bc733d05..f451e1b89f 100644 --- a/mappings/net/minecraft/sortme/Singleton.mapping +++ b/mappings/net/minecraft/util/LazySingleton.mapping @@ -1,4 +1,4 @@ -CLASS on net/minecraft/sortme/Singleton +CLASS on net/minecraft/util/LazySingleton FIELD a instance Ljava/lang/Object; FIELD b wasInstantiated Z METHOD b createInstance ()Ljava/lang/Object;