From bd4e393324966ddcaa976fb49d06aa02fca7b9e8 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 22 Oct 2023 14:47:45 +0900 Subject: [PATCH] More 23w42a stuff (#3703) --- .../block/entity/CrafterBlockEntity.mapping | 7 +++++++ .../minecraft/client/MinecraftClient.mapping | 4 ++++ .../gui/screen/BackupPromptScreen.mapping | 2 ++ .../gui/screen/ConfirmLinkScreen.mapping | 9 +++++++++ .../gui/screen/DatapackFailureScreen.mapping | 5 ++++- .../client/gui/screen/GameMenuScreen.mapping | 1 + .../client/gui/widget/EntryListWidget.mapping | 3 +++ .../realms/dto/RealmsNotification.mapping | 1 + .../RealmsSelectWorldTemplateScreen.mapping | 2 ++ .../client/render/BufferBuilder.mapping | 4 ++++ .../render/BufferBuilderStorage.mapping | 11 +++++++++- .../chunk/BlockBufferBuilderPool.mapping | 13 ++++++++++++ .../chunk/BlockBufferBuilderStorage.mapping | 3 +++ .../client/render/chunk/ChunkBuilder.mapping | 7 +++++++ .../client/texture/PlayerSkinProvider.mapping | 2 ++ .../client/util/GlAllocationUtils.mapping | 2 ++ .../command/ControlFlowAware.mapping | 1 + .../client/BlockStateModelGenerator.mapping | 2 ++ ...laAdventureTabAdvancementGenerator.mapping | 2 ++ .../datafixer/fix/ChoiceWriteReadFix.mapping | 1 + .../fix/PrimedTntBlockStateFix.mapping | 2 ++ .../datafixer/schema/Schema3682.mapping | 2 ++ .../datafixer/schema/Schema3683.mapping | 2 ++ .../inventory/RecipeInputInventory.mapping | 2 +- .../inventory/SimpleInventory.mapping | 3 ++- .../message/MessageChainTaskQueue.mapping | 3 +++ .../OneTwentyOneBuiltinRegistries.mapping | 3 +++ .../server/command/CommandManager.mapping | 7 +++++++ .../minecraft/server/function/Tracer.mapping | 1 + .../DirectStructurePoolAliasBinding.mapping | 2 ++ ...ndomGroupStructurePoolAliasBinding.mapping | 2 ++ .../RandomStructurePoolAliasBinding.mapping | 2 ++ .../net/minecraft/text/MutableText.mapping | 1 + .../net/minecraft/text/TextCodecs.mapping | 20 +++++++++++++++++++ mappings/net/minecraft/util/Colors.mapping | 4 ++++ mappings/net/minecraft/util/Urls.mapping | 1 + mappings/net/minecraft/util/Util.mapping | 1 + .../minecraft/util/thread/FutureQueue.mapping | 10 ++++++++++ .../gen/structure/JigsawStructure.mapping | 2 ++ 39 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 mappings/net/minecraft/client/render/chunk/BlockBufferBuilderPool.mapping create mode 100644 mappings/net/minecraft/registry/OneTwentyOneBuiltinRegistries.mapping diff --git a/mappings/net/minecraft/block/entity/CrafterBlockEntity.mapping b/mappings/net/minecraft/block/entity/CrafterBlockEntity.mapping index 80ab8e23a7..da81ae97dc 100644 --- a/mappings/net/minecraft/block/entity/CrafterBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CrafterBlockEntity.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_8887 net/minecraft/block/entity/CrafterBlockEntity + FIELD field_46809 GRID_WIDTH I + FIELD field_46810 GRID_HEIGHT I + FIELD field_46811 GRID_SIZE I + FIELD field_46812 SLOT_DISABLED I + FIELD field_46813 SLOT_ENABLED I + FIELD field_46814 TRIGGERED_PROPERTY I + FIELD field_46815 PROPERTIES_COUNT I FIELD field_46816 propertyDelegate Lnet/minecraft/class_3913; FIELD field_46817 inputStacks Lnet/minecraft/class_2371; FIELD field_46818 craftingTicksRemaining I diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 66fd6d030c..c2b68fa6d3 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -377,6 +377,10 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_29603 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_7497;Ljava/lang/Thread;)Lnet/minecraft/class_1132; ARG 5 thread METHOD method_29610 startIntegratedServer (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Z)V + ARG 1 session + ARG 2 dataPackManager + ARG 3 saveLoader + ARG 4 newWorld METHOD method_29611 isFabulousGraphicsOrBetter ()Z METHOD method_29970 setScreenAndRender (Lnet/minecraft/class_437;)V ARG 1 screen diff --git a/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping b/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping index 56869a97bc..f69fe50487 100644 --- a/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping @@ -4,7 +4,9 @@ CLASS net/minecraft/class_405 net/minecraft/client/gui/screen/BackupPromptScreen FIELD field_2364 subtitle Lnet/minecraft/class_2561; FIELD field_2365 wrappedText Lnet/minecraft/class_5489; FIELD field_46857 callback Lnet/minecraft/class_405$class_406; + FIELD field_46858 onCancel Ljava/lang/Runnable; METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_405$class_406;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V + ARG 1 onCancel ARG 2 callback ARG 3 title ARG 4 subtitle diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping index 10e57af64e..bffbe416c5 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping @@ -35,9 +35,18 @@ CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmLinkScreen ARG 3 confirmed METHOD method_49623 open (Lnet/minecraft/class_437;Ljava/lang/String;)V COMMENT Opens the confirmation screen to open {@code url}. + COMMENT The link is always trusted. COMMENT COMMENT @see #opening + ARG 0 parent + ARG 1 url + METHOD method_49624 (Lnet/minecraft/class_437;Ljava/lang/String;Lnet/minecraft/class_4185;)V + ARG 2 button METHOD method_49625 opening (Lnet/minecraft/class_437;Ljava/lang/String;)Lnet/minecraft/class_4185$class_4241; COMMENT {@return the button press action that opens the confirmation screen to open {@code url}} COMMENT + COMMENT

The link is always trusted. + COMMENT COMMENT @see #open + ARG 0 parent + ARG 1 url diff --git a/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping b/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping index b3d84dba98..5fa9203b53 100644 --- a/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_5346 net/minecraft/client/gui/screen/DatapackFailureScreen FIELD field_25265 wrappedText Lnet/minecraft/class_5489; + FIELD field_46859 goBack Ljava/lang/Runnable; + FIELD field_46860 runServerInSafeMode Ljava/lang/Runnable; METHOD (Ljava/lang/Runnable;Ljava/lang/Runnable;)V - ARG 1 runServerInSafeMode + ARG 1 goBack + ARG 2 runServerInSafeMode METHOD method_29345 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_29346 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping index 3a6f975d3a..b7e43507a4 100644 --- a/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_433 net/minecraft/client/gui/screen/GameMenuScreen METHOD method_47898 (Ljava/util/function/Supplier;Lnet/minecraft/class_4185;)V ARG 2 button METHOD method_47899 createUrlButton (Lnet/minecraft/class_2561;Ljava/lang/String;)Lnet/minecraft/class_4185; + ARG 1 text ARG 2 url METHOD method_47900 createButton (Lnet/minecraft/class_2561;Ljava/util/function/Supplier;)Lnet/minecraft/class_4185; ARG 1 text diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 7e0fdcd8fd..82d4d69cc0 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -32,6 +32,9 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25309 scroll (I)V ARG 1 amount METHOD method_25310 clickedHeader (II)Z + COMMENT Called when the header is clicked. + COMMENT + COMMENT @return {@code true} to indicate that the event handling is successful/valid ARG 1 x ARG 2 y METHOD method_25311 renderList (Lnet/minecraft/class_332;IIF)V diff --git a/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping b/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping index 159cbc9b98..5da38afa08 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_8204 net/minecraft/client/realms/dto/RealmsNotificatio ARG 0 parent ARG 1 json METHOD method_49580 createButton (Lnet/minecraft/class_437;)Lnet/minecraft/class_4185; + ARG 1 currentScreen METHOD method_49581 getDefaultMessage ()Lnet/minecraft/class_2561; CLASS class_8814 InfoPopup FIELD field_46540 TITLE_KEY Ljava/lang/String; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping index 979a774a14..0813da1870 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping @@ -73,3 +73,5 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_45984 prevClickTime J FIELD field_45985 infoButton Lnet/minecraft/class_344; FIELD field_45986 trailerButton Lnet/minecraft/class_344; + METHOD (Lnet/minecraft/class_4419;Lnet/minecraft/class_4890;)V + ARG 2 template diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index 31d03035e4..95b8218556 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -32,6 +32,8 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder FIELD field_39061 builtBufferCount I FIELD field_39062 batchOffset I FIELD field_43358 sorter Lnet/minecraft/class_8251; + FIELD field_46839 ROUND_SIZE_CHANGE I + FIELD field_46840 closed Z METHOD (I)V ARG 1 initialCapacity METHOD method_1324 beginSortedIndexBuffer (Lnet/minecraft/class_287$class_5594;)V @@ -86,6 +88,8 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder ARG 1 sorter METHOD method_49905 (Lorg/apache/commons/lang3/mutable/MutableInt;I)V ARG 2 index + METHOD method_54558 close ()V + METHOD method_54559 ensureNotClosed ()V CLASS class_4574 DrawParameters METHOD method_31957 getVertexBufferSize ()I METHOD method_31958 getBufferSize ()I diff --git a/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping b/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping index 86091481a8..36c781b80a 100644 --- a/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping @@ -1,7 +1,11 @@ CLASS net/minecraft/class_4599 net/minecraft/client/render/BufferBuilderStorage - FIELD field_20956 blockBuilders Lnet/minecraft/class_750; + FIELD field_20956 blockBufferBuilders Lnet/minecraft/class_750; FIELD field_20959 effectVertexConsumers Lnet/minecraft/class_4597$class_4598; FIELD field_20961 outlineVertexConsumers Lnet/minecraft/class_4618; + FIELD field_46900 blockBufferBuildersPool Lnet/minecraft/class_8901; + FIELD field_46901 entityVertexConsumers Lnet/minecraft/class_4597$class_4598; + METHOD (I)V + ARG 1 maxBlockBuildersPoolSize METHOD method_22997 getBlockBufferBuilders ()Lnet/minecraft/class_750; METHOD method_23000 getEntityVertexConsumers ()Lnet/minecraft/class_4597$class_4598; METHOD method_23001 getEffectVertexConsumers ()Lnet/minecraft/class_4597$class_4598; @@ -9,3 +13,8 @@ CLASS net/minecraft/class_4599 net/minecraft/client/render/BufferBuilderStorage METHOD method_23798 assignBufferBuilder (Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;Lnet/minecraft/class_1921;)V ARG 0 builderStorage ARG 1 layer + METHOD method_54639 (Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;)V + ARG 1 map + METHOD method_54640 getBlockBufferBuildersPool ()Lnet/minecraft/class_8901; + METHOD method_54641 (Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;Lnet/minecraft/class_1921;)V + ARG 1 renderLayer diff --git a/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderPool.mapping b/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderPool.mapping new file mode 100644 index 0000000000..bdd5fbe3c6 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderPool.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8901 net/minecraft/client/render/chunk/BlockBufferBuilderPool + FIELD field_46904 LOGGER Lorg/slf4j/Logger; + FIELD field_46905 availableBuilders Ljava/util/Queue; + FIELD field_46906 availableBuilderCount I + METHOD (Ljava/util/List;)V + ARG 1 availableBuilders + METHOD method_54642 acquire ()Lnet/minecraft/class_750; + METHOD method_54643 allocate (I)Lnet/minecraft/class_8901; + ARG 0 max + METHOD method_54644 release (Lnet/minecraft/class_750;)V + ARG 1 builders + METHOD method_54645 hasNoAvailableBuilder ()Z + METHOD method_54646 getAvailableBuilderCount ()I diff --git a/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping b/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping index 9bf80e88c5..11778350ef 100644 --- a/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping +++ b/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_750 net/minecraft/client/render/chunk/BlockBufferBuilderStorage FIELD field_3951 builders Ljava/util/Map; + FIELD field_46902 EXPECTED_TOTAL_SIZE I METHOD method_22705 clear ()V METHOD method_22706 (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; ARG 0 renderLayer + METHOD method_22707 (Lnet/minecraft/class_1921;)Lnet/minecraft/class_1921; + ARG 0 renderLayer METHOD method_23501 reset ()V METHOD method_3154 get (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; ARG 1 layer diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index c355990411..83c1274eb7 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -12,10 +12,13 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder COMMENT The number of tasks it can poll from {@link #prioritizedTaskQueue} COMMENT before polling from {@link #taskQueue} first instead. FIELD field_4443 uploadQueue Ljava/util/Queue; + FIELD field_46907 buffersPool Lnet/minecraft/class_8901; + FIELD field_46908 stopped Z METHOD (Lnet/minecraft/class_638;Lnet/minecraft/class_761;Ljava/util/concurrent/Executor;Lnet/minecraft/class_4599;)V ARG 1 world ARG 2 worldRenderer ARG 3 executor + ARG 4 bufferBuilderStorage METHOD method_19419 setCameraPosition (Lnet/minecraft/class_243;)V ARG 1 cameraPosition METHOD method_19420 getCameraPosition ()Lnet/minecraft/class_243; @@ -40,6 +43,8 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_3632 reset ()V METHOD method_3633 clear ()V METHOD method_3635 scheduleUpload (Lnet/minecraft/class_287$class_7433;Lnet/minecraft/class_291;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builtBuffer + ARG 2 glBuffer METHOD method_38555 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; ARG 0 future METHOD method_39132 pollTask ()Lnet/minecraft/class_846$class_851$class_4577; @@ -164,4 +169,6 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_22789 (Lnet/minecraft/class_846$class_4690;Ljava/lang/Throwable;)Lnet/minecraft/class_846$class_4690; ARG 1 result ARG 2 throwable + METHOD method_22790 (Ljava/lang/Void;)Lnet/minecraft/class_846$class_4690; + ARG 0 v CLASS class_4690 Result diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index 547c61a9b1..107f95c393 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider METHOD method_52859 fetchSkinTextures (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/MinecraftProfileTextures;)Ljava/util/concurrent/CompletableFuture; ARG 1 uuid ARG 2 textures + METHOD method_52861 (Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_8685$class_7920;Lcom/mojang/authlib/minecraft/MinecraftProfileTextures;Ljava/lang/Void;)Lnet/minecraft/class_8685; + ARG 6 v METHOD method_52862 getSkinTextures (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_8685; ARG 1 profile METHOD method_52863 fetchSkinTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/client/util/GlAllocationUtils.mapping b/mappings/net/minecraft/client/util/GlAllocationUtils.mapping index 767ba1044a..34fd7ec644 100644 --- a/mappings/net/minecraft/client/util/GlAllocationUtils.mapping +++ b/mappings/net/minecraft/client/util/GlAllocationUtils.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_311 net/minecraft/client/util/GlAllocationUtils METHOD method_37465 resizeByteBuffer (Ljava/nio/ByteBuffer;I)Ljava/nio/ByteBuffer; ARG 0 source ARG 1 size + METHOD method_54557 free (Ljava/nio/ByteBuffer;)V + ARG 0 buf diff --git a/mappings/net/minecraft/command/ControlFlowAware.mapping b/mappings/net/minecraft/command/ControlFlowAware.mapping index 8e915efa66..9b7f236ceb 100644 --- a/mappings/net/minecraft/command/ControlFlowAware.mapping +++ b/mappings/net/minecraft/command/ControlFlowAware.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_8848 net/minecraft/command/ControlFlowAware 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 ARG 1 source ARG 2 contextChain diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index aa8b0121f0..2a64d25b40 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -545,6 +545,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_51463 registerGeneric (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_54654 registerCrafter ()V + METHOD method_54655 (Lnet/minecraft/class_5000;)Lnet/minecraft/class_4935; + ARG 1 orientation CLASS class_4911 BuiltinModelPool FIELD field_22835 modelId Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping index 98fd317f16..71de8bd88b 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -37,5 +37,7 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van ARG 0 block METHOD method_54650 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V ARG 1 template + METHOD method_54651 (Lnet/minecraft/class_161$class_162;Lcom/mojang/datafixers/util/Pair;)V + ARG 1 pair METHOD method_54652 (Ljava/util/Set;Lnet/minecraft/class_7803$class_8905;)Z ARG 1 template diff --git a/mappings/net/minecraft/datafixer/fix/ChoiceWriteReadFix.mapping b/mappings/net/minecraft/datafixer/fix/ChoiceWriteReadFix.mapping index 220e148090..cb47ec79f4 100644 --- a/mappings/net/minecraft/datafixer/fix/ChoiceWriteReadFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChoiceWriteReadFix.mapping @@ -9,3 +9,4 @@ CLASS net/minecraft/class_8877 net/minecraft/datafixer/fix/ChoiceWriteReadFix ARG 4 type ARG 5 choiceName METHOD method_54447 transform (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 data diff --git a/mappings/net/minecraft/datafixer/fix/PrimedTntBlockStateFix.mapping b/mappings/net/minecraft/datafixer/fix/PrimedTntBlockStateFix.mapping index e8d028325a..cffb348402 100644 --- a/mappings/net/minecraft/datafixer/fix/PrimedTntBlockStateFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PrimedTntBlockStateFix.mapping @@ -2,4 +2,6 @@ CLASS net/minecraft/class_8878 net/minecraft/datafixer/fix/PrimedTntBlockStateFi METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema METHOD method_54449 fixFuse (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 data METHOD method_54450 fixBlockState (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 data diff --git a/mappings/net/minecraft/datafixer/schema/Schema3682.mapping b/mappings/net/minecraft/datafixer/schema/Schema3682.mapping index e7688ac001..ee0dcb015b 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3682.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3682.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8879 net/minecraft/datafixer/schema/Schema3682 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3683.mapping b/mappings/net/minecraft/datafixer/schema/Schema3683.mapping index 6cee4bb9b6..fdb74c453a 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3683.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3683.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8880 net/minecraft/datafixer/schema/Schema3683 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/inventory/RecipeInputInventory.mapping b/mappings/net/minecraft/inventory/RecipeInputInventory.mapping index c70a621ac9..3f06fa6591 100644 --- a/mappings/net/minecraft/inventory/RecipeInputInventory.mapping +++ b/mappings/net/minecraft/inventory/RecipeInputInventory.mapping @@ -5,5 +5,5 @@ CLASS net/minecraft/class_8566 net/minecraft/inventory/RecipeInputInventory COMMENT {@return the height of the recipe grid} METHOD method_17398 getWidth ()I COMMENT {@return the width of the recipe grid} - METHOD method_51305 getInputStacks ()Ljava/util/List; + METHOD method_51305 getHeldStacks ()Ljava/util/List; COMMENT {@return the stacks held by the inventory} diff --git a/mappings/net/minecraft/inventory/SimpleInventory.mapping b/mappings/net/minecraft/inventory/SimpleInventory.mapping index 6bf298927c..c761ca71b0 100644 --- a/mappings/net/minecraft/inventory/SimpleInventory.mapping +++ b/mappings/net/minecraft/inventory/SimpleInventory.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory COMMENT COMMENT

Changes to the inventory can be listened to either by subclassing this and COMMENT overriding {@link #markDirty}, or by using {@link #addListener}. - FIELD field_5828 stacks Lnet/minecraft/class_2371; + FIELD field_5828 heldStacks Lnet/minecraft/class_2371; FIELD field_5829 listeners Ljava/util/List; FIELD field_5831 size I METHOD (I)V @@ -47,6 +47,7 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory METHOD method_27070 canInsert (Lnet/minecraft/class_1799;)Z COMMENT {@return whether {@code stack} can be inserted into this inventory} ARG 1 stack + METHOD method_54454 getHeldStacks ()Lnet/minecraft/class_2371; METHOD method_5488 removeListener (Lnet/minecraft/class_1265;)V COMMENT Removes a {@code listener} previously added by {@code #addListener}. COMMENT Does nothing when the listener was not found. diff --git a/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping b/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping index 549a75a7d4..eb1a0cc55c 100644 --- a/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping +++ b/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping @@ -10,3 +10,6 @@ CLASS net/minecraft/class_7619 net/minecraft/network/message/MessageChainTaskQue ARG 2 object METHOD method_44904 (Ljava/lang/Throwable;)Ljava/lang/Void; ARG 0 throwable + METHOD method_54440 (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 a + ARG 1 b diff --git a/mappings/net/minecraft/registry/OneTwentyOneBuiltinRegistries.mapping b/mappings/net/minecraft/registry/OneTwentyOneBuiltinRegistries.mapping new file mode 100644 index 0000000000..1f569038aa --- /dev/null +++ b/mappings/net/minecraft/registry/OneTwentyOneBuiltinRegistries.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8906 net/minecraft/registry/OneTwentyOneBuiltinRegistries + METHOD method_54659 createWrapperLookup (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; + ARG 0 registriesFuture diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping index 14c24aa515..c60234003e 100644 --- a/mappings/net/minecraft/server/command/CommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager + FIELD field_46823 CURRENT_CONTEXT Ljava/lang/ThreadLocal; FIELD field_9832 dispatcher Lcom/mojang/brigadier/CommandDispatcher; FIELD field_9833 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_2170$class_5364;Lnet/minecraft/class_7157;)V @@ -35,6 +36,12 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager ARG 1 callback METHOD method_54314 (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2168;Lnet/minecraft/class_8854;)V ARG 3 context + METHOD method_54492 checkCommand (Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;Lnet/minecraft/class_2168;)Lcom/mojang/brigadier/context/ContextChain; + ARG 0 parseResults + ARG 1 command + ARG 2 source + METHOD method_54493 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 1 style METHOD method_9235 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_9238 getCommandValidator (Lnet/minecraft/class_2170$class_2171;)Ljava/util/function/Predicate; ARG 0 parser diff --git a/mappings/net/minecraft/server/function/Tracer.mapping b/mappings/net/minecraft/server/function/Tracer.mapping index 8afc1007c6..be3f17e6c0 100644 --- a/mappings/net/minecraft/server/function/Tracer.mapping +++ b/mappings/net/minecraft/server/function/Tracer.mapping @@ -12,3 +12,4 @@ CLASS net/minecraft/class_6346 net/minecraft/server/function/Tracer ARG 2 function ARG 3 size METHOD method_36352 traceError (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/structure/pool/alias/DirectStructurePoolAliasBinding.mapping b/mappings/net/minecraft/structure/pool/alias/DirectStructurePoolAliasBinding.mapping index d0798f76fd..97d84e742b 100644 --- a/mappings/net/minecraft/structure/pool/alias/DirectStructurePoolAliasBinding.mapping +++ b/mappings/net/minecraft/structure/pool/alias/DirectStructurePoolAliasBinding.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_8888 net/minecraft/structure/pool/alias/DirectStructurePoolAliasBinding FIELD field_46824 CODEC Lcom/mojang/serialization/Codec; + METHOD method_54501 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/structure/pool/alias/RandomGroupStructurePoolAliasBinding.mapping b/mappings/net/minecraft/structure/pool/alias/RandomGroupStructurePoolAliasBinding.mapping index dc47338e95..ed50448648 100644 --- a/mappings/net/minecraft/structure/pool/alias/RandomGroupStructurePoolAliasBinding.mapping +++ b/mappings/net/minecraft/structure/pool/alias/RandomGroupStructurePoolAliasBinding.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_8893 net/minecraft/structure/pool/alias/RandomGroupStr ARG 2 binding METHOD method_54518 (Lnet/minecraft/class_6008$class_6010;)Ljava/util/stream/Stream; ARG 0 present + METHOD method_54519 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/structure/pool/alias/RandomStructurePoolAliasBinding.mapping b/mappings/net/minecraft/structure/pool/alias/RandomStructurePoolAliasBinding.mapping index 2b32a313a6..63ce2a0f39 100644 --- a/mappings/net/minecraft/structure/pool/alias/RandomStructurePoolAliasBinding.mapping +++ b/mappings/net/minecraft/structure/pool/alias/RandomStructurePoolAliasBinding.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_8892 net/minecraft/structure/pool/alias/RandomStructurePoolAliasBinding FIELD field_46827 CODEC Lcom/mojang/serialization/Codec; + METHOD method_54514 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_54515 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_6008$class_6010;)V ARG 2 pool diff --git a/mappings/net/minecraft/text/MutableText.mapping b/mappings/net/minecraft/text/MutableText.mapping index 52544f67fb..b9ac5dd956 100644 --- a/mappings/net/minecraft/text/MutableText.mapping +++ b/mappings/net/minecraft/text/MutableText.mapping @@ -49,4 +49,5 @@ CLASS net/minecraft/class_5250 net/minecraft/text/MutableText COMMENT and style. ARG 0 content METHOD method_54663 withColor (I)Lnet/minecraft/class_5250; + COMMENT {@return the text with the RGB color {@color}} ARG 1 color diff --git a/mappings/net/minecraft/text/TextCodecs.mapping b/mappings/net/minecraft/text/TextCodecs.mapping index dcaece9237..06dea601a0 100644 --- a/mappings/net/minecraft/text/TextCodecs.mapping +++ b/mappings/net/minecraft/text/TextCodecs.mapping @@ -19,6 +19,9 @@ CLASS net/minecraft/class_8824 net/minecraft/text/TextCodecs ARG 0 text METHOD method_54174 dispatchingCodec ([Lnet/minecraft/class_3542;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/String;)Lcom/mojang/serialization/MapCodec; ARG 0 types + ARG 1 typeToCodec + ARG 2 valueToType + ARG 3 dispatchingKey METHOD method_54175 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2561; ARG 0 either2 METHOD method_54177 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; @@ -42,3 +45,20 @@ CLASS net/minecraft/class_8824 net/minecraft/text/TextCodecs ARG 1 ops METHOD method_54181 (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapCodec;)Ljava/util/stream/Stream; ARG 1 codec + CLASS class_8912 DispatchingCodec + FIELD field_46914 dispatchingKey Ljava/lang/String; + FIELD field_46915 withKeyCodec Lcom/mojang/serialization/MapCodec; + FIELD field_46916 withoutKeyCodec Lcom/mojang/serialization/MapCodec; + METHOD (Ljava/lang/String;Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/MapCodec;)V + ARG 1 dispatchingKey + ARG 2 withKeyCodec + ARG 3 withoutKeyCodec + METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 input + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder; + ARG 1 input + ARG 2 ops + ARG 3 prefix + METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; + ARG 1 ops diff --git a/mappings/net/minecraft/util/Colors.mapping b/mappings/net/minecraft/util/Colors.mapping index 6497431500..350f026b2c 100644 --- a/mappings/net/minecraft/util/Colors.mapping +++ b/mappings/net/minecraft/util/Colors.mapping @@ -12,3 +12,7 @@ CLASS net/minecraft/class_8012 net/minecraft/util/Colors COMMENT Represents the color light gray, {@code 0xFFA0A0A0}. FIELD field_46652 LIGHT_RED I COMMENT Represents the color light red, {@code 0xFFDF5050}. + FIELD field_46767 YELLOW I + COMMENT Represents the color yellow, {@code 0xFFFFFF00}. + FIELD field_46768 LIGHT_YELLOW I + COMMENT Represents the color light yellow, {@code 0xFFFFFF55}. diff --git a/mappings/net/minecraft/util/Urls.mapping b/mappings/net/minecraft/util/Urls.mapping index 660d669fa7..3903abcd2d 100644 --- a/mappings/net/minecraft/util/Urls.mapping +++ b/mappings/net/minecraft/util/Urls.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_8216 net/minecraft/util/Urls FIELD field_43133 REALMS_CONTENT_CREATOR Ljava/lang/String; FIELD field_44949 MINECRAFT_SYMLINKS Ljava/lang/String; FIELD field_45074 PRIVACY_STATEMENT Ljava/lang/String; + FIELD field_46769 MINECRAFT_SUPPORT Ljava/lang/String; METHOD method_49719 getExtendJavaRealmsUrl (Ljava/lang/String;Ljava/util/UUID;)Ljava/lang/String; ARG 0 subscriptionId ARG 1 uuid diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index bf043da3f2..d710148760 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util FIELD field_39824 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; COMMENT A locale-independent datetime formatter that uses {@code yyyy-MM-dd_HH.mm.ss} COMMENT as the format string. Example: {@code 2022-01-01_00.00.00} + FIELD field_46764 BACKUP_ATTEMPTS I METHOD method_17974 ifPresentOrElse (Ljava/util/Optional;Ljava/util/function/Consumer;Ljava/lang/Runnable;)Ljava/util/Optional; COMMENT If {@code optional} has value, calls {@code presentAction} with the value, COMMENT otherwise calls {@code elseAction}. diff --git a/mappings/net/minecraft/util/thread/FutureQueue.mapping b/mappings/net/minecraft/util/thread/FutureQueue.mapping index eb24c6947c..f1ffb4df2a 100644 --- a/mappings/net/minecraft/util/thread/FutureQueue.mapping +++ b/mappings/net/minecraft/util/thread/FutureQueue.mapping @@ -1,5 +1,15 @@ CLASS net/minecraft/class_7620 net/minecraft/util/thread/FutureQueue COMMENT A functional interface that can enqueue completable futures. FIELD field_39831 LOGGER Lorg/slf4j/Logger; + METHOD append (Ljava/lang/Runnable;)V + ARG 1 callback + METHOD append (Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Consumer;)V + ARG 1 future + ARG 2 callback METHOD immediate (Ljava/util/concurrent/Executor;)Lnet/minecraft/class_7620; ARG 0 executor + METHOD method_54441 (Ljava/lang/Runnable;Ljava/lang/Object;)V + ARG 1 current + CLASS 1 + METHOD method_54442 (Ljava/lang/Throwable;)Ljava/lang/Void; + ARG 0 throwable diff --git a/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping b/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping index b7081b5d1c..8a90abbc43 100644 --- a/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping @@ -50,4 +50,6 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/structure/JigsawStructure ARG 0 structure METHOD method_43567 (Lnet/minecraft/class_5434;)Ljava/util/Optional; ARG 0 structure + METHOD method_54520 (Lnet/minecraft/class_5434;)Ljava/util/List; + ARG 0 structure METHOD method_54521 getPoolAliasBindings ()Ljava/util/List;