From ab451cdd0628793a136b3c5f51222e556e7f041c Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 14 May 2021 01:59:44 +0900 Subject: [PATCH] Map command stuff, again (#2397) --- .../server/command/CommandManager.mapping | 16 ++++++++++++++++ .../server/command/CommandOutput.mapping | 1 + .../server/command/DebugCommand.mapping | 2 ++ .../server/command/ExecuteCommand.mapping | 1 + .../minecraft/server/command/FillCommand.mapping | 1 + .../server/command/ForceLoadCommand.mapping | 1 + .../minecraft/server/command/GiveCommand.mapping | 1 + .../server/command/LocateBiomeCommand.mapping | 2 ++ .../server/command/SpreadPlayersCommand.mapping | 1 + .../server/command/TeleportCommand.mapping | 2 ++ .../server/command/WeatherCommand.mapping | 1 + 11 files changed, 29 insertions(+) diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping index 0f9cdfcca3..949a35ee3d 100644 --- a/mappings/net/minecraft/server/command/CommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -5,8 +5,14 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager ARG 1 environment METHOD method_23917 getException (Lcom/mojang/brigadier/ParseResults;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; ARG 0 parse + METHOD method_30851 (Lcom/mojang/brigadier/arguments/ArgumentType;)Ljava/lang/String; + ARG 0 type METHOD method_30852 checkMissing ()V + METHOD method_30853 (Lcom/mojang/brigadier/arguments/ArgumentType;)Z + ARG 0 type 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 METHOD method_9238 getCommandValidator (Lnet/minecraft/class_2170$class_2171;)Ljava/util/function/Predicate; ARG 0 parser METHOD method_9239 makeTreeForSource (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/tree/CommandNode;Lnet/minecraft/class_2168;Ljava/util/Map;)V @@ -16,11 +22,21 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager ARG 4 resultNodes METHOD method_9241 sendCommandTree (Lnet/minecraft/class_3222;)V ARG 1 player + METHOD method_9242 (Lnet/minecraft/class_5250;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 1 style METHOD method_9244 argument (Ljava/lang/String;Lcom/mojang/brigadier/arguments/ArgumentType;)Lcom/mojang/brigadier/builder/RequiredArgumentBuilder; ARG 0 name ARG 1 type + METHOD method_9245 (Lnet/minecraft/class_2172;)Z + ARG 0 source + METHOD method_9246 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context METHOD method_9247 literal (Ljava/lang/String;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; ARG 0 literal + METHOD method_9248 (Lcom/mojang/brigadier/context/CommandContext;ZI)V + ARG 0 context + ARG 1 success + ARG 2 result METHOD method_9249 execute (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 1 commandSource ARG 2 command diff --git a/mappings/net/minecraft/server/command/CommandOutput.mapping b/mappings/net/minecraft/server/command/CommandOutput.mapping index a123e7893a..10aaef1ba2 100644 --- a/mappings/net/minecraft/server/command/CommandOutput.mapping +++ b/mappings/net/minecraft/server/command/CommandOutput.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2165 net/minecraft/server/command/CommandOutput COMMENT Represents a subject which can receive command feedback. FIELD field_17395 DUMMY Lnet/minecraft/class_2165; + METHOD method_36320 cannotBeSilenced ()Z METHOD method_9200 shouldReceiveFeedback ()Z METHOD method_9201 shouldBroadcastConsoleToOps ()Z METHOD method_9202 shouldTrackOutput ()Z diff --git a/mappings/net/minecraft/server/command/DebugCommand.mapping b/mappings/net/minecraft/server/command/DebugCommand.mapping index 2f4f2b33e9..74ef6866b3 100644 --- a/mappings/net/minecraft/server/command/DebugCommand.mapping +++ b/mappings/net/minecraft/server/command/DebugCommand.mapping @@ -31,6 +31,8 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand FIELD field_33551 writer Ljava/io/PrintWriter; FIELD field_33552 lastIndentWidth I FIELD field_33553 expectsCommandResult Z + METHOD (Ljava/io/PrintWriter;)V + ARG 1 writer METHOD method_36355 writeIndent (I)V ARG 1 width METHOD method_36356 writeIndentWithoutRememberingWidth (I)V diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 7ccf5252a0..43c2500ea4 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand FIELD field_13636 CONDITIONAL_FAIL_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13637 CONDITIONAL_FAIL_COUNT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_20852 LOOT_CONDITIONS Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD field_33390 MAX_BLOCKS I METHOD method_13249 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context METHOD method_13250 (Ljava/lang/Integer;Ljava/lang/Integer;)Z diff --git a/mappings/net/minecraft/server/command/FillCommand.mapping b/mappings/net/minecraft/server/command/FillCommand.mapping index f08188c218..88fc714435 100644 --- a/mappings/net/minecraft/server/command/FillCommand.mapping +++ b/mappings/net/minecraft/server/command/FillCommand.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand FIELD field_13648 AIR_BLOCK_ARGUMENT Lnet/minecraft/class_2247; FIELD field_13649 TOO_BIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD field_13650 FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_33391 MAX_BLOCKS I METHOD method_13345 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13346 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/ForceLoadCommand.mapping b/mappings/net/minecraft/server/command/ForceLoadCommand.mapping index 4f4510e6af..431691f063 100644 --- a/mappings/net/minecraft/server/command/ForceLoadCommand.mapping +++ b/mappings/net/minecraft/server/command/ForceLoadCommand.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3060 net/minecraft/server/command/ForceLoadCommand FIELD field_13658 ADDED_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13659 QUERY_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD field_13660 REMOVED_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_33392 MAX_CHUNKS I METHOD method_13363 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13364 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/GiveCommand.mapping b/mappings/net/minecraft/server/command/GiveCommand.mapping index 2986c7d781..cf34e15551 100644 --- a/mappings/net/minecraft/server/command/GiveCommand.mapping +++ b/mappings/net/minecraft/server/command/GiveCommand.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3068 net/minecraft/server/command/GiveCommand + FIELD field_33394 MAX_STACKS I METHOD method_13400 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13401 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2290;Ljava/util/Collection;I)I diff --git a/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping b/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping index f55347eea3..d91ba1c8a5 100644 --- a/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_4799 net/minecraft/server/command/LocateBiomeCommand FIELD field_22252 INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_22253 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_33395 RADIUS I + FIELD field_33396 BLOCK_CHECK_INTERVAL I METHOD method_24491 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_24492 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping index 0bcda2719f..a4f259eed9 100644 --- a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping +++ b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand FIELD field_13734 FAILED_TEAMS_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic4CommandExceptionType; FIELD field_13735 FAILED_ENTITIES_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic4CommandExceptionType; + FIELD field_33397 MAX_ATTEMPTS I METHOD method_13652 getPileCountRespectingTeams (Ljava/util/Collection;)I ARG 0 entities METHOD method_13653 makePiles (Ljava/util/Random;IDDDD)[Lnet/minecraft/class_3131$class_3132; diff --git a/mappings/net/minecraft/server/command/TeleportCommand.mapping b/mappings/net/minecraft/server/command/TeleportCommand.mapping index 6e53f0bece..ea9cee63e3 100644 --- a/mappings/net/minecraft/server/command/TeleportCommand.mapping +++ b/mappings/net/minecraft/server/command/TeleportCommand.mapping @@ -44,6 +44,8 @@ CLASS net/minecraft/class_3143 net/minecraft/server/command/TeleportCommand ARG 0 source ARG 1 targets ARG 2 destination + METHOD method_36970 formatFloat (D)Ljava/lang/String; + ARG 0 d CLASS class_3144 LookTarget FIELD field_13758 target Lnet/minecraft/class_1297; FIELD field_13759 targetAnchor Lnet/minecraft/class_2183$class_2184; diff --git a/mappings/net/minecraft/server/command/WeatherCommand.mapping b/mappings/net/minecraft/server/command/WeatherCommand.mapping index 13264de54a..7c1408f686 100644 --- a/mappings/net/minecraft/server/command/WeatherCommand.mapping +++ b/mappings/net/minecraft/server/command/WeatherCommand.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3155 net/minecraft/server/command/WeatherCommand + FIELD field_33398 DEFAULT_DURATION I METHOD method_13823 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13824 executeClear (Lnet/minecraft/class_2168;I)I