From e48363370c561bf6ef87c69a3b5354afb944e40a Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 1 Nov 2023 16:08:21 +0000 Subject: [PATCH] 23w44a --- build.gradle | 2 +- .../LootableContainerBlockEntity.mapping | 16 +------- .../entity/StructureBlockBlockEntity.mapping | 10 ----- mappings/net/minecraft/class_8934.mapping | 4 ++ .../client/option/HotbarStorage.mapping | 5 +-- .../entity/model/BatEntityModel.mapping | 3 +- .../minecraft/command/CommandAction.mapping | 3 +- .../command/CommandExecutionContext.mapping | 5 +-- .../command/CommandFunctionAction.mapping | 5 +-- .../command/ControlFlowAware.mapping | 9 ++--- .../command/ExecutionControl.mapping | 1 - .../command/FixedCommandAction.mapping | 4 +- .../net/minecraft/command/Forkable.mapping | 6 +-- .../minecraft/command/ResultStorer.mapping | 5 --- .../command/SingleCommandAction.mapping | 20 ++-------- .../command/SourcedCommandAction.mapping | 6 +-- .../command/SteppedCommandAction.mapping | 9 ++--- mappings/net/minecraft/nbt/NbtIo.mapping | 15 +++---- .../AbstractServerCommandSource.mapping | 9 +---- .../server/command/DebugCommand.mapping | 3 +- .../server/command/ExecuteCommand.mapping | 40 +------------------ .../server/command/FunctionCommand.mapping | 5 +-- .../server/command/ReturnCommand.mapping | 6 --- .../command/ServerCommandSource.mapping | 16 +------- .../StructureTemplateManager.mapping | 1 - .../minecraft/test/StructureTestUtil.mapping | 21 +--------- mappings/net/minecraft/util/Util.mapping | 5 --- .../net/minecraft/village/TradeOffers.mapping | 4 -- .../world/CommandBlockExecutor.mapping | 4 -- mappings/net/minecraft/world/World.mapping | 3 -- 30 files changed, 39 insertions(+), 206 deletions(-) create mode 100644 mappings/net/minecraft/class_8934.mapping delete mode 100644 mappings/net/minecraft/command/ResultStorer.mapping diff --git a/build.gradle b/build.gradle index 2bb84f4271..acd2c233fb 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w43b" +def minecraft_version = "23w44a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping index 9cd4f287d5..5247f8c260 100644 --- a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping @@ -1,21 +1,7 @@ CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlockEntity FIELD field_12036 lootTableSeed J FIELD field_12037 lootTableId Lnet/minecraft/class_2960; - FIELD field_31352 LOOT_TABLE_SEED_KEY Ljava/lang/String; - FIELD field_31353 LOOT_TABLE_KEY Ljava/lang/String; METHOD method_11281 setInvStackList (Lnet/minecraft/class_2371;)V ARG 1 list - METHOD method_11283 deserializeLootTable (Lnet/minecraft/class_2487;)Z - ARG 1 nbt - METHOD method_11285 setLootTable (Lnet/minecraft/class_2960;J)V + METHOD method_11285 (Lnet/minecraft/class_2960;)V ARG 1 id - ARG 2 seed - METHOD method_11286 serializeLootTable (Lnet/minecraft/class_2487;)Z - ARG 1 nbt - METHOD method_11287 setLootTable (Lnet/minecraft/class_1922;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V - ARG 0 world - ARG 1 random - ARG 2 pos - ARG 3 id - METHOD method_11289 checkLootInteraction (Lnet/minecraft/class_1657;)V - ARG 1 player diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 36ca72d907..98d2c819bf 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -48,9 +48,6 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_11366 saveStructure (Z)Z ARG 1 interactive METHOD method_11367 shouldIgnoreEntities ()Z - METHOD method_11368 loadStructure (Lnet/minecraft/class_3218;Z)Z - ARG 1 world - ARG 2 interactive METHOD method_11370 setIntegrity (F)V ARG 1 integrity METHOD method_11371 getSeed ()J @@ -77,10 +74,6 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 1 rotation METHOD method_20048 createRandom (J)Lnet/minecraft/class_5819; ARG 0 seed - METHOD method_21864 place (Lnet/minecraft/class_3218;ZLnet/minecraft/class_3499;)Z - ARG 1 world - ARG 2 interactive - ARG 3 template METHOD method_21865 getStructurePath ()Ljava/lang/String; METHOD method_34273 (Lnet/minecraft/class_2586;)Lnet/minecraft/class_2633; ARG 0 blockEntity @@ -99,7 +92,4 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 0 blockEntity METHOD method_34279 (Lnet/minecraft/class_2338;)Z ARG 1 pos - METHOD method_35293 setStructureVoid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 0 world - ARG 1 pos CLASS class_2634 Action diff --git a/mappings/net/minecraft/class_8934.mapping b/mappings/net/minecraft/class_8934.mapping new file mode 100644 index 0000000000..ead717a11c --- /dev/null +++ b/mappings/net/minecraft/class_8934.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8934 + METHOD method_10997 getWorld ()Lnet/minecraft/class_1937; + METHOD method_11016 getPos ()Lnet/minecraft/class_2338; + METHOD method_11285 setLootTable (Lnet/minecraft/class_2960;)V diff --git a/mappings/net/minecraft/client/option/HotbarStorage.mapping b/mappings/net/minecraft/client/option/HotbarStorage.mapping index 327f6bd855..06320e9c89 100644 --- a/mappings/net/minecraft/client/option/HotbarStorage.mapping +++ b/mappings/net/minecraft/client/option/HotbarStorage.mapping @@ -1,12 +1,11 @@ CLASS net/minecraft/class_302 net/minecraft/client/option/HotbarStorage FIELD field_1644 entries [Lnet/minecraft/class_748; FIELD field_1645 loaded Z - FIELD field_1646 file Ljava/io/File; + FIELD field_1646 file Ljava/nio/file/Path; FIELD field_1647 LOGGER Lorg/slf4j/Logger; FIELD field_1648 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_32135 STORAGE_ENTRY_COUNT I - METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V - ARG 1 file + METHOD (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)V ARG 2 dataFixer METHOD method_1409 save ()V METHOD method_1410 getSavedHotbar (I)Lnet/minecraft/class_748; diff --git a/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping index cc91d03ffe..a84b9456d9 100644 --- a/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping @@ -44,6 +44,5 @@ CLASS net/minecraft/class_553 net/minecraft/client/render/entity/model/BatEntity METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_31980 getTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_54805 setRoostingHeadAngles (FF)V + METHOD method_54805 setRoostingHeadAngles (F)V ARG 1 pitch - ARG 2 yaw diff --git a/mappings/net/minecraft/command/CommandAction.mapping b/mappings/net/minecraft/command/CommandAction.mapping index 15d12c87bc..afbee6b5dd 100644 --- a/mappings/net/minecraft/command/CommandAction.mapping +++ b/mappings/net/minecraft/command/CommandAction.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8853 net/minecraft/command/CommandAction - METHOD execute (Lnet/minecraft/class_8854;I)V + METHOD execute (Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 1 context - ARG 2 depth diff --git a/mappings/net/minecraft/command/CommandExecutionContext.mapping b/mappings/net/minecraft/command/CommandExecutionContext.mapping index c5c3e0c6fe..9ae7980ac5 100644 --- a/mappings/net/minecraft/command/CommandExecutionContext.mapping +++ b/mappings/net/minecraft/command/CommandExecutionContext.mapping @@ -18,15 +18,14 @@ CLASS net/minecraft/class_8854 net/minecraft/command/CommandExecutionContext ARG 1 depth METHOD method_54392 enqueueCommand (Lnet/minecraft/class_8847;)V ARG 1 entry - METHOD method_54393 enqueueCommand (Lnet/minecraft/class_8854;Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;)V + METHOD method_54393 enqueueCommand (Lnet/minecraft/class_8854;Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;Lnet/minecraft/class_8935;)V ARG 0 context ARG 1 command ARG 3 source METHOD method_54394 setTracer (Lnet/minecraft/class_6346;)V ARG 1 tracer - METHOD method_54395 enqueueProcedureCall (Lnet/minecraft/class_8868;Ljava/lang/Object;)V + METHOD method_54395 enqueueProcedureCall (Lnet/minecraft/class_8854;Lnet/minecraft/class_8868;Lnet/minecraft/class_8839;Lnet/minecraft/class_8935;)V ARG 1 procedure - ARG 2 source METHOD method_54396 getTracer ()Lnet/minecraft/class_6346; METHOD method_54397 getProfiler ()Lnet/minecraft/class_3695; METHOD method_54398 getForkLimit ()I diff --git a/mappings/net/minecraft/command/CommandFunctionAction.mapping b/mappings/net/minecraft/command/CommandFunctionAction.mapping index 0a54351705..f81dec1e1f 100644 --- a/mappings/net/minecraft/command/CommandFunctionAction.mapping +++ b/mappings/net/minecraft/command/CommandFunctionAction.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_8862 net/minecraft/command/CommandFunctionAction FIELD field_46747 function Lnet/minecraft/class_8868; - METHOD (Lnet/minecraft/class_8868;)V + METHOD (Lnet/minecraft/class_8868;Lnet/minecraft/class_8935;Z)V ARG 1 function - METHOD method_54413 (Ljava/lang/Object;ILnet/minecraft/class_8856;)Lnet/minecraft/class_8847; - ARG 1 depth - ARG 2 action diff --git a/mappings/net/minecraft/command/ControlFlowAware.mapping b/mappings/net/minecraft/command/ControlFlowAware.mapping index 9b7f236ceb..8882d032da 100644 --- a/mappings/net/minecraft/command/ControlFlowAware.mapping +++ b/mappings/net/minecraft/command/ControlFlowAware.mapping @@ -1,20 +1,17 @@ CLASS net/minecraft/class_8848 net/minecraft/command/ControlFlowAware - METHOD method_54290 execute (Ljava/lang/Object;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V + METHOD method_54290 execute (Ljava/lang/Object;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8936;Lnet/minecraft/class_8855;)V ARG 1 source ARG 2 contextChain - ARG 3 forkedMode ARG 4 control CLASS class_8849 Command METHOD run (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context CLASS class_8850 Helper - METHOD method_54255 sendError (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Lnet/minecraft/class_8839;ZLnet/minecraft/class_6346;)V + METHOD method_54255 sendError (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Lnet/minecraft/class_8839;Lnet/minecraft/class_8936;Lnet/minecraft/class_6346;)V ARG 1 exception ARG 2 source - ARG 3 silent ARG 4 tracer - METHOD method_54259 executeInner (Lnet/minecraft/class_8839;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V + METHOD method_54259 executeInner (Lnet/minecraft/class_8839;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8936;Lnet/minecraft/class_8855;)V ARG 1 source ARG 2 contextChain - ARG 3 forkedMode ARG 4 control diff --git a/mappings/net/minecraft/command/ExecutionControl.mapping b/mappings/net/minecraft/command/ExecutionControl.mapping index 590d489427..de18b4354f 100644 --- a/mappings/net/minecraft/command/ExecutionControl.mapping +++ b/mappings/net/minecraft/command/ExecutionControl.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8855 net/minecraft/command/ExecutionControl - METHOD method_54401 doReturn ()V METHOD method_54402 enqueueAction (Lnet/minecraft/class_8853;)V ARG 1 action METHOD method_54403 setTracer (Lnet/minecraft/class_6346;)V diff --git a/mappings/net/minecraft/command/FixedCommandAction.mapping b/mappings/net/minecraft/command/FixedCommandAction.mapping index 449a9fe599..47fab20eca 100644 --- a/mappings/net/minecraft/command/FixedCommandAction.mapping +++ b/mappings/net/minecraft/command/FixedCommandAction.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_8865 net/minecraft/command/FixedCommandAction FIELD field_46752 command Ljava/lang/String; - FIELD field_46753 forkedMode Z FIELD field_46754 context Lcom/mojang/brigadier/context/CommandContext; - METHOD (Ljava/lang/String;ZLcom/mojang/brigadier/context/CommandContext;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_8936;Lcom/mojang/brigadier/context/CommandContext;)V ARG 1 command - ARG 2 forkedMode ARG 3 context diff --git a/mappings/net/minecraft/command/Forkable.mapping b/mappings/net/minecraft/command/Forkable.mapping index d1f2e3fb19..2bc4652572 100644 --- a/mappings/net/minecraft/command/Forkable.mapping +++ b/mappings/net/minecraft/command/Forkable.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_8851 net/minecraft/command/Forkable - METHOD method_54270 execute (Ljava/util/List;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V - ARG 1 sources - ARG 2 contextChain - ARG 3 forkedMode - ARG 4 control + METHOD method_54270 execute (Ljava/lang/Object;Ljava/util/List;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8936;Lnet/minecraft/class_8855;)V CLASS class_8852 RedirectModifier METHOD apply (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; ARG 1 context diff --git a/mappings/net/minecraft/command/ResultStorer.mapping b/mappings/net/minecraft/command/ResultStorer.mapping deleted file mode 100644 index 8e8d47675f..0000000000 --- a/mappings/net/minecraft/command/ResultStorer.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_8838 net/minecraft/command/ResultStorer - METHOD storeResult (Ljava/lang/Object;ZI)V - ARG 1 context - ARG 2 success - ARG 3 result diff --git a/mappings/net/minecraft/command/SingleCommandAction.mapping b/mappings/net/minecraft/command/SingleCommandAction.mapping index e8aa617588..665f22fbbc 100644 --- a/mappings/net/minecraft/command/SingleCommandAction.mapping +++ b/mappings/net/minecraft/command/SingleCommandAction.mapping @@ -5,30 +5,18 @@ CLASS net/minecraft/class_8858 net/minecraft/command/SingleCommandAction METHOD (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;)V ARG 1 command ARG 2 contextChain - METHOD method_54407 traceCommandStart (Lnet/minecraft/class_8854;I)V + METHOD method_54407 traceCommandStart (Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 1 context - ARG 2 depth - METHOD method_54408 (Lnet/minecraft/class_8865;ILnet/minecraft/class_8839;)Lnet/minecraft/class_8847; - ARG 1 depth + METHOD method_54408 (Lnet/minecraft/class_8865;Lnet/minecraft/class_8937;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8847; ARG 2 source METHOD method_54409 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 count - METHOD method_54410 execute (Ljava/util/List;Lnet/minecraft/class_8854;IZ)V - ARG 1 forks - ARG 2 context - ARG 3 depth - ARG 4 silent - METHOD method_54411 fixAtDepth (Lnet/minecraft/class_8854;I)Lnet/minecraft/class_8855; - ARG 0 context - ARG 1 depth + METHOD method_54410 execute (Lnet/minecraft/class_8839;Ljava/util/List;Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;Lnet/minecraft/class_8936;)V CLASS class_8859 MultiSource - FIELD field_46744 forkedMode Z FIELD field_46745 sources Ljava/util/List; - METHOD (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;ZLjava/util/List;)V + METHOD (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8936;Lnet/minecraft/class_8839;Ljava/util/List;)V ARG 1 command ARG 2 contextChain - ARG 3 forkedMode - ARG 4 sources CLASS class_8860 SingleSource FIELD field_46746 source Lnet/minecraft/class_8839; METHOD (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;)V diff --git a/mappings/net/minecraft/command/SourcedCommandAction.mapping b/mappings/net/minecraft/command/SourcedCommandAction.mapping index 548173e2bd..685d3bc074 100644 --- a/mappings/net/minecraft/command/SourcedCommandAction.mapping +++ b/mappings/net/minecraft/command/SourcedCommandAction.mapping @@ -1,10 +1,8 @@ CLASS net/minecraft/class_8856 net/minecraft/command/SourcedCommandAction METHOD bind (Ljava/lang/Object;)Lnet/minecraft/class_8853; ARG 1 source - METHOD execute (Ljava/lang/Object;Lnet/minecraft/class_8854;I)V + METHOD execute (Ljava/lang/Object;Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 1 source ARG 2 context - ARG 3 depth - METHOD method_54405 (Ljava/lang/Object;Lnet/minecraft/class_8854;I)V + METHOD method_54405 (Ljava/lang/Object;Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 2 context - ARG 3 depth diff --git a/mappings/net/minecraft/command/SteppedCommandAction.mapping b/mappings/net/minecraft/command/SteppedCommandAction.mapping index c83aba95d4..2c7ba0a09c 100644 --- a/mappings/net/minecraft/command/SteppedCommandAction.mapping +++ b/mappings/net/minecraft/command/SteppedCommandAction.mapping @@ -3,16 +3,13 @@ CLASS net/minecraft/class_8863 net/minecraft/command/SteppedCommandAction FIELD field_46749 actions Ljava/util/List; FIELD field_46750 selfCommandQueueEntry Lnet/minecraft/class_8847; FIELD field_46751 nextActionIndex I - METHOD (Lnet/minecraft/class_8863$class_8864;Ljava/util/List;I)V + METHOD (Lnet/minecraft/class_8863$class_8864;Ljava/util/List;Lnet/minecraft/class_8937;)V ARG 1 wrapper ARG 2 actions - ARG 3 depth - METHOD method_54414 enqueueCommands (Lnet/minecraft/class_8854;ILjava/util/List;Lnet/minecraft/class_8863$class_8864;)V + METHOD method_54414 enqueueCommands (Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;Ljava/util/List;Lnet/minecraft/class_8863$class_8864;)V ARG 0 context - ARG 1 depth ARG 2 actions ARG 3 wrapper CLASS class_8864 ActionWrapper - METHOD create (ILjava/lang/Object;)Lnet/minecraft/class_8847; - ARG 1 depth + METHOD create (Lnet/minecraft/class_8937;Ljava/lang/Object;)Lnet/minecraft/class_8847; ARG 2 action diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index d9f3fb845f..9b0cbff30d 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -39,13 +39,12 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @see #readCompressed(File, NbtTagSizeTracker) ARG 0 stream ARG 1 tagSizeTracker - METHOD method_10630 write (Lnet/minecraft/class_2487;Ljava/io/File;)V + METHOD method_10630 write (Lnet/minecraft/class_2487;Ljava/nio/file/Path;)V COMMENT Writes the {@code nbt} to {@code file}. COMMENT COMMENT @throws IOException if the IO operation fails COMMENT @see #write(NbtCompound, DataOutput) ARG 0 nbt - ARG 1 file METHOD method_10631 write (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V COMMENT Writes the {@code nbt} to {@code output}. The output is the byte indicating COMMENT the element type, followed by {@linkplain DataOutput#writeUTF an empty string} @@ -56,14 +55,13 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @see #writeForPacket(NbtElement, DataOutput) ARG 0 nbt ARG 1 output - METHOD method_10633 read (Ljava/io/File;)Lnet/minecraft/class_2487; + METHOD method_10633 read (Ljava/nio/file/Path;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from {@code file}. COMMENT COMMENT @return the NBT compound from the file, or {@code null} if the file does not exist COMMENT @throws IOException if the IO operation fails or if the root NBT element is COMMENT not a compound COMMENT @throws NbtSizeValidationException if the NBT is too deep - ARG 0 file METHOD method_10634 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/OutputStream;)V COMMENT Writes the Gzip-compressed {@code nbt} to {@code stream}. COMMENT @@ -71,7 +69,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @see #writeCompressed(NbtCompound, File) ARG 0 nbt ARG 1 stream - METHOD method_30613 readCompressed (Ljava/io/File;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; + METHOD method_30613 readCompressed (Ljava/nio/file/Path;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from Gzip-compressed {@code file}. COMMENT COMMENT @return the NBT compound from the file @@ -79,15 +77,13 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT not a compound COMMENT @throws NbtSizeValidationException if the NBT is too deep COMMENT @see #readCompressed(InputStream, NbtTagSizeTracker) - ARG 0 file ARG 1 tagSizeTracker - METHOD method_30614 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/File;)V + METHOD method_30614 writeCompressed (Lnet/minecraft/class_2487;Ljava/nio/file/Path;)V COMMENT Writes the Gzip-compressed {@code nbt} to {@code file}. COMMENT COMMENT @throws IOException if the IO operation fails COMMENT @see #writeCompressed(NbtCompound, OutputStream) ARG 0 nbt - ARG 1 file METHOD method_39855 scan (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V COMMENT Scans the NBT input using {@code scanner}. COMMENT @@ -100,7 +96,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo ARG 0 input ARG 1 scanner ARG 2 tracker - METHOD method_40057 scanCompressed (Ljava/io/File;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V + METHOD method_40057 scanCompressed (Ljava/nio/file/Path;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V COMMENT Scans the compressed NBT file using {@code scanner}. COMMENT COMMENT @apiNote This method does not return the scan result; the user is expected @@ -110,7 +106,6 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @throws IOException if the IO operation fails COMMENT @throws NbtSizeValidationException if the {@code tracker}'s validation fails COMMENT @see #scanCompressed(InputStream, NbtScanner, NbtTagSizeTracker) - ARG 0 file ARG 1 scanner ARG 2 tracker METHOD method_40058 scanCompressed (Ljava/io/InputStream;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V diff --git a/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping b/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping index 3c97cb9c86..afa9b6854f 100644 --- a/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping @@ -1,13 +1,6 @@ CLASS net/minecraft/class_8839 net/minecraft/server/command/AbstractServerCommandSource - METHOD method_54306 consumeResult (ZI)V - ARG 1 success - ARG 2 result - METHOD method_54307 withResultStorer (Lnet/minecraft/class_8838;)Lnet/minecraft/class_8839; + METHOD method_54307 withResultStorer (Lnet/minecraft/class_8935;)Lnet/minecraft/class_8839; ARG 1 resultStorer - METHOD method_54308 withReturnValueConsumer (Ljava/util/function/IntConsumer;)Lnet/minecraft/class_8839; - ARG 1 returnValueConsumer - METHOD method_54309 consumeResult (I)V - ARG 1 result METHOD method_54310 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_54311 withDummyResultStorer ()Lnet/minecraft/class_8839; METHOD method_54316 (Lcom/mojang/brigadier/context/CommandContext;ZI)V diff --git a/mappings/net/minecraft/server/command/DebugCommand.mapping b/mappings/net/minecraft/server/command/DebugCommand.mapping index 74404bc39e..4e1eab6f0c 100644 --- a/mappings/net/minecraft/server/command/DebugCommand.mapping +++ b/mappings/net/minecraft/server/command/DebugCommand.mapping @@ -30,6 +30,5 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand ARG 1 width METHOD method_36357 writeNewLine ()V CLASS class_8829 Command - METHOD method_54257 (Ljava/util/Collection;Lnet/minecraft/class_2168;ILjava/lang/String;Lnet/minecraft/class_8854;I)V + METHOD method_54257 (Ljava/util/Collection;Lnet/minecraft/class_2168;ILjava/lang/String;Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 4 context - ARG 5 depth diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 6cfa45cecf..0882f8f11a 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand - FIELD field_13634 BINARY_RESULT_CONSUMER Ljava/util/function/BinaryOperator; FIELD field_13635 BLOCKS_TOOBIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD field_13636 CONDITIONAL_FAIL_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13637 CONDITIONAL_FAIL_COUNT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; @@ -30,10 +29,6 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 3 builder METHOD method_13259 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; ARG 0 context - METHOD method_13260 (Ljava/util/Collection;Lnet/minecraft/class_269;Lnet/minecraft/class_266;ZLnet/minecraft/class_2168;ZI)V - ARG 4 context - ARG 5 success - ARG 6 result METHOD method_13261 testBlocksCondition (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Z)Ljava/util/OptionalInt; ARG 0 world ARG 1 start @@ -77,10 +72,6 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 1 result METHOD method_13276 (Lcom/mojang/brigadier/context/CommandContext;I)Lnet/minecraft/class_2520; ARG 1 result - METHOD method_13277 (ZZLnet/minecraft/class_3002;Lnet/minecraft/class_2168;ZI)V - ARG 3 context - ARG 4 success - ARG 5 result METHOD method_13280 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context METHOD method_13281 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; @@ -114,10 +105,6 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 context METHOD method_13293 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; ARG 0 context - METHOD method_13294 (Lnet/minecraft/class_3162;ZLnet/minecraft/class_2203$class_2209;Ljava/util/function/IntFunction;Lnet/minecraft/class_2168;ZI)V - ARG 4 context - ARG 5 success - ARG 6 result METHOD method_13295 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; ARG 0 context METHOD method_13296 (Lnet/minecraft/class_3050$class_3051;Lcom/mojang/brigadier/context/CommandContext;)I @@ -255,35 +242,10 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 context METHOD method_49419 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; ARG 0 context - METHOD method_54261 (Lnet/minecraft/class_8838;Lnet/minecraft/class_8838;)Lnet/minecraft/class_8838; - ARG 0 consumer - ARG 1 consumer2 - METHOD method_54262 (Lnet/minecraft/class_8838;Lnet/minecraft/class_8838;Lnet/minecraft/class_2168;ZI)V - ARG 2 context - ARG 3 success - ARG 4 result METHOD method_54263 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 function ARG 1 message - METHOD method_54264 enqueueExecutions (Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/IntPredicate;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2487;Lnet/minecraft/class_8855;Lnet/minecraft/class_3050$class_8830;Z)V - ARG 0 sources - ARG 1 sourceTransformer - ARG 2 resultPredicate - ARG 3 contextChain - ARG 4 arguments - ARG 5 control - ARG 6 functionNamesGetter - ARG 7 silent - METHOD method_54265 createExecutionSource (Ljava/util/function/Function;Ljava/util/function/IntPredicate;Ljava/util/List;Lnet/minecraft/class_8839;Z)Lnet/minecraft/class_8839; - ARG 0 sourceTransformer - ARG 1 resultPredicate - ARG 2 successesOut - ARG 3 currentSource - ARG 4 singleFunction - METHOD method_54266 (Ljava/util/function/IntPredicate;Ljava/util/List;Lnet/minecraft/class_8839;I)V - ARG 3 result - METHOD method_54267 (Lorg/apache/commons/lang3/mutable/MutableBoolean;Ljava/util/function/IntPredicate;Ljava/util/List;Lnet/minecraft/class_8839;I)V - ARG 4 result + METHOD method_54264 enqueueExecutions (Lnet/minecraft/class_8839;Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/IntPredicate;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2487;Lnet/minecraft/class_8855;Lnet/minecraft/class_3050$class_8830;Lnet/minecraft/class_8936;)V CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/FunctionCommand.mapping b/mappings/net/minecraft/server/command/FunctionCommand.mapping index ed54bd2cff..9656e1efb2 100644 --- a/mappings/net/minecraft/server/command/FunctionCommand.mapping +++ b/mappings/net/minecraft/server/command/FunctionCommand.mapping @@ -25,15 +25,12 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand METHOD method_54274 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 argument ARG 1 argument2 - METHOD method_54275 enqueueAction (Ljava/util/Collection;Lnet/minecraft/class_2487;Lnet/minecraft/class_8839;Lnet/minecraft/class_8839;Lnet/minecraft/class_8855;Lnet/minecraft/class_3062$class_8832;)V + METHOD method_54275 enqueueAction (Ljava/util/Collection;Lnet/minecraft/class_2487;Lnet/minecraft/class_8839;Lnet/minecraft/class_8839;Lnet/minecraft/class_8855;Lnet/minecraft/class_3062$class_8832;Lnet/minecraft/class_8936;)V ARG 0 commandFunctions ARG 1 args - ARG 2 source ARG 3 functionSource ARG 4 control ARG 5 resultConsumer - METHOD method_54276 (Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_3062$class_8832;Lnet/minecraft/class_8839;Lnet/minecraft/class_2960;I)V - ARG 4 result CLASS class_8832 ResultConsumer METHOD method_54280 accept (Ljava/lang/Object;Lnet/minecraft/class_2960;I)V ARG 1 source diff --git a/mappings/net/minecraft/server/command/ReturnCommand.mapping b/mappings/net/minecraft/server/command/ReturnCommand.mapping index fbc96fc755..8dcbaeb383 100644 --- a/mappings/net/minecraft/server/command/ReturnCommand.mapping +++ b/mappings/net/minecraft/server/command/ReturnCommand.mapping @@ -4,10 +4,4 @@ CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand METHOD method_54286 (Lnet/minecraft/class_8839;)Z ARG 0 source CLASS class_8834 ReturnRunRedirector - METHOD method_54287 (Lnet/minecraft/class_8855;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8839; - ARG 1 source - METHOD method_54288 (Lnet/minecraft/class_8855;Lnet/minecraft/class_8839;ZI)V - ARG 1 source - ARG 2 success - ARG 3 result CLASS class_8835 Command diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 902d895c5e..d864ea9efc 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -5,15 +5,12 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource COMMENT @see Entity#getCommandSource() FIELD field_39183 signedArguments Lnet/minecraft/class_7448; FIELD field_39834 messageChainTaskQueue Lnet/minecraft/class_7620; - FIELD field_44647 returnValueConsumer Ljava/util/function/IntConsumer; - FIELD field_46668 DUMMY_STORER Lnet/minecraft/class_8838; FIELD field_9815 level I FIELD field_9816 entityAnchor Lnet/minecraft/class_2183$class_2184; FIELD field_9817 position Lnet/minecraft/class_243; FIELD field_9818 server Lnet/minecraft/server/MinecraftServer; FIELD field_9819 output Lnet/minecraft/class_2165; FIELD field_9820 entity Lnet/minecraft/class_1297; - FIELD field_9821 resultStorer Lnet/minecraft/class_8838; FIELD field_9822 rotation Lnet/minecraft/class_241; FIELD field_9823 silent Z FIELD field_9824 REQUIRES_PLAYER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; @@ -31,7 +28,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 7 displayName ARG 8 server ARG 9 entity - METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLnet/minecraft/class_8838;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;Ljava/util/function/IntConsumer;)V + METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLnet/minecraft/class_8935;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;)V ARG 1 output ARG 2 pos ARG 3 rot @@ -46,7 +43,6 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 12 entityAnchor ARG 13 signedArguments ARG 14 messageChainTaskQueue - ARG 15 returnValueConsumer METHOD method_36321 withOutput (Lnet/minecraft/class_2165;)Lnet/minecraft/class_2168; ARG 1 output METHOD method_41212 (Lnet/minecraft/class_2172$class_7078;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; @@ -76,14 +72,6 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource COMMENT Sends {@code message} as the feedback to the command's executor, or to the server's log COMMENT if the command is not executed by a player. ARG 1 message - METHOD method_51411 withReturnValueConsumer (Ljava/util/function/IntConsumer;)Lnet/minecraft/class_2168; - ARG 1 returnValueConsumer - METHOD method_51412 (I)V - ARG 0 returnValue - METHOD method_54305 (Lnet/minecraft/class_2168;ZI)V - ARG 0 context - ARG 1 success - ARG 2 result METHOD method_9206 withLevel (I)Lnet/minecraft/class_2168; ARG 1 level METHOD method_9207 getPlayerOrThrow ()Lnet/minecraft/class_3222; @@ -92,7 +80,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource COMMENT @throws CommandSyntaxException if this command source is not a player METHOD method_9208 withPosition (Lnet/minecraft/class_243;)Lnet/minecraft/class_2168; ARG 1 position - METHOD method_9209 mergeStorers (Lnet/minecraft/class_8838;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168; + METHOD method_9209 mergeStorers (Lnet/minecraft/class_8935;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168; ARG 1 resultStorer ARG 2 merger METHOD method_9210 getRotation ()Lnet/minecraft/class_241; diff --git a/mappings/net/minecraft/structure/StructureTemplateManager.mapping b/mappings/net/minecraft/structure/StructureTemplateManager.mapping index 72402794ed..e871e2866a 100644 --- a/mappings/net/minecraft/structure/StructureTemplateManager.mapping +++ b/mappings/net/minecraft/structure/StructureTemplateManager.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureTemplateManager FIELD field_31684 STRUCTURES_DIRECTORY Ljava/lang/String; FIELD field_31685 NBT_FILE_EXTENSION Ljava/lang/String; FIELD field_31686 SNBT_FILE_EXTENSION Ljava/lang/String; - FIELD field_39416 GAME_TEST_STRUCTURES_DIRECTORY Ljava/lang/String; FIELD field_39417 providers Ljava/util/List; FIELD field_40369 blockLookup Lnet/minecraft/class_7871; FIELD field_40370 NBT_FINDER Lnet/minecraft/class_7654; diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 8f0e4118ef..fe1129715b 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -26,26 +26,17 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 3 world METHOD method_22249 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 2 structureBlockPos - METHOD method_22250 createStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; - ARG 0 templateName - ARG 1 pos - ARG 2 rotation - ARG 3 world - ARG 4 initOnly METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V ARG 0 testName ARG 1 pos ARG 2 relativePos ARG 3 rotation ARG 4 world - METHOD method_22252 placeStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; + METHOD method_22252 placeStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2633; ARG 0 name ARG 1 pos ARG 2 rotation ARG 3 world - ARG 4 initOnly - METHOD method_22253 loadSnbt (Ljava/nio/file/Path;)Lnet/minecraft/class_2487; - ARG 0 path METHOD method_22254 (ILnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 2 pos METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_2338; @@ -63,9 +54,6 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 altitude ARG 1 pos ARG 2 world - METHOD method_22369 createStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_3218;)Lnet/minecraft/class_3499; - ARG 0 templateId - ARG 1 world METHOD method_29408 getRotation (I)Lnet/minecraft/class_2470; ARG 0 steps METHOD method_29409 getStructureBlockBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_3341; @@ -76,18 +64,11 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 structureBlockEntity METHOD method_36105 getRotationSteps (Lnet/minecraft/class_2470;)I ARG 0 rotation - METHOD method_54844 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)V - ARG 1 chunkPos METHOD method_54845 (Lnet/minecraft/class_3218;Ljava/util/Collection;Lnet/minecraft/class_2338;)V ARG 2 blockPos - METHOD method_54846 streamChunkPos (Lnet/minecraft/class_3341;I)Ljava/util/stream/Stream; - ARG 0 box - ARG 1 margin METHOD method_54847 getStructureBlockBoxCornerPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; ARG 0 pos ARG 1 size ARG 2 rotation - METHOD method_54848 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)V - ARG 1 chunkPos METHOD method_54849 getStructureBlockPos (Lnet/minecraft/class_2633;)Lnet/minecraft/class_2338; ARG 0 structureBlockEntity diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 4c5c4200a6..cf6dcc61f8 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -61,11 +61,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT @throws IllegalArgumentException if {@code array} is empty ARG 0 array ARG 1 random - METHOD method_27760 backupAndReplace (Ljava/io/File;Ljava/io/File;Ljava/io/File;)V - COMMENT Copies {@code current} to {@code backup} and then replaces {@code current} with {@code newPath}. - ARG 0 current - ARG 1 newFile - ARG 2 backup METHOD method_27761 moveCursor (Ljava/lang/String;II)I COMMENT Moves the {@code cursor} in the {@code string} by a {@code delta} amount. COMMENT Skips surrogate characters. diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 56863c78c5..7727ebf27b 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -179,26 +179,22 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 3 count ARG 4 experience METHOD (Lnet/minecraft/class_1792;IIII)V - ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1792;IIIIF)V - ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience ARG 6 multiplier METHOD (Lnet/minecraft/class_1799;IIII)V - ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1799;IIIIF)V - ARG 1 sell ARG 2 price ARG 3 count ARG 4 maxUses diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index 9443c1503c..6d102bfe7e 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -28,10 +28,6 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor ARG 1 lastOutput METHOD method_8292 getLastOutput ()Lnet/minecraft/class_2561; METHOD method_8293 getWorld ()Lnet/minecraft/class_3218; - METHOD method_8294 (Lnet/minecraft/class_2168;ZI)V - ARG 1 context - ARG 2 success - ARG 3 result METHOD method_8295 markDirty ()V METHOD method_8296 isTrackingOutput ()Z METHOD method_8297 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index e91a224361..b6113b0c88 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -247,9 +247,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 6 z ARG 8 sound ARG 9 category - METHOD method_8396 (Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V - COMMENT the player that caused the sound and therefore plays the sound directly in - COMMENT the client, or {@code null} METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState