From 7bedd4cd9f597f5831f7c9b1c8be0fc09589d593 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Thu, 11 Apr 2019 01:58:54 -0400 Subject: [PATCH] Map all commands and argument types --- mappings/cpy.mapping | 1 - .../packet/PlaySoundIdS2CPacket.mapping | 6 ++ .../network/packet/TitleS2CPacket.mapping | 22 +++--- .../minecraft/command/BlockDataObject.mapping | 2 + .../command/DataCommandObject.mapping | 6 ++ .../minecraft/command/EntitySelector.mapping | 20 +++++- .../command/EntitySelectorReader.mapping | 60 ++++++++++++++-- .../arguments/BlockPosArgumentType.mapping | 6 +- .../BlockPredicateArgumentType.mapping | 20 ++++-- ...ent.mapping => BlockStateArgument.mapping} | 2 +- ...mapping => BlockStateArgumentType.mapping} | 6 +- .../arguments/ColorArgumentType.mapping | 2 +- .../arguments/ColumnPosArgumentType.mapping | 6 +- .../arguments/ComponentArgumentType.mapping | 4 +- .../arguments/CoordinateArgument.mapping | 2 +- .../arguments/DefaultPosArgument.mapping | 2 +- .../EntityAnchorArgumentType.mapping | 2 +- .../arguments/EntityArgumentType.mapping | 22 ++++-- .../EntitySummonArgumentType.mapping | 2 +- .../arguments/FunctionArgumentType.mapping | 18 +++++ .../arguments/GameProfileArgumentType.mapping | 4 +- .../arguments/IdentifierArgumentType.mapping | 4 +- .../ItemEnchantmentArgumentType.mapping | 2 +- .../ItemPredicateArgumentType.mapping | 6 +- .../arguments/ItemSlotArgumentType.mapping | 6 +- .../arguments/ItemStackArgumentType.mapping | 4 +- .../arguments/MessageArgumentType.mapping | 4 +- .../arguments/MobEffectArgumentType.mapping | 2 +- .../NbtCompoundTagArgumentType.mapping | 4 +- .../arguments/NbtPathArgumentType.mapping | 12 ++++ .../arguments/NbtTagArgumentType.mapping | 4 +- .../arguments/NumberRangeArgumentType.mapping | 1 + .../arguments/ObjectiveArgumentType.mapping | 9 ++- .../ObjectiveCriteriaArgumentType.mapping | 6 +- .../arguments/OperationArgumentType.mapping | 4 +- .../arguments/ParticleArgumentType.mapping | 6 +- .../arguments/RotationArgumentType.mapping | 4 +- .../arguments/ScoreHolderArgumentType.mapping | 21 +++++- .../ScoreboardSlotArgumentType.mapping | 4 +- .../arguments/SwizzleArgumentType.mapping | 2 +- .../arguments/TeamArgumentType.mapping | 4 +- .../arguments/Vec2ArgumentType.mapping | 7 +- .../arguments/Vec3ArgumentType.mapping | 8 ++- .../effect/StatusEffectInstance.mapping | 6 ++ .../minecraft/entity/mob/MobEntity.mapping | 2 +- .../entity/player/PlayerEntity.mapping | 6 +- mappings/net/minecraft/item/ItemStack.mapping | 1 + ...boardTeam.mapping => AbstractTeam.mapping} | 3 +- .../scoreboard/ScoreboardCriterion.mapping | 2 +- .../{ScoreboardTeam.mapping => Team.mapping} | 3 +- .../minecraft/server/MinecraftServer.mapping | 1 + .../server/command/AdvancementCommand.mapping | 8 +++ .../server/command/ClearCommand.mapping | 3 + .../server/command/CloneCommand.mapping | 20 ++++++ ...Manager.mapping => CommandManager.mapping} | 4 +- .../server/command/CommandOutput.mapping | 1 + .../server/command/DataCommand.mapping | 36 +++++++++- .../server/command/DatapackCommand.mapping | 21 +++++- .../server/command/DebugCommand.mapping | 4 ++ .../command/DefaultGameModeCommand.mapping | 3 + .../server/command/DifficultyCommand.mapping | 3 + .../server/command/EffectCommand.mapping | 14 ++++ .../server/command/EnchantCommand.mapping | 5 ++ .../server/command/ExecuteCommand.mapping | 36 ++++++++++ .../server/command/ExperienceCommand.mapping | 21 ++++++ .../server/command/FillCommand.mapping | 11 +++ .../server/command/ForceLoadCommand.mapping | 12 +++- .../server/command/FunctionCommand.mapping | 1 + .../server/command/GameModeCommand.mapping | 8 +++ .../server/command/GameRuleCommand.mapping | 7 ++ .../server/command/GiveCommand.mapping | 5 ++ .../server/command/KickCommand.mapping | 4 ++ .../server/command/KillCommand.mapping | 3 + .../server/command/ListCommand.mapping | 5 ++ .../server/command/LocateCommand.mapping | 8 +++ .../server/command/LootCommand.mapping | 5 ++ .../server/command/MessageCommand.mapping | 4 ++ .../server/command/PlaySoundCommand.mapping | 11 +++ .../server/command/PublishCommand.mapping | 1 + .../server/command/ReplaceItemCommand.mapping | 10 +++ .../server/command/ScheduleCommand.mapping | 4 ++ .../server/command/ScoreboardCommand.mapping | 72 +++++++++++++++++++ .../server/command/SetBlockCommand.mapping | 13 ++++ .../command/SetWorldSpawnCommand.mapping | 3 + .../server/command/SpawnPointCommand.mapping | 4 ++ .../command/SpreadPlayersCommand.mapping | 43 +++++++++++ .../server/command/StopSoundCommand.mapping | 5 ++ .../server/command/SummonCommand.mapping | 6 ++ .../server/command/TagCommand.mapping | 13 ++++ .../server/command/TeamCommand.mapping | 61 ++++++++++++++++ .../server/command/TeleportCommand.mapping | 34 ++++++++- .../server/command/TimeCommand.mapping | 11 +++ .../server/command/TitleCommand.mapping | 15 ++++ .../server/command/TriggerCommand.mapping | 13 ++++ .../server/command/WeatherCommand.mapping | 8 +++ .../server/command/WorldBorderCommand.mapping | 21 ++++++ .../server/network/ServerPlayerEntity.mapping | 3 + mappings/net/minecraft/stat/Stat.mapping | 9 +++ .../net/minecraft/text/TextFormat.mapping | 1 + .../net/minecraft/util/NumberRange.mapping | 9 ++- .../net/minecraft/world/GameRules.mapping | 8 +++ .../world/border/WorldBorder.mapping | 8 +-- .../loot/function/SetNbtLootFunction.mapping | 5 ++ .../SerializingRegionBasedStorage.mapping | 5 ++ 104 files changed, 918 insertions(+), 93 deletions(-) delete mode 100644 mappings/cpy.mapping rename mappings/net/minecraft/command/arguments/{BlockArgument.mapping => BlockStateArgument.mapping} (70%) rename mappings/net/minecraft/command/arguments/{BlockArgumentType.mapping => BlockStateArgumentType.mapping} (53%) rename mappings/net/minecraft/scoreboard/{AbstractScoreboardTeam.mapping => AbstractTeam.mapping} (93%) rename mappings/net/minecraft/scoreboard/{ScoreboardTeam.mapping => Team.mapping} (94%) rename mappings/net/minecraft/server/command/{ServerCommandManager.mapping => CommandManager.mapping} (88%) create mode 100644 mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping diff --git a/mappings/cpy.mapping b/mappings/cpy.mapping deleted file mode 100644 index 77816c21d5..0000000000 --- a/mappings/cpy.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cpy diff --git a/mappings/net/minecraft/client/network/packet/PlaySoundIdS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/PlaySoundIdS2CPacket.mapping index 1d2cee5ea1..74c9bca005 100644 --- a/mappings/net/minecraft/client/network/packet/PlaySoundIdS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/PlaySoundIdS2CPacket.mapping @@ -6,6 +6,12 @@ CLASS ld net/minecraft/client/network/packet/PlaySoundIdS2CPacket FIELD e fixedZ I FIELD f volume F FIELD g pitch F + METHOD (Lqs;Lyk;Lcro;FF)V + ARG 1 sound + ARG 2 category + ARG 3 pos + ARG 4 volume + ARG 5 pitch METHOD b getSoundId ()Lqs; METHOD c getCategory ()Lyk; METHOD d getX ()D diff --git a/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping index 75aadf787d..c2e98d5283 100644 --- a/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping @@ -5,21 +5,23 @@ CLASS nc net/minecraft/client/network/packet/TitleS2CPacket FIELD f RESET Lnc$a; FIELD a action Lnc$a; FIELD b text Ljm; - FIELD c ticksFadeIn I - FIELD d ticksDisplay I - FIELD e ticksFadeOut I + FIELD c fadeInTicks I + FIELD d stayTicks I + FIELD e fadeOutTicks I METHOD (III)V - ARG 1 ticksFadeIn - ARG 2 ticksDisplay + ARG 1 fadeInTicks + ARG 2 stayTicks + ARG 3 fadeOutTicks METHOD (Lnc$a;Ljm;)V ARG 1 action METHOD (Lnc$a;Ljm;III)V ARG 1 action ARG 2 text - ARG 3 ticksFadeIn - ARG 4 ticksDisplay + ARG 3 fadeInTicks + ARG 4 stayTicks + ARG 5 fadeOutTicks METHOD b getAction ()Lnc$a; METHOD c getText ()Ljm; - METHOD d getTicksFadeIn ()I - METHOD e getTicksDisplay ()I - METHOD f getTicksFadeOut ()I + METHOD d getFadeInTicks ()I + METHOD e getStayTicks ()I + METHOD f getFadeOutTicks ()I diff --git a/mappings/net/minecraft/command/BlockDataObject.mapping b/mappings/net/minecraft/command/BlockDataObject.mapping index 87809a3847..fed52a0673 100644 --- a/mappings/net/minecraft/command/BlockDataObject.mapping +++ b/mappings/net/minecraft/command/BlockDataObject.mapping @@ -1,2 +1,4 @@ CLASS tz net/minecraft/command/BlockDataObject FIELD b INVALID_BLOCK_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD c blockEntity Lbtf; + FIELD d pos Lev; diff --git a/mappings/net/minecraft/command/DataCommandObject.mapping b/mappings/net/minecraft/command/DataCommandObject.mapping index 1be1583b5f..834b420396 100644 --- a/mappings/net/minecraft/command/DataCommandObject.mapping +++ b/mappings/net/minecraft/command/DataCommandObject.mapping @@ -1 +1,7 @@ CLASS ua net/minecraft/command/DataCommandObject + METHOD a getTag ()Lib; + METHOD a getGetFeedback (Lcr$h;DI)Ljm; + METHOD a setTag (Lib;)V + METHOD a getQueryFeedback (Lis;)Ljm; + ARG 1 tag + METHOD b getModifiedFeedback ()Ljm; diff --git a/mappings/net/minecraft/command/EntitySelector.mapping b/mappings/net/minecraft/command/EntitySelector.mapping index 47626f57c5..d5b7299fd8 100644 --- a/mappings/net/minecraft/command/EntitySelector.mapping +++ b/mappings/net/minecraft/command/EntitySelector.mapping @@ -1,6 +1,6 @@ CLASS ec net/minecraft/command/EntitySelector FIELD a count I - FIELD b includingNonPlayer Z + FIELD b includeNonPlayers Z FIELD c localWorldOnly Z FIELD d basePredicate Ljava/util/function/Predicate; FIELD e distance Lbi$c; @@ -9,16 +9,30 @@ CLASS ec net/minecraft/command/EntitySelector FIELD h sorter Ljava/util/function/BiConsumer; FIELD i senderOnly Z FIELD j playerName Ljava/lang/String; - FIELD k entityId Ljava/util/UUID; + FIELD k uuid Ljava/util/UUID; FIELD l type Laih; FIELD m checkPermissions Z + METHOD (IZZLjava/util/function/Predicate;Lbi$c;Ljava/util/function/Function;Lcrj;Ljava/util/function/BiConsumer;ZLjava/lang/String;Ljava/util/UUID;Laih;Z)V + ARG 1 count + ARG 2 includeNonPlayers + ARG 3 localWorldOnly + ARG 4 basePredicate + ARG 5 distance + ARG 6 positionOffset + ARG 7 box + ARG 8 sorter + ARG 9 senderOnly + ARG 10 playerName + ARG 11 uuid + ARG 12 type + ARG 13 checkPermissions METHOD a getCount ()I METHOD a getEntity (Lcd;)Laid; METHOD a getPositionPredicate (Lcro;)Ljava/util/function/Predicate; METHOD a getEntities (Lcro;Ljava/util/List;)Ljava/util/List; METHOD a getNames (Ljava/util/List;)Ljm; METHOD a appendEntitiesFromWorld (Ljava/util/List;Lvf;Lcro;Ljava/util/function/Predicate;)V - METHOD b isIncludingNonPlayer ()Z + METHOD b includesNonPlayers ()Z METHOD b getEntities (Lcd;)Ljava/util/List; METHOD c isSenderOnly ()Z METHOD c getPlayer (Lcd;)Lvg; diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping index 3cbce1c12f..0e885acf05 100644 --- a/mappings/net/minecraft/command/EntitySelectorReader.mapping +++ b/mappings/net/minecraft/command/EntitySelectorReader.mapping @@ -3,9 +3,10 @@ CLASS ed net/minecraft/command/EntitySelectorReader FIELD B sorter Ljava/util/function/BiConsumer; FIELD C senderOnly Z FIELD D playerName Ljava/lang/String; - FIELD F entityId Ljava/util/UUID; - FIELD G suggestions Ljava/util/function/BiFunction; - FIELD P type Laih; + FIELD E startCursor I + FIELD F uuid Ljava/util/UUID; + FIELD G suggestionProvider Ljava/util/function/BiFunction; + FIELD P entityType Laih; FIELD T checkPermissions Z FIELD a INVALID_ENTITY_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b UNKNOWN_SELECTOR_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; @@ -17,36 +18,83 @@ CLASS ed net/minecraft/command/EntitySelectorReader FIELD h NEAREST_FIRST Ljava/util/function/BiConsumer; FIELD i FURTHEST_FIRST Ljava/util/function/BiConsumer; FIELD j RANDOM Ljava/util/function/BiConsumer; + FIELD k DEFAULT_SUGGESTION_PROVIDER Ljava/util/function/BiFunction; FIELD l reader Lcom/mojang/brigadier/StringReader; FIELD n count I FIELD o includingNonPlayer Z FIELD p localWorldOnly Z FIELD q distance Lbi$c; - FIELD r experience Lbi$d; + FIELD r experienceRange Lbi$d; + FIELD s offsetX Ljava/lang/Double; + FIELD t offsetY Ljava/lang/Double; + FIELD u offsetZ Ljava/lang/Double; + FIELD v boxX Ljava/lang/Double; + FIELD w boxY Ljava/lang/Double; + FIELD x boxZ Ljava/lang/Double; FIELD y pitchRange Lbw; FIELD z yawRange Lbw; METHOD E hasEntityType ()Z METHOD I buildPredicate ()V METHOD a build ()Lec; + METHOD a setOffsetX (D)V + ARG 1 offsetX + METHOD a createBox (DDD)Lcrj; + ARG 1 x + ARG 3 y + ARG 5 z METHOD a setCount (I)V + ARG 1 count METHOD a setEntityType (Laih;)V + ARG 1 entityType METHOD a setDistance (Lbi$c;)V - METHOD a setExperience (Lbi$d;)V + ARG 1 distance + METHOD a setExperienceRange (Lbi$d;)V + ARG 1 experienceRange METHOD a setPitchRange (Lbw;)V METHOD a rotationPredicate (Lbw;Ljava/util/function/ToDoubleFunction;)Ljava/util/function/Predicate; METHOD a suggestSelector (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V METHOD a listSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; - METHOD a setOrdering (Ljava/util/function/BiConsumer;)V + METHOD a setSorter (Ljava/util/function/BiConsumer;)V + ARG 1 sorter METHOD a setSuggestionProvider (Ljava/util/function/BiFunction;)V METHOD a setPredicate (Ljava/util/function/Predicate;)V METHOD a setIncludingNonPlayer (Z)V + ARG 1 includingNonPlayer + METHOD b readAtSelector ()V + METHOD b setOffsetY (D)V + ARG 1 offsetY METHOD b setYawRange (Lbw;)V + METHOD b suggestSelector (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 suggestionsBuilder + METHOD c readRegular ()V + METHOD c setOffsetZ (D)V + ARG 1 offsetZ + METHOD c suggestNormal (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + METHOD d readOption ()V + METHOD d setBoxX (D)V + ARG 1 boxX + METHOD d suggestSelectorRest (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + METHOD e readNegationCharacter ()Z + METHOD e setBoxY (D)V + ARG 1 boxY METHOD e suggestOpen (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + METHOD f readTagCharacter ()Z + METHOD f setBoxZ (D)V + ARG 1 boxZ METHOD f suggestOptionOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; METHOD g getReader ()Lcom/mojang/brigadier/StringReader; METHOD g suggestOption (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; METHOD h setLocalWorldOnly ()V METHOD h suggestEndNext (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + METHOD i getDistance ()Lbi$c; + METHOD j getExperienceRange ()Lbi$d; METHOD k getPitchRange ()Lbw; METHOD l getYawRange ()Lbw; + METHOD m getOffsetX ()Ljava/lang/Double; + METHOD n getOffsetY ()Ljava/lang/Double; + METHOD o getOffsetZ ()Ljava/lang/Double; + METHOD p getBoxX ()Ljava/lang/Double; + METHOD q getBoxY ()Ljava/lang/Double; + METHOD r getBoxZ ()Ljava/lang/Double; METHOD t read ()Lec; + METHOD u isSenderOnly ()Z diff --git a/mappings/net/minecraft/command/arguments/BlockPosArgumentType.mapping b/mappings/net/minecraft/command/arguments/BlockPosArgumentType.mapping index 9eb2ed1049..1f2724f7f4 100644 --- a/mappings/net/minecraft/command/arguments/BlockPosArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/BlockPosArgumentType.mapping @@ -3,8 +3,10 @@ CLASS dj net/minecraft/command/arguments/BlockPosArgumentType FIELD b OUT_OF_WORLD_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD c EXAMPLES Ljava/util/Collection; METHOD a create ()Ldj; - METHOD a getValidPosArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lev; - METHOD b getPosArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lev; + METHOD a getLoadedBlockPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lev; + ARG 0 context + ARG 1 name + METHOD b getBlockPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lev; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/BlockPredicateArgumentType.mapping b/mappings/net/minecraft/command/arguments/BlockPredicateArgumentType.mapping index 9a0c360b92..734b2eb58f 100644 --- a/mappings/net/minecraft/command/arguments/BlockPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/BlockPredicateArgumentType.mapping @@ -1,17 +1,27 @@ CLASS df net/minecraft/command/arguments/BlockPredicateArgumentType - CLASS df$a BlockStatePredicate + CLASS df$a StatePredicate FIELD a state Lbvc; FIELD b properties Ljava/util/Set; - FIELD c compound Lib; - CLASS df$b BlockPredicateFactory + FIELD c nbt Lib; + METHOD (Lbvc;Ljava/util/Set;Lib;)V + ARG 1 state + ARG 2 properties + ARG 3 nbt + METHOD a (Lbvg;)Z + ARG 1 pos + CLASS df$b BlockPredicate CLASS df$c TagPredicate FIELD a tag Lza; - FIELD b compound Lib; + FIELD b nbt Lib; FIELD c properties Ljava/util/Map; + METHOD (Lza;Ljava/util/Map;Lib;)V + ARG 3 nbt FIELD a EXAMPLES Ljava/util/Collection; FIELD b UNKNOWN_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD a create ()Ldf; - METHOD a getPredicateArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/function/Predicate; + METHOD a getBlockPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/function/Predicate; + ARG 0 context + ARG 1 name METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/BlockArgument.mapping b/mappings/net/minecraft/command/arguments/BlockStateArgument.mapping similarity index 70% rename from mappings/net/minecraft/command/arguments/BlockArgument.mapping rename to mappings/net/minecraft/command/arguments/BlockStateArgument.mapping index 3dc0bd28f7..3919ed7e39 100644 --- a/mappings/net/minecraft/command/arguments/BlockArgument.mapping +++ b/mappings/net/minecraft/command/arguments/BlockStateArgument.mapping @@ -1,4 +1,4 @@ -CLASS de net/minecraft/command/arguments/BlockArgument +CLASS de net/minecraft/command/arguments/BlockStateArgument FIELD a state Lbvc; FIELD b properties Ljava/util/Set; FIELD c data Lib; diff --git a/mappings/net/minecraft/command/arguments/BlockArgumentType.mapping b/mappings/net/minecraft/command/arguments/BlockStateArgumentType.mapping similarity index 53% rename from mappings/net/minecraft/command/arguments/BlockArgumentType.mapping rename to mappings/net/minecraft/command/arguments/BlockStateArgumentType.mapping index a75e5a578d..1ab8bd8856 100644 --- a/mappings/net/minecraft/command/arguments/BlockArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/BlockStateArgumentType.mapping @@ -1,7 +1,9 @@ -CLASS dg net/minecraft/command/arguments/BlockArgumentType +CLASS dg net/minecraft/command/arguments/BlockStateArgumentType FIELD a EXAMPLES Ljava/util/Collection; METHOD a create ()Ldg; - METHOD a getBlockArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lde; + METHOD a (Lcom/mojang/brigadier/StringReader;)Lde; + ARG 1 reader + METHOD a getBlockState (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lde; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/ColorArgumentType.mapping b/mappings/net/minecraft/command/arguments/ColorArgumentType.mapping index 94a1798ceb..fc799b9e4a 100644 --- a/mappings/net/minecraft/command/arguments/ColorArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ColorArgumentType.mapping @@ -2,7 +2,7 @@ CLASS cg net/minecraft/command/arguments/ColorArgumentType FIELD a INVALID_COLOR_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lcg; - METHOD a getColorArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lc; + METHOD a getColor (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lc; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/ColumnPosArgumentType.mapping b/mappings/net/minecraft/command/arguments/ColumnPosArgumentType.mapping index 97fdd7933d..d8af7a026b 100644 --- a/mappings/net/minecraft/command/arguments/ColumnPosArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ColumnPosArgumentType.mapping @@ -1,11 +1,13 @@ CLASS dk net/minecraft/command/arguments/ColumnPosArgumentType - CLASS dk$a SimpleColumnPos + CLASS dk$a ColumnPos FIELD a x I FIELD b z I FIELD a INCOMPLETE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Ldk; - METHOD a parseSimple (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ldk$a; + METHOD a getColumnPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ldk$a; + ARG 0 context + ARG 1 name METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/ComponentArgumentType.mapping b/mappings/net/minecraft/command/arguments/ComponentArgumentType.mapping index 0729cba324..fbcb4bc6f4 100644 --- a/mappings/net/minecraft/command/arguments/ComponentArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ComponentArgumentType.mapping @@ -2,4 +2,6 @@ CLASS ch net/minecraft/command/arguments/ComponentArgumentType FIELD a INVALID_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lch; - METHOD a getComponentArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljm; + METHOD a getComponent (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljm; + ARG 0 context + ARG 1 name diff --git a/mappings/net/minecraft/command/arguments/CoordinateArgument.mapping b/mappings/net/minecraft/command/arguments/CoordinateArgument.mapping index 43049053d4..3f755b92e1 100644 --- a/mappings/net/minecraft/command/arguments/CoordinateArgument.mapping +++ b/mappings/net/minecraft/command/arguments/CoordinateArgument.mapping @@ -13,7 +13,7 @@ CLASS ds net/minecraft/command/arguments/CoordinateArgument ARG 0 reader METHOD a parse (Lcom/mojang/brigadier/StringReader;Z)Lds; ARG 0 reader - ARG 1 center + ARG 1 centerIntegers METHOD b isRelative (Lcom/mojang/brigadier/StringReader;)Z ARG 0 reader METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/command/arguments/DefaultPosArgument.mapping b/mappings/net/minecraft/command/arguments/DefaultPosArgument.mapping index 130844989f..8b590dea26 100644 --- a/mappings/net/minecraft/command/arguments/DefaultPosArgument.mapping +++ b/mappings/net/minecraft/command/arguments/DefaultPosArgument.mapping @@ -10,7 +10,7 @@ CLASS dt net/minecraft/command/arguments/DefaultPosArgument ARG 0 reader METHOD a parse (Lcom/mojang/brigadier/StringReader;Z)Ldt; ARG 0 reader - ARG 1 centerHorizontally + ARG 1 centerIntegers METHOD d zero ()Ldt; METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/command/arguments/EntityAnchorArgumentType.mapping b/mappings/net/minecraft/command/arguments/EntityAnchorArgumentType.mapping index 202d4da08c..7eb8a75d64 100644 --- a/mappings/net/minecraft/command/arguments/EntityAnchorArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/EntityAnchorArgumentType.mapping @@ -9,7 +9,7 @@ CLASS ck net/minecraft/command/arguments/EntityAnchorArgumentType FIELD a EXAMPLES Ljava/util/Collection; FIELD b INVALID_ANCHOR_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD a create ()Lck; - METHOD a getAnchorArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lck$a; + METHOD a getEntityAnchor (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lck$a; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/EntityArgumentType.mapping b/mappings/net/minecraft/command/arguments/EntityArgumentType.mapping index d0880202df..1ae57a80e5 100644 --- a/mappings/net/minecraft/command/arguments/EntityArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/EntityArgumentType.mapping @@ -8,13 +8,21 @@ CLASS cl net/minecraft/command/arguments/EntityArgumentType FIELD f NOT_ALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD g EXAMPLES Ljava/util/Collection; FIELD h singleTarget Z - FIELD i playerOnly Z - METHOD a oneEntity ()Lcl; - METHOD a getEntityArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Laid; - METHOD b multipleEntities ()Lcl; - METHOD c onePlayer ()Lcl; - METHOD d multiplePlayer ()Lcl; - METHOD e getServerPlayerArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lvg; + FIELD i playersOnly Z + METHOD a entity ()Lcl; + METHOD a getEntity (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Laid; + ARG 0 context + ARG 1 name + METHOD b entities ()Lcl; + METHOD b getEntities (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection; + ARG 0 context + ARG 1 name + METHOD c player ()Lcl; + METHOD c getOptionalEntities (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection; + METHOD d players ()Lcl; + METHOD d getOptionalPlayers (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection; + METHOD e getPlayer (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lvg; + METHOD f getPlayers (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/EntitySummonArgumentType.mapping b/mappings/net/minecraft/command/arguments/EntitySummonArgumentType.mapping index 3ce0bb7d7e..37bf2fc977 100644 --- a/mappings/net/minecraft/command/arguments/EntitySummonArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/EntitySummonArgumentType.mapping @@ -2,5 +2,5 @@ CLASS cm net/minecraft/command/arguments/EntitySummonArgumentType FIELD a NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lcm; - METHOD a getSummonArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lqs; + METHOD a getEntitySummon (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lqs; METHOD a validate (Lqs;)Lqs; diff --git a/mappings/net/minecraft/command/arguments/FunctionArgumentType.mapping b/mappings/net/minecraft/command/arguments/FunctionArgumentType.mapping index 60edcec4c3..9ca5d9b67b 100644 --- a/mappings/net/minecraft/command/arguments/FunctionArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/FunctionArgumentType.mapping @@ -1,5 +1,23 @@ CLASS dv net/minecraft/command/arguments/FunctionArgumentType + CLASS net/minecraft/command/arguments/FunctionArgumentType$a FunctionArgument + METHOD a getFunctions (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; + ARG 1 context + METHOD b getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;)Lcom/mojang/datafixers/util/Either; + ARG 1 context FIELD a EXAMPLES Ljava/util/Collection; FIELD b UNKNOWN_FUNCTION_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD c UNKNOWN_FUNCTION_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD a create ()Ldv; + METHOD a getFunction (Lcom/mojang/brigadier/StringReader;)Ldv$a; + METHOD a getFunctions (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection; + ARG 0 context + ARG 1 name + METHOD b getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcom/mojang/datafixers/util/Either; + ARG 0 context + ARG 1 name + METHOD c getFunction (Lcom/mojang/brigadier/context/CommandContext;Lqs;)Lca; + ARG 0 context + ARG 1 id + METHOD d getFunctionTag (Lcom/mojang/brigadier/context/CommandContext;Lqs;)Lza; + ARG 0 context + ARG 1 id diff --git a/mappings/net/minecraft/command/arguments/GameProfileArgumentType.mapping b/mappings/net/minecraft/command/arguments/GameProfileArgumentType.mapping index 50fdff4147..a5b49750f3 100644 --- a/mappings/net/minecraft/command/arguments/GameProfileArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/GameProfileArgumentType.mapping @@ -1,5 +1,7 @@ CLASS cn net/minecraft/command/arguments/GameProfileArgumentType - CLASS cn$a ProfileSupplier + CLASS cn$a GameProfileArgument + CLASS net/minecraft/command/arguments/GameProfileArgumentType$b SelectorProfileSupplier + FIELD a selector Lec; FIELD a UNKNOWN_PLAYER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lcn; diff --git a/mappings/net/minecraft/command/arguments/IdentifierArgumentType.mapping b/mappings/net/minecraft/command/arguments/IdentifierArgumentType.mapping index 97a2aa123e..191e464121 100644 --- a/mappings/net/minecraft/command/arguments/IdentifierArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/IdentifierArgumentType.mapping @@ -6,4 +6,6 @@ CLASS cy net/minecraft/command/arguments/IdentifierArgumentType METHOD a create ()Lcy; METHOD a getAdvancementArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lq; METHOD b getRecipeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lbec; - METHOD c getIdentifierArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lqs; + METHOD c getIdentifier (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lqs; + ARG 0 context + ARG 1 name diff --git a/mappings/net/minecraft/command/arguments/ItemEnchantmentArgumentType.mapping b/mappings/net/minecraft/command/arguments/ItemEnchantmentArgumentType.mapping index c746df9930..8139c6a3ac 100644 --- a/mappings/net/minecraft/command/arguments/ItemEnchantmentArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ItemEnchantmentArgumentType.mapping @@ -2,7 +2,7 @@ CLASS co net/minecraft/command/arguments/ItemEnchantmentArgumentType FIELD a UNKNOWN_ENCHANTMENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lco; - METHOD a getEnchantmentArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lbfc; + METHOD a getEnchantment (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lbfc; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/arguments/ItemPredicateArgumentType.mapping index be75331c4d..f1ac43dbda 100644 --- a/mappings/net/minecraft/command/arguments/ItemPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ItemPredicateArgumentType.mapping @@ -2,14 +2,16 @@ CLASS dz net/minecraft/command/arguments/ItemPredicateArgumentType CLASS dz$a ItemPredicate FIELD a item Lbbp; FIELD b compound Lib; - CLASS dz$b ItemPredicateFactory + CLASS dz$b ItemPredicateArgument CLASS dz$c TagPredicate FIELD a tag Lza; FIELD b compound Lib; FIELD a EXAMPLES Ljava/util/Collection; FIELD b UNKNOWN_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD a create ()Ldz; - METHOD a getPredicateArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/function/Predicate; + METHOD a getItemPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/function/Predicate; + ARG 0 context + ARG 1 name METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/ItemSlotArgumentType.mapping b/mappings/net/minecraft/command/arguments/ItemSlotArgumentType.mapping index 7745a11977..0a73f8b052 100644 --- a/mappings/net/minecraft/command/arguments/ItemSlotArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ItemSlotArgumentType.mapping @@ -3,7 +3,11 @@ CLASS db net/minecraft/command/arguments/ItemSlotArgumentType FIELD b UNKNOWN_SLOT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD c slotNamesToSlotCommandId Ljava/util/Map; METHOD a create ()Ldb; - METHOD a getSlotArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)I + METHOD a (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Integer; + ARG 1 reader + METHOD a getItemSlot (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)I + ARG 0 context + ARG 1 name METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/ItemStackArgumentType.mapping b/mappings/net/minecraft/command/arguments/ItemStackArgumentType.mapping index 0552d5acec..bd4f702039 100644 --- a/mappings/net/minecraft/command/arguments/ItemStackArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ItemStackArgumentType.mapping @@ -1,7 +1,9 @@ CLASS dw net/minecraft/command/arguments/ItemStackArgumentType FIELD a EXAMPLES Ljava/util/Collection; METHOD a create ()Ldw; - METHOD a getStackArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ldx; + METHOD a getItemStackArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ldx; + ARG 0 context + ARG 1 name METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/MessageArgumentType.mapping b/mappings/net/minecraft/command/arguments/MessageArgumentType.mapping index b021daf788..f64cc8b9f2 100644 --- a/mappings/net/minecraft/command/arguments/MessageArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/MessageArgumentType.mapping @@ -13,4 +13,6 @@ CLASS cp net/minecraft/command/arguments/MessageArgumentType METHOD b getEnd ()I FIELD a EXAMPLES Ljava/util/Collection; METHOD a create ()Lcp; - METHOD a getMessageArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljm; + METHOD a getMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljm; + ARG 0 command + ARG 1 name diff --git a/mappings/net/minecraft/command/arguments/MobEffectArgumentType.mapping b/mappings/net/minecraft/command/arguments/MobEffectArgumentType.mapping index 88e2001c40..d5689c6a16 100644 --- a/mappings/net/minecraft/command/arguments/MobEffectArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/MobEffectArgumentType.mapping @@ -2,7 +2,7 @@ CLASS cq net/minecraft/command/arguments/MobEffectArgumentType FIELD a INVALID_EFFECT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lcq; - METHOD a getEffectArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lahv; + METHOD a getMobEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lahv; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/NbtCompoundTagArgumentType.mapping b/mappings/net/minecraft/command/arguments/NbtCompoundTagArgumentType.mapping index c5c8c90be0..32f4edc549 100644 --- a/mappings/net/minecraft/command/arguments/NbtCompoundTagArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/NbtCompoundTagArgumentType.mapping @@ -1,4 +1,6 @@ CLASS ci net/minecraft/command/arguments/NbtCompoundTagArgumentType FIELD a EXAMPLES Ljava/util/Collection; METHOD a create ()Lci; - METHOD a getCompoundArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lib; + METHOD a getCompoundTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lib; + ARG 0 context + ARG 1 name diff --git a/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping b/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping index 32b9fd2e2d..ac24e2a219 100644 --- a/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping @@ -1,5 +1,17 @@ CLASS cr net/minecraft/command/arguments/NbtPathArgumentType + CLASS net/minecraft/command/arguments/NbtPathArgumentType$h NbtPath + METHOD a get (Lis;)Ljava/util/List; + ARG 1 tag + METHOD b count (Lis;)I + ARG 1 tag + CLASS cr$i NbtPathNode FIELD a INVALID_NBT_PATH_NODE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b NBT_PATH_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD c EXAMPLES Ljava/util/Collection; METHOD a create ()Lcr; + METHOD a parseNode (Lcom/mojang/brigadier/StringReader;Z)Lcr$i; + ARG 0 reader + ARG 1 first + METHOD a getNbtPath (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcr$h; + ARG 0 context + ARG 1 name diff --git a/mappings/net/minecraft/command/arguments/NbtTagArgumentType.mapping b/mappings/net/minecraft/command/arguments/NbtTagArgumentType.mapping index 8fdd3cdfd6..36c59a31d6 100644 --- a/mappings/net/minecraft/command/arguments/NbtTagArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/NbtTagArgumentType.mapping @@ -1,4 +1,6 @@ CLASS cs net/minecraft/command/arguments/NbtTagArgumentType FIELD a EXAMPLES Ljava/util/Collection; METHOD a create ()Lcs; - METHOD a getNbtTagArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lis; + METHOD a getTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lis; + ARG 0 context + ARG 1 name diff --git a/mappings/net/minecraft/command/arguments/NumberRangeArgumentType.mapping b/mappings/net/minecraft/command/arguments/NumberRangeArgumentType.mapping index 189ecfee26..879c0b6a65 100644 --- a/mappings/net/minecraft/command/arguments/NumberRangeArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/NumberRangeArgumentType.mapping @@ -7,3 +7,4 @@ CLASS cx net/minecraft/command/arguments/NumberRangeArgumentType FIELD a EXAMPLES Ljava/util/Collection; METHOD a getRangeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lbi$d; CLASS cx$c NumberSerializer + METHOD a create ()Lcx$b; diff --git a/mappings/net/minecraft/command/arguments/ObjectiveArgumentType.mapping b/mappings/net/minecraft/command/arguments/ObjectiveArgumentType.mapping index b29d64750d..92c7f6464f 100644 --- a/mappings/net/minecraft/command/arguments/ObjectiveArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ObjectiveArgumentType.mapping @@ -4,8 +4,13 @@ CLASS ct net/minecraft/command/arguments/ObjectiveArgumentType FIELD c UNKNOWN_OBJECTIVE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD d READONLY_OBJECTIVE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD a create ()Lct; - METHOD a getObjectiveArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcsl; - METHOD b getWritableObjectiveArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcsl; + METHOD a readName (Lcom/mojang/brigadier/StringReader;)Ljava/lang/String; + METHOD a getObjective (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcsl; + ARG 0 context + ARG 1 name + METHOD b getWritableObjective (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcsl; + ARG 0 context + ARG 1 name METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/ObjectiveCriteriaArgumentType.mapping b/mappings/net/minecraft/command/arguments/ObjectiveCriteriaArgumentType.mapping index df3905998c..3c4912cf19 100644 --- a/mappings/net/minecraft/command/arguments/ObjectiveCriteriaArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ObjectiveCriteriaArgumentType.mapping @@ -2,7 +2,11 @@ CLASS cu net/minecraft/command/arguments/ObjectiveCriteriaArgumentType FIELD a INVALID_CRITERIA_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lcu; - METHOD a getCriteriaArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcsr; + METHOD a getCriteria (Lcom/mojang/brigadier/StringReader;)Lcsr; + METHOD a getCriteria (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcsr; + METHOD a getStatName (Lyr;Ljava/lang/Object;)Ljava/lang/String; + ARG 1 stat + ARG 2 value METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/OperationArgumentType.mapping b/mappings/net/minecraft/command/arguments/OperationArgumentType.mapping index 0f73cbe431..6a8c4757b0 100644 --- a/mappings/net/minecraft/command/arguments/OperationArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/OperationArgumentType.mapping @@ -1,11 +1,11 @@ CLASS cv net/minecraft/command/arguments/OperationArgumentType - CLASS cv$a Operator + CLASS cv$a Operation CLASS cv$b IntOperator FIELD a EXAMPLES Ljava/util/Collection; FIELD b INVALID_OPERATION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD c DIVISION_ZERO_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD a create ()Lcv; - METHOD a getOperatorArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcv$a; + METHOD a getOperation (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcv$a; METHOD a getOperator (Ljava/lang/String;)Lcv$a; METHOD b getIntOperator (Ljava/lang/String;)Lcv$b; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/command/arguments/ParticleArgumentType.mapping b/mappings/net/minecraft/command/arguments/ParticleArgumentType.mapping index 32d1c220a2..fb31ea2aaf 100644 --- a/mappings/net/minecraft/command/arguments/ParticleArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ParticleArgumentType.mapping @@ -2,10 +2,14 @@ CLASS cw net/minecraft/command/arguments/ParticleArgumentType FIELD a UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lcw; + METHOD a (Lcom/mojang/brigadier/StringReader;)Lgd; + ARG 1 reader METHOD a readParameters (Lcom/mojang/brigadier/StringReader;Lge;)Lgd; ARG 0 reader ARG 1 type - METHOD a getParticleArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lgd; + METHOD a getParticle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lgd; + ARG 0 context + ARG 1 name METHOD b readParameters (Lcom/mojang/brigadier/StringReader;)Lgd; ARG 0 reader METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/command/arguments/RotationArgumentType.mapping b/mappings/net/minecraft/command/arguments/RotationArgumentType.mapping index 5e737b42d6..f58e08670b 100644 --- a/mappings/net/minecraft/command/arguments/RotationArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/RotationArgumentType.mapping @@ -2,6 +2,6 @@ CLASS dn net/minecraft/command/arguments/RotationArgumentType FIELD a INCOMPLETE_ROTATION_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Ldn; - METHOD a getRotationArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ldl; + METHOD a getRotation (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ldl; ARG 0 context - ARG 1 argumentName + ARG 1 name diff --git a/mappings/net/minecraft/command/arguments/ScoreHolderArgumentType.mapping b/mappings/net/minecraft/command/arguments/ScoreHolderArgumentType.mapping index 8a86b32b7a..e8ae56a032 100644 --- a/mappings/net/minecraft/command/arguments/ScoreHolderArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ScoreHolderArgumentType.mapping @@ -1,5 +1,7 @@ CLASS cz net/minecraft/command/arguments/ScoreHolderArgumentType CLASS cz$a ScoreHolder + METHOD getNames (Lcd;Ljava/util/function/Supplier;)Ljava/util/Collection; + ARG 1 source CLASS cz$b SelectorScoreHolder FIELD a selector Lec; CLASS cz$c Serializer @@ -7,5 +9,20 @@ CLASS cz net/minecraft/command/arguments/ScoreHolderArgumentType FIELD b EXAMPLES Ljava/util/Collection; FIELD c EMPTY_SCORE_HOLDER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD d multiple Z - METHOD a getHolderArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/String; - METHOD a getHoldersArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/Collection; + METHOD (Z)V + ARG 1 multiple + METHOD a scoreHolder ()Lcz; + METHOD a getScoreHolder (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/String; + ARG 0 context + ARG 1 name + METHOD a getScoreHolders (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/Collection; + ARG 0 context + ARG 1 name + ARG 2 players + METHOD b scoreHolders ()Lcz; + METHOD b getScoreHolders (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection; + ARG 0 context + ARG 1 name + METHOD c getScoreboardScoreHolders (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection; + ARG 0 context + ARG 1 name diff --git a/mappings/net/minecraft/command/arguments/ScoreboardSlotArgumentType.mapping b/mappings/net/minecraft/command/arguments/ScoreboardSlotArgumentType.mapping index 9bb80cf676..b95c130217 100644 --- a/mappings/net/minecraft/command/arguments/ScoreboardSlotArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ScoreboardSlotArgumentType.mapping @@ -2,7 +2,9 @@ CLASS da net/minecraft/command/arguments/ScoreboardSlotArgumentType FIELD a INVALID_SLOT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Lda; - METHOD a getScorebordSlotArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)I + METHOD a getScorebordSlot (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)I + ARG 0 context + ARG 1 name METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/SwizzleArgumentType.mapping b/mappings/net/minecraft/command/arguments/SwizzleArgumentType.mapping index 93cc1e0f1b..ad1b4d1fb9 100644 --- a/mappings/net/minecraft/command/arguments/SwizzleArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/SwizzleArgumentType.mapping @@ -2,4 +2,4 @@ CLASS dp net/minecraft/command/arguments/SwizzleArgumentType FIELD a EXAMPLES Ljava/util/Collection; FIELD b INVALID_SWIZZLE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD a create ()Ldp; - METHOD a getSwizzleArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/EnumSet; + METHOD a getSwizzle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/EnumSet; diff --git a/mappings/net/minecraft/command/arguments/TeamArgumentType.mapping b/mappings/net/minecraft/command/arguments/TeamArgumentType.mapping index 87d12504f1..b0a1a87271 100644 --- a/mappings/net/minecraft/command/arguments/TeamArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/TeamArgumentType.mapping @@ -2,7 +2,9 @@ CLASS dc net/minecraft/command/arguments/TeamArgumentType FIELD a EXAMPLES Ljava/util/Collection; FIELD b UNKNOWN_TEAM_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD a create ()Ldc; - METHOD a getTeamArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcsm; + METHOD a getTeam (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcsm; + ARG 0 context + ARG 1 name METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/Vec2ArgumentType.mapping b/mappings/net/minecraft/command/arguments/Vec2ArgumentType.mapping index 63d77c12d7..f07308b384 100644 --- a/mappings/net/minecraft/command/arguments/Vec2ArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/Vec2ArgumentType.mapping @@ -1,8 +1,13 @@ CLASS dq net/minecraft/command/arguments/Vec2ArgumentType FIELD a INCOMPLETE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; + FIELD c centerIntegers Z + METHOD (Z)V + ARG 1 centerIntegers METHOD a create ()Ldq; - METHOD a getVec2Argument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcrn; + METHOD a getVec2 (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcrn; + ARG 0 context + ARG 1 name METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/mappings/net/minecraft/command/arguments/Vec3ArgumentType.mapping b/mappings/net/minecraft/command/arguments/Vec3ArgumentType.mapping index 2f99601841..23ba9534dd 100644 --- a/mappings/net/minecraft/command/arguments/Vec3ArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/Vec3ArgumentType.mapping @@ -2,9 +2,15 @@ CLASS dr net/minecraft/command/arguments/Vec3ArgumentType FIELD a INCOMPLETE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b MIXED_COORDINATE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD c EXAMPLES Ljava/util/Collection; + FIELD d centerIntegers Z + METHOD (Z)V + ARG 1 centerIntegers METHOD a create ()Ldr; - METHOD a getVec3Argument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcro; + METHOD a getVec3 (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcro; + ARG 0 context + ARG 1 name METHOD a create (Z)Ldr; + ARG 0 centerIntegers METHOD b getPosArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ldl; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 16b211805f..aa180be890 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -13,12 +13,18 @@ CLASS ahx net/minecraft/entity/effect/StatusEffectInstance METHOD (Lahv;II)V ARG 1 type ARG 2 duration + METHOD (Lahv;IIZZ)V + ARG 1 effect + ARG 2 duration + ARG 3 amplifier + ARG 5 showParticles METHOD (Lahv;IIZZZ)V ARG 1 type ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 showParticles + ARG 6 showIcon METHOD a getEffectType ()Lahv; METHOD a upgrade (Lahx;)Z METHOD a update (Laim;)Z diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 3bfc2d3713..0a0fec32a5 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -63,7 +63,7 @@ CLASS ain net/minecraft/entity/mob/MobEntity ARG 1 current ARG 2 previous ARG 3 slot - METHOD a prepareEntityData (Lbhb;Lagw;Laip;Laiy;Lib;)Laiy; + METHOD a initialize (Lbhb;Lagw;Laip;Laiy;Lib;)Laiy; ARG 3 difficulty METHOD a canSpawn (Lbhb;Laip;)Z METHOD a canSpawn (Lbhd;)Z diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index f3dd79e74c..c80f5413e9 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -15,7 +15,7 @@ CLASS avr net/minecraft/entity/player/PlayerEntity FIELD bO abilities Lavo; FIELD bP experience I FIELD bQ experienceLevel I - FIELD bR experienceBarProgress F + FIELD bR experienceLevelProgress F FIELD bS enchantmentTableSeed I FIELD bU fishHook Latd; FIELD bW gameProfile Lcom/mojang/authlib/GameProfile; @@ -96,6 +96,8 @@ CLASS avr net/minecraft/entity/player/PlayerEntity METHOD c isUsingEffectiveTool (Lbvc;)Z METHOD c getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; ARG 0 nickname + METHOD c addTellClickEvent (Ljm;)Ljm; + ARG 1 component METHOD d addExperience (I)V METHOD dA getScore ()I METHOD dB vanishCursedItems ()V @@ -107,12 +109,14 @@ CLASS avr net/minecraft/entity/player/PlayerEntity METHOD dI getSpawnPosition ()Lev; METHOD dJ isSpawnForced ()Z METHOD dK getEnchantmentTableSeed ()I + METHOD dL getNextLevelExperience ()I METHOD dM getHungerManager ()Laxr; METHOD dN canFoodHeal ()Z METHOD dO canModifyWorld ()Z METHOD dP getEnderChestInventory ()Laza; METHOD dQ dropShoulderEntities ()V METHOD dR getScoreboard ()Lcso; + METHOD dS getNameAndUuid ()Ljm; METHOD dT getReducedDebugInfo ()Z METHOD dU getShoulderEntityLeft ()Lib; METHOD dV getShoulderEntityRight ()Lib; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 9b9a25ab05..09186de741 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -43,6 +43,7 @@ CLASS bbu net/minecraft/item/ItemStack METHOD a useOnBlock (Lbdf;)Lagy; METHOD a addEnchantment (Lbfc;I)V ARG 1 enchantment + ARG 2 level METHOD a update (Lbha;Laid;IZ)V ARG 1 world ARG 2 owner diff --git a/mappings/net/minecraft/scoreboard/AbstractScoreboardTeam.mapping b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping similarity index 93% rename from mappings/net/minecraft/scoreboard/AbstractScoreboardTeam.mapping rename to mappings/net/minecraft/scoreboard/AbstractTeam.mapping index b5476f81c2..c125a57f71 100644 --- a/mappings/net/minecraft/scoreboard/AbstractScoreboardTeam.mapping +++ b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping @@ -1,5 +1,6 @@ -CLASS csq net/minecraft/scoreboard/AbstractScoreboardTeam +CLASS csq net/minecraft/scoreboard/AbstractTeam CLASS csq$a CollisionRule + FIELD a ALWAYS Lcsq$a; FIELD e name Ljava/lang/String; FIELD f value I FIELD g COLLISION_RULES Ljava/util/Map; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping index 36397a171b..f26f58a921 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping @@ -1,5 +1,5 @@ CLASS csr net/minecraft/scoreboard/ScoreboardCriterion - CLASS csr$a Type + CLASS csr$a RenderType FIELD a INTEGER Lcsr$a; FIELD b HEARTS Lcsr$a; FIELD c name Ljava/lang/String; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping b/mappings/net/minecraft/scoreboard/Team.mapping similarity index 94% rename from mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping rename to mappings/net/minecraft/scoreboard/Team.mapping index 4120354c2f..924aed97ec 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardTeam.mapping +++ b/mappings/net/minecraft/scoreboard/Team.mapping @@ -1,4 +1,4 @@ -CLASS csm net/minecraft/scoreboard/ScoreboardTeam +CLASS csm net/minecraft/scoreboard/Team FIELD a scoreboard Lcso; FIELD b name Ljava/lang/String; FIELD c playerList Ljava/util/Set; @@ -13,6 +13,7 @@ CLASS csm net/minecraft/scoreboard/ScoreboardTeam FIELD l collisionRule Lcsq$a; METHOD (Lcso;Ljava/lang/String;)V ARG 1 scoreboard + ARG 2 name METHOD a setFriendlyFlagsBitwise (I)V METHOD a setColor (Lc;)V METHOD a setCollisionRule (Lcsq$a;)V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index fcad2c7cc2..a40e0577df 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -110,6 +110,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD aC getCommandFunctionManager ()Lre; METHOD aD reload ()V METHOD aE getDataManager ()Lxb; + METHOD aF getResourcePackContainerManager ()Lws; METHOD aH getCommandManager ()Lce; METHOD aI getCommandSource ()Lcd; METHOD aJ getRecipeManager ()Lbed; diff --git a/mappings/net/minecraft/server/command/AdvancementCommand.mapping b/mappings/net/minecraft/server/command/AdvancementCommand.mapping index 9493dc5f9d..c047903969 100644 --- a/mappings/net/minecraft/server/command/AdvancementCommand.mapping +++ b/mappings/net/minecraft/server/command/AdvancementCommand.mapping @@ -13,7 +13,15 @@ CLASS rl net/minecraft/server/command/AdvancementCommand FIELD g after Z FIELD a SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; METHOD a executeAdvancement (Lcd;Ljava/util/Collection;Lrl$a;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets + ARG 2 operation + ARG 3 selection METHOD a executeCriterion (Lcd;Ljava/util/Collection;Lrl$a;Lq;Ljava/lang/String;)I + ARG 0 source + ARG 1 targets + ARG 2 operation + ARG 3 advancement ARG 4 criterion METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V METHOD a searchAndAdd (Lq;Ljava/util/List;)V diff --git a/mappings/net/minecraft/server/command/ClearCommand.mapping b/mappings/net/minecraft/server/command/ClearCommand.mapping index 2873772c20..2f5726e305 100644 --- a/mappings/net/minecraft/server/command/ClearCommand.mapping +++ b/mappings/net/minecraft/server/command/ClearCommand.mapping @@ -1,4 +1,7 @@ CLASS rq net/minecraft/server/command/ClearCommand FIELD a FAILED_SINGLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b FAILED_MULTIPLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD a execute (Lcd;Ljava/util/Collection;Ljava/util/function/Predicate;I)I + ARG 2 item + ARG 3 maxCount METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/CloneCommand.mapping b/mappings/net/minecraft/server/command/CloneCommand.mapping index 3d8ce96dbb..e6023d7601 100644 --- a/mappings/net/minecraft/server/command/CloneCommand.mapping +++ b/mappings/net/minecraft/server/command/CloneCommand.mapping @@ -1,6 +1,26 @@ CLASS rr net/minecraft/server/command/CloneCommand + CLASS rr$a BlockInfo + FIELD a pos Lev; + FIELD b state Lbvc; + FIELD c blockEntityTag Lib; + METHOD (Lev;Lbvc;Lib;)V + ARG 1 pos + ARG 2 state + ARG 3 blockEntityTag + CLASS rr$b Mode + FIELD d allowsOverlap Z + METHOD (Z)V + ARG 1 allowsOverlap + METHOD a allowsOverlap ()Z FIELD a IS_AIR_PREDICATE Ljava/util/function/Predicate; FIELD b OVERLAP_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD c TOOBIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD d FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a execute (Lcd;Lev;Lev;Lev;Ljava/util/function/Predicate;Lrr$b;)I + ARG 0 source + ARG 1 begin + ARG 2 end + ARG 3 destination + ARG 4 filter + ARG 5 mode METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/ServerCommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping similarity index 88% rename from mappings/net/minecraft/server/command/ServerCommandManager.mapping rename to mappings/net/minecraft/server/command/CommandManager.mapping index a5fab7d0ad..ce44d0341f 100644 --- a/mappings/net/minecraft/server/command/ServerCommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -1,4 +1,4 @@ -CLASS ce net/minecraft/server/command/ServerCommandManager +CLASS ce net/minecraft/server/command/CommandManager CLASS ce$a CommandParser FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b dispatcher Lcom/mojang/brigadier/CommandDispatcher; @@ -8,4 +8,6 @@ CLASS ce net/minecraft/server/command/ServerCommandManager METHOD a getCommandValidator (Lce$a;)Ljava/util/function/Predicate; METHOD a literal (Ljava/lang/String;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; METHOD a argument (Ljava/lang/String;Lcom/mojang/brigadier/arguments/ArgumentType;)Lcom/mojang/brigadier/builder/RequiredArgumentBuilder; + ARG 0 name + ARG 1 type METHOD a sendCommandTree (Lvg;)V diff --git a/mappings/net/minecraft/server/command/CommandOutput.mapping b/mappings/net/minecraft/server/command/CommandOutput.mapping index a4dce68f4c..6b5567fd9d 100644 --- a/mappings/net/minecraft/server/command/CommandOutput.mapping +++ b/mappings/net/minecraft/server/command/CommandOutput.mapping @@ -1,4 +1,5 @@ CLASS cc net/minecraft/server/command/CommandOutput + FIELD a_ DUMMY Lcc; METHOD H_ shouldBroadcastConsoleToOps ()Z METHOD a sendCommandFeedback ()Z METHOD a appendCommandFeedback (Ljm;)V diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index 27fd4ffb4e..4be12332ad 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -1,5 +1,12 @@ CLASS ub net/minecraft/server/command/DataCommand - FIELD a OBJECTS Ljava/util/List; + CLASS ub$c ObjectType + METHOD a addArgumentsToBuilder (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 1 argumentBuilder + METHOD a getObject (Lcom/mojang/brigadier/context/CommandContext;)Lua; + ARG 1 context + FIELD a OBJECT_TYPES Ljava/util/List; + FIELD b TARGET_OBJECT_TYPES Ljava/util/List; + FIELD c SOURCE_OBJECT_TYPES Ljava/util/List; FIELD d MERGE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD e GET_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD f GET_UNKNOWN_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; @@ -7,4 +14,31 @@ CLASS ub net/minecraft/server/command/DataCommand FIELD h MODIFY_EXPECTED_LIST_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD i MODIFY_EXPECTED_OBJECT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD j MODIFY_INVALID_INDEX_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD a executeInsert (ILib;Lcr$h;Ljava/util/List;)I + ARG 0 integer + METHOD a executeGet (Lcd;Lua;)I + ARG 0 source + ARG 1 object + METHOD a executeRemove (Lcd;Lua;Lcr$h;)I + ARG 0 source + ARG 1 object + ARG 2 path + METHOD a executeGet (Lcd;Lua;Lcr$h;D)I + ARG 0 source + ARG 1 object + ARG 2 path + ARG 3 scale + METHOD a executeMerge (Lcd;Lua;Lib;)I + ARG 0 source + ARG 1 object + ARG 2 tag METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD a (Lcom/mojang/brigadier/context/CommandContext;Lub$c;Lub$a;Ljava/util/List;)I + ARG 1 objectType + METHOD a getTag (Lcr$h;Lua;)Lis; + ARG 0 path + ARG 1 object + METHOD b executeGet (Lcd;Lua;Lcr$h;)I + ARG 0 source + ARG 1 object + ARG 2 path diff --git a/mappings/net/minecraft/server/command/DatapackCommand.mapping b/mappings/net/minecraft/server/command/DatapackCommand.mapping index 4518409d2b..ba25ae9769 100644 --- a/mappings/net/minecraft/server/command/DatapackCommand.mapping +++ b/mappings/net/minecraft/server/command/DatapackCommand.mapping @@ -1,10 +1,25 @@ CLASS rs net/minecraft/server/command/DatapackCommand + CLASS rs$a PackAdder FIELD a UNKNOWN_DATAPACK_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD b ALREADY_ENABLED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD c ALREADY_DISABLED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD e NAME_SUGGESTION Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD d ENABLED_CONTAINERS_SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD e DISABLED_CONTAINERS_SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; METHOD a executeList (Lcd;)I + ARG 0 source + METHOD a executeDisable (Lcd;Lwv;)I + ARG 0 source + ARG 1 container + METHOD a executeEnable (Lcd;Lwv;Lrs$a;)I + ARG 0 source + ARG 1 container + ARG 2 packAdder METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V METHOD a getPackContainer (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Z)Lwv; - METHOD b executeAvailable (Lcd;)I - METHOD c executeEnabled (Lcd;)I + ARG 0 context + ARG 1 name + ARG 2 enable + METHOD b executeListAvailable (Lcd;)I + ARG 0 source + METHOD c executeListEnabled (Lcd;)I + ARG 0 source diff --git a/mappings/net/minecraft/server/command/DebugCommand.mapping b/mappings/net/minecraft/server/command/DebugCommand.mapping index 38d7213173..f665c600d1 100644 --- a/mappings/net/minecraft/server/command/DebugCommand.mapping +++ b/mappings/net/minecraft/server/command/DebugCommand.mapping @@ -1,4 +1,8 @@ CLASS ru net/minecraft/server/command/DebugCommand FIELD a NORUNNING_EXCPETION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b ALREADYRUNNING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a executeStart (Lcd;)I + ARG 0 source METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b executeStop (Lcd;)I + ARG 0 source diff --git a/mappings/net/minecraft/server/command/DefaultGameModeCommand.mapping b/mappings/net/minecraft/server/command/DefaultGameModeCommand.mapping index bd09c77b14..8fca043317 100644 --- a/mappings/net/minecraft/server/command/DefaultGameModeCommand.mapping +++ b/mappings/net/minecraft/server/command/DefaultGameModeCommand.mapping @@ -1,2 +1,5 @@ CLASS rv net/minecraft/server/command/DefaultGameModeCommand + METHOD a execute (Lcd;Lbgx;)I + ARG 0 source + ARG 1 defaultGameMode METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/DifficultyCommand.mapping b/mappings/net/minecraft/server/command/DifficultyCommand.mapping index c1f66e25bd..d550a28188 100644 --- a/mappings/net/minecraft/server/command/DifficultyCommand.mapping +++ b/mappings/net/minecraft/server/command/DifficultyCommand.mapping @@ -1,3 +1,6 @@ CLASS rw net/minecraft/server/command/DifficultyCommand FIELD a FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD a execute (Lcd;Lagv;)I + ARG 0 source + ARG 1 difficulty METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/EffectCommand.mapping b/mappings/net/minecraft/server/command/EffectCommand.mapping index 04ecbe2fa8..7feb0bf1e4 100644 --- a/mappings/net/minecraft/server/command/EffectCommand.mapping +++ b/mappings/net/minecraft/server/command/EffectCommand.mapping @@ -2,4 +2,18 @@ CLASS rx net/minecraft/server/command/EffectCommand FIELD a GIVE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b CLEAR_EVERYTHING_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD c CLEAR_SPECIFIC_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a executeClear (Lcd;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets + METHOD a executeClear (Lcd;Ljava/util/Collection;Lahv;)I + ARG 0 source + ARG 1 targets + ARG 2 effect + METHOD a executeGive (Lcd;Ljava/util/Collection;Lahv;Ljava/lang/Integer;IZ)I + ARG 0 source + ARG 1 targets + ARG 2 effect + ARG 3 seconds + ARG 4 amplifier + ARG 5 showParticles METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/EnchantCommand.mapping b/mappings/net/minecraft/server/command/EnchantCommand.mapping index 7ec18a0a10..e2a9377254 100644 --- a/mappings/net/minecraft/server/command/EnchantCommand.mapping +++ b/mappings/net/minecraft/server/command/EnchantCommand.mapping @@ -4,4 +4,9 @@ CLASS rz net/minecraft/server/command/EnchantCommand FIELD c FAILED_INCOMPATIBLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD d FAILED_LEVEL_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD e FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a execute (Lcd;Ljava/util/Collection;Lbfc;I)I + ARG 0 source + ARG 1 targets + ARG 2 enchantment + ARG 3 level METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 581ec85e1b..405f1082c3 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -1,5 +1,41 @@ CLASS sa net/minecraft/server/command/ExecuteCommand + CLASS sa$a Condition FIELD a BLOCKS_TOOBIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD b CONDITIONAL_FAIL_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD c CONDITIONAL_FAIL_COUNT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD a executeStoreScore (Lcd;Ljava/util/Collection;Lcsl;Z)Lcd; + ARG 0 source + ARG 1 targets + ARG 2 objective + METHOD a executeStoreBossbar (Lcd;Lri;ZZ)Lcd; + ARG 1 bossBar + METHOD a executeStoreData (Lcd;Lua;Lcr$h;Ljava/util/function/IntFunction;Z)Lcd; METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD a testObjectiveCondition (Lcom/mojang/brigadier/context/CommandContext;Lbi$d;)Z + METHOD a testObjectiveCondition (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/function/BiPredicate;)Z + METHOD a executePositiveBlockCondition (Lcom/mojang/brigadier/context/CommandContext;Z)I + ARG 1 masked + METHOD a transformSourceForCondition (Lcom/mojang/brigadier/context/CommandContext;ZZ)Ljava/util/Collection; + ARG 1 positive + ARG 2 result + METHOD a executeCondition (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/ArgumentBuilder;ZLsa$b;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + METHOD a addBlockConditionExecutes (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/ArgumentBuilder;ZZ)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 2 positive + ARG 3 masked + METHOD a addConditionArguments (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;Z)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 node + ARG 1 argumentBuilder + ARG 2 positive + METHOD a addStoreArguments (Lcom/mojang/brigadier/tree/LiteralCommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;Z)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 node + ARG 1 builder + ARG 2 result + METHOD a countPathMatches (Lua;Lcr$h;)I + ARG 0 object + ARG 1 path + METHOD a testBlockCondition (Lvf;Lev;Lev;Lev;Z)Ljava/util/OptionalInt; + METHOD a executeCondition (ZLsa$a;)Lcom/mojang/brigadier/Command; + ARG 0 positive + ARG 1 condition + METHOD b executeNegativeBlockCondition (Lcom/mojang/brigadier/context/CommandContext;Z)I + METHOD c testBlockCondition (Lcom/mojang/brigadier/context/CommandContext;Z)Ljava/util/OptionalInt; diff --git a/mappings/net/minecraft/server/command/ExperienceCommand.mapping b/mappings/net/minecraft/server/command/ExperienceCommand.mapping index 00548ae0b8..34675a3931 100644 --- a/mappings/net/minecraft/server/command/ExperienceCommand.mapping +++ b/mappings/net/minecraft/server/command/ExperienceCommand.mapping @@ -1,3 +1,24 @@ CLASS sb net/minecraft/server/command/ExperienceCommand + CLASS sb$a Component + FIELD c adder Ljava/util/function/BiConsumer; + FIELD d setter Ljava/util/function/BiPredicate; + FIELD e name Ljava/lang/String; + FIELD f getter Ljava/util/function/ToIntFunction; + METHOD (Ljava/lang/String;Ljava/util/function/BiConsumer;Ljava/util/function/BiPredicate;Ljava/util/function/ToIntFunction;)V + ARG 1 name + ARG 2 adder + ARG 3 setter + ARG 4 getter FIELD a SET_POINT_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a executeAdd (Lcd;Ljava/util/Collection;ILsb$a;)I + ARG 3 component + METHOD a executeQuery (Lcd;Lvg;Lsb$a;)I + ARG 0 source + ARG 1 player + ARG 2 component METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b executeSet (Lcd;Ljava/util/Collection;ILsb$a;)I + ARG 0 source + ARG 1 targets + ARG 2 amount + ARG 3 component diff --git a/mappings/net/minecraft/server/command/FillCommand.mapping b/mappings/net/minecraft/server/command/FillCommand.mapping index d4513388a5..5697ca9d56 100644 --- a/mappings/net/minecraft/server/command/FillCommand.mapping +++ b/mappings/net/minecraft/server/command/FillCommand.mapping @@ -1,4 +1,15 @@ CLASS sc net/minecraft/server/command/FillCommand + CLASS sc$a Mode + FIELD e filter Ltg$a; + METHOD (Ltg$a;)V + ARG 1 filter FIELD a TOOBIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD b AIR_BLOCK_ARGUMENT Lde; FIELD c FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a execute (Lcd;Lchk;Lde;Lsc$a;Ljava/util/function/Predicate;)I + ARG 0 source + ARG 1 range + ARG 2 block + ARG 3 mode + ARG 4 filter METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/ForceLoadCommand.mapping b/mappings/net/minecraft/server/command/ForceLoadCommand.mapping index 128a7cbf10..f730d6fba4 100644 --- a/mappings/net/minecraft/server/command/ForceLoadCommand.mapping +++ b/mappings/net/minecraft/server/command/ForceLoadCommand.mapping @@ -3,10 +3,16 @@ CLASS sd net/minecraft/server/command/ForceLoadCommand FIELD b QUERY_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD c ADDED_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD d REMOVED_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - METHOD a setForceLoaded (Lcd;Ldk$a;Ldk$a;Z)I + METHOD a executeQuery (Lcd;)I + ARG 0 source + METHOD a executeQuery (Lcd;Ldk$a;)I + ARG 0 source + ARG 1 pos + METHOD a executeChange (Lcd;Ldk$a;Ldk$a;Z)I ARG 0 source ARG 1 from ARG 2 to - ARG 3 isForceLoaded + ARG 3 forceLoaded METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V - METHOD b clearAllForceLoaded (Lcd;)I + METHOD b executeRemoveAll (Lcd;)I + ARG 0 source diff --git a/mappings/net/minecraft/server/command/FunctionCommand.mapping b/mappings/net/minecraft/server/command/FunctionCommand.mapping index e497c06017..e63f4b205e 100644 --- a/mappings/net/minecraft/server/command/FunctionCommand.mapping +++ b/mappings/net/minecraft/server/command/FunctionCommand.mapping @@ -1,3 +1,4 @@ CLASS se net/minecraft/server/command/FunctionCommand FIELD a SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; + METHOD a execute (Lcd;Ljava/util/Collection;)I METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/GameModeCommand.mapping b/mappings/net/minecraft/server/command/GameModeCommand.mapping index 0f5069dde5..4591838db0 100644 --- a/mappings/net/minecraft/server/command/GameModeCommand.mapping +++ b/mappings/net/minecraft/server/command/GameModeCommand.mapping @@ -1,2 +1,10 @@ CLASS sf net/minecraft/server/command/GameModeCommand + METHOD a setGameMode (Lcd;Lvg;Lbgx;)V + ARG 0 source + ARG 1 player + ARG 2 gameMode METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD a execute (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/Collection;Lbgx;)I + ARG 0 context + ARG 1 targets + ARG 2 gameMode diff --git a/mappings/net/minecraft/server/command/GameRuleCommand.mapping b/mappings/net/minecraft/server/command/GameRuleCommand.mapping index edb2c15b71..463ddb5d55 100644 --- a/mappings/net/minecraft/server/command/GameRuleCommand.mapping +++ b/mappings/net/minecraft/server/command/GameRuleCommand.mapping @@ -1,2 +1,9 @@ CLASS sg net/minecraft/server/command/GameRuleCommand + METHOD a executeQuery (Lcd;Ljava/lang/String;)I + ARG 0 source + ARG 1 gameRule + METHOD a executeSet (Lcd;Ljava/lang/String;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 source + ARG 1 gameRule + ARG 2 context METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/GiveCommand.mapping b/mappings/net/minecraft/server/command/GiveCommand.mapping index 81d5956111..ae3f32d49d 100644 --- a/mappings/net/minecraft/server/command/GiveCommand.mapping +++ b/mappings/net/minecraft/server/command/GiveCommand.mapping @@ -1,2 +1,7 @@ CLASS sh net/minecraft/server/command/GiveCommand + METHOD a execute (Lcd;Ldx;Ljava/util/Collection;I)I + ARG 0 source + ARG 1 item + ARG 2 targets + ARG 3 count METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/KickCommand.mapping b/mappings/net/minecraft/server/command/KickCommand.mapping index c4e9adb80d..37cc54d277 100644 --- a/mappings/net/minecraft/server/command/KickCommand.mapping +++ b/mappings/net/minecraft/server/command/KickCommand.mapping @@ -1,2 +1,6 @@ CLASS sj net/minecraft/server/command/KickCommand + METHOD a execute (Lcd;Ljava/util/Collection;Ljm;)I + ARG 0 source + ARG 1 targets + ARG 2 reason METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/KillCommand.mapping b/mappings/net/minecraft/server/command/KillCommand.mapping index 07707e688d..8758ead843 100644 --- a/mappings/net/minecraft/server/command/KillCommand.mapping +++ b/mappings/net/minecraft/server/command/KillCommand.mapping @@ -1,2 +1,5 @@ CLASS sk net/minecraft/server/command/KillCommand + METHOD a execute (Lcd;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/ListCommand.mapping b/mappings/net/minecraft/server/command/ListCommand.mapping index 79db845db9..f31d323f60 100644 --- a/mappings/net/minecraft/server/command/ListCommand.mapping +++ b/mappings/net/minecraft/server/command/ListCommand.mapping @@ -1,2 +1,7 @@ CLASS sl net/minecraft/server/command/ListCommand + METHOD a executeNames (Lcd;)I + METHOD a execute (Lcd;Ljava/util/function/Function;)I + ARG 0 source + ARG 1 nameProvider METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b executeUuids (Lcd;)I diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index f8953242a8..2fddb8e0c2 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -1,3 +1,11 @@ CLASS sm net/minecraft/server/command/LocateCommand FIELD a FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a getDistance (IIII)F + ARG 0 x1 + ARG 1 y1 + ARG 2 x2 + ARG 3 y2 + METHOD a execute (Lcd;Ljava/lang/String;)I + ARG 0 source + ARG 1 structure METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/LootCommand.mapping b/mappings/net/minecraft/server/command/LootCommand.mapping index 83729f07ce..7eca0fd9c1 100644 --- a/mappings/net/minecraft/server/command/LootCommand.mapping +++ b/mappings/net/minecraft/server/command/LootCommand.mapping @@ -1,4 +1,9 @@ CLASS sn net/minecraft/server/command/LootCommand + FIELD a SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; FIELD b NOHELD_ITEMS_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD c NOLOOTTABLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD a executeKill (Lcom/mojang/brigadier/context/CommandContext;Laid;Lsn$b;)I + METHOD a executeMine (Lcom/mojang/brigadier/context/CommandContext;Lev;Lbbu;Lsn$b;)I + METHOD a executeFish (Lcom/mojang/brigadier/context/CommandContext;Lqs;Lev;Lbbu;Lsn$b;)I + METHOD a executeLoot (Lcom/mojang/brigadier/context/CommandContext;Lqs;Lsn$b;)I diff --git a/mappings/net/minecraft/server/command/MessageCommand.mapping b/mappings/net/minecraft/server/command/MessageCommand.mapping index f164a33d7f..8075f9a8ba 100644 --- a/mappings/net/minecraft/server/command/MessageCommand.mapping +++ b/mappings/net/minecraft/server/command/MessageCommand.mapping @@ -1,2 +1,6 @@ CLASS so net/minecraft/server/command/MessageCommand + METHOD a execute (Lcd;Ljava/util/Collection;Ljm;)I + ARG 0 source + ARG 1 targets + ARG 2 message METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/PlaySoundCommand.mapping b/mappings/net/minecraft/server/command/PlaySoundCommand.mapping index fa6bed59f6..f28b2b75a7 100644 --- a/mappings/net/minecraft/server/command/PlaySoundCommand.mapping +++ b/mappings/net/minecraft/server/command/PlaySoundCommand.mapping @@ -1,3 +1,14 @@ CLASS st net/minecraft/server/command/PlaySoundCommand FIELD a FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a execute (Lcd;Ljava/util/Collection;Lqs;Lyk;Lcro;FFF)I + ARG 0 source + ARG 1 targets + ARG 2 sound + ARG 3 category + ARG 4 pos + ARG 5 volume + ARG 6 pitch + ARG 7 minVolume METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD a makeArgumentsForCategory (Lyk;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; + ARG 0 category diff --git a/mappings/net/minecraft/server/command/PublishCommand.mapping b/mappings/net/minecraft/server/command/PublishCommand.mapping index 2772afa72f..434b774020 100644 --- a/mappings/net/minecraft/server/command/PublishCommand.mapping +++ b/mappings/net/minecraft/server/command/PublishCommand.mapping @@ -1,4 +1,5 @@ CLASS su net/minecraft/server/command/PublishCommand FIELD a FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b ALREADY_PUBLISHED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD a execute (Lcd;I)I METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/ReplaceItemCommand.mapping b/mappings/net/minecraft/server/command/ReplaceItemCommand.mapping index b48f34d700..fed896598c 100644 --- a/mappings/net/minecraft/server/command/ReplaceItemCommand.mapping +++ b/mappings/net/minecraft/server/command/ReplaceItemCommand.mapping @@ -2,4 +2,14 @@ CLASS sy net/minecraft/server/command/ReplaceItemCommand FIELD a BLOCK_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b SLOT_INAPPLICABLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD c ENTITY_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + METHOD a executeBlock (Lcd;Lev;ILbbu;)I + ARG 0 source + ARG 1 pos + ARG 2 slot + ARG 3 item + METHOD a executeEntity (Lcd;Ljava/util/Collection;ILbbu;)I + ARG 0 source + ARG 1 targets + ARG 2 slot + ARG 3 item METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/ScheduleCommand.mapping b/mappings/net/minecraft/server/command/ScheduleCommand.mapping index 50033e65c3..7601035b41 100644 --- a/mappings/net/minecraft/server/command/ScheduleCommand.mapping +++ b/mappings/net/minecraft/server/command/ScheduleCommand.mapping @@ -1,3 +1,7 @@ CLASS td net/minecraft/server/command/ScheduleCommand FIELD a SAME_TICK_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a execute (Lcd;Lcom/mojang/datafixers/util/Either;I)I + ARG 0 source + ARG 1 function + ARG 2 time METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping index eddd615b4e..7921ef5e0c 100644 --- a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping +++ b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping @@ -5,4 +5,76 @@ CLASS te net/minecraft/server/command/ScoreboardCommand FIELD d PLAYERS_ENABLE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD e PLAYERS_ENABLE_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD f PLAYERS_GET_NULL_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + METHOD a makeRenderTypeArguments ()Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; + METHOD a executeListPlayers (Lcd;)I + ARG 0 source + METHOD a executeClearDisplay (Lcd;I)I + ARG 0 source + ARG 1 slot + METHOD a executeSetDisplay (Lcd;ILcsl;)I + ARG 0 source + ARG 1 slot + ARG 2 objective + METHOD a executeRemoveObjective (Lcd;Lcsl;)I + ARG 0 source + ARG 1 objective + METHOD a executeModifyRenderType (Lcd;Lcsl;Lcsr$a;)I + ARG 0 source + ARG 1 objective + ARG 2 type + METHOD a executeModifyObjective (Lcd;Lcsl;Ljm;)I + ARG 0 source + ARG 1 objective + ARG 2 displayName + METHOD a executeListScores (Lcd;Ljava/lang/String;)I + ARG 0 source + ARG 1 target + METHOD a executeGet (Lcd;Ljava/lang/String;Lcsl;)I + ARG 0 source + ARG 1 target + ARG 2 objective + METHOD a executeAddObjective (Lcd;Ljava/lang/String;Lcsr;Ljm;)I + ARG 0 source + ARG 1 objective + ARG 2 criteria + ARG 3 displayName + METHOD a executeReset (Lcd;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets + METHOD a suggestDisabled (Lcd;Ljava/util/Collection;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 0 source + ARG 1 targets + ARG 2 suggestionsBuilder + METHOD a executeEnable (Lcd;Ljava/util/Collection;Lcsl;)I + ARG 0 source + ARG 1 targets + ARG 2 objective + METHOD a executeSet (Lcd;Ljava/util/Collection;Lcsl;I)I + ARG 0 source + ARG 1 targets + ARG 2 objective + ARG 3 score + METHOD a executeOperation (Lcd;Ljava/util/Collection;Lcsl;Lcv$a;Ljava/util/Collection;Lcsl;)I + ARG 0 source + ARG 1 targets + ARG 2 targetObjective + ARG 3 operation + ARG 4 sources + ARG 5 sourceObjectives METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b executeListObjectives (Lcd;)I + ARG 0 source + METHOD b executeReset (Lcd;Ljava/util/Collection;Lcsl;)I + ARG 0 source + ARG 1 targets + ARG 2 objective + METHOD b executeAdd (Lcd;Ljava/util/Collection;Lcsl;I)I + ARG 0 source + ARG 1 targets + ARG 2 objective + ARG 3 score + METHOD c executeRemove (Lcd;Ljava/util/Collection;Lcsl;I)I + ARG 0 source + ARG 1 targets + ARG 2 objective + ARG 3 score diff --git a/mappings/net/minecraft/server/command/SetBlockCommand.mapping b/mappings/net/minecraft/server/command/SetBlockCommand.mapping index fe3ab7ade3..1d8915ee9f 100644 --- a/mappings/net/minecraft/server/command/SetBlockCommand.mapping +++ b/mappings/net/minecraft/server/command/SetBlockCommand.mapping @@ -1,3 +1,16 @@ CLASS tg net/minecraft/server/command/SetBlockCommand + CLASS tg$a Filter + METHOD filter (Lchk;Lev;Lde;Lvf;)Lde; + ARG 1 box + ARG 2 pos + ARG 3 block + ARG 4 world + CLASS tg$b Mode FIELD a FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a execute (Lcd;Lev;Lde;Ltg$b;Ljava/util/function/Predicate;)I + ARG 0 source + ARG 1 pos + ARG 2 block + ARG 3 mode + ARG 4 condition METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/SetWorldSpawnCommand.mapping b/mappings/net/minecraft/server/command/SetWorldSpawnCommand.mapping index 85984180de..381c11342d 100644 --- a/mappings/net/minecraft/server/command/SetWorldSpawnCommand.mapping +++ b/mappings/net/minecraft/server/command/SetWorldSpawnCommand.mapping @@ -1,2 +1,5 @@ CLASS tj net/minecraft/server/command/SetWorldSpawnCommand + METHOD a execute (Lcd;Lev;)I + ARG 0 source + ARG 1 pos METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/SpawnPointCommand.mapping b/mappings/net/minecraft/server/command/SpawnPointCommand.mapping index 358abd375a..d8bc5cac1f 100644 --- a/mappings/net/minecraft/server/command/SpawnPointCommand.mapping +++ b/mappings/net/minecraft/server/command/SpawnPointCommand.mapping @@ -1,2 +1,6 @@ CLASS ti net/minecraft/server/command/SpawnPointCommand + METHOD a execute (Lcd;Ljava/util/Collection;Lev;)I + ARG 0 source + ARG 1 targets + ARG 2 pos METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping index 88db820a96..7e12a96b37 100644 --- a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping +++ b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping @@ -1,4 +1,47 @@ CLASS tk net/minecraft/server/command/SpreadPlayersCommand + CLASS tk$a Pile + FIELD a x D + FIELD b z D + METHOD a setPileLocation (Ljava/util/Random;DDDD)V + ARG 1 random + ARG 2 minX + ARG 4 minZ + ARG 6 maxX + ARG 8 maxZ + METHOD a getDistance (Ltk$a;)D + ARG 1 pile FIELD a FAILED_TEAMS_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic4CommandExceptionType; FIELD b FAILED_ENTITIES_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic4CommandExceptionType; + METHOD a execute (Lcd;Lcrn;FFZLjava/util/Collection;)I + ARG 0 source + ARG 1 center + ARG 2 spreadDistance + ARG 3 maxRange + ARG 4 respectTeams + ARG 5 targets METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD a spread (Lcrn;DLvf;Ljava/util/Random;DDDD[Ltk$a;Z)V + ARG 0 center + ARG 1 spreadDistance + ARG 3 world + ARG 4 random + ARG 5 minX + ARG 7 minZ + ARG 9 maxX + ARG 11 maxZ + ARG 13 piles + ARG 14 respectTeams + METHOD a getPileCountRespectingTeams (Ljava/util/Collection;)I + ARG 0 entities + METHOD a getMinimumDistance (Ljava/util/Collection;Lvf;[Ltk$a;Z)D + ARG 0 entities + ARG 1 world + ARG 2 piles + ARG 3 betweenTeams + METHOD a makePiles (Ljava/util/Random;IDDDD)[Ltk$a; + ARG 0 random + ARG 1 count + ARG 2 minX + ARG 4 minZ + ARG 6 maxX + ARG 8 maxZ diff --git a/mappings/net/minecraft/server/command/StopSoundCommand.mapping b/mappings/net/minecraft/server/command/StopSoundCommand.mapping index 6ef9ac5da5..90c1bfed59 100644 --- a/mappings/net/minecraft/server/command/StopSoundCommand.mapping +++ b/mappings/net/minecraft/server/command/StopSoundCommand.mapping @@ -1,2 +1,7 @@ CLASS tm net/minecraft/server/command/StopSoundCommand + METHOD a execute (Lcd;Ljava/util/Collection;Lyk;Lqs;)I + ARG 0 source + ARG 1 targets + ARG 2 category + ARG 3 sound METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/SummonCommand.mapping b/mappings/net/minecraft/server/command/SummonCommand.mapping index d924050594..8a9a3d3ee3 100644 --- a/mappings/net/minecraft/server/command/SummonCommand.mapping +++ b/mappings/net/minecraft/server/command/SummonCommand.mapping @@ -1,3 +1,9 @@ CLASS tn net/minecraft/server/command/SummonCommand FIELD a FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a execute (Lcd;Lqs;Lcro;Lib;Z)I + ARG 0 source + ARG 1 entity + ARG 2 pos + ARG 3 nbt + ARG 4 initialize METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/TagCommand.mapping b/mappings/net/minecraft/server/command/TagCommand.mapping index 569a443f90..e0a032606a 100644 --- a/mappings/net/minecraft/server/command/TagCommand.mapping +++ b/mappings/net/minecraft/server/command/TagCommand.mapping @@ -1,4 +1,17 @@ CLASS to net/minecraft/server/command/TagCommand FIELD a ADD_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b REMOVE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a executeList (Lcd;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets + METHOD a executeAdd (Lcd;Ljava/util/Collection;Ljava/lang/String;)I + ARG 0 source + ARG 1 targets + ARG 2 tag METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD a getTags (Ljava/util/Collection;)Ljava/util/Collection; + ARG 0 entities + METHOD b executeRemove (Lcd;Ljava/util/Collection;Ljava/lang/String;)I + ARG 0 source + ARG 1 targets + ARG 2 tag diff --git a/mappings/net/minecraft/server/command/TeamCommand.mapping b/mappings/net/minecraft/server/command/TeamCommand.mapping index b3144cd4e4..2d2714966c 100644 --- a/mappings/net/minecraft/server/command/TeamCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamCommand.mapping @@ -11,4 +11,65 @@ CLASS tp net/minecraft/server/command/TeamCommand FIELD j OPTION_NAMETAGEVISIBILITY_UNCHANGED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD k OPTION_DEATHMESSAGEVISIBILITY_UNCHANGED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD l OPTION_COLLISIONRULE_UNCHANGED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a executeListTeams (Lcd;)I + ARG 0 source + METHOD a executeEmpty (Lcd;Lcsm;)I + ARG 0 source + ARG 1 team + METHOD a executeModifyColor (Lcd;Lcsm;Lc;)I + ARG 0 source + ARG 1 team + ARG 2 color + METHOD a executeModifyCollisionRule (Lcd;Lcsm;Lcsq$a;)I + ARG 0 source + ARG 1 team + ARG 2 collisionRule + METHOD a executeModifyNametagVisibility (Lcd;Lcsm;Lcsq$b;)I + ARG 0 source + ARG 1 team + ARG 2 visibility + METHOD a executeJoin (Lcd;Lcsm;Ljava/util/Collection;)I + ARG 0 source + ARG 1 team + ARG 2 members + METHOD a executeModifyDisplayName (Lcd;Lcsm;Ljm;)I + ARG 0 source + ARG 1 team + ARG 2 displayName + METHOD a executeModifySeeFriendlyInvisibles (Lcd;Lcsm;Z)I + ARG 0 source + ARG 1 team + ARG 2 allowed + METHOD a executeAdd (Lcd;Ljava/lang/String;)I + ARG 0 source + ARG 1 team + METHOD a executeAdd (Lcd;Ljava/lang/String;Ljm;)I + ARG 0 source + ARG 1 team + ARG 2 displayName + METHOD a executeLeave (Lcd;Ljava/util/Collection;)I + ARG 0 source + ARG 1 members METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b executeRemove (Lcd;Lcsm;)I + ARG 0 source + ARG 1 team + METHOD b executeModifyDeathMessageVisibility (Lcd;Lcsm;Lcsq$b;)I + ARG 0 source + ARG 1 team + ARG 2 visibility + METHOD b executeModifyPrefix (Lcd;Lcsm;Ljm;)I + ARG 0 source + ARG 1 team + ARG 2 prefix + METHOD b executeModifyFriendlyFire (Lcd;Lcsm;Z)I + ARG 0 source + ARG 1 team + ARG 2 allowed + METHOD c executeListMembers (Lcd;Lcsm;)I + ARG 0 source + ARG 1 team + METHOD c executeModifySuffix (Lcd;Lcsm;Ljm;)I + ARG 0 source + ARG 1 team + ARG 2 suffix diff --git a/mappings/net/minecraft/server/command/TeleportCommand.mapping b/mappings/net/minecraft/server/command/TeleportCommand.mapping index 1ce60ba3c1..68d264d78e 100644 --- a/mappings/net/minecraft/server/command/TeleportCommand.mapping +++ b/mappings/net/minecraft/server/command/TeleportCommand.mapping @@ -1,6 +1,36 @@ CLASS tr net/minecraft/server/command/TeleportCommand - METHOD a (Lcd;Ljava/util/Collection;Lvf;Ldl;Ldl;Ltr$a;)I + CLASS net/minecraft/server/command/TeleportCommand$a LookTarget + FIELD a pos Lcro; + FIELD b entity Laid; + FIELD c anchor Lck$a; + METHOD (Laid;Lck$a;)V + ARG 1 entity + ARG 2 anchor + METHOD (Lcro;)V + ARG 1 pos + METHOD a look (Lcd;Laid;)V + ARG 1 source + ARG 2 entity + METHOD a teleport (Lcd;Laid;Lvf;DDDLjava/util/Set;FFLtr$a;)V + ARG 0 source + ARG 1 target ARG 2 world - ARG 3 pos + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 movementFlags + ARG 10 yaw + ARG 11 pitch + ARG 12 facingLocation + METHOD a execute (Lcd;Ljava/util/Collection;Laid;)I + ARG 0 source + ARG 1 targets + ARG 2 destination + METHOD a execute (Lcd;Ljava/util/Collection;Lvf;Ldl;Ldl;Ltr$a;)I + ARG 0 source + ARG 1 targets + ARG 2 world + ARG 3 location ARG 4 rotation + ARG 5 facingLocation METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/TimeCommand.mapping b/mappings/net/minecraft/server/command/TimeCommand.mapping index 51e13cbed1..0342fa062e 100644 --- a/mappings/net/minecraft/server/command/TimeCommand.mapping +++ b/mappings/net/minecraft/server/command/TimeCommand.mapping @@ -1,2 +1,13 @@ CLASS tt net/minecraft/server/command/TimeCommand + METHOD a executeSet (Lcd;I)I + ARG 0 source + ARG 1 time METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD a getDayTime (Lvf;)I + ARG 0 world + METHOD b executeAdd (Lcd;I)I + ARG 0 source + ARG 1 time + METHOD c executeQuery (Lcd;I)I + ARG 0 source + ARG 1 time diff --git a/mappings/net/minecraft/server/command/TitleCommand.mapping b/mappings/net/minecraft/server/command/TitleCommand.mapping index f6568813e0..6edd2a7143 100644 --- a/mappings/net/minecraft/server/command/TitleCommand.mapping +++ b/mappings/net/minecraft/server/command/TitleCommand.mapping @@ -1,2 +1,17 @@ CLASS tu net/minecraft/server/command/TitleCommand + METHOD a executeClear (Lcd;Ljava/util/Collection;)I + METHOD a executeTimes (Lcd;Ljava/util/Collection;III)I + ARG 0 source + ARG 1 targets + ARG 2 fadeIn + ARG 3 stay + ARG 4 fadeOut + METHOD a executeTitle (Lcd;Ljava/util/Collection;Ljm;Lnc$a;)I + ARG 0 source + ARG 1 targets + ARG 2 title + ARG 3 type METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b executeReset (Lcd;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets diff --git a/mappings/net/minecraft/server/command/TriggerCommand.mapping b/mappings/net/minecraft/server/command/TriggerCommand.mapping index fde6cd92b8..5391e619c6 100644 --- a/mappings/net/minecraft/server/command/TriggerCommand.mapping +++ b/mappings/net/minecraft/server/command/TriggerCommand.mapping @@ -1,4 +1,17 @@ CLASS tv net/minecraft/server/command/TriggerCommand FIELD a FAILED_UMPRIMED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b FAILED_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a suggestObjectives (Lcd;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 0 source + ARG 1 suggestionsBuilder + METHOD a executeSimple (Lcd;Lcsn;)I + ARG 0 source + ARG 1 score + METHOD a executeAdd (Lcd;Lcsn;I)I + ARG 0 source + ARG 1 score + ARG 2 value METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD a getScore (Lvg;Lcsl;)Lcsn; + METHOD b executeSet (Lcd;Lcsn;I)I + ARG 2 value diff --git a/mappings/net/minecraft/server/command/WeatherCommand.mapping b/mappings/net/minecraft/server/command/WeatherCommand.mapping index 27d1b0b7b8..b6c6aeec87 100644 --- a/mappings/net/minecraft/server/command/WeatherCommand.mapping +++ b/mappings/net/minecraft/server/command/WeatherCommand.mapping @@ -1,2 +1,10 @@ CLASS tw net/minecraft/server/command/WeatherCommand + METHOD a executeClear (Lcd;I)I + ARG 0 source + ARG 1 duration METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b executeRain (Lcd;I)I + ARG 0 source + ARG 1 duration + METHOD c executeThunder (Lcd;I)I + ARG 1 duration diff --git a/mappings/net/minecraft/server/command/WorldBorderCommand.mapping b/mappings/net/minecraft/server/command/WorldBorderCommand.mapping index 10b6c18f8c..9c342c7017 100644 --- a/mappings/net/minecraft/server/command/WorldBorderCommand.mapping +++ b/mappings/net/minecraft/server/command/WorldBorderCommand.mapping @@ -7,4 +7,25 @@ CLASS ty net/minecraft/server/command/WorldBorderCommand FIELD f WARNING_DISTANCE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD g DAMAGE_BUFFER_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD h DAMAGE_AMOUNT_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a executeGet (Lcd;)I + ARG 0 source + METHOD a executeSet (Lcd;DJ)I + ARG 0 source + ARG 1 distance + ARG 3 time + METHOD a executeBuffer (Lcd;F)I + ARG 0 source + ARG 1 distance + METHOD a executeWarningTime (Lcd;I)I + ARG 0 source + ARG 1 time + METHOD a executeCenter (Lcd;Lcrn;)I + ARG 0 source + ARG 1 pos METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b executeDamage (Lcd;F)I + ARG 0 source + ARG 1 damagePerBlock + METHOD b executeWarningDistance (Lcd;I)I + ARG 0 source + ARG 1 distance diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 46d7c63b14..dd692e1c13 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -25,6 +25,7 @@ CLASS vg net/minecraft/server/network/ServerPlayerEntity METHOD I onTeleportationDone ()V METHOD L getAdvancementManager ()Lrb; METHOD M getCameraPosition ()Lfo; + METHOD a setExperiencePoints (I)V METHOD a sendUnloadChunkPacket (Lbgn;)V METHOD a sendInitialChunkPackets (Lbgn;Lka;Lka;)V METHOD a sendBlockEntityUpdate (Lbtf;)V @@ -35,6 +36,8 @@ CLASS vg net/minecraft/server/network/ServerPlayerEntity METHOD a copyFrom (Lvg;Z)V ARG 1 oldPlayer ARG 2 alive + METHOD b setExperienceLevel (I)V + ARG 1 level METHOD c onStoppedTracking (Laid;)V METHOD d onStartedTracking (Laid;)V METHOD e setCameraEntity (Laid;)V diff --git a/mappings/net/minecraft/stat/Stat.mapping b/mappings/net/minecraft/stat/Stat.mapping index 47139ddb45..9cf0ac95d5 100644 --- a/mappings/net/minecraft/stat/Stat.mapping +++ b/mappings/net/minecraft/stat/Stat.mapping @@ -2,8 +2,17 @@ CLASS yp net/minecraft/stat/Stat FIELD o formatter Lyq; FIELD p value Ljava/lang/Object; FIELD q type Lyr; + METHOD (Lyr;Ljava/lang/Object;Lyq;)V + ARG 1 type + ARG 2 value + ARG 3 formatter METHOD a getType ()Lyr; METHOD a format (I)Ljava/lang/String; + METHOD a getName (Lqs;)Ljava/lang/String; + ARG 0 id + METHOD a getName (Lyr;Ljava/lang/Object;)Ljava/lang/String; + ARG 0 type + ARG 1 value METHOD b getValue ()Ljava/lang/Object; METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/text/TextFormat.mapping b/mappings/net/minecraft/text/TextFormat.mapping index b4d0032cc9..a77724bdc5 100644 --- a/mappings/net/minecraft/text/TextFormat.mapping +++ b/mappings/net/minecraft/text/TextFormat.mapping @@ -4,6 +4,7 @@ CLASS c net/minecraft/text/TextFormat FIELD C id I FIELD D color Ljava/lang/Integer; FIELD a BLACK Lc; + FIELD v color Lc; FIELD x FORMAT_PATTERN Ljava/util/regex/Pattern; FIELD z sectionSignCode C METHOD a bySectionSignCode (C)Lc; diff --git a/mappings/net/minecraft/util/NumberRange.mapping b/mappings/net/minecraft/util/NumberRange.mapping index 2e4f880e43..27a59fccce 100644 --- a/mappings/net/minecraft/util/NumberRange.mapping +++ b/mappings/net/minecraft/util/NumberRange.mapping @@ -1,6 +1,6 @@ CLASS bi net/minecraft/util/NumberRange CLASS bi$a Factory - CLASS bi$c Float + CLASS bi$c FloatRange FIELD e ANY Lbi$c; FIELD f minSquared Ljava/lang/Double; FIELD g maxSquared Ljava/lang/Double; @@ -9,6 +9,8 @@ CLASS bi net/minecraft/util/NumberRange METHOD a matchesSquared (D)Z METHOD a fromJson (Lcom/google/gson/JsonElement;)Lbi$c; ARG 0 element + METHOD a parse (Lcom/mojang/brigadier/StringReader;)Lbi$c; + ARG 0 reader METHOD a (Lcom/mojang/brigadier/StringReader;Ljava/lang/Float;Ljava/lang/Float;)Lbi$c; ARG 1 min ARG 2 max @@ -17,7 +19,7 @@ CLASS bi net/minecraft/util/NumberRange METHOD b atLeast (F)Lbi$c; ARG 0 value METHOD d matches (F)Z - CLASS bi$d Integer + CLASS bi$d IntRange FIELD e ANY Lbi$d; FIELD f minSquared Ljava/lang/Long; FIELD g maxSquared Ljava/lang/Long; @@ -27,7 +29,7 @@ CLASS bi net/minecraft/util/NumberRange ARG 0 value METHOD a fromJson (Lcom/google/gson/JsonElement;)Lbi$d; ARG 0 element - METHOD a fromStringReader (Lcom/mojang/brigadier/StringReader;)Lbi$d; + METHOD a parse (Lcom/mojang/brigadier/StringReader;)Lbi$d; METHOD a (Lcom/mojang/brigadier/StringReader;Ljava/lang/Integer;Ljava/lang/Integer;)Lbi$d; ARG 1 min ARG 2 max @@ -37,6 +39,7 @@ CLASS bi net/minecraft/util/NumberRange METHOD b atLeast (I)Lbi$d; ARG 0 value METHOD d test (I)Z + CLASS net/minecraft/util/NumberRange$IntRang IntRange FIELD a EXCEPTION_EMPTY Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b EXCEPTION_SWAPPED Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD c min Ljava/lang/Number; diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index df8fbbf04e..cbe8d1796e 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -20,6 +20,14 @@ CLASS bgw net/minecraft/world/GameRules FIELD a STRING Lbgw$c; FIELD b BOOLEAN Lbgw$c; FIELD c INTEGER Lbgw$c; + FIELD d argumentType Ljava/util/function/Supplier; + FIELD e argumentProvider Ljava/util/function/BiFunction; + METHOD a set (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lbgw$a;)V + ARG 1 context + ARG 2 name + ARG 3 value + METHOD a argument (Ljava/lang/String;)Lcom/mojang/brigadier/builder/RequiredArgumentBuilder; + ARG 1 name FIELD a KEYS Ljava/util/TreeMap; FIELD b rules Ljava/util/TreeMap; METHOD a serialize ()Lib; diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index 85b3c3ead2..ff595ac6fa 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -29,7 +29,7 @@ CLASS bwo net/minecraft/world/border/WorldBorder METHOD n recalculateBounds ()V FIELD a listeners Ljava/util/List; FIELD b damagePerBlock D - FIELD c safeZone D + FIELD c buffer D FIELD d warningTime I FIELD e warningBlocks I FIELD f centerX D @@ -53,8 +53,8 @@ CLASS bwo net/minecraft/world/border/WorldBorder METHOD a contains (Lcrj;)Z METHOD a contains (Lev;)Z METHOD b getStage ()Lbwn; - METHOD b setSafeZone (D)V - ARG 1 safeZone + METHOD b setBuffer (D)V + ARG 1 buffer METHOD b contains (DD)D METHOD b setWarningTime (I)V ARG 1 warningTime @@ -78,7 +78,7 @@ CLASS bwo net/minecraft/world/border/WorldBorder METHOD k getTargetSize ()D METHOD l getListeners ()Ljava/util/List; METHOD m getMaxWorldBorderRadius ()I - METHOD n getSafeZone ()D + METHOD n getBuffer ()D METHOD o getDamagePerBlock ()D METHOD p getShrinkingSpeed ()D METHOD q getWarningTime ()I diff --git a/mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping new file mode 100644 index 0000000000..d40d1da0c7 --- /dev/null +++ b/mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping @@ -0,0 +1,5 @@ +CLASS cpy net/minecraft/world/loot/function/SetNbtLootFunction + CLASS cpy$a Factory + FIELD a tag Lib; + METHOD ([Lcqr;Lib;)V + ARG 2 tag diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index 172148be15..47722466f2 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -4,10 +4,14 @@ CLASS bxt net/minecraft/world/storage/SerializingRegionBasedStorage FIELD d unsavedElements Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; FIELD e deserializer Ljava/util/function/BiFunction; FIELD f factory Ljava/util/function/Function; + FIELD g dataFixer Lcom/mojang/datafixers/DataFixer; + FIELD h dataFixType Laac; METHOD (Ljava/io/File;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Laac;)V ARG 1 directory ARG 2 deserializer ARG 3 factory + ARG 4 dataFixer + ARG 5 dataFixType METHOD a onUpdate (J)V ARG 1 pos METHOD a loadDataAt (Lbgn;)V @@ -19,5 +23,6 @@ CLASS bxt net/minecraft/world/storage/SerializingRegionBasedStorage METHOD c getIfLoaded (J)Ljava/util/Optional; ARG 1 pos METHOD d get (J)Ljava/util/Optional; + ARG 1 pos METHOD e getOrCreate (J)Lzu; ARG 1 pos