From 774a015f93d9edd1a29d49cade7f3bea4caded43 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 6 Sep 2023 20:33:23 +0900 Subject: [PATCH] 1.20.2-pre1 stuff (#3655) * 1.20.2-pre1 stuff * Renames --- .../client/gui/screen/StatsScreen.mapping | 1 + .../gui/screen/ingame/LoomScreen.mapping | 1 + .../recipebook/RecipeBookWidget.mapping | 11 +++++ .../net/minecraft/client/main/Main.mapping | 2 + .../network/ClientPlayNetworkHandler.mapping | 1 + .../client/network/ClientPlayerEntity.mapping | 5 ++ .../client/option/GameOptions.mapping | 1 + ...deRebalanceChestLootTableGenerator.mapping | 5 ++ .../TradeRebalanceLootTableProviders.mapping | 3 ++ mappings/net/minecraft/entity/Entity.mapping | 5 ++ .../entity/passive/MerchantEntity.mapping | 1 + .../entity/player/PlayerEntity.mapping | 1 + .../net/minecraft/item/FilledMapItem.mapping | 4 ++ .../net/minecraft/item/map/MapIcon.mapping | 3 ++ mappings/net/minecraft/loot/LootTable.mapping | 12 ++++- .../network/ClientConnection.mapping | 2 + .../network/encryption/PlayerKeyPair.mapping | 2 +- .../encryption/PlayerPublicKey.mapping | 2 +- .../ServerCommonPacketListener.mapping | 3 +- .../c2s/common/ClientOptionsC2SPacket.mapping | 5 ++ .../c2s/common/SyncedClientOptions.mapping | 17 +++++++ .../c2s/play/ClientSettingsC2SPacket.mapping | 3 -- .../s2c/play/GameStateChangeS2CPacket.mapping | 1 + .../minecraft/server/PlayerManager.mapping | 2 + .../command/ServerCommandSource.mapping | 1 + .../server/function/CommandFunction.mapping | 2 + .../network/ConnectedClientData.mapping | 4 ++ .../ServerCommonNetworkHandler.mapping | 3 ++ .../ServerConfigurationNetworkHandler.mapping | 1 + .../network/ServerPlayNetworkHandler.mapping | 3 ++ .../server/network/ServerPlayerEntity.mapping | 7 ++- .../world/ThreadedAnvilChunkStorage.mapping | 1 + mappings/net/minecraft/util/Arm.mapping | 1 + .../net/minecraft/util/dynamic/Codecs.mapping | 9 +++- .../net/minecraft/village/TradeOffers.mapping | 47 +++++++++++++++++-- .../net/minecraft/world/GameRules.mapping | 3 ++ 36 files changed, 160 insertions(+), 15 deletions(-) create mode 100644 mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceChestLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/common/SyncedClientOptions.mapping delete mode 100644 mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping create mode 100644 mappings/net/minecraft/server/network/ConnectedClientData.mapping diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index d4ebdff890..d6264a0736 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen FIELD field_45419 HEADER_TEXTURE Lnet/minecraft/class_2960; FIELD field_45420 SORT_UP_TEXTURE Lnet/minecraft/class_2960; FIELD field_45421 SORT_DOWN_TEXTURE Lnet/minecraft/class_2960; + FIELD field_46185 NONE_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3469;)V ARG 1 parent ARG 2 statHandler diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index 4f6f0c0c14..b307c79a3a 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_45481 BANNER_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_45482 DYE_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_45483 PATTERN_SLOT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_46186 ERROR_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1726;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 screenHandler ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index 3d494c10de..77f3516730 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -26,6 +26,8 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_17064 getToggleCraftableButtonText ()Lnet/minecraft/class_2561; METHOD method_2576 triggerPirateSpeakEasterEgg (Ljava/lang/String;)V ARG 1 search + METHOD method_2577 (ZLnet/minecraft/class_516;)V + ARG 2 resultCollection METHOD method_2579 reset ()V METHOD method_2580 (Lnet/minecraft/class_516;)Z ARG 0 resultCollection @@ -94,3 +96,12 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_37308 (Ljava/util/List;Lnet/minecraft/class_339;)V ARG 1 button METHOD method_47429 updateTooltip ()V + METHOD method_53843 (Lnet/minecraft/class_516;Lnet/minecraft/class_516;)I + ARG 0 a + ARG 1 b + METHOD method_53844 (Ljava/lang/String;Lnet/minecraft/class_8786;)Z + ARG 2 recipe + METHOD method_53845 (Ljava/lang/String;Lnet/minecraft/class_516;)Z + ARG 2 resultCollection + METHOD method_53846 (Ljava/lang/String;Ljava/lang/String;)Z + ARG 1 word diff --git a/mappings/net/minecraft/client/main/Main.mapping b/mappings/net/minecraft/client/main/Main.mapping index 5693cf95b6..a891561f86 100644 --- a/mappings/net/minecraft/client/main/Main.mapping +++ b/mappings/net/minecraft/client/main/Main.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/client/main/Main ARG 0 i METHOD method_38752 toOptional (Ljava/lang/String;)Ljava/util/Optional; ARG 0 string + METHOD method_53858 unescape (Ljava/lang/String;)Ljava/lang/String; + ARG 0 string diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index bd33f817c9..f0c904a44f 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_45945 chunkBatchSizeCalculator Lnet/minecraft/class_8760; FIELD field_45946 pingMeasurer Lnet/minecraft/class_8761; FIELD field_45947 displayedUnsecureChatWarning Z + FIELD field_46187 worldCleared Z 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/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index ed76e7179c..44db2d1529 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -36,7 +36,9 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3945 activeHand Lnet/minecraft/class_1268; FIELD field_44911 nauseaIntensity F FIELD field_44912 prevNauseaIntensity F + FIELD field_46188 limitedCraftingEnabled Z METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_638;Lnet/minecraft/class_634;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;ZZ)V + ARG 1 client ARG 2 world ARG 3 networkHandler ARG 4 stats @@ -96,5 +98,8 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity ARG 1 vehicle METHOD method_51889 onGameModeChanged (Lnet/minecraft/class_1934;)V ARG 1 gameMode + METHOD method_53847 isLimitedCraftingEnabled ()Z + METHOD method_53848 setLimitedCraftingEnabled (Z)V + ARG 1 limitedCraftingEnabled METHOD method_7290 dropSelectedItem (Z)Z ARG 1 entireStack diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index f596732d45..6da418ebcb 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -593,6 +593,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_52704 (Ljava/lang/Boolean;)Lnet/minecraft/class_4063; ARG 0 value METHOD method_53530 getNarratorHotkey ()Lnet/minecraft/class_7172; + METHOD method_53842 getSyncedOptions ()Lnet/minecraft/class_8791; CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key diff --git a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceChestLootTableGenerator.mapping new file mode 100644 index 0000000000..21a6294f76 --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceChestLootTableGenerator.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8794 net/minecraft/data/server/loottable/rebalance/TradeRebalanceChestLootTableGenerator + METHOD method_53849 createPillagerOutpostChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_53850 createDesertPyramidChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_53851 createAncientCityChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_53852 createJungleTempleChestTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping new file mode 100644 index 0000000000..57094bc8a8 --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8795 net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders + METHOD method_53853 createTradeRebalanceProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438; + ARG 0 output diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 537df605ee..dadffa30ab 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1006,6 +1006,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 vehicle METHOD method_52538 getPassengerRidingPos (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; ARG 1 passenger + METHOD method_53827 getLerpTargetY ()D + METHOD method_53828 getLerpTargetZ ()D + METHOD method_53829 getLerpTargetPitch ()F + METHOD method_53830 getLerpTargetX ()D + METHOD method_53831 getLerpTargetYaw ()F METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V COMMENT Called when this entity's collision box intersects {@code state}. COMMENT diff --git a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping index 768004b103..3095eacde3 100644 --- a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity ARG 1 sold METHOD method_19170 fillRecipesFromPool (Lnet/minecraft/class_1916;[Lnet/minecraft/class_3853$class_1652;I)V ARG 1 recipeList + ARG 2 pool ARG 3 count METHOD method_19181 resetCustomer ()V METHOD method_20010 playCelebrateSound ()V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index c2ecf2882a..f050777a82 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_38197 LOGGER Lorg/slf4j/Logger; FIELD field_39445 lastDeathPos Ljava/util/Optional; FIELD field_41765 damageTiltYaw F + FIELD field_46174 DEFAULT_MAIN_ARM Lnet/minecraft/class_1306; 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/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index e0c8fc67ca..f3a2e476c0 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -23,6 +23,10 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 0 biomes ARG 1 x ARG 2 z + METHOD method_53836 getIdText (I)Lnet/minecraft/class_2561; + ARG 0 id + METHOD method_53837 getIdText (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2561; + ARG 0 stack METHOD method_7995 getFluidStateIfVisible (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 world ARG 2 state diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index 6a3931bd3c..7654f30eac 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon FIELD field_33990 useIconCountLimit Z FIELD field_45788 CODEC Lcom/mojang/serialization/Codec; FIELD field_45789 name Ljava/lang/String; + FIELD field_46184 structure Z FIELD field_81 id B FIELD field_82 tintColor I METHOD (Ljava/lang/String;ILjava/lang/String;ZIZZ)V @@ -31,11 +32,13 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon ARG 4 alwaysRender ARG 5 tintColor ARG 6 useIconCountLimit + ARG 7 structure METHOD (Ljava/lang/String;ILjava/lang/String;ZZ)V ARG 3 name ARG 4 alwaysRender ARG 5 useIconCountLimit METHOD method_37342 shouldUseIconCountLimit ()Z + METHOD method_53841 isStructure ()Z METHOD method_95 isAlwaysRendered ()Z METHOD method_96 getTintColor ()I METHOD method_97 hasTintColor ()Z diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index bc245e9965..59a6854e85 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -56,13 +56,23 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable METHOD method_51882 generateLoot (Lnet/minecraft/class_8567;Ljava/util/function/Consumer;)V ARG 1 parameters ARG 2 lootConsumer + METHOD method_53274 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53275 (Lnet/minecraft/class_52;)Ljava/util/List; + ARG 0 table + METHOD method_53276 (Lnet/minecraft/class_52;)Ljava/util/List; + ARG 0 table + METHOD method_53277 (Lnet/minecraft/class_52;)Ljava/util/Optional; + ARG 0 table + METHOD method_53278 (Lnet/minecraft/class_52;)Lnet/minecraft/class_176; + ARG 0 table CLASS class_53 Builder FIELD field_44893 randomSequenceId Ljava/util/Optional; FIELD field_949 pools Lcom/google/common/collect/ImmutableList$Builder; FIELD field_950 type Lnet/minecraft/class_176; FIELD field_951 functions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_334 type (Lnet/minecraft/class_176;)Lnet/minecraft/class_52$class_53; - ARG 1 context + ARG 1 type METHOD method_336 pool (Lnet/minecraft/class_55$class_56;)Lnet/minecraft/class_52$class_53; ARG 1 poolBuilder METHOD method_338 build ()Lnet/minecraft/class_52; diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index c376336caa..5fdcfc7a2d 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -180,6 +180,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_52918 flushInternal ()V METHOD method_53505 resetPacketSizeLog (Lnet/minecraft/class_8743;)V ARG 1 log + METHOD method_53859 addFlowControlHandler (Lio/netty/channel/ChannelPipeline;)V + ARG 1 pipeline CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel diff --git a/mappings/net/minecraft/network/encryption/PlayerKeyPair.mapping b/mappings/net/minecraft/network/encryption/PlayerKeyPair.mapping index ca9d5ca0da..4faf392c70 100644 --- a/mappings/net/minecraft/network/encryption/PlayerKeyPair.mapping +++ b/mappings/net/minecraft/network/encryption/PlayerKeyPair.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_7427 net/minecraft/network/encryption/PlayerKeyPair COMMENT

Users cannot generate the keys themselves; this must be provided from Mojang's COMMENT authentication server. COMMENT - COMMENT @see net.minecraft.client.util.ProfileKeys + COMMENT @see net.minecraft.client.session.ProfileKeys COMMENT @see PlayerPublicKey FIELD comp_743 Ljava/time/Instant; COMMENT the time when the keys must be refreshed, otherwise known as expiry time diff --git a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping index ba57ac1718..23df4659ac 100644 --- a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping +++ b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey COMMENT

Users cannot generate the keys themselves; this must be provided from Mojang's COMMENT authentication server. COMMENT - COMMENT @see net.minecraft.client.util.ProfileKeys + COMMENT @see net.minecraft.client.session.ProfileKeys COMMENT @see PlayerKeyPair FIELD field_39050 CODEC Lcom/mojang/serialization/Codec; FIELD field_39954 EXPIRED_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping index 3af692815b..4871c990f5 100644 --- a/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_8706 net/minecraft/network/listener/ServerCommonPacketListener - METHOD method_12069 onClientSettings (Lnet/minecraft/class_2803;)V + METHOD method_12069 onClientOptions (Lnet/minecraft/class_2803;)V + ARG 1 packet METHOD method_52392 onCustomPayload (Lnet/minecraft/class_2817;)V ARG 1 packet METHOD method_52393 onKeepAlive (Lnet/minecraft/class_2827;)V diff --git a/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping new file mode 100644 index 0000000000..eecb3a4cf8 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket + FIELD comp_1963 options Lnet/minecraft/class_8791; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1963 options ()Lnet/minecraft/class_8791; diff --git a/mappings/net/minecraft/network/packet/c2s/common/SyncedClientOptions.mapping b/mappings/net/minecraft/network/packet/c2s/common/SyncedClientOptions.mapping new file mode 100644 index 0000000000..a8a9b9d5de --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/common/SyncedClientOptions.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_8791 net/minecraft/network/packet/c2s/common/SyncedClientOptions + FIELD comp_1954 chatColorsEnabled Z + FIELD comp_1955 playerModelParts I + FIELD comp_1956 mainArm Lnet/minecraft/class_1306; + FIELD comp_1957 filtersText Z + FIELD comp_1958 allowsServerListing Z + FIELD field_46155 MAX_LANGUAGE_CODE_LENGTH I + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1954 chatColorsEnabled ()Z + METHOD comp_1955 playerModelParts ()I + METHOD comp_1956 mainArm ()Lnet/minecraft/class_1306; + METHOD comp_1957 filtersText ()Z + METHOD comp_1958 allowsServerListing ()Z + METHOD method_53821 createDefault ()Lnet/minecraft/class_8791; + METHOD method_53822 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping deleted file mode 100644 index 5783369937..0000000000 --- a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping index d4b2bf578d..01a9a23fe3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_2668 net/minecraft/network/packet/s2c/play/GameStateCh FIELD field_33330 DEMO_JUMP_HELP I FIELD field_33331 DEMO_INVENTORY_HELP I FIELD field_33332 DEMO_EXPIRY_NOTICE I + FIELD field_46189 LIMITED_CRAFTING_TOGGLED Lnet/minecraft/class_2668$class_5402; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2668$class_5402;F)V diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 62c30496ac..c540f1f398 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -58,6 +58,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14570 onPlayerConnect (Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;Lnet/minecraft/class_8792;)V ARG 1 connection ARG 2 player + ARG 3 clientData METHOD method_14571 getPlayerList ()Ljava/util/List; COMMENT Gets a list of all players on a Minecraft server. COMMENT This list should not be modified! @@ -130,6 +131,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 player METHOD method_14613 createPlayer (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_8791;)Lnet/minecraft/class_3222; ARG 1 profile + ARG 2 syncedOptions METHOD method_14614 isWhitelistEnabled ()Z METHOD method_14617 saveAllPlayerData ()V METHOD method_18241 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 8a1c9c15ff..ff53ae21a3 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -52,6 +52,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 3 registry METHOD method_43735 withSignedArguments (Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;)Lnet/minecraft/class_2168; ARG 1 signedArguments + ARG 2 messageChainTaskQueue METHOD method_43737 isExecutedByPlayer ()Z METHOD method_43738 getSignedArguments ()Lnet/minecraft/class_7448; METHOD method_44023 getPlayer ()Lnet/minecraft/class_3222; diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index 972a1c95f7..0766cd1c19 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -84,6 +84,8 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction ARG 1 arguments ARG 2 dispatcher ARG 3 source + METHOD method_53840 toString (Lnet/minecraft/class_2520;)Ljava/lang/String; + ARG 0 nbt CLASS class_8642 MacroElement FIELD field_45152 parts Ljava/util/List; FIELD field_45153 variables Ljava/util/List; diff --git a/mappings/net/minecraft/server/network/ConnectedClientData.mapping b/mappings/net/minecraft/server/network/ConnectedClientData.mapping new file mode 100644 index 0000000000..ef1e252d64 --- /dev/null +++ b/mappings/net/minecraft/server/network/ConnectedClientData.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8792 net/minecraft/server/network/ConnectedClientData + METHOD comp_1961 syncedOptions ()Lnet/minecraft/class_8791; + METHOD method_53824 createDefault (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_8792; + ARG 0 profile diff --git a/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping index 2b03908cfc..8e3b78c52d 100644 --- a/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_8609 net/minecraft/server/network/ServerCommonNetworkH METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_8792;)V ARG 1 server ARG 2 connection + ARG 3 clientData METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V ARG 1 packet METHOD method_52391 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V @@ -26,3 +27,5 @@ CLASS net/minecraft/class_8609 net/minecraft/server/network/ServerCommonNetworkH METHOD method_52405 getLatency ()I METHOD method_53046 disableFlush ()V METHOD method_53047 enableFlush ()V + METHOD method_53825 createClientData (Lnet/minecraft/class_8791;)Lnet/minecraft/class_8792; + ARG 1 syncedOptions diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping index e313f207e6..22743d8862 100644 --- a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN FIELD field_45022 profile Lcom/mojang/authlib/GameProfile; FIELD field_45023 tasks Ljava/util/Queue; FIELD field_45024 currentTask Lnet/minecraft/class_8605; + FIELD field_46157 syncedOptions Lnet/minecraft/class_8791; METHOD method_52406 onTaskFinished (Lnet/minecraft/class_8605$class_8606;)V ARG 1 key METHOD method_52407 (Lnet/minecraft/server/MinecraftServer$class_7460;)V diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 428561b2e4..864464f030 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 server ARG 2 connection ARG 3 player + ARG 4 clientData METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V ARG 1 x ARG 3 y @@ -150,6 +151,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 3 acknowledgment METHOD method_44897 addPendingAcknowledgment (Lnet/minecraft/class_7471;)V ARG 1 message + METHOD method_45002 (Lnet/minecraft/class_7448;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168; + ARG 2 source METHOD method_45003 parse (Ljava/lang/String;)Lcom/mojang/brigadier/ParseResults; COMMENT {@return the result of parsing {@code command}} ARG 1 command diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index ced9ed8071..1490bf1f16 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -51,10 +51,12 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_39986 session Lnet/minecraft/class_7822; FIELD field_44990 viewDistance I FIELD field_44991 chunkFilter Lnet/minecraft/class_8603; + FIELD field_46156 language Ljava/lang/String; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_8791;)V ARG 1 server ARG 2 world ARG 3 profile + ARG 4 clientOptions METHOD method_14203 copyFrom (Lnet/minecraft/class_3222;Z)V ARG 1 oldPlayer ARG 2 alive @@ -71,8 +73,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14212 updateScores (Lnet/minecraft/class_274;I)V ARG 1 criterion ARG 2 score - METHOD method_14213 setClientSettings (Lnet/minecraft/class_8791;)V - ARG 1 packet + METHOD method_14213 setClientOptions (Lnet/minecraft/class_8791;)V + ARG 1 clientOptions METHOD method_14217 markHealthDirty ()V METHOD method_14218 updateInput (FFZZ)V ARG 1 sidewaysSpeed @@ -244,6 +246,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 chunkFilter METHOD method_52374 createCommonPlayerSpawnInfo (Lnet/minecraft/class_3218;)Lnet/minecraft/class_8589; ARG 1 world + METHOD method_53823 getClientOptions ()Lnet/minecraft/class_8791; METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode CLASS 1 diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 8d0a76c79e..801cabfec0 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_29671 PROTO_CHUNK B FIELD field_29672 UNMARKED_CHUNK B FIELD field_29673 LEVEL_CHUNK B + FIELD field_29675 DEFAULT_VIEW_DISTANCE I FIELD field_36383 chunkToNextSaveTimeMs Lit/unimi/dsi/fastutil/longs/Long2LongMap; FIELD field_37278 noiseConfig Lnet/minecraft/class_7138; FIELD field_40856 structurePlacementCalculator Lnet/minecraft/class_7869; diff --git a/mappings/net/minecraft/util/Arm.mapping b/mappings/net/minecraft/util/Arm.mapping index 58a2a63b15..18bfaff338 100644 --- a/mappings/net/minecraft/util/Arm.mapping +++ b/mappings/net/minecraft/util/Arm.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1306 net/minecraft/util/Arm FIELD field_38385 id I FIELD field_45121 CODEC Lcom/mojang/serialization/Codec; FIELD field_45122 translationKey Ljava/lang/String; + FIELD field_46166 BY_ID Ljava/util/function/IntFunction; FIELD field_6181 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;)V ARG 3 id diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 53ffab9a7f..d62b8ad38d 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_44703 CODEPOINT Lcom/mojang/serialization/Codec; FIELD field_45075 IDENTIFIER_PATH Lcom/mojang/serialization/Codec; FIELD field_45076 GAME_PROFILE Lcom/mojang/serialization/MapCodec; + FIELD field_46165 ESCAPED_STRING 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 @@ -286,6 +287,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_53703 strictUnboundedMap (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5699$class_8783; ARG 0 keyCodec ARG 1 elementCodec + METHOD method_53826 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 string CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops @@ -417,7 +420,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 o METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 ops - CLASS class_8783 + CLASS class_8783 StrictUnboundedMapCodec FIELD a keyCodec Lcom/mojang/serialization/Codec; FIELD b elementCodec Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)V @@ -435,3 +438,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 3 prefix METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD method_53706 (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 2 map + METHOD method_53707 (Ljava/lang/Object;Ljava/util/Map;)Lcom/mojang/datafixers/util/Pair; + ARG 1 map diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 3fa340b8f7..56863c78c5 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -17,6 +17,13 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers FIELD field_30628 HIGH_PRICE_MULTIPLIER F FIELD field_45128 REBALANCED_PROFESSION_TO_LEVELED_TRADE Ljava/util/Map; FIELD field_45129 REBALANCED_WANDERING_TRADER_TRADES Ljava/util/List; + FIELD field_46167 SELL_DESERT_VILLAGE_MAP_TRADE Lnet/minecraft/class_3853$class_1654; + FIELD field_46168 SELL_SAVANNA_VILLAGE_MAP_TRADE Lnet/minecraft/class_3853$class_1654; + FIELD field_46169 SELL_PLAINS_VILLAGE_MAP_TRADE Lnet/minecraft/class_3853$class_1654; + FIELD field_46170 SELL_TAIGA_VILLAGE_MAP_TRADE Lnet/minecraft/class_3853$class_1654; + FIELD field_46171 SELL_SNOWY_VILLAGE_MAP_TRADE Lnet/minecraft/class_3853$class_1654; + FIELD field_46172 SELL_JUNGLE_TEMPLE_MAP_TRADE Lnet/minecraft/class_3853$class_1654; + FIELD field_46173 SELL_SWAMP_HUT_MAP_TRADE Lnet/minecraft/class_3853$class_1654; METHOD method_16928 copyToFastUtilMap (Lcom/google/common/collect/ImmutableMap;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; ARG 0 map METHOD method_16929 (Ljava/util/HashMap;)V @@ -26,6 +33,10 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 0 experience METHOD method_52553 createPotionStack (Lnet/minecraft/class_1842;)Lnet/minecraft/class_1799; ARG 0 potion + METHOD method_53832 enchant (Lnet/minecraft/class_1792;Lnet/minecraft/class_1887;I)Lnet/minecraft/class_1799; + ARG 0 item + ARG 1 enchantment + ARG 2 level CLASS class_1648 EnchantBookFactory FIELD field_18557 experience I FIELD field_45131 possibleEnchantments Ljava/util/List; @@ -132,22 +143,30 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 4 experience ARG 5 multiplier CLASS class_4164 ProcessItemFactory - FIELD field_18563 secondBuy Lnet/minecraft/class_1799; + FIELD field_18563 toBeProcessed Lnet/minecraft/class_1799; FIELD field_18565 price I - FIELD field_18566 sell Lnet/minecraft/class_1799; + FIELD field_18566 processed Lnet/minecraft/class_1799; FIELD field_18568 maxUses I FIELD field_18569 experience I FIELD field_18570 multiplier F METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIF)V ARG 1 item - ARG 2 secondCount + ARG 2 count + ARG 3 price + ARG 4 processed + ARG 5 processedCount + ARG 6 maxUses + ARG 7 experience + ARG 8 multiplier METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1799;IIIF)V ARG 1 item - ARG 2 secondCount + ARG 2 count ARG 3 price - ARG 5 sellCount + ARG 4 processed + ARG 5 processedCount ARG 6 maxUses ARG 7 experience + ARG 8 multiplier CLASS class_4165 SellItemFactory FIELD field_18571 sell Lnet/minecraft/class_1799; FIELD field_18572 price I @@ -160,21 +179,31 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 3 count ARG 4 experience METHOD (Lnet/minecraft/class_1792;IIII)V + ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1792;IIIIF)V + ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience ARG 6 multiplier METHOD (Lnet/minecraft/class_1799;IIII)V + ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience + METHOD (Lnet/minecraft/class_1799;IIIIF)V + ARG 1 sell + ARG 2 price + ARG 3 count + ARG 4 maxUses + ARG 5 experience + ARG 6 multiplier METHOD (Lnet/minecraft/class_2248;IIII)V ARG 1 block ARG 2 price @@ -215,3 +244,11 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers CLASS class_8640 TypedWrapperFactory FIELD comp_1962 typeToFactory Ljava/util/Map; METHOD comp_1962 typeToFactory ()Ljava/util/Map; + METHOD method_53833 (Lnet/minecraft/class_3853$class_1652;Lnet/minecraft/class_3854;)Lnet/minecraft/class_3853$class_1652; + ARG 1 type + METHOD method_53834 of (Lnet/minecraft/class_3853$class_1652;[Lnet/minecraft/class_3854;)Lnet/minecraft/class_3853$class_8640; + ARG 0 factory + ARG 1 types + METHOD method_53835 (Lnet/minecraft/class_3854;)Lnet/minecraft/class_3854; + ARG 0 type + CLASS class_8793 EmptyFactory diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 1bae224256..59498e775f 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -77,6 +77,9 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules METHOD method_27324 (Ljava/util/Map$Entry;)Lnet/minecraft/class_1928$class_4315; ARG 0 entry METHOD method_27325 copy ()Lnet/minecraft/class_1928; + METHOD method_53839 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1928$class_4310;)V + ARG 0 server + ARG 1 rule METHOD method_8355 getBoolean (Lnet/minecraft/class_1928$class_4313;)Z ARG 1 rule METHOD method_8356 getInt (Lnet/minecraft/class_1928$class_4313;)I