Rename command arguments to align with value types (#1950)

Some command arguments were named based on their ID strings, which while
they may match the Mojang names, do not match the Yarn names for their
value types. This aligns the command argument types with the correct
established yarn names for their values.
This commit is contained in:
zml 2021-01-06 14:18:04 -08:00 committed by GitHub
parent 098157df6a
commit 644e5c1241
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 23 deletions

View File

@ -1,6 +1,7 @@
CLASS net/minecraft/class_5473 net/minecraft/command/argument/AngleArgumentType
FIELD field_26368 INCOMPLETE_ANGLE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_26369 EXAMPLES Ljava/util/Collection;
FIELD field_27345 INVALID_ANGLE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
METHOD method_30658 angle ()Lnet/minecraft/class_5473;
METHOD method_30660 getAngle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)F
ARG 0 context

View File

@ -1,8 +1,8 @@
CLASS net/minecraft/class_2284 net/minecraft/command/argument/FunctionArgumentType
CLASS net/minecraft/class_2284 net/minecraft/command/argument/CommandFunctionArgumentType
FIELD field_10782 UNKNOWN_FUNCTION_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
FIELD field_10783 EXAMPLES Ljava/util/Collection;
FIELD field_10784 UNKNOWN_FUNCTION_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD method_9760 function ()Lnet/minecraft/class_2284;
METHOD method_9760 commandFunction ()Lnet/minecraft/class_2284;
METHOD method_9761 getFunction (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2158;
ARG 0 context
ARG 1 id

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_2194 net/minecraft/command/argument/ItemEnchantmentArgumentType
CLASS net/minecraft/class_2194 net/minecraft/command/argument/EnchantmentArgumentType
FIELD field_9871 EXAMPLES Ljava/util/Collection;
FIELD field_9872 UNKNOWN_ENCHANTMENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
@ -7,4 +7,4 @@ CLASS net/minecraft/class_2194 net/minecraft/command/argument/ItemEnchantmentArg
METHOD method_9334 getEnchantment (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1887;
ARG 0 context
ARG 1 name
METHOD method_9336 itemEnchantment ()Lnet/minecraft/class_2194;
METHOD method_9336 enchantment ()Lnet/minecraft/class_2194;

View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_2224 net/minecraft/command/argument/NumberRangeArgumentType
METHOD method_9422 numberRange ()Lnet/minecraft/class_2224$class_2227;
METHOD method_30918 floatRange ()Lnet/minecraft/class_2224$class_2225;
METHOD method_9422 intRange ()Lnet/minecraft/class_2224$class_2227;
CLASS class_2225 FloatRangeArgumentType
FIELD field_9937 EXAMPLES Ljava/util/Collection;
CLASS class_2227 IntRangeArgumentType

View File

@ -1,11 +0,0 @@
CLASS net/minecraft/class_2216 net/minecraft/command/argument/ObjectiveCriteriaArgumentType
FIELD field_9926 EXAMPLES Ljava/util/Collection;
FIELD field_9927 INVALID_CRITERIA_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
ARG 1 context
ARG 2 builder
METHOD method_9399 objectiveCriteria ()Lnet/minecraft/class_2216;
METHOD method_9400 getStatName (Lnet/minecraft/class_3448;Ljava/lang/Object;)Ljava/lang/String;
ARG 1 stat
ARG 2 value
METHOD method_9402 getCriteria (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_274;

View File

@ -1,10 +1,10 @@
CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleArgumentType
CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType
FIELD field_9935 EXAMPLES Ljava/util/Collection;
FIELD field_9936 UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
ARG 1 context
ARG 2 builder
METHOD method_9417 particle ()Lnet/minecraft/class_2223;
METHOD method_9417 particleEffect ()Lnet/minecraft/class_2223;
METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2394;
ARG 0 reader
METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394;

View File

@ -0,0 +1,11 @@
CLASS net/minecraft/class_2216 net/minecraft/command/argument/ScoreboardCriterionArgumentType
FIELD field_9926 EXAMPLES Ljava/util/Collection;
FIELD field_9927 INVALID_CRITERION_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
ARG 1 context
ARG 2 builder
METHOD method_9399 scoreboardCriterion ()Lnet/minecraft/class_2216;
METHOD method_9400 getStatName (Lnet/minecraft/class_3448;Ljava/lang/Object;)Ljava/lang/String;
ARG 1 stat
ARG 2 value
METHOD method_9402 getCriterion (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_274;

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_2214 net/minecraft/command/argument/ObjectiveArgumentType
CLASS net/minecraft/class_2214 net/minecraft/command/argument/ScoreboardObjectiveArgumentType
FIELD field_9919 EXAMPLES Ljava/util/Collection;
FIELD field_9920 LONG_NAME_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
FIELD field_9921 READONLY_OBJECTIVE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
@ -6,7 +6,7 @@ CLASS net/minecraft/class_2214 net/minecraft/command/argument/ObjectiveArgumentT
METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
ARG 1 context
ARG 2 builder
METHOD method_9391 objective ()Lnet/minecraft/class_2214;
METHOD method_9391 scoreboardObjective ()Lnet/minecraft/class_2214;
METHOD method_9393 getWritableObjective (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_266;
ARG 0 context
ARG 1 name

View File

@ -1,8 +1,8 @@
CLASS net/minecraft/class_2201 net/minecraft/command/argument/MobEffectArgumentType
CLASS net/minecraft/class_2201 net/minecraft/command/argument/StatusEffectArgumentType
FIELD field_9895 EXAMPLES Ljava/util/Collection;
FIELD field_9896 INVALID_EFFECT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
ARG 1 context
ARG 2 builder
METHOD method_9347 getMobEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1291;
METHOD method_9350 mobEffect ()Lnet/minecraft/class_2201;
METHOD method_9347 getStatusEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1291;
METHOD method_9350 statusEffect ()Lnet/minecraft/class_2201;