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

Merge branch 'pull/546' into 19w12a 

# Conflicts:
#	mappings/net/minecraft/entity/ai/brain/Brain.mapping
This commit is contained in:
modmuss50 2019-03-21 17:29:44 +00:00
parent c1cde47fae 6e5bfaa57d
commit 8339dfb381
10 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
CLASS awe net/minecraft/entity/ai/brain/Activity
FIELD h id Ljava/lang/String;
METHOD a getId ()Ljava/lang/String;
METHOD a register (Ljava/lang/String;)Lawe;

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

@ -25,4 +25,4 @@ CLASS aiw net/minecraft/entity/ai/brain/Brain
METHOD c hasActivity (Lawe;)Z
METHOD d getOptionalMemory (Laod;)Ljava/util/Optional;
METHOD d tick (Lvd;Laih;)V
METHOD f clone ()Laiw;
METHOD f copy ()Laiw;

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

@ -29,6 +29,7 @@ CLASS aji net/minecraft/entity/ai/brain/task/Task
ARG 1 world
ARG 2 entity
ARG 3 time
METHOD f stopInternal (Lvd;Laih;J)V
METHOD g shouldKeepRunning (Lvd;Laih;J)Z
ARG 1 world
ARG 2 entity

2
mappings/net/minecraft/entity/passive/FoxEntity.mapping
View File

@ -68,7 +68,7 @@ CLASS apy net/minecraft/entity/passive/FoxEntity
METHOD b addTrustedUuid (Ljava/util/UUID;)V
METHOD c canTrust (Ljava/util/UUID;)Z
METHOD d setFlag (IZ)V
METHOD dP getType ()Lapy$u;
METHOD dP getFoxType ()Lapy$u;
METHOD dQ isSitting ()Z
METHOD dR isWalking ()Z
METHOD dS isChasing ()Z

2
mappings/net/minecraft/entity/passive/MooshroomEntity.mapping
View File

@ -10,5 +10,5 @@ CLASS aqa net/minecraft/entity/passive/MooshroomEntity
FIELD bE lightningId Ljava/util/UUID;
METHOD a setType (Laqa$a;)V
METHOD a chooseBabyType (Laqa;)Laqa$a;
METHOD dP getType ()Laqa$a;
METHOD dP getMooshroomType ()Laqa$a;
METHOD k getStewEffectFrom (Lbaz;)Lorg/apache/commons/lang3/tuple/Pair;

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

@ -22,6 +22,8 @@ CLASS aui net/minecraft/entity/passive/VillagerEntity
FIELD bQ lastRestock J
FIELD bR MEMORY_MODULES Lcom/google/common/collect/ImmutableList;
FIELD bS SENSORS Lcom/google/common/collect/ImmutableList;
METHOD a isLackingBuddyGolem (J)Z
METHOD a wantsGolem (Lahy;)Z
METHOD a initBrain (Laiw;)V
METHOD a releaseTicketFor (Laod;)V
METHOD a talkWithVillager (Laui;J)V
@ -31,17 +33,21 @@ CLASS aui net/minecraft/entity/passive/VillagerEntity
METHOD a reinitializeBrain (Lvd;)V
METHOD b setRecipes (Lbfk;)V
METHOD dY resetCustomer ()V
METHOD dZ restock ()V
METHOD ea playWorkSound ()V
METHOD ee isReadyToBreed ()Z
METHOD ef consumeAvailableFood ()V
METHOD eg wantsToStartBreeding ()Z
METHOD eh canBreed ()Z
METHOD ej getLastRestock ()J
METHOD ek clearCurrentBonus ()V
METHOD el canLevelUp ()Z
METHOD em levelUp ()V
METHOD en getAvailableFood ()I
METHOD eo trySpawnGolem ()V
METHOD ep spawnIronGolem ()Lapz;
METHOD f beginTradeWith (Lauv;)V
ARG 1 customer
METHOD g prepareRecipesFor (Lauv;)V
METHOD r depleteFood (I)V
ARG 1 amount

1
mappings/net/minecraft/scoreboard/AbstractScoreboardTeam.mapping
View File

@ -7,6 +7,7 @@ CLASS crq net/minecraft/scoreboard/AbstractScoreboardTeam
FIELD d HIDDEN_FOR_TEAM Lcrq$b;
METHOD a isEqual (Lcrq;)Z
METHOD b getName ()Ljava/lang/String;
METHOD d modifyText (Ljm;)Ljm;
METHOD g getPlayerList ()Ljava/util/Collection;
METHOD h isFriendlyFireAllowed ()Z
METHOD i shouldShowFriendlyInvisibles ()Z

1
mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping
View File

@ -17,6 +17,7 @@ CLASS crm net/minecraft/scoreboard/ScoreboardTeam
METHOD a setColor (Lc;)V
METHOD a setCollisionRule (Lcrq$a;)V
METHOD a setNameTagVisibilityRule (Lcrq$b;)V
METHOD a modifyText (Lcrq;Ljm;)Ljm;
METHOD a setDisplayName (Ljm;)V
METHOD a setFriendlyFireAllowed (Z)V
METHOD b setDeathMessageVisibilityRule (Lcrq$b;)V

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

@ -5,6 +5,8 @@ CLASS bfj net/minecraft/village/TraderRecipe
FIELD d uses I
FIELD e maxUses I
FIELD f rewardExp Z
FIELD g tax I
FIELD h demandBonus I
FIELD i priceMultiplier F
FIELD j rewardedExp I
METHOD <init> (Lbaz;Lbaz;IIF)V
@ -29,24 +31,29 @@ CLASS bfj net/minecraft/village/TraderRecipe
ARG 6 rewardedExp
ARG 7 priceMultiplier
METHOD a getFirstBuyItem ()Lbaz;
METHOD a increasedMaxUses (I)V
METHOD a increaseTax (I)V
METHOD a matchesBuyItems (Lbaz;Lbaz;)Z
ARG 1 first
ARG 2 second
METHOD b getDiscountedFirstBuyItem ()Lbaz;
METHOD b setTax (I)V
METHOD b depleteBuyItems (Lbaz;Lbaz;)Z
METHOD c getSecondBuyItem ()Lbaz;
METHOD c acceptsBuy (Lbaz;Lbaz;)Z
ARG 1 given
ARG 2 sample
METHOD d getModifiableSellItem ()Lbaz;
METHOD e updatePriceOnDemand ()V
METHOD f getSellItem ()Lbaz;
METHOD g getUses ()I
METHOD h resetUses ()V
METHOD i getMaxUses ()I
METHOD j use ()V
METHOD k clearTax ()V
METHOD l getTax ()I
METHOD m getPriceMultiplier ()F
METHOD n getRewardedExp ()I
METHOD o isDisabled ()Z
METHOD p clearUses ()V
METHOD q shouldRewardExp ()Z
METHOD r serialize ()Lib;
METHOD r toTag ()Lib;

8
mappings/net/minecraft/village/VillageGossipType.mapping
View File

@ -1,9 +1,13 @@
CLASS aob net/minecraft/village/VillageGossipType
FIELD g key Ljava/lang/String;
FIELD h value I
FIELD h multiplier I
FIELD i maxReputation I
FIELD k 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
ARG 4 multiplier
ARG 5 maxReputation
ARG 7 value
METHOD a byKey (Ljava/lang/String;)Laob;
ARG 0 key