diff --git a/mappings/net/minecraft/command/argument/BlockPosArgumentType.mapping b/mappings/net/minecraft/command/argument/BlockPosArgumentType.mapping index ae9b1953a9..556a5bb5bf 100644 --- a/mappings/net/minecraft/command/argument/BlockPosArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/BlockPosArgumentType.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_2262 net/minecraft/command/argument/BlockPosArgumentTy METHOD method_9696 getLoadedBlockPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2338; ARG 0 context ARG 1 name - METHOD method_9697 getInBoundsBlockPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2338; + METHOD method_9697 getValidBlockPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2338; ARG 0 context ARG 1 name METHOD method_9698 blockPos ()Lnet/minecraft/class_2262; diff --git a/mappings/net/minecraft/server/command/CloneCommand.mapping b/mappings/net/minecraft/server/command/CloneCommand.mapping index 28012f7649..b7ecf224df 100644 --- a/mappings/net/minecraft/server/command/CloneCommand.mapping +++ b/mappings/net/minecraft/server/command/CloneCommand.mapping @@ -8,7 +8,11 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand ARG 1 commandRegistryAccess METHOD method_13090 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_3023$class_8010;Lnet/minecraft/class_3023$class_8010;Lnet/minecraft/class_3023$class_8010;Ljava/util/function/Predicate;Lnet/minecraft/class_3023$class_3025;)I ARG 0 source + ARG 1 begin + ARG 2 end + ARG 3 destination ARG 4 filter + ARG 5 mode METHOD method_13094 (Lnet/minecraft/class_2168;)Z ARG 0 source METHOD method_13096 (Lnet/minecraft/class_2694;)Z @@ -16,6 +20,57 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand METHOD method_13099 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 maxCount ARG 1 count + METHOD method_48035 createModeArgs (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 beginPosGetter + ARG 1 endPosGetter + ARG 2 destinationPosGetter + ARG 3 filterGetter + ARG 4 builder + METHOD method_48036 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_48037 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48038 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + ARG 1 context + METHOD method_48039 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; + ARG 0 context + METHOD method_48040 createDimensionalPos (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3218;Ljava/lang/String;)Lnet/minecraft/class_3023$class_8010; + ARG 0 context + ARG 1 world + ARG 2 name + METHOD method_48042 createSourceArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 commandRegistryAccess + ARG 1 worldGetter + METHOD method_48043 createDestinationArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 commandRegistryAccess + ARG 1 sourceWorldGetter + ARG 2 targetWorldGetter + METHOD method_48044 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_48045 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48046 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + ARG 1 context + METHOD method_48047 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; + ARG 0 context + METHOD method_48049 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_48050 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48051 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + ARG 1 context + METHOD method_48052 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; + ARG 0 context + METHOD method_48054 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48055 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; + ARG 0 context + METHOD method_48056 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; + ARG 0 context + METHOD method_48057 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; + ARG 0 context + METHOD method_48058 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; + ARG 0 context CLASS class_3024 BlockInfo FIELD field_13494 blockEntityNbt Lnet/minecraft/class_2487; FIELD field_13495 state Lnet/minecraft/class_2680; @@ -29,3 +84,7 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand METHOD (Ljava/lang/String;IZ)V ARG 3 allowsOverlap METHOD method_13109 allowsOverlap ()Z + CLASS class_8009 ArgumentGetter + METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 value + CLASS class_8010 DimensionalPos diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index a2d15fcb80..005403db34 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand FIELD field_13796 MERGE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13797 MODIFY_EXPECTED_OBJECT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13798 TARGET_OBJECT_TYPES Ljava/util/List; + FIELD field_41747 MODIFY_EXPECTED_VALUE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD method_13885 executeRemove (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;)I ARG 0 source ARG 1 object @@ -68,6 +69,8 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 1 object METHOD method_13909 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context + METHOD method_13911 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 2 operation METHOD method_13912 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context METHOD method_13916 executeGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;)I @@ -101,6 +104,35 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 0 context ARG 2 path ARG 3 elements + METHOD method_48088 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 3 builder + METHOD method_48089 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48090 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 2 operation + METHOD method_48091 getValues (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;)Ljava/util/List; + ARG 0 context + ARG 1 objectType + METHOD method_48093 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 nbt + METHOD method_48095 mapValues (Ljava/util/List;Ljava/util/function/Function;)Ljava/util/List; + ARG 0 list + ARG 1 function + METHOD method_48096 asString (Lnet/minecraft/class_2520;)Ljava/lang/String; + ARG 0 nbt + METHOD method_48097 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48098 getValuesByPath (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;)Ljava/util/List; + ARG 0 context + ARG 1 objectType + METHOD method_48101 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48102 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48103 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48104 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context CLASS class_3165 ModifyOperation METHOD modify (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 9e82f326b4..8ad4548ed1 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -216,6 +216,44 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 1 builder METHOD method_47527 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context + METHOD method_48059 isLoaded (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos + METHOD method_48060 (Lnet/minecraft/class_1297;)Ljava/util/stream/Stream; + ARG 0 entity + METHOD method_48061 addOnArguments (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; + ARG 0 node + ARG 1 builder + METHOD method_48062 (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;)Ljava/util/List; + ARG 1 entity + METHOD method_48063 createEntityModifier (Ljava/util/function/Function;)Lcom/mojang/brigadier/RedirectModifier; + ARG 0 function + METHOD method_48064 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; + ARG 1 context + METHOD method_48065 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48066 createMultiEntityModifier (Ljava/util/function/Function;)Lcom/mojang/brigadier/RedirectModifier; + ARG 0 function + METHOD method_48067 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; + ARG 1 context + METHOD method_48068 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48069 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48070 (ZLcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; + ARG 1 context + METHOD method_48071 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48072 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48073 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48074 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_48075 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_48076 (Lcom/mojang/brigadier/context/CommandContext;)Z + ARG 0 context CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/RideCommand.mapping b/mappings/net/minecraft/server/command/RideCommand.mapping new file mode 100644 index 0000000000..0a78ab6d48 --- /dev/null +++ b/mappings/net/minecraft/server/command/RideCommand.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/class_8011 net/minecraft/server/command/RideCommand + FIELD field_41742 NOT_RIDING_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_41743 ALREADY_RIDING_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_41744 GENERIC_FAILURE_EXCPETION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_41745 CANT_RIDE_PLAYERS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_41746 RIDE_LOOP_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD method_48077 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z + ARG 1 passager + METHOD method_48078 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_48079 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48080 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_48081 executeDismount (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;)I + ARG 0 source + ARG 1 rider + METHOD method_48082 executeMount (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)I + ARG 0 source + ARG 1 rider + ARG 2 vehicle + METHOD method_48083 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 entity + METHOD method_48084 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 rider + ARG 1 vehicle + METHOD method_48085 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48086 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 rider + ARG 1 vehicle diff --git a/mappings/net/minecraft/server/command/WeatherCommand.mapping b/mappings/net/minecraft/server/command/WeatherCommand.mapping index 7c1408f686..43a56ff735 100644 --- a/mappings/net/minecraft/server/command/WeatherCommand.mapping +++ b/mappings/net/minecraft/server/command/WeatherCommand.mapping @@ -25,3 +25,7 @@ CLASS net/minecraft/class_3155 net/minecraft/server/command/WeatherCommand METHOD method_13833 executeThunder (Lnet/minecraft/class_2168;I)I ARG 0 source ARG 1 duration + METHOD method_48087 processDuration (Lnet/minecraft/class_2168;ILnet/minecraft/class_6017;)I + ARG 0 source + ARG 1 duration + ARG 2 provider diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index c52de06c35..a60500a04a 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -30,6 +30,10 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_36208 structureLocator Lnet/minecraft/class_6832; FIELD field_36317 duringListenerUpdate Z FIELD field_39984 gameEventDispatchManager Lnet/minecraft/class_7719; + FIELD field_41748 CLEAR_THUNDER_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; + FIELD field_41749 CLEAR_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; + FIELD field_41750 RAIN_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; + FIELD field_41751 THUNDER_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;Z)V ARG 1 server ARG 2 workerExecutor