diff --git a/mappings/net/minecraft/village/VillageDoor.mapping b/mappings/net/minecraft/village/VillageDoor.mapping index 63c7649454..c8cbcd002c 100644 --- a/mappings/net/minecraft/village/VillageDoor.mapping +++ b/mappings/net/minecraft/village/VillageDoor.mapping @@ -3,6 +3,7 @@ CLASS amd net/minecraft/village/VillageDoor FIELD b insidePosition Let; FIELD c facing Ley; FIELD d lastTimeSeenByVillager I + FIELD e invalid Z FIELD f entityInsideTicks I METHOD (Let;III)V ARG 1 position @@ -17,14 +18,18 @@ CLASS amd net/minecraft/village/VillageDoor ARG 0 insideDirectionX ARG 1 insideDirectionZ METHOD a squaredDistanceTo (Let;)I + METHOD a setInvalid (Z)V METHOD b entityInsideTick ()V METHOD b squaredDistance (III)I ARG 1 x ARG 2 y + METHOD b squaredDistanceFromInsideTo (Let;)I METHOD c getEntityInsideTicks ()I + METHOD c isInside (Let;)Z METHOD d getPosition ()Let; METHOD e getInsidePosition ()Let; METHOD f insideDirectionX ()I METHOD g insideDirectionY ()I METHOD h getLastTimeSeenByVillager ()I + METHOD i isInvalid ()Z METHOD j getFacing ()Ley; diff --git a/mappings/net/minecraft/village/VillageProperties.mapping b/mappings/net/minecraft/village/VillageProperties.mapping index e07269606e..510d3ea90c 100644 --- a/mappings/net/minecraft/village/VillageProperties.mapping +++ b/mappings/net/minecraft/village/VillageProperties.mapping @@ -22,7 +22,7 @@ CLASS ame net/minecraft/village/VillageProperties METHOD a isInRadius (Let;)Z METHOD a isInRaidDistance (Let;I)Z ARG 2 raidBonus - METHOD a deserialize (Lhr;)V + METHOD a fromTag (Lhr;)V METHOD a getRating (Ljava/lang/String;)I ARG 1 username METHOD a changeRating (Ljava/lang/String;I)I @@ -32,7 +32,7 @@ CLASS ame net/minecraft/village/VillageProperties METHOD b changeAllRatings (I)V METHOD b getNearestAttacker (Lahr;)Lahr; METHOD b getClosestDoor (Let;)Lamd; - METHOD b serialize (Lhr;)V + METHOD b toTag (Lhr;)V METHOD c getDoorCount ()I METHOD c setRaidId (I)V METHOD c getNearestUnpopularPlayer (Lahr;)Lars; @@ -42,6 +42,7 @@ CLASS ame net/minecraft/village/VillageProperties METHOD e getPopulationSize ()I METHOD e getDoorAtPosition (Let;)Lamd; METHOD f getDoors ()Ljava/util/List; + METHOD f spawnIronGolemAround (Let;)Lahi; METHOD g hasNoDoors ()Z METHOD g isValidDoor (Let;)Z METHOD h onVillagerDeath ()V @@ -51,4 +52,5 @@ CLASS ame net/minecraft/village/VillageProperties METHOD l countGolems ()V METHOD m countVillagers ()V METHOD n clearOutdatedAttackerInfo ()V + METHOD o removeInvalidDoors ()V METHOD p recalculateSize ()V diff --git a/mappings/net/minecraft/village/VillagerRecipe.mapping b/mappings/net/minecraft/village/VillagerRecipe.mapping index 06964ab858..6ad7c7ab5a 100644 --- a/mappings/net/minecraft/village/VillagerRecipe.mapping +++ b/mappings/net/minecraft/village/VillagerRecipe.mapping @@ -1,5 +1,5 @@ CLASS bby net/minecraft/village/VillagerRecipe - FIELD a buyItem Laxm; + FIELD a firstBuyItem Laxm; FIELD b secondBuyItem Laxm; FIELD c sellItem Laxm; FIELD d uses I @@ -7,18 +7,29 @@ CLASS bby net/minecraft/village/VillagerRecipe FIELD f rewardExp Z METHOD (Laxm;Laxm;)V ARG 1 buyItem + ARG 2 sellItem METHOD (Laxm;Laxm;Laxm;)V - ARG 1 buyItem + ARG 1 firstBuyItem ARG 2 secondBuyItem + ARG 3 sellItem METHOD (Laxm;Laxm;Laxm;II)V - ARG 1 buyItem + ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses - METHOD a getBuyItem ()Laxm; + ARG 5 maxUses + METHOD a getFirstBuyItem ()Laxm; METHOD a increasedMaxUses (I)V + METHOD a matchesBuyItems (Laxm;Laxm;)Z + ARG 1 first + ARG 2 second METHOD b getSecondBuyItem ()Laxm; - METHOD c getSellItem ()Laxm; + METHOD b depleteBuyItems (Laxm;Laxm;)Z + METHOD c getModifiableSellItem ()Laxm; + METHOD c acceptsBuy (Laxm;Laxm;)Z + ARG 1 given + ARG 2 sample + METHOD d getSellItem ()Laxm; METHOD e getUses ()I METHOD f getMaxUses ()I METHOD g use ()V diff --git a/mappings/net/minecraft/village/VillagerRecipeList.mapping b/mappings/net/minecraft/village/VillagerRecipeList.mapping index 6986c8602e..ba7a464d6d 100644 --- a/mappings/net/minecraft/village/VillagerRecipeList.mapping +++ b/mappings/net/minecraft/village/VillagerRecipeList.mapping @@ -1,8 +1,8 @@ CLASS bbz net/minecraft/village/VillagerRecipeList - METHOD a deserialize ()Lhr; + METHOD a toTag ()Lhr; METHOD a getValidRecipe (Laxm;Laxm;I)Lbby; ARG 1 firstBuyItem ARG 2 secondBuyItem - METHOD a writeToBuf (Lis;)V - METHOD b readFromBuf (Lis;)Lbbz; + METHOD a toPacket (Lis;)V + METHOD b fromPacket (Lis;)Lbbz; ARG 0 byteBuf diff --git a/mappings/net/minecraft/village/VillagerTrades.mapping b/mappings/net/minecraft/village/VillagerTrades.mapping index 89aa6b404a..33d9a6e3b7 100644 --- a/mappings/net/minecraft/village/VillagerTrades.mapping +++ b/mappings/net/minecraft/village/VillagerTrades.mapping @@ -24,5 +24,6 @@ CLASS ark net/minecraft/village/VillagerTrades FIELD a range Lark$g; FIELD b structure Ljava/lang/String; FIELD a PROFESSION_TO_LEVELED_TRADE Ljava/util/Map; + FIELD b WANDERING_TRADER_TRADES Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; METHOD a copyToFastUtilMap (Lcom/google/common/collect/ImmutableMap;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; diff --git a/mappings/net/minecraft/world/WorldVillageManager.mapping b/mappings/net/minecraft/world/WorldVillageManager.mapping index cfd34e91a4..428e5301e4 100644 --- a/mappings/net/minecraft/world/WorldVillageManager.mapping +++ b/mappings/net/minecraft/world/WorldVillageManager.mapping @@ -5,7 +5,9 @@ CLASS amg net/minecraft/world/WorldVillageManager FIELD d villages Ljava/util/List; FIELD e tick I METHOD a tick ()V - METHOD a getBaseTag (Lbtk;)Ljava/lang/String; + METHOD a isWoodenDoor (Lbqs;)Z + METHOD a considerDoor (Lbqs;Let;)V + METHOD a getPersistentDataKey (Lbtk;)Ljava/lang/String; ARG 0 provider METHOD a addRecentVillagerPosition (Let;)V METHOD a getNearestVillage (Let;I)Lame; @@ -15,6 +17,7 @@ CLASS amg net/minecraft/world/WorldVillageManager ARG 2 facing METHOD b getVillages ()Ljava/util/List; METHOD b updateDoorsSeenByVillager (Let;)V + METHOD c initRaids ()V METHOD c getRecentlySeenDoor (Let;)Lamd; METHOD d isRecentVillagerPosition (Let;)Z METHOD g validateVillageProperties ()V