From 3c1b1d8013e628c63e746e13d8d43caf3a9450ab Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 11 Nov 2023 16:26:49 +0900 Subject: [PATCH] 23w45a advancements --- .../net/minecraft/advancement/Advancement.mapping | 14 ++++++++++++++ .../advancement/AdvancementCriterion.mapping | 4 ++++ .../advancement/AdvancementDisplay.mapping | 2 ++ .../advancement/AdvancementRewards.mapping | 4 ++++ .../criterion/BeeNestDestroyedCriterion.mapping | 9 ++------- .../criterion/BredAnimalsCriterion.mapping | 9 ++------- .../criterion/BrewedPotionCriterion.mapping | 5 ++--- .../criterion/ChangedDimensionCriterion.mapping | 7 ++----- .../criterion/ChanneledLightningCriterion.mapping | 5 ++--- .../criterion/ConstructBeaconCriterion.mapping | 5 ++--- .../criterion/ConsumeItemCriterion.mapping | 6 +++--- .../criterion/CriterionConditions.mapping | 2 ++ .../criterion/CuredZombieVillagerCriterion.mapping | 7 ++----- .../criterion/EffectsChangedCriterion.mapping | 7 ++----- .../criterion/EnchantedItemCriterion.mapping | 7 ++----- .../criterion/EnterBlockCriterion.mapping | 13 ++++++++----- .../criterion/EntityHurtPlayerCriterion.mapping | 5 ++--- .../criterion/FilledBucketCriterion.mapping | 5 ++--- .../criterion/FishingRodHookedCriterion.mapping | 9 ++------- .../criterion/InventoryChangedCriterion.mapping | 7 ++++--- .../advancement/criterion/ItemCriterion.mapping | 7 ++++--- .../ItemDurabilityChangedCriterion.mapping | 9 ++------- .../criterion/KilledByCrossbowCriterion.mapping | 7 ++----- .../criterion/LevitationCriterion.mapping | 7 ++----- .../criterion/LightningStrikeCriterion.mapping | 7 ++----- .../criterion/OnKilledCriterion.mapping | 5 ++--- .../PlayerGeneratesContainerLootCriterion.mapping | 5 ++--- .../criterion/PlayerHurtEntityCriterion.mapping | 11 +++++------ .../PlayerInteractedWithEntityCriterion.mapping | 7 ++----- .../criterion/RecipeCraftedCriterion.mapping | 7 ++----- .../criterion/RecipeUnlockedCriterion.mapping | 5 ++--- .../criterion/ShotCrossbowCriterion.mapping | 5 ++--- .../criterion/SlideDownBlockCriterion.mapping | 13 ++++++++----- .../criterion/StartedRidingCriterion.mapping | 3 ++- .../criterion/SummonedEntityCriterion.mapping | 5 ++--- .../criterion/TameAnimalCriterion.mapping | 5 ++--- .../criterion/TargetHitCriterion.mapping | 7 ++----- .../ThrownItemPickedUpByEntityCriterion.mapping | 7 ++----- .../advancement/criterion/TickCriterion.mapping | 3 ++- .../advancement/criterion/TravelCriterion.mapping | 7 ++----- .../criterion/UsedEnderEyeCriterion.mapping | 5 ++--- .../criterion/UsedTotemCriterion.mapping | 5 ++--- .../criterion/UsingItemCriterion.mapping | 5 ++--- .../criterion/VillagerTradeCriterion.mapping | 7 ++----- 44 files changed, 124 insertions(+), 162 deletions(-) diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 441d2dfbb3..822feb10d7 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -26,6 +26,16 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 0 buf METHOD method_54910 validate (Lnet/minecraft/class_161;)Lcom/mojang/serialization/DataResult; ARG 0 advancement + METHOD method_54911 (Lnet/minecraft/class_161;Lnet/minecraft/class_8782;)Lnet/minecraft/class_161; + ARG 1 validated + METHOD method_54912 validate (Lnet/minecraft/class_8942;Lnet/minecraft/class_8489;)V + ARG 1 errorReporter + ARG 2 conditionsLookup + METHOD method_54913 (Lnet/minecraft/class_8942;Lnet/minecraft/class_8489;Ljava/lang/String;Lnet/minecraft/class_175;)V + ARG 2 name + ARG 3 criterion + METHOD method_54914 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_54916 (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_170;Ljava/util/Map;Ljava/util/Optional;Ljava/lang/Boolean;)Lnet/minecraft/class_161; ARG 0 parent ARG 1 display @@ -33,6 +43,10 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 3 criteria ARG 4 requirements ARG 5 sendsTelemetryEvent + METHOD method_54917 (Lnet/minecraft/class_161;)Ljava/util/Optional; + ARG 0 advancement + METHOD method_54918 (Ljava/util/Map;)Lcom/mojang/serialization/DataResult; + ARG 0 criteria CLASS class_162 Builder FIELD field_1147 display Ljava/util/Optional; FIELD field_1148 criteria Lcom/google/common/collect/ImmutableMap$Builder; diff --git a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping index 73cda4954f..bc4beb558c 100644 --- a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping +++ b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping @@ -3,3 +3,7 @@ CLASS net/minecraft/class_175 net/minecraft/advancement/AdvancementCriterion FIELD field_47188 CODEC Lcom/mojang/serialization/Codec; FIELD field_47189 MAP_CODEC Lcom/mojang/serialization/MapCodec; METHOD comp_1924 conditions ()Lnet/minecraft/class_184; + METHOD method_54935 getCodec (Lnet/minecraft/class_179;)Lcom/mojang/serialization/Codec; + ARG 0 criterion + METHOD method_54936 (Lnet/minecraft/class_179;Lnet/minecraft/class_184;)Lnet/minecraft/class_175; + ARG 1 conditions diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping index 37bab32099..f53a7e4709 100644 --- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping +++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping @@ -19,6 +19,8 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay ARG 6 showToast ARG 7 announceToChat ARG 8 hidden + METHOD method_54939 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_808 shouldAnnounceToChat ()Z METHOD method_811 getTitle ()Lnet/minecraft/class_2561; METHOD method_812 getBackground ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/advancement/AdvancementRewards.mapping b/mappings/net/minecraft/advancement/AdvancementRewards.mapping index d8d7d23f1c..68513e1854 100644 --- a/mappings/net/minecraft/advancement/AdvancementRewards.mapping +++ b/mappings/net/minecraft/advancement/AdvancementRewards.mapping @@ -13,6 +13,10 @@ CLASS net/minecraft/class_170 net/minecraft/advancement/AdvancementRewards METHOD comp_2028 function ()Ljava/util/Optional; METHOD method_17978 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3222;Lnet/minecraft/class_2158;)V ARG 2 function + METHOD method_54930 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_54931 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2159;)Ljava/util/Optional; + ARG 1 function METHOD method_748 apply (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_171 Builder diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index ea53c1c1dd..1df557014d 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping @@ -7,18 +7,11 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro ARG 3 stack ARG 4 beeCount CLASS class_4709 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2030 block Ljava/util/Optional; - FIELD comp_2031 item Ljava/util/Optional; - FIELD comp_2032 beeCount Lnet/minecraft/class_2096$class_2100; FIELD field_47217 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 3 item ARG 4 beeCount - METHOD comp_2030 block ()Ljava/util/Optional; - METHOD comp_2031 item ()Ljava/util/Optional; - METHOD comp_2032 beeCount ()Lnet/minecraft/class_2096$class_2100; METHOD method_23878 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;I)Z ARG 1 state ARG 2 stack @@ -27,3 +20,5 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro ARG 0 block ARG 1 itemPredicateBuilder ARG 2 beeCountRange + METHOD method_54940 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index cbfb444edc..bfcc9afef6 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -7,19 +7,12 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri ARG 3 partner ARG 4 child CLASS class_198 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2033 parent Ljava/util/Optional; - FIELD comp_2034 partner Ljava/util/Optional; - FIELD comp_2035 child Ljava/util/Optional; FIELD field_47228 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 parentPredicate ARG 3 partnerPredicate ARG 4 childPredicate - METHOD comp_2033 parent ()Ljava/util/Optional; - METHOD comp_2034 partner ()Ljava/util/Optional; - METHOD comp_2035 child ()Ljava/util/Optional; METHOD method_29918 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 parent ARG 1 partner @@ -27,6 +20,8 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri METHOD method_53075 parentMatches (Ljava/util/Optional;Lnet/minecraft/class_47;)Z ARG 0 parent ARG 1 parentContext + METHOD method_54952 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_860 any ()Lnet/minecraft/class_175; METHOD method_861 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 child diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index 2025bd9916..944e1ebca5 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -5,12 +5,11 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionC ARG 1 player ARG 2 potion CLASS class_1998 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2036 potion Ljava/util/Optional; FIELD field_47229 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate - METHOD comp_2036 potion ()Ljava/util/Optional; + METHOD method_54953 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8790 matches (Lnet/minecraft/class_6880;)Z ARG 1 potion METHOD method_8791 any ()Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index 8d4155aade..f64bc43546 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -6,20 +6,17 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens ARG 2 from ARG 3 to CLASS class_2001 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2037 from Ljava/util/Optional; - FIELD comp_2038 to Ljava/util/Optional; FIELD field_47230 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate - METHOD comp_2037 from ()Ljava/util/Optional; - METHOD comp_2038 to ()Ljava/util/Optional; METHOD method_35068 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Lnet/minecraft/class_175; ARG 0 from ARG 1 to METHOD method_35069 from (Lnet/minecraft/class_5321;)Lnet/minecraft/class_175; ARG 0 from METHOD method_35070 create ()Lnet/minecraft/class_175; + METHOD method_54954 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8799 to (Lnet/minecraft/class_5321;)Lnet/minecraft/class_175; ARG 0 to METHOD method_8800 matches (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Z diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index 70a51ec05b..f4ccb758dc 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -7,13 +7,12 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLigh ARG 1 player ARG 2 victims CLASS class_2004 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2039 victims Ljava/util/List; FIELD field_47231 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/List;)V ARG 1 playerPredicate ARG 2 victims - METHOD comp_2039 victims ()Ljava/util/List; + METHOD method_54955 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8808 matches (Ljava/util/Collection;)Z ARG 1 victims METHOD method_8809 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index f02907e91c..9bf3880c1d 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -5,14 +5,13 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac ARG 1 player ARG 2 level CLASS class_2008 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2040 level Lnet/minecraft/class_2096$class_2100; FIELD field_47232 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 level - METHOD comp_2040 level ()Lnet/minecraft/class_2096$class_2100; METHOD method_35110 create ()Lnet/minecraft/class_175; + METHOD method_54956 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8817 matches (I)Z ARG 1 level METHOD method_8818 level (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index 11dcca5f8f..8ae82fdd93 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -5,14 +5,14 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCr ARG 1 player ARG 2 stack CLASS class_2012 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2041 item Ljava/util/Optional; FIELD field_47233 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item - METHOD comp_2041 item ()Ljava/util/Optional; METHOD method_35112 predicate (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; + ARG 0 predicate + METHOD method_54957 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8826 matches (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_8827 any ()Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping index 91172e22f7..888b32cbbe 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_184 net/minecraft/advancement/criterion/CriterionConditions + METHOD method_54938 validate (Lnet/minecraft/class_8944;)V + ARG 1 validator diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index 5fe3ab80c5..5428dc970c 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -6,16 +6,13 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVi ARG 2 zombie ARG 3 villager CLASS class_2016 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2042 zombie Ljava/util/Optional; - FIELD comp_2043 villager Ljava/util/Optional; FIELD field_47237 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 zombie ARG 3 villager - METHOD comp_2042 zombie ()Ljava/util/Optional; - METHOD comp_2043 villager ()Ljava/util/Optional; + METHOD method_54972 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8836 any ()Lnet/minecraft/class_175; METHOD method_8837 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_47;)Z ARG 1 zombie diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index 7250a3c385..45e06e3034 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -5,18 +5,15 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange ARG 1 player ARG 2 source CLASS class_2029 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2046 effects Ljava/util/Optional; - FIELD comp_2047 source Ljava/util/Optional; FIELD field_47240 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 effects ARG 3 source - METHOD comp_2046 effects ()Ljava/util/Optional; - METHOD comp_2047 source ()Ljava/util/Optional; METHOD method_37224 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 source + METHOD method_54977 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8868 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;)Z ARG 1 player ARG 2 context diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index 704a7d416f..80b2a7e532 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -6,16 +6,13 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem ARG 2 stack ARG 3 levels CLASS class_2032 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2048 item Ljava/util/Optional; - FIELD comp_2049 levels Lnet/minecraft/class_2096$class_2100; FIELD field_47241 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 item ARG 3 levels - METHOD comp_2048 item ()Ljava/util/Optional; - METHOD comp_2049 levels ()Lnet/minecraft/class_2096$class_2100; + METHOD method_54978 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8877 any ()Lnet/minecraft/class_175; METHOD method_8878 matches (Lnet/minecraft/class_1799;I)Z ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index d6f34d36c9..1976db56ee 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -5,17 +5,20 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCri ARG 1 player ARG 2 state CLASS class_2039 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2050 block Ljava/util/Optional; - FIELD comp_2051 state Ljava/util/Optional; FIELD field_47242 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 3 state - METHOD comp_2050 block ()Ljava/util/Optional; - METHOD comp_2051 state ()Ljava/util/Optional; METHOD method_54979 validate (Lnet/minecraft/class_2037$class_2039;)Lcom/mojang/serialization/DataResult; ARG 0 conditions + METHOD method_54980 (Lnet/minecraft/class_2037$class_2039;Lnet/minecraft/class_6880;)Ljava/util/Optional; + ARG 1 block + METHOD method_54981 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_54982 (Lnet/minecraft/class_6880;Lnet/minecraft/class_4559;)Ljava/util/Optional; + ARG 1 state + METHOD method_54983 (Lnet/minecraft/class_6880;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 1 property METHOD method_8890 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; ARG 0 block METHOD method_8891 matches (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index 4efa6d3072..4cf5396513 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -8,16 +8,15 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla METHOD method_22468 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZLnet/minecraft/class_2044$class_2046;)Z ARG 5 conditions CLASS class_2046 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2052 damage Ljava/util/Optional; FIELD field_47249 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 damage - METHOD comp_2052 damage ()Ljava/util/Optional; METHOD method_35209 create (Lnet/minecraft/class_2019;)Lnet/minecraft/class_175; ARG 0 predicate METHOD method_35210 create ()Lnet/minecraft/class_175; + METHOD method_54988 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8907 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z ARG 1 player ARG 2 damageSource diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index 2814c6ce6b..520b38c86a 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -5,13 +5,12 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketC ARG 1 player ARG 2 stack CLASS class_2056 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2053 item Ljava/util/Optional; FIELD field_47251 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item - METHOD comp_2053 item ()Ljava/util/Optional; + METHOD method_54991 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8937 create (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 item METHOD method_8938 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index f0871d1b88..0d079c410a 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -7,23 +7,18 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo ARG 3 bobber ARG 4 fishingLoots CLASS class_2060 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2054 rod Ljava/util/Optional; - FIELD comp_2055 hookedEntity Ljava/util/Optional; - FIELD comp_2056 caughtItem Ljava/util/Optional; FIELD field_47259 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 rod ARG 3 hookedEntity ARG 4 caughtItem - METHOD comp_2054 rod ()Ljava/util/Optional; - METHOD comp_2055 hookedEntity ()Ljava/util/Optional; - METHOD comp_2056 caughtItem ()Ljava/util/Optional; METHOD method_27810 matches (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Ljava/util/Collection;)Z ARG 1 rodStack ARG 2 hookedEntity ARG 3 fishingLoots + METHOD method_54992 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8947 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 rod ARG 1 hookedEntity diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index 275981eb03..5f7d2e949d 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -13,16 +13,15 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan ARG 2 inventory ARG 3 stack CLASS class_2068 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2058 items Ljava/util/List; FIELD field_47263 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2066$class_2068$class_8948;Ljava/util/List;)V ARG 1 playerPredicate - METHOD comp_2058 items ()Ljava/util/List; METHOD method_24363 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2073;)Z ARG 1 item METHOD method_53160 items ([Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 items + METHOD method_54997 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8957 items ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_175; ARG 0 items METHOD method_8958 matches (Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;III)Z @@ -40,3 +39,5 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan ARG 1 full ARG 2 empty ARG 3 occupied + METHOD method_54999 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping index 81642cb6ad..9d02107b38 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping @@ -6,13 +6,10 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion ARG 2 pos ARG 3 stack CLASS class_4712 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2065 location Ljava/util/Optional; FIELD field_47267 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 location - METHOD comp_2065 location ()Ljava/util/Optional; METHOD method_27981 createItemUsedOnBlock (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 location ARG 1 item @@ -28,3 +25,7 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion ARG 1 location METHOD method_51712 createPlacedBlock ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_175; ARG 0 locationConditions + METHOD method_55003 (Lnet/minecraft/class_8944;Lnet/minecraft/class_5258;)V + ARG 1 location + METHOD method_55004 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 045503bef5..6a83992308 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -6,22 +6,17 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit ARG 2 stack ARG 3 durability CLASS class_2071 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2062 item Ljava/util/Optional; - FIELD comp_2063 durability Lnet/minecraft/class_2096$class_2100; - FIELD comp_2064 delta Lnet/minecraft/class_2096$class_2100; FIELD field_47266 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 item ARG 3 durability ARG 4 delta - METHOD comp_2062 item ()Ljava/util/Optional; - METHOD comp_2063 durability ()Lnet/minecraft/class_2096$class_2100; - METHOD comp_2064 delta ()Lnet/minecraft/class_2096$class_2100; METHOD method_35229 create (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; ARG 0 item ARG 1 durability + METHOD method_55000 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8967 create (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; ARG 0 playerPredicate ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index 8b65bcff2a..b713df4c3b 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -5,16 +5,13 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross ARG 1 player ARG 2 piercingKilledEntities CLASS class_2078 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2066 victims Ljava/util/List; - FIELD comp_2067 uniqueEntityTypes Lnet/minecraft/class_2096$class_2100; FIELD field_47268 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/List;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 victims ARG 3 uniqueEntityTypes - METHOD comp_2066 victims ()Ljava/util/List; - METHOD comp_2067 uniqueEntityTypes ()Lnet/minecraft/class_2096$class_2100; + METHOD method_55005 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8986 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 victimPredicates METHOD method_8987 create (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index eefb3329e9..742967d4cd 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -6,16 +6,13 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri ARG 2 startPos ARG 3 duration CLASS class_2087 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2070 distance Ljava/util/Optional; - FIELD comp_2071 duration Lnet/minecraft/class_2096$class_2100; FIELD field_47305 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 distance ARG 3 duration - METHOD comp_2070 distance ()Ljava/util/Optional; - METHOD comp_2071 duration ()Lnet/minecraft/class_2096$class_2100; + METHOD method_55051 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9013 create (Lnet/minecraft/class_2025;)Lnet/minecraft/class_175; ARG 0 distance METHOD method_9014 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)Z diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping index 5b8985e727..d46648f1fa 100644 --- a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping @@ -8,19 +8,16 @@ CLASS net/minecraft/class_6405 net/minecraft/advancement/criterion/LightningStri METHOD method_37242 (Lnet/minecraft/class_47;Ljava/util/List;Lnet/minecraft/class_6405$class_6406;)Z ARG 2 conditions CLASS class_6406 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2072 lightning Ljava/util/Optional; - FIELD comp_2073 bystander Ljava/util/Optional; FIELD field_47306 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 lightning ARG 3 bystander - METHOD comp_2072 lightning ()Ljava/util/Optional; - METHOD comp_2073 bystander ()Ljava/util/Optional; METHOD method_37243 create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 lightning ARG 1 bystander METHOD method_37244 test (Lnet/minecraft/class_47;Ljava/util/List;)Z ARG 1 lightning ARG 2 bystanders + METHOD method_55058 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index a39419a778..f3d9ed811c 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -6,16 +6,13 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite ARG 2 entity ARG 3 killingDamage CLASS class_2083 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; FIELD comp_2068 entity Ljava/util/Optional; - FIELD comp_2069 killingBlow Ljava/util/Optional; FIELD field_47304 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 entity ARG 3 killingBlow METHOD comp_2068 entity ()Ljava/util/Optional; - METHOD comp_2069 killingBlow ()Ljava/util/Optional; METHOD method_35247 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 killedEntityPredicateBuilder ARG 1 killingBlow @@ -44,6 +41,8 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite ARG 0 entity ARG 1 killingBlow METHOD method_42671 createKillMobNearSculkCatalyst ()Lnet/minecraft/class_175; + METHOD method_55050 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8997 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 killedEntityPredicateBuilder METHOD method_8998 createEntityKilledPlayer ()Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping index 95d0c44335..c91dc6900f 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping @@ -5,14 +5,13 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGenerat ARG 1 player ARG 2 id CLASS class_5283 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2074 lootTable Lnet/minecraft/class_2960; FIELD field_47307 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V ARG 1 playerPredicate ARG 2 lootTable - METHOD comp_2074 lootTable ()Lnet/minecraft/class_2960; METHOD method_27995 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_175; ARG 0 lootTable METHOD method_27996 test (Lnet/minecraft/class_2960;)Z ARG 1 lootTable + METHOD method_55060 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index 574809bf29..6220eac830 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -9,24 +9,23 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt ARG 5 taken ARG 6 blocked CLASS class_2117 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2077 damage Ljava/util/Optional; - FIELD comp_2078 entity Ljava/util/Optional; FIELD field_47317 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 damage ARG 3 entity - METHOD comp_2077 damage ()Ljava/util/Optional; - METHOD comp_2078 entity ()Ljava/util/Optional; METHOD method_35294 create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 damage ARG 1 entity - METHOD method_35295 create (Ljava/util/Optional;)Lnet/minecraft/class_175; + METHOD method_35295 createEntity (Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 entity + METHOD method_35296 createDamage (Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 damage METHOD method_35297 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_175; ARG 0 damage METHOD method_35298 create ()Lnet/minecraft/class_175; + METHOD method_55069 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9103 create (Lnet/minecraft/class_2019$class_2020;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 damage ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping index d6acc63e34..81fe6568e5 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping @@ -6,16 +6,11 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac ARG 2 stack ARG 3 entity CLASS class_5410 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2079 item Ljava/util/Optional; - FIELD comp_2080 entity Ljava/util/Optional; FIELD field_47318 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item ARG 3 entity - METHOD comp_2079 item ()Ljava/util/Optional; - METHOD comp_2080 entity ()Ljava/util/Optional; METHOD method_30099 create (Ljava/util/Optional;Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 playerPredicate ARG 1 item @@ -26,3 +21,5 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 item ARG 1 entity + METHOD method_55070 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping index a23fdc637f..6155ef6f44 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping @@ -6,16 +6,11 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted ARG 2 recipeId ARG 3 ingredients CLASS class_8509 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2087 recipeId Lnet/minecraft/class_2960; - FIELD comp_2088 ingredients Ljava/util/List; FIELD field_47327 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 1 playerPredicate ARG 2 recipeId ARG 3 ingredients - METHOD comp_2087 recipeId ()Lnet/minecraft/class_2960; - METHOD comp_2088 ingredients ()Ljava/util/List; METHOD method_51352 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_175; ARG 0 recipeId METHOD method_51353 create (Lnet/minecraft/class_2960;Ljava/util/List;)Lnet/minecraft/class_175; @@ -24,3 +19,5 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted METHOD method_51354 matches (Lnet/minecraft/class_2960;Ljava/util/List;)Z ARG 1 recipeId ARG 2 ingredients + METHOD method_55106 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index 14250d41f7..9628180845 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -7,12 +7,11 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlocke ARG 1 player ARG 2 recipe CLASS class_2121 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2089 recipe Lnet/minecraft/class_2960; FIELD field_47333 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V ARG 1 playerPredicate ARG 2 recipe - METHOD comp_2089 recipe ()Lnet/minecraft/class_2960; + METHOD method_55118 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9112 matches (Lnet/minecraft/class_8786;)Z ARG 1 recipe diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index c89eb2c758..3a32b6b408 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -5,15 +5,14 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowC ARG 1 player ARG 2 stack CLASS class_2125 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2090 item Ljava/util/Optional; FIELD field_47334 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item - METHOD comp_2090 item ()Ljava/util/Optional; METHOD method_35323 create (Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 item + METHOD method_55123 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9120 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 item METHOD method_9121 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping index d5b61105a9..3f93a5d578 100644 --- a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping @@ -5,18 +5,21 @@ CLASS net/minecraft/class_4713 net/minecraft/advancement/criterion/SlideDownBloc ARG 1 player ARG 2 state CLASS class_4714 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2091 block Ljava/util/Optional; - FIELD comp_2092 state Ljava/util/Optional; FIELD field_47335 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 3 state - METHOD comp_2091 block ()Ljava/util/Optional; - METHOD comp_2092 state ()Ljava/util/Optional; METHOD method_23912 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; ARG 0 block METHOD method_23913 test (Lnet/minecraft/class_2680;)Z ARG 1 state + METHOD method_55125 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_55126 validate (Lnet/minecraft/class_4713$class_4714;)Lcom/mojang/serialization/DataResult; ARG 0 conditions + METHOD method_55127 (Lnet/minecraft/class_4713$class_4714;Lnet/minecraft/class_6880;)Ljava/util/Optional; + ARG 1 block + METHOD method_55128 (Lnet/minecraft/class_6880;Lnet/minecraft/class_4559;)Ljava/util/Optional; + ARG 1 state + METHOD method_55129 (Lnet/minecraft/class_6880;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 1 property diff --git a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping index a8a0cbcaad..5af4c8f2af 100644 --- a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping @@ -4,7 +4,8 @@ CLASS net/minecraft/class_6407 net/minecraft/advancement/criterion/StartedRiding METHOD method_37259 (Lnet/minecraft/class_6407$class_6408;)Z ARG 0 conditions CLASS class_6408 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; FIELD field_47337 CODEC Lcom/mojang/serialization/Codec; METHOD method_37260 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 player + METHOD method_55134 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index 958ae25023..f796b9f10b 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -5,13 +5,12 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntit ARG 1 player ARG 2 entity CLASS class_2130 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2093 entity Ljava/util/Optional; FIELD field_47338 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 entity - METHOD comp_2093 entity ()Ljava/util/Optional; + METHOD method_55135 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9129 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 summonedEntityPredicateBuilder METHOD method_9130 matches (Lnet/minecraft/class_47;)Z diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 3cc970bb6a..2887761dc7 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -5,15 +5,14 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCri ARG 1 player ARG 2 entity CLASS class_2133 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2094 entity Ljava/util/Optional; FIELD field_47344 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 entity - METHOD comp_2094 entity ()Ljava/util/Optional; METHOD method_16114 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 entity + METHOD method_55136 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9138 any ()Lnet/minecraft/class_175; METHOD method_9139 matches (Lnet/minecraft/class_47;)Z ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index 5c1a5e0026..200acd039f 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -7,16 +7,11 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit METHOD method_24951 (Lnet/minecraft/class_47;Lnet/minecraft/class_243;ILnet/minecraft/class_4851$class_4852;)Z ARG 3 conditions CLASS class_4852 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2095 signalStrength Lnet/minecraft/class_2096$class_2100; - FIELD comp_2096 projectile Ljava/util/Optional; FIELD field_47345 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 signalStrength ARG 3 projectile - METHOD comp_2095 signalStrength ()Lnet/minecraft/class_2096$class_2100; - METHOD comp_2096 projectile ()Ljava/util/Optional; METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 signalStrength ARG 1 projectile @@ -24,3 +19,5 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit ARG 1 projectile ARG 2 hitPos ARG 3 signalStrength + METHOD method_55137 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping index f5c9f794fe..b82e3214f5 100644 --- a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -6,16 +6,11 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic METHOD method_27976 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Lnet/minecraft/class_5279$class_5280;)Z ARG 3 conditions CLASS class_5280 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2075 item Ljava/util/Optional; - FIELD comp_2076 entity Ljava/util/Optional; FIELD field_47316 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item ARG 3 entity - METHOD comp_2075 item ()Ljava/util/Optional; - METHOD comp_2076 entity ()Ljava/util/Optional; METHOD method_27978 createThrownItemPickedUpByEntity (Lnet/minecraft/class_5258;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 player ARG 1 item @@ -28,3 +23,5 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic ARG 0 playerPredicate ARG 1 item ARG 2 entity + METHOD method_55068 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index 496734672c..72acfeb50a 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion METHOD method_9141 trigger (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_2137 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; FIELD field_47326 CODEC Lcom/mojang/serialization/Codec; METHOD method_43135 createLocation (Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 entity @@ -19,3 +18,5 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion METHOD method_49195 createTick ()Lnet/minecraft/class_175; METHOD method_53788 createLocation (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 entity + METHOD method_55105 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping index 3243526743..aeee6eadcf 100644 --- a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping @@ -5,16 +5,11 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/TravelCriteri ARG 1 player ARG 2 startPos CLASS class_2110 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2044 startPos Ljava/util/Optional; - FIELD comp_2045 distance Ljava/util/Optional; FIELD field_47239 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 startPos ARG 3 distance - METHOD comp_2044 startPos ()Ljava/util/Optional; - METHOD comp_2045 distance ()Ljava/util/Optional; METHOD method_38850 rideEntityInLava (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2025;)Lnet/minecraft/class_175; ARG 0 entity ARG 1 distance @@ -22,6 +17,8 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/TravelCriteri ARG 0 entity ARG 1 distance ARG 2 startPos + METHOD method_54976 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9085 netherTravel (Lnet/minecraft/class_2025;)Lnet/minecraft/class_175; ARG 0 distance METHOD method_9086 matches (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index 6de130dbef..a74b4c1eab 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -5,12 +5,11 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeC ARG 1 player ARG 2 strongholdPos CLASS class_2145 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2099 distance Lnet/minecraft/class_2096$class_2099; FIELD field_47350 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2099;)V ARG 1 playerPredicate ARG 2 distance - METHOD comp_2099 distance ()Lnet/minecraft/class_2096$class_2099; + METHOD method_55142 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9162 matches (D)Z ARG 1 distance diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index 814e426f00..8ed6e58101 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -5,15 +5,14 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCrit ARG 1 player ARG 2 stack CLASS class_2150 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2100 item Ljava/util/Optional; FIELD field_47351 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item - METHOD comp_2100 item ()Ljava/util/Optional; METHOD method_35399 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_175; ARG 0 itemPredicate + METHOD method_55143 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9170 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 item METHOD method_9171 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping index 1428aca52f..10d2ce8a1c 100644 --- a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping @@ -5,15 +5,14 @@ CLASS net/minecraft/class_6409 net/minecraft/advancement/criterion/UsingItemCrit METHOD method_37263 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6409$class_6410;)Z ARG 1 conditions CLASS class_6410 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2101 item Ljava/util/Optional; FIELD field_47353 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item - METHOD comp_2101 item ()Ljava/util/Optional; METHOD method_37265 create (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 player ARG 1 item METHOD method_37266 test (Lnet/minecraft/class_1799;)Z ARG 1 stack + METHOD method_55144 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index b02f681fc5..39d28ffd66 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -6,18 +6,15 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTrade ARG 2 merchant ARG 3 stack CLASS class_2142 Conditions - FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; - FIELD comp_2097 villager Ljava/util/Optional; - FIELD comp_2098 item Ljava/util/Optional; FIELD field_47347 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 villager ARG 3 item - METHOD comp_2097 villager ()Ljava/util/Optional; - METHOD comp_2098 item ()Ljava/util/Optional; METHOD method_38914 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 playerPredicate + METHOD method_55138 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9153 any ()Lnet/minecraft/class_175; METHOD method_9154 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_1799;)Z ARG 1 villager