From 084eb4be250b972b2d0f425814eaefbb86456b2c Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 11 Nov 2023 20:15:04 +0900 Subject: [PATCH] 23w45a predicates (#3724) --- .../predicate/BlockPredicate.mapping | 10 ++--- .../predicate/DamagePredicate.mapping | 8 +--- .../predicate/FluidPredicate.mapping | 6 +-- .../predicate/LightPredicate.mapping | 2 + .../minecraft/predicate/NumberRange.mapping | 38 ++++++++++++++++++- .../predicate/StatePredicate.mapping | 6 +++ .../minecraft/predicate/TagPredicate.mapping | 6 +-- .../entity/DamageSourcePredicate.mapping | 8 +--- .../entity/DistancePredicate.mapping | 12 +----- .../entity/EntityEquipmentPredicate.mapping | 20 ++++------ .../entity/EntityFlagsPredicate.mapping | 10 +---- .../predicate/entity/EntityPredicate.mapping | 18 --------- .../entity/EntityTypePredicate.mapping | 8 ++++ .../entity/FishingHookPredicate.mapping | 4 +- .../entity/LightningBoltPredicate.mapping | 6 +-- .../entity/LocationPredicate.mapping | 16 +------- .../entity/LootContextPredicate.mapping | 2 + .../LootContextPredicateValidator.mapping | 25 ++++++++++++ .../predicate/entity/PlayerPredicate.mapping | 8 ---- .../predicate/entity/SlimePredicate.mapping | 4 +- .../entity/TypeSpecificPredicate.mapping | 2 + .../entity/VariantPredicates.mapping | 4 ++ .../item/EnchantmentPredicate.mapping | 4 +- .../predicate/item/ItemPredicate.mapping | 20 ++-------- 24 files changed, 124 insertions(+), 123 deletions(-) create mode 100644 mappings/net/minecraft/predicate/entity/LootContextPredicateValidator.mapping diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index d27a7963a4..25f8108841 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -1,17 +1,15 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate - FIELD comp_1731 tag Ljava/util/Optional; - FIELD comp_1732 blocks Ljava/util/Optional; FIELD comp_1733 state Ljava/util/Optional; - FIELD comp_1734 nbt Ljava/util/Optional; FIELD field_45723 CODEC Lcom/mojang/serialization/Codec; FIELD field_45724 BLOCK_ENTRY_LIST_CODEC Lcom/mojang/serialization/Codec; - METHOD comp_1731 tag ()Ljava/util/Optional; - METHOD comp_1732 blocks ()Ljava/util/Optional; METHOD comp_1733 state ()Ljava/util/Optional; - METHOD comp_1734 nbt ()Ljava/util/Optional; METHOD method_22454 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos + METHOD method_53071 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53072 (Lnet/minecraft/class_6885;)Ljava/util/List; + ARG 0 blocks CLASS class_4710 Builder FIELD field_21572 blocks Ljava/util/Optional; FIELD field_21573 tag Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/DamagePredicate.mapping b/mappings/net/minecraft/predicate/DamagePredicate.mapping index ff4dcbbc6d..bc7f038b3e 100644 --- a/mappings/net/minecraft/predicate/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/DamagePredicate.mapping @@ -1,18 +1,14 @@ CLASS net/minecraft/class_2019 net/minecraft/predicate/DamagePredicate FIELD comp_1735 dealt Lnet/minecraft/class_2096$class_2099; FIELD comp_1736 taken Lnet/minecraft/class_2096$class_2099; - FIELD comp_1737 sourceEntity Ljava/util/Optional; - FIELD comp_1738 blocked Ljava/util/Optional; - FIELD comp_1739 source Ljava/util/Optional; FIELD field_47238 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 dealt ARG 2 taken METHOD comp_1735 dealt ()Lnet/minecraft/class_2096$class_2099; METHOD comp_1736 taken ()Lnet/minecraft/class_2096$class_2099; - METHOD comp_1737 sourceEntity ()Ljava/util/Optional; - METHOD comp_1738 blocked ()Ljava/util/Optional; - METHOD comp_1739 source ()Ljava/util/Optional; + METHOD method_54973 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8838 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z ARG 1 player ARG 2 source diff --git a/mappings/net/minecraft/predicate/FluidPredicate.mapping b/mappings/net/minecraft/predicate/FluidPredicate.mapping index f08362ca98..97a2f3dc93 100644 --- a/mappings/net/minecraft/predicate/FluidPredicate.mapping +++ b/mappings/net/minecraft/predicate/FluidPredicate.mapping @@ -1,14 +1,12 @@ CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate - FIELD comp_1780 tag Ljava/util/Optional; - FIELD comp_1781 fluid Ljava/util/Optional; FIELD comp_1782 state Ljava/util/Optional; FIELD field_45753 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_1780 tag ()Ljava/util/Optional; - METHOD comp_1781 fluid ()Ljava/util/Optional; METHOD comp_1782 state ()Ljava/util/Optional; METHOD method_22475 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos + METHOD method_53156 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_6079 Builder FIELD field_30912 fluid Ljava/util/Optional; FIELD field_30913 tag Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/LightPredicate.mapping b/mappings/net/minecraft/predicate/LightPredicate.mapping index 1f80f700a1..99aa64dc25 100644 --- a/mappings/net/minecraft/predicate/LightPredicate.mapping +++ b/mappings/net/minecraft/predicate/LightPredicate.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_4552 net/minecraft/predicate/LightPredicate METHOD method_22483 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos + METHOD method_53172 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_6087 Builder FIELD field_31078 light Lnet/minecraft/class_2096$class_2100; METHOD method_35271 create ()Lnet/minecraft/class_4552$class_6087; diff --git a/mappings/net/minecraft/predicate/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping index 521608877a..d43643af4d 100644 --- a/mappings/net/minecraft/predicate/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -1,6 +1,19 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange FIELD field_9700 EXCEPTION_EMPTY Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_9701 EXCEPTION_SWAPPED Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD method_53188 (Lnet/minecraft/class_2096$class_2097;Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2096; + ARG 1 either + METHOD method_53189 (Lnet/minecraft/class_2096$class_2097;Ljava/lang/Number;)Lnet/minecraft/class_2096; + ARG 1 value + METHOD method_53190 (Lnet/minecraft/class_2096;)Lcom/mojang/datafixers/util/Either; + ARG 0 range + METHOD method_53191 createCodec (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2096$class_2097;)Lcom/mojang/serialization/Codec; + ARG 0 valueCodec + ARG 1 rangeFactory + METHOD method_53192 (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2096$class_2097;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance + METHOD method_53193 (Lnet/minecraft/class_2096;)Lnet/minecraft/class_2096; + ARG 0 range METHOD method_53194 getConstantValue ()Ljava/util/Optional; METHOD method_9037 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/util/Optional; ARG 0 reader @@ -16,14 +29,22 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 3 exceptionTypeSupplier ARG 4 mapper CLASS class_2097 Factory + METHOD create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096; + ARG 1 min + ARG 2 max CLASS class_2098 CommandFactory METHOD create (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096; ARG 1 reader + ARG 2 min + ARG 3 max CLASS class_2099 DoubleRange FIELD comp_1807 squaredMin Ljava/util/Optional; FIELD comp_1808 squaredMax Ljava/util/Optional; FIELD field_45762 CODEC Lcom/mojang/serialization/Codec; FIELD field_9705 ANY Lnet/minecraft/class_2096$class_2099; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 min + ARG 2 max METHOD comp_1807 squaredMin ()Ljava/util/Optional; METHOD comp_1808 squaredMax ()Ljava/util/Optional; METHOD method_35284 exactly (D)Lnet/minecraft/class_2096$class_2099; @@ -33,11 +54,16 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 2 max METHOD method_35286 atMost (D)Lnet/minecraft/class_2096$class_2099; ARG 0 value + METHOD method_53195 (Ljava/lang/Double;)Ljava/lang/Double; + ARG 0 d METHOD method_9044 square (Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 value METHOD method_9045 testSqrt (D)Z ARG 1 value METHOD method_9046 create (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096$class_2099; ARG 0 reader + ARG 1 min + ARG 2 max METHOD method_9047 test (D)Z ARG 1 value METHOD method_9048 parse (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2099; @@ -54,6 +80,9 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange FIELD comp_1810 maxSquared Ljava/util/Optional; FIELD field_45763 CODEC Lcom/mojang/serialization/Codec; FIELD field_9708 ANY Lnet/minecraft/class_2096$class_2100; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 min + ARG 2 max METHOD comp_1809 minSquared ()Ljava/util/Optional; METHOD comp_1810 maxSquared ()Ljava/util/Optional; METHOD method_35287 between (II)Lnet/minecraft/class_2096$class_2100; @@ -63,18 +92,25 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 1 value METHOD method_35289 atMost (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value + METHOD method_53197 (Ljava/lang/Integer;)Ljava/lang/Long; + ARG 0 i + METHOD method_53198 (Ljava/lang/Integer;)Ljava/lang/Long; + ARG 0 i METHOD method_9053 atLeast (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value METHOD method_9054 test (I)Z ARG 1 value METHOD method_9055 parse (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader + ARG 1 min + ARG 2 max METHOD method_9057 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader ARG 1 converter METHOD method_9058 exactly (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value - METHOD method_9059 squared (Ljava/util/Optional;)Ljava/util/Optional; + METHOD method_9059 square (Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 value METHOD method_9060 parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader METHOD method_9061 (Ljava/lang/Integer;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index 5326c100f6..c13a0c87ca 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -14,6 +14,12 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate ARG 1 state METHOD method_53235 findMissing (Lnet/minecraft/class_2689;)Ljava/util/Optional; ARG 1 stateManager + METHOD method_53236 (Ljava/util/List;)Ljava/util/Map; + ARG 0 conditions + METHOD method_53237 (Ljava/util/Map$Entry;)Lnet/minecraft/class_4559$class_4562; + ARG 0 state + METHOD method_53238 (Ljava/util/Map;)Ljava/util/List; + ARG 0 states CLASS class_4560 Builder FIELD field_20738 conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_22523 create ()Lnet/minecraft/class_4559$class_4560; diff --git a/mappings/net/minecraft/predicate/TagPredicate.mapping b/mappings/net/minecraft/predicate/TagPredicate.mapping index 2ed658897b..d1ae0596bb 100644 --- a/mappings/net/minecraft/predicate/TagPredicate.mapping +++ b/mappings/net/minecraft/predicate/TagPredicate.mapping @@ -1,11 +1,7 @@ CLASS net/minecraft/class_8129 net/minecraft/predicate/TagPredicate - FIELD comp_1836 tag Lnet/minecraft/class_6862; - FIELD comp_1837 expected Z METHOD (Lnet/minecraft/class_6862;Z)V ARG 1 tag ARG 2 expected - METHOD comp_1836 tag ()Lnet/minecraft/class_6862; - METHOD comp_1837 expected ()Z METHOD method_48965 expected (Lnet/minecraft/class_6862;)Lnet/minecraft/class_8129; ARG 0 tag METHOD method_48967 test (Lnet/minecraft/class_6880;)Z @@ -14,3 +10,5 @@ CLASS net/minecraft/class_8129 net/minecraft/predicate/TagPredicate ARG 0 tag METHOD method_53245 createCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/Codec; ARG 0 registryRef + METHOD method_53246 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance diff --git a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index 95c8f241d4..8ef68df27a 100644 --- a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -1,13 +1,9 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredicate - FIELD comp_1740 tagPredicates Ljava/util/List; - FIELD comp_1741 directEntity Ljava/util/Optional; - FIELD comp_1742 sourceEntity Ljava/util/Optional; FIELD field_45727 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 tagPredicates - METHOD comp_1740 tagPredicates ()Ljava/util/List; - METHOD comp_1741 directEntity ()Ljava/util/Optional; - METHOD comp_1742 sourceEntity ()Ljava/util/Optional; + METHOD method_53116 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8845 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1282;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping index b601310e5e..7e130c55cf 100644 --- a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/class_2025 net/minecraft/predicate/entity/DistancePredicate - FIELD comp_1743 x Lnet/minecraft/class_2096$class_2099; - FIELD comp_1744 y Lnet/minecraft/class_2096$class_2099; - FIELD comp_1745 z Lnet/minecraft/class_2096$class_2099; - FIELD comp_1746 horizontal Lnet/minecraft/class_2096$class_2099; - FIELD comp_1747 absolute Lnet/minecraft/class_2096$class_2099; FIELD field_45728 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;)V ARG 1 x @@ -11,13 +6,10 @@ CLASS net/minecraft/class_2025 net/minecraft/predicate/entity/DistancePredicate ARG 3 z ARG 4 horizontal ARG 5 absolute - METHOD comp_1743 x ()Lnet/minecraft/class_2096$class_2099; - METHOD comp_1744 y ()Lnet/minecraft/class_2096$class_2099; - METHOD comp_1745 z ()Lnet/minecraft/class_2096$class_2099; - METHOD comp_1746 horizontal ()Lnet/minecraft/class_2096$class_2099; - METHOD comp_1747 absolute ()Lnet/minecraft/class_2096$class_2099; METHOD method_37223 absolute (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025; ARG 0 absolute + METHOD method_53118 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8856 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025; ARG 0 y METHOD method_8859 test (DDDDDD)Z diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping index f6ae2b6cef..3fee1f9dbb 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping @@ -1,20 +1,10 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPredicate - FIELD comp_1750 head Ljava/util/Optional; - FIELD comp_1751 chest Ljava/util/Optional; - FIELD comp_1752 legs Ljava/util/Optional; - FIELD comp_1753 feet Ljava/util/Optional; - FIELD comp_1754 mainhand Ljava/util/Optional; - FIELD comp_1755 offhand Ljava/util/Optional; FIELD field_19240 OMINOUS_BANNER_ON_HEAD Lnet/minecraft/class_3735; FIELD field_45744 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_1750 head ()Ljava/util/Optional; - METHOD comp_1751 chest ()Ljava/util/Optional; - METHOD comp_1752 legs ()Ljava/util/Optional; - METHOD comp_1753 feet ()Ljava/util/Optional; - METHOD comp_1754 mainhand ()Ljava/util/Optional; - METHOD comp_1755 offhand ()Ljava/util/Optional; METHOD method_16226 test (Lnet/minecraft/class_1297;)Z ARG 1 entity + METHOD method_53129 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_5278 Builder FIELD field_24482 head Ljava/util/Optional; FIELD field_24483 chest Ljava/util/Optional; @@ -24,9 +14,15 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPre FIELD field_24487 offhand Ljava/util/Optional; METHOD method_27965 create ()Lnet/minecraft/class_3735$class_5278; METHOD method_27966 head (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + ARG 1 item METHOD method_27967 build ()Lnet/minecraft/class_3735; METHOD method_27968 chest (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + ARG 1 item METHOD method_27969 legs (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + ARG 1 item METHOD method_27970 feet (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + ARG 1 item METHOD method_35195 mainhand (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + ARG 1 item METHOD method_35196 offhand (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + ARG 1 item diff --git a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping index 54db3db6ea..afa26f961f 100644 --- a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping @@ -1,15 +1,9 @@ CLASS net/minecraft/class_2040 net/minecraft/predicate/entity/EntityFlagsPredicate - FIELD comp_1756 isOnFire Ljava/util/Optional; FIELD comp_1757 isSneaking Ljava/util/Optional; - FIELD comp_1758 isSprinting Ljava/util/Optional; - FIELD comp_1759 isSwimming Ljava/util/Optional; - FIELD comp_1760 isBaby Ljava/util/Optional; FIELD field_45745 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_1756 isOnFire ()Ljava/util/Optional; METHOD comp_1757 isSneaking ()Ljava/util/Optional; - METHOD comp_1758 isSprinting ()Ljava/util/Optional; - METHOD comp_1759 isSwimming ()Ljava/util/Optional; - METHOD comp_1760 isBaby ()Ljava/util/Optional; + METHOD method_53131 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8892 test (Lnet/minecraft/class_1297;)Z ARG 1 entity CLASS class_2041 Builder diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 5464d645f0..2c64a5c235 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -1,32 +1,14 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD comp_1761 type Ljava/util/Optional; FIELD comp_1762 distance Ljava/util/Optional; - FIELD comp_1763 location Ljava/util/Optional; FIELD comp_1764 steppingOn Ljava/util/Optional; - FIELD comp_1765 effects Ljava/util/Optional; - FIELD comp_1766 nbt Ljava/util/Optional; - FIELD comp_1767 flags Ljava/util/Optional; - FIELD comp_1768 equipment Ljava/util/Optional; FIELD comp_1769 typeSpecific Ljava/util/Optional; - FIELD comp_1770 vehicle Ljava/util/Optional; - FIELD comp_1771 passenger Ljava/util/Optional; - FIELD comp_1772 targetedEntity Ljava/util/Optional; - FIELD comp_1773 team Ljava/util/Optional; FIELD field_45746 CODEC Lcom/mojang/serialization/Codec; FIELD field_47250 LOOT_CONTEXT_PREDICATE_CODEC Lcom/mojang/serialization/Codec; METHOD comp_1761 type ()Ljava/util/Optional; METHOD comp_1762 distance ()Ljava/util/Optional; - METHOD comp_1763 location ()Ljava/util/Optional; METHOD comp_1764 steppingOn ()Ljava/util/Optional; - METHOD comp_1765 effects ()Ljava/util/Optional; - METHOD comp_1766 nbt ()Ljava/util/Optional; - METHOD comp_1767 flags ()Ljava/util/Optional; - METHOD comp_1768 equipment ()Ljava/util/Optional; METHOD comp_1769 typeSpecific ()Ljava/util/Optional; - METHOD comp_1770 vehicle ()Ljava/util/Optional; - METHOD comp_1771 passenger ()Ljava/util/Optional; - METHOD comp_1772 targetedEntity ()Ljava/util/Optional; - METHOD comp_1773 team ()Ljava/util/Optional; METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; ARG 0 player ARG 1 target diff --git a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping index 7adae7e860..0a8e0c73b9 100644 --- a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping @@ -1,5 +1,13 @@ CLASS net/minecraft/class_2050 net/minecraft/predicate/entity/EntityTypePredicate FIELD field_45749 CODEC Lcom/mojang/serialization/Codec; + METHOD method_53143 (Lnet/minecraft/class_2050;)Lcom/mojang/serialization/DataResult; + ARG 0 predicate + METHOD method_53144 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2050; + ARG 0 either + METHOD method_53145 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2050; + ARG 0 type + METHOD method_53147 (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2050; + ARG 0 tag METHOD method_8925 matches (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_8926 create (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2050; diff --git a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping index 5c9af052a2..5648177a83 100644 --- a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4965 net/minecraft/predicate/entity/FishingHookPredicate - FIELD comp_1779 inOpenWater Ljava/util/Optional; FIELD field_23137 ALL Lnet/minecraft/class_4965; FIELD field_45750 CODEC Lcom/mojang/serialization/MapCodec; - METHOD comp_1779 inOpenWater ()Ljava/util/Optional; METHOD method_26095 of (Z)Lnet/minecraft/class_4965; ARG 0 inOpenWater + METHOD method_53150 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping b/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping index 79fafe7024..937dda784d 100644 --- a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_6404 net/minecraft/predicate/entity/LightningBoltPredicate - FIELD comp_1792 blocksSetOnFire Lnet/minecraft/class_2096$class_2100; - FIELD comp_1793 entityStruck Ljava/util/Optional; FIELD field_45759 CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)V ARG 1 blocksSetOnFire - METHOD comp_1792 blocksSetOnFire ()Lnet/minecraft/class_2096$class_2100; - METHOD comp_1793 entityStruck ()Ljava/util/Optional; METHOD method_37235 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 3 struckEntity METHOD method_37237 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_6404; ARG 0 blocksSetOnFire + METHOD method_53175 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 275d2838b9..330e34766e 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -1,19 +1,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate - FIELD comp_1795 biome Ljava/util/Optional; - FIELD comp_1796 structure Ljava/util/Optional; - FIELD comp_1797 dimension Ljava/util/Optional; - FIELD comp_1798 smokey Ljava/util/Optional; - FIELD comp_1799 light Ljava/util/Optional; - FIELD comp_1800 block Ljava/util/Optional; - FIELD comp_1801 fluid Ljava/util/Optional; FIELD field_45760 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_1795 biome ()Ljava/util/Optional; - METHOD comp_1796 structure ()Ljava/util/Optional; - METHOD comp_1797 dimension ()Ljava/util/Optional; - METHOD comp_1798 smokey ()Ljava/util/Optional; - METHOD comp_1799 light ()Ljava/util/Optional; - METHOD comp_1800 block ()Ljava/util/Optional; - METHOD comp_1801 fluid ()Ljava/util/Optional; + METHOD method_53178 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_53179 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Ljava/util/Optional; ARG 0 position ARG 1 biome diff --git a/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping b/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping index 11dfa33c81..52b472577d 100644 --- a/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping @@ -12,3 +12,5 @@ CLASS net/minecraft/class_5258 net/minecraft/predicate/entity/LootContextPredica ARG 0 conditions METHOD method_54958 (Lnet/minecraft/class_5258;)Ljava/util/List; ARG 0 lootContextPredicate + METHOD method_54959 validateConditions (Lnet/minecraft/class_58;)V + ARG 1 reporter diff --git a/mappings/net/minecraft/predicate/entity/LootContextPredicateValidator.mapping b/mappings/net/minecraft/predicate/entity/LootContextPredicateValidator.mapping new file mode 100644 index 0000000000..22ff49341a --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/LootContextPredicateValidator.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_8944 net/minecraft/predicate/entity/LootContextPredicateValidator + FIELD field_47235 errorReporter Lnet/minecraft/class_8942; + FIELD field_47236 conditionsLookup Lnet/minecraft/class_8489; + METHOD (Lnet/minecraft/class_8942;Lnet/minecraft/class_8489;)V + ARG 1 errorReporter + ARG 2 conditionsLookup + METHOD method_54961 validate (Lnet/minecraft/class_5258;Lnet/minecraft/class_176;Ljava/lang/String;)V + ARG 1 predicate + ARG 2 type + ARG 3 path + METHOD method_54962 validateEntityPredicate (Lnet/minecraft/class_5258;Ljava/lang/String;)V + ARG 1 predicate + ARG 2 path + METHOD method_54963 (Ljava/lang/String;Lnet/minecraft/class_5258;)V + ARG 2 p + METHOD method_54964 validate (Ljava/util/List;Lnet/minecraft/class_176;Ljava/lang/String;)V + ARG 1 predicates + ARG 2 type + ARG 3 path + METHOD method_54965 validateEntityPredicates (Ljava/util/List;Ljava/lang/String;)V + ARG 1 predicates + ARG 2 path + METHOD method_54966 validateEntityPredicate (Ljava/util/Optional;Ljava/lang/String;)V + ARG 1 predicate + ARG 2 path diff --git a/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping index c388a18a02..0c727d2184 100644 --- a/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerPredicate FIELD comp_1817 experienceLevel Lnet/minecraft/class_2096$class_2100; FIELD comp_1818 gameMode Ljava/util/Optional; - FIELD comp_1819 stats Ljava/util/List; - FIELD comp_1820 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; - FIELD comp_1821 advancements Ljava/util/Map; - FIELD comp_1822 lookingAt Ljava/util/Optional; FIELD field_33928 LOOKING_AT_DISTANCE I FIELD field_45770 CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;Ljava/util/List;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;Ljava/util/Optional;)V @@ -13,10 +9,6 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerPredicate ARG 5 advancements METHOD comp_1817 experienceLevel ()Lnet/minecraft/class_2096$class_2100; METHOD comp_1818 gameMode ()Ljava/util/Optional; - METHOD comp_1819 stats ()Ljava/util/List; - METHOD comp_1820 recipes ()Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; - METHOD comp_1821 advancements ()Ljava/util/Map; - METHOD comp_1822 lookingAt ()Ljava/util/Optional; METHOD method_22497 (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z ARG 1 entity METHOD method_37250 (Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping index e52735a57a..2e0a5b9e66 100644 --- a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_7383 net/minecraft/predicate/entity/SlimePredicate - FIELD comp_1829 size Lnet/minecraft/class_2096$class_2100; FIELD field_45776 CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/class_2096$class_2100;)V ARG 1 size - METHOD comp_1829 size ()Lnet/minecraft/class_2096$class_2100; METHOD method_43157 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_7383; ARG 0 size + METHOD method_53234 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping index 7762610150..4af3874325 100644 --- a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredic ARG 0 variant METHOD method_43096 frog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_7376; ARG 0 variant + METHOD method_53142 (Lnet/minecraft/class_7376$class_8745;)Lcom/mojang/serialization/Codec; + ARG 0 type CLASS class_7378 Deserializers FIELD field_38724 ANY Lnet/minecraft/class_7376$class_8745; FIELD field_38725 LIGHTNING Lnet/minecraft/class_7376$class_8745; diff --git a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping index 69a58afc2f..0a5270165b 100644 --- a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_7380 net/minecraft/predicate/entity/VariantPredicates ARG 1 codec ARG 2 variantGetter METHOD method_43114 getDeserializer ()Lnet/minecraft/class_7376$class_8745; + METHOD method_43115 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance METHOD method_43116 create (Lnet/minecraft/class_2378;Ljava/util/function/Function;)Lnet/minecraft/class_7380; ARG 0 registry ARG 1 variantGetter @@ -14,3 +16,5 @@ CLASS net/minecraft/class_7380 net/minecraft/predicate/entity/VariantPredicates ARG 0 codec ARG 1 variantGetter CLASS class_8746 Predicate + METHOD method_53148 (Ljava/lang/Object;)Z + ARG 1 variant diff --git a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping index 481f5790c5..1a78cabc84 100644 --- a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_2035 net/minecraft/predicate/item/EnchantmentPredicate - FIELD comp_1748 enchantment Ljava/util/Optional; FIELD comp_1749 levels Lnet/minecraft/class_2096$class_2100; FIELD field_45741 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_1887;Lnet/minecraft/class_2096$class_2100;)V ARG 1 enchantment ARG 2 levels - METHOD comp_1748 enchantment ()Ljava/util/Optional; METHOD comp_1749 levels ()Lnet/minecraft/class_2096$class_2100; + METHOD method_53126 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8880 test (Ljava/util/Map;)Z ARG 1 enchantments diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 8800ebc239..09b84e98b7 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -1,25 +1,13 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate - FIELD comp_1783 tag Ljava/util/Optional; - FIELD comp_1784 items Ljava/util/Optional; - FIELD comp_1785 count Lnet/minecraft/class_2096$class_2100; - FIELD comp_1786 durability Lnet/minecraft/class_2096$class_2100; - FIELD comp_1787 enchantments Ljava/util/List; - FIELD comp_1788 storedEnchantments Ljava/util/List; - FIELD comp_1789 potion Ljava/util/Optional; - FIELD comp_1790 nbt Ljava/util/Optional; FIELD field_45754 CODEC Lcom/mojang/serialization/Codec; FIELD field_45755 ITEM_ENTRY_LIST_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/util/List;Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)V ARG 3 count ARG 4 durability - METHOD comp_1783 tag ()Ljava/util/Optional; - METHOD comp_1784 items ()Ljava/util/Optional; - METHOD comp_1785 count ()Lnet/minecraft/class_2096$class_2100; - METHOD comp_1786 durability ()Lnet/minecraft/class_2096$class_2100; - METHOD comp_1787 enchantments ()Ljava/util/List; - METHOD comp_1788 storedEnchantments ()Ljava/util/List; - METHOD comp_1789 potion ()Ljava/util/Optional; - METHOD comp_1790 nbt ()Ljava/util/Optional; + METHOD method_53162 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53163 (Lnet/minecraft/class_6885;)Ljava/util/List; + ARG 0 items METHOD method_8970 test (Lnet/minecraft/class_1799;)Z ARG 1 stack CLASS class_2074 Builder