From 5aabebac46359087c00580328cb55b724935fbfd Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 5 Apr 2021 09:40:36 +1000 Subject: [PATCH] command stuff (#2272) --- .../command/DataCommandStorage.mapping | 4 +++- .../minecraft/command/EntitySelector.mapping | 1 + .../command/EntitySelectorReader.mapping | 19 +++++++++++++++++++ .../command/FloatRangeArgument.mapping | 16 ++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping index 8b0fe7c3a8..0e4cc353d6 100644 --- a/mappings/net/minecraft/command/DataCommandStorage.mapping +++ b/mappings/net/minecraft/command/DataCommandStorage.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage FIELD field_20747 storages Ljava/util/Map; FIELD field_20748 stateManager Lnet/minecraft/class_26; + FIELD field_31834 COMMAND_STORAGE_PREFIX Ljava/lang/String; METHOD (Lnet/minecraft/class_26;)V ARG 1 stateManager METHOD method_22542 getIds ()Ljava/util/stream/Stream; @@ -15,6 +16,7 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage ARG 2 nbt CLASS class_4566 PersistentState FIELD field_20749 map Ljava/util/Map; + FIELD field_31835 CONTENTS_KEY Ljava/lang/String; METHOD method_22550 get (Ljava/lang/String;)Lnet/minecraft/class_2487; ARG 1 name METHOD method_22552 set (Ljava/lang/String;Lnet/minecraft/class_2487;)V @@ -22,5 +24,5 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage ARG 2 nbt METHOD method_22554 getIds (Ljava/lang/String;)Ljava/util/stream/Stream; ARG 1 namespace - METHOD method_32383 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_4565$class_4566; + METHOD method_32383 readNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_4565$class_4566; ARG 1 nbt diff --git a/mappings/net/minecraft/command/EntitySelector.mapping b/mappings/net/minecraft/command/EntitySelector.mapping index 06a7b3af96..702e8b9807 100644 --- a/mappings/net/minecraft/command/EntitySelector.mapping +++ b/mappings/net/minecraft/command/EntitySelector.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector ARG 11 uuid ARG 12 type ARG 13 usesAt + METHOD method_35815 usesAt ()Z METHOD method_9809 getEntity (Lnet/minecraft/class_2168;)Lnet/minecraft/class_1297; METHOD method_9811 getPlayer (Lnet/minecraft/class_2168;)Lnet/minecraft/class_3222; METHOD method_9813 getPlayers (Lnet/minecraft/class_2168;)Ljava/util/List; diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping index ae7a182b1f..f4cf903077 100644 --- a/mappings/net/minecraft/command/EntitySelectorReader.mapping +++ b/mappings/net/minecraft/command/EntitySelectorReader.mapping @@ -45,11 +45,26 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader FIELD field_10880 NOT_ALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_10881 dz Ljava/lang/Double; FIELD field_10882 FURTHEST Ljava/util/function/BiConsumer; + FIELD field_33069 SELECTOR_PREFIX C + FIELD field_33070 ARGUMENT_DEFINER C + FIELD field_33071 INVERT_MODIFIER C + FIELD field_33072 TAG_MODIFIER C + FIELD field_33073 ARGUMENTS_OPENING C + FIELD field_33074 ARGUMENTS_CLOSING C + FIELD field_33075 ARGUMENT_SEPARATOR C + FIELD field_33076 NEAREST_PLAYER C + FIELD field_33077 ALL_PLAYERS C + FIELD field_33078 RANDOM_PLAYER C + FIELD field_33079 SELF C + FIELD field_33080 ALL_ENTITIES C METHOD (Lcom/mojang/brigadier/StringReader;)V ARG 1 reader METHOD (Lcom/mojang/brigadier/StringReader;Z)V ARG 1 reader ARG 2 atAllowed + METHOD method_35817 suggestDefinerNext (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + METHOD method_35818 getSorter ()Ljava/util/function/BiConsumer; METHOD method_9833 setExcludesTeam (Z)V ARG 1 excludesTeam METHOD method_9834 suggestSelectorRest (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; @@ -79,6 +94,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9852 setLocalWorldOnly ()V METHOD method_9853 getYawRange ()Lnet/minecraft/class_2152; METHOD method_9855 setYawRange (Lnet/minecraft/class_2152;)V + ARG 1 yawRange METHOD method_9857 setHasNegatedGameMode (Z)V ARG 1 hasNegatedGameMode METHOD method_9858 suggestNormal (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; @@ -98,6 +114,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9873 getDistance ()Lnet/minecraft/class_2096$class_2099; METHOD method_9874 readArguments ()V METHOD method_9875 setSuggestionProvider (Ljava/util/function/BiFunction;)V + ARG 1 suggestionProvider METHOD method_9877 setHasLimit (Z)V ARG 1 hasLimit METHOD method_9878 buildPredicate ()V @@ -128,6 +145,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9896 suggestSelector (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V ARG 0 builder METHOD method_9898 setPitchRange (Lnet/minecraft/class_2152;)V + ARG 1 pitchRange METHOD method_9899 setSelectsName (Z)V ARG 1 selectsName METHOD method_9900 setLimit (I)V @@ -150,6 +168,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9913 setExcludesName (Z)V METHOD method_9915 readTagCharacter ()Z METHOD method_9916 setPredicate (Ljava/util/function/Predicate;)V + ARG 1 predicate METHOD method_9917 readAtVariable ()V METHOD method_9918 setDz (D)V ARG 1 dz diff --git a/mappings/net/minecraft/command/FloatRangeArgument.mapping b/mappings/net/minecraft/command/FloatRangeArgument.mapping index 48e263f208..ba4046d436 100644 --- a/mappings/net/minecraft/command/FloatRangeArgument.mapping +++ b/mappings/net/minecraft/command/FloatRangeArgument.mapping @@ -3,6 +3,22 @@ CLASS net/minecraft/class_2152 net/minecraft/command/FloatRangeArgument FIELD field_9779 max Ljava/lang/Float; FIELD field_9780 ANY Lnet/minecraft/class_2152; FIELD field_9781 ONLY_INTS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD (Ljava/lang/Float;Ljava/lang/Float;)V + ARG 1 min + ARG 2 max + METHOD method_35400 isInSquaredRange (D)Z + ARG 1 value + METHOD method_35401 exactly (F)Lnet/minecraft/class_2152; + ARG 0 value + METHOD method_35402 between (FF)Lnet/minecraft/class_2152; + ARG 0 min + ARG 1 max + METHOD method_35406 atLeast (F)Lnet/minecraft/class_2152; + ARG 0 value + METHOD method_35408 atMost (F)Lnet/minecraft/class_2152; + ARG 0 value + METHOD method_35409 isInRange (F)Z + ARG 1 value METHOD method_9172 parse (Lcom/mojang/brigadier/StringReader;ZLjava/util/function/Function;)Lnet/minecraft/class_2152; ARG 0 reader ARG 1 allowFloats