From dcf9a5b1a3aa8f46da4b591b1db658e0a01e6089 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 1 Feb 2021 04:06:03 +1100 Subject: [PATCH] village stuff (#1995) --- mappings/net/minecraft/village/Merchant.mapping | 3 +++ mappings/net/minecraft/village/MerchantInventory.mapping | 2 ++ mappings/net/minecraft/village/SimpleMerchant.mapping | 2 ++ mappings/net/minecraft/village/TradeOffer.mapping | 2 ++ mappings/net/minecraft/village/TradeOfferList.mapping | 2 ++ mappings/net/minecraft/village/VillagerGossips.mapping | 5 +++++ mappings/net/minecraft/village/raid/RaidManager.mapping | 3 +++ 7 files changed, 19 insertions(+) diff --git a/mappings/net/minecraft/village/Merchant.mapping b/mappings/net/minecraft/village/Merchant.mapping index 00b1da8f59..9ff218e5e8 100644 --- a/mappings/net/minecraft/village/Merchant.mapping +++ b/mappings/net/minecraft/village/Merchant.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1915 net/minecraft/village/Merchant METHOD method_17449 sendOffers (Lnet/minecraft/class_1657;Lnet/minecraft/class_2561;I)V + ARG 1 player + ARG 2 test + ARG 3 levelProgress METHOD method_18010 getYesSound ()Lnet/minecraft/class_3414; METHOD method_19269 getExperience ()I METHOD method_19270 isLeveledMerchant ()Z diff --git a/mappings/net/minecraft/village/MerchantInventory.mapping b/mappings/net/minecraft/village/MerchantInventory.mapping index 06f46c80f4..721aac188a 100644 --- a/mappings/net/minecraft/village/MerchantInventory.mapping +++ b/mappings/net/minecraft/village/MerchantInventory.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_1725 net/minecraft/village/MerchantInventory FIELD field_7843 tradeOffer Lnet/minecraft/class_1914; FIELD field_7844 merchant Lnet/minecraft/class_1915; FIELD field_7845 inventory Lnet/minecraft/class_2371; + METHOD (Lnet/minecraft/class_1915;)V + ARG 1 merchant METHOD method_19252 getMerchantRewardedExperience ()I METHOD method_7642 getTradeOffer ()Lnet/minecraft/class_1914; METHOD method_7643 setRecipeIndex (I)V diff --git a/mappings/net/minecraft/village/SimpleMerchant.mapping b/mappings/net/minecraft/village/SimpleMerchant.mapping index 16cecc3f8d..fd7db7d319 100644 --- a/mappings/net/minecraft/village/SimpleMerchant.mapping +++ b/mappings/net/minecraft/village/SimpleMerchant.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_1645 net/minecraft/village/SimpleMerchant FIELD field_18525 experience I FIELD field_7441 player Lnet/minecraft/class_1657; FIELD field_7442 recipeList Lnet/minecraft/class_1916; + METHOD (Lnet/minecraft/class_1657;)V + ARG 1 player diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 362122910f..76f896225a 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -45,6 +45,8 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 1 first ARG 2 second METHOD method_16953 depleteBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 firstBuyStack + ARG 2 secondBuyStack METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 given ARG 2 sample diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping index 013cad0665..02d2da3c75 100644 --- a/mappings/net/minecraft/village/TradeOfferList.mapping +++ b/mappings/net/minecraft/village/TradeOfferList.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList + METHOD (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_8265 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1916; ARG 0 byteBuf METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914; diff --git a/mappings/net/minecraft/village/VillagerGossips.mapping b/mappings/net/minecraft/village/VillagerGossips.mapping index c9523f640e..b8cdc70490 100644 --- a/mappings/net/minecraft/village/VillagerGossips.mapping +++ b/mappings/net/minecraft/village/VillagerGossips.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 1 right METHOD method_19061 shareGossipFrom (Lnet/minecraft/class_4136;Ljava/util/Random;I)V ARG 1 from + ARG 2 random ARG 3 count METHOD method_19063 mergeReputation (Lnet/minecraft/class_4139;II)I ARG 1 type @@ -41,6 +42,10 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips FIELD field_18421 target Ljava/util/UUID; FIELD field_18422 type Lnet/minecraft/class_4139; FIELD field_18423 value I + METHOD (Ljava/util/UUID;Lnet/minecraft/class_4139;I)V + ARG 1 target + ARG 2 type + ARG 3 value METHOD method_19083 getValue ()I METHOD method_19084 deserialize (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; METHOD method_19087 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index e6be0dcb08..a937735f6b 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager ARG 1 world ARG 2 pos METHOD method_16533 nameFor (Lnet/minecraft/class_2874;)Ljava/lang/String; + ARG 0 dimensionType METHOD method_16534 nextId ()I METHOD method_16539 tick ()V METHOD method_16540 startRaid (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3765; @@ -22,3 +23,5 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager ARG 1 pos ARG 2 searchDistance METHOD method_77 fromTag (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; + ARG 0 world + ARG 1 nbt