From 957e132469b2bdb69a38b7cd0e9fd1b39ae9829a Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 21 Nov 2021 05:12:01 +1100 Subject: [PATCH] Mapping Bonanza Part 7: Predicate stuff (#2851) * Predicate stuff * Apply suggestions from code review --- mappings/net/minecraft/predicate/NumberRange.mapping | 10 ++++++++++ .../net/minecraft/predicate/StatePredicate.mapping | 4 ++++ .../predicate/block/BlockStatePredicate.mapping | 2 ++ .../minecraft/predicate/entity/EntityPredicate.mapping | 2 ++ .../predicate/entity/EntityPredicates.mapping | 2 ++ 5 files changed, 20 insertions(+) diff --git a/mappings/net/minecraft/predicate/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping index 7f74f91b13..776816eabb 100644 --- a/mappings/net/minecraft/predicate/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -42,14 +42,23 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange FIELD field_9703 squaredMin Ljava/lang/Double; FIELD field_9704 squaredMax Ljava/lang/Double; FIELD field_9705 ANY Lnet/minecraft/class_2096$class_2099; + METHOD (Ljava/lang/Double;Ljava/lang/Double;)V + ARG 1 min + ARG 2 max METHOD method_35284 exactly (D)Lnet/minecraft/class_2096$class_2099; + ARG 0 value METHOD method_35285 between (DD)Lnet/minecraft/class_2096$class_2099; + ARG 0 min + ARG 2 max METHOD method_35286 atMost (D)Lnet/minecraft/class_2096$class_2099; + ARG 0 value METHOD method_9044 square (Ljava/lang/Double;)Ljava/lang/Double; METHOD method_9045 testSqrt (D)Z ARG 1 value METHOD method_9046 create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Double;Ljava/lang/Double;)Lnet/minecraft/class_2096$class_2099; ARG 0 reader + ARG 1 min + ARG 2 max METHOD method_9047 test (D)Z METHOD method_9048 parse (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2099; ARG 0 reader @@ -57,6 +66,7 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange METHOD method_9049 parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2096$class_2099; ARG 0 reader METHOD method_9050 atLeast (D)Lnet/minecraft/class_2096$class_2099; + ARG 0 value METHOD method_9051 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2096$class_2099; ARG 0 element CLASS class_2100 IntRange diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index 15aceb173b..b44598205a 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -12,10 +12,14 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate METHOD method_22516 check (Lnet/minecraft/class_2689;Ljava/util/function/Consumer;)V ARG 1 factory ARG 2 reporter + METHOD method_22517 (Lnet/minecraft/class_2689;Ljava/util/function/Consumer;Lnet/minecraft/class_4559$class_4562;)V + ARG 2 condition METHOD method_22518 test (Lnet/minecraft/class_3610;)Z ARG 1 state METHOD method_22519 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559; ARG 0 json + METHOD method_22520 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4559$class_4562;)V + ARG 1 condition METHOD method_22521 createPredicate (Ljava/lang/String;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559$class_4562; ARG 0 key ARG 1 json diff --git a/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping b/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping index 5b7cca775a..9197078478 100644 --- a/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping +++ b/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping @@ -9,7 +9,9 @@ CLASS net/minecraft/class_2715 net/minecraft/predicate/block/BlockStatePredicate METHOD method_11761 testProperty (Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;Ljava/util/function/Predicate;)Z ARG 1 blockState ARG 2 property + ARG 3 predicate METHOD method_11762 with (Lnet/minecraft/class_2769;Ljava/util/function/Predicate;)Lnet/minecraft/class_2715; ARG 1 property + ARG 2 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 state diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 84102f07ca..354b0c39cc 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -50,6 +50,8 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; ARG 0 player ARG 1 target + METHOD method_37227 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z + ARG 3 entity METHOD method_8909 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index 69949994e2..e8ab4ac84e 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -54,6 +54,8 @@ CLASS net/minecraft/class_1301 net/minecraft/predicate/entity/EntityPredicates ARG 0 entity METHOD method_5914 (Lnet/minecraft/class_1297;)Z ARG 0 entity + METHOD method_5915 (Lnet/minecraft/class_1297;Lnet/minecraft/class_270;Lnet/minecraft/class_270$class_271;Lnet/minecraft/class_1297;)Z + ARG 3 entity CLASS class_1302 Equipable FIELD field_6158 stack Lnet/minecraft/class_1799; METHOD (Lnet/minecraft/class_1799;)V