From 7af25ddc51873854e6d67085c207f3ce47a3a9f5 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 11 Oct 2023 22:46:32 -0400 Subject: [PATCH] Revise some more names --- mappings/net/minecraft/class_8848.mapping | 18 ------------------ mappings/net/minecraft/class_8851.mapping | 6 ------ .../minecraft/command/ControlFlowAware.mapping | 18 ++++++++++++++++++ .../net/minecraft/command/Forkable.mapping | 7 +++++++ ...ltConsumer.mapping => ResultStorer.mapping} | 2 +- .../SingleCommandAction.mapping} | 9 +++++---- .../minecraft/command/VirtualMachine.mapping | 8 +++++--- .../server/command/CommandManager.mapping | 2 +- .../server/command/DebugCommand.mapping | 3 ++- .../server/command/ExecuteCommand.mapping | 6 +++--- .../server/command/FunctionCommand.mapping | 7 +++++-- .../server/command/ReturnCommand.mapping | 3 ++- .../function/CommandFunctionManager.mapping | 3 +++ 13 files changed, 52 insertions(+), 40 deletions(-) delete mode 100644 mappings/net/minecraft/class_8848.mapping delete mode 100644 mappings/net/minecraft/class_8851.mapping create mode 100644 mappings/net/minecraft/command/ControlFlowAware.mapping create mode 100644 mappings/net/minecraft/command/Forkable.mapping rename mappings/net/minecraft/command/{ResultConsumer.mapping => ResultStorer.mapping} (57%) rename mappings/net/minecraft/{class_8858.mapping => command/SingleCommandAction.mapping} (88%) diff --git a/mappings/net/minecraft/class_8848.mapping b/mappings/net/minecraft/class_8848.mapping deleted file mode 100644 index c755e6c7bb..0000000000 --- a/mappings/net/minecraft/class_8848.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS net/minecraft/class_8848 - METHOD method_54290 (Ljava/lang/Object;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V - ARG 1 source - ARG 2 contextChain - ARG 3 forkedMode - ARG 4 control - CLASS class_8849 - METHOD run (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context - CLASS class_8850 - METHOD method_54255 (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Lnet/minecraft/class_8839;Z)V - ARG 2 source - ARG 3 silent - METHOD method_54259 (Lnet/minecraft/class_8839;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V - ARG 1 source - ARG 2 contextChain - ARG 3 forkedMode - ARG 4 control diff --git a/mappings/net/minecraft/class_8851.mapping b/mappings/net/minecraft/class_8851.mapping deleted file mode 100644 index b5eb6e584c..0000000000 --- a/mappings/net/minecraft/class_8851.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_8851 - METHOD method_54270 (Ljava/util/List;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V - ARG 1 sources - ARG 2 contextChain - ARG 3 forkedMode - ARG 4 control diff --git a/mappings/net/minecraft/command/ControlFlowAware.mapping b/mappings/net/minecraft/command/ControlFlowAware.mapping new file mode 100644 index 0000000000..26a7f38337 --- /dev/null +++ b/mappings/net/minecraft/command/ControlFlowAware.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_8848 net/minecraft/command/ControlFlowAware + METHOD method_54290 execute (Ljava/lang/Object;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V + ARG 1 source + ARG 2 contextChain + ARG 3 forkedMode + ARG 4 control + CLASS class_8849 Command + METHOD run (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + CLASS class_8850 Helper + METHOD method_54255 sendError (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Lnet/minecraft/class_8839;Z)V + ARG 2 source + ARG 3 silent + METHOD method_54259 executeInner (Lnet/minecraft/class_8839;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V + ARG 1 source + ARG 2 contextChain + ARG 3 forkedMode + ARG 4 control diff --git a/mappings/net/minecraft/command/Forkable.mapping b/mappings/net/minecraft/command/Forkable.mapping new file mode 100644 index 0000000000..5f151325b9 --- /dev/null +++ b/mappings/net/minecraft/command/Forkable.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8851 net/minecraft/command/Forkable + METHOD method_54270 execute (Ljava/util/List;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V + ARG 1 sources + ARG 2 contextChain + ARG 3 forkedMode + ARG 4 control + CLASS class_8852 RedirectModifier diff --git a/mappings/net/minecraft/command/ResultConsumer.mapping b/mappings/net/minecraft/command/ResultStorer.mapping similarity index 57% rename from mappings/net/minecraft/command/ResultConsumer.mapping rename to mappings/net/minecraft/command/ResultStorer.mapping index 8b871e10be..8e8d47675f 100644 --- a/mappings/net/minecraft/command/ResultConsumer.mapping +++ b/mappings/net/minecraft/command/ResultStorer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_8838 net/minecraft/command/ResultConsumer +CLASS net/minecraft/class_8838 net/minecraft/command/ResultStorer METHOD storeResult (Ljava/lang/Object;ZI)V ARG 1 context ARG 2 success diff --git a/mappings/net/minecraft/class_8858.mapping b/mappings/net/minecraft/command/SingleCommandAction.mapping similarity index 88% rename from mappings/net/minecraft/class_8858.mapping rename to mappings/net/minecraft/command/SingleCommandAction.mapping index 53b13a8915..ab523f5f9d 100644 --- a/mappings/net/minecraft/class_8858.mapping +++ b/mappings/net/minecraft/command/SingleCommandAction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_8858 +CLASS net/minecraft/class_8858 net/minecraft/command/SingleCommandAction FIELD field_46739 FORK_LIMIT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_46740 command Ljava/lang/String; FIELD field_46741 contextChain Lcom/mojang/brigadier/context/ContextChain; @@ -13,22 +13,23 @@ CLASS net/minecraft/class_8858 METHOD method_54409 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 count METHOD method_54410 execute (Ljava/util/List;Lnet/minecraft/class_8854;IZ)V - ARG 1 sources + ARG 1 forks ARG 2 vm ARG 3 depth ARG 4 silent METHOD method_54411 fixAtDepth (Lnet/minecraft/class_8854;I)Lnet/minecraft/class_8855; ARG 0 vm ARG 1 depth - CLASS class_8859 + CLASS class_8859 MultiSource FIELD field_46744 forkedMode Z FIELD field_46745 sources Ljava/util/List; METHOD (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;ZLjava/util/List;)V ARG 1 command ARG 3 forkedMode ARG 4 sources - CLASS class_8860 + CLASS class_8860 SingleSource FIELD field_46746 source Lnet/minecraft/class_8839; METHOD (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;)V ARG 1 command ARG 3 source + CLASS class_8861 Sourced diff --git a/mappings/net/minecraft/command/VirtualMachine.mapping b/mappings/net/minecraft/command/VirtualMachine.mapping index 9333466f5a..6eb31513e5 100644 --- a/mappings/net/minecraft/command/VirtualMachine.mapping +++ b/mappings/net/minecraft/command/VirtualMachine.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_8854 net/minecraft/command/VirtualMachine FIELD field_46729 MAX_COMMAND_QUEUE_LENGTH I FIELD field_46730 LOGGER Lorg/slf4j/Logger; FIELD field_46731 commandsExecuted I - FIELD field_46732 forksRemaining I + FIELD field_46732 forkLimit I FIELD field_46733 profiler Lnet/minecraft/class_3695; FIELD field_46734 tracer Lnet/minecraft/class_6346; FIELD field_46735 commandsRemaining I @@ -18,8 +18,10 @@ CLASS net/minecraft/class_8854 net/minecraft/command/VirtualMachine ARG 1 depth METHOD method_54392 enqueueCommand (Lnet/minecraft/class_8847;)V ARG 1 entry - METHOD method_54393 (Lnet/minecraft/class_8854;Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;)V + METHOD method_54393 enqueueCommand (Lnet/minecraft/class_8854;Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;)V ARG 0 vm + ARG 1 command + ARG 3 source METHOD method_54394 setTracer (Lnet/minecraft/class_6346;)V ARG 1 tracer METHOD method_54395 enqueueProcedureCall (Lnet/minecraft/class_8868;Ljava/lang/Object;)V @@ -27,6 +29,6 @@ CLASS net/minecraft/class_8854 net/minecraft/command/VirtualMachine ARG 2 source METHOD method_54396 getTracer ()Lnet/minecraft/class_6346; METHOD method_54397 getProfiler ()Lnet/minecraft/class_3695; - METHOD method_54398 getForksRemaining ()I + METHOD method_54398 getForkLimit ()I METHOD method_54399 decrementCommandQuota ()V METHOD method_54400 markQueueOverflowed ()V diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping index d24b8286e3..626bd7ec73 100644 --- a/mappings/net/minecraft/server/command/CommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager ARG 0 registryLookup METHOD method_54312 throwException (Lcom/mojang/brigadier/ParseResults;)V ARG 0 parse - METHOD method_54313 (Lnet/minecraft/class_2168;Ljava/util/function/Consumer;)V + METHOD method_54313 callWithVm (Lnet/minecraft/class_2168;Ljava/util/function/Consumer;)V ARG 0 commandSource ARG 1 callback METHOD method_54314 (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2168;Lnet/minecraft/class_8854;)V diff --git a/mappings/net/minecraft/server/command/DebugCommand.mapping b/mappings/net/minecraft/server/command/DebugCommand.mapping index 736a36b259..10d8d808ff 100644 --- a/mappings/net/minecraft/server/command/DebugCommand.mapping +++ b/mappings/net/minecraft/server/command/DebugCommand.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand FIELD field_13596 ALREADY_RUNNING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13597 NOT_RUNNING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_20283 LOGGER Lorg/slf4j/Logger; + FIELD field_46638 NO_RECURSION_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_13154 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13156 register (Lcom/mojang/brigadier/CommandDispatcher;)V @@ -26,7 +27,7 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand METHOD method_36356 writeIndentWithoutRememberingWidth (I)V ARG 1 width METHOD method_36357 writeNewLine ()V - CLASS class_8829 + CLASS class_8829 Command METHOD method_54257 (Ljava/util/Collection;Lnet/minecraft/class_2168;ILjava/lang/String;Lnet/minecraft/class_8854;I)V ARG 4 vm ARG 5 depth diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index f1aa9126d4..799dd3ff06 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -262,7 +262,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand METHOD method_54263 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 function ARG 1 message - METHOD method_54264 (Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/IntPredicate;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2487;Lnet/minecraft/class_8855;Lnet/minecraft/class_3050$class_8830;Z)V + METHOD method_54264 enqueueExecutions (Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/IntPredicate;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2487;Lnet/minecraft/class_8855;Lnet/minecraft/class_3050$class_8830;Z)V ARG 0 sources ARG 1 sourceTransformer ARG 2 resultPredicate @@ -273,7 +273,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand METHOD method_54265 createExecutionSource (Ljava/util/function/Function;Ljava/util/function/IntPredicate;Ljava/util/List;Lnet/minecraft/class_8839;Z)Lnet/minecraft/class_8839; ARG 0 sourceTransformer ARG 1 resultPredicate - ARG 2 sources + ARG 2 successesOut ARG 3 currentSource ARG 4 singleFunction METHOD method_54266 (Ljava/util/function/IntPredicate;Ljava/util/List;Lnet/minecraft/class_8839;I)V @@ -289,7 +289,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand CLASS class_8830 METHOD get (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; ARG 1 context - CLASS class_8831 + CLASS class_8831 IfUnlessRedirector FIELD field_46643 predicate Ljava/util/function/IntPredicate; METHOD (Z)V ARG 1 positive diff --git a/mappings/net/minecraft/server/command/FunctionCommand.mapping b/mappings/net/minecraft/server/command/FunctionCommand.mapping index f389d11b6d..ed54bd2cff 100644 --- a/mappings/net/minecraft/server/command/FunctionCommand.mapping +++ b/mappings/net/minecraft/server/command/FunctionCommand.mapping @@ -25,18 +25,21 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand METHOD method_54274 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 argument ARG 1 argument2 - METHOD method_54275 (Ljava/util/Collection;Lnet/minecraft/class_2487;Lnet/minecraft/class_8839;Lnet/minecraft/class_8839;Lnet/minecraft/class_8855;Lnet/minecraft/class_3062$class_8832;)V + METHOD method_54275 enqueueAction (Ljava/util/Collection;Lnet/minecraft/class_2487;Lnet/minecraft/class_8839;Lnet/minecraft/class_8839;Lnet/minecraft/class_8855;Lnet/minecraft/class_3062$class_8832;)V ARG 0 commandFunctions ARG 1 args ARG 2 source ARG 3 functionSource + ARG 4 control ARG 5 resultConsumer + METHOD method_54276 (Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_3062$class_8832;Lnet/minecraft/class_8839;Lnet/minecraft/class_2960;I)V + ARG 4 result CLASS class_8832 ResultConsumer METHOD method_54280 accept (Ljava/lang/Object;Lnet/minecraft/class_2960;I)V ARG 1 source ARG 2 id ARG 3 result - CLASS class_8833 + CLASS class_8833 Command METHOD method_54277 getArguments (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2487; ARG 1 context METHOD method_54282 (Lcom/mojang/datafixers/util/Either;)Ljava/util/Collection; diff --git a/mappings/net/minecraft/server/command/ReturnCommand.mapping b/mappings/net/minecraft/server/command/ReturnCommand.mapping index 1feff6eff6..1a2bfbeaa5 100644 --- a/mappings/net/minecraft/server/command/ReturnCommand.mapping +++ b/mappings/net/minecraft/server/command/ReturnCommand.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand METHOD method_51277 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - CLASS class_8834 + CLASS class_8834 ReturnRunRedirector METHOD method_54287 (Lnet/minecraft/class_8855;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8839; ARG 1 source METHOD method_54288 (Lnet/minecraft/class_8855;Lnet/minecraft/class_8839;ZI)V ARG 1 source ARG 2 success ARG 3 result + CLASS class_8835 Command diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 3ea6fdf076..c16ef29598 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -36,6 +36,7 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer, NbtCompound) ARG 1 function COMMENT the function + ARG 2 source METHOD method_12905 getFunction (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id METHOD method_18699 tick ()V @@ -52,3 +53,5 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana METHOD method_29464 getFunctionTags ()Ljava/lang/Iterable; METHOD method_29773 load (Lnet/minecraft/class_5349;)V ARG 1 loader + METHOD method_54252 (Lnet/minecraft/class_8868;Lnet/minecraft/class_2168;Lnet/minecraft/class_8854;)V + ARG 2 vm