From 0f01f795f5062170504f4651eaf5afa1e5c736f4 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 22 Mar 2024 00:43:23 +0900 Subject: [PATCH] 24w12a more stuff --- .../minecraft/advancement/Advancement.mapping | 1 + .../advancement/AdvancementRewards.mapping | 2 + ...yerGeneratesContainerLootCriterion.mapping | 2 + .../net/minecraft/block/CrafterBlock.mapping | 2 + .../block/entity/BrushableBlockEntity.mapping | 1 + .../LootableContainerBlockEntity.mapping | 2 +- .../block/spawner/TrialSpawnerConfig.mapping | 4 +- .../block/spawner/TrialSpawnerLogic.mapping | 4 ++ .../minecraft/block/vault/VaultConfig.mapping | 1 + .../minecraft/client/MinecraftClient.mapping | 2 + .../client/gui/hud/InGameHud.mapping | 9 ++++ .../screen/world/ExperimentsScreen.mapping | 3 ++ .../ModelPredicateProviderRegistry.mapping | 1 + .../screen/RealmsCreateWorldScreen.mapping | 5 +++ .../gui/screen/RealmsPlayerScreen.mapping | 21 ++++++++++ .../client/render/MapRenderer.mapping | 2 + .../model/json/ModelOverrideList.mapping | 1 + .../type/WrittenBookContentComponent.mapping | 4 ++ mappings/net/minecraft/data/Main.mapping | 2 + ...laHusbandryTabAdvancementGenerator.mapping | 4 ++ .../EntityLootTableGenerator.mapping | 3 ++ .../loottable/LootTableProvider.mapping | 9 ++++ .../enchantment/DamageEnchantment.mapping | 1 + .../net/minecraft/entity/LivingEntity.mapping | 1 + .../passive/AbstractHorseEntity.mapping | 2 + .../entity/passive/ArmadilloBrain.mapping | 4 +- .../entity/passive/AxolotlBrain.mapping | 4 +- .../entity/passive/CamelBrain.mapping | 4 +- .../entity/passive/ChickenEntity.mapping | 2 + .../entity/passive/FrogBrain.mapping | 4 +- .../entity/passive/FrogEntity.mapping | 3 ++ .../entity/passive/GoatBrain.mapping | 4 +- .../entity/passive/LlamaEntity.mapping | 2 + .../entity/passive/OcelotEntity.mapping | 1 + .../entity/passive/SnifferBrain.mapping | 4 +- .../entity/passive/TadpoleEntity.mapping | 2 +- .../entity/player/HungerManager.mapping | 1 + .../entity/player/PlayerEntity.mapping | 2 + .../entity/vehicle/ChestBoatEntity.mapping | 2 +- .../vehicle/StorageMinecartEntity.mapping | 3 +- .../entity/vehicle/VehicleInventory.mapping | 8 +++- .../net/minecraft/inventory/Inventory.mapping | 2 + .../inventory/LootableInventory.mapping | 14 +++---- mappings/net/minecraft/item/ItemStack.mapping | 4 ++ .../net/minecraft/item/ShearsItem.mapping | 1 + mappings/net/minecraft/item/SwordItem.mapping | 1 + .../net/minecraft/item/TridentItem.mapping | 1 + .../item/trim/ArmorTrimMaterials.mapping | 1 + .../item/trim/ArmorTrimPatterns.mapping | 1 + .../net/minecraft/loot/LootTables.mapping | 1 + .../condition/ReferenceLootCondition.mapping | 3 ++ .../loot/context/LootContext.mapping | 5 ++- .../loot/entry/LootTableEntry.mapping | 7 ++++ .../ExplorationMapLootFunction.mapping | 2 + .../function/ReferenceLootFunction.mapping | 2 + .../loot/function/SetLoreLootFunction.mapping | 6 +++ .../SetWrittenBookPagesLootFunction.mapping | 5 +++ .../ToggleTooltipsLootFunction.mapping | 2 + .../number}/StorageLootNumberProvider.mapping | 2 +- .../s2c/play/MapUpdateS2CPacket.mapping | 4 +- .../minecraft/predicate/NbtPredicate.mapping | 2 + .../entity/EntitySubPredicateTypes.mapping | 42 +++++++++++++------ .../LootContextPredicateValidator.mapping | 1 + mappings/net/minecraft/recipe/Recipe.mapping | 1 + .../net/minecraft/recipe/RecipeCache.mapping | 1 + .../minecraft/registry/RegistryKey.mapping | 1 + .../registry/ReloadableRegistries.mapping | 28 ++++++++++++- .../registry/entry/RegistryEntryList.mapping | 2 + .../resource/featuretoggle/FeatureSet.mapping | 1 + .../minecraft/server/DataPackContents.mapping | 5 +++ .../minecraft/server/MinecraftServer.mapping | 3 ++ .../net/minecraft/server/SaveLoading.mapping | 2 + .../server/command/ExecuteCommand.mapping | 1 + .../server/command/LootCommand.mapping | 4 ++ .../structure/OceanRuinGenerator.mapping | 1 + .../structure/StructurePiece.mapping | 3 ++ .../processor/StructureProcessorLists.mapping | 1 + .../AppendLootRuleBlockEntityModifier.mapping | 2 + mappings/net/minecraft/util/Rarity.mapping | 2 +- mappings/net/minecraft/util/Util.mapping | 5 ++- .../util/collection/ListOperation.mapping | 10 ++++- .../net/minecraft/village/TradeOffers.mapping | 3 +- 82 files changed, 276 insertions(+), 48 deletions(-) rename mappings/net/minecraft/loot/{number/provider => provider/number}/StorageLootNumberProvider.mapping (83%) diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 34a4541152..f967c22180 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 1 validated METHOD method_54912 validate (Lnet/minecraft/class_8942;Lnet/minecraft/class_7871$class_7872;)V ARG 1 errorReporter + ARG 2 lookup METHOD method_54913 (Lnet/minecraft/class_8942;Lnet/minecraft/class_7871$class_7872;Ljava/lang/String;Lnet/minecraft/class_175;)V ARG 2 name ARG 3 criterion diff --git a/mappings/net/minecraft/advancement/AdvancementRewards.mapping b/mappings/net/minecraft/advancement/AdvancementRewards.mapping index 787e8221a6..f49f87f314 100644 --- a/mappings/net/minecraft/advancement/AdvancementRewards.mapping +++ b/mappings/net/minecraft/advancement/AdvancementRewards.mapping @@ -25,7 +25,9 @@ CLASS net/minecraft/class_170 net/minecraft/advancement/AdvancementRewards FIELD field_1170 function Ljava/util/Optional; FIELD field_1171 loot Lcom/google/common/collect/ImmutableList$Builder; METHOD method_34899 loot (Lnet/minecraft/class_5321;)Lnet/minecraft/class_170$class_171; + ARG 0 loot METHOD method_34900 addLoot (Lnet/minecraft/class_5321;)Lnet/minecraft/class_170$class_171; + ARG 1 loot METHOD method_34901 function (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171; ARG 0 function METHOD method_34902 setFunction (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171; diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping index b745810bf9..941d5bc082 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGenerat ARG 1 conditions METHOD method_27993 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_5321;)V ARG 1 player + ARG 2 lootTable CLASS class_5283 Conditions FIELD comp_2029 player Ljava/util/Optional; FIELD field_47307 CODEC Lcom/mojang/serialization/Codec; @@ -10,5 +11,6 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGenerat ARG 1 playerPredicate METHOD method_27995 create (Lnet/minecraft/class_5321;)Lnet/minecraft/class_175; METHOD method_27996 test (Lnet/minecraft/class_5321;)Z + ARG 1 lootTable METHOD method_55060 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/block/CrafterBlock.mapping b/mappings/net/minecraft/block/CrafterBlock.mapping index aefd84be56..e8d2b795a8 100644 --- a/mappings/net/minecraft/block/CrafterBlock.mapping +++ b/mappings/net/minecraft/block/CrafterBlock.mapping @@ -11,10 +11,12 @@ CLASS net/minecraft/class_8886 net/minecraft/block/CrafterBlock ARG 0 world ARG 1 inputInventory METHOD method_54476 transferOrSpawnStack (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8887;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_8786;)V + ARG 1 world ARG 2 pos ARG 3 blockEntity ARG 4 stack ARG 5 state + ARG 6 recipe METHOD method_54477 setTriggered (Lnet/minecraft/class_2586;Z)V ARG 1 blockEntity ARG 2 triggered diff --git a/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping b/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping index 7f4b1b3b88..83c5c111b3 100644 --- a/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_8174 net/minecraft/block/entity/BrushableBlockEntity ARG 3 player ARG 4 hitDirection METHOD method_49216 setLootTable (Lnet/minecraft/class_5321;J)V + ARG 1 lootTable ARG 2 seed METHOD method_49217 generateItem (Lnet/minecraft/class_1657;)V ARG 1 player diff --git a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping index ff9a80d235..b28c2a7f60 100644 --- a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlockEntity FIELD field_12036 lootTableSeed J - FIELD field_12037 lootTableId Lnet/minecraft/class_5321; + FIELD field_12037 lootTable Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping index 6437c6a9f5..fa2bf10ba8 100644 --- a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8965 net/minecraft/block/spawner/TrialSpawnerConfig - FIELD field_47367 defaultInstance Lnet/minecraft/class_8965; - FIELD field_47368 codec Lcom/mojang/serialization/MapCodec; + FIELD field_47367 DEFAULT Lnet/minecraft/class_8965; + 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; diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping index 473f2d18bc..9c41d9b9f2 100644 --- a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic METHOD method_55159 ejectLootTable (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5321;)V ARG 1 world ARG 2 pos + ARG 3 lootTable METHOD method_55160 shouldRemoveMobFromData (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/UUID;)Z ARG 0 world ARG 1 pos @@ -55,6 +56,9 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic ARG 3 playerCount METHOD method_55168 setEntityDetector (Lnet/minecraft/class_8962;)V ARG 1 detector + METHOD method_55169 (Lnet/minecraft/class_8965;Lnet/minecraft/class_8966;)Lnet/minecraft/class_8963; + ARG 1 config + ARG 2 data METHOD method_55170 getConfig ()Lnet/minecraft/class_8965; METHOD method_55171 tickServer (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 1 world diff --git a/mappings/net/minecraft/block/vault/VaultConfig.mapping b/mappings/net/minecraft/block/vault/VaultConfig.mapping index 9258a64fe9..1acc345db2 100644 --- a/mappings/net/minecraft/block/vault/VaultConfig.mapping +++ b/mappings/net/minecraft/block/vault/VaultConfig.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_9203 net/minecraft/block/vault/VaultConfig FIELD field_48882 DEFAULT Lnet/minecraft/class_9203; FIELD field_48883 codec Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5321;DDLnet/minecraft/class_1799;Ljava/util/Optional;)V + ARG 1 lootTable ARG 2 activationRange ARG 4 deactivationRange ARG 6 keyItem diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 27da3c02cb..003f99caa0 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -188,6 +188,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_46553 uptimeInTicks J FIELD field_47680 userPropertiesFuture Ljava/util/concurrent/CompletableFuture; FIELD field_49473 NBT_TOOLTIP_TEXT Lnet/minecraft/class_2561; + FIELD field_50035 mapDecorationsAtlasManager Lnet/minecraft/class_9443; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -557,6 +558,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_56134 disconnect (Lnet/minecraft/class_437;)V ARG 1 disconnectionScreen METHOD method_57017 onFontOptionsChanged ()V + METHOD method_58476 getMapDecorationsAtlasManager ()Lnet/minecraft/class_9443; CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index fb6a271ad4..a5d1855a3f 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -241,6 +241,15 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_56136 renderExperienceLevel (Lnet/minecraft/class_332;F)V ARG 1 context ARG 2 x + METHOD method_58477 renderFood (Lnet/minecraft/class_332;Lnet/minecraft/class_1657;II)V + ARG 1 context + ARG 2 player + ARG 3 top + ARG 4 left + METHOD method_58478 renderArmor (Lnet/minecraft/class_332;Lnet/minecraft/class_1657;IIII)V + ARG 0 context + ARG 1 player + ARG 5 x CLASS class_6411 HeartType FIELD field_33946 POISONED Lnet/minecraft/class_329$class_6411; FIELD field_45329 fullTexture Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping index 46283b9603..b3dc61741d 100644 --- a/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_8134 net/minecraft/client/gui/screen/world/Experiments FIELD field_42507 applier Ljava/util/function/Consumer; FIELD field_42508 experiments Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; FIELD field_49562 TITLE Lnet/minecraft/class_2561; + FIELD field_50043 INFO_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;)V ARG 1 parent ARG 2 resourcePackManager @@ -27,3 +28,5 @@ CLASS net/minecraft/class_8134 net/minecraft/client/gui/screen/world/Experiments METHOD method_49023 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_49024 applyAndClose ()V + METHOD method_52767 (Lnet/minecraft/class_7847;)V + ARG 0 positioner diff --git a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping index e1fc63aaf7..3d06bbb161 100644 --- a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping +++ b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR METHOD method_27877 (Lnet/minecraft/class_1792;)Ljava/util/Map; ARG 0 key METHOD method_27878 get (Lnet/minecraft/class_1799;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1800; + ARG 0 stack ARG 1 id METHOD method_27879 register (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;Lnet/minecraft/class_6395;)V ARG 0 item diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping index dfd6dc5723..21ad12e405 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping @@ -92,3 +92,8 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea FIELD field_48384 TEXTURE Lnet/minecraft/class_2960; FIELD field_48385 SIZE I FIELD field_48386 TEXTURE_MARGIN I + METHOD (Lnet/minecraft/class_4410;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V + ARG 2 textRenderer + ARG 3 message + ARG 4 image + ARG 5 onPress diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index 3cf69d56a5..e1d1997f2a 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -15,12 +15,21 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay ARG 1 button METHOD method_57681 (Lnet/minecraft/class_4406;Lnet/minecraft/class_364;)V ARG 1 child + METHOD method_57682 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_58475 refreshPlayers ()V CLASS class_4407 InvitedObjectSelectionList CLASS class_4408 InvitedObjectSelectionListEntry FIELD field_19979 playerInfo Lnet/minecraft/class_4874; FIELD field_44536 uninviteButton Lnet/minecraft/class_4185; FIELD field_44537 opButton Lnet/minecraft/class_4185; FIELD field_44538 deopButton Lnet/minecraft/class_4185; + FIELD field_49464 NORMAL_TOOLTIP_TEXT Lnet/minecraft/class_2561; + FIELD field_49465 OPS_TOOLTIP_TEXT Lnet/minecraft/class_2561; + FIELD field_49466 REMOVE_TOOLTIP_TEXT Lnet/minecraft/class_2561; + FIELD field_49467 MAKE_OPERATOR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_49468 REMOVE_OPERATOR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_49469 REMOVE_PLAYER_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4406;Lnet/minecraft/class_4874;)V ARG 2 playerInfo METHOD method_51246 (ILnet/minecraft/class_4185;)V @@ -29,3 +38,15 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay ARG 2 button METHOD method_51249 (ILnet/minecraft/class_4185;)V ARG 2 button + METHOD method_57691 op (I)V + ARG 1 index + METHOD method_57692 setOps (Lnet/minecraft/class_4870;)V + ARG 1 ops + METHOD method_57693 (Lnet/minecraft/class_4874;IZ)V + ARG 3 confirmed + METHOD method_57695 deop (I)V + ARG 1 index + METHOD method_57697 refreshOpButtonsVisibility ()V + METHOD method_57698 uninvite (I)V + ARG 1 index + METHOD method_57700 getOpButton ()Lnet/minecraft/class_4185; diff --git a/mappings/net/minecraft/client/render/MapRenderer.mapping b/mappings/net/minecraft/client/render/MapRenderer.mapping index e0c19c82d1..c9cd63377d 100644 --- a/mappings/net/minecraft/client/render/MapRenderer.mapping +++ b/mappings/net/minecraft/client/render/MapRenderer.mapping @@ -3,8 +3,10 @@ CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer FIELD field_2045 mapTextures Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_32173 DEFAULT_IMAGE_WIDTH I FIELD field_32174 DEFAULT_IMAGE_HEIGHT I + FIELD field_50036 mapDecorationsAtlasManager Lnet/minecraft/class_9443; METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_9443;)V ARG 1 textureManager + ARG 2 mapDecorationsAtlasManager METHOD method_1769 updateTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V ARG 1 id ARG 2 state diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping index 66c469cd72..f0587cefbd 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_806 net/minecraft/client/render/model/json/ModelOverri ARG 1 condition METHOD method_3495 apply (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087; ARG 1 model + ARG 2 stack ARG 3 world ARG 4 entity ARG 5 seed diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping index 9e0801a42a..17dda52567 100644 --- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping @@ -30,3 +30,7 @@ CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentCo METHOD method_57526 (ZLnet/minecraft/class_9262;)Lnet/minecraft/class_2561; ARG 1 page METHOD method_57527 asResolved ()Lnet/minecraft/class_9302; + METHOD method_58436 createPagesCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 textCodec + METHOD method_58437 createPageCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 textCodec diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index 32cf433b69..5481050062 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -38,3 +38,5 @@ CLASS net/minecraft/data/Main ARG 2 outputx METHOD method_58266 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;Lnet/minecraft/class_7784;)Lnet/minecraft/class_9382; ARG 2 outputx + METHOD method_58575 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;Lnet/minecraft/class_7784;)Lnet/minecraft/class_9447; + ARG 2 outputx diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping index de8a18298d..cfd4bb9df0 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/vanilla/Van ARG 0 advancementBuilder ARG 1 breedableAnimals ARG 2 eggLayingAnimals + METHOD method_16117 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_6880$class_6883;)V + ARG 1 entry METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; ARG 0 builder METHOD method_43362 requireAllFrogsOnLeads (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; @@ -30,3 +32,5 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/vanilla/Van ARG 1 type METHOD method_48498 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_1299;)V ARG 1 type + METHOD method_58572 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960; + ARG 0 entry diff --git a/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping index bf326f4243..ca822cebe9 100644 --- a/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping @@ -14,14 +14,17 @@ CLASS net/minecraft/class_7789 net/minecraft/data/server/loottable/EntityLootTab ARG 0 entityType METHOD method_46028 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_5321;Lnet/minecraft/class_52$class_53;)V ARG 1 entityType + ARG 2 tableKey ARG 3 lootTable METHOD method_46029 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_52$class_53;)V ARG 1 entityType ARG 2 lootTable METHOD method_46030 killedByFrog (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5341$class_210; + ARG 1 frogVariant METHOD method_46031 createForSheep (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; ARG 0 item METHOD method_46032 (Ljava/util/Set;Lnet/minecraft/class_6880$class_6883;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5321;Lnet/minecraft/class_52$class_53;)V + ARG 3 tableKey ARG 4 lootTableBuilder METHOD method_46033 (Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/class_6880$class_6883;)V ARG 3 entityType diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping index dbf12f35c1..ed99081355 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping @@ -12,11 +12,20 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 name ARG 1 message + METHOD method_10408 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; + ARG 3 entry + METHOD method_10410 (Lnet/minecraft/class_7225$class_7874;Ljava/util/Map;Lnet/minecraft/class_2385;Lnet/minecraft/class_2438$class_7790;)V + ARG 3 lootTypeGenerator + METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_6880$class_6883;)V + ARG 1 entry METHOD method_10412 (Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lnet/minecraft/class_52$class_53;)V + ARG 3 lootTable ARG 4 builder METHOD method_56883 run (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletableFuture; ARG 1 writer ARG 2 registryLookup METHOD method_56884 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; ARG 2 registryLookup + METHOD method_58574 getId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960; + ARG 0 lootTableKey CLASS class_7790 LootTypeGenerator diff --git a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping index 9d8172c03b..a65cd24b20 100644 --- a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_1882 net/minecraft/enchantment/DamageEnchantment FIELD field_48369 applicableEntities Ljava/util/Optional; METHOD (Lnet/minecraft/class_1887$class_9427;Ljava/util/Optional;)V ARG 1 weight + ARG 2 applicableEntities diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index e297032f88..41cfb5c00b 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -139,6 +139,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_18808 getProjectileType (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 stack METHOD method_18865 applyFoodEffects (Lnet/minecraft/class_4174;)V + ARG 1 component METHOD method_18866 eatFood (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 world ARG 2 stack diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 0687b4f6aa..5f631300e3 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -74,6 +74,8 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 soundGroup METHOD method_56679 updateSaddledFlag ()V METHOD method_56680 getInventory ()Lnet/minecraft/class_1263; + METHOD method_58392 (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V ARG 1 random METHOD method_6721 onChestedStatusChanged ()V diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping index fc522442c5..aa954c1700 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain ARG 0 context METHOD method_55734 updateActivities (Lnet/minecraft/class_9069;)V ARG 0 armadillo - METHOD method_55735 getBreedingIngredient ()Ljava/util/function/Predicate; + METHOD method_55735 getTemptItemPredicate ()Ljava/util/function/Predicate; METHOD method_55736 (Lnet/minecraft/class_1309;)Ljava/lang/Float; ARG 0 armadillo METHOD method_55737 addCoreActivities (Lnet/minecraft/class_4095;)V @@ -23,6 +23,8 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain ARG 0 brain METHOD method_55739 addPanicActivities (Lnet/minecraft/class_4095;)V ARG 0 brain + METHOD method_58386 (Lnet/minecraft/class_1799;)Z + ARG 0 stack CLASS class_9072 RollUpTask FIELD field_49087 RUN_TIME_IN_TICKS I FIELD field_49090 ticksUntilPeek I diff --git a/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping b/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping index ffd5c986c4..5b8c0d1681 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping @@ -52,7 +52,7 @@ CLASS net/minecraft/class_5768 net/minecraft/entity/passive/AxolotlBrain FIELD field_30396 IDLE_SPEED F FIELD field_30397 TARGET_APPROACHING_SPEED F FIELD field_30398 ADULT_FOLLOWING_SPEED F - METHOD method_33241 getTemptItems ()Ljava/util/function/Predicate; + METHOD method_33241 getTemptItemPredicate ()Ljava/util/function/Predicate; METHOD method_33242 getTargetApproachingSpeed (Lnet/minecraft/class_1309;)F COMMENT {@return the axolotl's speed when approaching the attack target} ARG 0 entity @@ -78,3 +78,5 @@ CLASS net/minecraft/class_5768 net/minecraft/entity/passive/AxolotlBrain ARG 0 brain METHOD method_37457 canGoToLookTarget (Lnet/minecraft/class_1309;)Z ARG 0 entity + METHOD method_58387 (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/entity/passive/CamelBrain.mapping b/mappings/net/minecraft/entity/passive/CamelBrain.mapping index 564cb850a2..931e794ac4 100644 --- a/mappings/net/minecraft/entity/passive/CamelBrain.mapping +++ b/mappings/net/minecraft/entity/passive/CamelBrain.mapping @@ -14,13 +14,15 @@ CLASS net/minecraft/class_7691 net/minecraft/entity/passive/CamelBrain METHOD method_45367 initialize (Lnet/minecraft/class_7689;Lnet/minecraft/class_5819;)V ARG 0 camel ARG 1 random - METHOD method_45368 getTemptItems ()Ljava/util/function/Predicate; + METHOD method_45368 getTemptItemPredicate ()Ljava/util/function/Predicate; METHOD method_45369 addCoreActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_45370 addIdleActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_52549 (Lnet/minecraft/class_1309;)Ljava/lang/Double; ARG 0 entity + METHOD method_58388 (Lnet/minecraft/class_1799;)Z + ARG 0 stack CLASS class_7692 CamelWalkTask CLASS class_7693 SitOrStandTask FIELD field_40160 lastPoseTickDelta I diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping index fee5dbda51..5d6e8ea0ed 100644 --- a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_1428 net/minecraft/entity/passive/ChickenEntity FIELD field_6741 flapProgress F FIELD field_6743 maxWingDeviation F METHOD method_26882 createChickenAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_58366 (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_6472 hasJockey ()Z METHOD method_6473 setHasJockey (Z)V ARG 1 hasJockey diff --git a/mappings/net/minecraft/entity/passive/FrogBrain.mapping b/mappings/net/minecraft/entity/passive/FrogBrain.mapping index a6596822d5..78864e4425 100644 --- a/mappings/net/minecraft/entity/passive/FrogBrain.mapping +++ b/mappings/net/minecraft/entity/passive/FrogBrain.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_7107 net/minecraft/entity/passive/FrogBrain FIELD field_37469 FLEE_SPEED F FIELD field_37474 longJumpCooldownRange Lnet/minecraft/class_6019; FIELD field_37478 TEMPT_SPEED F - METHOD method_41366 getTemptItems ()Ljava/util/function/Predicate; + METHOD method_41366 getTemptItemPredicate ()Ljava/util/function/Predicate; METHOD method_41367 (Lnet/minecraft/class_1309;)Ljava/lang/Float; ARG 0 frog METHOD method_41368 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; @@ -39,3 +39,5 @@ CLASS net/minecraft/class_7107 net/minecraft/entity/passive/FrogBrain METHOD method_45373 shouldJumpTo (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Z ARG 0 frog ARG 1 pos + METHOD method_58390 (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/entity/passive/FrogEntity.mapping b/mappings/net/minecraft/entity/passive/FrogEntity.mapping index ba02f7bacf..9aa29aed56 100644 --- a/mappings/net/minecraft/entity/passive/FrogEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FrogEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity FIELD field_37457 VARIANT Lnet/minecraft/class_2940; FIELD field_37458 TARGET Lnet/minecraft/class_2940; FIELD field_38720 VARIANT_KEY Ljava/lang/String; + FIELD field_49988 DEFAULT_VARIANT_KEY Lnet/minecraft/class_5321; METHOD method_41352 setFrogTarget (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_41353 setVariant (Lnet/minecraft/class_6880;)V @@ -22,6 +23,8 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity ARG 2 reason ARG 3 pos ARG 4 random + METHOD method_58389 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 variant CLASS class_7103 FrogLookControl METHOD (Lnet/minecraft/class_7102;Lnet/minecraft/class_1308;)V ARG 2 entity diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping index 0145e75c22..7a3e197569 100644 --- a/mappings/net/minecraft/entity/passive/GoatBrain.mapping +++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain FIELD field_33500 RAM_TARGET_PREDICATE Lnet/minecraft/class_4051; FIELD field_33501 RAM_SPEED F FIELD field_33693 SCREAMING_RAM_COOLDOWN_RANGE Lnet/minecraft/class_6019; - METHOD method_35181 getTemptItems ()Ljava/util/function/Predicate; + METHOD method_35181 getTemptItemPredicate ()Ljava/util/function/Predicate; METHOD method_35182 (Lnet/minecraft/class_1309;)Ljava/lang/Float; ARG 0 goat METHOD method_35183 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; @@ -51,3 +51,5 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain ARG 0 goat METHOD method_43543 (Lnet/minecraft/class_6053;)Lnet/minecraft/class_3414; ARG 0 goat + METHOD method_58391 (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index ec7b6ff7b9..18535e01c0 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity FIELD field_7000 following Lnet/minecraft/class_1501; METHOD method_18004 createChild ()Lnet/minecraft/class_1501; METHOD method_26900 createLlamaAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_58393 (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_6791 follow (Lnet/minecraft/class_1501;)V ARG 1 llama METHOD method_6792 spitAt (Lnet/minecraft/class_1309;)V diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index 7dbe5fb5c2..1a727d6f56 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -34,4 +34,5 @@ CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity METHOD (Lnet/minecraft/class_3701;DLjava/util/function/Predicate;Z)V ARG 1 ocelot ARG 2 speed + ARG 4 foodPredicate ARG 5 canBeScared diff --git a/mappings/net/minecraft/entity/passive/SnifferBrain.mapping b/mappings/net/minecraft/entity/passive/SnifferBrain.mapping index 844595cf15..211297a6b5 100644 --- a/mappings/net/minecraft/entity/passive/SnifferBrain.mapping +++ b/mappings/net/minecraft/entity/passive/SnifferBrain.mapping @@ -16,13 +16,15 @@ CLASS net/minecraft/class_8155 net/minecraft/entity/passive/SnifferBrain ARG 0 brain METHOD method_49157 addIdleActivities (Lnet/minecraft/class_4095;)V ARG 0 brain - METHOD method_51159 getTemptItems ()Ljava/util/function/Predicate; + METHOD method_51159 getTemptItemPredicate ()Ljava/util/function/Predicate; METHOD method_51160 (Lnet/minecraft/class_1309;)Ljava/lang/Float; ARG 0 sniffer METHOD method_51161 stopDiggingOrSniffing (Lnet/minecraft/class_8153;)Lnet/minecraft/class_8153; ARG 0 sniffer METHOD method_52174 (Lnet/minecraft/class_1309;)Ljava/lang/Double; ARG 0 sniffer + METHOD method_58394 (Lnet/minecraft/class_1799;)Z + ARG 0 stack CLASS class_8156 DiggingTask METHOD (II)V ARG 1 minRunTime diff --git a/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping b/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping index 560c361f9a..fde533d205 100644 --- a/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping @@ -19,5 +19,5 @@ CLASS net/minecraft/class_7110 net/minecraft/entity/passive/TadpoleEntity METHOD method_41396 getTadpoleAge ()I METHOD method_41397 growUp ()V METHOD method_41398 getTicksUntilGrowth ()I - METHOD method_41399 isSlimeBall (Lnet/minecraft/class_1799;)Z + METHOD method_41399 isFrogFood (Lnet/minecraft/class_1799;)Z ARG 1 stack diff --git a/mappings/net/minecraft/entity/player/HungerManager.mapping b/mappings/net/minecraft/entity/player/HungerManager.mapping index ce92be86f9..d3e8d61e71 100644 --- a/mappings/net/minecraft/entity/player/HungerManager.mapping +++ b/mappings/net/minecraft/entity/player/HungerManager.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1702 net/minecraft/entity/player/HungerManager ARG 1 exhaustion METHOD method_35219 getExhaustion ()F METHOD method_7579 eat (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_7580 setFoodLevel (I)V ARG 1 foodLevel METHOD method_7581 setSaturationLevel (F)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index ebe3a308f2..561a6028f1 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_46174 DEFAULT_MAIN_ARM Lnet/minecraft/class_1306; FIELD field_47821 VEHICLE_ATTACHMENT_POS Lnet/minecraft/class_243; FIELD field_49989 currentExplosionImpactPos Lnet/minecraft/class_243; + FIELD field_49990 explodedBy Lnet/minecraft/class_1297; FIELD field_49991 ignoreFallDamageFromCurrentExplosion Z FIELD field_7483 strideDistance F FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796; @@ -163,6 +164,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 2 additionalRange COMMENT the player's additional interaction range added to {@linkplain COMMENT #getEntityInteractionRange the default range} + METHOD method_58396 clearCurrentExplosion ()V METHOD method_58397 (Lnet/minecraft/class_243;)V ARG 1 currentExplosionImpactPos METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I diff --git a/mappings/net/minecraft/entity/vehicle/ChestBoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/ChestBoatEntity.mapping index 7b0d5a06ed..92bd8d4128 100644 --- a/mappings/net/minecraft/entity/vehicle/ChestBoatEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/ChestBoatEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_7264 net/minecraft/entity/vehicle/ChestBoatEntity FIELD field_38204 inventory Lnet/minecraft/class_2371; - FIELD field_38205 lootTableId Lnet/minecraft/class_5321; + FIELD field_38205 lootTable Lnet/minecraft/class_5321; FIELD field_38206 lootTableSeed J FIELD field_38207 INVENTORY_SIZE I METHOD method_42282 generateLoot (Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping index 66fb24251d..c0d8300f8d 100644 --- a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1693 net/minecraft/entity/vehicle/StorageMinecartEntity FIELD field_7732 lootSeed J - FIELD field_7734 lootTableId Lnet/minecraft/class_5321; + FIELD field_7734 lootTable Lnet/minecraft/class_5321; FIELD field_7735 inventory Lnet/minecraft/class_2371; METHOD (Lnet/minecraft/class_1299;DDDLnet/minecraft/class_1937;)V ARG 1 type @@ -12,4 +12,5 @@ CLASS net/minecraft/class_1693 net/minecraft/entity/vehicle/StorageMinecartEntit ARG 1 syncId ARG 2 playerInventory METHOD method_7562 setLootTable (Lnet/minecraft/class_5321;J)V + ARG 1 lootTable ARG 2 lootSeed diff --git a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping index fbc8bfc187..8e06f5ebcb 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping @@ -5,8 +5,9 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory METHOD method_42273 resetInventory ()V METHOD method_42274 setLootTableSeed (J)V ARG 1 lootTableSeed - METHOD method_42275 setLootTableId (Lnet/minecraft/class_5321;)V - METHOD method_42276 getLootTableId ()Lnet/minecraft/class_5321; + METHOD method_42275 setLootTable (Lnet/minecraft/class_5321;)V + ARG 1 lootTable + METHOD method_42276 getLootTable ()Lnet/minecraft/class_5321; METHOD method_42277 getLootTableSeed ()J METHOD method_42278 getInventory ()Lnet/minecraft/class_2371; METHOD method_42283 onBroken (Lnet/minecraft/class_1282;Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;)V @@ -17,13 +18,16 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory ARG 1 player METHOD method_42285 readInventoryFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt + ARG 2 registriesLookup METHOD method_42286 removeInventoryStack (II)Lnet/minecraft/class_1799; ARG 1 slot ARG 2 amount METHOD method_42287 setInventoryStack (ILnet/minecraft/class_1799;)V ARG 1 slot + ARG 2 stack METHOD method_42288 writeInventoryToNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt + ARG 2 registriesLookup METHOD method_42289 removeInventoryStack (I)Lnet/minecraft/class_1799; ARG 1 slot METHOD method_42290 getInventoryStack (I)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 573125658b..642b0b19d4 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -166,3 +166,5 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory COMMENT Sets the stack stored at {@code slot} to {@code stack}. ARG 1 slot ARG 2 stack + METHOD method_58350 getMaxCount (Lnet/minecraft/class_1799;)I + ARG 1 stack diff --git a/mappings/net/minecraft/inventory/LootableInventory.mapping b/mappings/net/minecraft/inventory/LootableInventory.mapping index 71ebcdb79e..0c1e35a9b7 100644 --- a/mappings/net/minecraft/inventory/LootableInventory.mapping +++ b/mappings/net/minecraft/inventory/LootableInventory.mapping @@ -7,10 +7,8 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory FIELD field_47155 LOOT_TABLE_SEED_KEY Ljava/lang/String; METHOD method_10997 getWorld ()Lnet/minecraft/class_1937; METHOD method_11016 getPos ()Lnet/minecraft/class_2338; - METHOD method_11285 setLootTableId (Lnet/minecraft/class_5321;)V - COMMENT Sets the loot table ID. - COMMENT - COMMENT

This is usually stored under the {@value LOOT_TABLE_KEY} NBT key. + METHOD method_11285 setLootTable (Lnet/minecraft/class_5321;)V + ARG 1 lootTable METHOD method_54866 setLootTableSeed (J)V COMMENT Sets the loot table's seed. COMMENT @@ -26,6 +24,7 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory COMMENT @see #setLootTableId(Identifier) COMMENT @see #setLootTableSeed(long) COMMENT @see #setLootTable(BlockView, Random, BlockPos, Identifier) + ARG 1 lootTableId ARG 2 lootTableSeed METHOD method_54868 setLootTable (Lnet/minecraft/class_1922;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_5321;)V COMMENT Queries the block entity at {@code pos}, checks if it is a {@link LootableInventory}, @@ -38,10 +37,8 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory ARG 0 world ARG 1 random ARG 2 pos - METHOD method_54869 getLootTableId ()Lnet/minecraft/class_5321; - COMMENT {@return the loot table ID, or {@code null} if there is no associated loot table} - COMMENT - COMMENT

This is usually stored under the {@value LOOT_TABLE_KEY} NBT key. + ARG 3 lootTableId + METHOD method_54869 getLootTable ()Lnet/minecraft/class_5321; METHOD method_54870 getLootTableSeed ()J COMMENT {@return the loot table's seed} COMMENT @@ -55,6 +52,7 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory COMMENT the inventory if this returns {@code true}. COMMENT COMMENT @return whether the loot table ID was found + ARG 1 nbt METHOD method_54872 writeLootTable (Lnet/minecraft/class_2487;)Z COMMENT Writes the loot table ID and seed to {@code nbt}, if {@linkplain #getLootTableId COMMENT the loot table ID} is not {@code null}. Implementations should skip writing the diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 81c7bb3a56..2e843de16b 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -325,6 +325,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 0 stack METHOD method_58407 takesDamageFrom (Lnet/minecraft/class_1282;)Z ARG 1 source + METHOD method_58408 capCount (I)V + COMMENT Sets the count of items in this item stack to not exceed {@code maxCount}. + ARG 1 maxCount METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT @@ -419,6 +422,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @return values consistent with calls to {@link Item#isSuitableFor} COMMENT @see Item#isSuitableFor(BlockState) + ARG 1 state METHOD method_7952 postMine (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V ARG 1 world ARG 2 state diff --git a/mappings/net/minecraft/item/ShearsItem.mapping b/mappings/net/minecraft/item/ShearsItem.mapping index ec63c66cc8..2d9f806079 100644 --- a/mappings/net/minecraft/item/ShearsItem.mapping +++ b/mappings/net/minecraft/item/ShearsItem.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_1820 net/minecraft/item/ShearsItem + METHOD method_58416 createToolComponent ()Lnet/minecraft/class_9424; diff --git a/mappings/net/minecraft/item/SwordItem.mapping b/mappings/net/minecraft/item/SwordItem.mapping index d7d4c5ef4a..350e5128a3 100644 --- a/mappings/net/minecraft/item/SwordItem.mapping +++ b/mappings/net/minecraft/item/SwordItem.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_1829 net/minecraft/item/SwordItem ARG 0 material ARG 1 baseAttackDamage ARG 2 attackSpeed + METHOD method_58417 createToolComponent ()Lnet/minecraft/class_9424; diff --git a/mappings/net/minecraft/item/TridentItem.mapping b/mappings/net/minecraft/item/TridentItem.mapping index 00696dba9f..88b5f893fd 100644 --- a/mappings/net/minecraft/item/TridentItem.mapping +++ b/mappings/net/minecraft/item/TridentItem.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_1835 net/minecraft/item/TridentItem FIELD field_30927 ATTACK_DAMAGE F FIELD field_30928 THROW_SPEED F METHOD method_57395 createAttributeModifiers ()Lnet/minecraft/class_9285; + METHOD method_58420 createToolComponent ()Lnet/minecraft/class_9424; diff --git a/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping b/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping index a47ee9ffce..b4b3a17914 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_8055 net/minecraft/item/trim/ArmorTrimMaterials METHOD method_48439 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z ARG 1 recipe METHOD method_48440 get (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;)Ljava/util/Optional; + ARG 0 registriesLookup ARG 1 stack METHOD method_48441 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id diff --git a/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping b/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping index 2b3376b90a..63d3a15f4e 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_8057 net/minecraft/item/trim/ArmorTrimPatterns METHOD method_48447 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z ARG 1 pattern METHOD method_48448 get (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;)Ljava/util/Optional; + ARG 0 registriesLookup ARG 1 stack METHOD method_48449 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id diff --git a/mappings/net/minecraft/loot/LootTables.mapping b/mappings/net/minecraft/loot/LootTables.mapping index 315991682d..71410f6d57 100644 --- a/mappings/net/minecraft/loot/LootTables.mapping +++ b/mappings/net/minecraft/loot/LootTables.mapping @@ -39,3 +39,4 @@ CLASS net/minecraft/class_39 net/minecraft/loot/LootTables ARG 0 id METHOD method_270 getAll ()Ljava/util/Set; METHOD method_271 registerLootTable (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; + ARG 0 key diff --git a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping index 547637f218..2eb8282a49 100644 --- a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_4568 net/minecraft/loot/condition/ReferenceLootConditi FIELD field_45861 CODEC Lcom/mojang/serialization/Codec; METHOD comp_1869 id ()Lnet/minecraft/class_5321; METHOD method_35555 builder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5341$class_210; + ARG 0 key + METHOD method_51230 (Lnet/minecraft/class_58;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 entry METHOD method_53411 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping index 34e6f8c936..f9307a25b7 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -1,11 +1,12 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext - FIELD field_44490 dataLookup Lnet/minecraft/class_7871$class_7872; + FIELD field_44490 lookup Lnet/minecraft/class_7871$class_7872; FIELD field_44881 parameters Lnet/minecraft/class_8567; FIELD field_923 random Lnet/minecraft/class_5819; FIELD field_927 activeEntries Ljava/util/Set; METHOD (Lnet/minecraft/class_8567;Lnet/minecraft/class_5819;Lnet/minecraft/class_7871$class_7872;)V ARG 1 parameters ARG 2 random + ARG 3 lookup METHOD method_294 getRandom ()Lnet/minecraft/class_5819; METHOD method_295 markInactive (Lnet/minecraft/class_47$class_8487;)V ARG 1 entry @@ -22,7 +23,7 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext METHOD method_302 getLuck ()F METHOD method_35508 requireParameter (Lnet/minecraft/class_169;)Ljava/lang/Object; ARG 1 parameter - METHOD method_51183 getDataLookup ()Lnet/minecraft/class_7871$class_7872; + METHOD method_51183 getLookup ()Lnet/minecraft/class_7871$class_7872; METHOD method_51184 isActive (Lnet/minecraft/class_47$class_8487;)Z ARG 1 entry METHOD method_51185 table (Lnet/minecraft/class_52;)Lnet/minecraft/class_47$class_8487; diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index eb838963ca..d97d3fd8cb 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry ARG 4 conditions ARG 5 functions METHOD method_428 builder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_85$class_86; + ARG 0 key METHOD method_430 (Lnet/minecraft/class_5321;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality @@ -15,10 +16,14 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry ARG 4 functions METHOD method_51222 (Lnet/minecraft/class_58;Lnet/minecraft/class_52;)V ARG 1 table + METHOD method_51223 (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;)V + ARG 1 key METHOD method_53293 (Lnet/minecraft/class_83;)Lcom/mojang/datafixers/util/Either; ARG 0 entry METHOD method_53294 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_57630 (Lnet/minecraft/class_47;Lnet/minecraft/class_5321;)Lnet/minecraft/class_52; + ARG 1 key METHOD method_57631 builder (Lnet/minecraft/class_52;)Lnet/minecraft/class_85$class_86; ARG 0 table METHOD method_57632 (Lnet/minecraft/class_52;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; @@ -26,5 +31,7 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry ARG 2 quality ARG 3 conditions ARG 4 functions + METHOD method_57633 (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 entry METHOD method_57634 (Lnet/minecraft/class_52;)Lnet/minecraft/class_52; ARG 0 table diff --git a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index ddf0b69a4a..34fe67a94e 100644 --- a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc METHOD (Ljava/util/List;Lnet/minecraft/class_6862;Lnet/minecraft/class_6880;BIZ)V ARG 1 conditions ARG 2 destination + ARG 3 decoration ARG 4 zoom ARG 5 searchRadius ARG 6 skipExistingChunks @@ -38,6 +39,7 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc METHOD method_35521 searchRadius (I)Lnet/minecraft/class_111$class_112; ARG 1 searchRadius METHOD method_499 withDecoration (Lnet/minecraft/class_6880;)Lnet/minecraft/class_111$class_112; + ARG 1 decoration METHOD method_500 withZoom (B)Lnet/minecraft/class_111$class_112; ARG 1 zoom METHOD method_502 withDestination (Lnet/minecraft/class_6862;)Lnet/minecraft/class_111$class_112; diff --git a/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping b/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping index 20e1fab489..1781ca5512 100644 --- a/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping @@ -4,7 +4,9 @@ CLASS net/minecraft/class_8492 net/minecraft/loot/function/ReferenceLootFunction FIELD field_45828 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Lnet/minecraft/class_5321;)V ARG 1 conditions + ARG 2 name METHOD method_51224 builder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_120$class_121; + ARG 0 name METHOD method_51225 (Lnet/minecraft/class_5321;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_53340 (Lnet/minecraft/class_8492;)Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index 24dce28e86..5a7795bf74 100644 --- a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -2,8 +2,11 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction FIELD field_16231 lore Ljava/util/List; FIELD field_16233 entity Ljava/util/Optional; FIELD field_45847 CODEC Lcom/mojang/serialization/Codec; + FIELD field_50024 operation Lnet/minecraft/class_9368; METHOD (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_9368;Ljava/util/Optional;)V ARG 1 conditions + ARG 2 lore + ARG 3 operation ARG 4 entity METHOD method_35544 builder ()Lnet/minecraft/class_3671$class_6159; METHOD method_53381 (Lnet/minecraft/class_47$class_50;)Ljava/util/Set; @@ -24,7 +27,10 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction CLASS class_6159 Builder FIELD field_31867 target Ljava/util/Optional; FIELD field_31868 lore Lcom/google/common/collect/ImmutableList$Builder; + FIELD field_50025 operation Lnet/minecraft/class_9368; METHOD method_35546 target (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_3671$class_6159; ARG 1 target METHOD method_35547 lore (Lnet/minecraft/class_2561;)Lnet/minecraft/class_3671$class_6159; ARG 1 lore + METHOD method_58460 operation (Lnet/minecraft/class_9368;)Lnet/minecraft/class_3671$class_6159; + ARG 1 operation diff --git a/mappings/net/minecraft/loot/function/SetWrittenBookPagesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetWrittenBookPagesLootFunction.mapping index bef074c2fe..e268021904 100644 --- a/mappings/net/minecraft/loot/function/SetWrittenBookPagesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetWrittenBookPagesLootFunction.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_9378 net/minecraft/loot/function/SetWrittenBookPagesLo FIELD field_49889 CODEC Lcom/mojang/serialization/Codec; FIELD field_49890 pages Ljava/util/List; FIELD field_49891 operation Lnet/minecraft/class_9368; + FIELD field_50026 TEXT_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_9368;)V ARG 1 conditions ARG 2 pages @@ -14,3 +15,7 @@ CLASS net/minecraft/class_9378 net/minecraft/loot/function/SetWrittenBookPagesLo ARG 0 instance METHOD method_58224 (Lnet/minecraft/class_9378;)Ljava/util/List; ARG 0 function + METHOD method_58461 (Lnet/minecraft/class_2561;)Lcom/mojang/serialization/DataResult; + ARG 0 text + METHOD method_58462 (Lnet/minecraft/class_2561;Ljava/lang/Object;)Lnet/minecraft/class_2561; + ARG 1 value diff --git a/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping b/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping index a058073722..42ce64da19 100644 --- a/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_9429 net/minecraft/loot/function/ToggleTooltipsLootFun METHOD method_58463 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9429$class_9430;Ljava/lang/Boolean;)V ARG 1 componentType ARG 2 showInTooltip + METHOD method_58464 (Lnet/minecraft/class_9429$class_9430;)Lnet/minecraft/class_9429$class_9430; + ARG 0 toggle METHOD method_58465 (Lnet/minecraft/class_9429;)Ljava/util/Map; ARG 0 lootFunction METHOD method_58466 (Lnet/minecraft/class_9331;)Lcom/mojang/serialization/DataResult; diff --git a/mappings/net/minecraft/loot/number/provider/StorageLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/StorageLootNumberProvider.mapping similarity index 83% rename from mappings/net/minecraft/loot/number/provider/StorageLootNumberProvider.mapping rename to mappings/net/minecraft/loot/provider/number/StorageLootNumberProvider.mapping index c22b444ff0..12f33a2132 100644 --- a/mappings/net/minecraft/loot/number/provider/StorageLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/StorageLootNumberProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9432 net/minecraft/loot/number/provider/StorageLootNumberProvider +CLASS net/minecraft/class_9432 net/minecraft/loot/provider/number/StorageLootNumberProvider FIELD field_50033 CODEC Lcom/mojang/serialization/Codec; METHOD method_58470 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index 7804e4914c..22e29fa12f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -1,14 +1,12 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket - FIELD comp_2273 icons Ljava/util/Optional; FIELD comp_2274 updateData Ljava/util/Optional; FIELD field_47938 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_9209;BZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V ARG 1 mapId ARG 2 scale ARG 3 locked - ARG 4 icons + ARG 4 decorations ARG 5 updateData - METHOD comp_2273 icons ()Ljava/util/Optional; METHOD comp_2274 updateData ()Ljava/util/Optional; METHOD method_11642 apply (Lnet/minecraft/class_22;)V ARG 1 mapState diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index baaf1e34b0..546b5fb9ff 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate FIELD comp_1816 nbt Lnet/minecraft/class_2487; FIELD field_45768 CODEC Lcom/mojang/serialization/Codec; FIELD field_49244 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_50007 STRINGIFIED_CDEC Lcom/mojang/serialization/Codec; + FIELD field_50008 INLINE_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD comp_1816 nbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping index 8b4342faf0..7a0d444c9d 100644 --- a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping +++ b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping @@ -3,19 +3,6 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate FIELD field_38726 FISHING_HOOK Lcom/mojang/serialization/MapCodec; FIELD field_38727 PLAYER Lcom/mojang/serialization/MapCodec; FIELD field_38728 SLIME Lcom/mojang/serialization/MapCodec; - FIELD field_38729 CAT Lnet/minecraft/class_7378$class_9419; - FIELD field_38730 FROG Lnet/minecraft/class_7378$class_9419; - FIELD field_41534 AXOLOTL Lnet/minecraft/class_7378$class_7380; - FIELD field_41535 BOAT Lnet/minecraft/class_7378$class_7380; - FIELD field_41536 FOX Lnet/minecraft/class_7378$class_7380; - FIELD field_41537 MOOSHROOM Lnet/minecraft/class_7378$class_7380; - FIELD field_41538 PAINTING Lnet/minecraft/class_7378$class_9419; - FIELD field_41539 RABBIT Lnet/minecraft/class_7378$class_7380; - FIELD field_41540 HORSE Lnet/minecraft/class_7378$class_7380; - FIELD field_41541 LLAMA Lnet/minecraft/class_7378$class_7380; - FIELD field_41542 VILLAGER Lnet/minecraft/class_7378$class_7380; - FIELD field_41543 PARROT Lnet/minecraft/class_7378$class_7380; - FIELD field_41544 TROPICAL_FISH Lnet/minecraft/class_7378$class_7380; METHOD method_43100 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity METHOD method_43102 (Lnet/minecraft/class_1297;)Ljava/util/Optional; @@ -43,7 +30,9 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate METHOD method_47839 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity METHOD method_58153 catVariant (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7376; + ARG 0 catVariant METHOD method_58154 frogVariant (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7376; + ARG 0 frogVariant METHOD method_58155 register (Ljava/lang/String;Lnet/minecraft/class_7378$class_7380;)Lnet/minecraft/class_7378$class_7380; ARG 0 id ARG 1 type @@ -51,6 +40,12 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate ARG 0 id ARG 1 codec METHOD method_58157 getDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/MapCodec; + ARG 0 registry + METHOD method_58351 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_58352 register (Ljava/lang/String;Lnet/minecraft/class_7378$class_9419;)Lnet/minecraft/class_7378$class_9419; + ARG 0 id + ARG 1 type CLASS class_7380 VariantType FIELD field_38741 variantGetter Ljava/util/function/Function; FIELD field_49794 codec Lcom/mojang/serialization/MapCodec; @@ -75,3 +70,24 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate FIELD field_49796 variant Ljava/lang/Object; METHOD (Lnet/minecraft/class_7378$class_7380;Ljava/lang/Object;)V ARG 2 variant + CLASS class_9419 DynamicVariantType + FIELD field_49974 codec Lcom/mojang/serialization/MapCodec; + FIELD field_49975 variantGetter Ljava/util/function/Function; + METHOD (Lnet/minecraft/class_5321;Ljava/util/function/Function;)V + ARG 1 registryRef + ARG 2 variantGetter + METHOD method_58353 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance + METHOD method_58354 create (Lnet/minecraft/class_5321;Ljava/util/function/Function;)Lnet/minecraft/class_7378$class_9419; + ARG 0 registryRef + ARG 1 variantGetter + METHOD method_58355 (Lnet/minecraft/class_7378$class_9419$class_9420;)Lnet/minecraft/class_6885; + ARG 0 type + METHOD method_58356 createPredicate (Lnet/minecraft/class_6885;)Lnet/minecraft/class_7376; + ARG 1 variants + METHOD method_58357 (Lnet/minecraft/class_6885;)Lnet/minecraft/class_7378$class_9419$class_9420; + ARG 1 entries + CLASS class_9420 DynamicPredicate + FIELD field_49977 variants Lnet/minecraft/class_6885; + METHOD (Lnet/minecraft/class_7378$class_9419;Lnet/minecraft/class_6885;)V + ARG 2 variants diff --git a/mappings/net/minecraft/predicate/entity/LootContextPredicateValidator.mapping b/mappings/net/minecraft/predicate/entity/LootContextPredicateValidator.mapping index 694a6ade62..825eb1eef7 100644 --- a/mappings/net/minecraft/predicate/entity/LootContextPredicateValidator.mapping +++ b/mappings/net/minecraft/predicate/entity/LootContextPredicateValidator.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_8944 net/minecraft/predicate/entity/LootContextPredica FIELD field_47236 conditionsLookup Lnet/minecraft/class_7871$class_7872; METHOD (Lnet/minecraft/class_8942;Lnet/minecraft/class_7871$class_7872;)V ARG 1 errorReporter + ARG 2 conditionsLookup METHOD method_54961 validate (Lnet/minecraft/class_5258;Lnet/minecraft/class_176;Ljava/lang/String;)V ARG 1 predicate ARG 2 type diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping index 8f56b16582..fb981b99b6 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe COMMENT COMMENT

The returned stack should not be modified. To obtain the actual output, COMMENT call {@link #craft(Inventory, DynamicRegistryManager)}. + ARG 1 registriesLookup METHOD method_8111 getRemainder (Lnet/minecraft/class_1263;)Lnet/minecraft/class_2371; COMMENT {@return the remaining stacks to be left in the {@code inventory} after the recipe is used} COMMENT At each index, the remainder item stack in the list should correspond to the original diff --git a/mappings/net/minecraft/recipe/RecipeCache.mapping b/mappings/net/minecraft/recipe/RecipeCache.mapping index 06d43103c9..80b3ea1dcb 100644 --- a/mappings/net/minecraft/recipe/RecipeCache.mapping +++ b/mappings/net/minecraft/recipe/RecipeCache.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_8884 net/minecraft/recipe/RecipeCache ARG 2 inputInventory METHOD method_54471 cache (Ljava/util/List;Lnet/minecraft/class_8786;)V ARG 1 inputStacks + ARG 2 recipe CLASS class_8885 CachedRecipe METHOD method_54472 matches (Ljava/util/List;)Z ARG 1 inputs diff --git a/mappings/net/minecraft/registry/RegistryKey.mapping b/mappings/net/minecraft/registry/RegistryKey.mapping index 73fb3bbb60..58150af9e5 100644 --- a/mappings/net/minecraft/registry/RegistryKey.mapping +++ b/mappings/net/minecraft/registry/RegistryKey.mapping @@ -62,6 +62,7 @@ CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey ARG 0 registry METHOD method_56039 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; ARG 1 id + METHOD method_58273 getRegistryRef ()Lnet/minecraft/class_5321; CLASS class_7892 RegistryIdPair FIELD comp_1150 id Lnet/minecraft/class_2960; METHOD comp_1150 id ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/registry/ReloadableRegistries.mapping b/mappings/net/minecraft/registry/ReloadableRegistries.mapping index 517ecd1ae7..db0ba8a116 100644 --- a/mappings/net/minecraft/registry/ReloadableRegistries.mapping +++ b/mappings/net/minecraft/registry/ReloadableRegistries.mapping @@ -2,6 +2,16 @@ CLASS net/minecraft/class_9383 net/minecraft/registry/ReloadableRegistries FIELD field_49916 LOGGER Lorg/slf4j/Logger; FIELD field_49917 GSON Lcom/google/gson/Gson; FIELD field_49918 DEFAULT_REGISTRY_ENTRY_INFO Lnet/minecraft/class_9248; + METHOD method_58276 (Lnet/minecraft/class_6903;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_8490;)Ljava/util/concurrent/CompletableFuture; + ARG 3 type + METHOD method_58277 prepare (Lnet/minecraft/class_8490;Lnet/minecraft/class_6903;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 type + ARG 1 ops + ARG 2 resourceManager + ARG 3 prepareExecutor + METHOD method_58278 (Lnet/minecraft/class_8490;Lnet/minecraft/class_6903;Lnet/minecraft/class_2385;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V + ARG 3 id + ARG 4 json METHOD method_58280 (Lnet/minecraft/class_8490;Lnet/minecraft/class_58;Lnet/minecraft/class_6880$class_6883;)V ARG 2 entry METHOD method_58281 validateLootData (Lnet/minecraft/class_58;Lnet/minecraft/class_8490;Lnet/minecraft/class_5455;)V @@ -13,11 +23,25 @@ CLASS net/minecraft/class_9383 net/minecraft/registry/ReloadableRegistries METHOD method_58283 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 path ARG 1 message - CLASS class_9384 + METHOD method_58284 reload (Lnet/minecraft/class_7780;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 dynamicRegistries + ARG 1 resourceManager + ARG 2 prepareExecutor + METHOD method_58285 apply (Lnet/minecraft/class_7780;Ljava/util/List;)Lnet/minecraft/class_7780; + ARG 0 dynamicRegistries + ARG 1 registries + METHOD method_58286 (Lnet/minecraft/class_2385;Lnet/minecraft/class_8490;Lnet/minecraft/class_2960;Ljava/lang/Object;)V + ARG 3 value + METHOD method_58287 with (Lnet/minecraft/class_7780;Ljava/util/List;)Lnet/minecraft/class_7780; + ARG 0 dynamicRegistries + ARG 1 registries + METHOD method_58288 (Lnet/minecraft/class_7780;Ljava/util/List;)Lnet/minecraft/class_7780; + ARG 1 registries + CLASS class_9384 ReloadableWrapperLookup FIELD field_49919 registryManager Lnet/minecraft/class_5455; METHOD (Lnet/minecraft/class_5455;)V ARG 1 registryManager - CLASS class_9385 + CLASS class_9385 Lookup FIELD field_49920 registryManager Lnet/minecraft/class_5455$class_6890; METHOD (Lnet/minecraft/class_5455$class_6890;)V ARG 1 registryManager diff --git a/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping index 37b5d9e23f..cb8b156a9b 100644 --- a/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping @@ -48,10 +48,12 @@ CLASS net/minecraft/class_6885 net/minecraft/registry/entry/RegistryEntryList METHOD method_45925 getTagKey ()Ljava/util/Optional; METHOD method_46768 ownerEquals (Lnet/minecraft/class_7876;)Z ARG 1 owner + METHOD method_58563 empty ()Lnet/minecraft/class_6885; CLASS class_6886 Direct COMMENT A direct registry entry list that holds the values directly, instead of using tags. FIELD field_36457 entries Ljava/util/List; FIELD field_36458 entrySet Ljava/util/Set; + FIELD field_50070 EMPTY Lnet/minecraft/class_6885$class_6886; METHOD (Ljava/util/List;)V ARG 1 entries METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping b/mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping index 1855ca5583..a337b5b2db 100644 --- a/mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping +++ b/mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping @@ -27,3 +27,4 @@ CLASS net/minecraft/class_7699 net/minecraft/resource/featuretoggle/FeatureSet ARG 1 feature METHOD method_45404 combine (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7699; ARG 1 features + METHOD method_58398 isEmpty ()Z diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping index 308f261dda..0589453db6 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_25342 functionLoader Lnet/minecraft/class_5349; FIELD field_36491 LOGGER Lorg/slf4j/Logger; FIELD field_48785 registryLookup Lnet/minecraft/class_5350$class_9180; + FIELD field_49921 reloadableRegistries Lnet/minecraft/class_9383$class_9385; 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 @@ -27,6 +28,7 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents COMMENT COMMENT @see MinecraftServer#reloadResources ARG 0 manager + ARG 1 dynamicRegistries ARG 2 enabledFeatures ARG 3 environment ARG 4 functionPermissionLevel @@ -54,6 +56,9 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents METHOD method_42095 (Lnet/minecraft/class_5350;Ljava/lang/Object;Ljava/lang/Throwable;)V ARG 1 void_ ARG 2 throwable + METHOD method_58296 (Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;ILnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Lnet/minecraft/class_7780;)Ljava/util/concurrent/CompletionStage; + ARG 6 reloadedDynamicRegistries + METHOD method_58297 getReloadableRegistries ()Lnet/minecraft/class_9383$class_9385; CLASS class_7158 EntryListCreationPolicy COMMENT A policy on how to handle a {@link net.minecraft.registry.tag.TagKey} that does not resolve COMMENT to an existing tag (unrecognized tag) in {@link diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 4bd33a399b..f690449a3a 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -144,6 +144,8 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_27903 adjustTrackingDistance (I)I ARG 1 initialDistance METHOD method_29435 getWorldRegistryKeys ()Ljava/util/Set; + METHOD method_29437 (Lcom/google/common/collect/ImmutableList;)Ljava/util/concurrent/CompletionStage; + ARG 1 resourcePacks METHOD method_29439 reloadResources (Ljava/util/Collection;)Ljava/util/concurrent/CompletableFuture; COMMENT Reloads this server's data packs. COMMENT @@ -463,6 +465,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 pos METHOD method_57822 onChunkSaveFailure (Lnet/minecraft/class_1923;)V ARG 1 pos + METHOD method_58576 getReloadableRegistries ()Lnet/minecraft/class_9383$class_9385; CLASS class_6414 DebugStart FIELD field_33980 time J FIELD field_33981 tick I diff --git a/mappings/net/minecraft/server/SaveLoading.mapping b/mappings/net/minecraft/server/SaveLoading.mapping index 3486f64fa6..b9e7b7459c 100644 --- a/mappings/net/minecraft/server/SaveLoading.mapping +++ b/mappings/net/minecraft/server/SaveLoading.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_7237 net/minecraft/server/SaveLoading METHOD method_42096 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V ARG 1 dataPackContents ARG 2 throwable + METHOD method_42097 (Lnet/minecraft/class_7237$class_7239;Lnet/minecraft/class_6860;Lnet/minecraft/class_7780;Lnet/minecraft/class_7237$class_7661;Lnet/minecraft/class_5350;)Ljava/lang/Object; + ARG 4 dataPackContents METHOD method_42098 load (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Lnet/minecraft/class_7237$class_7239;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 serverConfig ARG 1 loadContextSupplier diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index f8ee28625e..6ec0182cb9 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -198,6 +198,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 1 result METHOD method_22829 testLootCondition (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;)Z ARG 0 source + ARG 1 lootCondition METHOD method_22830 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context METHOD method_22831 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/server/command/LootCommand.mapping b/mappings/net/minecraft/server/command/LootCommand.mapping index d90fbf536b..c7eb117363 100644 --- a/mappings/net/minecraft/server/command/LootCommand.mapping +++ b/mappings/net/minecraft/server/command/LootCommand.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand ARG 2 stack METHOD method_13180 getFeedbackMessageSingle (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_6880;Lnet/minecraft/class_8567;Lnet/minecraft/class_3039$class_3041;)I ARG 0 context + ARG 1 lootTable ARG 2 lootContextParameters ARG 3 constructor METHOD method_13181 (Lnet/minecraft/class_2168;)Z @@ -56,11 +57,13 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand ARG 3 messageSender METHOD method_13197 executeLoot (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_6880;Lnet/minecraft/class_3039$class_3041;)I ARG 0 context + ARG 1 lootTable ARG 2 constructor METHOD method_13198 (Lnet/minecraft/class_3039$class_3041;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context METHOD method_13199 executeFish (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_3039$class_3041;)I ARG 0 context + ARG 1 lootTable ARG 2 pos ARG 3 stack ARG 4 constructor @@ -102,6 +105,7 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand METHOD method_13212 sendDroppedFeedback (Lnet/minecraft/class_2168;Ljava/util/List;Lnet/minecraft/class_5321;)V ARG 0 source ARG 1 stacks + ARG 2 lootTable METHOD method_13213 sendDroppedFeedback (Lnet/minecraft/class_2168;Ljava/util/List;)V ARG 0 source ARG 1 stacks diff --git a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping index 9df26eca08..3194c71a03 100644 --- a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping @@ -42,6 +42,7 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator METHOD method_49885 createArchaeologyStructureProcessor (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_5321;)Lnet/minecraft/class_3491; ARG 0 baseBlock ARG 1 suspiciousBlock + ARG 2 lootTable CLASS class_3410 Piece FIELD field_14524 integrity F FIELD field_14525 large Z diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index 6c7cdb8a76..ea4f72220e 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 4 x ARG 5 y ARG 6 z + ARG 7 lootTable METHOD method_14916 orientateChest (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 0 world ARG 1 pos @@ -53,6 +54,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 2 boundingBox ARG 3 random ARG 4 pos + ARG 5 lootTable ARG 6 block METHOD method_14922 translate (III)V ARG 1 x @@ -80,6 +82,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 5 y ARG 6 z ARG 7 facing + ARG 8 lootTable METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 structureAccessor diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping index 0c5e63d06d..0988c6e99e 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping @@ -8,4 +8,5 @@ CLASS net/minecraft/class_5469 net/minecraft/structure/processor/StructureProces METHOD method_46846 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 processorListRegisterable METHOD method_51464 createTrailRuinsTowerTopProcessor (Lnet/minecraft/class_5321;I)Lnet/minecraft/class_8243; + ARG 0 lootTable ARG 1 limit diff --git a/mappings/net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier.mapping b/mappings/net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier.mapping index fa7b3e660e..4454dae94d 100644 --- a/mappings/net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier.mapping +++ b/mappings/net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_8244 net/minecraft/structure/rule/blockentity/AppendLo FIELD field_43336 CODEC Lcom/mojang/serialization/Codec; FIELD field_43337 LOGGER Lorg/slf4j/Logger; FIELD field_43338 lootTable Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_5321;)V + ARG 1 lootTable METHOD method_49893 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_49894 (Lnet/minecraft/class_8244;)Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/util/Rarity.mapping b/mappings/net/minecraft/util/Rarity.mapping index 3a99550917..7c391198df 100644 --- a/mappings/net/minecraft/util/Rarity.mapping +++ b/mappings/net/minecraft/util/Rarity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1814 net/minecraft/util/Rarity FIELD field_50001 CODEC Lcom/mojang/serialization/Codec; - FIELD field_50002 idToValue Ljava/util/function/IntFunction; + FIELD field_50002 ID_TO_VALUE Ljava/util/function/IntFunction; FIELD field_50003 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_50004 index I FIELD field_50005 name Ljava/lang/String; diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index d0665b53f0..51142305f1 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -313,13 +313,16 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_57107 registryValueToString (Lnet/minecraft/class_2378;Ljava/lang/Object;)Ljava/lang/String; ARG 0 registry ARG 1 value - METHOD method_57108 listWith (Ljava/util/List;Ljava/lang/Object;)Ljava/util/List; + METHOD method_57108 withAppended (Ljava/util/List;Ljava/lang/Object;)Ljava/util/List; ARG 0 list ARG 1 valueToAppend METHOD method_57109 mapWith (Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map; ARG 0 map ARG 1 keyToAppend ARG 2 valueToAppend + METHOD method_58272 withPrepended (Ljava/lang/Object;Ljava/util/List;)Ljava/util/List; + ARG 0 valueToPrepend + ARG 1 list METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; COMMENT {@return the item preceding {@code object} in {@code iterable}} COMMENT diff --git a/mappings/net/minecraft/util/collection/ListOperation.mapping b/mappings/net/minecraft/util/collection/ListOperation.mapping index d6d1c76297..6ea9105807 100644 --- a/mappings/net/minecraft/util/collection/ListOperation.mapping +++ b/mappings/net/minecraft/util/collection/ListOperation.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_9368 net/minecraft/util/collection/ListOperation - METHOD method_58191 getType ()Lnet/minecraft/class_9368$class_9373; + METHOD method_58191 getMode ()Lnet/minecraft/class_9368$class_9373; METHOD method_58192 apply (Ljava/util/List;Ljava/util/List;I)Ljava/util/List; ARG 1 current ARG 2 values ARG 3 maxSize + METHOD method_58456 createCodec (I)Lcom/mojang/serialization/MapCodec; + ARG 0 maxSize + METHOD method_58458 (ILnet/minecraft/class_9368;)Lcom/mojang/serialization/DataResult; + ARG 1 operation + METHOD method_58459 (Lnet/minecraft/class_9368$class_9373;)Lcom/mojang/serialization/Codec; + ARG 0 mode CLASS class_9369 Append FIELD field_49847 INSTANCE Lnet/minecraft/class_9368$class_9369; FIELD field_49848 CODEC Lcom/mojang/serialization/MapCodec; @@ -23,7 +29,7 @@ CLASS net/minecraft/class_9368 net/minecraft/util/collection/ListOperation ARG 1 offset METHOD method_58196 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - CLASS class_9373 Type + CLASS class_9373 Mode FIELD field_49860 CODEC Lcom/mojang/serialization/Codec; FIELD field_49862 id Ljava/lang/String; FIELD field_49863 codec Lcom/mojang/serialization/MapCodec; diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 0cdc55c2e2..dd1b481406 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -69,12 +69,13 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers FIELD field_18590 maxUses I FIELD field_18591 experience I FIELD field_37051 nameKey Ljava/lang/String; - FIELD field_7473 iconType Lnet/minecraft/class_6880; + FIELD field_7473 decoration Lnet/minecraft/class_6880; FIELD field_7474 structure Lnet/minecraft/class_6862; METHOD (ILnet/minecraft/class_6862;Ljava/lang/String;Lnet/minecraft/class_6880;II)V ARG 1 price ARG 2 structure ARG 3 nameKey + ARG 4 decoration ARG 5 maxUses ARG 6 experience CLASS class_4160 SellDyedArmorFactory