From 9a9470a6fad91c7ef6d52d5805e8b379c2453386 Mon Sep 17 00:00:00 2001 From: zml Date: Wed, 23 Dec 2020 13:43:49 -0800 Subject: [PATCH] Map some of the unmapped parts of functions (#1928) --- .../server/function/CommandFunction.mapping | 12 ++++++++++++ .../function/CommandFunctionManager.mapping | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index e2a2e129d1..e5e4650a69 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -7,7 +7,14 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction METHOD method_9193 getElements ()[Lnet/minecraft/class_2158$class_2161; METHOD method_9194 getId ()Lnet/minecraft/class_2960; METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;Ljava/util/List;)Lnet/minecraft/class_2158; + COMMENT Parses a function in the context of {@code source}. + COMMENT + COMMENT

Any syntax errors, such as improper comment lines or unknown commands, will be thrown at this point.

ARG 0 id + ARG 1 dispatcher + ARG 2 source + ARG 3 lines + COMMENT the raw lines (including comments) read from a function file CLASS class_2159 LazyContainer FIELD field_9807 id Lnet/minecraft/class_2960; FIELD field_9808 function Ljava/util/Optional; @@ -28,6 +35,11 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction METHOD method_9198 execute (Lnet/minecraft/class_2991;Lnet/minecraft/class_2168;Ljava/util/Deque;I)V ARG 1 manager ARG 2 source + ARG 3 entries ARG 4 maxChainLength CLASS class_2162 FunctionElement FIELD field_9812 function Lnet/minecraft/class_2158$class_2159; + METHOD (Lnet/minecraft/class_2158;)V + ARG 1 function + METHOD method_17914 (ILjava/util/ArrayDeque;Lnet/minecraft/class_2991;Lnet/minecraft/class_2168;Lnet/minecraft/class_2158;)V + ARG 4 actual diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 5748aa1b4e..6795375db1 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -7,6 +7,10 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana FIELD field_13419 server Lnet/minecraft/server/MinecraftServer; FIELD field_13422 needToRunLoadFunctions Z FIELD field_19332 pending Ljava/util/List; + FIELD field_25333 loader Lnet/minecraft/class_5349; + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5349;)V + ARG 1 server + ARG 2 loader METHOD method_12899 getTaggedFunctionSource ()Lnet/minecraft/class_2168; METHOD method_12900 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_12902 getMaxCommandChainLength ()I @@ -16,6 +20,19 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana METHOD method_12905 getFunction (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id METHOD method_18699 tick ()V + METHOD method_29460 executeAll (Ljava/util/Collection;Lnet/minecraft/class_2960;)V + ARG 1 functions + ARG 2 label + METHOD method_29461 update (Lnet/minecraft/class_5349;)V + COMMENT Called to update the loaded functions on datapack reload. + ARG 1 loader + COMMENT the new loader functions will be taken from + METHOD method_29462 getTaggedFunctions (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494; + ARG 1 tag + METHOD method_29463 getAllFunctions ()Ljava/lang/Iterable; + METHOD method_29464 getFunctionTags ()Ljava/lang/Iterable; + METHOD method_29773 initialize (Lnet/minecraft/class_5349;)V + ARG 1 loader CLASS class_2992 Entry FIELD field_13423 manager Lnet/minecraft/class_2991; FIELD field_13424 source Lnet/minecraft/class_2168;