mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Villager Mapping (#527) 

* Merge with upstream

* Add back dropped mapping

* Further villager mapping
This commit is contained in:
Gegy 2019-03-20 19:45:35 +02:00 committed by Modmuss50
parent 0e61cb17bd
commit f1e3439325
26 changed files with 196 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mappings/net/minecraft/client/network/packet/SetVillagerRecipesPacket.mapping
View File

@ -1,8 +1,11 @@
CLASS lq net/minecraft/client/network/packet/SetVillagerRecipesPacket
FIELD a syncId I
FIELD b recipes Lbfc;
FIELD e canLevel Z
METHOD <init> (ILbfc;IIZ)V
ARG 1 syncId
ARG 2 recipes
ARG 5 canLevel
METHOD b getSyncId ()I
METHOD c getRecipes ()Lbfc;
METHOD f canLevel ()Z

7
mappings/net/minecraft/container/MerchantContainer.mapping
View File

@ -1,8 +1,15 @@
CLASS axv net/minecraft/container/MerchantContainer
FIELD c villager Lbfa;
FIELD d villagerInventory Laxu;
FIELD f canLevel Z
METHOD <init> (ILaum;)V
ARG 1 syncId
METHOD <init> (ILaum;Lbfa;)V
ARG 1 syncId
METHOD a setRecipes (Lbfc;)V
METHOD a setCanLevel (Z)V
ARG 1 canLevel
METHOD d setRecipeIndex (I)V
METHOD e getExperience ()I
METHOD h getRecipes ()Lbfc;
METHOD i canLevel ()Z

3
mappings/net/minecraft/entity/EntityInteraction.mapping Normal file
View File

@ -0,0 +1,3 @@
CLASS aov net/minecraft/entity/EntityInteraction
METHOD a create (Ljava/lang/String;)Laov;
ARG 0 key

3
mappings/net/minecraft/entity/InteractionObserver.mapping Normal file
View File

@ -0,0 +1,3 @@
CLASS aiq net/minecraft/entity/InteractionObserver
METHOD a onInteractionWith (Laov;Lahw;)V
ARG 1 interaction

6
mappings/net/minecraft/entity/LivingEntity.mapping
View File

@ -21,6 +21,7 @@ CLASS aif net/minecraft/entity/LivingEntity
FIELD bd movementInputUp F
FIELD be movementInputForward F
FIELD bo activeItemStack Lbar;
FIELD bs brain Laiu;
FIELD bt SLEEPING_POSITION Lqe;
FIELD bu attributeContainer Laiz;
FIELD bv damageTracker Lahe;
@ -54,9 +55,9 @@ CLASS aif net/minecraft/entity/LivingEntity
METHOD a isEquippedStackValid (Laib;)Z
METHOD a setAttacker (Laif;)V
METHOD a getAttributeInstance (Laiv;)Laiw;
METHOD a createBrain (Lcom/mojang/datafixers/Dynamic;)Laiu;
METHOD a applyFoodEffects (Lbar;Lbfx;Laif;)V
METHOD a eatFood (Lbfx;Lbar;)Lbar;
METHOD a createBrain (Lcom/mojang/datafixers/Dynamic;)Laiu;
METHOD a_ doJump (Z)V
METHOD b heal (F)V
ARG 1 amount
@ -104,12 +105,14 @@ CLASS aif net/minecraft/entity/LivingEntity
METHOD cu getPotionEffects ()Ljava/util/Collection;
METHOD cw isUndead ()Z
METHOD cx getHealth ()F
METHOD cy getRecentDamageSource ()Lahf;
METHOD cz dropInventory ()V
METHOD d applyDamage (Lahf;F)V
ARG 1 damageSource
METHOD d removeStatusEffect (Laho;)Z
METHOD d isPotionEffective (Lahq;)Z
METHOD d getCurrentExperience (Laun;)I
METHOD d getDrinkSound (Lbar;)Lyf;
METHOD da getAbsorptionAmount ()F
METHOD dc getMainHand ()Laie;
METHOD dd isUsingItem ()Z
@ -124,6 +127,7 @@ CLASS aif net/minecraft/entity/LivingEntity
ARG 1 yaw
METHOD e getHurtSound (Lahf;)Lyf;
ARG 1 source
METHOD e getEatSound (Lbar;)Lyf;
METHOD e travel (Lcqg;)V
ARG 1 movementInput
METHOD f attackLivingEntity (Laif;)V

6
mappings/net/minecraft/entity/ai/brain/Brain.mapping
View File

@ -6,10 +6,15 @@ CLASS aiu net/minecraft/entity/ai/brain/Brain
FIELD g possibleActivities Ljava/util/Set;
FIELD h activity Lavw;
METHOD a doActivity (J)V
ARG 1 worldTime
METHOD a forget (Lanw;)V
METHOD a isMemoryInState (Lanw;Lanx;)Z
ARG 2 state
METHOD a readMemory (Lanw;Lcom/mojang/datafixers/Dynamic;)V
METHOD a putMemory (Lanw;Ljava/lang/Object;)V
ARG 2 value
METHOD a setMemory (Lanw;Ljava/util/Optional;)V
ARG 2 value
METHOD a setTaskList (Lavw;Lcom/google/common/collect/ImmutableList;)V
METHOD a setTaskList (Lavw;Lcom/google/common/collect/ImmutableList;Ljava/util/Set;)V
METHOD a setSchedule (Lavy;)V
@ -20,3 +25,4 @@ CLASS aiu net/minecraft/entity/ai/brain/Brain
METHOD b stopAllTasks (Lvc;Laif;)V
METHOD c getMemory (Lanw;)Ljava/util/Optional;
METHOD c hasActivity (Lavw;)Z
METHOD e clone ()Laiu;

1
mappings/net/minecraft/entity/ai/brain/Schedule.mapping
View File

@ -12,3 +12,4 @@ CLASS avy net/minecraft/entity/ai/brain/Schedule
ARG 0 id
METHOD b getRule (Lavw;)Lawa;
ARG 1 activity
METHOD c getOtherRules (Lavw;)Ljava/util/List;

6
mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping
View File

@ -1,10 +1,16 @@
CLASS avz net/minecraft/entity/ai/brain/ScheduleBuilder
CLASS avz$a ActivityEntry
FIELD a startTime I
FIELD b activity Lavw;
METHOD <init> (ILavw;)V
ARG 1 startTime
METHOD a getStartTime ()I
METHOD b getActivity ()Lavw;
FIELD a schedule Lavy;
FIELD b activities Ljava/util/List;
METHOD <init> (Lavy;)V
ARG 1 schedule
METHOD a build ()Lavy;
METHOD a withActivity (ILavw;)Lavz;
ARG 1 startTime
ARG 2 activity

5
mappings/net/minecraft/entity/ai/brain/ScheduleRule.mapping
View File

@ -1,3 +1,8 @@
CLASS awa net/minecraft/entity/ai/brain/ScheduleRule
FIELD a entries Ljava/util/List;
METHOD a getPriority (I)F
ARG 1 time
METHOD a withEntry (IF)Lawa;
ARG 1 startTime
ARG 2 priority
METHOD b sort ()V

8
mappings/net/minecraft/entity/ai/brain/ScheduleRuleEntry.mapping Normal file
View File

@ -0,0 +1,8 @@
CLASS avx net/minecraft/entity/ai/brain/ScheduleRuleEntry
FIELD a startTime I
FIELD b priority F
METHOD <init> (IF)V
ARG 1 startTime
ARG 2 priority
METHOD a getStartTime ()I
METHOD b getPriority ()F

4
mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping
View File

@ -2,6 +2,10 @@ CLASS atx net/minecraft/entity/passive/AbstractTraderEntity
FIELD bA recipes Lbfc;
FIELD bB customer Laun;
FIELD bC inventory Lagw;
METHOD a fillRecipesFromPool (Lbfc;[Laue$f;I)V
ARG 1 recipeList
ARG 2 pool
ARG 3 count
METHOD b afterUsing (Lbfb;)V
METHOD dP hasCustomer ()Z
METHOD dS getYesSound ()Lyf;

29
mappings/net/minecraft/entity/passive/VillagerEntity.mapping
View File

@ -1,9 +1,38 @@
CLASS aua net/minecraft/entity/passive/VillagerEntity
FIELD bB ITEM_FOOD_VALUES Ljava/util/Map;
FIELD bD VILLAGER_DATA Lqe;
FIELD bE GATHERABLE_ITEMS Ljava/util/Set;
FIELD bF levelUpTimer I
FIELD bG levellingUp Z
FIELD bH lastCustomer Laun;
FIELD bI buddyGolemId Ljava/util/UUID;
FIELD bM foodLevel B
FIELD bN gossip Lant;
FIELD bO gossipStartTime J
FIELD bP experience I
FIELD bQ lastRestock J
FIELD bR MEMORY_MODULES Lcom/google/common/collect/ImmutableList;
FIELD bS SENSORS Lcom/google/common/collect/ImmutableList;
METHOD a initBrain (Laiu;)V
METHOD a releaseTicketFor (Lanw;)V
METHOD a talkWithVillager (Laua;J)V
ARG 1 villager
ARG 2 time
METHOD a setVillagerData (Laub;)V
METHOD a reinitializeBrain (Lvc;)V
METHOD b setRecipes (Lbfc;)V
METHOD dW resetCustomer ()V
METHOD dY playWorkSound ()V
METHOD ec isReadyToBreed ()Z
METHOD ed consumeAvailableFood ()V
METHOD ee wantsToStartBreeding ()Z
METHOD ef canBreed ()Z
METHOD eh getLastRestock ()J
METHOD ej canLevelUp ()Z
METHOD ek levelUp ()V
METHOD el getAvailableFood ()I
METHOD em spawnIronGolem ()Lapr;
METHOD f beginTradeWith (Laun;)V
ARG 1 customer
METHOD r depleteFood (I)V
ARG 1 amount

1
mappings/net/minecraft/entity/raid/RaidManager.mapping
View File

@ -8,6 +8,7 @@ CLASS avu net/minecraft/entity/raid/RaidManager
METHOD a isLivingAroundVillage (Laif;Leu;I)Z
METHOD a isValidRaiderFor (Lavt;Lavs;)Z
METHOD a nameFor (Lbwp;)Ljava/lang/String;
METHOD a getRaidAt (Leu;)Lavs;
METHOD a getOrCreateRaid (Lvc;Leu;)Lavs;
METHOD a startRaid (Lvd;)Lavs;
METHOD e nextId ()I

1
mappings/net/minecraft/inventory/Inventory.mapping
View File

@ -10,6 +10,7 @@ CLASS agk net/minecraft/inventory/Inventory
ARG 2 itemStack
METHOD a canPlayerUseInv (Laun;)Z
ARG 1 playerEntity
METHOD a getInvAmountOf (Lbam;)I
METHOD a_ onInvOpen (Laun;)V
METHOD b removeInvStack (I)Lbar;
ARG 1 slot

7
mappings/net/minecraft/server/world/ServerWorld.mapping
View File

@ -11,6 +11,7 @@ CLASS vc net/minecraft/server/world/ServerWorld
FIELD K insideTick Z
FIELD L wanderingTraderManager Lauh;
FIELD b savingDisabled Z
FIELD c raidManager Lavu;
FIELD v LOGGER Lorg/apache/logging/log4j/Logger;
FIELD w globalEntities Ljava/util/List;
FIELD x entitiesById Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
@ -24,10 +25,14 @@ CLASS vc net/minecraft/server/world/ServerWorld
ARG 6 profiler
ARG 7 worldGenerationProgressListener
METHOD B getPointOfInterestStorage ()Laoy;
METHOD C getRaidManager ()Lavu;
METHOD a getChunkSyncIfServerThread (IIZ)Ljava/util/concurrent/CompletableFuture;
ARG 1 x
ARG 2 z
ARG 3 create
METHOD a handleInteraction (Laov;Lahw;Laiq;)V
ARG 1 interaction
ARG 3 observer
METHOD a addLightning (Lasd;)V
METHOD a init (Lbgb;)V
ARG 1 levelInfo
@ -44,6 +49,8 @@ CLASS vc net/minecraft/server/world/ServerWorld
ARG 1 x
ARG 2 z
ARG 3 forced
METHOD c_ getRaidAt (Leu;)Lavs;
METHOD d_ hasRaidAt (Leu;)Z
METHOD f resetIdleTimeout ()V
METHOD g placeBonusChest ()V
METHOD h getForcedSpawnPoint ()Leu;

7
mappings/net/minecraft/sortme/CuboidBlockIterator.mapping
View File

@ -5,6 +5,10 @@ CLASS ex net/minecraft/sortme/CuboidBlockIterator
FIELD d endX I
FIELD e endY I
FIELD f endZ I
FIELD g x I
FIELD h y I
FIELD i z I
FIELD j complete Z
METHOD <init> (IIIIII)V
ARG 1 startX
ARG 2 startY
@ -13,3 +17,6 @@ CLASS ex net/minecraft/sortme/CuboidBlockIterator
ARG 5 endY
ARG 6 endZ
METHOD a step ()Z
METHOD b getX ()I
METHOD c getY ()I
METHOD d getZ ()I

4
mappings/net/minecraft/village/PointOfInterest.mapping
View File

@ -15,8 +15,8 @@ CLASS aoz net/minecraft/village/PointOfInterest
ARG 1 pos
ARG 2 type
ARG 3 updateListener
METHOD a removeTicket ()Z
METHOD b addTicket ()Z
METHOD a reserveTicket ()Z
METHOD b releaseTicket ()Z
METHOD c hasSpace ()Z
METHOD d isOccupied ()Z
METHOD e getPos ()Leu;

2
mappings/net/minecraft/village/PointOfInterestSet.mapping
View File

@ -17,7 +17,7 @@ CLASS apa net/minecraft/village/PointOfInterestSet
ARG 1 pos
ARG 2 predicate
METHOD a get (Ljava/util/function/Predicate;Laoy$b;)Ljava/util/stream/Stream;
METHOD c addTicket (Leu;)Z
METHOD c releaseTicket (Leu;)Z
ARG 1 pos
METHOD d getType (Leu;)Ljava/util/Optional;
ARG 1 pos

2
mappings/net/minecraft/village/PointOfInterestStorage.mapping
View File

@ -42,7 +42,7 @@ CLASS aoy net/minecraft/village/PointOfInterestStorage
ARG 3 pos
ARG 4 radius
ARG 5 occupationStatus
METHOD b addTicket (Leu;)Z
METHOD b releaseTicket (Leu;)Z
ARG 1 pos
METHOD b getNearestPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Leu;I)Ljava/util/Optional;
ARG 1 typePredicate

1
mappings/net/minecraft/village/SimpleTrader.mapping
View File

@ -2,3 +2,4 @@ CLASS aty net/minecraft/village/SimpleTrader
FIELD a traderInventory Laxu;
FIELD b player Laun;
FIELD c recipeList Lbfc;
FIELD d experience I

4
mappings/net/minecraft/village/Trader.mapping
View File

@ -2,8 +2,12 @@ CLASS bfa net/minecraft/village/Trader
METHOD a sendRecipes (Laun;Ljl;I)V
METHOD a useRecipe (Lbfb;)V
METHOD a setServerRecipes (Lbfc;)V
METHOD dN getExperience ()I
METHOD dO getCurrentCustomer ()Laun;
METHOD dQ getRecipes ()Lbfc;
METHOD dU getTraderWorld ()Lbfx;
METHOD e setCurrentCustomer (Laun;)V
ARG 1 customer
METHOD j onSellingItem (Lbar;)V
METHOD q setExperience (I)V
ARG 1 experience

17
mappings/net/minecraft/village/TraderRecipe.mapping
View File

@ -5,19 +5,29 @@ CLASS bfb net/minecraft/village/TraderRecipe
FIELD d uses I
FIELD e maxUses I
FIELD f rewardExp Z
FIELD i priceMultiplier F
FIELD j rewardedExp I
METHOD <init> (Lbar;Lbar;IIF)V
ARG 1 buyItem
ARG 2 sellItem
ARG 3 maxUses
ARG 4 rewardedExp
ARG 5 priceMultiplier
METHOD <init> (Lbar;Lbar;Lbar;IIF)V
ARG 1 firstBuyItem
ARG 2 secondBuyItem
ARG 3 sellItem
ARG 4 maxUses
ARG 5 rewardedExp
ARG 6 priceMultiplier
METHOD <init> (Lbar;Lbar;Lbar;IIIF)V
ARG 1 firstBuyItem
ARG 2 secondBuyItem
ARG 3 sellItem
ARG 4 uses
ARG 5 maxUses
ARG 6 rewardedExp
ARG 7 priceMultiplier
METHOD a getFirstBuyItem ()Lbar;
METHOD a increasedMaxUses (I)V
METHOD a matchesBuyItems (Lbar;Lbar;)Z
@ -31,9 +41,12 @@ CLASS bfb net/minecraft/village/TraderRecipe
METHOD d getModifiableSellItem ()Lbar;
METHOD f getSellItem ()Lbar;
METHOD g getUses ()I
METHOD h resetUses ()V
METHOD i getMaxUses ()I
METHOD j use ()V
METHOD m getPriceMultiplier ()F
METHOD n getRewardedExp ()I
METHOD o isDisabled ()Z
METHOD p clearUses ()V
METHOD q getRewardExp ()Z
METHOD r deserialize ()Lia;
METHOD q shouldRewardExp ()Z
METHOD r serialize ()Lia;

9
mappings/net/minecraft/village/VillageGossipType.mapping Normal file
View File

@ -0,0 +1,9 @@
CLASS anu net/minecraft/village/VillageGossipType
FIELD g key Ljava/lang/String;
FIELD h value I
FIELD l BY_KEY Ljava/util/Map;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;IIII)V
ARG 3 key
ARG 4 value
METHOD a byKey (Ljava/lang/String;)Lanu;
ARG 0 key

11
mappings/net/minecraft/village/VillagerData.mapping
View File

@ -1,11 +1,22 @@
CLASS aub net/minecraft/village/VillagerData
FIELD a LEVEL_BASE_EXPERIENCE [I
FIELD b type Lauf;
FIELD c profession Laud;
FIELD d level I
METHOD <init> (Lauf;Laud;I)V
ARG 3 level
METHOD a getType ()Lauf;
METHOD a withLevel (I)Laub;
ARG 1 level
METHOD a withProfession (Laud;)Laub;
METHOD a withType (Lauf;)Laub;
METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object;
ARG 1 ops
METHOD b getProfession ()Laud;
METHOD b getLowerLevelExperience (I)I
ARG 0 level
METHOD c getLevel ()I
METHOD c getUpperLevelExperience (I)I
ARG 0 level
METHOD d isLevelValid (I)Z
ARG 0 level

44
mappings/net/minecraft/village/VillagerGossips.mapping Normal file
View File

@ -0,0 +1,44 @@
CLASS ant net/minecraft/village/VillagerGossips
CLASS ant$a Reputation
FIELD a associatedGossip Lit/unimi/dsi/fastutil/objects/Object2IntMap;
METHOD a entriesFor (Ljava/util/UUID;)Ljava/util/stream/Stream;
ARG 1 target
METHOD a getValue (Ljava/util/function/Predicate;)I
CLASS ant$b GossipEntry
FIELD a target Ljava/util/UUID;
FIELD b type Lanu;
FIELD c value I
METHOD <init> (Ljava/util/UUID;Lanu;I)V
ARG 1 target
ARG 2 type
ARG 3 value
METHOD a getValue ()I
METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Ljava/util/Optional;
METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
ARG 1 ops
FIELD a entityReputation Ljava/util/Map;
METHOD a max (II)I
ARG 0 left
ARG 1 right
METHOD a shareGossipFrom (Lant;Ljava/util/Random;I)V
ARG 1 from
ARG 3 count
METHOD a getGossipCount (Lanu;)J
METHOD a mergeReputation (Lanu;II)I
ARG 1 type
ARG 2 left
ARG 3 right
METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)V
METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
ARG 1 ops
METHOD a pickGossips (Ljava/util/Random;I)Ljava/util/Collection;
ARG 2 count
METHOD a getReputationFor (Ljava/util/UUID;)Lant$a;
ARG 1 target
METHOD a startGossip (Ljava/util/UUID;Lanu;I)V
ARG 1 target
ARG 2 type
ARG 3 value
METHOD a getReputationFor (Ljava/util/UUID;Ljava/util/function/Predicate;)I
ARG 1 target
METHOD b entries ()Ljava/util/stream/Stream;

12
mappings/net/minecraft/village/VillagerProfession.mapping
View File

@ -1,3 +1,15 @@
CLASS aud net/minecraft/village/VillagerProfession
FIELD p id Ljava/lang/String;
FIELD q workStation Lapb;
FIELD r gatherableItems Lcom/google/common/collect/ImmutableSet;
METHOD <init> (Ljava/lang/String;Lapb;Lcom/google/common/collect/ImmutableSet;)V
ARG 1 id
ARG 2 workStation
ARG 3 gatherableItems
METHOD a register (Ljava/lang/String;Lapb;)Laud;
ARG 0 key
METHOD a register (Ljava/lang/String;Lapb;Lcom/google/common/collect/ImmutableSet;)Laud;
ARG 0 key
ARG 2 gatherableItems
METHOD b getWorkStation ()Lapb;
METHOD c getGatherableItems ()Lcom/google/common/collect/ImmutableSet;