From e2c9a5c337a691083cd9c5775bdecb83db5ef697 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Fri, 5 Apr 2019 23:56:48 +0800 Subject: [PATCH] A few mappings around villagers (#587) * A few mappings around villagers Signed-off-by: liach * Update VillagerEntity.mapping did enigma broke --- .../client/render/entity/model/VillagerEntityModel.mapping | 3 --- .../render/entity/model/VillagerResemblingModel.mapping | 3 +++ .../minecraft/command/arguments/ItemSlotArgumentType.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 3 +++ mappings/net/minecraft/entity/mob/MobEntity.mapping | 1 + .../minecraft/entity/passive/AbstractTraderEntity.mapping | 4 ++++ mappings/net/minecraft/entity/passive/VillagerEntity.mapping | 5 +++++ .../net/minecraft/sortme/DebugRendererInfoManager.mapping | 2 ++ 8 files changed, 19 insertions(+), 4 deletions(-) delete mode 100644 mappings/net/minecraft/client/render/entity/model/VillagerEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/VillagerResemblingModel.mapping diff --git a/mappings/net/minecraft/client/render/entity/model/VillagerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/VillagerEntityModel.mapping deleted file mode 100644 index e1792e9b97..0000000000 --- a/mappings/net/minecraft/client/render/entity/model/VillagerEntityModel.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dfz net/minecraft/client/render/entity/model/VillagerEntityModel - FIELD a head Ldgl; - FIELD l nose Ldgl; diff --git a/mappings/net/minecraft/client/render/entity/model/VillagerResemblingModel.mapping b/mappings/net/minecraft/client/render/entity/model/VillagerResemblingModel.mapping new file mode 100644 index 0000000000..42994711ab --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/VillagerResemblingModel.mapping @@ -0,0 +1,3 @@ +CLASS dfz net/minecraft/client/render/entity/model/VillagerResemblingModel + FIELD a head Ldgl; + FIELD l nose Ldgl; diff --git a/mappings/net/minecraft/command/arguments/ItemSlotArgumentType.mapping b/mappings/net/minecraft/command/arguments/ItemSlotArgumentType.mapping index 8fd430e8cb..7745a11977 100644 --- a/mappings/net/minecraft/command/arguments/ItemSlotArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ItemSlotArgumentType.mapping @@ -1,7 +1,7 @@ CLASS db net/minecraft/command/arguments/ItemSlotArgumentType FIELD a EXAMPLES Ljava/util/Collection; FIELD b UNKNOWN_SLOT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD c slotNames Ljava/util/Map; + FIELD c slotNamesToSlotCommandId Ljava/util/Map; METHOD a create ()Ldb; METHOD a getSlotArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)I METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 5e42934fd7..1a6c7e8ad7 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -204,6 +204,9 @@ CLASS ahz net/minecraft/entity/Entity METHOD aX getItemsHand ()Ljava/lang/Iterable; METHOD aY getItemsArmor ()Ljava/lang/Iterable; METHOD aZ getItemsEquipped ()Ljava/lang/Iterable; + METHOD a_ tryReplaceItem (ILbbq;)Z + ARG 1 slotCommandId + ARG 2 stack METHOD aa baseTick ()V METHOD ab getMaxPortalTime ()I METHOD ac setOnFireFromLava ()V diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 2c46ef7091..7cf7b7fea7 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -53,6 +53,7 @@ CLASS aij net/minecraft/entity/mob/MobEntity METHOD a canBeLeashedBy (Lavn;)Z METHOD a interactMob (Lavn;Lagt;)Z ARG 1 player + ARG 2 hand METHOD a isHolding (Lbbl;)Z METHOD a isBetterItemFor (Lbbq;Lbbq;Laie;)Z ARG 1 current diff --git a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping index 006d5e4f68..ab3bda270c 100644 --- a/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping @@ -1,16 +1,20 @@ CLASS auv net/minecraft/entity/passive/AbstractTraderEntity FIELD bA customer Lavn; FIELD bB inventory Lagz; + FIELD bC headRollingTimeLeft I FIELD bz recipes Lbgb; METHOD a fillRecipesFromPool (Lbgb;[Lave$f;I)V ARG 1 recipeList ARG 2 pool ARG 3 count + METHOD a produceParticles (Lgd;)V METHOD b afterUsing (Lbga;)V METHOD dU hasCustomer ()Z METHOD dX getYesSound ()Lyh; METHOD dY playCelebrateSound ()V + METHOD dZ getHeadRollingTimeLeft ()I METHOD ea getInventory ()Lagz; METHOD ec fillRecipes ()V + METHOD r setHeadRollingTimeLeft (I)V METHOD r getTradingSound (Z)Lyh; ARG 1 sold diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 4ae45619fd..ca853bd5a9 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -16,6 +16,7 @@ CLASS ava net/minecraft/entity/passive/VillagerEntity FIELD bF levellingUp Z FIELD bG lastCustomer Lavn; FIELD bH buddyGolemId Ljava/util/UUID; + FIELD bI oneMinAfterLastGolemCheckTimestamp J FIELD bL foodLevel B FIELD bM gossip Laoo; FIELD bN gossipStartTime J @@ -24,6 +25,7 @@ CLASS ava net/minecraft/entity/passive/VillagerEntity FIELD bQ MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD bR SENSORS Lcom/google/common/collect/ImmutableList; METHOD a isLackingBuddyGolem (J)Z + ARG 1 time METHOD a wantsGolem (Lahz;)Z METHOD a initBrain (Laix;)V METHOD a releaseTicketFor (Laor;)V @@ -31,6 +33,7 @@ CLASS ava net/minecraft/entity/passive/VillagerEntity ARG 1 villager ARG 2 time METHOD a setVillagerData (Lavb;)V + ARG 1 villagerData METHOD a reinitializeBrain (Lve;)V METHOD b setRecipes (Lbgb;)V METHOD ed resetCustomer ()V @@ -42,6 +45,7 @@ CLASS ava net/minecraft/entity/passive/VillagerEntity METHOD em canBreed ()Z METHOD en hasSeedToPlant ()Z METHOD eo getLastRestock ()J + METHOD ep questionAndRollHead ()V METHOD eq clearCurrentBonus ()V METHOD er canLevelUp ()Z METHOD es levelUp ()V @@ -51,6 +55,7 @@ CLASS ava net/minecraft/entity/passive/VillagerEntity METHOD f beginTradeWith (Lavn;)V ARG 1 customer METHOD g prepareRecipesFor (Lavn;)V + ARG 1 player METHOD s depleteFood (I)V ARG 1 amount METHOD t setExperience (I)V diff --git a/mappings/net/minecraft/sortme/DebugRendererInfoManager.mapping b/mappings/net/minecraft/sortme/DebugRendererInfoManager.mapping index 1dbcd3f6ac..1dc5bf2dac 100644 --- a/mappings/net/minecraft/sortme/DebugRendererInfoManager.mapping +++ b/mappings/net/minecraft/sortme/DebugRendererInfoManager.mapping @@ -1,5 +1,6 @@ CLASS no net/minecraft/sortme/DebugRendererInfoManager FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a sendVillagerAiDebugData (Laii;)V METHOD a sendGoalSelector (Lbgw;Laij;Lamn;)V ARG 0 world ARG 1 mob @@ -7,3 +8,4 @@ CLASS no net/minecraft/sortme/DebugRendererInfoManager METHOD a sendPathfindingData (Lbgw;Laij;Lcmt;F)V METHOD a sendBlockUpdate (Lbgw;Lev;)V METHOD a sendStructureStart (Lbgx;Lchy;)V + METHOD c sendPointOfInterest (Lve;Lev;)V