From a0c6dc7e67c328a0ae2860ec6881b98fe36e6d1c Mon Sep 17 00:00:00 2001 From: liach Date: Thu, 21 Mar 2019 08:16:40 -0700 Subject: [PATCH] Add some villager related mappings and fix some really poor names Signed-off-by: liach --- .../net/minecraft/entity/ai/brain/Activity.mapping | 1 + mappings/net/minecraft/entity/ai/brain/Brain.mapping | 3 ++- .../net/minecraft/entity/ai/brain/task/Task.mapping | 1 + .../net/minecraft/entity/passive/FoxEntity.mapping | 2 +- .../minecraft/entity/passive/MooshroomEntity.mapping | 2 +- .../minecraft/entity/passive/VillagerEntity.mapping | 11 +++++++++++ .../scoreboard/AbstractScoreboardTeam.mapping | 1 + .../net/minecraft/scoreboard/ScoreboardTeam.mapping | 1 + mappings/net/minecraft/village/TraderRecipe.mapping | 9 +++++++-- .../net/minecraft/village/VillageGossipType.mapping | 8 ++++++-- 10 files changed, 32 insertions(+), 7 deletions(-) diff --git a/mappings/net/minecraft/entity/ai/brain/Activity.mapping b/mappings/net/minecraft/entity/ai/brain/Activity.mapping index 2629985710..209b8ef274 100644 --- a/mappings/net/minecraft/entity/ai/brain/Activity.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Activity.mapping @@ -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; diff --git a/mappings/net/minecraft/entity/ai/brain/Brain.mapping b/mappings/net/minecraft/entity/ai/brain/Brain.mapping index 64ac29963c..6ad2f75b02 100644 --- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping @@ -21,7 +21,8 @@ CLASS aiw net/minecraft/entity/ai/brain/Brain METHOD b forget (Laod;)V METHOD b setActivity (Lawe;)V METHOD b stopAllTasks (Lvd;Laih;)V + METHOD c requireMemory (Laod;)Ljava/util/Optional; METHOD c hasActivity (Lawe;)Z METHOD d getMemory (Laod;)Ljava/util/Optional; METHOD d tick (Lvd;Laih;)V - METHOD f clone ()Laiw; + METHOD f copy ()Laiw; diff --git a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping index e251f81707..51ffc2192f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 2a74d3191b..e60d8264b7 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index 891325b35d..bd07a1ad39 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -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; diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 5aa417d8e8..5c76e6ec33 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -1,4 +1,9 @@ CLASS aui net/minecraft/entity/passive/VillagerEntity + CLASS aui$a GolemSpawnConditionMemory + FIELD b lastSleepTime J + METHOD b setLastSleepTime (J)V + METHOD c isRightTime (J)Z + ARG 1 worldTime FIELD bB ITEM_FOOD_VALUES Ljava/util/Map; FIELD bD VILLAGER_DATA Lqf; FIELD bE GATHERABLE_ITEMS Ljava/util/Set; @@ -13,6 +18,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 @@ -22,17 +29,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 diff --git a/mappings/net/minecraft/scoreboard/AbstractScoreboardTeam.mapping b/mappings/net/minecraft/scoreboard/AbstractScoreboardTeam.mapping index b2160dd3ff..fa63c86fb6 100644 --- a/mappings/net/minecraft/scoreboard/AbstractScoreboardTeam.mapping +++ b/mappings/net/minecraft/scoreboard/AbstractScoreboardTeam.mapping @@ -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 diff --git a/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping b/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping index 3e62c3f0c2..3db2482f55 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping @@ -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 diff --git a/mappings/net/minecraft/village/TraderRecipe.mapping b/mappings/net/minecraft/village/TraderRecipe.mapping index 6fdb3eec70..13589fbb20 100644 --- a/mappings/net/minecraft/village/TraderRecipe.mapping +++ b/mappings/net/minecraft/village/TraderRecipe.mapping @@ -5,6 +5,7 @@ CLASS bfj net/minecraft/village/TraderRecipe FIELD d uses I FIELD e maxUses I FIELD f rewardExp Z + FIELD g tax I FIELD i priceMultiplier F FIELD j rewardedExp I METHOD (Lbaz;Lbaz;IIF)V @@ -29,10 +30,12 @@ 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 @@ -44,9 +47,11 @@ CLASS bfj net/minecraft/village/TraderRecipe 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; diff --git a/mappings/net/minecraft/village/VillageGossipType.mapping b/mappings/net/minecraft/village/VillageGossipType.mapping index 6bb903327c..b7e5af5cca 100644 --- a/mappings/net/minecraft/village/VillageGossipType.mapping +++ b/mappings/net/minecraft/village/VillageGossipType.mapping @@ -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 (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