Skip to content

Commit

Permalink
23w31a commands and functions (#3614)
Browse files Browse the repository at this point in the history
  • Loading branch information
@apple502j
apple502j authored Aug 4, 2023
1 parent 127beb3 commit 075dd63
Show file tree
Hide file tree
Showing 15 changed files with 105 additions and 8 deletions.
4 changes: 4 additions & 0 deletions mappings/net/minecraft/command/DataCommandStorage.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage
METHOD method_22547 set (Lnet/minecraft/class_2960;Lnet/minecraft/class_2487;)V
ARG 1 id
ARG 2 nbt
METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_4565$class_4566;
ARG 2 nbt
METHOD method_52614 getPersistentStateType (Ljava/lang/String;)Lnet/minecraft/class_18$class_8645;
ARG 1 namespace
CLASS class_4566 PersistentState
FIELD field_20749 map Ljava/util/Map;
FIELD field_31835 CONTENTS_KEY Ljava/lang/String;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/server/command/ChaseCommand.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CLASS net/minecraft/class_6634 net/minecraft/server/command/ChaseCommand
FIELD field_35003 INTERVAL I
FIELD field_35004 server Lnet/minecraft/class_6632;
FIELD field_35005 client Lnet/minecraft/class_6630;
FIELD field_44981 LOGGER Lorg/slf4j/Logger;
METHOD method_38770 register (Lcom/mojang/brigadier/CommandDispatcher;)V
ARG 0 dispatcher
METHOD method_38771 (Lcom/mojang/brigadier/context/CommandContext;)I
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/server/command/CommandManager.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager
FIELD field_9832 dispatcher Lcom/mojang/brigadier/CommandDispatcher;
FIELD field_9833 LOGGER Lorg/slf4j/Logger;
METHOD <init> (Lnet/minecraft/class_2170$class_5364;Lnet/minecraft/class_7157;)V
ARG 1 environment
ARG 2 commandRegistryAccess
METHOD method_23917 getException (Lcom/mojang/brigadier/ParseResults;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;
ARG 0 parse
Expand Down
6 changes: 4 additions & 2 deletions mappings/net/minecraft/server/command/DebugConfigCommand.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ CLASS net/minecraft/class_8600 net/minecraft/server/command/DebugConfigCommand
ARG 1 suggestionsBuilder
METHOD method_52302 (Lnet/minecraft/class_2168;)Z
ARG 0 source
METHOD method_52303 config (Lnet/minecraft/class_2168;Lnet/minecraft/class_3222;)I
METHOD method_52303 executeConfig (Lnet/minecraft/class_2168;Lnet/minecraft/class_3222;)I
ARG 0 source
ARG 1 player
METHOD method_52304 unconfig (Lnet/minecraft/class_2168;Ljava/util/UUID;)I
METHOD method_52304 executeUnconfig (Lnet/minecraft/class_2168;Ljava/util/UUID;)I
ARG 0 source
ARG 1 uuid
METHOD method_52305 collectConfiguringPlayers (Lnet/minecraft/server/MinecraftServer;)Ljava/lang/Iterable;
ARG 0 server
METHOD method_52306 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
5 changes: 5 additions & 0 deletions mappings/net/minecraft/server/command/ExecuteCommand.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
ARG 0 context
METHOD method_49419 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168;
ARG 0 context
METHOD method_52307 (Lcom/mojang/brigadier/context/CommandContext;)Z
ARG 0 context
METHOD method_52308 testFunction (Lnet/minecraft/class_2168;Ljava/util/Collection;)Z
ARG 0 source
ARG 1 functions
CLASS class_3051 ExistsCondition
METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
Expand Down
21 changes: 21 additions & 0 deletions mappings/net/minecraft/server/command/FunctionCommand.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand
FIELD field_13662 SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider;
FIELD field_44982 ARGUMENT_NOT_COMPOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD method_13380 register (Lcom/mojang/brigadier/CommandDispatcher;)V
ARG 0 dispatcher
METHOD method_13381 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2487;)I
ARG 0 source
ARG 1 functions
ARG 2 arguments
METHOD method_13382 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
ARG 0 context
ARG 1 builder
Expand All @@ -13,3 +16,21 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand
ARG 0 source
METHOD method_51276 (Lorg/apache/commons/lang3/mutable/MutableObject;I)V
ARG 1 value
METHOD method_52309 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
ARG 1 builder
METHOD method_52310 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
METHOD method_52311 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_52312 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2158;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3062$class_8601;
ARG 0 source
ARG 1 function
ARG 2 arguments
METHOD method_52313 getArgument (Lnet/minecraft/class_2203$class_2209;Lnet/minecraft/class_3162;)Lnet/minecraft/class_2487;
ARG 0 path
ARG 1 object
METHOD method_52314 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 argument
METHOD method_52315 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
CLASS class_8601 FunctionResult
16 changes: 10 additions & 6 deletions mappings/net/minecraft/server/command/RandomCommand.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,39 @@ CLASS net/minecraft/class_8602 net/minecraft/server/command/RandomCommand
METHOD method_52320 suggestSequences (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
ARG 0 context
ARG 1 suggestionsBuilder
METHOD method_52321 resetAll (Lnet/minecraft/class_2168;)I
METHOD method_52321 executeReset (Lnet/minecraft/class_2168;)I
ARG 0 source
METHOD method_52322 resetAll (Lnet/minecraft/class_2168;IZZ)I
METHOD method_52322 executeReset (Lnet/minecraft/class_2168;IZZ)I
ARG 0 source
ARG 1 salt
ARG 2 includeWorldSeed
ARG 3 includeSequenceId
METHOD method_52323 reset (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;)I
METHOD method_52323 executeReset (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;)I
ARG 0 source
ARG 1 sequenceId
METHOD method_52324 reset (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;IZZ)I
METHOD method_52324 executeReset (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;IZZ)I
ARG 0 source
ARG 1 sequenceId
ARG 2 salt
ARG 3 includeWorldSeed
ARG 4 includeSequenceId
METHOD method_52325 sample (Lnet/minecraft/class_2168;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2960;Z)I
METHOD method_52325 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2960;Z)I
ARG 0 source
ARG 1 range
ARG 2 sequenceId
ARG 3 roll
METHOD method_52326 (Ljava/lang/String;Z)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;
METHOD method_52326 random (Ljava/lang/String;Z)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;
ARG 0 argumentName
ARG 1 roll
METHOD method_52327 (Ljava/util/List;Lnet/minecraft/class_2960;Lnet/minecraft/class_8564;)V
ARG 1 id
ARG 2 sequence
METHOD method_52328 (ZLcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
METHOD method_52331 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_52332 (Lnet/minecraft/class_2168;)Z
ARG 0 source
METHOD method_52333 (ZLcom/mojang/brigadier/context/CommandContext;)I
ARG 1 context
METHOD method_52335 (Lcom/mojang/brigadier/context/CommandContext;)I
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/server/command/ReturnCommand.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand
ARG 1 value
METHOD method_52342 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168;
ARG 0 context
METHOD method_52343 executeRun (Lcom/mojang/brigadier/context/CommandContext;ZI)I
ARG 0 context
ARG 1 success
ARG 2 value
2 changes: 2 additions & 0 deletions mappings/net/minecraft/server/command/ScoreboardCommand.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand
ARG 0 context
METHOD method_13592 executeClearDisplay (Lnet/minecraft/class_2168;Lnet/minecraft/class_8646;)I
ARG 0 source
ARG 1 slot
METHOD method_13593 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_13594 (Lcom/mojang/brigadier/context/CommandContext;)I
Expand All @@ -67,6 +68,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand
ARG 0 dispatcher
METHOD method_13596 executeSetDisplay (Lnet/minecraft/class_2168;Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)I
ARG 0 source
ARG 1 slot
ARG 2 objective
METHOD method_13597 executeListObjectives (Lnet/minecraft/class_2168;)I
ARG 0 source
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/server/command/TestCommand.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand
FIELD field_45665 LOGGER Lorg/slf4j/Logger;
METHOD method_22263 (Lnet/minecraft/class_124;Ljava/lang/String;Lnet/minecraft/class_3222;)V
ARG 2 player
METHOD method_22264 executePos (Lnet/minecraft/class_2168;Ljava/lang/String;)I
Expand Down Expand Up @@ -120,6 +121,10 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand
ARG 0 context
METHOD method_29423 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_52890 executeExportThese (Lnet/minecraft/class_2168;)I
ARG 0 source
METHOD method_52891 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
CLASS class_4528 Listener
FIELD field_20581 world Lnet/minecraft/class_3218;
FIELD field_20582 tests Lnet/minecraft/class_4524;
Expand Down
32 changes: 32 additions & 0 deletions mappings/net/minecraft/server/function/CommandFunction.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction
METHOD <init> (Lnet/minecraft/class_2960;[Lnet/minecraft/class_2158$class_2161;)V
ARG 1 id
ARG 2 elements
METHOD method_52592 continuesToNextLine (Ljava/lang/CharSequence;)Z
ARG 0 string
METHOD method_52593 isValidMacroVariableName (Ljava/lang/String;)Z
ARG 0 name
METHOD method_52594 parseMacro (Ljava/lang/String;I)Lnet/minecraft/class_2158$class_8642;
ARG 0 macro
ARG 1 line
METHOD method_52595 withMacroReplaced (Lnet/minecraft/class_2487;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2158;
ARG 1 arguments
ARG 2 dispatcher
ARG 3 source
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;
Expand Down Expand Up @@ -61,3 +72,24 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction
ARG 1 function
METHOD method_17914 (Lnet/minecraft/class_2991$class_6346;IILjava/util/Deque;Lnet/minecraft/class_2168;Lnet/minecraft/class_2158;)V
ARG 5 f
CLASS class_8641 Macro
FIELD field_45149 variables Ljava/util/List;
FIELD field_45150 CACHE_SIZE I
FIELD field_45151 cache Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;
METHOD <init> (Lnet/minecraft/class_2960;[Lnet/minecraft/class_2158$class_2161;Ljava/util/List;)V
ARG 1 id
ARG 2 elements
ARG 3 variables
METHOD method_52597 withMacroReplaced (Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2158;
ARG 1 arguments
ARG 2 dispatcher
ARG 3 source
CLASS class_8642 MacroElement
FIELD field_45152 parts Ljava/util/List;
FIELD field_45153 variables Ljava/util/List;
METHOD <init> (Ljava/util/List;Ljava/util/List;)V
ARG 1 parts
ARG 2 variables
METHOD method_52598 getVariables ()Ljava/util/List;
METHOD method_52599 getCommand (Ljava/util/List;)Ljava/lang/String;
ARG 1 arguments
2 changes: 2 additions & 0 deletions mappings/net/minecraft/server/function/CommandFunctionManager.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
COMMENT the command source to execute with
ARG 3 tracer
COMMENT a tracer for a non-recursive function execution
ARG 4 arguments
COMMENT arguments for macro substitution, if any
CLASS class_2992 Entry
FIELD field_13424 source Lnet/minecraft/class_2168;
FIELD field_13425 element Lnet/minecraft/class_2158$class_2161;
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/server/function/MacroException.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/class_8643 net/minecraft/server/function/MacroException
FIELD field_45154 message Lnet/minecraft/class_2561;
METHOD <init> (Lnet/minecraft/class_2561;)V
ARG 1 message
METHOD method_52600 getMessage ()Lnet/minecraft/class_2561;
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/PersistentState.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState
ARG 1 dirty
METHOD method_79 isDirty ()Z
METHOD method_80 markDirty ()V
CLASS class_8645 Type
8 changes: 8 additions & 0 deletions mappings/net/minecraft/world/PersistentStateManager.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager
ARG 2 dataFixer
METHOD method_120 readFromFile (Ljava/util/function/Function;Lnet/minecraft/class_4284;Ljava/lang/String;)Lnet/minecraft/class_18;
ARG 1 readFunction
ARG 2 dataFixTypes
ARG 3 id
METHOD method_123 set (Ljava/lang/String;Lnet/minecraft/class_18;)V
ARG 1 id
ARG 2 state
Expand All @@ -18,8 +20,14 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager
ARG 1 id
METHOD method_17923 readNbt (Ljava/lang/String;Lnet/minecraft/class_4284;I)Lnet/minecraft/class_2487;
ARG 1 id
ARG 2 dataFixTypes
ARG 3 currentSaveVersion
METHOD method_17924 getOrCreate (Lnet/minecraft/class_18$class_8645;Ljava/lang/String;)Lnet/minecraft/class_18;
ARG 1 type
ARG 2 id
METHOD method_20786 get (Lnet/minecraft/class_18$class_8645;Ljava/lang/String;)Lnet/minecraft/class_18;
ARG 1 type
ARG 2 id
METHOD method_32384 (Ljava/lang/String;Lnet/minecraft/class_18;)V
ARG 1 id
ARG 2 state

0 comments on commit 075dd63

Please sign in to comment.