From 41fa6e47936af7365ec41dfd901b70555feff357 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:14:48 +0900 Subject: [PATCH] 24w06a stuff --- .../net/minecraft/SharedConstants.mapping | 1 + .../entity/EndGatewayBlockEntity.mapping | 2 ++ .../block/entity/HopperBlockEntity.mapping | 3 ++ .../minecraft/client/MinecraftClient.mapping | 3 ++ .../net/minecraft/client/font/Font.mapping | 1 + .../client/font/FontFilterType.mapping | 15 ++++++++++ .../minecraft/client/font/FontLoader.mapping | 4 +++ .../minecraft/client/font/FontManager.mapping | 28 +++++++++++++++++++ .../minecraft/client/font/FontStorage.mapping | 14 +++++++++- .../option/LanguageOptionsScreen.mapping | 2 ++ .../client/option/GameOptions.mapping | 6 +++- .../particle/GustEmitterParticle.mapping | 17 +++++++++++ .../client/particle/Particle.mapping | 5 ++++ .../client/realms/FileUpload.mapping | 3 ++ ...ping => RenameEntityAttributesFix.mapping} | 9 ++++-- .../net/minecraft/entity/LivingEntity.mapping | 5 ++++ .../entity/{ => data}/DataTracked.mapping | 2 +- .../minecraft/entity/data/DataTracker.mapping | 1 + .../minecraft/entity/mob/MobEntity.mapping | 2 ++ .../minecraft/entity/mob/PatrolEntity.mapping | 2 ++ .../passive/WanderingTraderEntity.mapping | 2 ++ .../entity/player/PlayerEntity.mapping | 1 + mappings/net/minecraft/item/ItemStack.mapping | 5 ++++ .../server/function/CommandFunction.mapping | 2 ++ mappings/net/minecraft/test/Batches.mapping | 7 +++++ .../net/minecraft/test/TestRunContext.mapping | 2 ++ .../util/collection/Class2IntMap.mapping | 12 ++++++++ .../net/minecraft/util/dynamic/Codecs.mapping | 3 ++ .../util/profiling/jfr/FlightProfiler.mapping | 12 ++++++++ .../util/profiling/jfr/JfrJsonReport.mapping | 9 ++++++ .../profiling/jfr/JfrProfileRecorder.mapping | 10 ++++++- .../util/profiling/jfr/JfrProfiler.mapping | 1 + .../jfr/event/ChunkRegionEvent.mapping | 27 ++++++++++-------- .../jfr/sample/ChunkRegionSample.mapping | 3 ++ .../jfr/sample/NetworkIoStatistics.mapping | 1 + .../{Packet.mapping => PacketSample.mapping} | 2 +- .../minecraft/world/gen/WorldPresets.mapping | 1 + .../world/poi/PointOfInterestStorage.mapping | 7 +++++ .../storage/ChunkPosKeyedStorage.mapping | 4 +++ .../storage/RecreatedChunkStorage.mapping | 7 +++++ .../world/storage/RecreationStorage.mapping | 8 ++++++ .../world/storage/RegionBasedStorage.mapping | 5 ++++ .../world/storage/RegionFile.mapping | 10 +++++++ .../world/storage/StorageIoWorker.mapping | 4 +++ .../world/storage/StorageKey.mapping | 3 ++ .../storage/VersionedChunkStorage.mapping | 5 ++++ .../world/updater/WorldUpdater.mapping | 19 +++++++++++++ 47 files changed, 277 insertions(+), 20 deletions(-) create mode 100644 mappings/net/minecraft/client/font/FontFilterType.mapping rename mappings/net/minecraft/datafixer/fix/{RenameItemStackAttributesFix.mapping => RenameEntityAttributesFix.mapping} (66%) rename mappings/net/minecraft/entity/{ => data}/DataTracked.mapping (69%) create mode 100644 mappings/net/minecraft/util/collection/Class2IntMap.mapping create mode 100644 mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping rename mappings/net/minecraft/util/profiling/jfr/sample/{Packet.mapping => PacketSample.mapping} (92%) create mode 100644 mappings/net/minecraft/world/storage/StorageKey.mapping diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index d047cfc2d1..e6b2709750 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants FIELD field_34373 CURRENT_SERIES Ljava/lang/String; FIELD field_36325 CRASH_ON_UNCAUGHT_THREAD_EXCEPTION Z FIELD field_43095 requiredDataFixTypes Ljava/util/Set; + FIELD field_49017 EXPANDED_MACRO_COMMAND_MAX_LENGTH I METHOD method_16673 getGameVersion ()Lnet/minecraft/class_6489; METHOD method_31372 getProtocolVersion ()I METHOD method_34872 setGameVersion (Lnet/minecraft/class_6489;)V diff --git a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping index 60176381d2..e8f62b34c2 100644 --- a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping @@ -68,3 +68,5 @@ CLASS net/minecraft/class_2643 net/minecraft/block/entity/EndGatewayBlockEntity ARG 1 pos ARG 2 state ARG 3 blockEntity + METHOD method_57012 (Lnet/minecraft/class_2338;)V + ARG 1 exitPortalPos diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping index aac85173a9..e5dc886366 100644 --- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity FIELD field_12024 inventory Lnet/minecraft/class_2371; FIELD field_31341 TRANSFER_COOLDOWN I FIELD field_31342 INVENTORY_SIZE I + FIELD field_49100 AVAILABLE_SLOTS_CACHE [[I FIELD field_49101 facing Lnet/minecraft/class_2350; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos @@ -106,3 +107,5 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity ARG 0 world ARG 1 pos ARG 2 state + METHOD method_57011 indexArray (I)[I + ARG 0 size diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 52a9ce28cf..6776d36e6b 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -538,6 +538,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_53526 getDebugHud ()Lnet/minecraft/class_340; METHOD method_53527 onInitFinished (Lnet/minecraft/class_310$class_8764;)Ljava/lang/Runnable; ARG 1 loadingContext + METHOD method_53865 (Ljava/util/List;)Lnet/minecraft/class_1123; + ARG 0 stacks METHOD method_54116 formatSeconds (D)Ljava/lang/String; ARG 0 seconds METHOD method_54117 addUptimesToCrashReport (Lnet/minecraft/class_129;)V @@ -553,6 +555,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_55607 getUserProperties ()Lcom/mojang/authlib/minecraft/UserApiService$UserProperties; METHOD method_56134 disconnect (Lnet/minecraft/class_437;)V ARG 1 disconnectionScreen + METHOD method_57017 onFontOptionsChanged ()V CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/font/Font.mapping b/mappings/net/minecraft/client/font/Font.mapping index d75bae7442..4f74900ff5 100644 --- a/mappings/net/minecraft/client/font/Font.mapping +++ b/mappings/net/minecraft/client/font/Font.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_390 net/minecraft/client/font/Font ARG 1 codePoint METHOD method_27442 getProvidedGlyphs ()Lit/unimi/dsi/fastutil/ints/IntSet; COMMENT {@return the set of code points for which this font can provide glyphs} + CLASS class_9241 FontFilterPair diff --git a/mappings/net/minecraft/client/font/FontFilterType.mapping b/mappings/net/minecraft/client/font/FontFilterType.mapping new file mode 100644 index 0000000000..37ce40e511 --- /dev/null +++ b/mappings/net/minecraft/client/font/FontFilterType.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_9243 net/minecraft/client/font/FontFilterType + FIELD field_49114 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49115 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id + CLASS class_9244 FilterMap + FIELD field_49117 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49118 NO_FILTER Lnet/minecraft/class_9243$class_9244; + FIELD field_49119 activeFilters Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 activeFilters + METHOD method_57031 apply (Lnet/minecraft/class_9243$class_9244;)Lnet/minecraft/class_9243$class_9244; + ARG 1 activeFilters + METHOD method_57032 isAllowed (Ljava/util/Set;)Z + ARG 1 activeFilters diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping index 692c709e0e..7349dca626 100644 --- a/mappings/net/minecraft/client/font/FontLoader.mapping +++ b/mappings/net/minecraft/client/font/FontLoader.mapping @@ -8,3 +8,7 @@ CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader METHOD load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; ARG 1 resourceManager CLASS class_8540 Reference + CLASS class_9245 Provider + FIELD field_49122 CODEC Lcom/mojang/serialization/Codec; + METHOD method_57040 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index 99712cd1e7..35dc9995c6 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -8,12 +8,16 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager FIELD field_40409 FINDER Lnet/minecraft/class_7654; FIELD field_44757 GSON Lcom/google/gson/Gson; FIELD field_44758 fonts Ljava/util/List; + FIELD field_49111 currentStorage Lnet/minecraft/class_377; METHOD (Lnet/minecraft/class_1060;)V ARG 1 manager METHOD method_27539 createTextRenderer ()Lnet/minecraft/class_327; METHOD method_27540 (Lnet/minecraft/class_377;)V ARG 0 fontStorage METHOD method_45078 createAdvanceValidatingTextRenderer ()Lnet/minecraft/class_327; + METHOD method_51607 (Ljava/util/Set;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 2 id + ARG 3 fonts METHOD method_51608 loadIndex (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 resourceManager ARG 2 executor @@ -23,6 +27,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager ARG 2 index METHOD method_51611 (Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 3 dest + METHOD method_51612 (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8539;)V + ARG 6 loadable METHOD method_51613 load (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8539;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 key ARG 2 loadable @@ -31,6 +37,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_51614 reload (Lnet/minecraft/class_378$class_8536;Lnet/minecraft/class_3695;)V ARG 1 index ARG 2 profiler + METHOD method_51615 (Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8540;)V + ARG 3 reference METHOD method_51617 getRequiredFontProviders (Ljava/util/List;)Ljava/util/Map; ARG 1 entries METHOD method_51618 (Ljava/util/List;I)V @@ -40,6 +48,7 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager ARG 1 id METHOD method_51620 insertFont (Ljava/util/List;Lnet/minecraft/class_390$class_9241;)V ARG 1 fonts + ARG 2 font METHOD method_51621 (Ljava/util/List;Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; ARG 4 providers METHOD method_51622 (Ljava/util/List;Ljava/util/Map;Ljava/lang/Void;)Lnet/minecraft/class_378$class_8536; @@ -51,20 +60,39 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager ARG 2 fonts METHOD method_51626 (Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; ARG 2 entries + METHOD method_57023 getStorageInternal (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; + ARG 1 id + METHOD method_57024 setActiveFilters (Lnet/minecraft/class_315;)V + ARG 1 options + METHOD method_57025 getStorage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; + ARG 1 id + METHOD method_57026 getActiveFilters (Lnet/minecraft/class_315;)Ljava/util/Set; + ARG 0 options + METHOD method_57027 createEmptyFont ()Lnet/minecraft/class_390$class_9241; CLASS class_8534 FontKey CLASS class_8535 Builder + METHOD method_51628 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/Optional; + ARG 1 future METHOD method_51629 build (Ljava/util/function/Function;)Ljava/util/Optional; ARG 1 fontRetriever METHOD method_51630 (Ljava/util/function/Function;Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 2 referee + METHOD method_57028 applyFilter (Lnet/minecraft/class_390$class_9241;)Lnet/minecraft/class_390$class_9241; + ARG 1 font + METHOD method_57029 (Lnet/minecraft/class_390;)Ljava/util/List; + ARG 1 font CLASS class_8536 ProviderIndex CLASS class_8537 FontEntry METHOD (Lnet/minecraft/class_2960;)V ARG 1 fontId METHOD method_51631 addReferenceBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8540;)V ARG 1 key + ARG 2 filters + ARG 3 reference METHOD method_51632 addBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Ljava/util/concurrent/CompletableFuture;)V ARG 1 key + ARG 2 filters + ARG 3 fontFuture METHOD method_51633 (Lnet/minecraft/class_378$class_8535;)Ljava/util/stream/Stream; ARG 0 builder METHOD method_51634 getRequiredFontProviders (Ljava/util/function/Function;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index c60a90cb68..53e16a1455 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -9,11 +9,14 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382; FIELD field_2257 glyphCache Lnet/minecraft/class_8532; FIELD field_39934 MAX_ADVANCE F + FIELD field_49120 allFonts Ljava/util/List; + FIELD field_49121 availableFonts Ljava/util/List; METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V ARG 1 textureManager ARG 2 id METHOD method_2004 setFonts (Ljava/util/List;Ljava/util/Set;)V - ARG 1 fonts + ARG 1 allFonts + ARG 2 activeFilters METHOD method_2010 closeGlyphAtlases ()V METHOD method_2011 getGlyph (IZ)Lnet/minecraft/class_379; COMMENT {@return the glyph of {@code codePoint}} @@ -41,6 +44,15 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage ARG 0 rowCount METHOD method_51638 (I)[[Lnet/minecraft/class_382; ARG 0 rowCount + METHOD method_57034 getId ()Lnet/minecraft/class_2960; + METHOD method_57035 (Ljava/util/List;Ljava/util/Set;I)V + ARG 3 codePoint + METHOD method_57036 setActiveFilters (Ljava/util/Set;)V + ARG 1 activeFilters + METHOD method_57037 applyFilters (Ljava/util/List;Ljava/util/Set;)Ljava/util/List; + ARG 1 allFonts + ARG 2 activeFilters + METHOD method_57038 clear ()V CLASS class_7647 GlyphPair FIELD comp_979 glyph Lnet/minecraft/class_379; FIELD comp_980 advanceValidatedGlyph Lnet/minecraft/class_379; diff --git a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping index e48eb0a2fb..b71a3042e8 100644 --- a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/option/LanguageOpt METHOD method_19820 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_52184 onDone ()V + METHOD method_57042 (Lnet/minecraft/class_4185;)V + ARG 1 button CLASS class_4195 LanguageSelectionListWidget METHOD (Lnet/minecraft/class_426;Lnet/minecraft/class_310;)V ARG 2 client diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 20ab1a5494..8fe593ab3a 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -599,6 +599,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_53842 getSyncedOptions ()Lnet/minecraft/class_8791; METHOD method_54581 getHideSplashTexts ()Lnet/minecraft/class_7172; METHOD method_57018 getJapaneseGlyphVariants ()Lnet/minecraft/class_7172; + METHOD method_57019 acceptProfiledOptions (Lnet/minecraft/class_315$class_9242;)V + ARG 1 visitor METHOD method_57020 onFontOptionsChanged ()V METHOD method_57021 shouldUseJapaneseGlyphsByDefault ()Z METHOD method_57022 (Ljava/lang/Boolean;)V @@ -633,5 +635,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_33684 visitBoolean (Ljava/lang/String;Z)Z ARG 1 key ARG 2 current - CLASS class_9242 + CLASS class_9242 OptionVisitor METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V + ARG 1 key + ARG 2 option diff --git a/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping b/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping index 04da029911..52f1990343 100644 --- a/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping +++ b/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping @@ -1,2 +1,19 @@ CLASS net/minecraft/class_8979 net/minecraft/client/particle/GustEmitterParticle + FIELD field_49126 deviation D + FIELD field_49127 interval I + METHOD (Lnet/minecraft/class_638;DDDDII)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 deviation + ARG 10 maxAge + ARG 11 interval CLASS class_8980 Factory + FIELD field_49128 deviation D + FIELD field_49129 maxAge I + FIELD field_49130 interval I + METHOD (DII)V + ARG 1 deviation + ARG 3 maxAge + ARG 4 interval diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index ecdae0ab78..c2fbd8b6ab 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -38,6 +38,11 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle FIELD field_3871 z D FIELD field_3872 boundingBox Lnet/minecraft/class_238; FIELD field_3874 x D + METHOD (Lnet/minecraft/class_638;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z METHOD (Lnet/minecraft/class_638;DDDDDD)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/client/realms/FileUpload.mapping b/mappings/net/minecraft/client/realms/FileUpload.mapping index 47a08985ea..14f2d76b78 100644 --- a/mappings/net/minecraft/client/realms/FileUpload.mapping +++ b/mappings/net/minecraft/client/realms/FileUpload.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload FIELD field_19561 requestConfig Lorg/apache/http/client/config/RequestConfig; FIELD field_32056 MAX_ATTEMPTS I FIELD field_32057 UPLOAD_ENDPOINT Ljava/lang/String; + FIELD field_49104 worldVersion Ljava/lang/String; METHOD (Ljava/io/File;JILnet/minecraft/class_4888;Lnet/minecraft/class_320;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_4351;)V ARG 1 file ARG 2 worldId @@ -20,6 +21,8 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload ARG 5 uploadInfo ARG 6 session ARG 7 clientVersion + ARG 8 worldVersion + ARG 9 uploadStatus METHOD method_20970 cancel ()V METHOD method_20971 requestUpload (I)Lnet/minecraft/class_4429; ARG 1 currentAttempt diff --git a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameEntityAttributesFix.mapping similarity index 66% rename from mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping rename to mappings/net/minecraft/datafixer/fix/RenameEntityAttributesFix.mapping index 681d6aad37..0d4b89222a 100644 --- a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RenameEntityAttributesFix.mapping @@ -1,7 +1,10 @@ -CLASS net/minecraft/class_5129 net/minecraft/datafixer/fix/RenameItemStackAttributesFix - FIELD field_23695 RENAMES Ljava/util/function/UnaryOperator; +CLASS net/minecraft/class_5129 net/minecraft/datafixer/fix/RenameEntityAttributesFix + FIELD field_23695 renames Ljava/util/function/UnaryOperator; + FIELD field_49056 description Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V ARG 1 outputSchema + ARG 2 description + ARG 3 renames METHOD method_26808 updateAttributeName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_26810 updateAttributeModifiers (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - METHOD method_26814 updatePlayerAttributes (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + METHOD method_26814 updateEntityAttributes (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 9553200965..3a172cbab5 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -375,6 +375,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack + METHOD method_56991 canUseSlot (Lnet/minecraft/class_1304;)Z + ARG 1 slot + METHOD method_56992 isInCreativeMode ()Z + METHOD method_56993 getSafeFallDistance (F)I + ARG 1 health METHOD method_56994 getJumpVelocity (F)F ARG 1 strength METHOD method_5877 getHandItems ()Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/entity/DataTracked.mapping b/mappings/net/minecraft/entity/data/DataTracked.mapping similarity index 69% rename from mappings/net/minecraft/entity/DataTracked.mapping rename to mappings/net/minecraft/entity/data/DataTracked.mapping index ed0cc28a4f..ef8cbbb39e 100644 --- a/mappings/net/minecraft/entity/DataTracked.mapping +++ b/mappings/net/minecraft/entity/data/DataTracked.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9221 net/minecraft/entity/DataTracked +CLASS net/minecraft/class_9221 net/minecraft/entity/data/DataTracked METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V ARG 1 entries METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index 6f2cd256b5..a633f0e64e 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker FIELD field_13333 trackedEntity Lnet/minecraft/class_9221; FIELD field_13334 LOGGER Lorg/slf4j/Logger; FIELD field_33378 MAX_DATA_VALUE_ID I + FIELD field_49021 CLASS_TO_LAST_ID Lnet/minecraft/class_9227; METHOD (Lnet/minecraft/class_9221;[Lnet/minecraft/class_2945$class_2946;)V ARG 1 trackedEntity ARG 2 entries diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 7ce5b9bea3..cd7aa3085e 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -156,6 +156,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_56677 isWearingBodyArmor ()Z METHOD method_56678 equipBodyArmor (Lnet/minecraft/class_1799;)V ARG 1 stack + METHOD method_56995 (Ljava/util/UUID;)Lnet/minecraft/class_2520; + ARG 0 uuid METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F ARG 1 slot METHOD method_5930 setForwardSpeed (F)V diff --git a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping index a1f08c3fcf..55aee4aa16 100644 --- a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping @@ -22,6 +22,8 @@ CLASS net/minecraft/class_3732 net/minecraft/entity/mob/PatrolEntity ARG 4 random METHOD method_22332 setPatrolling (Z)V ARG 1 patrolling + METHOD method_57005 (Lnet/minecraft/class_2338;)V + ARG 1 patrolTarget CLASS class_3733 PatrolGoal FIELD field_16480 leaderSpeed D FIELD field_16481 entity Lnet/minecraft/class_3732; diff --git a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping index a4d259df88..308514fb0f 100644 --- a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_3989 net/minecraft/entity/passive/WanderingTraderEntit ARG 1 wanderTarget METHOD method_20508 tickDespawnDelay ()V METHOD method_52557 fillRebalancedRecipes ()V + METHOD method_57006 (Lnet/minecraft/class_2338;)V + ARG 1 wanderTarget CLASS class_3994 WanderToTargetGoal FIELD field_17759 trader Lnet/minecraft/class_3989; FIELD field_17760 proximityDistance D diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 706bb401a7..b5c1f47e71 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_41765 damageTiltYaw F FIELD field_46174 DEFAULT_MAIN_ARM Lnet/minecraft/class_1306; FIELD field_47821 VEHICLE_ATTACHMENT_POS Lnet/minecraft/class_243; + FIELD field_49094 ignoreFallDamageAboveY Ljava/lang/Double; FIELD field_7483 strideDistance F FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796; FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 66f615ad87..c0c552fb1e 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -300,6 +300,11 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT the item of the resultant stack ARG 2 count COMMENT the item count of the resultant stack + METHOD method_57008 decremenUnlessCreative (ILnet/minecraft/class_1309;)V + COMMENT Decrements the count of items in this item stack, unless {@code entity} + COMMENT is a creative mode player. + ARG 1 amount + ARG 2 entity METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index 8a09141a39..b908d2ff7e 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction ARG 0 dispatcher ARG 1 source ARG 2 reader + METHOD method_57057 validateCommandLength (Ljava/lang/CharSequence;)V + ARG 0 command METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Ljava/util/List;)Lnet/minecraft/class_2158; COMMENT Parses a function in the context of {@code source}. COMMENT diff --git a/mappings/net/minecraft/test/Batches.mapping b/mappings/net/minecraft/test/Batches.mapping index aaeb48ea6e..addb73993b 100644 --- a/mappings/net/minecraft/test/Batches.mapping +++ b/mappings/net/minecraft/test/Batches.mapping @@ -1,10 +1,16 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches FIELD field_48467 BATCH_SIZE I METHOD method_56188 defaultBatcher ()Lnet/minecraft/class_4520$class_9116; + METHOD method_56189 (Lnet/minecraft/class_3218;Ljava/lang/String;Ljava/util/List;J)Lnet/minecraft/class_4514; + ARG 2 states + ARG 3 index METHOD method_56190 (Lnet/minecraft/class_3218;Ljava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 1 entry METHOD method_56191 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517; ARG 1 testFunction + METHOD method_56192 (Ljava/lang/String;Ljava/util/List;J)Lnet/minecraft/class_4514; + ARG 1 states + ARG 2 index METHOD method_56193 (Ljava/util/Collection;)Ljava/util/Collection; ARG 0 states METHOD method_56194 createBatches (Ljava/util/Collection;Lnet/minecraft/class_3218;)Ljava/util/Collection; @@ -13,6 +19,7 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches METHOD method_56195 create (Ljava/util/List;Ljava/lang/String;J)Lnet/minecraft/class_4514; ARG 0 states ARG 1 batchId + ARG 2 index METHOD method_56196 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 0 entry METHOD method_56197 (Lnet/minecraft/class_4517;)Ljava/lang/String; diff --git a/mappings/net/minecraft/test/TestRunContext.mapping b/mappings/net/minecraft/test/TestRunContext.mapping index 209d173b75..df3cd59445 100644 --- a/mappings/net/minecraft/test/TestRunContext.mapping +++ b/mappings/net/minecraft/test/TestRunContext.mapping @@ -43,6 +43,8 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestRunContext METHOD method_56230 (Lnet/minecraft/class_4517;)V ARG 0 state METHOD method_56231 onFinish ()V + METHOD method_57072 (Lnet/minecraft/class_4517;)Ljava/lang/String; + ARG 0 state CLASS 1 METHOD method_56232 onFinished ()V METHOD method_56233 (J)V diff --git a/mappings/net/minecraft/util/collection/Class2IntMap.mapping b/mappings/net/minecraft/util/collection/Class2IntMap.mapping new file mode 100644 index 0000000000..56eafd2e5e --- /dev/null +++ b/mappings/net/minecraft/util/collection/Class2IntMap.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_9227 net/minecraft/util/collection/Class2IntMap + COMMENT A map with {@link Class}es as keys and an integer as values. + COMMENT If the entry for the provided class does not exist, then it recursively checks + COMMENT their superclasses. + FIELD field_49052 MISSING I + FIELD field_49053 backingMap Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD method_56939 get (Ljava/lang/Class;)I + ARG 1 clazz + METHOD method_56940 getNext (Ljava/lang/Class;)I + ARG 1 clazz + METHOD method_56941 put (Ljava/lang/Class;)I + ARG 1 clazz diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 8e413c95ce..0745e57c45 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -304,6 +304,9 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_56627 createRecursiveMap (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; METHOD method_56907 (Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult; ARG 0 value + METHOD method_56942 withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 originalCodec + ARG 1 lifecycleGetter CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping index 9c6de23f78..33e860c353 100644 --- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping @@ -12,14 +12,26 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler ARG 3 targetStatus METHOD method_38656 onPacketReceived (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V ARG 1 state + ARG 2 type ARG 3 remoteAddress ARG 4 bytes METHOD method_38657 onPacketSent (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V ARG 1 state + ARG 2 type ARG 3 remoteAddress ARG 4 bytes METHOD method_38658 isAvailable ()Z METHOD method_38659 startWorldLoadProfiling ()Lnet/minecraft/class_6613; + METHOD method_56979 onChunkRegionRead (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V + ARG 1 key + ARG 2 chunkPos + ARG 3 format + ARG 4 bytes + METHOD method_56980 onChunkRegionWrite (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V + ARG 1 key + ARG 2 chunkPos + ARG 3 format + ARG 4 bytes CLASS class_6612 NoopProfiler FIELD field_34924 LOGGER Lorg/slf4j/Logger; FIELD field_34925 NOOP Lnet/minecraft/class_6613; diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping index 6b8d86213c..e88a0a7d95 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping @@ -15,8 +15,11 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport ARG 1 statistics METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6767;Ljava/util/function/BiConsumer;)Lcom/google/gson/JsonElement; ARG 1 statistics + ARG 2 callback METHOD method_38015 collectThreadAllocationSection (Lnet/minecraft/class_6530$class_6531;)Lcom/google/gson/JsonElement; ARG 1 statistics + METHOD method_38016 (Lcom/google/gson/JsonArray;Ljava/util/function/BiConsumer;Lcom/mojang/datafixers/util/Pair;)V + ARG 2 topContributor METHOD method_38017 (Lcom/google/gson/JsonArray;Ljava/lang/String;Ljava/lang/Double;)V ARG 1 threadName ARG 2 allocation @@ -51,3 +54,9 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport ARG 1 samples METHOD method_38664 (Lnet/minecraft/class_6532;)D ARG 0 sample + METHOD method_56983 addChunkData (Lnet/minecraft/class_9234;Lcom/google/gson/JsonObject;)V + ARG 0 chunk + ARG 1 json + METHOD method_56984 addPacketData (Lnet/minecraft/class_6769;Lcom/google/gson/JsonObject;)V + ARG 0 packet + ARG 1 json diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping index 2b22b64fb6..3fea768334 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord FIELD field_34433 threadAllocationStatisticsSamples Ljava/util/List; FIELD field_34434 serverTickTimeSamples Ljava/util/List; FIELD field_34435 worldGenDuration Ljava/time/Duration; + FIELD field_49070 chunkRegionReadCounter Ljava/util/Map; + FIELD field_49071 chunkRegionWriteCounter Ljava/util/Map; METHOD (Ljava/util/stream/Stream;)V ARG 1 events METHOD method_38000 createProfile ()Lnet/minecraft/class_6517; @@ -37,7 +39,13 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord ARG 1 event ARG 2 bytes ARG 3 packetsToCounter - CLASS class_6766 PacketCounter + METHOD method_56981 (Lnet/minecraft/class_9234;)Lnet/minecraft/class_6516$class_6766; + ARG 0 chunk + METHOD method_56982 addChunkRegionEvent (Ljdk/jfr/consumer/RecordedEvent;ILjava/util/Map;)V + ARG 1 event + ARG 2 bytes + ARG 3 chunksToCounter + CLASS class_6766 Counter FIELD field_35581 totalCount J FIELD field_35582 totalBytes J METHOD method_39436 toStatistics ()Lnet/minecraft/class_6767$class_6768; diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping index 34905ac76b..efce971007 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_6505 net/minecraft/util/profiling/jfr/JfrProfiler FIELD field_35576 INSTANCE Lnet/minecraft/class_6505; FIELD field_35577 tickTime F FIELD field_35578 summaryRecorderByAddress Ljava/util/Map; + FIELD field_49058 STORAGE Ljava/lang/String; METHOD method_37982 (Lnet/minecraft/class_6506;Ljava/lang/String;Ljdk/jfr/Recording;)V ARG 2 recording METHOD method_37983 start (Ljava/io/Reader;Lnet/minecraft/class_6506;)Z diff --git a/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping index 0d477585c1..e8be28e5c0 100644 --- a/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping @@ -1,16 +1,19 @@ CLASS net/minecraft/class_9232 net/minecraft/util/profiling/jfr/event/ChunkRegionEvent FIELD levelId worldId Ljava/lang/String; METHOD (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V + ARG 1 key + ARG 2 chunkPos + ARG 3 format ARG 4 bytes - CLASS class_9233 Constants - FIELD field_49059 regionPosX Ljava/lang/String; - FIELD field_49060 regionPosZ Ljava/lang/String; - FIELD field_49061 localPosX Ljava/lang/String; - FIELD field_49062 localPosZ Ljava/lang/String; - FIELD field_49063 chunkPosX Ljava/lang/String; - FIELD field_49064 chunkPosZ Ljava/lang/String; - FIELD field_49065 world Ljava/lang/String; - FIELD field_49066 dimension Ljava/lang/String; - FIELD field_49067 type Ljava/lang/String; - FIELD field_49068 compression Ljava/lang/String; - FIELD field_49069 bytes Ljava/lang/String; + CLASS class_9233 Names + FIELD field_49059 REGION_POS_X Ljava/lang/String; + FIELD field_49060 REGION_POS_Z Ljava/lang/String; + FIELD field_49061 LOCAL_POS_X Ljava/lang/String; + FIELD field_49062 LOCAL_POS_Z Ljava/lang/String; + FIELD field_49063 CHUNK_POS_X Ljava/lang/String; + FIELD field_49064 CHUNK_POS_Z Ljava/lang/String; + FIELD field_49065 LEVEL Ljava/lang/String; + FIELD field_49066 DIMENSION Ljava/lang/String; + FIELD field_49067 TYPE Ljava/lang/String; + FIELD field_49068 COMPRESSION Ljava/lang/String; + FIELD field_49069 BYTES Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping new file mode 100644 index 0000000000..336045d5f9 --- /dev/null +++ b/mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9234 net/minecraft/util/profiling/jfr/sample/ChunkRegionSample + METHOD method_56985 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_9234; + ARG 0 event diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping index e1ac280700..145226f36e 100644 --- a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_6767 net/minecraft/util/profiling/jfr/sample/NetworkIo FIELD field_35586 COMPARATOR Ljava/util/Comparator; METHOD method_39444 add (Lnet/minecraft/class_6767$class_6768;)Lnet/minecraft/class_6767$class_6768; ARG 1 statistics + METHOD method_56986 getAverageSize ()F diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping similarity index 92% rename from mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping rename to mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping index cc4e3508cb..11189c9003 100644 --- a/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6769 net/minecraft/util/profiling/jfr/sample/Packet +CLASS net/minecraft/class_6769 net/minecraft/util/profiling/jfr/sample/PacketSample FIELD comp_259 side Ljava/lang/String; METHOD comp_259 side ()Ljava/lang/String; METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6769; diff --git a/mappings/net/minecraft/world/gen/WorldPresets.mapping b/mappings/net/minecraft/world/gen/WorldPresets.mapping index dbea58e7cc..37338b4b22 100644 --- a/mappings/net/minecraft/world/gen/WorldPresets.mapping +++ b/mappings/net/minecraft/world/gen/WorldPresets.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets METHOD method_41593 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 presetRegisterable METHOD method_41594 getWorldPreset (Lnet/minecraft/class_7723;)Ljava/util/Optional; + ARG 0 registry METHOD method_41597 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_41598 createDemoOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723; diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index d5a57f3b28..1a7f5e53b4 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage FIELD field_18484 pointOfInterestDistanceTracker Lnet/minecraft/class_4153$class_4154; FIELD field_20688 preloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dataFixer + ARG 4 dsync + ARG 5 registryManager + ARG 6 world METHOD method_19112 remove (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_19113 (Lnet/minecraft/class_2338;ILnet/minecraft/class_4156;)Z diff --git a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping index a7beb15489..b771e2eacc 100644 --- a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping +++ b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_9172 net/minecraft/world/storage/ChunkPosKeyedStorage FIELD field_48761 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_48762 dataFixTypes Lnet/minecraft/class_4284; METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_4284;)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dataFixer + ARG 4 dsync ARG 5 dataFixTypes METHOD method_56565 set (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos diff --git a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping index 3096ef698a..3c927b5dca 100644 --- a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_9170 net/minecraft/world/storage/RecreatedChunkStorage FIELD field_48748 recreationWorker Lnet/minecraft/class_4698; FIELD field_48749 outputDirectory Ljava/nio/file/Path; + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V + ARG 1 storageKey + ARG 2 directory + ARG 3 outputStorageKey + ARG 4 outputDirectory + ARG 5 dataFixer + ARG 6 dsync diff --git a/mappings/net/minecraft/world/storage/RecreationStorage.mapping b/mappings/net/minecraft/world/storage/RecreationStorage.mapping index cef5cd7b30..ba61b20a00 100644 --- a/mappings/net/minecraft/world/storage/RecreationStorage.mapping +++ b/mappings/net/minecraft/world/storage/RecreationStorage.mapping @@ -1,3 +1,11 @@ CLASS net/minecraft/class_9171 net/minecraft/world/storage/RecreationStorage FIELD field_48750 recreationWorker Lnet/minecraft/class_4698; FIELD field_48751 outputDirectory Ljava/nio/file/Path; + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_4284;)V + ARG 1 storageKey + ARG 2 directory + ARG 3 outputStorageKey + ARG 4 outputDirectory + ARG 5 dataFixer + ARG 6 dsync + ARG 7 dataFixTypes diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping index a42ff95720..79121168f7 100644 --- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping @@ -4,6 +4,11 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage FIELD field_23748 dsync Z FIELD field_31425 MCA_EXTENSION Ljava/lang/String; FIELD field_31426 MAX_CACHE_SIZE I + FIELD field_49103 storageKey Lnet/minecraft/class_9240; + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Z)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dsync METHOD method_12440 getRegionFile (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2861; ARG 1 pos METHOD method_17911 getTagAt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index 442064177f..d2ebeb8721 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -11,8 +11,18 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile FIELD field_31417 SECTOR_DATA_LIMIT I FIELD field_31421 FILE_EXTENSION Ljava/lang/String; FIELD field_48752 path Ljava/nio/file/Path; + FIELD field_49102 storageKey Lnet/minecraft/class_9240; + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V + ARG 1 storageKey + ARG 2 path + ARG 3 directory + ARG 4 compressionFormat + ARG 5 dsync METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V + ARG 1 storageKey ARG 2 directory + ARG 3 path + ARG 4 dsync METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I ARG 1 pos METHOD method_12423 hasChunk (Lnet/minecraft/class_1923;)Z diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index 1f78a2716e..807bf7ad28 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker FIELD field_24468 executor Lnet/minecraft/class_3846; FIELD field_38240 blendingStatusCaches Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; FIELD field_38241 MAX_CACHE_SIZE I + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Z)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dsync METHOD method_23698 completeAll (Z)Ljava/util/concurrent/CompletableFuture; ARG 1 sync METHOD method_23701 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_4698$class_4699;)V diff --git a/mappings/net/minecraft/world/storage/StorageKey.mapping b/mappings/net/minecraft/world/storage/StorageKey.mapping new file mode 100644 index 0000000000..bb42a9adef --- /dev/null +++ b/mappings/net/minecraft/world/storage/StorageKey.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9240 net/minecraft/world/storage/StorageKey + METHOD method_57013 withSuffix (Ljava/lang/String;)Lnet/minecraft/class_9240; + ARG 1 suffix diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index 2cbf14c1df..da6ad4643c 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -3,6 +3,11 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage FIELD field_17655 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_21494 worker Lnet/minecraft/class_4698; FIELD field_36219 FEATURE_UPDATING_VERSION I + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dataFixer + ARG 4 dsync METHOD method_17907 updateChunkNbt (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;Ljava/util/Optional;)Lnet/minecraft/class_2487; ARG 1 worldKey ARG 2 persistentStateManagerFactory diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 9eebe666c2..0d050c27cc 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -46,18 +46,29 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater METHOD method_5402 cancel ()V METHOD method_5403 isDone ()Z METHOD method_5404 updateWorld ()V + METHOD method_56987 getNewDirectoryPath (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 0 current CLASS class_9161 Update FIELD field_48732 pendingUpdateFuture Ljava/util/concurrent/CompletableFuture; FIELD field_48733 dataFixTypes Lnet/minecraft/class_4284; FIELD field_48735 upgradingText Lnet/minecraft/class_5250; FIELD field_48736 finishedText Lnet/minecraft/class_5250; FIELD field_48737 targetName Ljava/lang/String; + FIELD field_49072 name Ljava/lang/String; + METHOD (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V + ARG 2 dataFixTypes + ARG 3 name + ARG 4 targetName + ARG 5 upgradingText + ARG 6 finishedText METHOD method_56537 update ()V METHOD method_56538 update (Lnet/minecraft/class_5321;Ljava/lang/AutoCloseable;Lnet/minecraft/class_1923;)Z ARG 1 worldKey ARG 2 storage ARG 3 chunkPos METHOD method_56539 listRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/List; + ARG 0 key + ARG 1 regionDirectory METHOD method_56540 (Lnet/minecraft/class_1257$class_9165;)I ARG 0 region METHOD method_56541 recreate (Lnet/minecraft/class_2861;)V @@ -71,7 +82,10 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater ARG 3 worldKey METHOD method_56544 listWoldData ()Ljava/util/List; METHOD method_56545 enumerateRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/ListIterator; + ARG 1 key + ARG 2 regionDirectory METHOD method_56546 openStorage (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable; + ARG 1 key ARG 2 worldDirectory CLASS class_9162 RegionUpdate CLASS class_9163 WorldData @@ -79,6 +93,11 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater CLASS class_9165 Region CLASS class_9166 PoiUpdate CLASS class_9167 ChunkPosKeyedStorageUpdate + METHOD (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V + ARG 2 dataFixTypes + ARG 3 targetName + ARG 4 upgradingText + ARG 5 finishedText METHOD method_56550 updateNbt (Lnet/minecraft/class_9172;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 storage ARG 2 nbt