From 0fb234b73228ce00f40c1d5d091cbf22b719ed72 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 3 Nov 2023 01:14:18 +0900 Subject: [PATCH] 23w44a more stuff --- .../minecraft/client/MinecraftClient.mapping | 2 +- .../inventory/LootableInventory.mapping | 60 ++++++++++++++++++- mappings/net/minecraft/nbt/NbtIo.mapping | 24 +++++--- .../net/minecraft/test/GameTestState.mapping | 5 ++ .../minecraft/test/StructureTestUtil.mapping | 7 +++ .../net/minecraft/test/TestServer.mapping | 5 ++ .../net/minecraft/util/math/BlockBox.mapping | 1 + .../minecraft/world/tick/TickManager.mapping | 2 +- 8 files changed, 94 insertions(+), 12 deletions(-) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index bd38d653e3..8f0840e487 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -98,7 +98,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT The client connection to the integrated server. COMMENT This is only used when connecting to the integrated server. COMMENT - COMMENT @see net.minecraft.client.gui.screen.ConnectScreen + COMMENT @see net.minecraft.client.gui.screen.multiplayer.ConnectScreen FIELD field_1747 crashReportSupplier Ljava/util/function/Supplier; FIELD field_1748 levelStorage Lnet/minecraft/class_32; FIELD field_1749 ALT_TEXT_RENDERER_ID Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/inventory/LootableInventory.mapping b/mappings/net/minecraft/inventory/LootableInventory.mapping index 8230989b0a..e80746c753 100644 --- a/mappings/net/minecraft/inventory/LootableInventory.mapping +++ b/mappings/net/minecraft/inventory/LootableInventory.mapping @@ -1,25 +1,81 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory + COMMENT An inventory whose contents can be supplied from a loot table. + COMMENT + COMMENT

This is usually implemented by block entities, which extend {@link + COMMENT net.minecraft.block.entity.LootableContainerBlockEntity}. FIELD field_47154 LOOT_TABLE_KEY Ljava/lang/String; FIELD field_47155 LOOT_TABLE_SEED_KEY Ljava/lang/String; 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 + METHOD method_11285 setLootTableId (Lnet/minecraft/class_2960;)V + COMMENT Sets the loot table ID. + COMMENT + COMMENT

This is usually stored under the {@value LOOT_TABLE_KEY} NBT key. ARG 1 lootTableId + COMMENT the loot table ID, or {@code null} to remove the loot table METHOD method_54866 setLootTableSeed (J)V + COMMENT Sets the loot table's seed. + COMMENT + COMMENT

Vanilla implementations return {@code 0} when there is no loot + COMMENT table associated with the inventory, although it is not necessary. + COMMENT + COMMENT

This is usually stored under the {@value LOOT_TABLE_SEED_KEY} NBT key. ARG 1 lootTableSeed METHOD method_54867 setLootTable (Lnet/minecraft/class_2960;J)V + COMMENT Sets the loot table ID and seed at once. + COMMENT This is useful for code-based structure generation. + COMMENT + COMMENT @see #setLootTableId(Identifier) + COMMENT @see #setLootTableSeed(long) + COMMENT @see #setLootTable(BlockView, Random, BlockPos, Identifier) ARG 1 lootTableId ARG 2 lootTableSeed METHOD method_54868 setLootTable (Lnet/minecraft/class_1922;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V + COMMENT Queries the block entity at {@code pos}, checks if it is a {@link LootableInventory}, + COMMENT and sets the loot table ID and seed if applicable. + COMMENT This is useful for code-based structure generation. + COMMENT + COMMENT @see #setLootTableId(Identifier) + COMMENT @see #setLootTableSeed(long) + COMMENT @see #setLootTable(Identifier, long) ARG 0 world ARG 1 random ARG 2 pos ARG 3 lootTableId - METHOD method_54869 getLootTable ()Lnet/minecraft/class_2960; + METHOD method_54869 getLootTableId ()Lnet/minecraft/class_2960; + COMMENT {@return the loot table ID, or {@code null} if there is no associated loot table} + COMMENT + COMMENT

This is usually stored under the {@value LOOT_TABLE_KEY} NBT key. METHOD method_54870 getLootTableSeed ()J + COMMENT {@return the loot table's seed} + COMMENT + COMMENT

Vanilla implementations return {@code 0} when there is no loot + COMMENT table associated with the inventory, although it is not necessary. + COMMENT + COMMENT

This is usually stored under the {@value LOOT_TABLE_SEED_KEY} NBT key. METHOD method_54871 readLootTable (Lnet/minecraft/class_2487;)Z + COMMENT Reads the loot table ID and seed from {@code nbt}, if the loot table ID + COMMENT exists in {@code nbt}. Implementations should skip reading the contents of + COMMENT the inventory if this returns {@code true}. + COMMENT + COMMENT @return whether the loot table ID was found ARG 1 nbt METHOD method_54872 writeLootTable (Lnet/minecraft/class_2487;)Z + COMMENT Writes the loot table ID and seed to {@code nbt}, if {@linkplain #getLootTableId + COMMENT the loot table ID} is not {@code null}. Implementations should skip writing the + COMMENT contents of the inventory if this returns {@code true}. + COMMENT + COMMENT

This skips writing the seed if it equals {@code 0L}. This has no practical + COMMENT difference in-game, as getting nonexistent {@code long} values return {@code 0L}. + COMMENT + COMMENT @return whether the loot table ID was non-{@code null} ARG 1 nbt METHOD method_54873 generateLoot (Lnet/minecraft/class_1657;)V + COMMENT Replaces the contents of this inventory with the generated loot, if it exists. + COMMENT Does nothing if there is no loot table associated with this inventory. + COMMENT After generation, the loot table is removed from the inventory. + COMMENT + COMMENT

Implementations should call this method whenever the inventory is accessed. ARG 1 player + COMMENT the player that triggered this generation (by opening, breaking, etc), or + COMMENT {@code null} if there was no player involvement diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index 9b0cbff30d..16b50ad243 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT Writes the {@code nbt} to {@code output}. COMMENT COMMENT @throws IOException if the IO operation fails - COMMENT @see #write(NbtCompound, File) + COMMENT @see #write(NbtCompound, Path) ARG 0 nbt ARG 1 output METHOD method_10629 readCompressed (Ljava/io/InputStream;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; @@ -36,15 +36,16 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo 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 - COMMENT @see #readCompressed(File, NbtTagSizeTracker) + COMMENT @see #readCompressed(Path, NbtTagSizeTracker) ARG 0 stream ARG 1 tagSizeTracker METHOD method_10630 write (Lnet/minecraft/class_2487;Ljava/nio/file/Path;)V - COMMENT Writes the {@code nbt} to {@code file}. + COMMENT Writes the {@code nbt} to the file at {@code path}. COMMENT COMMENT @throws IOException if the IO operation fails COMMENT @see #write(NbtCompound, DataOutput) ARG 0 nbt + ARG 1 path 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,34 +57,37 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo ARG 0 nbt ARG 1 output METHOD method_10633 read (Ljava/nio/file/Path;)Lnet/minecraft/class_2487; - COMMENT Reads an NBT compound from {@code file}. + COMMENT Reads an NBT compound from the file at{@code path}. 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 path METHOD method_10634 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/OutputStream;)V COMMENT Writes the Gzip-compressed {@code nbt} to {@code stream}. COMMENT COMMENT @throws IOException if the IO operation fails - COMMENT @see #writeCompressed(NbtCompound, File) + COMMENT @see #writeCompressed(NbtCompound, Path) ARG 0 nbt ARG 1 stream 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 Reads an NBT compound from Gzip-compressed file at {@code path}. COMMENT COMMENT @return the NBT compound from the file 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 COMMENT @see #readCompressed(InputStream, NbtTagSizeTracker) + ARG 0 path ARG 1 tagSizeTracker METHOD method_30614 writeCompressed (Lnet/minecraft/class_2487;Ljava/nio/file/Path;)V - COMMENT Writes the Gzip-compressed {@code nbt} to {@code file}. + COMMENT Writes the Gzip-compressed {@code nbt} to the file at {@code path}. COMMENT COMMENT @throws IOException if the IO operation fails COMMENT @see #writeCompressed(NbtCompound, OutputStream) ARG 0 nbt + ARG 1 path 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 @@ -106,6 +110,7 @@ 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 path ARG 1 scanner ARG 2 tracker METHOD method_40058 scanCompressed (Ljava/io/InputStream;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V @@ -117,7 +122,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT COMMENT @throws IOException if the IO operation fails COMMENT @throws NbtSizeValidationException if the {@code tracker}'s validation fails - COMMENT @see #scanCompressed(File, NbtScanner, NbtTagSizeTracker) + COMMENT @see #scanCompressed(Path, NbtScanner, NbtTagSizeTracker) ARG 0 stream ARG 1 scanner ARG 2 tracker @@ -154,3 +159,6 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo METHOD method_54662 toBytes (Lnet/minecraft/class_2487;)[B COMMENT {@return the byte array serialization of {@code nbt}} ARG 0 nbt + METHOD method_54906 compress (Ljava/io/OutputStream;)Ljava/io/DataOutputStream; + COMMENT {@return a new output stream that compresses the input {@code stream}} + ARG 0 stream diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index a75b0a2326..240b1cd69b 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -15,6 +15,9 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState FIELD field_25301 rotation Lnet/minecraft/class_2470; FIELD field_27805 structureBlockEntity Lnet/minecraft/class_2633; FIELD field_46593 rerunUntilFailed Z + FIELD field_47172 initialDelay I + FIELD field_47173 initialized Z + FIELD field_47174 tickedOnce Z METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V ARG 1 testFunction ARG 2 rotation @@ -78,3 +81,5 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_54435 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_54843 getStructureBlockPos ()Lnet/minecraft/class_2338; + METHOD method_54900 (Lnet/minecraft/class_1923;)Z + ARG 1 chunkPos diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index fe1129715b..126238d6d3 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -72,3 +72,10 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 2 rotation METHOD method_54849 getStructureBlockPos (Lnet/minecraft/class_2633;)Lnet/minecraft/class_2338; ARG 0 structureBlockEntity + METHOD method_54901 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)V + ARG 1 chunkPos + METHOD method_54903 initStructure (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2633; + ARG 0 testName + ARG 1 pos + ARG 2 rotation + ARG 3 world diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 6779647abd..87e945655d 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer FIELD field_33161 TEST_LEVEL Lnet/minecraft/class_5285; FIELD field_33162 testSet Lnet/minecraft/class_4524; FIELD field_39441 NONE_API_SERVICES Lnet/minecraft/class_7497; + FIELD field_47175 TEST_POS_XZ_RANGE I METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/util/Collection;Lnet/minecraft/class_2338;)V ARG 1 serverThread ARG 2 session @@ -23,9 +24,13 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer METHOD method_36097 (Lnet/minecraft/class_4517;)V ARG 0 test METHOD method_36098 isTesting ()Z + METHOD method_40377 (Lnet/minecraft/class_1940;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; + ARG 1 context METHOD method_40378 create (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Ljava/util/Collection;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6306; ARG 0 thread ARG 1 session ARG 2 resourcePackManager ARG 3 batches ARG 4 pos + METHOD method_43615 (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_1940;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 2 executor diff --git a/mappings/net/minecraft/util/math/BlockBox.mapping b/mappings/net/minecraft/util/math/BlockBox.mapping index bbd284daac..18a8fa75af 100644 --- a/mappings/net/minecraft/util/math/BlockBox.mapping +++ b/mappings/net/minecraft/util/math/BlockBox.mapping @@ -129,3 +129,4 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox ARG 1 x ARG 2 y ARG 3 z + METHOD method_54883 streamChunkPos ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/world/tick/TickManager.mapping b/mappings/net/minecraft/world/tick/TickManager.mapping index e38f809be7..3dc507d451 100644 --- a/mappings/net/minecraft/world/tick/TickManager.mapping +++ b/mappings/net/minecraft/world/tick/TickManager.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_8921 net/minecraft/world/tick/TickManager ARG 1 tickRate METHOD method_54675 setFrozen (Z)V ARG 1 frozen - METHOD method_54746 shouldTick (Lnet/minecraft/class_1297;)Z + METHOD method_54746 shouldSkipTick (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_54747 setStepTicks (I)V ARG 1 stepTicks