From 37305ccefa504e6b60b27b99b0c791861955305a Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Fri, 12 May 2017 19:27:13 +0200 Subject: [PATCH] more minor work --- mappings/mk.mapping | 2 -- mappings/net/minecraft/entity/Entity.mapping | 4 +++- .../minecraft/entity/EntityRegistry.mapping | 23 +++++++++++++++++++ .../entity/player/InventoryPlayer.mapping | 4 ++++ .../net/minecraft/item/ItemBucket.mapping | 7 ++++++ .../net/minecraft/potion/PotionHelper.mapping | 2 ++ .../reference/CriterionTriggers.mapping | 15 +++++++++++- .../minecraft/reference/LootTables.mapping | 1 + .../util/LoggedDebugPrintStream.mapping | 2 ++ 9 files changed, 56 insertions(+), 4 deletions(-) delete mode 100644 mappings/mk.mapping create mode 100644 mappings/net/minecraft/util/LoggedDebugPrintStream.mapping diff --git a/mappings/mk.mapping b/mappings/mk.mapping deleted file mode 100644 index 30bd91b549..0000000000 --- a/mappings/mk.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS mk - METHOD a print (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 6cec7bfcd6..1e8869355c 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -109,6 +109,8 @@ CLASS ub net/minecraft/entity/Entity METHOD a toTagList ([F)Lfi; METHOD aC removeAllPassengers ()V METHOD aE getForwardVector ()Lbfp; + METHOD aF getRotationClient ()Lbfo; + METHOD aG getRotationVecClient ()Lbfp; METHOD aH getDefaultPortalCooldown ()I METHOD aJ getItemsHand ()Ljava/lang/Iterable; METHOD aK getItemsArmor ()Ljava/lang/Iterable; @@ -138,7 +140,7 @@ CLASS ub net/minecraft/entity/Entity METHOD b setRenderDistanceMultiplier (D)V METHOD b setPosition (DDD)V METHOD b setPositionAndAngles (DDDFF)V - METHOD b setYawAndPitch (FF)V + METHOD b setRotation (FF)V METHOD b changeWorld (I)Lub; METHOD b setEntityFlag (IZ)V METHOD b interact (Lacu;Lsw;)Z diff --git a/mappings/net/minecraft/entity/EntityRegistry.mapping b/mappings/net/minecraft/entity/EntityRegistry.mapping index 674658ba49..7937d40923 100644 --- a/mappings/net/minecraft/entity/EntityRegistry.mapping +++ b/mappings/net/minecraft/entity/EntityRegistry.mapping @@ -1,19 +1,42 @@ CLASS ud net/minecraft/entity/EntityRegistry + CLASS ud$a Metadata + FIELD a id Lmd; + FIELD b colorEgg I + FIELD c colorEggSpots I + FIELD d killStat Lpl; + FIELD e killedByStat Lpl; + METHOD (Lmd;II)V + ARG 0 id + ARG 1 colorEgg + ARG 2 colorEggSpots FIELD a LIGHTNING_BOLT_ID Lmd; FIELD b CLASS_MAP Lel; + FIELD c METADATA_MAP Ljava/util/Map; FIELD d ID_SET Ljava/util/Set; FIELD e PLAYER_ID Lmd; FIELD f LOGGER Lorg/apache/logging/log4j/Logger; FIELD g NAME_LIST Ljava/util/List; METHOD a getIdList ()Ljava/util/Set; + METHOD a getClassClient (I)Ljava/lang/Class; + ARG 0 id + METHOD a create (ILali;)Lub; + ARG 0 id METHOD a registerEntity (ILjava/lang/String;Ljava/lang/Class;Ljava/lang/String;)V METHOD a deserialize (Lfc;Lali;)Lub; METHOD a getIdByClass (Ljava/lang/Class;)Lmd; METHOD a create (Ljava/lang/Class;Lali;)Lub; + METHOD a getClassClient (Ljava/lang/String;)Ljava/lang/Class; + ARG 0 id + METHOD a registerEntityMetadata (Ljava/lang/String;II)Lud$a; + ARG 0 id + ARG 1 colorEgg + ARG 2 colorSpos METHOD a getName (Lmd;)Ljava/lang/String; METHOD a create (Lmd;Lali;)Lub; + ARG 0 id METHOD a getId (Lub;)Lmd; METHOD a matches (Lub;Lmd;)Z + METHOD b getIdListAsString ()Ljava/lang/String; METHOD b isValidIdentifier (Lmd;)Z METHOD b getName (Lub;)Ljava/lang/String; METHOD c registerDefaults ()V diff --git a/mappings/net/minecraft/entity/player/InventoryPlayer.mapping b/mappings/net/minecraft/entity/player/InventoryPlayer.mapping index f27ad4dff8..d88b845bc7 100644 --- a/mappings/net/minecraft/entity/player/InventoryPlayer.mapping +++ b/mappings/net/minecraft/entity/player/InventoryPlayer.mapping @@ -26,10 +26,14 @@ CLASS act net/minecraft/entity/player/InventoryPlayer METHOD b deserialize (Lfi;)V METHOD c getInvProperty (I)I METHOD c insertStack (ILahf;)Z + ARG 0 slot + ARG 1 stack METHOD c onInvClose (Lacu;)V METHOD c getOccupiedSlotWithRoomForStack (Lahf;)I METHOD c_ removeInvStack (I)Lahf; METHOD d swapSlotWithHotbar (I)V + METHOD d insertStack (Lahf;)Z + ARG 0 stack METHOD e isValidHotbarIndex (I)Z METHOD e removeOne (Lahf;)V METHOD f scrollSelectedSlot (I)V diff --git a/mappings/net/minecraft/item/ItemBucket.mapping b/mappings/net/minecraft/item/ItemBucket.mapping index 71b66f6d7d..14b0c90e85 100644 --- a/mappings/net/minecraft/item/ItemBucket.mapping +++ b/mappings/net/minecraft/item/ItemBucket.mapping @@ -1,2 +1,9 @@ CLASS afy net/minecraft/item/ItemBucket + FIELD a liquidBlock Lank; + METHOD (Lank;)V + ARG 0 liquidBlock + METHOD a tryEmptying (Lacu;Lali;Ldx;)Z + ARG 0 player + ARG 1 world + ARG 2 pos METHOD a onRightClick (Lali;Lacu;Lsw;)Lsz; diff --git a/mappings/net/minecraft/potion/PotionHelper.mapping b/mappings/net/minecraft/potion/PotionHelper.mapping index bc3e90720a..40c18480bf 100644 --- a/mappings/net/minecraft/potion/PotionHelper.mapping +++ b/mappings/net/minecraft/potion/PotionHelper.mapping @@ -10,5 +10,7 @@ CLASS aix net/minecraft/potion/PotionHelper METHOD a getColor (Ljava/util/Collection;)I METHOD b getCustomPotionEffects (Lahf;)Ljava/util/List; METHOD b getCustomPotionEffects (Lfc;)Ljava/util/List; + METHOD c getColor (Lahf;)I + ARG 0 stack METHOD c getPotion (Lfc;)Laiv; METHOD d getPotion (Lahf;)Laiv; diff --git a/mappings/net/minecraft/reference/CriterionTriggers.mapping b/mappings/net/minecraft/reference/CriterionTriggers.mapping index 481f3d0608..ad4d4213e5 100644 --- a/mappings/net/minecraft/reference/CriterionTriggers.mapping +++ b/mappings/net/minecraft/reference/CriterionTriggers.mapping @@ -1,7 +1,20 @@ CLASS m net/minecraft/reference/CriterionTriggers + FIELD a IMPOSSIBLE Lad; + FIELD b PLAYER_KILLED_ENTITY Laj; + FIELD c ENTER_BLOCK Lab; + FIELD d INVENTORY_CHANGED Lae; + FIELD e RECIPE_UNLOCKED Lak; + FIELD f PLAYER_DAMAGED Lai; + FIELD g ENCHANTED_ITEM Lz; + FIELD h BREWED_POTION Lw; + FIELD i CONSTRUCT_BEACON Lx; + FIELD j USED_ENDER_EYE Lam; + FIELD k SUMMONED_ENTITY Lal; + FIELD l BRED_ANIMALS Lv; + FIELD m LOCATION Lag; FIELD n TRIGGERS Ljava/util/Map; METHOD a getAllTriggers ()Ljava/lang/Iterable; METHOD a getById (Lmd;)Lp; ARG 0 id - METHOD a (Lp;)Lp; + METHOD a register (Lp;)Lp; ARG 0 trigger diff --git a/mappings/net/minecraft/reference/LootTables.mapping b/mappings/net/minecraft/reference/LootTables.mapping index 4e3bc1db09..6374317f0f 100644 --- a/mappings/net/minecraft/reference/LootTables.mapping +++ b/mappings/net/minecraft/reference/LootTables.mapping @@ -71,6 +71,7 @@ CLASS bdy net/minecraft/reference/LootTables FIELD l CHEST_JUNGLE_TEMPLE Lmd; FIELD m DISPENSER_JUNGLE_TEMPLE Lmd; FIELD n CHEST_IGLOO Lmd; + FIELD o CHEST_WOODLAND_MANSION Lmd; FIELD p ENTITY_WITCH Lmd; FIELD q ENTITY_BLAZE Lmd; FIELD r ENTITY_CREEPER Lmd; diff --git a/mappings/net/minecraft/util/LoggedDebugPrintStream.mapping b/mappings/net/minecraft/util/LoggedDebugPrintStream.mapping new file mode 100644 index 0000000000..d43a08f5d0 --- /dev/null +++ b/mappings/net/minecraft/util/LoggedDebugPrintStream.mapping @@ -0,0 +1,2 @@ +CLASS mk net/minecraft/util/LoggedDebugPrintStream + METHOD a print (Ljava/lang/String;)V