From 5a18d7959b58eca1189e56ae2d59520ef46ec73e Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 1 Mar 2024 15:03:05 +1100 Subject: [PATCH] a bit more --- mappings/net/minecraft/predicate/BlockPredicate.mapping | 2 ++ .../net/minecraft/predicate/ComponentPredicate.mapping | 4 ++++ mappings/net/minecraft/predicate/FluidPredicate.mapping | 1 + mappings/net/minecraft/predicate/NbtPredicate.mapping | 2 ++ mappings/net/minecraft/predicate/StatePredicate.mapping | 9 +++++++++ .../predicate/entity/EntityEffectPredicate.mapping | 2 ++ .../minecraft/predicate/entity/LocationPredicate.mapping | 6 ++++++ .../predicate/item/EnchantmentPredicate.mapping | 1 + .../net/minecraft/predicate/item/ItemPredicate.mapping | 9 +++++++++ mappings/net/minecraft/recipe/RepairItemRecipe.mapping | 2 ++ 10 files changed, 38 insertions(+) diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index 53f6394a04..9abff504b8 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate ARG 1 world ARG 2 pos METHOD method_57143 hasNbt ()Z + METHOD method_57144 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_57145 testBlockEntity (Lnet/minecraft/class_4538;Lnet/minecraft/class_2586;Lnet/minecraft/class_2105;)Z ARG 0 world ARG 1 blockEntity diff --git a/mappings/net/minecraft/predicate/ComponentPredicate.mapping b/mappings/net/minecraft/predicate/ComponentPredicate.mapping index fc9f8fd962..9922ec6b44 100644 --- a/mappings/net/minecraft/predicate/ComponentPredicate.mapping +++ b/mappings/net/minecraft/predicate/ComponentPredicate.mapping @@ -12,7 +12,11 @@ CLASS net/minecraft/class_9329 net/minecraft/predicate/ComponentPredicate ARG 1 holder METHOD method_57865 of (Lnet/minecraft/class_9323;)Lnet/minecraft/class_9329; ARG 0 components + METHOD method_57866 (Lnet/minecraft/class_9329;)Ljava/util/List; + ARG 0 predicate METHOD method_57867 isEmpty ()Z + METHOD method_57869 (Lnet/minecraft/class_9329;)Ljava/util/Map; + ARG 0 predicate METHOD method_57870 toChanges ()Lnet/minecraft/class_9326; METHOD test (Ljava/lang/Object;)Z ARG 1 components diff --git a/mappings/net/minecraft/predicate/FluidPredicate.mapping b/mappings/net/minecraft/predicate/FluidPredicate.mapping index 635f67afe3..0a5485042a 100644 --- a/mappings/net/minecraft/predicate/FluidPredicate.mapping +++ b/mappings/net/minecraft/predicate/FluidPredicate.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate FIELD field_30914 state Ljava/util/Optional; METHOD method_35221 create ()Lnet/minecraft/class_4551$class_6079; METHOD method_35222 tag (Lnet/minecraft/class_6885;)Lnet/minecraft/class_4551$class_6079; + ARG 1 tag METHOD method_35223 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4551$class_6079; ARG 1 state METHOD method_35224 fluid (Lnet/minecraft/class_3611;)Lnet/minecraft/class_4551$class_6079; diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index c3acd02bf5..baaf1e34b0 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -1,12 +1,14 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate FIELD comp_1816 nbt Lnet/minecraft/class_2487; FIELD field_45768 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49244 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD comp_1816 nbt ()Lnet/minecraft/class_2487; METHOD method_9072 test (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_9074 test (Lnet/minecraft/class_1799;)Z + ARG 1 stack METHOD method_9076 entityToNbt (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487; ARG 0 entity METHOD method_9077 test (Lnet/minecraft/class_2520;)Z diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index c13a0c87ca..2ff11403a1 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate FIELD comp_1830 conditions Ljava/util/List; FIELD field_45777 CODEC Lcom/mojang/serialization/Codec; FIELD field_45778 CONDITION_LIST_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49396 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/util/List;)V ARG 1 conditions METHOD comp_1830 conditions ()Ljava/util/List; @@ -39,11 +40,13 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate CLASS class_4561 ExactValueMatcher FIELD comp_1831 value Ljava/lang/String; FIELD field_45779 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49397 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;)V ARG 1 key METHOD comp_1831 value ()Ljava/lang/String; CLASS class_4562 Condition FIELD comp_1832 key Ljava/lang/String; + FIELD field_49398 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;Lnet/minecraft/class_4559$class_8750;)V ARG 1 key METHOD comp_1832 key ()Ljava/lang/String; @@ -56,12 +59,18 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate FIELD comp_1834 min Ljava/util/Optional; FIELD comp_1835 max Ljava/util/Optional; FIELD field_45780 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49399 PACKET_CODEC Lnet/minecraft/class_9139; METHOD comp_1834 min ()Ljava/util/Optional; METHOD comp_1835 max ()Ljava/util/Optional; + METHOD method_53239 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_8750 ValueMatcher FIELD field_45781 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49400 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_22532 test (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;)Z ARG 1 state ARG 2 property METHOD method_53243 (Lnet/minecraft/class_4559$class_8750;)Lcom/mojang/datafixers/util/Either; ARG 0 valueMatcher + METHOD method_57564 (Lnet/minecraft/class_4559$class_8750;)Lcom/mojang/datafixers/util/Either; + ARG 0 valueMatcher diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index 379336d05b..fc374ce3bc 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredic METHOD comp_1813 duration ()Lnet/minecraft/class_2096$class_2100; METHOD comp_1814 ambient ()Ljava/util/Optional; METHOD comp_1815 visible ()Ljava/util/Optional; + METHOD method_53204 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_9069 test (Lnet/minecraft/class_1293;)Z ARG 1 statusEffectInstance CLASS class_8748 Builder diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index f0d1a73729..1298b18953 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate METHOD method_35276 x (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 x METHOD method_35277 structure (Lnet/minecraft/class_6885;)Lnet/minecraft/class_2090$class_2091; + ARG 1 structure METHOD method_35278 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 y METHOD method_35279 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; @@ -37,13 +38,16 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate METHOD method_35280 z (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 z METHOD method_53180 createBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2090$class_2091; + ARG 0 biome METHOD method_53181 createY (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 0 y METHOD method_53182 createDimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; ARG 0 dimension METHOD method_53183 createStructure (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2090$class_2091; + ARG 0 structure METHOD method_9023 build ()Lnet/minecraft/class_2090; METHOD method_9024 biome (Lnet/minecraft/class_6885;)Lnet/minecraft/class_2090$class_2091; + ARG 1 biome CLASS class_8747 PositionRange FIELD field_45761 CODEC Lcom/mojang/serialization/Codec; METHOD method_53184 test (DDD)Z @@ -54,3 +58,5 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 0 x ARG 1 y ARG 2 z + METHOD method_53186 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping index 2c9395cbd8..6445344a67 100644 --- a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_2035 net/minecraft/predicate/item/EnchantmentPredicate METHOD method_53126 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_8880 test (Lnet/minecraft/class_9304;)Z + ARG 1 enchantmentsComponent diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index fc3fbc265d..d6b0b9e35c 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -1,15 +1,20 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate FIELD field_45754 CODEC Lcom/mojang/serialization/Codec; + METHOD method_57298 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_8970 test (Lnet/minecraft/class_1799;)Z ARG 1 stack CLASS class_2074 Builder FIELD field_20690 storedEnchantments Lcom/google/common/collect/ImmutableList$Builder; + FIELD field_49234 nbtPredicate Ljava/util/Optional; + FIELD field_49235 componentPredicate Lnet/minecraft/class_9329; FIELD field_9648 count Lnet/minecraft/class_2096$class_2100; FIELD field_9649 enchantments Lcom/google/common/collect/ImmutableList$Builder; FIELD field_9650 item Ljava/util/Optional; FIELD field_9651 potion Ljava/util/Optional; FIELD field_9653 durability Lnet/minecraft/class_2096$class_2100; METHOD method_35232 potion (Lnet/minecraft/class_6885;)Lnet/minecraft/class_2073$class_2074; + ARG 1 potion METHOD method_35233 count (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 count METHOD method_35234 storedEnchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; @@ -18,6 +23,10 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate ARG 1 durability METHOD method_53166 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_6880; ARG 0 item + METHOD method_57299 component (Lnet/minecraft/class_9329;)Lnet/minecraft/class_2073$class_2074; + ARG 1 componentPredicate + METHOD method_57300 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2073$class_2074; + ARG 1 nbt METHOD method_8973 create ()Lnet/minecraft/class_2073$class_2074; METHOD method_8975 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2073$class_2074; ARG 1 tag diff --git a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping index df39ca4214..49c975e29d 100644 --- a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping +++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_4317 net/minecraft/recipe/RepairItemRecipe METHOD method_24364 (Lnet/minecraft/class_9304;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304$class_9305;Lnet/minecraft/class_1887;)V ARG 3 enchantment + METHOD method_57528 (Lnet/minecraft/class_5455;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304$class_9305;)V + ARG 3 builder