diff --git a/mappings/beq.mapping b/mappings/beq.mapping deleted file mode 100644 index 1a2b0ba641..0000000000 --- a/mappings/beq.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS beq diff --git a/mappings/fp.mapping b/mappings/fp.mapping deleted file mode 100644 index 12e9f918be..0000000000 --- a/mappings/fp.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS fp diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 3254209d55..5cd27beae1 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -9,6 +9,7 @@ CLASS avo net/minecraft/entity/passive/VillagerEntity FIELD bI foodLevel B FIELD bJ gossip Lapb; FIELD bK gossipStartTime J + FIELD bL lastGossipDecay J FIELD bM experience I FIELD bN lastRestock J FIELD bO MEMORY_MODULES Lcom/google/common/collect/ImmutableList; @@ -17,6 +18,13 @@ CLASS avo net/minecraft/entity/passive/VillagerEntity ARG 1 entityType ARG 2 world ARG 3 type + METHOD a canSummonGolem (J)Z + ARG 1 time + METHOD a summonGolem (JI)V + ARG 1 time + ARG 3 requiredVillagerCount + METHOD a notifyDeath (Lail;)V + ARG 1 killer METHOD a initBrain (Lajj;)V ARG 1 brain METHOD a releaseTicketFor (Lape;)V @@ -26,22 +34,34 @@ CLASS avo net/minecraft/entity/passive/VillagerEntity ARG 1 villagerData METHOD a reinitializeBrain (Lvi;)V ARG 1 world + METHOD b setGolemLastSeenTime (J)V + ARG 1 time METHOD b setOffers (Lbgq;)V ARG 1 offers + METHOD c hasSeenGolemRecently (J)Z + ARG 1 currentTime + METHOD d hasRecentlyWorkedAndSlept (J)Z + ARG 1 worldTime METHOD eA getAvailableFood ()I + METHOD eB craftBread ()V + METHOD eC decayGossip ()V METHOD eD spawnIronGolem ()Lard; METHOD ek restock ()V METHOD el playWorkSound ()V METHOD en isReadyToBreed ()Z METHOD eo consumeAvailableFood ()V + METHOD ep eatForBreeding ()V METHOD eq wantsToStartBreeding ()Z METHOD er canBreed ()Z METHOD es hasSeedToPlant ()Z METHOD et getLastRestock ()J METHOD ev sayNo ()V METHOD ew clearCurrentBonus ()V + METHOD ex lacksFood ()Z METHOD ey canLevelUp ()Z METHOD ez levelUp ()V + METHOD f getReputation (Lawb;)I + ARG 1 player METHOD g beginTradeWith (Lawb;)V ARG 1 customer METHOD h prepareRecipesFor (Lawb;)V diff --git a/mappings/net/minecraft/inventory/BasicInventory.mapping b/mappings/net/minecraft/inventory/BasicInventory.mapping index a9aa131849..dd90b5fb69 100644 --- a/mappings/net/minecraft/inventory/BasicInventory.mapping +++ b/mappings/net/minecraft/inventory/BasicInventory.mapping @@ -7,5 +7,8 @@ CLASS ahl net/minecraft/inventory/BasicInventory METHOD ([Lbce;)V ARG 1 items METHOD a addListener (Lahb;)V + METHOD a poll (Lbbz;I)Lbce; + ARG 1 item + ARG 2 count METHOD a add (Lbce;)Lbce; METHOD b removeListener (Lahb;)V diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 2797e49254..ea85770e70 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -11,7 +11,7 @@ CLASS agz net/minecraft/inventory/Inventory ARG 2 stack METHOD a canPlayerUseInv (Lawb;)Z ARG 1 player - METHOD a getInvAmountOf (Lbbz;)I + METHOD a countInInv (Lbbz;)I ARG 1 item METHOD a containsAnyInInv (Ljava/util/Set;)Z ARG 1 items diff --git a/mappings/net/minecraft/recipe/RecipeSerializer.mapping b/mappings/net/minecraft/recipe/RecipeSerializer.mapping index aeb8ee5423..50a7601618 100644 --- a/mappings/net/minecraft/recipe/RecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializer.mapping @@ -13,6 +13,7 @@ CLASS beo net/minecraft/recipe/RecipeSerializer FIELD l SHIELD_DECORATION Lbew; FIELD m SHULKER_BOX Lbew; FIELD n SUSPICIOUS_STEW Lbew; + FIELD o REPAIR_ITEM Lbew; FIELD p SMELTING Lbev; FIELD q BLASTING Lbev; FIELD r SMOKING Lbev; diff --git a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping new file mode 100644 index 0000000000..909bf55ec4 --- /dev/null +++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping @@ -0,0 +1 @@ +CLASS beq net/minecraft/recipe/RepairItemRecipe diff --git a/mappings/net/minecraft/recipe/SpecialCraftingRecipe.mapping b/mappings/net/minecraft/recipe/SpecialCraftingRecipe.mapping index 7d88d48bf2..15954589a7 100644 --- a/mappings/net/minecraft/recipe/SpecialCraftingRecipe.mapping +++ b/mappings/net/minecraft/recipe/SpecialCraftingRecipe.mapping @@ -1,2 +1,4 @@ CLASS bef net/minecraft/recipe/SpecialCraftingRecipe FIELD a id Lqt; + METHOD (Lqt;)V + ARG 1 id diff --git a/mappings/net/minecraft/util/Timestamp.mapping b/mappings/net/minecraft/util/Timestamp.mapping new file mode 100644 index 0000000000..2e2b5ca842 --- /dev/null +++ b/mappings/net/minecraft/util/Timestamp.mapping @@ -0,0 +1,11 @@ +CLASS fp net/minecraft/util/Timestamp + FIELD a time J + METHOD (J)V + ARG 1 time + METHOD a getTime ()J + METHOD a of (J)Lfp; + ARG 0 time + METHOD a of (Lcom/mojang/datafixers/Dynamic;)Lfp; + ARG 0 dynamic + METHOD equals (Ljava/lang/Object;)Z + ARG 1 obj diff --git a/mappings/net/minecraft/village/VillageGossipType.mapping b/mappings/net/minecraft/village/VillageGossipType.mapping index e9310a702e..a763d42337 100644 --- a/mappings/net/minecraft/village/VillageGossipType.mapping +++ b/mappings/net/minecraft/village/VillageGossipType.mapping @@ -1,13 +1,15 @@ CLASS apc net/minecraft/village/VillageGossipType FIELD f key Ljava/lang/String; FIELD g multiplier I - FIELD h maxReputation I - FIELD j value I + FIELD h maxValue I + FIELD i decay I + FIELD j shareDecrement I FIELD k BY_KEY Ljava/util/Map; METHOD (Ljava/lang/String;ILjava/lang/String;IIII)V ARG 3 key ARG 4 multiplier ARG 5 maxReputation - ARG 7 value + ARG 6 decay + ARG 7 shareDecrement METHOD a byKey (Ljava/lang/String;)Lapc; ARG 0 key diff --git a/mappings/net/minecraft/village/VillagerGossips.mapping b/mappings/net/minecraft/village/VillagerGossips.mapping index 31c7f7dc02..18eee651e4 100644 --- a/mappings/net/minecraft/village/VillagerGossips.mapping +++ b/mappings/net/minecraft/village/VillagerGossips.mapping @@ -1,9 +1,16 @@ CLASS apb net/minecraft/village/VillagerGossips CLASS a Reputation FIELD a associatedGossip Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD a decay ()V + METHOD a clamp (Lapc;)V + ARG 1 gossipType METHOD a entriesFor (Ljava/util/UUID;)Ljava/util/stream/Stream; ARG 1 target - METHOD a getValue (Ljava/util/function/Predicate;)I + METHOD a getValueFor (Ljava/util/function/Predicate;)I + ARG 1 gossipTypeFilter + METHOD b isObsolete ()Z + METHOD b remove (Lapc;)V + ARG 1 gossipType CLASS b GossipEntry FIELD a target Ljava/util/UUID; FIELD b type Lapc; @@ -40,4 +47,6 @@ CLASS apb net/minecraft/village/VillagerGossips ARG 3 value METHOD a getReputationFor (Ljava/util/UUID;Ljava/util/function/Predicate;)I ARG 1 target + ARG 2 gossipTypeFilter + METHOD b decay ()V METHOD c entries ()Ljava/util/stream/Stream;