From 38d541efad459762edf8510c83004e40c8080ea3 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 1 Feb 2021 04:06:22 +1100 Subject: [PATCH] predicate stuff (#1997) --- .../minecraft/predicate/BlockPredicate.mapping | 4 ++++ .../minecraft/predicate/FluidPredicate.mapping | 2 ++ .../predicate/block/BlockStatePredicate.mapping | 2 ++ .../entity/DamageSourcePredicate.mapping | 1 + .../predicate/entity/EntityFlagsPredicate.mapping | 2 ++ .../predicate/entity/EntityPredicate.mapping | 12 ++++++++++++ .../predicate/entity/EntityPredicates.mapping | 15 +++++++++++++++ .../predicate/entity/LocationPredicate.mapping | 4 ++++ .../predicate/item/EnchantmentPredicate.mapping | 1 + .../predicate/item/ItemPredicate.mapping | 2 ++ 10 files changed, 45 insertions(+) diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index 355b0ac705..eb92f126a1 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate METHOD method_22454 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos + METHOD method_33185 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException; + ARG 0 id CLASS class_4710 Builder FIELD field_21572 block Lnet/minecraft/class_2248; FIELD field_21573 tag Lnet/minecraft/class_3494; @@ -26,3 +28,5 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate ARG 1 block METHOD method_27963 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4550$class_4710; ARG 1 state + METHOD method_29233 tag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_4550$class_4710; + ARG 1 tag diff --git a/mappings/net/minecraft/predicate/FluidPredicate.mapping b/mappings/net/minecraft/predicate/FluidPredicate.mapping index 510ac93c47..e49e629e8a 100644 --- a/mappings/net/minecraft/predicate/FluidPredicate.mapping +++ b/mappings/net/minecraft/predicate/FluidPredicate.mapping @@ -13,3 +13,5 @@ CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate METHOD method_22475 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos + METHOD method_33259 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException; + ARG 0 id diff --git a/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping b/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping index 0cde52f7e3..5b7cca775a 100644 --- a/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping +++ b/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_2715 net/minecraft/predicate/block/BlockStatePredicate ARG 2 property METHOD method_11762 with (Lnet/minecraft/class_2769;Ljava/util/function/Predicate;)Lnet/minecraft/class_2715; ARG 1 property + METHOD test (Ljava/lang/Object;)Z + ARG 1 state diff --git a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index 8ba7a4841c..c3e935ddc6 100644 --- a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -55,4 +55,5 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredic METHOD method_8853 lightning (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; ARG 1 lightning METHOD method_8854 directEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2022$class_2023; + ARG 1 entity METHOD method_8855 create ()Lnet/minecraft/class_2022$class_2023; diff --git a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping index 25afc2e9d6..c2562e09cc 100644 --- a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_2040 net/minecraft/predicate/entity/EntityFlagsPredica FIELD field_9586 isSneaking Ljava/lang/Boolean; FIELD field_9587 isOnFire Ljava/lang/Boolean; FIELD field_9588 isSprinting Ljava/lang/Boolean; + METHOD method_29935 isBaby (Ljava/lang/Boolean;)Lnet/minecraft/class_2040$class_2041; + ARG 1 isBaby METHOD method_8897 create ()Lnet/minecraft/class_2040$class_2041; METHOD method_8898 onFire (Ljava/lang/Boolean;)Lnet/minecraft/class_2040$class_2041; ARG 1 onFire diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 0926658f06..e1cfff7265 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -13,6 +13,18 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD field_9599 ANY Lnet/minecraft/class_2048; FIELD field_9600 nbt Lnet/minecraft/class_2105; FIELD field_9601 distance Lnet/minecraft/class_2025; + METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Ljava/lang/String;Lnet/minecraft/class_2960;)V + ARG 1 type + ARG 2 distance + ARG 3 location + ARG 4 effects + ARG 5 nbt + ARG 6 flags + ARG 7 equipment + ARG 8 player + ARG 9 fishingHook + ARG 10 team + ARG 11 catType METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;Lnet/minecraft/class_2960;)V ARG 1 type ARG 2 distance diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index 92210df079..49a7e249d7 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -33,14 +33,29 @@ CLASS net/minecraft/class_1301 net/minecraft/predicate/entity/EntityPredicates COMMENT

A living entity is valid when the entity is alive. COMMENT COMMENT @see net.minecraft.entity.LivingEntity#isAlive() + METHOD method_24517 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_32878 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_5907 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_5908 (Lnet/minecraft/class_1297;)Z + ARG 0 entity METHOD method_5909 maxDistance (DDDD)Ljava/util/function/Predicate; ARG 0 x ARG 2 y ARG 4 z + ARG 6 max + METHOD method_5910 (Lnet/minecraft/class_1297;)Z + ARG 0 entity METHOD method_5911 canBePushedBy (Lnet/minecraft/class_1297;)Ljava/util/function/Predicate; ARG 0 entity + METHOD method_5912 (DDDDLnet/minecraft/class_1297;)Z + ARG 8 entity METHOD method_5913 rides (Lnet/minecraft/class_1297;)Ljava/util/function/Predicate; ARG 0 entity + METHOD method_5914 (Lnet/minecraft/class_1297;)Z + ARG 0 entity CLASS class_1302 Equipable FIELD field_6158 stack Lnet/minecraft/class_1799; METHOD (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 617170053d..beb72c8faf 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_20715 block Lnet/minecraft/class_4550; FIELD field_20716 fluid Lnet/minecraft/class_4551; FIELD field_24500 smokey Ljava/lang/Boolean; + FIELD field_24732 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_9681 z Lnet/minecraft/class_2096$class_2099; FIELD field_9682 x Lnet/minecraft/class_2096$class_2099; FIELD field_9683 biome Lnet/minecraft/class_5321; @@ -14,6 +15,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 1 x ARG 2 y ARG 3 z + ARG 4 biome ARG 5 feature ARG 6 dimension ARG 7 smokey @@ -38,6 +40,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2090; ARG 0 json METHOD method_9022 biome (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; + ARG 0 biome CLASS class_2091 Builder FIELD field_20717 light Lnet/minecraft/class_4552; FIELD field_20718 block Lnet/minecraft/class_4550; @@ -56,3 +59,4 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 1 smokey METHOD method_9023 build ()Lnet/minecraft/class_2090; METHOD method_9024 biome (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; + ARG 1 biome diff --git a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping index d6f1777c73..5220866aa8 100644 --- a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_2035 net/minecraft/predicate/item/EnchantmentPredicate METHOD method_8879 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2035; ARG 0 el METHOD method_8880 test (Ljava/util/Map;)Z + ARG 1 enchantments METHOD method_8881 serialize ()Lcom/google/gson/JsonElement; METHOD method_8882 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2035; ARG 0 el diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 914101a8c1..3d463cd785 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate ARG 6 storedEnchantments ARG 7 potion ARG 8 nbt + METHOD method_33267 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException; + ARG 0 id METHOD method_8969 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2073; ARG 0 el METHOD method_8970 test (Lnet/minecraft/class_1799;)Z