Improve some names mapped in #3694

- `VirtualMachine` sounds like an expensive object to construct. This isn't really a VM, so rename it to something
more neutral.
- `Control` conflicts with the class in entity.ai package. Add a prefix.
- Related changes.
This commit is contained in:
apple502j 2023-10-15 00:49:10 +09:00
parent 47a9140697
commit 5accdd9fab
No known key found for this signature in database
GPG Key ID: 2A69798565A099A9
12 changed files with 22 additions and 16 deletions

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_8853 net/minecraft/command/CommandAction
METHOD execute (Lnet/minecraft/class_8854;I)V
ARG 1 vm
ARG 1 context
ARG 2 depth

View File

@ -1,7 +1,7 @@
CLASS net/minecraft/class_8854 net/minecraft/command/VirtualMachine
CLASS net/minecraft/class_8854 net/minecraft/command/CommandExecutionContext
FIELD field_46729 MAX_COMMAND_QUEUE_LENGTH I
FIELD field_46730 LOGGER Lorg/slf4j/Logger;
FIELD field_46731 commandsExecuted I
FIELD field_46731 maxCommandChainLength I
FIELD field_46732 forkLimit I
FIELD field_46733 profiler Lnet/minecraft/class_3695;
FIELD field_46734 tracer Lnet/minecraft/class_6346;
@ -19,7 +19,7 @@ CLASS net/minecraft/class_8854 net/minecraft/command/VirtualMachine
METHOD method_54392 enqueueCommand (Lnet/minecraft/class_8847;)V
ARG 1 entry
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 0 context
ARG 1 command
ARG 3 source
METHOD method_54394 setTracer (Lnet/minecraft/class_6346;)V

View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_8847 net/minecraft/command/CommandQueueEntry
METHOD method_54388 execute (Lnet/minecraft/class_8854;)V
ARG 1 vm
ARG 1 context

View File

@ -9,6 +9,7 @@ CLASS net/minecraft/class_8848 net/minecraft/command/ControlFlowAware
ARG 1 context
CLASS class_8850 Helper
METHOD method_54255 sendError (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Lnet/minecraft/class_8839;Z)V
ARG 1 exception
ARG 2 source
ARG 3 silent
METHOD method_54259 executeInner (Lnet/minecraft/class_8839;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_8855 net/minecraft/command/Control
CLASS net/minecraft/class_8855 net/minecraft/command/ExecutionControl
METHOD method_54401 doReturn ()V
METHOD method_54402 enqueueAction (Lnet/minecraft/class_8853;)V
ARG 1 action

View File

@ -5,3 +5,5 @@ CLASS net/minecraft/class_8851 net/minecraft/command/Forkable
ARG 3 forkedMode
ARG 4 control
CLASS class_8852 RedirectModifier
METHOD apply (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection;
ARG 1 context

View File

@ -4,8 +4,9 @@ CLASS net/minecraft/class_8858 net/minecraft/command/SingleCommandAction
FIELD field_46741 contextChain Lcom/mojang/brigadier/context/ContextChain;
METHOD <init> (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;)V
ARG 1 command
ARG 2 contextChain
METHOD method_54407 traceCommandStart (Lnet/minecraft/class_8854;I)V
ARG 1 vm
ARG 1 context
ARG 2 depth
METHOD method_54408 (Lnet/minecraft/class_8865;ILnet/minecraft/class_8839;)Lnet/minecraft/class_8847;
ARG 1 depth
@ -14,22 +15,24 @@ CLASS net/minecraft/class_8858 net/minecraft/command/SingleCommandAction
ARG 0 count
METHOD method_54410 execute (Ljava/util/List;Lnet/minecraft/class_8854;IZ)V
ARG 1 forks
ARG 2 vm
ARG 2 context
ARG 3 depth
ARG 4 silent
METHOD method_54411 fixAtDepth (Lnet/minecraft/class_8854;I)Lnet/minecraft/class_8855;
ARG 0 vm
ARG 0 context
ARG 1 depth
CLASS class_8859 MultiSource
FIELD field_46744 forkedMode Z
FIELD field_46745 sources Ljava/util/List;
METHOD <init> (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;ZLjava/util/List;)V
ARG 1 command
ARG 2 contextChain
ARG 3 forkedMode
ARG 4 sources
CLASS class_8860 SingleSource
FIELD field_46746 source Lnet/minecraft/class_8839;
METHOD <init> (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;)V
ARG 1 command
ARG 2 contextChain
ARG 3 source
CLASS class_8861 Sourced

View File

@ -3,8 +3,8 @@ CLASS net/minecraft/class_8856 net/minecraft/command/SourcedCommandAction
ARG 1 source
METHOD execute (Ljava/lang/Object;Lnet/minecraft/class_8854;I)V
ARG 1 source
ARG 2 vm
ARG 2 context
ARG 3 depth
METHOD method_54405 (Ljava/lang/Object;Lnet/minecraft/class_8854;I)V
ARG 2 vm
ARG 2 context
ARG 3 depth

View File

@ -8,7 +8,7 @@ CLASS net/minecraft/class_8863 net/minecraft/command/SteppedCommandAction
ARG 2 actions
ARG 3 depth
METHOD method_54414 enqueueCommands (Lnet/minecraft/class_8854;ILjava/util/List;Lnet/minecraft/class_8863$class_8864;)V
ARG 0 vm
ARG 0 context
ARG 1 depth
ARG 2 actions
ARG 3 wrapper

View File

@ -30,11 +30,11 @@ 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 callWithVm (Lnet/minecraft/class_2168;Ljava/util/function/Consumer;)V
METHOD method_54313 callWithContext (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
ARG 3 vm
ARG 3 context
METHOD method_9235 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
METHOD method_9236 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
ARG 1 style

View File

@ -29,5 +29,5 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand
METHOD method_36357 writeNewLine ()V
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 4 context
ARG 5 depth

View File

@ -54,4 +54,4 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
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
ARG 2 context