From 08f2d8fcdf6e1ae2baad918ef730a1d4006b89ea Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 2 Feb 2024 23:02:58 +0900 Subject: [PATCH] 24w05a stuff (#3780) * 24w05a stuff * More stuff * Fix capitalization --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../block/spawner/TrialSpawnerConfig.mapping | 2 + .../minecraft/block/vault/VaultConfig.mapping | 2 + mappings/net/minecraft/class_9187.mapping | 6 --- .../minecraft/client/gui/hud/DebugHud.mapping | 6 +++ .../network/ClientPlayNetworkHandler.mapping | 1 + .../network/DebugSampleSubscriber.mapping} | 5 +- .../client/option/HotbarStorage.mapping | 2 + .../client/option/HotbarStorageEntry.mapping | 24 ++++++++- .../client/render/WorldRenderer.mapping | 1 + .../client/util/math/MatrixStack.mapping | 10 ++++ .../command/CommandRegistryAccess.mapping | 3 ++ .../command/DataCommandStorage.mapping | 1 + .../ItemPredicateArgumentType.mapping | 1 + .../argument/ItemPredicateReader.mapping | 52 +++++++++++++++++++ .../ItemPredicateStringReader.mapping | 15 ++++++ .../argument/ItemStackArgumentType.mapping | 1 + .../command/argument/ItemStringReader.mapping | 5 ++ .../ParticleEffectArgumentType.mapping | 3 ++ .../argument/StyleArgumentType.mapping | 4 ++ .../argument/TagKeyArgumentType.mapping | 10 ---- .../command/argument/TextArgumentType.mapping | 4 ++ mappings/net/minecraft/entity/Entity.mapping | 2 +- .../net/minecraft/entity/LivingEntity.mapping | 1 + .../effect/StatusEffectInstance.mapping | 4 ++ .../entity/mob/ZombieVillagerEntity.mapping | 2 + .../entity/passive/MerchantEntity.mapping | 3 ++ .../entity/passive/VillagerEntity.mapping | 2 + mappings/net/minecraft/item/Items.mapping | 1 + .../item/map/MapBannerMarker.mapping | 6 --- .../net/minecraft/item/map/MapIcon.mapping | 6 --- .../loot/context/LootContextTypes.mapping | 2 + .../minecraft/network/PacketByteBuf.mapping | 3 -- .../network/codec/PacketCodecs.mapping | 21 ++++++++ .../s2c/common/StoreCookieS2CPacket.mapping | 1 + .../play/CommandSuggestionsS2CPacket.mapping | 2 + .../s2c/play/MapUpdateS2CPacket.mapping | 2 + .../net/minecraft/registry/Registry.mapping | 4 -- .../minecraft/registry/RegistryOps.mapping | 3 ++ .../screen/HorseScreenHandler.mapping | 1 + .../minecraft/server/DataPackContents.mapping | 1 + .../minecraft/server/MinecraftServer.mapping | 6 ++- .../server/SampleSubscriptionTracker.mapping | 4 +- .../server/command/CommandManager.mapping | 3 ++ .../MinecraftDedicatedServer.mapping | 2 + .../net/minecraft/test/TestServer.mapping | 1 + .../minecraft/util/DebugSampleType.mapping | 1 - .../net/minecraft/util/dynamic/Codecs.mapping | 8 +++ .../minecraft/util/math/MatrixUtil.mapping | 4 ++ .../MultiValueDebugSampleLogImpl.mapping | 9 ++++ .../util/profiler/PerformanceLog.mapping | 6 --- .../profiler/log/ArrayDebugSampleLog.mapping | 8 +++ .../util/profiler/log/DebugSampleLog.mapping | 8 +++ .../util/profiler/log/DebugSampleType.mapping | 1 + .../log/MultiValueDebugSampleLog.mapping | 9 ++++ .../log/SubscribableDebugSampleLog.mapping | 12 +++++ .../net/minecraft/world/WorldEvents.mapping | 6 +-- .../storage/ChunkCompressionFormat.mapping | 1 + 57 files changed, 262 insertions(+), 52 deletions(-) delete mode 100644 mappings/net/minecraft/class_9187.mapping rename mappings/net/minecraft/{class_9211.mapping => client/network/DebugSampleSubscriber.mapping} (63%) create mode 100644 mappings/net/minecraft/command/argument/ItemPredicateReader.mapping create mode 100644 mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping delete mode 100644 mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping delete mode 100644 mappings/net/minecraft/util/DebugSampleType.mapping create mode 100644 mappings/net/minecraft/util/profiler/MultiValueDebugSampleLogImpl.mapping delete mode 100644 mappings/net/minecraft/util/profiler/PerformanceLog.mapping create mode 100644 mappings/net/minecraft/util/profiler/log/ArrayDebugSampleLog.mapping create mode 100644 mappings/net/minecraft/util/profiler/log/DebugSampleLog.mapping create mode 100644 mappings/net/minecraft/util/profiler/log/DebugSampleType.mapping create mode 100644 mappings/net/minecraft/util/profiler/log/MultiValueDebugSampleLog.mapping create mode 100644 mappings/net/minecraft/util/profiler/log/SubscribableDebugSampleLog.mapping diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping index 84b608814b..6437c6a9f5 100644 --- a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping @@ -3,5 +3,7 @@ CLASS net/minecraft/class_8965 net/minecraft/block/spawner/TrialSpawnerConfig FIELD field_47368 codec Lcom/mojang/serialization/MapCodec; METHOD method_55179 getTotalMobs (I)I ARG 1 additionalPlayers + METHOD method_55180 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_55181 getSimultaneousMobs (I)I ARG 1 additionalPlayers diff --git a/mappings/net/minecraft/block/vault/VaultConfig.mapping b/mappings/net/minecraft/block/vault/VaultConfig.mapping index 319fdd50fb..c390182e74 100644 --- a/mappings/net/minecraft/block/vault/VaultConfig.mapping +++ b/mappings/net/minecraft/block/vault/VaultConfig.mapping @@ -8,4 +8,6 @@ CLASS net/minecraft/class_9203 net/minecraft/block/vault/VaultConfig ARG 4 deactivationRange ARG 6 keyItem ARG 7 overrideLootTableToDisplay + METHOD method_56764 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_56765 validate ()Lcom/mojang/serialization/DataResult; diff --git a/mappings/net/minecraft/class_9187.mapping b/mappings/net/minecraft/class_9187.mapping deleted file mode 100644 index 4c99866023..0000000000 --- a/mappings/net/minecraft/class_9187.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_9187 - FIELD field_48806 defaultArray [J - FIELD field_48807 array [J - METHOD (I[J)V - ARG 1 size - ARG 2 def diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 5219ac5c58..04babc2b55 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -21,6 +21,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_45993 tickNanosLog Lnet/minecraft/class_9191; FIELD field_45994 pingLog Lnet/minecraft/class_9191; FIELD field_45995 packetSizeLog Lnet/minecraft/class_9191; + FIELD field_48931 receivedDebugSamples Ljava/util/Map; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_1834 getChunk ()Lnet/minecraft/class_2818; METHOD method_1835 getLeftText ()Ljava/util/List; METHOD method_1836 getClientChunk ()Lnet/minecraft/class_2818; @@ -78,6 +81,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_9191; METHOD method_53545 clear ()V METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_9191; + METHOD method_56828 set ([JLnet/minecraft/class_9192;)V + ARG 1 values + ARG 2 type METHOD method_56829 shouldRenderTickCharts ()Z CLASS class_7412 AllocationRateCalculator FIELD field_38986 INTERVAL I diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index e4f35894f2..807f0a2e17 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_46578 worldLoadingState Lnet/minecraft/class_8819; FIELD field_47878 scoreboard Lnet/minecraft/class_269; FIELD field_48403 secureChatEnforced Z + FIELD field_48933 debugSampleSubscriber Lnet/minecraft/class_9211; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V ARG 1 client METHOD method_16690 getSessionId ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/class_9211.mapping b/mappings/net/minecraft/client/network/DebugSampleSubscriber.mapping similarity index 63% rename from mappings/net/minecraft/class_9211.mapping rename to mappings/net/minecraft/client/network/DebugSampleSubscriber.mapping index 16cfca4492..8e4529069a 100644 --- a/mappings/net/minecraft/class_9211.mapping +++ b/mappings/net/minecraft/client/network/DebugSampleSubscriber.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9211 +CLASS net/minecraft/class_9211 net/minecraft/client/network/DebugSampleSubscriber FIELD field_48934 TIMEOUT I FIELD field_48935 networkHandler Lnet/minecraft/class_634; FIELD field_48936 debugHud Lnet/minecraft/class_340; @@ -6,5 +6,6 @@ CLASS net/minecraft/class_9211 METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_340;)V ARG 1 handler ARG 2 hud - METHOD method_56831 update (Lnet/minecraft/class_9192;)V + METHOD method_56830 tick ()V + METHOD method_56831 subscribe (Lnet/minecraft/class_9192;)V ARG 1 type diff --git a/mappings/net/minecraft/client/option/HotbarStorage.mapping b/mappings/net/minecraft/client/option/HotbarStorage.mapping index 52e85f71fa..d35f199995 100644 --- a/mappings/net/minecraft/client/option/HotbarStorage.mapping +++ b/mappings/net/minecraft/client/option/HotbarStorage.mapping @@ -12,3 +12,5 @@ CLASS net/minecraft/class_302 net/minecraft/client/option/HotbarStorage METHOD method_1410 getSavedHotbar (I)Lnet/minecraft/class_748; ARG 1 i METHOD method_1411 load ()V + METHOD method_56825 (Ljava/lang/String;)V + ARG 0 error diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping index 7bdf956982..87b50bb075 100644 --- a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping +++ b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping @@ -2,8 +2,28 @@ CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry FIELD field_48942 CODEC Lcom/mojang/serialization/Codec; FIELD field_48943 LOGGER Lorg/slf4j/Logger; FIELD field_48944 HOTBAR_SIZE I - METHOD method_56836 (Lnet/minecraft/class_1661;Lnet/minecraft/class_5455;)V + FIELD field_48945 NBT_OPS Lcom/mojang/serialization/DynamicOps; + FIELD field_48946 EMPTY_STACK Lcom/mojang/serialization/Dynamic; + FIELD field_48947 stacks Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 1 stacks + METHOD method_56835 isEmpty ()Z + METHOD method_56836 serialize (Lnet/minecraft/class_1661;Lnet/minecraft/class_5455;)V ARG 1 playerInventory ARG 2 registryManager - METHOD method_56839 (Lnet/minecraft/class_7225$class_7874;)Ljava/util/List; + METHOD method_56837 isEmpty (Lcom/mojang/serialization/Dynamic;)Z + ARG 0 stack + METHOD method_56838 (Lnet/minecraft/class_748;)Ljava/util/List; + ARG 0 entry + METHOD method_56839 deserialize (Lnet/minecraft/class_7225$class_7874;)Ljava/util/List; ARG 1 registryLookup + METHOD method_56840 (Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_1799; + ARG 1 stack + METHOD method_56841 (Ljava/lang/String;)V + ARG 0 error + METHOD method_56842 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 stacks + METHOD method_56843 (Lnet/minecraft/class_2520;)Lcom/mojang/serialization/Dynamic; + ARG 0 nbt + METHOD method_56844 (Ljava/lang/String;)V + ARG 0 error diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 3e06c8f2b9..4fcd68c6a9 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -413,6 +413,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 song ARG 2 songPosition METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V + ARG 1 parameters ARG 2 shouldAlwaysSpawn ARG 3 important ARG 4 x diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping index 7aeba81bfe..3524880539 100644 --- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping +++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping @@ -60,6 +60,7 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack CLASS class_4665 Entry FIELD field_21327 positionMatrix Lorg/joml/Matrix4f; FIELD field_21328 normalMatrix Lorg/joml/Matrix3f; + FIELD field_48930 canSkipNormalization Z METHOD (Lnet/minecraft/class_4587$class_4665;)V ARG 1 matrix METHOD (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)V @@ -69,4 +70,13 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack COMMENT {@return the matrix used to transform positions} METHOD method_23762 getNormalMatrix ()Lorg/joml/Matrix3f; COMMENT {@return the matrix used to transform normal vectors} + METHOD method_56820 transformNormal (FFFLorg/joml/Vector3f;)Lorg/joml/Vector3f; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 dest + METHOD method_56821 transformNormal (Lorg/joml/Vector3f;Lorg/joml/Vector3f;)Lorg/joml/Vector3f; + ARG 1 vec + ARG 2 dest METHOD method_56822 copy ()Lnet/minecraft/class_4587$class_4665; + METHOD method_56823 computeNormal ()V diff --git a/mappings/net/minecraft/command/CommandRegistryAccess.mapping b/mappings/net/minecraft/command/CommandRegistryAccess.mapping index 26757a456b..449aa9a03b 100644 --- a/mappings/net/minecraft/command/CommandRegistryAccess.mapping +++ b/mappings/net/minecraft/command/CommandRegistryAccess.mapping @@ -8,3 +8,6 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess METHOD method_46722 of (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157; ARG 0 wrapperLookup ARG 1 enabledFeatures + CLASS 1 + METHOD method_56810 (Lnet/minecraft/class_7699;Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226; + ARG 1 wrapper diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping index 4d170c6a35..15b8cfcf0b 100644 --- a/mappings/net/minecraft/command/DataCommandStorage.mapping +++ b/mappings/net/minecraft/command/DataCommandStorage.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage ARG 2 nbt METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_4565$class_4566; ARG 2 nbt + ARG 3 registryLookup METHOD method_52614 getPersistentStateType (Ljava/lang/String;)Lnet/minecraft/class_18$class_8645; ARG 1 namespace CLASS class_4566 PersistentState diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping index 69fd10f438..e8182e1f3a 100644 --- a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgumentType FIELD field_10812 EXAMPLES Ljava/util/Collection; + FIELD field_48959 reader Lnet/minecraft/class_9215; METHOD (Lnet/minecraft/class_7157;)V ARG 1 commandRegistryAccess METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping b/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping new file mode 100644 index 0000000000..8bc4d2a30e --- /dev/null +++ b/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping @@ -0,0 +1,52 @@ +CLASS net/minecraft/class_9216 net/minecraft/command/argument/ItemPredicateReader + FIELD field_48963 INVALID_ID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_48964 INVALID_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_48965 HASH C + FIELD field_48966 CURLY_OPEN_BRACKET C + FIELD field_48967 DEFAULT_SUGGESTOR Ljava/util/function/Function; + FIELD field_48968 itemRegistry Lnet/minecraft/class_7225$class_7226; + FIELD field_48969 allowTags Z + METHOD (Lnet/minecraft/class_7225$class_7874;Z)V + ARG 1 registryLookup + ARG 2 allowTags + METHOD method_56865 read (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_9216$class_9219;)V + ARG 1 reader + ARG 2 callbacks + METHOD method_56866 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + METHOD method_56867 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 tag + METHOD method_56868 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id + CLASS class_9217 Reader + FIELD field_48971 reader Lcom/mojang/brigadier/StringReader; + FIELD field_48972 callbacks Lnet/minecraft/class_9216$class_9219; + METHOD (Lnet/minecraft/class_9216;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_9216$class_9219;)V + ARG 2 reader + ARG 3 callbacks + METHOD method_56869 suggest ()V + METHOD method_56871 suggestCurlyBraceIfPossible (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + METHOD method_56872 readItem ()V + METHOD method_56874 suggestItems (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + METHOD method_56875 readTag ()V + METHOD method_56876 suggestTags (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + METHOD method_56877 readNbt ()V + METHOD method_56878 suggestAll (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + CLASS class_9218 SuggestionCallbacks + FIELD field_48973 suggestor Ljava/util/function/Function; + METHOD method_56879 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lcom/mojang/brigadier/StringReader;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + ARG 2 reader + CLASS class_9219 Callbacks + METHOD method_56853 onItem (Lnet/minecraft/class_6880;)V + ARG 1 item + METHOD method_56854 setNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_56862 onTag (Lnet/minecraft/class_6885;)V + ARG 1 tag + METHOD method_56880 setSuggestor (Ljava/util/function/Function;)V + ARG 1 suggestor diff --git a/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping b/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping new file mode 100644 index 0000000000..6aa8685f75 --- /dev/null +++ b/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_9215 net/minecraft/command/argument/ItemPredicateStringReader + FIELD field_48960 predicateReader Lnet/minecraft/class_9216; + METHOD (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 registryLookup + METHOD method_56859 read (Lcom/mojang/brigadier/StringReader;)Ljava/util/function/Predicate; + ARG 1 reader + METHOD method_56860 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + CLASS 1 + METHOD method_56861 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_56863 (Lnet/minecraft/class_6885;Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_56864 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1799;)Z + ARG 1 stack diff --git a/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping index d77f7a9e94..a82561f142 100644 --- a/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2287 net/minecraft/command/argument/ItemStackArgumentType FIELD field_10790 EXAMPLES Ljava/util/Collection; + FIELD field_48954 reader Lnet/minecraft/class_2291; METHOD (Lnet/minecraft/class_7157;)V ARG 1 commandRegistryAccess METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping index fe677f619a..19677e83e2 100644 --- a/mappings/net/minecraft/command/argument/ItemStringReader.mapping +++ b/mappings/net/minecraft/command/argument/ItemStringReader.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader + FIELD field_48955 predicateReader Lnet/minecraft/class_9216; + METHOD (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 registryLookup METHOD method_9789 consume (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2291$class_7215; + ARG 1 reader METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder CLASS class_7215 ItemResult diff --git a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping index 7eb7de6ab6..4c192b59ee 100644 --- a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType + FIELD field_48929 registryLookup Lnet/minecraft/class_7225$class_7874; FIELD field_9935 EXAMPLES Ljava/util/Collection; FIELD field_9936 UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD (Lnet/minecraft/class_7157;)V @@ -13,11 +14,13 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgu ARG 0 registryAccess METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394; ARG 0 reader + ARG 1 registryLookup METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394; ARG 0 reader ARG 1 type + ARG 2 registryLookup METHOD method_9421 getParticle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2394; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping index da68dcdbf7..f2e6333a1f 100644 --- a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping @@ -1,7 +1,11 @@ CLASS net/minecraft/class_9019 net/minecraft/command/argument/StyleArgumentType FIELD field_47553 INVALID_STYLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_47554 EXAMPLES Ljava/util/Collection; + FIELD field_48932 registryLookup Lnet/minecraft/class_7225$class_7874; + METHOD (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 registryLookup METHOD method_55446 style (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9019; + ARG 0 registryAccess METHOD method_55448 getStyle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2583; ARG 0 context ARG 1 style diff --git a/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping b/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping deleted file mode 100644 index 1d609510b4..0000000000 --- a/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_9216 net/minecraft/command/argument/TagKeyArgumentType - FIELD field_48963 ERROR_INVALID Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_48964 ERROR_UNKNOWN Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_48965 TAG_PREFIX C - FIELD field_48966 NBT_OPENING C - FIELD field_48968 registryWrapper Lnet/minecraft/class_7225$class_7226; - METHOD method_56867 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 data - METHOD method_56868 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 data diff --git a/mappings/net/minecraft/command/argument/TextArgumentType.mapping b/mappings/net/minecraft/command/argument/TextArgumentType.mapping index 8873354a7b..9a96f80f73 100644 --- a/mappings/net/minecraft/command/argument/TextArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/TextArgumentType.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_2178 net/minecraft/command/argument/TextArgumentType + FIELD field_48917 registryLookup Lnet/minecraft/class_7225$class_7874; FIELD field_9841 EXAMPLES Ljava/util/Collection; FIELD field_9842 INVALID_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 registryLookup METHOD method_9280 getTextArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 context ARG 1 name METHOD method_9281 text (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2178; + ARG 0 registryAccess METHOD method_9282 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 text METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 1f14f4edf5..b6efda6d99 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -484,7 +484,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT Removes this entity from the current dimension. COMMENT COMMENT

This calls {@link #setRemoved} by default. Subclasses can add other logics, - COMMENT such as setting the stack count of {@linkplain #getItemsEquipped equipped stacks} + COMMENT such as setting the stack count of {@linkplain LivingEntity#getEquippedItems equipped stacks} COMMENT to zero. COMMENT COMMENT @see #moveToWorld diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index fe1389fa08..5aca2ba5bd 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_42108 limbAnimator Lnet/minecraft/class_8080; FIELD field_45123 serverHeadYaw D FIELD field_45740 ACTIVE_EFFECTS_NBT_KEY Ljava/lang/String; + FIELD field_48826 syncedBodyArmorStack Lnet/minecraft/class_1799; FIELD field_6210 bodyTrackingIncrements I FIELD field_6212 sidewaysSpeed F FIELD field_6213 deathTime I diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index a530a0cbbb..c7690c7d31 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_42106 INFINITE I FIELD field_47739 fading Lnet/minecraft/class_1293$class_9063; FIELD field_48821 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49014 MIN_AMPLIFIER I + FIELD field_49015 MAX_AMPLIFIER I FIELD field_5889 showIcon Z FIELD field_5890 showParticles Z FIELD field_5892 ambient Z @@ -142,5 +144,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 5 hiddenEffect METHOD method_56670 (Lnet/minecraft/class_1293$class_9195;)Ljava/util/Optional; ARG 0 parameters + METHOD method_56671 (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec METHOD method_56672 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 1 instance diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index 715f426659..31ac264e8e 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity METHOD method_35194 getXp ()I METHOD method_40125 (Lnet/minecraft/class_6880$class_6883;)V ARG 1 profession + METHOD method_56681 (Lnet/minecraft/class_1916;)V + ARG 1 offerData METHOD method_7194 getConversionRate ()I METHOD method_7197 finishConversion (Lnet/minecraft/class_3218;)V ARG 1 world diff --git a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping index 3095eacde3..754ccbb84f 100644 --- a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity FIELD field_17723 inventory Lnet/minecraft/class_1277; FIELD field_19295 HEAD_ROLLING_TIME_LEFT Lnet/minecraft/class_2940; FIELD field_30600 INVENTORY_SIZE I + FIELD field_48833 LOGGER Lorg/slf4j/Logger; METHOD method_18007 produceParticles (Lnet/minecraft/class_2394;)V ARG 1 parameters METHOD method_18008 afterUsing (Lnet/minecraft/class_1914;)V @@ -20,4 +21,6 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity METHOD method_20506 getHeadRollingTimeLeft ()I METHOD method_20507 setHeadRollingTimeLeft (I)V ARG 1 ticks + METHOD method_56682 (Lnet/minecraft/class_1916;)V + ARG 1 offers METHOD method_7237 fillRecipes ()V diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 943ab7cd1d..fde2b2d9b9 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -104,5 +104,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_49695 sendOffersToCustomer ()V METHOD method_51304 (Lnet/minecraft/class_1799;)Z ARG 0 stack + METHOD method_56683 (Lnet/minecraft/class_3850;)V + ARG 1 villagerData METHOD method_7234 wantsToStartBreeding ()Z METHOD method_7239 canBreed ()Z diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 54689cd593..2e814c5d9e 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -418,6 +418,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_47025 WAXED_OXIDIZED_COPPER_BULB Lnet/minecraft/class_1792; FIELD field_47026 CHISELED_TUFF_BRICKS Lnet/minecraft/class_1792; FIELD field_47314 TRIAL_SPAWNER Lnet/minecraft/class_1792; + FIELD field_48847 VAULT Lnet/minecraft/class_1792; FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping index d3def763a6..f5ac83e9aa 100644 --- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping +++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping @@ -2,17 +2,11 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker COMMENT Represents a banner marker in world. COMMENT

COMMENT Used to track banners in a map state. - FIELD comp_2312 pos Lnet/minecraft/class_2338; - FIELD comp_2313 color Lnet/minecraft/class_1767; - FIELD comp_2314 name Ljava/util/Optional; FIELD field_48918 CODEC Lcom/mojang/serialization/Codec; FIELD field_48919 LIST_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_1767;Ljava/util/Optional;)V ARG 1 pos ARG 2 dyeColor - METHOD comp_2312 pos ()Lnet/minecraft/class_2338; - METHOD comp_2313 color ()Lnet/minecraft/class_1767; - METHOD comp_2314 name ()Ljava/util/Optional; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_56812 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index 27bd7cc5b8..5c5437bb30 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -1,20 +1,14 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon - FIELD comp_1842 type Lnet/minecraft/class_20$class_21; - FIELD comp_1843 x B FIELD comp_1844 z B FIELD comp_1845 rotation B - FIELD comp_1846 text Ljava/util/Optional; FIELD field_48920 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_20$class_21;BBBLjava/util/Optional;)V ARG 1 type ARG 2 x ARG 3 z ARG 4 rotation - METHOD comp_1842 type ()Lnet/minecraft/class_20$class_21; - METHOD comp_1843 x ()B METHOD comp_1844 z ()B METHOD comp_1845 rotation ()B - METHOD comp_1846 text ()Ljava/util/Optional; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_92 getTypeId ()B diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index e41a345930..7a19a3b8fc 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 0 id METHOD method_56128 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder + METHOD method_56818 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder METHOD method_755 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_756 (Lnet/minecraft/class_176$class_177;)V diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 3f405476de..54edb1610b 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -60,9 +60,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link Quaternionf}{@link #readQuaternionf()}{@link #writeQuaternionf(Quaternionf)} COMMENT COMMENT - COMMENT {@link Text}{@link #readText()}{@link #writeText(Text)} - COMMENT - COMMENT COMMENT {@link Enum}{@link #readEnumConstant(Class)}{@link #writeEnumConstant(Enum)} COMMENT COMMENT diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index 51db7a421c..203e8dd95a 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -72,6 +72,11 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs COMMENT COMMENT @see net.minecraft.network.PacketByteBuf#readQuaternionf() COMMENT @see net.minecraft.network.PacketByteBuf#writeQuaternionf(Quaternionf) + FIELD field_48987 BYTE_ARRAY Lnet/minecraft/class_9139; + COMMENT A codec for a byte array. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readByteArray() + COMMENT @see net.minecraft.network.PacketByteBuf#writeByteArray(byte[]) METHOD method_56363 toList ()Lnet/minecraft/class_9139$class_9140; COMMENT Used to make a codec for a list of values using {@link PacketCodec#collect}. COMMENT This creates an {@link java.util.ArrayList}, so the decoded result can be modified. @@ -216,9 +221,19 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs METHOD method_56385 (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 0 codec METHOD method_56895 byteArray (I)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a byte array with maximum length {@code maxLength}} + COMMENT + COMMENT @see #BYTE_ARRAY + COMMENT @see net.minecraft.network.PacketByteBuf#readByteArray(ByteBuf, int) + COMMENT @see net.minecraft.network.PacketByteBuf#writeByteArray(ByteBuf, byte[]) ARG 0 maxLength METHOD method_56896 registryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; ARG 0 codec + CLASS 4 + METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; + ARG 1 error + METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + ARG 1 error CLASS 10 METHOD method_56419 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V ARG 3 k @@ -236,3 +251,9 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V ARG 1 buf ARG 2 value + CLASS 22 + METHOD method_56407 read (Lio/netty/buffer/ByteBuf;)[B + ARG 1 buf + METHOD method_56408 write (Lio/netty/buffer/ByteBuf;[B)V + ARG 1 buf + ARG 2 value diff --git a/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping index 7879633c2d..ff5a6ad1b1 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_9150 net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket FIELD field_48627 CODEC Lnet/minecraft/class_9139; FIELD field_48628 MAX_COOKIE_LENGTH I + FIELD field_49011 COOKIE_PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56467 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping index 12080463b0..674c216ba3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSugg ARG 1 completionId ARG 2 suggestions METHOD method_11397 getSuggestions ()Lcom/mojang/brigadier/suggestion/Suggestions; + METHOD method_56608 (Lcom/mojang/brigadier/context/StringRange;Lnet/minecraft/class_2639$class_9177;)Lcom/mojang/brigadier/suggestion/Suggestion; + ARG 1 suggestion METHOD method_56609 (Lcom/mojang/brigadier/suggestion/Suggestion;)Lnet/minecraft/class_2639$class_9177; ARG 0 suggestion CLASS class_9177 Suggestion diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index 6b9b80b365..7804e4914c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -12,3 +12,5 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2 METHOD comp_2274 updateData ()Ljava/util/Optional; METHOD method_11642 apply (Lnet/minecraft/class_22;)V ARG 1 mapState + METHOD method_56618 (Lnet/minecraft/class_22;Lnet/minecraft/class_22$class_5637;)V + ARG 1 updateData diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index ffec291a6b..f9b1ec74d1 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -259,13 +259,9 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry METHOD method_46771 getReadOnlyWrapper ()Lnet/minecraft/class_7225$class_7226; COMMENT {@return a registry wrapper that does not mutate the backing registry under COMMENT any circumstances} - COMMENT - COMMENT @see net.minecraft.command.CommandRegistryAccess.EntryListCreationPolicy#FAIL METHOD method_46772 getTagCreatingWrapper ()Lnet/minecraft/class_7225$class_7226; COMMENT {@return a registry wrapper that creates and stores a new registry entry list COMMENT when handling an unknown tag key} - COMMENT - COMMENT @see net.minecraft.command.CommandRegistryAccess.EntryListCreationPolicy#CREATE_NEW METHOD method_47441 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle; ARG 1 entry METHOD method_47442 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle; diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping index d658178f8d..cacc844015 100644 --- a/mappings/net/minecraft/registry/RegistryOps.mapping +++ b/mappings/net/minecraft/registry/RegistryOps.mapping @@ -31,6 +31,9 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps ARG 0 registryRef METHOD method_46637 getEntryCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; ARG 0 key + METHOD method_56622 withRegistry (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_7225$class_7874;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 registryLookup CLASS 1 FIELD field_40854 registryRefToInfo Ljava/util/Map; CLASS 2 diff --git a/mappings/net/minecraft/screen/HorseScreenHandler.mapping b/mappings/net/minecraft/screen/HorseScreenHandler.mapping index 016ab5d2b3..7bb375e49f 100644 --- a/mappings/net/minecraft/screen/HorseScreenHandler.mapping +++ b/mappings/net/minecraft/screen/HorseScreenHandler.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1724 net/minecraft/screen/HorseScreenHandler + FIELD field_48834 horseArmorInventory Lnet/minecraft/class_1263; FIELD field_7836 inventory Lnet/minecraft/class_1263; FIELD field_7837 entity Lnet/minecraft/class_1496; METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_1496;)V diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping index 1a8d2fc862..f1da2af91e 100644 --- a/mappings/net/minecraft/server/DataPackContents.mapping +++ b/mappings/net/minecraft/server/DataPackContents.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents FIELD field_25341 serverAdvancementLoader Lnet/minecraft/class_2989; FIELD field_25342 functionLoader Lnet/minecraft/class_5349; FIELD field_36491 LOGGER Lorg/slf4j/Logger; + FIELD field_48785 registryLookup Lnet/minecraft/class_5350$class_9180; METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;I)V ARG 1 dynamicRegistryManager ARG 2 enabledFeatures diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index eadbc30998..db033a7f7a 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -452,12 +452,16 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_54835 getTickTimes ()[J METHOD method_54837 getAutosaveInterval ()I METHOD method_56040 acceptsTransfers ()Z - METHOD method_56593 getPerformanceLog ()Lnet/minecraft/class_8743; + METHOD method_56593 getDebugSampleLog ()Lnet/minecraft/class_8743; METHOD method_56602 pushTickLog (J)V ARG 1 tickStartTime METHOD method_56603 pushFullTickLog ()V METHOD method_56604 startTaskPerformanceLog ()V METHOD method_56605 pushPerformanceLogs ()V + METHOD method_56625 subscribeToDebugSample (Lnet/minecraft/class_3222;Lnet/minecraft/class_9192;)V + ARG 1 player + ARG 2 type + METHOD method_56626 shouldPushTickTimeLog ()Z CLASS class_6414 DebugStart FIELD field_33980 time J FIELD field_33981 tick I diff --git a/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping b/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping index b5332b856c..f45c3db6c1 100644 --- a/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping +++ b/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping @@ -5,9 +5,11 @@ CLASS net/minecraft/class_9188 net/minecraft/server/SampleSubscriptionTracker FIELD field_48811 subscriptionMap Ljava/util/EnumMap; FIELD field_48812 pendingQueue Ljava/util/Queue; METHOD (Lnet/minecraft/class_3324;)V - ARG 1 playermanager + ARG 1 playerManager METHOD method_56652 tick (I)V ARG 1 tick + METHOD method_56653 (IJLjava/util/Map$Entry;)Z + ARG 4 entry METHOD method_56654 onSubscription (JI)V ARG 1 time ARG 3 tick diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping index c60234003e..2f8c615e70 100644 --- a/mappings/net/minecraft/server/command/CommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -71,6 +71,9 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager COMMENT @see #executeWithPrefix(ServerCommandSource, String) ARG 1 parseResults ARG 2 command + CLASS 1 + METHOD method_56811 createTagCreatingLookup (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226$class_7875; + ARG 1 original CLASS class_2171 CommandParser METHOD parse (Lcom/mojang/brigadier/StringReader;)V ARG 1 reader diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index d80d394939..3b40772db1 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated FIELD field_16799 propertiesLoader Lnet/minecraft/class_3807; FIELD field_16800 gui Lnet/minecraft/class_3182; FIELD field_26898 filterer Lnet/minecraft/class_5514; + FIELD field_48788 debugSampleLog Lnet/minecraft/class_9193; + FIELD field_48789 subscriptionTracker Lnet/minecraft/class_9188; METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7497;Lnet/minecraft/class_3950;)V ARG 1 serverThread ARG 2 session diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index b2ebf184be..f83899bb74 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer FIELD field_47175 TEST_POS_XZ_RANGE I FIELD field_48493 testFunctions Ljava/util/List; FIELD field_48494 stopwatch Lcom/google/common/base/Stopwatch; + FIELD field_48984 debugSampleLog Lnet/minecraft/class_9191; 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 diff --git a/mappings/net/minecraft/util/DebugSampleType.mapping b/mappings/net/minecraft/util/DebugSampleType.mapping deleted file mode 100644 index 6d5c8857da..0000000000 --- a/mappings/net/minecraft/util/DebugSampleType.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_9192 net/minecraft/util/DebugSampleType diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 3160af4da8..8e413c95ce 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs COMMENT types of objects this can "serialize". COMMENT COMMENT @see RuntimeOps + FIELD field_49012 UNSIGNED_BYTE Lcom/mojang/serialization/Codec; METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; COMMENT Returns an exclusive-or codec for {@link Either} instances. COMMENT @@ -301,6 +302,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 3 typeGetter ARG 4 parametersCodecGetter 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 CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops @@ -487,11 +490,16 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 map CLASS class_9181 RecursiveMap FIELD field_48804 supplier Ljava/util/function/Supplier; + FIELD field_49013 name Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/util/function/Function;)V + ARG 1 name + ARG 2 codecFunction 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 builder METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 ops diff --git a/mappings/net/minecraft/util/math/MatrixUtil.mapping b/mappings/net/minecraft/util/math/MatrixUtil.mapping index e7a8d852b7..60bb8f3a21 100644 --- a/mappings/net/minecraft/util/math/MatrixUtil.mapping +++ b/mappings/net/minecraft/util/math/MatrixUtil.mapping @@ -34,3 +34,7 @@ CLASS net/minecraft/class_7837 net/minecraft/util/math/MatrixUtil COMMENT Stores A′XA into X, clobbering A. ARG 0 X ARG 1 A + METHOD method_56826 isTranslation (Lorg/joml/Matrix4f;)Z + ARG 0 matrix + METHOD method_56827 isOrthonormal (Lorg/joml/Matrix4f;)Z + ARG 0 matrix diff --git a/mappings/net/minecraft/util/profiler/MultiValueDebugSampleLogImpl.mapping b/mappings/net/minecraft/util/profiler/MultiValueDebugSampleLogImpl.mapping new file mode 100644 index 0000000000..7ac44f35a5 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/MultiValueDebugSampleLogImpl.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_9191 net/minecraft/util/profiler/MultiValueDebugSampleLogImpl + FIELD field_48813 LOG_SIZE I + FIELD field_48814 multiValues [[J + FIELD field_48815 start I + FIELD field_48816 length I + METHOD (I)V + ARG 1 dimensions + METHOD method_56661 wrap (I)I + ARG 1 index diff --git a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping deleted file mode 100644 index de02339e49..0000000000 --- a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog - METHOD method_53066 push (J)V - ARG 1 value - METHOD method_56535 push (JI)V - ARG 1 value - ARG 3 column diff --git a/mappings/net/minecraft/util/profiler/log/ArrayDebugSampleLog.mapping b/mappings/net/minecraft/util/profiler/log/ArrayDebugSampleLog.mapping new file mode 100644 index 0000000000..74cd09fdf3 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/log/ArrayDebugSampleLog.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_9187 net/minecraft/util/profiler/log/ArrayDebugSampleLog + FIELD field_48806 defaults [J + FIELD field_48807 values [J + METHOD (I[J)V + ARG 1 size + ARG 2 defaults + METHOD method_56649 onPush ()V + METHOD method_56651 clearValues ()V diff --git a/mappings/net/minecraft/util/profiler/log/DebugSampleLog.mapping b/mappings/net/minecraft/util/profiler/log/DebugSampleLog.mapping new file mode 100644 index 0000000000..35f9060429 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/log/DebugSampleLog.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8743 net/minecraft/util/profiler/log/DebugSampleLog + METHOD method_53066 push (J)V + ARG 1 value + METHOD method_56535 push (JI)V + ARG 1 value + ARG 3 column + METHOD method_56650 set ([J)V + ARG 1 values diff --git a/mappings/net/minecraft/util/profiler/log/DebugSampleType.mapping b/mappings/net/minecraft/util/profiler/log/DebugSampleType.mapping new file mode 100644 index 0000000000..3cecd118ad --- /dev/null +++ b/mappings/net/minecraft/util/profiler/log/DebugSampleType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9192 net/minecraft/util/profiler/log/DebugSampleType diff --git a/mappings/net/minecraft/util/profiler/log/MultiValueDebugSampleLog.mapping b/mappings/net/minecraft/util/profiler/log/MultiValueDebugSampleLog.mapping new file mode 100644 index 0000000000..5f1f9d2ca3 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/log/MultiValueDebugSampleLog.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_9194 net/minecraft/util/profiler/log/MultiValueDebugSampleLog + METHOD method_56659 get (I)J + ARG 1 index + METHOD method_56660 get (II)J + ARG 1 index + ARG 2 dimension + METHOD method_56662 getDimension ()I + METHOD method_56663 getLength ()I + METHOD method_56664 clear ()V diff --git a/mappings/net/minecraft/util/profiler/log/SubscribableDebugSampleLog.mapping b/mappings/net/minecraft/util/profiler/log/SubscribableDebugSampleLog.mapping new file mode 100644 index 0000000000..1b12b216a3 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/log/SubscribableDebugSampleLog.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_9193 net/minecraft/util/profiler/log/SubscribableDebugSampleLog + FIELD field_48819 tracker Lnet/minecraft/class_9188; + FIELD field_48820 type Lnet/minecraft/class_9192; + METHOD (ILnet/minecraft/class_9188;Lnet/minecraft/class_9192;)V + ARG 1 size + ARG 2 tracker + ARG 3 type + METHOD (ILnet/minecraft/class_9188;Lnet/minecraft/class_9192;[J)V + ARG 1 size + ARG 2 tracker + ARG 3 type + ARG 4 defaults diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 28d85524b0..b6bee2d37d 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -360,12 +360,12 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents FIELD field_48852 VAULT_ACTIVATES I COMMENT A vault is activated. COMMENT
Plays the activate sound and spawns smoke and small flame particles. - COMMENT

Called by {@link net.minecraft.block.vault.VaultState#ACTIVE}. + COMMENT

Called by {@link net.minecraft.block.enums.VaultState#ACTIVE}. FIELD field_48853 VAULT_DEACTIVATES I COMMENT A vault is deactivated. COMMENT
Plays the deactivate sound and spawns small flame particles. - COMMENT

Called by {@link net.minecraft.block.vault.VaultState#INACTIVE}. + COMMENT

Called by {@link net.minecraft.block.enums.VaultState#INACTIVE}. FIELD field_48854 VAULT_EJECTS_ITEM I COMMENT A vault ejects loot. COMMENT
Spawns ejection particles. - COMMENT

Called by {@link net.minecraft.block.vault.VaultState#ejectItem}. + COMMENT

Called by {@link net.minecraft.block.enums.VaultState#ejectItem}. diff --git a/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping b/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping index e1348c7e02..3319e58a6e 100644 --- a/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping +++ b/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkCompressionForma FIELD field_48756 FORMAT_BY_NAME Lit/unimi/dsi/fastutil/objects/Object2ObjectMap; FIELD field_48757 currentFormat Lnet/minecraft/class_4486; FIELD field_48758 name Ljava/lang/String; + FIELD field_48916 CUSTOM Lnet/minecraft/class_4486; METHOD (ILjava/lang/String;Lnet/minecraft/class_4486$class_4487;Lnet/minecraft/class_4486$class_4487;)V ARG 1 id ARG 2 name