From 8c992c5e9a56f839cbe387038b264a1129cc4583 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 18 Dec 2023 15:11:52 +0000 Subject: [PATCH 01/47] 23w51a --- build.gradle | 2 +- .../net/minecraft/block/AbstractBlock.mapping | 23 ---- .../minecraft/block/AbstractSignBlock.mapping | 2 - mappings/net/minecraft/block/BedBlock.mapping | 2 - .../net/minecraft/block/BeehiveBlock.mapping | 2 - .../minecraft/block/CandleCakeBlock.mapping | 5 +- .../block/ChiseledBookshelfBlock.mapping | 3 +- .../minecraft/block/EnderChestBlock.mapping | 4 - .../net/minecraft/block/FlowerBlock.mapping | 6 +- .../net/minecraft/block/PumpkinBlock.mapping | 2 - mappings/net/minecraft/block/TntBlock.mapping | 2 - .../minecraft/block/WitherRoseBlock.mapping | 2 - .../block/cauldron/CauldronBehavior.mapping | 32 +++--- .../block/dispenser/DispenserBehavior.mapping | 12 +- .../block/entity/BeaconBlockEntity.mapping | 18 ++- mappings/net/minecraft/client/Mouse.mapping | 3 +- .../client/gui/hud/BossBarHud.mapping | 1 - .../minecraft/client/gui/hud/ChatHud.mapping | 2 +- .../client/gui/hud/InGameHud.mapping | 18 +-- .../client/gui/screen/ChatScreen.mapping | 2 +- .../client/gui/screen/TitleScreen.mapping | 3 - .../gui/screen/ingame/BeaconScreen.mapping | 18 ++- .../multiplayer/MultiplayerScreen.mapping | 3 - .../MultiplayerServerListWidget.mapping | 2 - .../ClientPlayerInteractionManager.mapping | 2 - .../MultiplayerServerListPinger.mapping | 2 +- .../client/network/ServerInfo.mapping | 2 - .../client/render/BackgroundRenderer.mapping | 2 +- .../entity/BreezeEntityRenderer.mapping | 1 - .../render/entity/EntityRenderer.mapping | 2 +- .../feature/BreezeEyesFeatureRenderer.mapping | 6 - .../feature/BreezeWindFeatureRenderer.mapping | 4 +- .../entity/feature/FeatureRenderer.mapping | 2 - .../entity/model/BreezeEntityModel.mapping | 10 +- .../entity/model/EntityModelLayers.mapping | 2 - .../entity/model/WolfEntityModel.mapping | 2 +- .../texture/StatusEffectSpriteManager.mapping | 3 +- .../client/world/ClientWorld.mapping | 3 - .../VanillaGameEventTagProvider.mapping | 4 +- .../datafixer/fix/JigsawBlockNameFix.mapping | 8 -- .../entity/AreaEffectCloudEntity.mapping | 7 +- mappings/net/minecraft/entity/Entity.mapping | 28 +---- .../minecraft/entity/EntityDimensions.mapping | 9 +- .../net/minecraft/entity/LivingEntity.mapping | 25 +---- .../ai/brain/task/BreezeJumpTask.mapping | 7 -- .../entity/ai/goal/GoalSelector.mapping | 6 - .../attribute/AttributeContainer.mapping | 26 +---- .../AttributeModifierCreator.mapping | 4 - .../DefaultAttributeContainer.mapping | 34 ++---- .../attribute/EntityAttributeInstance.mapping | 7 +- .../entity/attribute/EntityAttributes.mapping | 4 +- .../entity/effect/StatusEffect.mapping | 26 ++--- .../effect/StatusEffectInstance.mapping | 78 ++----------- .../entity/effect/StatusEffectUtil.mapping | 2 +- .../entity/effect/StatusEffects.mapping | 2 +- .../entity/mob/AbstractPiglinEntity.mapping | 1 - .../minecraft/entity/mob/BreezeBrain.mapping | 2 - .../minecraft/entity/mob/BreezeEntity.mapping | 4 - .../entity/mob/PathAwareEntity.mapping | 2 - .../minecraft/entity/mob/SpiderEntity.mapping | 2 +- .../entity/mob/ZombifiedPiglinEntity.mapping | 2 - .../passive/AbstractHorseEntity.mapping | 6 +- .../entity/passive/SnowGolemEntity.mapping | 1 - .../entity/player/PlayerEntity.mapping | 2 - .../entity/projectile/ArrowEntity.mapping | 2 +- .../PersistentProjectileEntity.mapping | 2 +- .../projectile/thrown/PotionEntity.mapping | 3 +- .../vehicle/AbstractMinecartEntity.mapping | 2 - .../net/minecraft/item/HorseArmorItem.mapping | 6 +- mappings/net/minecraft/item/ItemStack.mapping | 3 +- .../function/SetPotionLootFunction.mapping | 5 +- .../SetStewEffectLootFunction.mapping | 3 +- .../c2s/play/UpdateBeaconC2SPacket.mapping | 18 ++- .../play/EntityAttributesS2CPacket.mapping | 15 ++- .../play/EntityStatusEffectS2CPacket.mapping | 13 +-- .../RemoveEntityStatusEffectS2CPacket.mapping | 10 +- mappings/net/minecraft/potion/Potion.mapping | 9 +- .../net/minecraft/potion/PotionUtil.mapping | 13 +-- mappings/net/minecraft/potion/Potions.mapping | 6 +- .../entity/EntityEffectPredicate.mapping | 6 +- .../predicate/item/ItemPredicate.mapping | 3 +- .../recipe/BrewingRecipeRegistry.mapping | 20 ++-- .../net/minecraft/registry/Registries.mapping | 106 ++++++++---------- .../registry/tag/TagManagerLoader.mapping | 2 - .../screen/BeaconScreenHandler.mapping | 9 +- .../minecraft/server/PlayerManager.mapping | 2 +- .../server/command/LocateCommand.mapping | 4 - .../server/function/CommandFunction.mapping | 3 +- .../server/function/FunctionBuilder.mapping | 2 +- .../minecraft/server/function/Macro.mapping | 9 +- .../server/network/DebugInfoSender.mapping | 2 +- .../network/ServerPlayNetworkHandler.mapping | 1 - .../net/minecraft/test/TestContext.mapping | 3 +- .../packageinfo/PackageInfo9074.mapping | 1 + .../net/minecraft/village/TradeOffers.mapping | 8 +- .../net/minecraft/world/WorldAccess.mapping | 8 +- .../net/minecraft/world/WorldEvents.mapping | 8 -- .../minecraft/world/WorldSaveHandler.mapping | 3 +- .../minecraft/world/event/GameEvent.mapping | 18 ++- .../minecraft/world/event/Vibrations.mapping | 21 ++-- .../listener/GameEventDispatchManager.mapping | 4 +- .../listener/GameEventDispatcher.mapping | 2 +- .../event/listener/GameEventListener.mapping | 2 +- .../world/event/listener/Vibration.mapping | 6 +- .../world/poi/PointOfInterestSet.mapping | 2 - 105 files changed, 267 insertions(+), 609 deletions(-) delete mode 100644 mappings/net/minecraft/datafixer/fix/JigsawBlockNameFix.mapping delete mode 100644 mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9074.mapping diff --git a/build.gradle b/build.gradle index e925b3427e..be4d611567 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20.4" +def minecraft_version = "23w51a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index da053704c6..8ff7a65557 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -472,24 +472,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 world ARG 3 pos ARG 4 context - METHOD method_9534 onUse (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; - COMMENT Called when this block is used by a player. - COMMENT This, by default, is bound to using the right mouse button. - COMMENT - COMMENT

This method is called on both the logical client and logical server, so take caution when overriding this method. - COMMENT The logical side can be checked using {@link net.minecraft.world.World#isClient() world.isClient()}. - COMMENT - COMMENT

If the action result is successful on a logical client, then the action will be sent to the logical server for processing. - COMMENT - COMMENT @return an action result that specifies if using the block was successful. - COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#onUse} instead. See why these methods are deprecated. - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 player - ARG 5 hand - ARG 6 hit METHOD method_9535 getRenderingSeed (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)J COMMENT {@return the seed value for rendering} COMMENT @@ -1081,11 +1063,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 world ARG 2 pos ARG 3 direction - METHOD method_26174 onUse (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; - ARG 1 world - ARG 2 player - ARG 3 hand - ARG 4 hit METHOD method_26175 onProjectileHit (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_3965;Lnet/minecraft/class_1676;)V ARG 1 world ARG 2 state diff --git a/mappings/net/minecraft/block/AbstractSignBlock.mapping b/mappings/net/minecraft/block/AbstractSignBlock.mapping index d609abc798..85efdb6024 100644 --- a/mappings/net/minecraft/block/AbstractSignBlock.mapping +++ b/mappings/net/minecraft/block/AbstractSignBlock.mapping @@ -25,5 +25,3 @@ CLASS net/minecraft/class_2478 net/minecraft/block/AbstractSignBlock ARG 1 player ARG 2 blockEntity ARG 3 front - METHOD method_52576 getActionResult (Z)Lnet/minecraft/class_1269; - ARG 1 usedSignChanger diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 5fef66eeea..83b6b05f79 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock METHOD method_18476 getDirection (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350; ARG 0 world ARG 1 pos - METHOD method_19283 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1657$class_1658;)V - ARG 1 reason METHOD method_21838 bounceEntity (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_22357 wakeVillager (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/block/BeehiveBlock.mapping b/mappings/net/minecraft/block/BeehiveBlock.mapping index 13467c8021..079847d702 100644 --- a/mappings/net/minecraft/block/BeehiveBlock.mapping +++ b/mappings/net/minecraft/block/BeehiveBlock.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_4481 net/minecraft/block/BeehiveBlock FIELD field_31011 FULL_HONEY_LEVEL I FIELD field_31012 DROPPED_HONEYCOMB_COUNT I FIELD field_46274 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_21839 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_21840 addHoneyParticle (Lnet/minecraft/class_1937;DDDDD)V ARG 1 world ARG 2 minX diff --git a/mappings/net/minecraft/block/CandleCakeBlock.mapping b/mappings/net/minecraft/block/CandleCakeBlock.mapping index 1f299e9fad..033f418616 100644 --- a/mappings/net/minecraft/block/CandleCakeBlock.mapping +++ b/mappings/net/minecraft/block/CandleCakeBlock.mapping @@ -6,12 +6,11 @@ CLASS net/minecraft/class_5545 net/minecraft/block/CandleCakeBlock FIELD field_27187 CANDLES_TO_CANDLE_CAKES Ljava/util/Map; FIELD field_27188 PARTICLE_OFFSETS Ljava/lang/Iterable; FIELD field_46299 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_46300 candle Lnet/minecraft/class_2248; + FIELD field_46300 candle Lnet/minecraft/class_5544; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V ARG 1 candle ARG 2 settings - METHOD method_31632 getCandleCakeFromCandle (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; - ARG 0 candle + METHOD method_31632 getCandleCakeFromCandle (Lnet/minecraft/class_5544;)Lnet/minecraft/class_2680; METHOD method_31633 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4970$class_4971;)Z ARG 1 statex METHOD method_31634 isHittingCandle (Lnet/minecraft/class_3965;)Z diff --git a/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping index 1197511256..55f1c76916 100644 --- a/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping +++ b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping @@ -23,5 +23,4 @@ CLASS net/minecraft/class_7714 net/minecraft/block/ChiseledBookshelfBlock METHOD method_47579 getHitPos (Lnet/minecraft/class_3965;Lnet/minecraft/class_2350;)Ljava/util/Optional; ARG 0 hit ARG 1 facing - METHOD method_47580 getSlotForHitPos (Lnet/minecraft/class_241;)I - ARG 0 hitPos + METHOD method_47580 getSlotForHitPos (Lnet/minecraft/class_3965;Lnet/minecraft/class_2680;)Ljava/util/OptionalInt; diff --git a/mappings/net/minecraft/block/EnderChestBlock.mapping b/mappings/net/minecraft/block/EnderChestBlock.mapping index aee02d000e..b6411570d0 100644 --- a/mappings/net/minecraft/block/EnderChestBlock.mapping +++ b/mappings/net/minecraft/block/EnderChestBlock.mapping @@ -4,7 +4,3 @@ CLASS net/minecraft/class_2336 net/minecraft/block/EnderChestBlock FIELD field_10968 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_17363 CONTAINER_NAME Lnet/minecraft/class_2561; FIELD field_46347 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_17468 (Lnet/minecraft/class_1730;ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; - ARG 1 syncId - ARG 2 inventory - ARG 3 playerx diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 69f2fd1871..3c1a17f95a 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -6,12 +6,10 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock METHOD (Ljava/util/List;Lnet/minecraft/class_4970$class_2251;)V ARG 1 stewEffects ARG 2 settings - METHOD (Lnet/minecraft/class_1291;ILnet/minecraft/class_4970$class_2251;)V - ARG 1 stewEffect + METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_4970$class_2251;)V ARG 2 duration ARG 3 settings - METHOD method_54015 createStewEffectList (Lnet/minecraft/class_1291;I)Ljava/util/List; - ARG 0 stewEffect + METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Ljava/util/List; ARG 1 duration METHOD method_54016 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/block/PumpkinBlock.mapping b/mappings/net/minecraft/block/PumpkinBlock.mapping index 85dfc27cc8..35e3e063f0 100644 --- a/mappings/net/minecraft/block/PumpkinBlock.mapping +++ b/mappings/net/minecraft/block/PumpkinBlock.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_2445 net/minecraft/block/PumpkinBlock FIELD field_46419 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_20291 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx diff --git a/mappings/net/minecraft/block/TntBlock.mapping b/mappings/net/minecraft/block/TntBlock.mapping index 519867477c..ad7640a0b8 100644 --- a/mappings/net/minecraft/block/TntBlock.mapping +++ b/mappings/net/minecraft/block/TntBlock.mapping @@ -8,5 +8,3 @@ CLASS net/minecraft/class_2530 net/minecraft/block/TntBlock METHOD method_10738 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos - METHOD method_20292 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx diff --git a/mappings/net/minecraft/block/WitherRoseBlock.mapping b/mappings/net/minecraft/block/WitherRoseBlock.mapping index 605c1aa260..5808b5b513 100644 --- a/mappings/net/minecraft/block/WitherRoseBlock.mapping +++ b/mappings/net/minecraft/block/WitherRoseBlock.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_2563 net/minecraft/block/WitherRoseBlock FIELD field_46503 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Lnet/minecraft/class_1291;ILnet/minecraft/class_4970$class_2251;)V - ARG 1 effect METHOD method_54075 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index 2c18504986..b69d5487d3 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -70,7 +70,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT @see #fillCauldron FIELD field_46589 BEHAVIOR_MAPS Ljava/util/Map; FIELD field_46590 CODEC Lcom/mojang/serialization/Codec; - METHOD interact (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD interact (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; COMMENT Called when a player interacts with a cauldron. COMMENT COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if this behavior succeeds, @@ -96,7 +96,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT COMMENT @return the created map ARG 0 name - METHOD method_32207 fillCauldron (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1269; + METHOD method_32207 fillCauldron (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_3414;)Lnet/minecraft/class_9062; COMMENT Fills a cauldron from a bucket stack. COMMENT COMMENT

The filled bucket stack will be replaced by an empty bucket in the player's @@ -119,14 +119,14 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT the sound produced by filling METHOD method_32208 (Lnet/minecraft/class_2680;)Z ARG 0 statex - METHOD method_32209 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32209 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1269; + METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_9062; COMMENT Empties a cauldron if it's full. COMMENT COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if emptied, {@link ActionResult#PASS} otherwise @@ -152,70 +152,70 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT Registers the vanilla cauldron behaviors. METHOD method_32213 (Lnet/minecraft/class_2680;)Z ARG 0 statex - METHOD method_32214 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32214 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32215 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32215 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32216 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32216 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32217 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32217 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32218 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32218 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32219 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32219 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32220 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32220 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32221 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32221 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32222 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32222 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32223 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32223 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos @@ -224,14 +224,14 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior ARG 5 stack METHOD method_32696 (Lnet/minecraft/class_2680;)Z ARG 0 statex - METHOD method_32697 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32697 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD method_32698 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + METHOD method_32698 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; ARG 0 state ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index b41c4c5846..46fce801ba 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -39,22 +39,22 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 3 filledBottleStack METHOD method_27900 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state - CLASS 20 + CLASS 21 FIELD field_38001 fallback Lnet/minecraft/class_2347; - CLASS 22 + CLASS 23 METHOD method_17199 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1681;)V ARG 1 entity - CLASS 23 + CLASS 24 METHOD method_17200 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1680;)V ARG 1 entity - CLASS 24 + CLASS 25 METHOD method_17201 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1683;)V ARG 1 entity - CLASS 25 + CLASS 26 CLASS 1 METHOD method_17203 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity - CLASS 26 + CLASS 27 CLASS 1 METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index ef641bf10f..1f1781fa95 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity FIELD field_11793 customName Lnet/minecraft/class_2561; - FIELD field_11795 primary Lnet/minecraft/class_1291; + FIELD field_11795 primary Lnet/minecraft/class_6880; FIELD field_11798 EFFECTS Ljava/util/Set; - FIELD field_11799 secondary Lnet/minecraft/class_1291; - FIELD field_11801 EFFECTS_BY_LEVEL [[Lnet/minecraft/class_1291; + FIELD field_11799 secondary Lnet/minecraft/class_6880; + FIELD field_11801 EFFECTS_BY_LEVEL Ljava/util/List; FIELD field_11803 level I FIELD field_17377 lock Lnet/minecraft/class_1273; FIELD field_17378 propertyDelegate Lnet/minecraft/class_3913; @@ -26,12 +26,10 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 0 world ARG 1 pos ARG 2 sound - METHOD method_10940 applyPlayerEffects (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILnet/minecraft/class_1291;Lnet/minecraft/class_1291;)V + METHOD method_10940 applyPlayerEffects (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V ARG 0 world ARG 1 pos ARG 2 beaconLevel - ARG 3 primaryEffect - ARG 4 secondaryEffect METHOD method_16896 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2580;)V ARG 0 world ARG 1 pos @@ -42,15 +40,13 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 1 x ARG 2 y ARG 3 z - METHOD method_53251 getEffectOrNull (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; - ARG 0 effect - METHOD method_53252 readStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_1291; + METHOD method_53251 getEffectOrNull (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; + METHOD method_53252 readStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 nbt ARG 1 key - METHOD method_53253 writeStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_1291;)V + METHOD method_53253 writeStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_6880;)V ARG 0 nbt ARG 1 key - ARG 2 effect CLASS class_2581 BeamSegment FIELD field_11804 height I FIELD field_11805 color [F diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index e35e09c88f..b1b6763225 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_1782 cursorYSmoother Lnet/minecraft/class_3540; FIELD field_1783 cursorLocked Z FIELD field_1784 hasResolutionChanged Z - FIELD field_1785 lastMouseUpdateTime D FIELD field_1787 cursorDeltaY D FIELD field_1788 rightButtonClicked Z FIELD field_1789 cursorDeltaX D @@ -39,7 +38,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse ARG 5 mods METHOD method_1603 getX ()D METHOD method_1604 getY ()D - METHOD method_1606 updateMouse ()V + METHOD method_1606 updateMouse (D)V METHOD method_1607 setup (J)V ARG 1 window METHOD method_1608 wasLeftButtonClicked ()Z diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index 12932a6c68..013b6b876a 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -12,7 +12,6 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud METHOD method_1795 handlePacket (Lnet/minecraft/class_2629;)V ARG 1 packet METHOD method_1796 render (Lnet/minecraft/class_332;)V - ARG 1 context METHOD method_1797 shouldDarkenSky ()Z METHOD method_1798 shouldPlayDragonMusic ()Z METHOD method_1799 renderBossBar (Lnet/minecraft/class_332;IILnet/minecraft/class_1259;)V diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index b3f50636c0..3723da8798 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 scroll METHOD method_1803 addToMessageHistory (Ljava/lang/String;)V ARG 1 message - METHOD method_1805 render (Lnet/minecraft/class_332;III)V + METHOD method_1805 render (Lnet/minecraft/class_332;IIIZ)V ARG 1 context ARG 2 currentTick ARG 3 mouseX diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 404027211f..6230d4918e 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud COMMENT COMMENT

The current instance used by the client can be obtained by {@link COMMENT MinecraftClient#inGameHud MinecraftClient.getInstance().inGameHud}. - FIELD field_2011 scaledWidth I FIELD field_2012 lastHealthCheckTime J FIELD field_2013 vignetteDarkness F FIELD field_2014 lastHealthValue I @@ -15,11 +14,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2020 VIGNETTE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2021 chatHud Lnet/minecraft/class_338; FIELD field_2023 titleRemainTicks I - FIELD field_2024 itemRenderer Lnet/minecraft/class_918; FIELD field_2025 spectatorHud Lnet/minecraft/class_365; FIELD field_2026 debugHud Lnet/minecraft/class_340; FIELD field_2027 subtitlesHud Lnet/minecraft/class_359; - FIELD field_2029 scaledHeight I FIELD field_2030 bossBarHud Lnet/minecraft/class_337; FIELD field_2031 currentStack Lnet/minecraft/class_1799; FIELD field_2032 heartJumpEndTick J @@ -75,9 +72,8 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_45327 FOOD_EMPTY_TEXTURE Lnet/minecraft/class_2960; FIELD field_45328 FOOD_HALF_TEXTURE Lnet/minecraft/class_2960; FIELD field_47550 SCOREBOARD_ENTRY_COMPARATOR Ljava/util/Comparator; - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_918;)V + METHOD (Lnet/minecraft/class_310;)V ARG 1 client - ARG 2 itemRenderer METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_1732 setRecordPlayingOverlay (Lnet/minecraft/class_2561;)V @@ -88,7 +84,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_332;Lnet/minecraft/class_1297;)V ARG 1 context ARG 2 entity - METHOD method_1736 renderCrosshair (Lnet/minecraft/class_332;)V + METHOD method_1736 renderCrosshair (Lnet/minecraft/class_332;F)V ARG 1 context METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I @@ -130,9 +126,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1758 setOverlayMessage (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 tinted - METHOD method_1759 renderHotbar (FLnet/minecraft/class_332;)V - ARG 1 tickDelta - ARG 2 context + METHOD method_1759 renderHotbar (Lnet/minecraft/class_332;F)V METHOD method_1760 renderStatusBars (Lnet/minecraft/class_332;)V COMMENT Renders the armor, health, air, and hunger bars. ARG 1 context @@ -144,9 +138,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 5 player ARG 6 stack ARG 7 seed - METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_332;)V + METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_332;F)V ARG 1 context - METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_332;)V + METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_332;F)V ARG 1 context METHOD method_19346 drawTextBackground (Lnet/minecraft/class_332;Lnet/minecraft/class_327;III)V ARG 1 context @@ -192,7 +186,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 7 half METHOD method_39191 tick (Z)V ARG 1 paused - METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_332;)V + METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_332;F)V ARG 1 context METHOD method_39193 tickAutosaveIndicator ()V METHOD method_44353 shouldShowChatDisabledScreen ()Z diff --git a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping index cae9e2f83d..8a468990f3 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping @@ -27,6 +27,6 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen METHOD method_44054 normalize (Ljava/lang/String;)Ljava/lang/String; COMMENT {@return the {@code message} normalized by trimming it and then normalizing spaces} ARG 1 chatText - METHOD method_44056 sendMessage (Ljava/lang/String;Z)Z + METHOD method_44056 sendMessage (Ljava/lang/String;Z)V ARG 1 chatText ARG 2 addToHistory diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index a97e573c88..b381a8bd18 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -24,8 +24,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen ARG 1 button METHOD method_19858 (ZLnet/minecraft/class_4185;)V ARG 2 button - METHOD method_19859 onRealmsButtonPress (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_19860 onMultiplayerButtonPressed (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19861 (Lnet/minecraft/class_4185;)V @@ -46,7 +44,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen METHOD method_2251 initWidgetsDemo (II)V ARG 1 y ARG 2 spacingY - METHOD method_2252 switchToRealms ()V METHOD method_2253 isRealmsNotificationsGuiDisplayed ()Z METHOD method_31129 canReadDemoWorldData ()Z METHOD method_41198 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 1c8404c1ce..59a7f4e041 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScreen - FIELD field_17412 primaryEffect Lnet/minecraft/class_1291; - FIELD field_17413 secondaryEffect Lnet/minecraft/class_1291; + FIELD field_17412 primaryEffect Lnet/minecraft/class_6880; + FIELD field_17413 secondaryEffect Lnet/minecraft/class_6880; FIELD field_26560 PRIMARY_POWER_TEXT Lnet/minecraft/class_2561; FIELD field_26561 SECONDARY_POWER_TEXT Lnet/minecraft/class_2561; FIELD field_2808 TEXTURE Lnet/minecraft/class_2960; @@ -31,18 +31,15 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree CLASS class_469 EffectButtonWidget FIELD field_17416 primary Z FIELD field_18223 sprite Lnet/minecraft/class_1058; - FIELD field_2813 effect Lnet/minecraft/class_1291; + FIELD field_2813 effect Lnet/minecraft/class_6880; FIELD field_33833 level I - METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_1291;ZI)V + METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_6880;ZI)V ARG 2 x ARG 3 y - ARG 4 statusEffect ARG 5 primary ARG 6 level - METHOD method_37081 init (Lnet/minecraft/class_1291;)V - ARG 1 statusEffect - METHOD method_37082 getEffectName (Lnet/minecraft/class_1291;)Lnet/minecraft/class_5250; - ARG 1 statusEffect + METHOD method_37081 init (Lnet/minecraft/class_6880;)V + METHOD method_37082 getEffectName (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5250; CLASS class_470 BaseButtonWidget FIELD field_2815 disabled Z METHOD (II)V @@ -68,7 +65,6 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD method_37080 tick (I)V ARG 1 level CLASS class_6393 LevelTwoEffectButtonWidget - METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_1291;)V + METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_6880;)V ARG 2 x ARG 3 y - ARG 4 statusEffect diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping index 45dcff9223..6bf3e0dd50 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip FIELD field_3037 serverListPinger Lnet/minecraft/class_644; FIELD field_3040 serverList Lnet/minecraft/class_641; FIELD field_3041 buttonEdit Lnet/minecraft/class_4185; - FIELD field_3042 multiplayerScreenTooltip Ljava/util/List; FIELD field_3043 serverListWidget Lnet/minecraft/class_4267; FIELD field_3044 LOGGER Lorg/slf4j/Logger; FIELD field_3045 lanServerDetector Lnet/minecraft/class_1134$class_1135; @@ -37,8 +36,6 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip ARG 1 confirmedAction METHOD method_20380 directConnect (Z)V ARG 1 confirmedAction - METHOD method_2528 setMultiplayerScreenTooltip (Ljava/util/List;)V - ARG 1 tooltip METHOD method_2529 getServerList ()Lnet/minecraft/class_641; METHOD method_2531 select (Lnet/minecraft/class_4267$class_504;)V ARG 1 entry diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 8e8847b810..447a8392f0 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -84,7 +84,5 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 1 i ARG 2 j METHOD method_29978 saveFile ()V - METHOD method_48274 pinged ()Z - METHOD method_48275 protocolVersionMatches ()Z METHOD method_49300 uploadFavicon ([B)Z ARG 1 bytes diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index 61f8d28fe6..c0fbb81c1f 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -38,7 +38,6 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 2 direction METHOD method_2903 copyAbilities (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_2904 getReachDistance ()F METHOD method_2905 interactEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 entity @@ -87,7 +86,6 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti METHOD method_2923 isBreakingBlock ()Z METHOD method_2924 hasLimitedAttackSpeed ()Z METHOD method_2925 cancelBlockBreaking ()V - METHOD method_2926 hasExtendedReach ()Z METHOD method_2927 tick ()V METHOD method_2928 isFlyingLocked ()Z METHOD method_29357 createPlayer (Lnet/minecraft/class_638;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;)Lnet/minecraft/class_746; diff --git a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping index d3794cc197..93e83cbb4d 100644 --- a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping +++ b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_644 net/minecraft/client/network/MultiplayerServerList ARG 1 socketAddress ARG 2 address ARG 3 serverInfo - METHOD method_3003 add (Lnet/minecraft/class_642;Ljava/lang/Runnable;)V + METHOD method_3003 add (Lnet/minecraft/class_642;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 entry ARG 2 saver METHOD method_3004 cancel ()V diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 8523941f66..5e3a9361fa 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo COMMENT @see net.minecraft.client.option.ServerList FIELD field_3752 name Ljava/lang/String; FIELD field_3753 playerCountLabel Lnet/minecraft/class_2561; - FIELD field_3754 online Z FIELD field_3755 resourcePackPolicy Lnet/minecraft/class_642$class_643; FIELD field_3756 protocolVersion I FIELD field_3757 label Lnet/minecraft/class_2561; @@ -24,7 +23,6 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo FIELD field_45608 serverType Lnet/minecraft/class_642$class_8678; FIELD field_46206 MAX_FAVICON_SIZE I METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_642$class_8678;)V - ARG 1 name ARG 2 address ARG 3 serverType METHOD method_2990 getResourcePackPolicy ()Lnet/minecraft/class_642$class_643; diff --git a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping index 4d1d1ffd8a..025c8126ff 100644 --- a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping +++ b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping @@ -42,7 +42,7 @@ CLASS net/minecraft/class_758 net/minecraft/client/render/BackgroundRenderer METHOD (Lnet/minecraft/class_758$class_4596;)V ARG 1 fogType CLASS class_7286 StatusEffectFogModifier - METHOD method_42590 getStatusEffect ()Lnet/minecraft/class_1291; + METHOD method_42590 getStatusEffect ()Lnet/minecraft/class_6880; METHOD method_42591 applyStartEndModifier (Lnet/minecraft/class_758$class_7285;Lnet/minecraft/class_1309;Lnet/minecraft/class_1293;FF)V ARG 1 fogData ARG 2 entity diff --git a/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping index f45af3b242..bf6a5f25cf 100644 --- a/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_8986 net/minecraft/client/render/entity/BreezeEntityRenderer FIELD field_47475 TEXTURE Lnet/minecraft/class_2960; - FIELD field_47476 WIND_TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 628b3facfb..3822579746 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer COMMENT COMMENT

Checks for a custom nametag on living entities, and for teams/team visibilities for players. ARG 1 entity - METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Lnet/minecraft/class_2561;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Lnet/minecraft/class_2561;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IF)V ARG 1 entity ARG 2 text ARG 3 matrices diff --git a/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping index 2892c74acd..f33a7b465c 100644 --- a/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping @@ -1,7 +1 @@ CLASS net/minecraft/class_8988 net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer - FIELD field_47479 texture Lnet/minecraft/class_2960; - FIELD field_47480 model Lnet/minecraft/class_8973; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_2960;)V - ARG 1 breezeModel - ARG 2 entityModelLoader - ARG 3 texture diff --git a/mappings/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.mapping index 8d66487e22..7514568a78 100644 --- a/mappings/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_8989 net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer FIELD field_47484 texture Lnet/minecraft/class_2960; FIELD field_47485 model Lnet/minecraft/class_8973; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_3883;)V ARG 1 breezeModel - ARG 2 entityModelLoader - ARG 3 texture METHOD method_55273 getXOffset (F)F ARG 1 tickDelta diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index f50f2ba7b0..0cb03fe9b6 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/FeatureRenderer FIELD field_17155 context Lnet/minecraft/class_3883; - METHOD (Lnet/minecraft/class_3883;)V - ARG 1 context METHOD method_17165 getContextModel ()Lnet/minecraft/class_583; METHOD method_23194 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping index 4e9116b138..6ddcb9d23c 100644 --- a/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping @@ -1,16 +1,8 @@ CLASS net/minecraft/class_8973 net/minecraft/client/render/entity/model/BreezeEntityModel FIELD field_47434 root Lnet/minecraft/class_630; FIELD field_47435 head Lnet/minecraft/class_630; - FIELD field_47436 windBody Lnet/minecraft/class_630; FIELD field_47437 windTop Lnet/minecraft/class_630; FIELD field_47438 windMid Lnet/minecraft/class_630; FIELD field_47439 windBottom Lnet/minecraft/class_630; FIELD field_47440 rods Lnet/minecraft/class_630; - METHOD (Lnet/minecraft/class_630;)V - ARG 1 root - METHOD method_55233 getTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_55234 getEyesTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_55235 getWindTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_55236 getWindTop ()Lnet/minecraft/class_630; - METHOD method_55237 getWindMid ()Lnet/minecraft/class_630; - METHOD method_55238 getWindBottom ()Lnet/minecraft/class_630; + METHOD method_55233 getTexturedModelData (II)Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping index 3ebdee1aaf..863e9f7390 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping @@ -44,8 +44,6 @@ CLASS net/minecraft/class_5602 net/minecraft/client/render/entity/model/EntityMo FIELD field_27697 CONDUIT_WIND Lnet/minecraft/class_5601; FIELD field_27700 CREEPER_ARMOR Lnet/minecraft/class_5601; FIELD field_32582 MAIN Ljava/lang/String; - FIELD field_47444 BREEZE_WIND Lnet/minecraft/class_5601; - FIELD field_47445 BREEZE_EYES Lnet/minecraft/class_5601; METHOD method_32076 getLayers ()Ljava/util/stream/Stream; METHOD method_32077 createBoat (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601; ARG 0 type diff --git a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping index 66b3cf5417..f4ce02701f 100644 --- a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping @@ -19,4 +19,4 @@ CLASS net/minecraft/class_624 net/minecraft/client/render/entity/model/WolfEntit FIELD field_3623 torso Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root - METHOD method_32068 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_32068 getTexturedModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5609; diff --git a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping index 915a55ae34..0eb80ead7b 100644 --- a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping +++ b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4074 net/minecraft/client/texture/StatusEffectSpriteManager METHOD (Lnet/minecraft/class_1060;)V ARG 1 textureManager - METHOD method_18663 getSprite (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1058; - ARG 1 effect + METHOD method_18663 getSprite (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1058; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index eac721a5ee..77607d08ad 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_35432 BLOCK_MARKER_ITEMS Ljava/util/Set; FIELD field_3727 networkHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; - FIELD field_3733 scoreboard Lnet/minecraft/class_269; FIELD field_37951 pendingUpdateManager Lnet/minecraft/class_7202; FIELD field_37952 LOGGER Lorg/slf4j/Logger; FIELD field_47129 tickManager Lnet/minecraft/class_8921; @@ -97,8 +96,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 5 random ARG 6 block ARG 7 pos - METHOD method_2944 setScoreboard (Lnet/minecraft/class_269;)V - ARG 1 scoreboard METHOD method_2945 removeEntity (ILnet/minecraft/class_1297$class_5529;)V ARG 1 entityId ARG 2 removalReason diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping index 4cfbb297d5..91e79c3ecb 100644 --- a/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_5746 net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider - FIELD field_38363 BASIC_GAME_EVENTS [Lnet/minecraft/class_5712; + FIELD field_38363 BASIC_GAME_EVENTS Ljava/util/List; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture - METHOD method_46826 (Lnet/minecraft/class_5712;)Lnet/minecraft/class_5321; - ARG 0 gameEvent diff --git a/mappings/net/minecraft/datafixer/fix/JigsawBlockNameFix.mapping b/mappings/net/minecraft/datafixer/fix/JigsawBlockNameFix.mapping deleted file mode 100644 index 0475503710..0000000000 --- a/mappings/net/minecraft/datafixer/fix/JigsawBlockNameFix.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_5527 net/minecraft/datafixer/fix/JigsawBlockNameFix - COMMENT A block (re)name fix that updates the block references within Jigsaw - COMMENT block entities. Used by blocks that are generated by jigsaws. - FIELD field_26991 name Ljava/lang/String; - METHOD method_31446 create (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix; - ARG 0 oldSchema - ARG 1 name - ARG 2 rename diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index fa117895c9..d5c9cfaf51 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity FIELD field_5930 radiusGrowth F FIELD field_5931 PARTICLE_ID Lnet/minecraft/class_2940; FIELD field_5932 durationOnUse I - FIELD field_5933 potion Lnet/minecraft/class_1842; + FIELD field_5933 potion Lnet/minecraft/class_6880; FIELD field_5934 effects Ljava/util/List; FIELD field_5935 LOGGER Lorg/slf4j/Logger; FIELD field_5936 COLOR Lnet/minecraft/class_2940; @@ -31,7 +31,7 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity METHOD method_35045 getRadiusGrowth ()F METHOD method_35046 getDurationOnUse ()I METHOD method_35047 getWaitTime ()I - METHOD method_35048 getPotion ()Lnet/minecraft/class_1842; + METHOD method_35048 getPotion ()Lnet/minecraft/class_6880; METHOD method_5595 setWaitTime (I)V ARG 1 waitTime METHOD method_5596 setRadiusGrowth (F)V @@ -58,5 +58,4 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity METHOD method_5610 addEffect (Lnet/minecraft/class_1293;)V ARG 1 effect METHOD method_5611 isWaiting ()Z - METHOD method_5612 setPotion (Lnet/minecraft/class_1842;)V - ARG 1 potion + METHOD method_5612 setPotion (Lnet/minecraft/class_6880;)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 28a8bff722..e97efdc5a5 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -144,7 +144,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_33758 hasVisualFire Z FIELD field_34927 collidedSoftly Z FIELD field_35101 chunkPos Lnet/minecraft/class_1923; - FIELD field_35588 blockStateAtPos Lnet/minecraft/class_2680; FIELD field_36331 groundCollision Z FIELD field_38931 trackedPosition Lnet/minecraft/class_7422; FIELD field_44784 supportingBlockPos Ljava/util/Optional; @@ -202,7 +201,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6009 invulnerable Z FIELD field_6011 dataTracker Lnet/minecraft/class_2945; FIELD field_6012 age I - FIELD field_6013 stepHeight F FIELD field_6014 prevX D FIELD field_6017 fallDistance F FIELD field_6018 portalCooldown I @@ -254,9 +252,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #getWidth COMMENT @see #getHeight ARG 1 pose - METHOD method_18378 getEyeHeight (Lnet/minecraft/class_4050;Lnet/minecraft/class_4048;)F - ARG 1 pose - ARG 2 dimensions METHOD method_18379 tickPortal ()V METHOD method_18380 setPose (Lnet/minecraft/class_4050;)V ARG 1 pose @@ -681,7 +676,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT the mapped index as given by the item slot argument METHOD method_32319 setInPowderSnow (Z)V ARG 1 inPowderSnow - METHOD method_32875 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)V + METHOD method_32875 emitGameEvent (Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;)V COMMENT Emits a game event originating from another entity at this entity's position. COMMENT COMMENT

A common example is a game event called in {@link #interact}, where the player @@ -691,7 +686,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 event ARG 2 entity COMMENT the entity that emitted the game event, or {@code null} if there is none - METHOD method_32876 emitGameEvent (Lnet/minecraft/class_5712;)V + METHOD method_32876 emitGameEvent (Lnet/minecraft/class_6880;)V COMMENT Emits a game event originating from this entity at this entity's position. COMMENT COMMENT @see #emitGameEvent(GameEvent, Entity) @@ -770,14 +765,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 yaw METHOD method_36457 setPitch (F)V ARG 1 pitch - METHOD method_36601 getBlockStateAtPos ()Lnet/minecraft/class_2680; - COMMENT {@return the block state at the entity's position} - COMMENT - COMMENT

The result is cached. - COMMENT - COMMENT @see #getBlockPos - COMMENT @see #getLandingBlockState - COMMENT @see #getSteppingBlockState METHOD method_36971 canModifyAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z COMMENT {@return whether the entity can modify the world at {@code pos}} COMMENT @@ -937,8 +924,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_48923 getDamageSources ()Lnet/minecraft/class_8109; METHOD method_49108 canBeHitByProjectile ()Z METHOD method_49476 getStepHeight ()F - METHOD method_49477 setStepHeight (F)V - ARG 1 stepHeight METHOD method_49693 shouldDismountUnderwater ()Z COMMENT {@return whether this vehicle should dismount the passenger if submerged underwater} METHOD method_49694 getControllingVehicle ()Lnet/minecraft/class_1297; @@ -956,7 +941,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_49790 shouldPlayAmethystChimeSound (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_49792 teleportPassengers ()V - METHOD method_51152 getNameLabelHeight ()F METHOD method_51295 playSwimSound ()V METHOD method_51296 playSecondaryStepSound (Lnet/minecraft/class_2680;)V ARG 1 state @@ -992,16 +976,12 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 6 z ARG 8 yaw ARG 10 pitch - METHOD method_52533 getPassengerAttachmentPos (Lnet/minecraft/class_1297;Lnet/minecraft/class_4048;F)Lorg/joml/Vector3f; + METHOD method_52533 getPassengerAttachmentPos (Lnet/minecraft/class_1297;Lnet/minecraft/class_4048;F)Lnet/minecraft/class_243; ARG 1 passenger ARG 2 dimensions ARG 3 scaleFactor METHOD method_52534 shouldControlVehicles ()Z METHOD method_52535 isInFluid ()Z - METHOD method_52536 getRidingOffset (Lnet/minecraft/class_1297;)F - ARG 1 vehicle - METHOD method_52537 getUnscaledRidingOffset (Lnet/minecraft/class_1297;)F - ARG 1 vehicle METHOD method_52538 getPassengerRidingPos (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; ARG 1 passenger METHOD method_53827 getLerpTargetY ()D @@ -2216,8 +2196,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT the player crosshair} METHOD method_5864 getType ()Lnet/minecraft/class_1299; METHOD method_5865 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V - ARG 1 passenger - ARG 2 positionUpdater METHOD method_5867 calculateNextStepSoundDistance ()F METHOD method_5869 isSubmergedInWater ()Z COMMENT {@return whether this entity's hitbox is fully submerged in water} diff --git a/mappings/net/minecraft/entity/EntityDimensions.mapping b/mappings/net/minecraft/entity/EntityDimensions.mapping index 0dcea3688a..6a18c5c7e4 100644 --- a/mappings/net/minecraft/entity/EntityDimensions.mapping +++ b/mappings/net/minecraft/entity/EntityDimensions.mapping @@ -1,11 +1,14 @@ CLASS net/minecraft/class_4048 net/minecraft/entity/EntityDimensions - FIELD field_18067 width F - FIELD field_18068 height F - FIELD field_18069 fixed Z + FIELD comp_2185 width F + FIELD comp_2186 height F + FIELD comp_2189 fixed Z METHOD (FFZ)V ARG 1 width ARG 2 height ARG 3 fixed + METHOD comp_2185 width ()F + METHOD comp_2186 height ()F + METHOD comp_2189 fixed ()Z METHOD method_18383 scaled (F)Lnet/minecraft/class_4048; ARG 1 ratio METHOD method_18384 changing (FF)Lnet/minecraft/class_4048; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 10ddea31ae..5beff11a7f 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -108,9 +108,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 pos METHOD method_18393 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_18394 getActiveEyeHeight (Lnet/minecraft/class_4050;Lnet/minecraft/class_4048;)F - ARG 1 pose - ARG 2 dimensions METHOD method_18395 canTarget (Lnet/minecraft/class_1309;)Z ARG 1 target METHOD method_18396 getArmorVisibility ()F @@ -229,10 +226,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 2 slipperiness METHOD method_26319 canWalkOnFluid (Lnet/minecraft/class_3610;)Z ARG 1 state - METHOD method_26825 getAttributeValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute - METHOD method_26826 getAttributeBaseValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute METHOD method_26827 createLivingAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_27071 shouldDropLoot ()Z METHOD method_27302 shouldDisplaySoulSpeedEffects ()Z @@ -355,8 +348,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_51851 getLootTableSeed ()J METHOD method_52197 sendEffectToControllingPlayer (Lnet/minecraft/class_1293;)V ARG 1 effect - METHOD method_52540 updateAttribute (Lnet/minecraft/class_1320;)V - ARG 1 attribute + METHOD method_52540 updateAttribute (Lnet/minecraft/class_6880;)V METHOD method_52541 getMaxAbsorption ()F METHOD method_52542 wouldNotSuffocateInPose (Lnet/minecraft/class_4050;)Z ARG 1 pose @@ -372,8 +364,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; - METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attribute + METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; METHOD method_5997 attackLivingEntity (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_5998 getStackInHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1799; @@ -405,7 +396,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6014 getItemUseTimeLeft ()I METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V ARG 1 attacker - METHOD method_6016 removeStatusEffect (Lnet/minecraft/class_1291;)Z + METHOD method_6016 removeStatusEffect (Lnet/minecraft/class_6880;)Z COMMENT Removes a status effect from this entity. COMMENT COMMENT

Calling this method will call cleanup methods on the status effect and trigger synchronization of effect particles with watching clients. If this entity is a player, @@ -413,7 +404,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT COMMENT @return whether the active status effects on this entity has been changed by COMMENT this call - ARG 1 type METHOD method_6017 getSoundPitch ()F METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V ARG 1 hand @@ -497,8 +487,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6057 canSee (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_6058 getActiveHand ()Lnet/minecraft/class_1268; - METHOD method_6059 hasStatusEffect (Lnet/minecraft/class_1291;)Z - ARG 1 effect + METHOD method_6059 hasStatusEffect (Lnet/minecraft/class_6880;)Z METHOD method_6060 knockback (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_6061 blockedByShield (Lnet/minecraft/class_1282;)Z @@ -608,16 +597,14 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT @see #dropXp() COMMENT @see #shouldAlwaysDropXp() COMMENT @see #shouldDropXp() - METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; + METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1293; COMMENT Removes a status effect from this entity without calling any listener. COMMENT COMMENT

This method does not perform any cleanup or synchronization operation. COMMENT Under most circumstances, calling {@link #removeStatusEffect(StatusEffect)} is highly preferable. COMMENT COMMENT @return the status effect removed - ARG 1 type - METHOD method_6112 getStatusEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; - ARG 1 effect + METHOD method_6112 getStatusEffect (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1293; METHOD method_6113 isSleeping ()Z METHOD method_6114 onAttacking (Lnet/minecraft/class_1297;)V ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping index cb3f6b8d71..645075a628 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping @@ -1,14 +1,10 @@ CLASS net/minecraft/class_8952 net/minecraft/entity/ai/brain/task/BreezeJumpTask FIELD field_47289 REQUIRED_SPACE_ABOVE I - FIELD field_47290 MAX_JUMP_DISTANCE D FIELD field_47291 JUMP_COOLDOWN_EXPIRY I FIELD field_47292 JUMP_COOLDOWN_EXPIRY_WHEN_HURT I FIELD field_47293 JUMP_INHALING_EXPIRY I FIELD field_47294 MAX_JUMP_VELOCITY F FIELD field_47295 POSSIBLE_JUMP_ANGLES Lit/unimi/dsi/fastutil/objects/ObjectArrayList; - METHOD method_55022 getRandomPosBehindTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_5819;)Lnet/minecraft/class_243; - ARG 0 target - ARG 1 random METHOD method_55023 getPosToJumpTo (Lnet/minecraft/class_1309;Lnet/minecraft/class_243;)Lnet/minecraft/class_2338; ARG 0 breeze ARG 1 pos @@ -21,9 +17,6 @@ CLASS net/minecraft/class_8952 net/minecraft/entity/ai/brain/task/BreezeJumpTask METHOD method_55026 isTargetOutOfRange (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Z ARG 0 breeze ARG 1 target - METHOD method_55027 canJumpTo (Lnet/minecraft/class_8949;Lnet/minecraft/class_243;)Z - ARG 0 breeze - ARG 1 jumpPos METHOD method_55028 (Lnet/minecraft/class_8949;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 1 jumpTarget METHOD method_55029 hasRoomToJump (Lnet/minecraft/class_3218;Lnet/minecraft/class_8949;)Z diff --git a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping index 0f9031704c..5fa269e39d 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping @@ -15,15 +15,10 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector FIELD field_6461 goals Ljava/util/Set; FIELD field_6462 disabledControls Ljava/util/EnumSet; FIELD field_6463 profiler Ljava/util/function/Supplier; - FIELD field_6464 timeInterval I - FIELD field_6466 LOGGER Lorg/slf4j/Logger; METHOD (Ljava/util/function/Supplier;)V ARG 1 profiler - METHOD method_19048 getRunningGoals ()Ljava/util/stream/Stream; METHOD method_35113 clear (Ljava/util/function/Predicate;)V ARG 1 predicate - METHOD method_35114 setTimeInterval (I)V - ARG 1 timeInterval METHOD method_35115 getGoals ()Ljava/util/Set; METHOD method_38063 usesAny (Lnet/minecraft/class_4135;Ljava/util/EnumSet;)Z ARG 0 goal @@ -49,4 +44,3 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector ARG 1 priority ARG 2 goal METHOD method_6280 remove (Lnet/minecraft/class_1352;)V - ARG 1 goal diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index b66d86ce4d..3a6098a5c4 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -6,13 +6,9 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer METHOD (Lnet/minecraft/class_5132;)V ARG 1 defaultAttributes METHOD method_26841 getTracked ()Ljava/util/Set; - METHOD method_26842 getCustomInstance (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attribute - METHOD method_26843 (Lnet/minecraft/class_1320;Lnet/minecraft/class_1322;)V - ARG 1 attribute + METHOD method_26843 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V ARG 2 attributeModifier - METHOD method_26844 (Lnet/minecraft/class_1320;Ljava/util/Collection;)V - ARG 1 attribute + METHOD method_26844 (Lnet/minecraft/class_6880;Ljava/util/Collection;)V ARG 2 modifiers METHOD method_26845 updateTrackedStatus (Lnet/minecraft/class_1324;)V ARG 1 instance @@ -20,32 +16,18 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 1 other METHOD method_26847 removeModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers - METHOD method_26849 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1320;)V - ARG 2 attribute METHOD method_26850 readNbt (Lnet/minecraft/class_2499;)V ARG 1 nbt METHOD method_26851 getAttributesToSend ()Ljava/util/Collection; - METHOD method_26852 getValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute + METHOD method_26852 getValue (Lnet/minecraft/class_6880;)D METHOD method_26853 (Lnet/minecraft/class_1324;)V ARG 1 attributeInstance METHOD method_26854 addTemporaryModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers METHOD method_26855 toNbt ()Lnet/minecraft/class_2499; - METHOD method_26856 getBaseValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute + METHOD method_26856 getBaseValue (Lnet/minecraft/class_6880;)D METHOD method_26857 (Lnet/minecraft/class_1324;)Z ARG 0 attribute - METHOD method_26858 (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attributex - METHOD method_27305 hasModifierForAttribute (Lnet/minecraft/class_1320;Ljava/util/UUID;)Z - ARG 1 attribute - ARG 2 uuid - METHOD method_27306 hasAttribute (Lnet/minecraft/class_1320;)Z - ARG 1 attribute - METHOD method_27307 getModifierValue (Lnet/minecraft/class_1320;Ljava/util/UUID;)D - ARG 1 attribute - ARG 2 uuid METHOD method_45329 getCustomInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; ARG 1 attribute METHOD method_45330 hasModifierForAttribute (Lnet/minecraft/class_6880;Ljava/util/UUID;)Z diff --git a/mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping b/mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping deleted file mode 100644 index 98806f9178..0000000000 --- a/mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_8630 net/minecraft/entity/attribute/AttributeModifierCreator - METHOD method_52521 getUuid ()Ljava/util/UUID; - METHOD method_52522 createAttributeModifier (I)Lnet/minecraft/class_1322; - ARG 1 amplifier diff --git a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping index 76b3d4c11c..f58cfd4f48 100644 --- a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping @@ -3,33 +3,23 @@ CLASS net/minecraft/class_5132 net/minecraft/entity/attribute/DefaultAttributeCo METHOD (Ljava/util/Map;)V ARG 1 instances METHOD method_26861 builder ()Lnet/minecraft/class_5132$class_5133; - METHOD method_26862 getValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute - METHOD method_26863 createOverride (Ljava/util/function/Consumer;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; + METHOD method_26862 getValue (Lnet/minecraft/class_6880;)D + METHOD method_26863 createOverride (Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; ARG 1 updateCallback - ARG 2 attribute - METHOD method_26864 getBaseValue (Lnet/minecraft/class_1320;)D - ARG 1 attribute - METHOD method_26865 require (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attribute - METHOD method_27308 getModifierValue (Lnet/minecraft/class_1320;Ljava/util/UUID;)D - ARG 1 attribute + METHOD method_26864 getBaseValue (Lnet/minecraft/class_6880;)D + METHOD method_26865 require (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + METHOD method_27308 getModifierValue (Lnet/minecraft/class_6880;Ljava/util/UUID;)D ARG 2 uuid - METHOD method_27309 hasModifier (Lnet/minecraft/class_1320;Ljava/util/UUID;)Z - ARG 1 type + METHOD method_27309 hasModifier (Lnet/minecraft/class_6880;Ljava/util/UUID;)Z ARG 2 uuid - METHOD method_27310 has (Lnet/minecraft/class_1320;)Z - ARG 1 type + METHOD method_27310 has (Lnet/minecraft/class_6880;)Z CLASS class_5133 Builder - FIELD field_23714 instances Ljava/util/Map; + FIELD field_23714 instances Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_23715 unmodifiable Z METHOD method_26866 build ()Lnet/minecraft/class_5132; - METHOD method_26867 add (Lnet/minecraft/class_1320;)Lnet/minecraft/class_5132$class_5133; - ARG 1 attribute - METHOD method_26868 add (Lnet/minecraft/class_1320;D)Lnet/minecraft/class_5132$class_5133; - ARG 1 attribute + METHOD method_26867 add (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5132$class_5133; + METHOD method_26868 add (Lnet/minecraft/class_6880;D)Lnet/minecraft/class_5132$class_5133; ARG 2 baseValue - METHOD method_26869 (Lnet/minecraft/class_1320;Lnet/minecraft/class_1324;)V + METHOD method_26869 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1324;)V ARG 2 attributex - METHOD method_26870 checkedAdd (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attribute + METHOD method_26870 checkedAdd (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index f2f0ca258f..debd4db198 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeInstance COMMENT A double-valued attribute. - FIELD field_23700 type Lnet/minecraft/class_1320; + FIELD field_23700 type Lnet/minecraft/class_6880; FIELD field_23701 operationToModifiers Ljava/util/Map; FIELD field_23702 idToModifiers Ljava/util/Map; FIELD field_23703 persistentModifiers Ljava/util/Set; @@ -8,8 +8,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns FIELD field_23705 dirty Z FIELD field_23706 value D FIELD field_23707 updateCallback Ljava/util/function/Consumer; - METHOD (Lnet/minecraft/class_1320;Ljava/util/function/Consumer;)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;Ljava/util/function/Consumer;)V ARG 2 updateCallback METHOD method_26831 setFrom (Lnet/minecraft/class_1324;)V COMMENT Copies the values of an attribute to this attribute. @@ -53,7 +52,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns ARG 1 modifier METHOD method_6197 addModifier (Lnet/minecraft/class_1322;)V ARG 1 modifier - METHOD method_6198 getAttribute ()Lnet/minecraft/class_1320; + METHOD method_6198 getAttribute ()Lnet/minecraft/class_6880; METHOD method_6199 getModifier (Ljava/util/UUID;)Lnet/minecraft/class_1322; ARG 1 uuid METHOD method_6200 removeModifier (Ljava/util/UUID;)V diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping index 8e6fc6bba8..165c190239 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5134 net/minecraft/entity/attribute/EntityAttributes - FIELD field_45124 GENERIC_MAX_ABSORPTION Lnet/minecraft/class_1320; - METHOD method_26871 register (Ljava/lang/String;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1320; + FIELD field_45124 GENERIC_MAX_ABSORPTION Lnet/minecraft/class_6880; + METHOD method_26871 register (Ljava/lang/String;Lnet/minecraft/class_1320;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 attribute diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 27668e3c6a..93eac25f51 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect FIELD field_18270 category Lnet/minecraft/class_4081; - FIELD field_38083 factorCalculationDataSupplier Ljava/util/function/Supplier; - FIELD field_45729 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_5883 translationKey Ljava/lang/String; FIELD field_5885 attributeModifiers Ljava/util/Map; FIELD field_5886 color I @@ -9,13 +7,9 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 1 category ARG 2 color METHOD method_18792 getCategory ()Lnet/minecraft/class_4081; - METHOD method_42126 setFactorCalculationDataSupplier (Ljava/util/function/Supplier;)Lnet/minecraft/class_1291; - ARG 1 factorCalculationDataSupplier - METHOD method_42127 getFactorCalculationDataSupplier ()Ljava/util/Optional; METHOD method_52520 onApplied (Lnet/minecraft/class_1309;I)V ARG 1 entity ARG 2 amplifier - METHOD method_53123 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_5552 canApplyUpdateEffect (II)Z ARG 1 duration ARG 2 amplifier @@ -34,22 +28,20 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 3 target ARG 4 amplifier ARG 5 proximity - METHOD method_5565 getAttributeModifiers ()Ljava/util/Map; - METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_1320;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291; - ARG 1 attribute + METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_6880;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291; ARG 2 uuid ARG 3 amount ARG 5 operation METHOD method_5567 getTranslationKey ()Ljava/lang/String; - METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)V + METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)Z ARG 1 entity ARG 2 amplifier METHOD method_5573 isBeneficial ()Z CLASS class_8634 EffectAttributeModifierCreator - FIELD field_45105 uuid Ljava/util/UUID; - FIELD field_45106 baseValue D - FIELD field_45107 operation Lnet/minecraft/class_1322$class_1323; - METHOD (Lnet/minecraft/class_1291;Ljava/util/UUID;DLnet/minecraft/class_1322$class_1323;)V - ARG 2 uuid - ARG 3 baseValue - ARG 5 operation + FIELD comp_2182 uuid Ljava/util/UUID; + FIELD comp_2183 baseValue D + FIELD comp_2184 operation Lnet/minecraft/class_1322$class_1323; + METHOD comp_2182 uuid ()Ljava/util/UUID; + METHOD comp_2183 baseValue ()D + METHOD comp_2184 operation ()Lnet/minecraft/class_1322$class_1323; + METHOD method_52522 createAttributeModifier (Ljava/lang/String;I)Lnet/minecraft/class_1322; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index a6b1f7a584..c630ddb5ec 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance COMMENT COMMENT

This exists so that long-duration low-amplifier effects reappears COMMENT after short-duration high-amplifier effects run out. - FIELD field_38084 factorCalculationData Ljava/util/Optional; FIELD field_42106 INFINITE I FIELD field_45730 ID_NBT_KEY Ljava/lang/String; FIELD field_45731 AMBIENT_NBT_KEY Ljava/lang/String; @@ -14,65 +13,48 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_45734 DURATION_NBT_KEY Ljava/lang/String; FIELD field_45735 SHOW_PARTICLES_NBT_KEY Ljava/lang/String; FIELD field_45736 SHOW_ICON_NBT_KEY Ljava/lang/String; - FIELD field_45737 FACTOR_CALCULATION_DATA_NBT_KEY Ljava/lang/String; FIELD field_5889 showIcon Z FIELD field_5890 showParticles Z FIELD field_5892 ambient Z FIELD field_5893 amplifier I FIELD field_5895 duration I - FIELD field_5896 type Lnet/minecraft/class_1291; + FIELD field_5896 type Lnet/minecraft/class_6880; FIELD field_5897 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_1291;)V - ARG 1 type - METHOD (Lnet/minecraft/class_1291;I)V - ARG 1 type + METHOD (Lnet/minecraft/class_1293;)V + ARG 1 instance + METHOD (Lnet/minecraft/class_6880;I)V ARG 2 duration - METHOD (Lnet/minecraft/class_1291;II)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;II)V ARG 2 duration ARG 3 amplifier - METHOD (Lnet/minecraft/class_1291;IIZZ)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;IIZZ)V ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 visible - METHOD (Lnet/minecraft/class_1291;IIZZZ)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;IIZZZ)V ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 showParticles ARG 6 showIcon - METHOD (Lnet/minecraft/class_1291;IIZZZLnet/minecraft/class_1293;Ljava/util/Optional;)V - ARG 1 type + METHOD (Lnet/minecraft/class_6880;IIZZZLnet/minecraft/class_1293;)V ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 showParticles ARG 6 showIcon ARG 7 hiddenEffect - ARG 8 factorCalculationData - METHOD (Lnet/minecraft/class_1293;)V - ARG 1 instance METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_24275 fromNbt (Lnet/minecraft/class_1291;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; - ARG 0 type + METHOD method_24275 fromNbt (Lnet/minecraft/class_6880;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; ARG 1 nbt METHOD method_24276 copyFrom (Lnet/minecraft/class_1293;)V ARG 1 that METHOD method_24277 writeTypelessNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt - METHOD method_42129 getFactorCalculationData ()Ljava/util/Optional; - METHOD method_42131 (Lnet/minecraft/class_1293$class_7247;)V - ARG 1 factorCalculationData - METHOD method_42132 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1293$class_7247;)V - ARG 1 factorCalculationData - METHOD method_42133 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V - ARG 1 factorCalculationDataNbt METHOD method_48557 isDurationBelow (I)Z ARG 1 duration METHOD method_48558 mapDuration (Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)I @@ -87,7 +69,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_52523 onApplied (Lnet/minecraft/class_1309;)V ARG 1 entity METHOD method_5578 getAmplifier ()I - METHOD method_5579 getEffectType ()Lnet/minecraft/class_1291; + METHOD method_5579 getEffectType ()Lnet/minecraft/class_6880; METHOD method_5581 shouldShowParticles ()Z METHOD method_5582 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt @@ -103,43 +85,3 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 1 that METHOD method_5591 isAmbient ()Z METHOD method_5592 shouldShowIcon ()Z - CLASS class_7247 FactorCalculationData - FIELD field_38085 CODEC Lcom/mojang/serialization/Codec; - FIELD field_38086 paddingDuration I - FIELD field_38087 factorTarget F - FIELD field_38088 factorCurrent F - FIELD field_38090 factorPreviousFrame F - FIELD field_38091 hadEffectLastTick Z - FIELD field_39111 factorStart F - FIELD field_42107 effectChangedTimestamp I - METHOD (I)V - ARG 1 paddingDuration - METHOD (IFFFIFZ)V - ARG 1 paddingDuration - ARG 2 factorStart - ARG 3 factorTarget - ARG 4 factorCurrent - ARG 5 effectChangedTimestamp - ARG 6 factorPreviousFrame - ARG 7 hadEffectLastTick - METHOD method_42134 lerp (Lnet/minecraft/class_1309;F)F - ARG 1 entity - ARG 2 tickDelta - METHOD method_42135 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Boolean; - ARG 0 data - METHOD method_42136 update (Lnet/minecraft/class_1293;)V - ARG 1 effect - METHOD method_42137 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_42138 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; - ARG 0 data - METHOD method_42139 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Integer; - ARG 0 data - METHOD method_42140 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; - ARG 0 data - METHOD method_42141 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; - ARG 0 data - METHOD method_42142 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Integer; - ARG 0 data - METHOD method_43685 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; - ARG 0 data diff --git a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping index 496daec456..a76cdc4639 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1292 net/minecraft/entity/effect/StatusEffectUtil ARG 6 duration METHOD method_42144 (Lnet/minecraft/class_1293;Lnet/minecraft/class_1297;Lnet/minecraft/class_3222;)V ARG 2 player - METHOD method_42145 (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;DLnet/minecraft/class_1291;Lnet/minecraft/class_1293;ILnet/minecraft/class_3222;)Z + METHOD method_42145 (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;DLnet/minecraft/class_6880;Lnet/minecraft/class_1293;ILnet/minecraft/class_3222;)Z ARG 7 player METHOD method_5574 hasWaterBreathing (Lnet/minecraft/class_1309;)Z ARG 0 entity diff --git a/mappings/net/minecraft/entity/effect/StatusEffects.mapping b/mappings/net/minecraft/entity/effect/StatusEffects.mapping index 0887324744..e920b53092 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffects.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffects.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1294 net/minecraft/entity/effect/StatusEffects FIELD field_38093 DARKNESS_PADDING_DURATION I - METHOD method_5594 register (Ljava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; + METHOD method_5594 register (Ljava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 statusEffect diff --git a/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping index 996f7759b8..9440d67659 100644 --- a/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_5418 net/minecraft/entity/mob/AbstractPiglinEntity FIELD field_25758 IMMUNE_TO_ZOMBIFICATION Lnet/minecraft/class_2940; FIELD field_25759 timeInOverworld I FIELD field_30547 TIME_TO_ZOMBIFY I - FIELD field_41030 EYE_HEIGHT F METHOD method_24694 zombify (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_24705 getActivity ()Lnet/minecraft/class_4837; diff --git a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping index 4741929992..1a2ae7b1da 100644 --- a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_8950 net/minecraft/entity/mob/BreezeBrain FIELD field_47288 MEMORY_MODULES Ljava/util/List; METHOD method_55016 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain - METHOD method_55017 (Lnet/minecraft/class_8949;)Ljava/util/Optional; - ARG 0 breeze METHOD method_55018 addCoreTasks (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_55019 addFightTasks (Lnet/minecraft/class_4095;)V diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index 6b5706cf0b..05004f229f 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -9,10 +9,6 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity METHOD method_55008 addLongJumpingParticles ()V METHOD method_55009 getChargeY ()D METHOD method_55010 stopAnimations ()V - METHOD method_55011 isWithinLargeRange (Lnet/minecraft/class_243;)Z - ARG 1 pos - METHOD method_55012 isWithinMediumRange (Lnet/minecraft/class_243;)Z - ARG 1 pos METHOD method_55013 isWithinShortRange (Lnet/minecraft/class_243;)Z ARG 1 pos METHOD method_55014 createBreezeAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping index b3cfc40c64..4b4f61e2f1 100644 --- a/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_1314 net/minecraft/entity/mob/PathAwareEntity FIELD field_35670 DEFAULT_PATHFINDING_FAVOR F METHOD method_43689 shouldFollowLeash ()Z - METHOD method_52545 (Lnet/minecraft/class_4135;)Z - ARG 0 goal METHOD method_52546 isPanicking ()Z METHOD method_6142 updateForLeashLength (F)V ARG 1 leashLength diff --git a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping index bd93733651..d1033f6ac6 100644 --- a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1628 net/minecraft/entity/mob/SpiderEntity METHOD (Lnet/minecraft/class_1628;)V ARG 1 spider CLASS class_1630 SpiderData - FIELD field_7404 effect Lnet/minecraft/class_1291; + FIELD field_7404 effect Lnet/minecraft/class_6880; METHOD method_7168 setEffect (Lnet/minecraft/class_5819;)V ARG 1 random CLASS class_1631 TargetGoal diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index e2ecaf0361..4e87c42e61 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_6019; FIELD field_25608 angerPassingCooldown I FIELD field_25609 ANGER_PASSING_COOLDOWN_RANGE Lnet/minecraft/class_6019; - FIELD field_41029 EYE_HEIGHT F - FIELD field_41598 BABY_EYE_HEIGHT_OFFSET F FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7308 angrySoundDelay I FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 59b74802e8..2609eb7a2a 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -65,10 +65,9 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 4 min ARG 6 max ARG 8 random - METHOD method_49124 setChildAttribute (Lnet/minecraft/class_1296;Lnet/minecraft/class_1496;Lnet/minecraft/class_1320;DD)V + METHOD method_49124 setChildAttribute (Lnet/minecraft/class_1296;Lnet/minecraft/class_1496;Lnet/minecraft/class_6880;DD)V ARG 1 other ARG 2 child - ARG 3 attribute ARG 4 min ARG 6 max METHOD method_49129 (I)I @@ -79,9 +78,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 controllingPassenger METHOD method_49996 isWooden (Lnet/minecraft/class_2498;)Z ARG 1 soundGroup - METHOD method_52550 getPassengerAttachmentY (Lnet/minecraft/class_4048;F)F - ARG 1 dimensions - ARG 2 scaleFactor 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/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping index 7a48047738..faa39214b0 100644 --- a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1473 net/minecraft/entity/passive/SnowGolemEntity FIELD field_30373 HAS_PUMPKIN_FLAG B - FIELD field_30374 EYE_HEIGHT F FIELD field_6873 SNOW_GOLEM_FLAGS Lnet/minecraft/class_2940; METHOD method_18443 (Lnet/minecraft/class_1309;)Z ARG 0 entity diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 1e7cb2b261..ec44bdaa45 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -138,8 +138,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 0 c METHOD method_53968 isUsernameValid (Ljava/lang/String;)Z ARG 0 name - METHOD method_54292 getReachDistance (Z)F - ARG 0 creative METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping index 80c18c5502..73ada4f338 100644 --- a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1667 net/minecraft/entity/projectile/ArrowEntity FIELD field_46971 DEFAULT_STACK Lnet/minecraft/class_1799; FIELD field_7595 COLOR Lnet/minecraft/class_2940; FIELD field_7596 colorSet Z - FIELD field_7597 potion Lnet/minecraft/class_1842; + FIELD field_7597 potion Lnet/minecraft/class_6880; FIELD field_7598 effects Ljava/util/Set; METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V ARG 1 world diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index 2219ab00b8..c4471b7982 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -44,7 +44,7 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject COMMENT

This is the original stack used to spawn the projectile. {@link #asItemStack} COMMENT returns a copy of that stack which can be safely changed. Additionally, COMMENT {@link #asItemStack} reflects changes to the entity data, such as custom potion ID. - METHOD method_55052 deflect ()V + METHOD method_55052 deflect (Lnet/minecraft/class_1297;)V METHOD method_7433 setNoClip (Z)V ARG 1 noClip METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966; diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index 2ab0e162e3..e3518978a6 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -10,9 +10,8 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti ARG 2 owner METHOD method_46401 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_1842;)V + METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)V ARG 1 stack - ARG 2 potion METHOD method_7498 applySplashPotion (Ljava/util/List;Lnet/minecraft/class_1297;)V ARG 1 statusEffects ARG 2 entity diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 192c3d3fbf..fe63b8ebeb 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti FIELD field_45139 clientYaw D FIELD field_45140 clientPitch D FIELD field_45141 clientVelocity Lnet/minecraft/class_243; - FIELD field_46214 PASSENGER_ATTACHMENT_Y_OFFSET F - FIELD field_46219 VILLAGER_PASSENGER_ATTACHMENT_Y_OFFSET F FIELD field_7660 yawFlipped Z FIELD field_7661 CUSTOM_BLOCK_OFFSET Lnet/minecraft/class_2940; FIELD field_7664 ADJACENT_RAIL_POSITIONS_BY_SHAPE Ljava/util/Map; diff --git a/mappings/net/minecraft/item/HorseArmorItem.mapping b/mappings/net/minecraft/item/HorseArmorItem.mapping index 2937b20e83..56b8fd39ff 100644 --- a/mappings/net/minecraft/item/HorseArmorItem.mapping +++ b/mappings/net/minecraft/item/HorseArmorItem.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_4059 net/minecraft/item/HorseArmorItem FIELD field_18136 bonus I - FIELD field_18137 entityTexture Ljava/lang/String; - FIELD field_30886 ENTITY_TEXTURE_PREFIX Ljava/lang/String; - METHOD (ILjava/lang/String;Lnet/minecraft/class_1792$class_1793;)V + METHOD (ILnet/minecraft/class_4059$class_9076;Ljava/lang/String;Lnet/minecraft/class_1792$class_1793;)V ARG 1 bonus - ARG 2 name - ARG 3 settings METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960; METHOD method_18455 getBonus ()I diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 1185fd18e3..1f9f628a3a 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -285,11 +285,10 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @see Item Stack NBT Operations ARG 0 nbt - METHOD method_7916 addAttributeModifier (Lnet/minecraft/class_1320;Lnet/minecraft/class_1322;Lnet/minecraft/class_1304;)V + METHOD method_7916 addAttributeModifier (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;Lnet/minecraft/class_1304;)V COMMENT Adds an attribute modifier to this stack. COMMENT COMMENT @see #getAttributeModifiers - ARG 1 attribute ARG 2 modifier ARG 3 slot METHOD method_7917 inventoryTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;IZ)V diff --git a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping index 06c57d2de6..17cc5c53f0 100644 --- a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping @@ -4,9 +4,8 @@ CLASS net/minecraft/class_6662 net/minecraft/loot/function/SetPotionLootFunction METHOD (Ljava/util/List;Lnet/minecraft/class_6880;)V ARG 1 conditions ARG 2 potion - METHOD method_38927 builder (Lnet/minecraft/class_1842;)Lnet/minecraft/class_120$class_121; - ARG 0 potion - METHOD method_38928 (Lnet/minecraft/class_1842;Ljava/util/List;)Lnet/minecraft/class_117; + METHOD method_38927 builder (Lnet/minecraft/class_6880;)Lnet/minecraft/class_120$class_121; + METHOD method_38928 (Lnet/minecraft/class_6880;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_53393 (Lnet/minecraft/class_6662;)Lnet/minecraft/class_6880; ARG 0 function diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index 993ae07607..0c2a6828c2 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -16,8 +16,7 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunct METHOD method_637 builder ()Lnet/minecraft/class_152$class_153; CLASS class_153 Builder FIELD field_1123 map Lcom/google/common/collect/ImmutableList$Builder; - METHOD method_640 withEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_5658;)Lnet/minecraft/class_152$class_153; - ARG 1 effect + METHOD method_640 withEffect (Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)Lnet/minecraft/class_152$class_153; ARG 2 durationRange CLASS class_8754 StewEffect FIELD field_45854 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 286249aa8f..7a690bff13 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -1,20 +1,18 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket - FIELD field_13049 secondaryEffectId Ljava/util/Optional; - FIELD field_13050 primaryEffectId Ljava/util/Optional; + FIELD comp_2180 primaryEffectId Ljava/util/Optional; + FIELD comp_2181 secondaryEffectId Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 primaryEffectId ARG 2 secondaryEffectId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12435 getSecondaryEffectId ()Ljava/util/Optional; - METHOD method_12436 getPrimaryEffectId ()Ljava/util/Optional; - METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1291;)V + METHOD comp_2180 primaryEffectId ()Ljava/util/Optional; + METHOD comp_2181 secondaryEffectId ()Ljava/util/Optional; + METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 - ARG 1 secondaryEffectId - METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1291; + METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; ARG 0 buf2 - METHOD method_43366 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1291;)V + METHOD method_43366 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 - ARG 1 primaryEffectId - METHOD method_43367 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1291; + METHOD method_43367 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; ARG 0 buf2 diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping index 68359fc5ab..93a3a6d8c6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping @@ -19,13 +19,12 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri METHOD method_34202 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1322; ARG 0 modifiers CLASS class_2782 Entry - FIELD field_12722 baseValue D - FIELD field_12723 modifiers Ljava/util/Collection; - FIELD field_12724 attribute Lnet/minecraft/class_1320; - METHOD (Lnet/minecraft/class_1320;DLjava/util/Collection;)V - ARG 1 attribute + FIELD comp_2177 attribute Lnet/minecraft/class_6880; + FIELD comp_2178 baseValue D + FIELD comp_2179 modifiers Ljava/util/Collection; + METHOD (Lnet/minecraft/class_6880;DLjava/util/Collection;)V ARG 2 baseValue ARG 4 modifiers - METHOD method_11939 getModifiers ()Ljava/util/Collection; - METHOD method_11940 getAttribute ()Lnet/minecraft/class_1320; - METHOD method_11941 getBaseValue ()D + METHOD comp_2177 attribute ()Lnet/minecraft/class_6880; + METHOD comp_2178 baseValue ()D + METHOD comp_2179 modifiers ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index 3155f481de..a8a7cf58a8 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket - FIELD field_12725 effectId Lnet/minecraft/class_1291; + FIELD field_12725 effectId Lnet/minecraft/class_6880; FIELD field_12726 duration I FIELD field_12727 entityId I FIELD field_12728 flags B @@ -7,8 +7,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu FIELD field_33356 AMBIENT_MASK I FIELD field_33357 SHOW_PARTICLES_MASK I FIELD field_33358 SHOW_ICON_MASK I - FIELD field_38364 factorCalculationData Lnet/minecraft/class_1293$class_7247; - METHOD (ILnet/minecraft/class_1293;)V + METHOD (ILnet/minecraft/class_1293;Z)V ARG 1 entityId ARG 2 effect METHOD (Lnet/minecraft/class_2540;)V @@ -17,12 +16,6 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11943 getEntityId ()I METHOD method_11944 getDuration ()I METHOD method_11945 getAmplifier ()B - METHOD method_11946 getEffectId ()Lnet/minecraft/class_1291; + METHOD method_11946 getEffectId ()Lnet/minecraft/class_6880; METHOD method_11949 shouldShowParticles ()Z METHOD method_11950 isAmbient ()Z - METHOD method_42625 getFactorCalculationData ()Lnet/minecraft/class_1293$class_7247; - METHOD method_43891 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1293$class_7247;)V - ARG 0 buf2 - ARG 1 factorCalculationData - METHOD method_43892 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1293$class_7247; - ARG 0 buf2 diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping index 40de634589..26aca9e7f4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket - FIELD field_12424 entityId I - FIELD field_12425 effectType Lnet/minecraft/class_1291; - METHOD (ILnet/minecraft/class_1291;)V + FIELD comp_2175 entityId I + FIELD comp_2176 effectType Lnet/minecraft/class_6880; + METHOD (ILnet/minecraft/class_6880;)V ARG 1 entityId - ARG 2 effectType METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD comp_2175 entityId ()I + METHOD comp_2176 effectType ()Lnet/minecraft/class_6880; METHOD method_11767 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world - METHOD method_11768 getEffectType ()Lnet/minecraft/class_1291; diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index f84eef3cd9..252c176785 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion - FIELD field_45767 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_8954 baseName Ljava/lang/String; - FIELD field_8955 effects Lcom/google/common/collect/ImmutableList; + FIELD field_8955 effects Ljava/util/List; METHOD (Ljava/lang/String;[Lnet/minecraft/class_1293;)V ARG 1 baseName ARG 2 effects METHOD ([Lnet/minecraft/class_1293;)V ARG 1 effects - METHOD method_53211 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; - METHOD method_8048 byId (Ljava/lang/String;)Lnet/minecraft/class_1842; + METHOD method_8048 byId (Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 id METHOD method_8049 getEffects ()Ljava/util/List; METHOD method_8050 hasInstantEffect ()Z - METHOD method_8051 finishTranslationKey (Ljava/lang/String;)Ljava/lang/String; - ARG 1 prefix + METHOD method_8051 finishTranslationKey (Lnet/minecraft/class_6880;Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index f549803bf9..0747c29bef 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -14,22 +14,19 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil METHOD method_8056 setCustomPotionEffects (Lnet/minecraft/class_1799;Ljava/util/Collection;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 effects - METHOD method_8057 getPotion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1842; + METHOD method_8057 getPotion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_6880; ARG 0 compound METHOD method_8058 getCustomPotionEffects (Lnet/minecraft/class_2487;Ljava/util/List;)V ARG 0 nbt ARG 1 list - METHOD method_8059 getPotionEffects (Lnet/minecraft/class_1842;Ljava/util/Collection;)Ljava/util/List; - ARG 0 potion + METHOD method_8059 getPotionEffects (Lnet/minecraft/class_6880;Ljava/util/Collection;)Ljava/util/List; ARG 1 custom METHOD method_8060 getCustomPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; ARG 0 nbt - METHOD method_8061 setPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1799; + METHOD method_8061 setPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; ARG 0 stack - ARG 1 potion - METHOD method_8062 getColor (Lnet/minecraft/class_1842;)I - ARG 0 potion - METHOD method_8063 getPotion (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1842; + METHOD method_8062 getColor (Lnet/minecraft/class_6880;)I + METHOD method_8063 getPotion (Lnet/minecraft/class_1799;)Lnet/minecraft/class_6880; ARG 0 stack METHOD method_8064 getColor (Lnet/minecraft/class_1799;)I ARG 0 stack diff --git a/mappings/net/minecraft/potion/Potions.mapping b/mappings/net/minecraft/potion/Potions.mapping index c03dea78d9..47270cc0b7 100644 --- a/mappings/net/minecraft/potion/Potions.mapping +++ b/mappings/net/minecraft/potion/Potions.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_1847 net/minecraft/potion/Potions FIELD field_42473 EMPTY_KEY Lnet/minecraft/class_5321; - FIELD field_8984 EMPTY Lnet/minecraft/class_1842; - METHOD method_48962 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1842; + FIELD field_8984 EMPTY Lnet/minecraft/class_6880; + METHOD method_48962 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; ARG 0 key ARG 1 potion - METHOD method_8084 register (Ljava/lang/String;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1842; + METHOD method_8084 register (Ljava/lang/String;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; ARG 0 name ARG 1 potion diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index 492e18e01c..f627b6c58a 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -28,9 +28,7 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredic CLASS class_8748 Builder FIELD field_45765 EFFECTS Lcom/google/common/collect/ImmutableMap$Builder; METHOD method_53200 create ()Lnet/minecraft/class_2102$class_8748; - METHOD method_53201 addEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_2102$class_8748; - ARG 1 effect - METHOD method_53202 addEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_2102$class_2103;)Lnet/minecraft/class_2102$class_8748; - ARG 1 effect + METHOD method_53201 addEffect (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2102$class_8748; + METHOD method_53202 addEffect (Lnet/minecraft/class_6880;Lnet/minecraft/class_2102$class_2103;)Lnet/minecraft/class_2102$class_8748; ARG 2 effectData METHOD method_53203 build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 09b84e98b7..3c1d81c4e5 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -21,8 +21,7 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate FIELD field_9654 nbt Ljava/util/Optional; METHOD method_20399 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2073$class_2074; ARG 1 nbt - METHOD method_35232 potion (Lnet/minecraft/class_1842;)Lnet/minecraft/class_2073$class_2074; - ARG 1 potion + METHOD method_35232 potion (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2073$class_2074; METHOD method_35233 count (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 count METHOD method_35234 storedEnchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; diff --git a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping index 77841e347a..6f8d05c1a3 100644 --- a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping +++ b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping @@ -3,8 +3,7 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry FIELD field_8957 POTION_TYPES Ljava/util/List; FIELD field_8958 POTION_TYPE_PREDICATE Ljava/util/function/Predicate; FIELD field_8959 ITEM_RECIPES Ljava/util/List; - METHOD method_20361 isBrewable (Lnet/minecraft/class_1842;)Z - ARG 0 potion + METHOD method_20361 isBrewable (Lnet/minecraft/class_6880;)Z METHOD method_8069 isPotionRecipeIngredient (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_8070 hasItemRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z @@ -19,10 +18,8 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry ARG 1 ingredient METHOD method_8073 (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_8074 registerPotionRecipe (Lnet/minecraft/class_1842;Lnet/minecraft/class_1792;Lnet/minecraft/class_1842;)V - ARG 0 input + METHOD method_8074 registerPotionRecipe (Lnet/minecraft/class_6880;Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)V ARG 1 item - ARG 2 output METHOD method_8075 hasPotionRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 input ARG 1 ingredient @@ -37,10 +34,11 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry METHOD method_8080 registerPotionType (Lnet/minecraft/class_1792;)V ARG 0 item CLASS class_1846 Recipe - FIELD field_8960 ingredient Lnet/minecraft/class_1856; - FIELD field_8961 output Ljava/lang/Object; - FIELD field_8962 input Ljava/lang/Object; - METHOD (Ljava/lang/Object;Lnet/minecraft/class_1856;Ljava/lang/Object;)V - ARG 1 input + FIELD comp_2190 input Lnet/minecraft/class_6880; + FIELD comp_2191 ingredient Lnet/minecraft/class_1856; + FIELD comp_2192 output Lnet/minecraft/class_6880; + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;)V ARG 2 ingredient - ARG 3 output + METHOD comp_2190 input ()Lnet/minecraft/class_6880; + METHOD comp_2191 ingredient ()Lnet/minecraft/class_1856; + METHOD comp_2192 output ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 8eb3b9e849..cf8b292472 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -73,57 +73,51 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_46912 POOL_ALIAS_BINDING Lnet/minecraft/class_2378; FIELD field_47496 CRITERION Lnet/minecraft/class_2378; FIELD field_47555 NUMBER_FORMAT_TYPE Lnet/minecraft/class_2378; - METHOD method_47450 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4168; + METHOD method_47450 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47451 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4170; + METHOD method_47451 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47452 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4149; + METHOD method_47452 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47453 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4140; + METHOD method_47453 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47454 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3852; + METHOD method_47454 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47455 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3854; + METHOD method_47455 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47456 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3448; + METHOD method_47456 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47457 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5717; + METHOD method_47457 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47458 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1320; + METHOD method_47459 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47459 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1865; + METHOD method_47460 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47460 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3956; + METHOD method_47461 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47461 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3917; + METHOD method_47462 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47462 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4996; + METHOD method_47463 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47463 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3827; + METHOD method_47464 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47464 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2806; + METHOD method_47465 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47465 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2960; + METHOD method_47466 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47466 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2591; + METHOD method_47467 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47467 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2396; + METHOD method_47469 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47468 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1842; + METHOD method_47470 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47469 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1792; + METHOD method_47471 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47470 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1299; + METHOD method_47472 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47471 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1887; + METHOD method_47474 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47472 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2248; - ARG 0 registry - METHOD method_47473 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1291; - ARG 0 registry - METHOD method_47474 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3611; - ARG 0 registry - METHOD method_47475 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3414; + METHOD method_47475 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47476 bootstrap ()V METHOD method_47477 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; @@ -154,8 +148,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries ARG 0 registries METHOD method_47484 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V ARG 1 registry - METHOD method_47486 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5712; - ARG 0 registry METHOD method_47487 init ()V METHOD method_47488 createIntrusive (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; ARG 0 key @@ -166,58 +158,58 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries ARG 0 key ARG 1 defaultId ARG 2 initializer - METHOD method_47490 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7106; + METHOD method_47490 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47491 freezeRegistries ()V - METHOD method_47492 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3816; + METHOD method_47492 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47493 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3828; + METHOD method_47493 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47494 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5202; + METHOD method_47494 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47495 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4663; + METHOD method_47495 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47496 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7388; + METHOD method_47496 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47497 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5142; + METHOD method_47497 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47498 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4648; + METHOD method_47498 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47499 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4652; + METHOD method_47499 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47500 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6798; + METHOD method_47500 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47501 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7151; + METHOD method_47501 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47502 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3773; + METHOD method_47502 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47503 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6875; + METHOD method_47503 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47504 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3031; + METHOD method_47504 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47505 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2939; + METHOD method_47505 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47506 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6647; + METHOD method_47506 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47507 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6123; + METHOD method_47507 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47508 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6018; + METHOD method_47508 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47509 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5864; + METHOD method_47509 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47510 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5669; + METHOD method_47510 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47511 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5650; + METHOD method_47511 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47512 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5657; + METHOD method_47512 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47513 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5342; + METHOD method_47513 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47514 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5339; + METHOD method_47514 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_47515 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5338; + METHOD method_47515 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry - METHOD method_49927 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_8249; + METHOD method_49927 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_53495 createIntrusive (Lnet/minecraft/class_5321;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; ARG 0 key diff --git a/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping b/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping index 7566ec249a..97a00f6de7 100644 --- a/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_3505 net/minecraft/registry/tag/TagManagerLoader ARG 2 prepareExecutor ARG 3 requirement METHOD method_40096 getRegistryTags ()Ljava/util/List; - METHOD method_40097 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Ljava/util/Optional; - ARG 2 id METHOD method_40098 (Ljava/util/List;Ljava/lang/Void;)V ARG 2 void_ METHOD method_40099 getPath (Lnet/minecraft/class_5321;)Ljava/lang/String; diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index fe8260ff73..3cf8608cfe 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -22,12 +22,11 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler ARG 1 primary ARG 2 secondary METHOD method_17373 getProperties ()I - METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_1291; - METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_1291; + METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_6880; + METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_6880; METHOD method_17376 hasPayment ()Z - METHOD method_53173 getRawIdForStatusEffect (Lnet/minecraft/class_1291;)I - ARG 0 statusEffect - METHOD method_53174 getStatusEffectForRawId (I)Lnet/minecraft/class_1291; + METHOD method_53173 getRawIdForStatusEffect (Lnet/minecraft/class_6880;)I + METHOD method_53174 getStatusEffectForRawId (I)Lnet/minecraft/class_6880; ARG 0 id CLASS class_1705 PaymentSlot METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1263;III)V diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index c540f1f398..7caaedad90 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -102,7 +102,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 2 permissionLevel METHOD method_14597 disconnectAllPlayers ()V METHOD method_14599 reloadWhitelist ()V - METHOD method_14600 loadPlayerData (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2487; + METHOD method_14600 loadPlayerData (Lnet/minecraft/class_3222;)Ljava/util/Optional; ARG 1 player METHOD method_14601 updatePlayerLatency ()V METHOD method_14602 getPlayer (Ljava/util/UUID;)Lnet/minecraft/class_3222; diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index 349fd22e96..8354efa36d 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -63,8 +63,6 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 1 predicate METHOD method_43917 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_45147 getKeyString (Lcom/mojang/datafixers/util/Pair;)Ljava/lang/String; - ARG 0 result METHOD method_45148 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7737$class_7741;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;ZLjava/time/Duration;)I ARG 0 source ARG 1 predicate @@ -85,5 +83,3 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 2 tag METHOD method_45151 (Lnet/minecraft/class_7737$class_7741;Lnet/minecraft/class_6880$class_6883;)Ljava/lang/String; ARG 1 entry - METHOD method_45152 (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 key diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index ef59bf4589..8a09141a39 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -2,10 +2,9 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction METHOD comp_1994 id ()Lnet/minecraft/class_2960; METHOD method_52592 continuesToNextLine (Ljava/lang/CharSequence;)Z ARG 0 string - METHOD method_52595 withMacroReplaced (Lnet/minecraft/class_2487;Lcom/mojang/brigadier/CommandDispatcher;Ljava/lang/Object;)Lnet/minecraft/class_8868; + METHOD method_52595 withMacroReplaced (Lnet/minecraft/class_2487;Lcom/mojang/brigadier/CommandDispatcher;)Lnet/minecraft/class_8868; ARG 1 arguments ARG 2 dispatcher - ARG 3 source METHOD method_54417 parse (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_8856; ARG 0 dispatcher ARG 1 source diff --git a/mappings/net/minecraft/server/function/FunctionBuilder.mapping b/mappings/net/minecraft/server/function/FunctionBuilder.mapping index f65c6625fc..29b81cb1bf 100644 --- a/mappings/net/minecraft/server/function/FunctionBuilder.mapping +++ b/mappings/net/minecraft/server/function/FunctionBuilder.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_8867 net/minecraft/server/function/FunctionBuilder ARG 1 action METHOD method_54420 indexOfVariable (Ljava/lang/String;)I ARG 1 variable - METHOD method_54421 addMacroCommand (Ljava/lang/String;I)V + METHOD method_54421 addMacroCommand (Ljava/lang/String;ILnet/minecraft/class_8839;)V ARG 1 command ARG 2 lineNum METHOD method_54422 indicesOfVariables (Ljava/util/List;)Lit/unimi/dsi/fastutil/ints/IntList; diff --git a/mappings/net/minecraft/server/function/Macro.mapping b/mappings/net/minecraft/server/function/Macro.mapping index 252a9fbd0a..cc1c3ce943 100644 --- a/mappings/net/minecraft/server/function/Macro.mapping +++ b/mappings/net/minecraft/server/function/Macro.mapping @@ -9,11 +9,10 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro ARG 1 id ARG 2 lines ARG 3 varNames - METHOD method_52597 withMacroReplaced (Ljava/util/List;Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8868; + METHOD method_52597 withMacroReplaced (Ljava/util/List;Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;)Lnet/minecraft/class_8868; ARG 1 varNames ARG 2 arguments ARG 3 dispatcher - ARG 4 source METHOD method_53840 toString (Lnet/minecraft/class_2520;)Ljava/lang/String; ARG 0 nbt METHOD method_54423 (Ljava/text/DecimalFormat;)V @@ -28,15 +27,13 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro ARG 2 index CLASS class_8869 Line METHOD method_54428 getDependentVariables ()Lit/unimi/dsi/fastutil/ints/IntList; - METHOD method_54429 instantiate (Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Ljava/lang/Object;Lnet/minecraft/class_2960;)Lnet/minecraft/class_8856; + METHOD method_54429 instantiate (Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2960;)Lnet/minecraft/class_8856; ARG 1 args ARG 2 dispatcher - ARG 3 source - ARG 4 id CLASS class_8870 VariableLine FIELD field_46760 invocation Lnet/minecraft/class_8873; FIELD field_46761 variableIndices Lit/unimi/dsi/fastutil/ints/IntList; - METHOD (Lnet/minecraft/class_8873;Lit/unimi/dsi/fastutil/ints/IntList;)V + METHOD (Lnet/minecraft/class_8873;Lit/unimi/dsi/fastutil/ints/IntList;Lnet/minecraft/class_8839;)V ARG 1 invocation ARG 2 variableIndices CLASS class_8871 FixedLine diff --git a/mappings/net/minecraft/server/network/DebugInfoSender.mapping b/mappings/net/minecraft/server/network/DebugInfoSender.mapping index 9b99dd511e..b805dd74d1 100644 --- a/mappings/net/minecraft/server/network/DebugInfoSender.mapping +++ b/mappings/net/minecraft/server/network/DebugInfoSender.mapping @@ -53,7 +53,7 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender METHOD method_24819 sendPoi (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos - METHOD method_33139 sendGameEvent (Lnet/minecraft/class_1937;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V + METHOD method_33139 sendGameEvent (Lnet/minecraft/class_1937;Lnet/minecraft/class_6880;Lnet/minecraft/class_243;)V ARG 0 world ARG 1 event ARG 2 pos diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index bb3ca0985b..4254c1ff2c 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -26,7 +26,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_14145 updatedX D FIELD field_14146 lastTickY D FIELD field_14147 topmostRiddenEntity Lnet/minecraft/class_1297; - FIELD field_37280 MAX_BREAK_SQUARED_DISTANCE D FIELD field_37281 DEFAULT_SEQUENCE I FIELD field_37282 sequence I FIELD field_39805 messageUnpacker Lnet/minecraft/class_7610$class_7611; diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index c8d7443b1d..f0f37da5c0 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -374,9 +374,8 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 2 direction ARG 3 powerPredicate ARG 4 errorMessage - METHOD method_52889 expectEntityHasEffect (Lnet/minecraft/class_1309;Lnet/minecraft/class_1291;I)V + METHOD method_52889 expectEntityHasEffect (Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;I)V ARG 1 entity - ARG 2 effect ARG 3 amplifier METHOD method_54143 expectItem (Lnet/minecraft/class_1792;)V ARG 1 item diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9074.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9074.mapping new file mode 100644 index 0000000000..13fa1fb80d --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9074.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9074 net/minecraft/unused/packageinfo/PackageInfo9074 diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 56863c78c5..6a0f51eb0e 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -31,8 +31,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers METHOD method_52551 createMasterLibrarianTradeFactory ()Lnet/minecraft/class_3853$class_1652; METHOD method_52552 createLibrarianTradeFactory (I)Lnet/minecraft/class_3853$class_1652; ARG 0 experience - METHOD method_52553 createPotionStack (Lnet/minecraft/class_1842;)Lnet/minecraft/class_1799; - ARG 0 potion + METHOD method_52553 createPotionStack (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; METHOD method_53832 enchant (Lnet/minecraft/class_1792;Lnet/minecraft/class_1887;I)Lnet/minecraft/class_1799; ARG 0 item ARG 1 enchantment @@ -218,8 +217,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 1 stewEffects ARG 2 experience ARG 3 multiplier - METHOD (Lnet/minecraft/class_1291;II)V - ARG 1 effect + METHOD (Lnet/minecraft/class_6880;II)V ARG 2 duration ARG 3 experience CLASS class_4167 SellPotionHoldingItemFactory @@ -239,8 +237,6 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 5 price ARG 6 maxUses ARG 7 experience - METHOD method_19203 (Lnet/minecraft/class_1842;)Z - ARG 0 potion CLASS class_8640 TypedWrapperFactory FIELD comp_1962 typeToFactory Ljava/util/Map; METHOD comp_1962 typeToFactory ()Ljava/util/Map; diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index 4abb6164dc..f7fd23c5b0 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -3,12 +3,12 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 1 eventId ARG 2 pos ARG 3 data - METHOD method_32888 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V + METHOD method_32888 emitGameEvent (Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V COMMENT Emits a game event. ARG 1 event ARG 2 emitterPos ARG 3 emitter - METHOD method_33596 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V + METHOD method_33596 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)V ARG 1 entity ARG 2 event ARG 3 pos @@ -47,11 +47,11 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 4 neighborPos ARG 5 flags ARG 6 maxUpdateDepth - METHOD method_43275 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V + METHOD method_43275 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Lnet/minecraft/class_243;)V ARG 1 entity ARG 2 event ARG 3 pos - METHOD method_43276 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712$class_7397;)V + METHOD method_43276 emitGameEvent (Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712$class_7397;)V ARG 1 event ARG 2 pos ARG 3 emitter diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 26e09cf9c6..9665238f15 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -167,14 +167,6 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT A spawner spawns a mob. COMMENT
Spawns smoke and flame particles. COMMENT

Called by {@link net.minecraft.block.spawner.MobSpawnerLogic#serverTick(net.minecraft.server.world.ServerWorld, net.minecraft.util.math.BlockPos) MobSpawnerLogic#serverTick} - FIELD field_31148 PLANT_FERTILIZED I - COMMENT A plant is fertilized with bone meal or by a bee, or a turtle egg is placed. - COMMENT
Spawns happy villager particles. - COMMENT

Called by {@link net.minecraft.entity.passive.BeeEntity.GrowCropsGoal#tick() BeeEntity.GrowCropsGoal#tick}, - COMMENT {@link net.minecraft.item.BoneMealItem#useOnBlock(net.minecraft.item.ItemUsageContext) BoneMealItem#useOnBlock}, - COMMENT {@link net.minecraft.entity.ai.brain.task.BoneMealTask#keepRunning(net.minecraft.server.world.ServerWorld, net.minecraft.entity.passive.VillagerEntity, long) BoneMealTask#keepRunning}, - COMMENT {@link net.minecraft.block.dispenser.DispenserBehavior DispenserBehavior}, - COMMENT and {@link net.minecraft.block.TurtleEggBlock#onBlockAdded(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, boolean) TurtleEggBlock#onBlockAdded} FIELD field_31149 DRAGON_BREATH_CLOUD_SPAWNS I COMMENT A dragon breath cloud spawns. COMMENT
Plays the dragon fireball explode sound event and spawns dragon breath particles. diff --git a/mappings/net/minecraft/world/WorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandler.mapping index 38b9b7e7b0..a46ed33391 100644 --- a/mappings/net/minecraft/world/WorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/WorldSaveHandler.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V ARG 1 session ARG 2 dataFixer - METHOD method_261 loadPlayerData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_2487; + METHOD method_261 loadPlayerData (Lnet/minecraft/class_1657;Ljava/lang/String;)Ljava/util/Optional; ARG 1 player METHOD method_262 savePlayerData (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_263 getSavedPlayerIds ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping index 134143571f..59e32a24ff 100644 --- a/mappings/net/minecraft/world/event/GameEvent.mapping +++ b/mappings/net/minecraft/world/event/GameEvent.mapping @@ -1,18 +1,14 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent - FIELD field_28154 range I + FIELD comp_2193 range I FIELD field_31449 DEFAULT_RANGE I - FIELD field_36412 registryEntry Lnet/minecraft/class_6880$class_6883; METHOD (I)V ARG 1 range - METHOD method_32939 register (Ljava/lang/String;)Lnet/minecraft/class_5712; + METHOD comp_2193 range ()I + METHOD method_32939 register (Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; ARG 0 id - METHOD method_32940 register (Ljava/lang/String;I)Lnet/minecraft/class_5712; + METHOD method_32940 register (Ljava/lang/String;I)Lnet/minecraft/class_6880$class_6883; ARG 0 id ARG 1 range - METHOD method_32941 getRange ()I - METHOD method_40156 isIn (Lnet/minecraft/class_6862;)Z - ARG 1 tag - METHOD method_40157 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; CLASS class_7397 Emitter METHOD method_43285 of (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5712$class_7397; ARG 0 sourceEntity @@ -22,12 +18,12 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent METHOD method_43287 of (Lnet/minecraft/class_2680;)Lnet/minecraft/class_5712$class_7397; ARG 0 affectedState CLASS class_7447 Message - FIELD field_39177 event Lnet/minecraft/class_5712; + FIELD field_39177 event Lnet/minecraft/class_6880; FIELD field_39178 emitterPos Lnet/minecraft/class_243; FIELD field_39179 emitter Lnet/minecraft/class_5712$class_7397; FIELD field_39180 listener Lnet/minecraft/class_5714; FIELD field_39181 distanceTraveled D - METHOD (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V ARG 1 event ARG 2 emitterPos ARG 3 emitter @@ -35,7 +31,7 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent ARG 5 listenerPos METHOD compareTo (Ljava/lang/Object;)I ARG 1 other - METHOD method_43724 getEvent ()Lnet/minecraft/class_5712; + METHOD method_43724 getEvent ()Lnet/minecraft/class_6880; METHOD method_43726 getEmitterPos ()Lnet/minecraft/class_243; METHOD method_43727 getEmitter ()Lnet/minecraft/class_5712$class_7397; METHOD method_43728 getListener ()Lnet/minecraft/class_5714; diff --git a/mappings/net/minecraft/world/event/Vibrations.mapping b/mappings/net/minecraft/world/event/Vibrations.mapping index 1d59e4dcf0..0944f46130 100644 --- a/mappings/net/minecraft/world/event/Vibrations.mapping +++ b/mappings/net/minecraft/world/event/Vibrations.mapping @@ -1,19 +1,16 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations - FIELD field_44638 RESONATIONS [Lnet/minecraft/class_5712; + FIELD field_44638 RESONATIONS Ljava/util/List; FIELD field_44639 FREQUENCIES Ljava/util/function/ToIntFunction; METHOD method_51298 getVibrationListenerData ()Lnet/minecraft/class_8514$class_8515; METHOD method_51299 getVibrationCallback ()Lnet/minecraft/class_8514$class_5719; - METHOD method_51383 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V - ARG 0 frequencies METHOD method_51384 getSignalStrength (FI)I ARG 0 distance ARG 1 range - METHOD method_51385 getFrequency (Lnet/minecraft/class_5712;)I - ARG 0 event - METHOD method_51386 getResonation (I)Lnet/minecraft/class_5712; + METHOD method_51385 getFrequency (Lnet/minecraft/class_5321;)I + METHOD method_51386 getResonation (I)Lnet/minecraft/class_5321; ARG 0 frequency CLASS class_5719 Callback - METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V + METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V COMMENT Accepts a game event after delay. ARG 1 world ARG 2 pos @@ -21,14 +18,14 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations ARG 4 sourceEntity ARG 5 entity ARG 6 distance - METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z + METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;)Z COMMENT Returns whether the callback wants to accept this event. ARG 1 world ARG 2 pos ARG 3 event ARG 4 emitter METHOD method_42210 getTag ()Lnet/minecraft/class_6862; - METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z + METHOD method_42324 canAccept (Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;)Z ARG 1 gameEvent ARG 2 emitter METHOD method_42672 onListen ()V @@ -73,9 +70,9 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations FIELD field_44646 receiver Lnet/minecraft/class_8514; METHOD (Lnet/minecraft/class_8514;)V ARG 1 receiver - METHOD method_51398 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + METHOD method_51398 (Lnet/minecraft/class_3218;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V ARG 5 pos - METHOD method_51399 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + METHOD method_51399 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V ARG 1 world ARG 2 listenerData ARG 3 event @@ -91,7 +88,7 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations METHOD method_51402 getTravelDelay (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)F ARG 0 emitterPos ARG 1 listenerPos - METHOD method_51403 forceListen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)V + METHOD method_51403 forceListen (Lnet/minecraft/class_3218;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)V ARG 1 world ARG 2 event ARG 3 emitter diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping index 0dddbc8053..527c7200a7 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping @@ -4,12 +4,12 @@ CLASS net/minecraft/class_7719 net/minecraft/world/event/listener/GameEventDispa FIELD field_40352 world Lnet/minecraft/class_3218; METHOD (Lnet/minecraft/class_3218;)V ARG 1 world - METHOD method_45490 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V + METHOD method_45490 dispatch (Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V ARG 1 event ARG 2 emitterPos ARG 3 emitter METHOD method_45491 dispatchListenersByDistance (Ljava/util/List;)V ARG 1 messages - METHOD method_45492 (Ljava/util/List;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V + METHOD method_45492 (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V ARG 5 listener ARG 6 listenerPos diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping index c92e5d9b6c..5a376aa78c 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa COMMENT An unmodifiable, empty (non-operative) dispatcher. METHOD method_32942 isEmpty ()Z COMMENT Returns whether this dispatcher has no listeners. - METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5713$class_7721;)Z + METHOD method_32943 dispatch (Lnet/minecraft/class_6880;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5713$class_7721;)Z COMMENT Dispatches an event to all the listeners in this dispatcher. ARG 1 event COMMENT the event diff --git a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping index d1ad1b40e6..61abb86bbe 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_5714 net/minecraft/world/event/listener/GameEventListe COMMENT A game event listener listens to game events from {@link GameEventDispatcher}s. METHOD method_32946 getPositionSource ()Lnet/minecraft/class_5716; COMMENT Returns the position source of this listener. - METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)Z + METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_6880;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)Z COMMENT Listens to an incoming game event. COMMENT COMMENT @return {@code true} if the game event has been accepted by this listener diff --git a/mappings/net/minecraft/world/event/listener/Vibration.mapping b/mappings/net/minecraft/world/event/listener/Vibration.mapping index c3159cfb6d..2866a36fda 100644 --- a/mappings/net/minecraft/world/event/listener/Vibration.mapping +++ b/mappings/net/minecraft/world/event/listener/Vibration.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_7269 net/minecraft/world/event/listener/Vibration FIELD field_38245 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V + METHOD (Lnet/minecraft/class_6880;FLnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V ARG 1 gameEvent ARG 2 distance ARG 3 pos ARG 4 uuid ARG 5 projectileOwnerUuid - METHOD (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Lnet/minecraft/class_1297;)V + METHOD (Lnet/minecraft/class_6880;FLnet/minecraft/class_243;Lnet/minecraft/class_1297;)V ARG 1 gameEvent ARG 2 distance ARG 3 pos @@ -17,7 +17,7 @@ CLASS net/minecraft/class_7269 net/minecraft/world/event/listener/Vibration ARG 0 instance METHOD method_42684 getOwnerUuid (Lnet/minecraft/class_1297;)Ljava/util/UUID; ARG 0 entity - METHOD method_42685 (Lnet/minecraft/class_5712;Ljava/lang/Float;Lnet/minecraft/class_243;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_7269; + METHOD method_42685 (Lnet/minecraft/class_6880;Ljava/lang/Float;Lnet/minecraft/class_243;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_7269; ARG 0 event ARG 1 distance ARG 2 pos diff --git a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping index 079124f1b1..1574a76970 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping @@ -51,5 +51,3 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet ARG 1 pos METHOD method_35157 getFreeTickets (Lnet/minecraft/class_2338;)I ARG 1 pos - METHOD method_43986 (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 key From a505d2842f03156f307221835cbddbb30c88c369 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 18 Dec 2023 16:26:44 +0000 Subject: [PATCH 02/47] 23w51b --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index be4d611567..9fbe31f27a 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w51a" +def minecraft_version = "23w51b" filament { minecraftVersion = minecraft_version From 1bbec7296b609b163979ede14f4f2f221214f085 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 19 Dec 2023 20:41:40 +1100 Subject: [PATCH 03/47] 23w51 stuff (#3754) not entirely finished, but it's getting late... --- .../net/minecraft/block/AbstractBlock.mapping | 24 ++++++++++ .../net/minecraft/block/BeehiveBlock.mapping | 2 + .../net/minecraft/block/FlowerBlock.mapping | 2 + .../net/minecraft/block/PumpkinBlock.mapping | 2 + mappings/net/minecraft/block/TntBlock.mapping | 2 + .../block/entity/BeaconBlockEntity.mapping | 6 +++ .../client/gui/hud/BossBarHud.mapping | 1 + .../entity/ArmadilloEntityRenderer.mapping | 2 + .../entity/BreezeEntityRenderer.mapping | 3 ++ .../render/entity/EntityRenderer.mapping | 3 ++ .../animation/ArmadilloAnimations.mapping | 4 ++ .../feature/WolfArmorFeatureRenderer.mapping | 5 +++ .../entity/model/ArmadilloEntityModel.mapping | 14 ++++++ .../entity/model/BreezeEntityModel.mapping | 10 +++++ .../entity/model/WolfEntityModel.mapping | 1 + .../texture/StatusEffectSpriteManager.mapping | 1 + .../data/server/tag/TagProvider.mapping | 2 + .../datafixer/schema/Schema3799.mapping | 1 + .../entity/AreaEffectCloudEntity.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 15 +++++++ .../entity/EntityAttachmentType.mapping | 20 +++++++++ .../entity/EntityAttachments.mapping | 45 +++++++++++++++++++ .../minecraft/entity/EntityDimensions.mapping | 12 ++--- .../net/minecraft/entity/LivingEntity.mapping | 9 ++++ .../ArmadilloScareDetectedSensor.mapping | 19 ++++++++ .../ai/brain/task/StayAboveWaterTask.mapping | 2 + .../entity/ai/goal/GoalSelector.mapping | 1 + .../attribute/AttributeContainer.mapping | 8 ++++ .../DefaultAttributeContainer.mapping | 10 +++++ .../attribute/EntityAttributeInstance.mapping | 3 ++ .../entity/attribute/EntityAttributes.mapping | 3 +- .../entity/damage/DamageSources.mapping | 6 +++ .../entity/damage/DamageTypes.mapping | 2 + .../damage/OneTwentyOneDamageTypes.mapping | 3 ++ .../data/TrackedDataHandlerRegistry.mapping | 1 + .../decoration/ArmorStandEntity.mapping | 1 + .../entity/effect/StatusEffect.mapping | 8 ++++ .../effect/StatusEffectInstance.mapping | 12 +++++ .../entity/effect/StatusEffects.mapping | 2 + .../minecraft/entity/mob/BreezeBrain.mapping | 6 +++ .../minecraft/entity/mob/BreezeEntity.mapping | 1 + .../entity/mob/DrownedEntity.mapping | 1 + .../minecraft/entity/mob/MobEntity.mapping | 1 + .../passive/AbstractHorseEntity.mapping | 1 + .../entity/passive/ArmadilloBrain.mapping | 18 ++++++++ .../entity/passive/ArmadilloEntity.mapping | 32 +++++++++++++ .../entity/passive/SnifferEntity.mapping | 1 + .../entity/passive/WolfEntity.mapping | 7 +++ .../entity/player/PlayerEntity.mapping | 2 + .../PersistentProjectileEntity.mapping | 1 + .../projectile/thrown/PotionEntity.mapping | 1 + .../vehicle/AbstractMinecartEntity.mapping | 1 + .../minecraft/item/AnimalArmorItem.mapping | 20 +++++++++ .../net/minecraft/item/HorseArmorItem.mapping | 6 --- mappings/net/minecraft/item/ItemStack.mapping | 1 + .../function/SetPotionLootFunction.mapping | 1 + .../SetStewEffectLootFunction.mapping | 1 + .../c2s/play/UpdateBeaconC2SPacket.mapping | 4 -- .../play/EntityAttributesS2CPacket.mapping | 6 --- .../RemoveEntityStatusEffectS2CPacket.mapping | 4 -- mappings/net/minecraft/potion/Potion.mapping | 2 + .../net/minecraft/potion/PotionUtil.mapping | 3 ++ mappings/net/minecraft/potion/Potions.mapping | 2 + .../entity/EntityEffectPredicate.mapping | 2 + .../predicate/item/ItemPredicate.mapping | 1 + .../recipe/BrewingRecipeRegistry.mapping | 9 ++-- .../net/minecraft/registry/Registry.mapping | 2 + .../registry/entry/RegistryEntry.mapping | 5 +++ .../screen/BeaconScreenHandler.mapping | 1 + .../server/network/ServerPlayerEntity.mapping | 7 +++ .../net/minecraft/util/ActionResult.mapping | 10 ++--- .../minecraft/util/DateTimeFormatters.mapping | 2 + .../minecraft/util/ItemActionResult.mapping | 5 +++ .../net/minecraft/util/TimeHelper.mapping | 2 + .../net/minecraft/village/TradeOffers.mapping | 4 ++ .../minecraft/world/event/GameEvent.mapping | 4 +- .../minecraft/world/event/Vibrations.mapping | 5 +++ 77 files changed, 410 insertions(+), 40 deletions(-) create mode 100644 mappings/net/minecraft/client/render/entity/ArmadilloEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping create mode 100644 mappings/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/ArmadilloEntityModel.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3799.mapping create mode 100644 mappings/net/minecraft/entity/EntityAttachmentType.mapping create mode 100644 mappings/net/minecraft/entity/EntityAttachments.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor.mapping create mode 100644 mappings/net/minecraft/entity/damage/OneTwentyOneDamageTypes.mapping create mode 100644 mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping create mode 100644 mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping create mode 100644 mappings/net/minecraft/item/AnimalArmorItem.mapping delete mode 100644 mappings/net/minecraft/item/HorseArmorItem.mapping create mode 100644 mappings/net/minecraft/util/DateTimeFormatters.mapping create mode 100644 mappings/net/minecraft/util/ItemActionResult.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 8ff7a65557..51a10bf770 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -344,6 +344,20 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 5 stackMerger METHOD method_55224 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 2 stack + METHOD method_55765 onUseWithItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_9062; + ARG 1 stack + ARG 2 state + ARG 3 world + ARG 4 pos + ARG 5 player + ARG 6 hand + ARG 7 hit + METHOD method_55766 onUse (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 player + ARG 5 hit METHOD method_8389 asItem ()Lnet/minecraft/class_1792; COMMENT {@return the block's corresponding item} COMMENT @@ -1290,6 +1304,16 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 pos ARG 3 explosion ARG 4 stackMerger + METHOD method_55780 onUseWithItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_9062; + ARG 1 stack + ARG 2 world + ARG 3 player + ARG 4 hand + ARG 5 hit + METHOD method_55781 onUse (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; + ARG 1 world + ARG 2 player + ARG 3 hit CLASS class_3752 ShapeCache FIELD field_16555 lightSubtracted I FIELD field_16556 transparent Z diff --git a/mappings/net/minecraft/block/BeehiveBlock.mapping b/mappings/net/minecraft/block/BeehiveBlock.mapping index 079847d702..2f6c551b1a 100644 --- a/mappings/net/minecraft/block/BeehiveBlock.mapping +++ b/mappings/net/minecraft/block/BeehiveBlock.mapping @@ -39,3 +39,5 @@ CLASS net/minecraft/class_4481 net/minecraft/block/BeehiveBlock METHOD method_23894 hasBees (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos + METHOD method_55768 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 3c1a17f95a..242a3e68aa 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -7,9 +7,11 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock ARG 1 stewEffects ARG 2 settings METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_4970$class_2251;)V + ARG 1 effect ARG 2 duration ARG 3 settings METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Ljava/util/List; + ARG 0 effect ARG 1 duration METHOD method_54016 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/block/PumpkinBlock.mapping b/mappings/net/minecraft/block/PumpkinBlock.mapping index 35e3e063f0..5bbd5f115d 100644 --- a/mappings/net/minecraft/block/PumpkinBlock.mapping +++ b/mappings/net/minecraft/block/PumpkinBlock.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_2445 net/minecraft/block/PumpkinBlock FIELD field_46419 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_55777 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx diff --git a/mappings/net/minecraft/block/TntBlock.mapping b/mappings/net/minecraft/block/TntBlock.mapping index ad7640a0b8..f855a5565f 100644 --- a/mappings/net/minecraft/block/TntBlock.mapping +++ b/mappings/net/minecraft/block/TntBlock.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_2530 net/minecraft/block/TntBlock METHOD method_10738 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos + METHOD method_55778 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 1f1781fa95..977e25a50b 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -30,6 +30,8 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 0 world ARG 1 pos ARG 2 beaconLevel + ARG 3 primaryEffect + ARG 4 secondaryEffect METHOD method_16896 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2580;)V ARG 0 world ARG 1 pos @@ -41,12 +43,16 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 2 y ARG 3 z METHOD method_53251 getEffectOrNull (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; + ARG 0 effect METHOD method_53252 readStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 nbt ARG 1 key METHOD method_53253 writeStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_6880;)V ARG 0 nbt ARG 1 key + ARG 2 effect + METHOD method_55779 (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_5321;)V + ARG 2 entryKey CLASS class_2581 BeamSegment FIELD field_11804 height I FIELD field_11805 color [F diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index 013b6b876a..12932a6c68 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud METHOD method_1795 handlePacket (Lnet/minecraft/class_2629;)V ARG 1 packet METHOD method_1796 render (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_1797 shouldDarkenSky ()Z METHOD method_1798 shouldPlayDragonMusic ()Z METHOD method_1799 renderBossBar (Lnet/minecraft/class_332;IILnet/minecraft/class_1259;)V diff --git a/mappings/net/minecraft/client/render/entity/ArmadilloEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ArmadilloEntityRenderer.mapping new file mode 100644 index 0000000000..f8c7e1e21b --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/ArmadilloEntityRenderer.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9084 net/minecraft/client/render/entity/ArmadilloEntityRenderer + FIELD field_47887 TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping index bf6a5f25cf..5ee4da8c60 100644 --- a/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_8986 net/minecraft/client/render/entity/BreezeEntityRenderer FIELD field_47475 TEXTURE Lnet/minecraft/class_2960; + METHOD method_55830 updatePartVisibility (Lnet/minecraft/class_8973;[Lnet/minecraft/class_630;)Lnet/minecraft/class_8973; + ARG 0 model + ARG 1 modelParts diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 3822579746..1cf758a0ff 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 3 matrices ARG 4 vertexConsumers ARG 5 light + ARG 6 tickDelta METHOD method_3931 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; ARG 1 entity METHOD method_3932 getTextRenderer ()Lnet/minecraft/class_327; @@ -44,3 +45,5 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 4 matrices ARG 5 vertexConsumers ARG 6 light + METHOD method_55831 getShadowRadius (Lnet/minecraft/class_1297;)F + ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping new file mode 100644 index 0000000000..c2f21afe0e --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9079 net/minecraft/client/render/entity/animation/ArmadilloAnimations + FIELD field_47843 ROLLING Lnet/minecraft/class_7184; + FIELD field_47844 IDLE Lnet/minecraft/class_7184; + FIELD field_47845 SCARED Lnet/minecraft/class_7184; diff --git a/mappings/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.mapping new file mode 100644 index 0000000000..6915e7df96 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9085 net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer + FIELD field_47890 model Lnet/minecraft/class_624; + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V + ARG 1 context + ARG 2 loader diff --git a/mappings/net/minecraft/client/render/entity/model/ArmadilloEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ArmadilloEntityModel.mapping new file mode 100644 index 0000000000..775ed9aa80 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/ArmadilloEntityModel.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_9082 net/minecraft/client/render/entity/model/ArmadilloEntityModel + FIELD field_47864 HEAD_CUBE Ljava/lang/String; + FIELD field_47865 RIGHT_EAR_CUBE Ljava/lang/String; + FIELD field_47866 LEFT_EAR_CUBE Ljava/lang/String; + FIELD field_47867 root Lnet/minecraft/class_630; + FIELD field_47868 body Lnet/minecraft/class_630; + FIELD field_47869 rightHindLeg Lnet/minecraft/class_630; + FIELD field_47870 leftHindLeg Lnet/minecraft/class_630; + FIELD field_47871 cube Lnet/minecraft/class_630; + FIELD field_47872 head Lnet/minecraft/class_630; + FIELD field_47873 tail Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root + METHOD method_55818 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping index 6ddcb9d23c..8331ee16b1 100644 --- a/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping @@ -5,4 +5,14 @@ CLASS net/minecraft/class_8973 net/minecraft/client/render/entity/model/BreezeEn FIELD field_47438 windMid Lnet/minecraft/class_630; FIELD field_47439 windBottom Lnet/minecraft/class_630; FIELD field_47440 rods Lnet/minecraft/class_630; + FIELD field_47874 eyes Lnet/minecraft/class_630; + FIELD field_47875 windBody Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root METHOD method_55233 getTexturedModelData (II)Lnet/minecraft/class_5607; + ARG 0 textureWidth + ARG 1 textureHeight + METHOD method_55819 getHead ()Lnet/minecraft/class_630; + METHOD method_55820 getEyes ()Lnet/minecraft/class_630; + METHOD method_55821 getRods ()Lnet/minecraft/class_630; + METHOD method_55822 getWindBody ()Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping index f4ce02701f..3331667023 100644 --- a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping @@ -20,3 +20,4 @@ CLASS net/minecraft/class_624 net/minecraft/client/render/entity/model/WolfEntit METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_32068 getTexturedModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5609; + ARG 0 dilation diff --git a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping index 0eb80ead7b..05977a2a4f 100644 --- a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping +++ b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_4074 net/minecraft/client/texture/StatusEffectSpriteMa METHOD (Lnet/minecraft/class_1060;)V ARG 1 textureManager METHOD method_18663 getSprite (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1058; + ARG 1 effect diff --git a/mappings/net/minecraft/data/server/tag/TagProvider.mapping b/mappings/net/minecraft/data/server/tag/TagProvider.mapping index 8443e5ceeb..daaf448999 100644 --- a/mappings/net/minecraft/data/server/tag/TagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/TagProvider.mapping @@ -60,6 +60,8 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/TagProvider ARG 1 keys METHOD method_46835 add (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2474$class_5124; ARG 1 key + METHOD method_55842 add (Ljava/util/List;)Lnet/minecraft/class_2474$class_5124; + ARG 1 keys CLASS class_8210 RegistryInfo CLASS class_8211 TagLookup METHOD contains (Lnet/minecraft/class_6862;)Z diff --git a/mappings/net/minecraft/datafixer/schema/Schema3799.mapping b/mappings/net/minecraft/datafixer/schema/Schema3799.mapping new file mode 100644 index 0000000000..fac1190549 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3799.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9061 net/minecraft/datafixer/schema/Schema3799 diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index d5c9cfaf51..8ca909b810 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -59,3 +59,4 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity ARG 1 effect METHOD method_5611 isWaiting ()Z METHOD method_5612 setPotion (Lnet/minecraft/class_6880;)V + ARG 1 potion diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index e97efdc5a5..d3153a3f80 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -148,6 +148,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_38931 trackedPosition Lnet/minecraft/class_7422; FIELD field_44784 supportingBlockPos Ljava/util/Optional; FIELD field_44873 forceUpdateSupportingBlockPos Z + FIELD field_47742 stateAtPos Lnet/minecraft/class_2680; FIELD field_5951 ridingCooldown I FIELD field_5952 onGround Z FIELD field_5953 firstUpdate Z @@ -992,6 +993,18 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_54756 (Lnet/minecraft/class_1297;)Z ARG 0 passenger METHOD method_54757 getPlayerPassengers ()I + METHOD method_55666 onDeflectProjectile (Lnet/minecraft/class_1676;)V + ARG 1 projectile + METHOD method_55667 getBlockStateAtPos ()Lnet/minecraft/class_2680; + COMMENT {@return the block state at the entity's position} + COMMENT + COMMENT

The result is cached. + COMMENT + COMMENT @see #getBlockPos + COMMENT @see #getLandingBlockState + COMMENT @see #getSteppingBlockState + METHOD method_55668 getVehicleAttachmentPos (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; + ARG 1 vehicle METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V COMMENT Called when this entity's collision box intersects {@code state}. COMMENT @@ -2196,6 +2209,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT the player crosshair} METHOD method_5864 getType ()Lnet/minecraft/class_1299; METHOD method_5865 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V + ARG 1 passenger + ARG 2 positionUpdater METHOD method_5867 calculateNextStepSoundDistance ()F METHOD method_5869 isSubmergedInWater ()Z COMMENT {@return whether this entity's hitbox is fully submerged in water} diff --git a/mappings/net/minecraft/entity/EntityAttachmentType.mapping b/mappings/net/minecraft/entity/EntityAttachmentType.mapping new file mode 100644 index 0000000000..8647206a95 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityAttachmentType.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_9064 net/minecraft/entity/EntityAttachmentType + FIELD field_47746 point Lnet/minecraft/class_9064$class_9065; + METHOD (Ljava/lang/String;ILnet/minecraft/class_9064$class_9065;)V + ARG 3 point + METHOD method_55670 createPoint (FF)Ljava/util/List; + ARG 1 width + ARG 2 height + CLASS class_9065 Point + FIELD field_47748 NONE Ljava/util/List; + FIELD field_47749 ZERO Lnet/minecraft/class_9064$class_9065; + FIELD field_47750 AT_HEIGHT Lnet/minecraft/class_9064$class_9065; + METHOD create (FF)Ljava/util/List; + ARG 1 width + ARG 2 height + METHOD method_55671 (FF)Ljava/util/List; + ARG 0 width + ARG 1 height + METHOD method_55672 (FF)Ljava/util/List; + ARG 0 width + ARG 1 height diff --git a/mappings/net/minecraft/entity/EntityAttachments.mapping b/mappings/net/minecraft/entity/EntityAttachments.mapping new file mode 100644 index 0000000000..11143e1979 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityAttachments.mapping @@ -0,0 +1,45 @@ +CLASS net/minecraft/class_9066 net/minecraft/entity/EntityAttachments + FIELD field_47751 DEFAULT Lnet/minecraft/class_9066; + FIELD field_47752 points Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 points + METHOD method_55673 create ()Lnet/minecraft/class_9066$class_9067; + METHOD method_55674 scale (FFF)Lnet/minecraft/class_9066; + ARG 1 xScale + ARG 2 yScale + ARG 3 zScale + METHOD method_55675 getPointNullable (Lnet/minecraft/class_9064;IF)Lnet/minecraft/class_243; + ARG 1 type + ARG 2 index + ARG 3 yaw + METHOD method_55676 rotatePoint (Lnet/minecraft/class_243;F)Lnet/minecraft/class_243; + ARG 0 point + ARG 1 yaw + METHOD method_55677 scalePoints (Ljava/util/List;FFF)Ljava/util/List; + ARG 0 points + ARG 1 xScale + ARG 2 yScale + ARG 3 zScale + METHOD method_55678 getPoint (Lnet/minecraft/class_9064;IF)Lnet/minecraft/class_243; + ARG 1 type + ARG 2 index + ARG 3 yaw + METHOD method_55679 getPointOrDefault (Lnet/minecraft/class_9064;IF)Lnet/minecraft/class_243; + ARG 1 type + ARG 2 index + ARG 3 yaw + CLASS class_9067 Builder + FIELD field_47753 points Ljava/util/Map; + METHOD method_55680 build (FF)Lnet/minecraft/class_9066; + ARG 1 width + ARG 2 height + METHOD method_55681 (Lnet/minecraft/class_9064;)Ljava/util/List; + ARG 0 list + METHOD method_55682 add (Lnet/minecraft/class_9064;FFF)Lnet/minecraft/class_9066$class_9067; + ARG 1 type + ARG 2 x + ARG 3 y + ARG 4 z + METHOD method_55683 add (Lnet/minecraft/class_9064;Lnet/minecraft/class_243;)Lnet/minecraft/class_9066$class_9067; + ARG 1 type + ARG 2 point diff --git a/mappings/net/minecraft/entity/EntityDimensions.mapping b/mappings/net/minecraft/entity/EntityDimensions.mapping index 6a18c5c7e4..29b651b595 100644 --- a/mappings/net/minecraft/entity/EntityDimensions.mapping +++ b/mappings/net/minecraft/entity/EntityDimensions.mapping @@ -1,14 +1,8 @@ CLASS net/minecraft/class_4048 net/minecraft/entity/EntityDimensions - FIELD comp_2185 width F - FIELD comp_2186 height F - FIELD comp_2189 fixed Z METHOD (FFZ)V ARG 1 width ARG 2 height ARG 3 fixed - METHOD comp_2185 width ()F - METHOD comp_2186 height ()F - METHOD comp_2189 fixed ()Z METHOD method_18383 scaled (F)Lnet/minecraft/class_4048; ARG 1 ratio METHOD method_18384 changing (FF)Lnet/minecraft/class_4048; @@ -26,3 +20,9 @@ CLASS net/minecraft/class_4048 net/minecraft/entity/EntityDimensions ARG 5 z METHOD method_30757 getBoxAt (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; ARG 1 pos + METHOD method_55684 withAttachments (Lnet/minecraft/class_9066$class_9067;)Lnet/minecraft/class_4048; + ARG 1 attachments + METHOD method_55685 withEyeHeight (F)Lnet/minecraft/class_4048; + ARG 1 eyeHeight + METHOD method_55686 getDefaultEyeHeight (F)F + ARG 0 height diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 5beff11a7f..f2ab78e31d 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -349,6 +349,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_52197 sendEffectToControllingPlayer (Lnet/minecraft/class_1293;)V ARG 1 effect METHOD method_52540 updateAttribute (Lnet/minecraft/class_6880;)V + ARG 1 attribute METHOD method_52541 getMaxAbsorption ()F METHOD method_52542 wouldNotSuffocateInPose (Lnet/minecraft/class_4050;)Z ARG 1 pose @@ -361,10 +362,14 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT @see net.minecraft.entity.mob.MobEntity#getAttackBox METHOD method_53964 getMaxRelativeHeadRotation ()F COMMENT {@return the maximum rotation of the head relative to the body in degrees} + METHOD method_55693 getScale ()F + METHOD method_55694 getBaseDimensions (Lnet/minecraft/class_4050;)Lnet/minecraft/class_4048; + ARG 1 pose METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + ARG 1 attribute METHOD method_5997 attackLivingEntity (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_5998 getStackInHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1799; @@ -404,6 +409,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT COMMENT @return whether the active status effects on this entity has been changed by COMMENT this call + ARG 1 effect METHOD method_6017 getSoundPitch ()F METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V ARG 1 hand @@ -488,6 +494,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 entity METHOD method_6058 getActiveHand ()Lnet/minecraft/class_1268; METHOD method_6059 hasStatusEffect (Lnet/minecraft/class_6880;)Z + ARG 1 effect METHOD method_6060 knockback (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_6061 blockedByShield (Lnet/minecraft/class_1282;)Z @@ -604,7 +611,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT Under most circumstances, calling {@link #removeStatusEffect(StatusEffect)} is highly preferable. COMMENT COMMENT @return the status effect removed + ARG 1 effect METHOD method_6112 getStatusEffect (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1293; + ARG 1 effect METHOD method_6113 isSleeping ()Z METHOD method_6114 onAttacking (Lnet/minecraft/class_1297;)V ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor.mapping new file mode 100644 index 0000000000..ad75158d31 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_9068 net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor + FIELD field_47764 threateningEntityPredicate Ljava/util/function/BiPredicate; + FIELD field_47765 canRollUpPredicate Ljava/util/function/Predicate; + FIELD field_47766 memoryModuleType Lnet/minecraft/class_4140; + FIELD field_47767 expiry I + METHOD (ILjava/util/function/BiPredicate;Ljava/util/function/Predicate;Lnet/minecraft/class_4140;I)V + ARG 1 senseInterval + ARG 2 threateningEntityPredicate + ARG 3 canRollUpPredicate + ARG 4 memoryModuleType + ARG 5 expiry + METHOD method_55702 tryDetectThreat (Lnet/minecraft/class_1309;)V + ARG 1 entity + METHOD method_55703 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z + ARG 2 threat + METHOD method_55704 onDetected (Lnet/minecraft/class_1309;)V + ARG 1 entity + METHOD method_55705 clear (Lnet/minecraft/class_1309;)V + ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping index 61be4a0662..618714c791 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_4125 net/minecraft/entity/ai/brain/task/StayAboveWater FIELD field_18387 chance F METHOD (F)V ARG 1 chance + METHOD method_55700 isUnderwater (Lnet/minecraft/class_1308;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping index 5fa269e39d..f5be407ece 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping @@ -44,3 +44,4 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector ARG 1 priority ARG 2 goal METHOD method_6280 remove (Lnet/minecraft/class_1352;)V + ARG 1 goal diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index 3a6098a5c4..446e4e8fda 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -7,8 +7,10 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 1 defaultAttributes METHOD method_26841 getTracked ()Ljava/util/Set; METHOD method_26843 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 1 attribute ARG 2 attributeModifier METHOD method_26844 (Lnet/minecraft/class_6880;Ljava/util/Collection;)V + ARG 1 attribute ARG 2 modifiers METHOD method_26845 updateTrackedStatus (Lnet/minecraft/class_1324;)V ARG 1 instance @@ -16,16 +18,20 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 1 other METHOD method_26847 removeModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers + METHOD method_26849 (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 attribute METHOD method_26850 readNbt (Lnet/minecraft/class_2499;)V ARG 1 nbt METHOD method_26851 getAttributesToSend ()Ljava/util/Collection; METHOD method_26852 getValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute METHOD method_26853 (Lnet/minecraft/class_1324;)V ARG 1 attributeInstance METHOD method_26854 addTemporaryModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers METHOD method_26855 toNbt ()Lnet/minecraft/class_2499; METHOD method_26856 getBaseValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute METHOD method_26857 (Lnet/minecraft/class_1324;)Z ARG 0 attribute METHOD method_45329 getCustomInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; @@ -40,3 +46,5 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 2 uuid METHOD method_52547 (Lnet/minecraft/class_1324;Lnet/minecraft/class_1322;)V ARG 1 modifier + METHOD method_55698 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + ARG 1 attribute diff --git a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping index f58cfd4f48..7d72a06a51 100644 --- a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping @@ -4,22 +4,32 @@ CLASS net/minecraft/class_5132 net/minecraft/entity/attribute/DefaultAttributeCo ARG 1 instances METHOD method_26861 builder ()Lnet/minecraft/class_5132$class_5133; METHOD method_26862 getValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute METHOD method_26863 createOverride (Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; ARG 1 updateCallback + ARG 2 attribute METHOD method_26864 getBaseValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute METHOD method_26865 require (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + ARG 1 attribute METHOD method_27308 getModifierValue (Lnet/minecraft/class_6880;Ljava/util/UUID;)D + ARG 1 attribute ARG 2 uuid METHOD method_27309 hasModifier (Lnet/minecraft/class_6880;Ljava/util/UUID;)Z + ARG 1 attribute ARG 2 uuid METHOD method_27310 has (Lnet/minecraft/class_6880;)Z + ARG 1 attribute CLASS class_5133 Builder FIELD field_23714 instances Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_23715 unmodifiable Z METHOD method_26866 build ()Lnet/minecraft/class_5132; METHOD method_26867 add (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5132$class_5133; + ARG 1 attribute METHOD method_26868 add (Lnet/minecraft/class_6880;D)Lnet/minecraft/class_5132$class_5133; + ARG 1 attribute ARG 2 baseValue METHOD method_26869 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1324;)V ARG 2 attributex METHOD method_26870 checkedAdd (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + ARG 1 attribute diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index debd4db198..1535d84e9a 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns FIELD field_23706 value D FIELD field_23707 updateCallback Ljava/util/function/Consumer; METHOD (Lnet/minecraft/class_6880;Ljava/util/function/Consumer;)V + ARG 1 type ARG 2 updateCallback METHOD method_26831 setFrom (Lnet/minecraft/class_1324;)V COMMENT Copies the values of an attribute to this attribute. @@ -42,6 +43,8 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns COMMENT METHOD method_27304 tryRemoveModifier (Ljava/util/UUID;)Z ARG 1 uuid + METHOD method_55696 updateModifier (Lnet/minecraft/class_1322;)V + ARG 1 modifier METHOD method_6192 setBaseValue (D)V ARG 1 baseValue METHOD method_6193 getModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Set; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping index 165c190239..d3fc01d310 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5134 net/minecraft/entity/attribute/EntityAttributes - FIELD field_45124 GENERIC_MAX_ABSORPTION Lnet/minecraft/class_6880; METHOD method_26871 register (Ljava/lang/String;Lnet/minecraft/class_1320;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 attribute + METHOD method_55699 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry diff --git a/mappings/net/minecraft/entity/damage/DamageSources.mapping b/mappings/net/minecraft/entity/damage/DamageSources.mapping index 70a16d03dc..d9c7e7d495 100644 --- a/mappings/net/minecraft/entity/damage/DamageSources.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSources.mapping @@ -106,3 +106,9 @@ CLASS net/minecraft/class_8109 net/minecraft/entity/damage/DamageSources METHOD method_48837 stalagmite ()Lnet/minecraft/class_1282; METHOD method_51846 outsideBorder ()Lnet/minecraft/class_1282; METHOD method_51847 genericKill ()Lnet/minecraft/class_1282; + METHOD method_55647 spit (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_55648 windCharge (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker diff --git a/mappings/net/minecraft/entity/damage/DamageTypes.mapping b/mappings/net/minecraft/entity/damage/DamageTypes.mapping index 8bed74a6a0..1aa5f727ee 100644 --- a/mappings/net/minecraft/entity/damage/DamageTypes.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTypes.mapping @@ -43,5 +43,7 @@ CLASS net/minecraft/class_8111 net/minecraft/entity/damage/DamageTypes FIELD field_42360 MOB_ATTACK Lnet/minecraft/class_5321; FIELD field_44868 OUTSIDE_BORDER Lnet/minecraft/class_5321; FIELD field_44869 GENERIC_KILL Lnet/minecraft/class_5321; + FIELD field_47736 SPIT Lnet/minecraft/class_5321; + FIELD field_47737 WIND_CHARGE Lnet/minecraft/class_5321; METHOD method_48839 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 damageTypeRegisterable diff --git a/mappings/net/minecraft/entity/damage/OneTwentyOneDamageTypes.mapping b/mappings/net/minecraft/entity/damage/OneTwentyOneDamageTypes.mapping new file mode 100644 index 0000000000..b129061944 --- /dev/null +++ b/mappings/net/minecraft/entity/damage/OneTwentyOneDamageTypes.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9086 net/minecraft/entity/damage/OneTwentyOneDamageTypes + METHOD method_55843 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 damageTypeRegisterable diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 0159f58980..3968eaa137 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis FIELD field_42236 OPTIONAL_BLOCK_STATE Lnet/minecraft/class_2941; FIELD field_42237 VECTOR3F Lnet/minecraft/class_2941; FIELD field_42543 SNIFFER_STATE Lnet/minecraft/class_2941; + FIELD field_47707 ARMADILLO_STATE Lnet/minecraft/class_2941; METHOD method_12719 getId (Lnet/minecraft/class_2941;)I ARG 0 handler METHOD method_12720 register (Lnet/minecraft/class_2941;)V diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index 97741d4fd7..3adf127ed1 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -38,6 +38,7 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity METHOD method_18059 canClip ()Z METHOD method_31168 getDimensions (Z)Lnet/minecraft/class_4048; ARG 1 marker + METHOD method_55745 createArmorStandAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6898 spawnBreakParticles ()V METHOD method_6900 getRightLegRotation ()Lnet/minecraft/class_2379; METHOD method_6901 shouldHideBasePlate ()Z diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 93eac25f51..737648267c 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -28,7 +28,13 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 3 target ARG 4 amplifier ARG 5 proximity + METHOD method_55650 (ILjava/util/function/BiConsumer;)V + ARG 1 amplifier + METHOD method_55651 (Ljava/util/function/BiConsumer;ILnet/minecraft/class_6880;Lnet/minecraft/class_1291$class_8634;)V + ARG 3 attribute + ARG 4 modifier METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_6880;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291; + ARG 1 attribute ARG 2 uuid ARG 3 amount ARG 5 operation @@ -45,3 +51,5 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect METHOD comp_2183 baseValue ()D METHOD comp_2184 operation ()Lnet/minecraft/class_1322$class_1323; METHOD method_52522 createAttributeModifier (Ljava/lang/String;I)Lnet/minecraft/class_1322; + ARG 1 translationKey + ARG 2 amplifier diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index c630ddb5ec..ead3af89e9 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -22,23 +22,30 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5897 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_1293;)V ARG 1 instance + METHOD (Lnet/minecraft/class_6880;)V + ARG 1 effect METHOD (Lnet/minecraft/class_6880;I)V + ARG 1 effect ARG 2 duration METHOD (Lnet/minecraft/class_6880;II)V + ARG 1 effect ARG 2 duration ARG 3 amplifier METHOD (Lnet/minecraft/class_6880;IIZZ)V + ARG 1 effect ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 visible METHOD (Lnet/minecraft/class_6880;IIZZZ)V + ARG 1 effect ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 showParticles ARG 6 showIcon METHOD (Lnet/minecraft/class_6880;IIZZZLnet/minecraft/class_1293;)V + ARG 1 effect ARG 2 duration ARG 3 amplifier ARG 4 ambient @@ -50,6 +57,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_24275 fromNbt (Lnet/minecraft/class_6880;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; + ARG 0 effect ARG 1 nbt METHOD method_24276 copyFrom (Lnet/minecraft/class_1293;)V ARG 1 that @@ -68,6 +76,10 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_48563 getDurationString ()Ljava/lang/String; METHOD method_52523 onApplied (Lnet/minecraft/class_1309;)V ARG 1 entity + METHOD method_55654 equals (Lnet/minecraft/class_6880;)Z + ARG 1 effect + METHOD method_55655 (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_1293; + ARG 1 effect METHOD method_5578 getAmplifier ()I METHOD method_5579 getEffectType ()Lnet/minecraft/class_6880; METHOD method_5581 shouldShowParticles ()Z diff --git a/mappings/net/minecraft/entity/effect/StatusEffects.mapping b/mappings/net/minecraft/entity/effect/StatusEffects.mapping index e920b53092..bc5343cd1d 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffects.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffects.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1294 net/minecraft/entity/effect/StatusEffects FIELD field_38093 DARKNESS_PADDING_DURATION I + METHOD method_55664 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry METHOD method_5594 register (Ljava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 statusEffect diff --git a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping index 1a2ae7b1da..8056be6161 100644 --- a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping @@ -7,4 +7,10 @@ CLASS net/minecraft/class_8950 net/minecraft/entity/mob/BreezeBrain ARG 0 brain METHOD method_55019 addFightTasks (Lnet/minecraft/class_4095;)V ARG 0 brain + METHOD method_55748 updateActivities (Lnet/minecraft/class_8949;)V + ARG 0 breeze + METHOD method_55749 (Lnet/minecraft/class_8949;)Ljava/util/Optional; + ARG 0 breeze + METHOD method_55750 addIdleTasks (Lnet/minecraft/class_4095;)V + ARG 0 brain CLASS class_8951 SlideAroundTask diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index 05004f229f..66035b4137 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity ARG 1 pos METHOD method_55014 createBreezeAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55015 resetLongJumpingParticleAddCount ()Lnet/minecraft/class_8949; + METHOD method_55747 playWhirlSound ()V diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping index d35c5cea81..0ee47a342d 100644 --- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_1551 net/minecraft/entity/mob/DrownedEntity ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_55746 createDrownedAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_7012 canDrownedAttackTarget (Lnet/minecraft/class_1309;)Z ARG 1 target METHOD method_7013 setTargetingUnderwater (Z)V diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index fef7d7c0eb..06b50dd3b8 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -152,6 +152,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT Gets the area in which this mob can attack entities whose hitbox intersects it. COMMENT COMMENT @see LivingEntity#getHitbox + METHOD method_55695 stopMovement ()V METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F ARG 1 slot METHOD method_5930 setForwardSpeed (F)V diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 2609eb7a2a..d5e3c0ac99 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -68,6 +68,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity METHOD method_49124 setChildAttribute (Lnet/minecraft/class_1296;Lnet/minecraft/class_1496;Lnet/minecraft/class_6880;DD)V ARG 1 other ARG 2 child + ARG 3 attribute ARG 4 min ARG 6 max METHOD method_49129 (I)I diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping new file mode 100644 index 0000000000..20386e2644 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain + FIELD field_47796 BREEDING_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_47803 SENSOR_TYPES Lcom/google/common/collect/ImmutableList; + FIELD field_47804 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; + METHOD method_55728 createBrainProfile ()Lnet/minecraft/class_4095$class_5303; + METHOD method_55729 (Lnet/minecraft/class_3218;Lnet/minecraft/class_9069;J)Z + ARG 1 armadillo + METHOD method_55731 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; + ARG 0 brain + METHOD method_55734 updateActivities (Lnet/minecraft/class_9069;)V + ARG 0 armadillo + METHOD method_55735 getBreedingIngredient ()Lnet/minecraft/class_1856; + METHOD method_55737 addCoreActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_55738 addIdleActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_55739 addPanicActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping new file mode 100644 index 0000000000..7ffbd491e8 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity + FIELD field_47780 scaredAnimationState Lnet/minecraft/class_7094; + FIELD field_47781 rollingAnimationState Lnet/minecraft/class_7094; + FIELD field_47785 STATE Lnet/minecraft/class_2940; + FIELD field_47786 currentStateTicks J + FIELD field_47787 nextScuteShedCooldown I + METHOD method_55711 isRolledUp ()Z + METHOD method_55712 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx + METHOD method_55713 setState (Lnet/minecraft/class_9069$class_9070;)V + ARG 1 state + METHOD method_55714 shouldSwitchToScaredState ()Z + METHOD method_55715 startRolling ()V + METHOD method_55716 brushScute ()V + METHOD method_55717 canRollUp ()Z + METHOD method_55718 getState ()Lnet/minecraft/class_9069$class_9070; + METHOD method_55719 getNextScuteShedCooldown ()I + METHOD method_55720 updateAnimationStates ()V + METHOD method_55721 isEntityThreatening (Lnet/minecraft/class_1309;)Z + ARG 1 entity + METHOD method_55722 createArmadilloAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_55723 isNotIdle ()Z + METHOD method_55724 unroll (Z)V + METHOD method_55725 setRolling (Z)V + ARG 1 rolling + CLASS class_9070 State + FIELD field_47793 name Ljava/lang/String; + FIELD field_47794 CODEC Lnet/minecraft/class_3542$class_7292; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_55727 fromName (Ljava/lang/String;)Lnet/minecraft/class_9069$class_9070; + ARG 0 name diff --git a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping index 7947c772cf..08206999af 100644 --- a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_8153 net/minecraft/entity/passive/SnifferEntity FIELD field_42655 risingAnimationState Lnet/minecraft/class_7094; FIELD field_42662 STATE Lnet/minecraft/class_2940; FIELD field_42663 FINISH_DIG_TIME Lnet/minecraft/class_2940; + FIELD field_44786 DIMENSIONS Lnet/minecraft/class_4048; METHOD method_49131 spawnDiggingParticles (Lnet/minecraft/class_7094;)Lnet/minecraft/class_8153; ARG 1 diggingAnimationState METHOD method_49132 startState (Lnet/minecraft/class_8153$class_8154;)Lnet/minecraft/class_8153; diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 974a67a616..54675ccb57 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940; FIELD field_30386 WILD_MAX_HEALTH F FIELD field_30387 TAMED_MAX_HEALTH F + FIELD field_47776 WOLF_ARMOR_BONUS_MODIFIER_UUID Ljava/util/UUID; + FIELD field_47777 ARMORED Lnet/minecraft/class_2940; FIELD field_6944 furWet Z FIELD field_6945 lastShakeProgress F FIELD field_6946 BEGGING Lnet/minecraft/class_2940; @@ -23,6 +25,11 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_55708 setArmored (Z)V + ARG 1 armored + METHOD method_55709 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx + METHOD method_55710 hasArmor ()Z METHOD method_6707 getFurWetBrightnessMultiplier (F)F COMMENT Returns this wolf's brightness multiplier based on the fur wetness. COMMENT

diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index ec44bdaa45..b29b057b7d 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -138,6 +138,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 0 c METHOD method_53968 isUsernameValid (Ljava/lang/String;)Z ARG 0 name + METHOD method_55754 getBlockInteractionRange ()D + METHOD method_55755 getEntityInteractionRange ()D METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index c4471b7982..e6aacfda8a 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -45,6 +45,7 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject COMMENT returns a copy of that stack which can be safely changed. Additionally, COMMENT {@link #asItemStack} reflects changes to the entity data, such as custom potion ID. METHOD method_55052 deflect (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_7433 setNoClip (Z)V ARG 1 noClip METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966; diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index e3518978a6..870d6612b6 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti ARG 0 entity METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)V ARG 1 stack + ARG 2 potion METHOD method_7498 applySplashPotion (Ljava/util/List;Lnet/minecraft/class_1297;)V ARG 1 statusEffects ARG 2 entity diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index fe63b8ebeb..97f23d79cb 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti FIELD field_45139 clientYaw D FIELD field_45140 clientPitch D FIELD field_45141 clientVelocity Lnet/minecraft/class_243; + FIELD field_47822 VILLAGER_PASSENGER_ATTACHMENT_POS Lnet/minecraft/class_243; FIELD field_7660 yawFlipped Z FIELD field_7661 CUSTOM_BLOCK_OFFSET Lnet/minecraft/class_2940; FIELD field_7664 ADJACENT_RAIL_POSITIONS_BY_SHAPE Ljava/util/Map; diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping new file mode 100644 index 0000000000..aa17f543c4 --- /dev/null +++ b/mappings/net/minecraft/item/AnimalArmorItem.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem + FIELD field_18136 bonus I + FIELD field_47823 entityTexture Lnet/minecraft/class_2960; + FIELD field_47824 type Lnet/minecraft/class_4059$class_9076; + METHOD (ILnet/minecraft/class_4059$class_9076;Ljava/lang/String;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 bonus + ARG 2 type + ARG 3 name + ARG 4 settings + METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960; + METHOD method_18455 getBonus ()I + METHOD method_55756 getType ()Lnet/minecraft/class_4059$class_9076; + CLASS class_9076 Type + FIELD field_47827 textureIdFunction Ljava/util/function/Function; + METHOD (Ljava/lang/String;ILjava/util/function/Function;)V + ARG 3 textureIdFunction + METHOD method_55758 (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 name + METHOD method_55759 (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 name diff --git a/mappings/net/minecraft/item/HorseArmorItem.mapping b/mappings/net/minecraft/item/HorseArmorItem.mapping deleted file mode 100644 index 56b8fd39ff..0000000000 --- a/mappings/net/minecraft/item/HorseArmorItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_4059 net/minecraft/item/HorseArmorItem - FIELD field_18136 bonus I - METHOD (ILnet/minecraft/class_4059$class_9076;Ljava/lang/String;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 bonus - METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960; - METHOD method_18455 getBonus ()I diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 1f9f628a3a..92d1f94871 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -289,6 +289,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT Adds an attribute modifier to this stack. COMMENT COMMENT @see #getAttributeModifiers + ARG 1 attribute ARG 2 modifier ARG 3 slot METHOD method_7917 inventoryTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;IZ)V diff --git a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping index 17cc5c53f0..87cd1515b0 100644 --- a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_6662 net/minecraft/loot/function/SetPotionLootFunction ARG 1 conditions ARG 2 potion METHOD method_38927 builder (Lnet/minecraft/class_6880;)Lnet/minecraft/class_120$class_121; + ARG 0 potion METHOD method_38928 (Lnet/minecraft/class_6880;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_53393 (Lnet/minecraft/class_6662;)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index 0c2a6828c2..9167098501 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunct CLASS class_153 Builder FIELD field_1123 map Lcom/google/common/collect/ImmutableList$Builder; METHOD method_640 withEffect (Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)Lnet/minecraft/class_152$class_153; + ARG 1 effect ARG 2 durationRange CLASS class_8754 StewEffect FIELD field_45854 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 7a690bff13..9ebb62044f 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -1,13 +1,9 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket - FIELD comp_2180 primaryEffectId Ljava/util/Optional; - FIELD comp_2181 secondaryEffectId Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 primaryEffectId ARG 2 secondaryEffectId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD comp_2180 primaryEffectId ()Ljava/util/Optional; - METHOD comp_2181 secondaryEffectId ()Ljava/util/Optional; METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping index 93a3a6d8c6..a13f587337 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping @@ -19,12 +19,6 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri METHOD method_34202 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1322; ARG 0 modifiers CLASS class_2782 Entry - FIELD comp_2177 attribute Lnet/minecraft/class_6880; - FIELD comp_2178 baseValue D - FIELD comp_2179 modifiers Ljava/util/Collection; METHOD (Lnet/minecraft/class_6880;DLjava/util/Collection;)V ARG 2 baseValue ARG 4 modifiers - METHOD comp_2177 attribute ()Lnet/minecraft/class_6880; - METHOD comp_2178 baseValue ()D - METHOD comp_2179 modifiers ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping index 26aca9e7f4..88c9d03c92 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping @@ -1,11 +1,7 @@ CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket - FIELD comp_2175 entityId I - FIELD comp_2176 effectType Lnet/minecraft/class_6880; METHOD (ILnet/minecraft/class_6880;)V ARG 1 entityId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD comp_2175 entityId ()I - METHOD comp_2176 effectType ()Lnet/minecraft/class_6880; METHOD method_11767 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index 252c176785..e23aa8ca58 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion METHOD method_8049 getEffects ()Ljava/util/List; METHOD method_8050 hasInstantEffect ()Z METHOD method_8051 finishTranslationKey (Lnet/minecraft/class_6880;Ljava/lang/String;)Ljava/lang/String; + ARG 0 potion + ARG 1 prefix diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index 0747c29bef..3d0343b1f4 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -20,12 +20,15 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 0 nbt ARG 1 list METHOD method_8059 getPotionEffects (Lnet/minecraft/class_6880;Ljava/util/Collection;)Ljava/util/List; + ARG 0 potion ARG 1 custom METHOD method_8060 getCustomPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; ARG 0 nbt METHOD method_8061 setPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; ARG 0 stack + ARG 1 potion METHOD method_8062 getColor (Lnet/minecraft/class_6880;)I + ARG 0 potion METHOD method_8063 getPotion (Lnet/minecraft/class_1799;)Lnet/minecraft/class_6880; ARG 0 stack METHOD method_8064 getColor (Lnet/minecraft/class_1799;)I diff --git a/mappings/net/minecraft/potion/Potions.mapping b/mappings/net/minecraft/potion/Potions.mapping index 47270cc0b7..aa576b03ec 100644 --- a/mappings/net/minecraft/potion/Potions.mapping +++ b/mappings/net/minecraft/potion/Potions.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_1847 net/minecraft/potion/Potions METHOD method_48962 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; ARG 0 key ARG 1 potion + METHOD method_55763 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry METHOD method_8084 register (Ljava/lang/String;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; ARG 0 name ARG 1 potion diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index f627b6c58a..379336d05b 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredic FIELD field_45765 EFFECTS Lcom/google/common/collect/ImmutableMap$Builder; METHOD method_53200 create ()Lnet/minecraft/class_2102$class_8748; METHOD method_53201 addEffect (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2102$class_8748; + ARG 1 effect METHOD method_53202 addEffect (Lnet/minecraft/class_6880;Lnet/minecraft/class_2102$class_2103;)Lnet/minecraft/class_2102$class_8748; + ARG 1 effect ARG 2 effectData METHOD method_53203 build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 3c1d81c4e5..dd123aefbe 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate METHOD method_20399 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2073$class_2074; ARG 1 nbt METHOD method_35232 potion (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2073$class_2074; + ARG 1 potion METHOD method_35233 count (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 count METHOD method_35234 storedEnchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; diff --git a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping index 6f8d05c1a3..9aaeed313d 100644 --- a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping +++ b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry FIELD field_8958 POTION_TYPE_PREDICATE Ljava/util/function/Predicate; FIELD field_8959 ITEM_RECIPES Ljava/util/List; METHOD method_20361 isBrewable (Lnet/minecraft/class_6880;)Z + ARG 0 potion METHOD method_8069 isPotionRecipeIngredient (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_8070 hasItemRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z @@ -19,7 +20,9 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry METHOD method_8073 (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_8074 registerPotionRecipe (Lnet/minecraft/class_6880;Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)V + ARG 0 input ARG 1 item + ARG 2 output METHOD method_8075 hasPotionRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 input ARG 1 ingredient @@ -34,11 +37,5 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry METHOD method_8080 registerPotionType (Lnet/minecraft/class_1792;)V ARG 0 item CLASS class_1846 Recipe - FIELD comp_2190 input Lnet/minecraft/class_6880; - FIELD comp_2191 ingredient Lnet/minecraft/class_1856; - FIELD comp_2192 output Lnet/minecraft/class_6880; METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;)V ARG 2 ingredient - METHOD comp_2190 input ()Lnet/minecraft/class_6880; - METHOD comp_2191 ingredient ()Lnet/minecraft/class_1856; - METHOD comp_2192 output ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index dbb082f7d1..a9a0a64c77 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -282,6 +282,8 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry ARG 0 registry ARG 1 id ARG 2 entry + METHOD method_55841 getEntry (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 id CLASS 1 METHOD method_46773 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; ARG 0 entry diff --git a/mappings/net/minecraft/registry/entry/RegistryEntry.mapping b/mappings/net/minecraft/registry/entry/RegistryEntry.mapping index 4ed407dc7f..d3f5cbee50 100644 --- a/mappings/net/minecraft/registry/entry/RegistryEntry.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryEntry.mapping @@ -59,6 +59,11 @@ CLASS net/minecraft/class_6880 net/minecraft/registry/entry/RegistryEntry COMMENT stand-alone or intrusive. METHOD method_46745 ownerEquals (Lnet/minecraft/class_7876;)Z ARG 1 owner + METHOD method_55838 matches (Lnet/minecraft/class_6880;)Z + ARG 1 entry + METHOD method_55839 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key + METHOD method_55840 getIdAsString ()Ljava/lang/String; CLASS class_6881 Direct COMMENT A direct registry entry holds the value directly. The value does not have to be COMMENT registered in a registry. Therefore, they receive no ID or registry key, and they diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index 3cf8608cfe..c4884bc1fb 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_6880; METHOD method_17376 hasPayment ()Z METHOD method_53173 getRawIdForStatusEffect (Lnet/minecraft/class_6880;)I + ARG 0 effect METHOD method_53174 getStatusEffectForRawId (I)Lnet/minecraft/class_6880; ARG 0 id CLASS class_1705 PaymentSlot diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index e6eb8dd069..27b063cd0c 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -52,6 +52,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_44990 viewDistance I FIELD field_44991 chunkFilter Lnet/minecraft/class_8603; FIELD field_46156 language Ljava/lang/String; + FIELD field_47709 CREATIVE_BLOCK_INTERACTION_RANGE_MODIFIER_UUID Lnet/minecraft/class_1322; + FIELD field_47710 CREATIVE_ENTITY_INTERACTION_RANGE_MODIFIER_UUID Lnet/minecraft/class_1322; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_8791;)V ARG 1 server ARG 2 world @@ -261,6 +263,11 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 4 deltaZ METHOD method_54934 (Lnet/minecraft/class_2960;)Ljava/util/stream/Stream; ARG 1 recipe + METHOD method_55631 isBoxInEntityInteractionRange (Lnet/minecraft/class_238;)Z + ARG 1 box + METHOD method_55632 isPosInBlockInteractionRange (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_55633 updateCreativeInteractionRangeModifiers ()V METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode CLASS 1 diff --git a/mappings/net/minecraft/util/ActionResult.mapping b/mappings/net/minecraft/util/ActionResult.mapping index cbabb2a9f7..459b95b792 100644 --- a/mappings/net/minecraft/util/ActionResult.mapping +++ b/mappings/net/minecraft/util/ActionResult.mapping @@ -3,19 +3,19 @@ CLASS net/minecraft/class_1269 net/minecraft/util/ActionResult COMMENT such as {@link net.minecraft.block.AbstractBlock#onUse}, return this. COMMENT COMMENT @see TypedActionResult - FIELD field_21466 CONSUME Lnet/minecraft/class_1269; + FIELD field_21466 Lnet/minecraft/class_1269; COMMENT Indicates an action is performed but no animation should accompany the COMMENT performance. - FIELD field_33562 CONSUME_PARTIAL Lnet/minecraft/class_1269; + FIELD field_33562 Lnet/minecraft/class_1269; COMMENT Indicates an action is performed but no animation should accompany the COMMENT performance and no statistic should be incremented. - FIELD field_5811 PASS Lnet/minecraft/class_1269; + FIELD field_5811 Lnet/minecraft/class_1269; COMMENT Indicates an action is not performed but allows other actions to COMMENT perform. - FIELD field_5812 SUCCESS Lnet/minecraft/class_1269; + FIELD field_5812 Lnet/minecraft/class_1269; COMMENT Indicates an action is performed and the actor's hand should swing to COMMENT indicate the performance. - FIELD field_5814 FAIL Lnet/minecraft/class_1269; + FIELD field_5814 Lnet/minecraft/class_1269; COMMENT Indicates that an action is not performed and prevents other actions COMMENT from performing. METHOD method_23665 isAccepted ()Z diff --git a/mappings/net/minecraft/util/DateTimeFormatters.mapping b/mappings/net/minecraft/util/DateTimeFormatters.mapping new file mode 100644 index 0000000000..ee4466c077 --- /dev/null +++ b/mappings/net/minecraft/util/DateTimeFormatters.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9078 net/minecraft/util/DateTimeFormatters + METHOD method_55786 create ()Ljava/time/format/DateTimeFormatter; diff --git a/mappings/net/minecraft/util/ItemActionResult.mapping b/mappings/net/minecraft/util/ItemActionResult.mapping new file mode 100644 index 0000000000..76f061f96e --- /dev/null +++ b/mappings/net/minecraft/util/ItemActionResult.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9062 net/minecraft/util/ItemActionResult + METHOD method_55643 isAccepted ()Z + METHOD method_55644 success (Z)Lnet/minecraft/class_9062; + ARG 0 swingHand + METHOD method_55645 toActionResult ()Lnet/minecraft/class_1269; diff --git a/mappings/net/minecraft/util/TimeHelper.mapping b/mappings/net/minecraft/util/TimeHelper.mapping index 14b9b6d781..f694b62fb8 100644 --- a/mappings/net/minecraft/util/TimeHelper.mapping +++ b/mappings/net/minecraft/util/TimeHelper.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_4802 net/minecraft/util/TimeHelper COMMENT The equivalent of 1 second, in milliseconds. Is {@code 1000}. FIELD field_46958 HOUR_IN_SECONDS J COMMENT The equivalent of 1 hour, in seconds. Is {@code 3600}. + FIELD field_47726 MINUTE_IN_SECONDS I + COMMENT The equivalent of 1 minute, in seconds. Is {@code 60}. METHOD method_24505 betweenSeconds (II)Lnet/minecraft/class_6019; COMMENT {@return an int provider that provides a time in ticks, between {@code min * 20} and COMMENT {@code max * 20} (both inclusive)} diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 6a0f51eb0e..c9fd8c500b 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers METHOD method_52552 createLibrarianTradeFactory (I)Lnet/minecraft/class_3853$class_1652; ARG 0 experience METHOD method_52553 createPotionStack (Lnet/minecraft/class_6880;)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 @@ -218,6 +219,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 2 experience ARG 3 multiplier METHOD (Lnet/minecraft/class_6880;II)V + ARG 1 effect ARG 2 duration ARG 3 experience CLASS class_4167 SellPotionHoldingItemFactory @@ -237,6 +239,8 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 5 price ARG 6 maxUses ARG 7 experience + METHOD method_19203 (Lnet/minecraft/class_6880$class_6883;)Z + ARG 0 potion CLASS class_8640 TypedWrapperFactory FIELD comp_1962 typeToFactory Ljava/util/Map; METHOD comp_1962 typeToFactory ()Ljava/util/Map; diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping index 59e32a24ff..3f3ded6c81 100644 --- a/mappings/net/minecraft/world/event/GameEvent.mapping +++ b/mappings/net/minecraft/world/event/GameEvent.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent - FIELD comp_2193 range I FIELD field_31449 DEFAULT_RANGE I METHOD (I)V ARG 1 range - METHOD comp_2193 range ()I METHOD method_32939 register (Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; ARG 0 id METHOD method_32940 register (Ljava/lang/String;I)Lnet/minecraft/class_6880$class_6883; ARG 0 id ARG 1 range + METHOD method_55782 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry CLASS class_7397 Emitter METHOD method_43285 of (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5712$class_7397; ARG 0 sourceEntity diff --git a/mappings/net/minecraft/world/event/Vibrations.mapping b/mappings/net/minecraft/world/event/Vibrations.mapping index 0944f46130..0a608ffd9a 100644 --- a/mappings/net/minecraft/world/event/Vibrations.mapping +++ b/mappings/net/minecraft/world/event/Vibrations.mapping @@ -3,12 +3,17 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations FIELD field_44639 FREQUENCIES Ljava/util/function/ToIntFunction; METHOD method_51298 getVibrationListenerData ()Lnet/minecraft/class_8514$class_8515; METHOD method_51299 getVibrationCallback ()Lnet/minecraft/class_8514$class_5719; + METHOD method_51383 (Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;)V + ARG 0 frequencies METHOD method_51384 getSignalStrength (FI)I ARG 0 distance ARG 1 range METHOD method_51385 getFrequency (Lnet/minecraft/class_5321;)I + ARG 0 gameEvent METHOD method_51386 getResonation (I)Lnet/minecraft/class_5321; ARG 0 frequency + METHOD method_55783 getFrequencyOrZero (Lnet/minecraft/class_6880;)I + ARG 0 gameEvent CLASS class_5719 Callback METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V COMMENT Accepts a game event after delay. From 09a453f4ebd455fb6d81a5a50f7b441da5b67555 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Wed, 20 Dec 2023 03:06:34 +1100 Subject: [PATCH 04/47] More 23w51 stuff (#3755) --- .../minecraft/block/CandleCakeBlock.mapping | 1 + .../block/ChiseledBookshelfBlock.mapping | 4 ++ .../net/minecraft/block/Fertilizable.mapping | 4 ++ mappings/net/minecraft/client/Mouse.mapping | 3 ++ .../client/gui/LayeredDrawer.mapping | 21 ++++++++++ .../minecraft/client/gui/hud/ChatHud.mapping | 1 + .../client/gui/hud/InGameHud.mapping | 39 +++++++++++++++++++ .../client/gui/screen/TitleScreen.mapping | 1 + .../gui/screen/ingame/BeaconScreen.mapping | 4 ++ .../MultiplayerServerListWidget.mapping | 4 ++ .../network/ClientPlayNetworkHandler.mapping | 2 + .../client/network/ClientPlayerEntity.mapping | 1 + .../client/network/ServerInfo.mapping | 6 +++ .../minecraft/client/render/Camera.mapping | 1 + .../entity/StriderEntityRenderer.mapping | 1 + .../feature/BreezeEyesFeatureRenderer.mapping | 1 + .../entity/feature/FeatureRenderer.mapping | 2 + .../client/util/ParticleUtil.mapping | 13 +++++++ .../datafixer/TypeReferences.mapping | 1 + .../datafixer/fix/BlockNameFix.mapping | 2 + .../ai/brain/task/BreezeMovementUtil.mapping | 8 ++++ .../minecraft/entity/mob/PiglinEntity.mapping | 1 + .../entity/mob/SkeletonHorseEntity.mapping | 1 + .../minecraft/entity/mob/ZombieEntity.mapping | 1 + .../entity/mob/ZombieHorseEntity.mapping | 1 + .../entity/mob/ZombifiedPiglinEntity.mapping | 1 + .../passive/AbstractDonkeyEntity.mapping | 1 + .../entity/passive/ChickenEntity.mapping | 1 + .../entity/passive/CowEntity.mapping | 1 + .../entity/passive/FoxEntity.mapping | 1 + .../entity/passive/HorseEntity.mapping | 1 + .../entity/passive/LlamaEntity.mapping | 1 + .../entity/passive/PandaEntity.mapping | 1 + .../entity/passive/TurtleEntity.mapping | 1 + .../entity/player/PlayerEntity.mapping | 1 + .../entity/player/PlayerInventory.mapping | 2 + .../item/DyeableAnimalArmorItem.mapping | 1 + .../item/DyeableHorseArmorItem.mapping | 1 - .../net/minecraft/item/map/MapState.mapping | 4 ++ .../server/function/FunctionBuilder.mapping | 1 + .../minecraft/server/function/Macro.mapping | 3 ++ .../net/minecraft/test/TestContext.mapping | 1 + .../net/minecraft/world/WorldAccess.mapping | 4 ++ .../net/minecraft/world/WorldEvents.mapping | 21 +++++++--- .../minecraft/world/WorldSaveHandler.mapping | 9 +++++ unpick-definitions/world_events.unpick | 3 +- 46 files changed, 177 insertions(+), 7 deletions(-) create mode 100644 mappings/net/minecraft/client/gui/LayeredDrawer.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/BreezeMovementUtil.mapping create mode 100644 mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping delete mode 100644 mappings/net/minecraft/item/DyeableHorseArmorItem.mapping diff --git a/mappings/net/minecraft/block/CandleCakeBlock.mapping b/mappings/net/minecraft/block/CandleCakeBlock.mapping index 033f418616..1408673a9a 100644 --- a/mappings/net/minecraft/block/CandleCakeBlock.mapping +++ b/mappings/net/minecraft/block/CandleCakeBlock.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_5545 net/minecraft/block/CandleCakeBlock ARG 1 candle ARG 2 settings METHOD method_31632 getCandleCakeFromCandle (Lnet/minecraft/class_5544;)Lnet/minecraft/class_2680; + ARG 0 candle METHOD method_31633 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4970$class_4971;)Z ARG 1 statex METHOD method_31634 isHittingCandle (Lnet/minecraft/class_3965;)Z diff --git a/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping index 55f1c76916..321ca518e7 100644 --- a/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping +++ b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping @@ -24,3 +24,7 @@ CLASS net/minecraft/class_7714 net/minecraft/block/ChiseledBookshelfBlock ARG 0 hit ARG 1 facing METHOD method_47580 getSlotForHitPos (Lnet/minecraft/class_3965;Lnet/minecraft/class_2680;)Ljava/util/OptionalInt; + ARG 1 hit + ARG 2 state + METHOD method_55772 (Lnet/minecraft/class_241;)Ljava/util/OptionalInt; + ARG 0 hitPos diff --git a/mappings/net/minecraft/block/Fertilizable.mapping b/mappings/net/minecraft/block/Fertilizable.mapping index ba980fe9d4..05e17c7877 100644 --- a/mappings/net/minecraft/block/Fertilizable.mapping +++ b/mappings/net/minecraft/block/Fertilizable.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable + METHOD method_55769 getFertilizeParticlePos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 1 pos + METHOD method_55770 getFertilizableType ()Lnet/minecraft/class_2256$class_9077; METHOD method_9650 canGrow (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 random @@ -13,3 +16,4 @@ CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable ARG 2 random ARG 3 pos ARG 4 state + CLASS class_9077 Type diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index b1b6763225..d5248fb786 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_1795 x D FIELD field_45296 eventDeltaHorizontalWheel D FIELD field_45297 eventDeltaVerticalWheel D + FIELD field_47842 lastUpdateTime D METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1598 onMouseScroll (JDD)V @@ -39,6 +40,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse METHOD method_1603 getX ()D METHOD method_1604 getY ()D METHOD method_1606 updateMouse (D)V + ARG 1 delta METHOD method_1607 setup (J)V ARG 1 window METHOD method_1608 wasLeftButtonClicked ()Z @@ -68,3 +70,4 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse ARG 3 paths METHOD method_30134 setResolutionChanged ()V METHOD method_35707 wasMiddleButtonClicked ()Z + METHOD method_55793 updateMouse ()V diff --git a/mappings/net/minecraft/client/gui/LayeredDrawer.mapping b/mappings/net/minecraft/client/gui/LayeredDrawer.mapping new file mode 100644 index 0000000000..7035178a7f --- /dev/null +++ b/mappings/net/minecraft/client/gui/LayeredDrawer.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_9080 net/minecraft/client/gui/LayeredDrawer + FIELD field_47848 LAYER_Z_PADDING F + FIELD field_47849 layers Ljava/util/List; + METHOD method_55809 render (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55810 addLayer (Lnet/minecraft/class_9080$class_9081;)Lnet/minecraft/class_9080; + ARG 1 layer + METHOD method_55811 addSubDrawer (Lnet/minecraft/class_9080;Ljava/util/function/BooleanSupplier;)Lnet/minecraft/class_9080; + ARG 1 drawer + ARG 2 shouldRender + METHOD method_55812 (Ljava/util/function/BooleanSupplier;Lnet/minecraft/class_9080;Lnet/minecraft/class_332;F)V + ARG 2 context + ARG 3 tickDelta + METHOD method_55813 renderInternal (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + CLASS class_9081 Layer + METHOD render (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 3723da8798..7a6c2f3094 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 2 currentTick ARG 3 mouseX ARG 4 mouseY + ARG 5 focused METHOD method_1806 getWidth (D)I ARG 0 widthOption METHOD method_1808 clear (Z)V diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 6230d4918e..9d72093a3d 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -72,6 +72,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_45327 FOOD_EMPTY_TEXTURE Lnet/minecraft/class_2960; FIELD field_45328 FOOD_HALF_TEXTURE Lnet/minecraft/class_2960; FIELD field_47550 SCOREBOARD_ENTRY_COMPARATOR Ljava/util/Comparator; + FIELD field_47847 layeredDrawer Lnet/minecraft/class_9080; METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V @@ -86,6 +87,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 2 entity METHOD method_1736 renderCrosshair (Lnet/minecraft/class_332;F)V ARG 1 context + ARG 2 tickDelta METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I METHOD method_1739 getSpectatorHud ()Lnet/minecraft/class_365; @@ -127,6 +129,8 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 message ARG 2 tinted METHOD method_1759 renderHotbar (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta METHOD method_1760 renderStatusBars (Lnet/minecraft/class_332;)V COMMENT Renders the armor, health, air, and hunger bars. ARG 1 context @@ -142,6 +146,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 context METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_332;F)V ARG 1 context + ARG 2 tickDelta METHOD method_19346 drawTextBackground (Lnet/minecraft/class_332;Lnet/minecraft/class_327;III)V ARG 1 context ARG 2 textRenderer @@ -188,6 +193,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 paused METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_332;F)V ARG 1 context + ARG 2 tickDelta METHOD method_39193 tickAutosaveIndicator ()V METHOD method_44353 shouldShowChatDisabledScreen ()Z METHOD method_44354 setCanShowChatDisabledScreen (Z)V @@ -197,6 +203,39 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 3 scoreboardEntry METHOD method_55441 (I)[Lnet/minecraft/class_329$class_9016; ARG 0 size + METHOD method_55798 renderMiscOverlays (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55799 renderSleepOverlay (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55800 renderMessageOverlay (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55801 renderTitleAndSubtitle (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55802 renderChat (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55803 renderScoreboardSidebar (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55804 renderPlayerList (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55805 renderMainHud (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55806 (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55807 (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55808 (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta 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/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index b381a8bd18..5af5631388 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen FIELD field_32272 DEMO_WORLD_NAME Ljava/lang/String; FIELD field_37209 deprecationNotice Lnet/minecraft/class_442$class_7063; FIELD field_41847 logoDrawer Lnet/minecraft/class_8020; + FIELD field_47850 NARRATOR_SCREEN_TITLE Lnet/minecraft/class_2561; METHOD (Z)V ARG 1 doBackgroundFade METHOD (ZLnet/minecraft/class_8020;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 59a7f4e041..bd6b7c3f16 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -36,10 +36,13 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_6880;ZI)V ARG 2 x ARG 3 y + ARG 4 effect ARG 5 primary ARG 6 level METHOD method_37081 init (Lnet/minecraft/class_6880;)V + ARG 1 effect METHOD method_37082 getEffectName (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5250; + ARG 1 effect CLASS class_470 BaseButtonWidget FIELD field_2815 disabled Z METHOD (II)V @@ -68,3 +71,4 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_6880;)V ARG 2 x ARG 3 y + ARG 4 effect diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 447a8392f0..7bf52f790b 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -70,6 +70,9 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi FIELD field_19123 icon Lnet/minecraft/class_8573; FIELD field_19124 time J FIELD field_42874 favicon [B + FIELD field_47855 playerListSummary Ljava/util/List; + FIELD field_47856 statusIconTexture Lnet/minecraft/class_2960; + FIELD field_47857 statusTooltipText Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4267;Lnet/minecraft/class_500;Lnet/minecraft/class_642;)V ARG 2 screen ARG 3 server @@ -86,3 +89,4 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_29978 saveFile ()V METHOD method_49300 uploadFavicon ([B)Z ARG 1 bytes + METHOD method_55815 update ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 4fd20c9e97..10eea89241 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_45947 displayedUnsecureChatWarning Z FIELD field_46187 worldCleared Z FIELD field_46578 worldLoadingState Lnet/minecraft/class_8819; + FIELD field_47878 scoreboard Lnet/minecraft/class_269; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V ARG 1 client METHOD method_16690 getSessionId ()Ljava/util/UUID; @@ -136,3 +137,4 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 1 player ARG 2 world METHOD method_54134 clearWorld ()V + METHOD method_55823 getScoreboard ()Lnet/minecraft/class_269; diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 44db2d1529..b491a0c4f7 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -76,6 +76,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity COMMENT {@return the color multiplier of vision in water} Visibility in COMMENT water is reduced when the player just entered water. METHOD method_3141 onRecipeDisplayed (Lnet/minecraft/class_8786;)V + ARG 1 recipe METHOD method_3143 getStatHandler ()Lnet/minecraft/class_3469; METHOD method_3144 isRiding ()Z METHOD method_3145 setExperience (FII)V diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 5e3a9361fa..92588349d9 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -22,7 +22,9 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo FIELD field_42890 favicon [B FIELD field_45608 serverType Lnet/minecraft/class_642$class_8678; FIELD field_46206 MAX_FAVICON_SIZE I + FIELD field_47879 status Lnet/minecraft/class_642$class_9083; METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_642$class_8678;)V + ARG 1 name ARG 2 address ARG 3 serverType METHOD method_2990 getResourcePackPolicy ()Lnet/minecraft/class_642$class_643; @@ -51,6 +53,9 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo METHOD method_53885 validateFavicon ([B)[B ARG 0 favicon METHOD method_55616 getServerType ()Lnet/minecraft/class_642$class_8678; + METHOD method_55824 setStatus (Lnet/minecraft/class_642$class_9083;)V + ARG 1 status + METHOD method_55825 getStatus ()Lnet/minecraft/class_642$class_9083; CLASS class_643 ResourcePackPolicy COMMENT The policy of the client when this server sends a {@linkplain COMMENT net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket server @@ -70,3 +75,4 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo ARG 3 name METHOD method_2997 getName ()Lnet/minecraft/class_2561; CLASS class_8678 ServerType + CLASS class_9083 Status diff --git a/mappings/net/minecraft/client/render/Camera.mapping b/mappings/net/minecraft/client/render/Camera.mapping index cfd306a8e2..54a667cbd0 100644 --- a/mappings/net/minecraft/client/render/Camera.mapping +++ b/mappings/net/minecraft/client/render/Camera.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_4184 net/minecraft/client/render/Camera FIELD field_18722 lastCameraY F FIELD field_21518 rotation Lorg/joml/Quaternionf; FIELD field_47549 lastTickDelta F + FIELD field_47841 BASE_CAMERA_DISTANCE F METHOD method_19317 updateEyeHeight ()V METHOD method_19318 clipToSpace (D)D ARG 1 desiredCameraDistance diff --git a/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping index 9c50b0a4a5..11fd39b6e3 100644 --- a/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_4999 net/minecraft/client/render/entity/StriderEntityRenderer FIELD field_23372 TEXTURE Lnet/minecraft/class_2960; FIELD field_23937 COLD_TEXTURE Lnet/minecraft/class_2960; + FIELD field_47888 BABY_SCALE_MULTIPLIER F diff --git a/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping index f33a7b465c..86df1e89b0 100644 --- a/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_8988 net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer + FIELD field_47889 TEXTURE Lnet/minecraft/class_1921; diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index 0cb03fe9b6..f50f2ba7b0 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/FeatureRenderer FIELD field_17155 context Lnet/minecraft/class_3883; + METHOD (Lnet/minecraft/class_3883;)V + ARG 1 context METHOD method_17165 getContextModel ()Lnet/minecraft/class_583; METHOD method_23194 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; ARG 1 entity diff --git a/mappings/net/minecraft/client/util/ParticleUtil.mapping b/mappings/net/minecraft/client/util/ParticleUtil.mapping index 9ed9bfda50..a2f5509311 100644 --- a/mappings/net/minecraft/client/util/ParticleUtil.mapping +++ b/mappings/net/minecraft/client/util/ParticleUtil.mapping @@ -33,3 +33,16 @@ CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil ARG 1 pos ARG 2 random ARG 3 effect + METHOD method_55635 spawnParticlesAround (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;IDDZLnet/minecraft/class_2394;)V + ARG 0 world + ARG 1 pos + ARG 2 count + ARG 3 horizontalOffset + ARG 5 verticalOffset + ARG 7 force + ARG 8 effect + METHOD method_55636 spawnParticlesAround (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;ILnet/minecraft/class_2394;)V + ARG 0 world + ARG 1 pos + ARG 2 count + ARG 3 effect diff --git a/mappings/net/minecraft/datafixer/TypeReferences.mapping b/mappings/net/minecraft/datafixer/TypeReferences.mapping index 88d8c6c2a7..fe7a795a1d 100644 --- a/mappings/net/minecraft/datafixer/TypeReferences.mapping +++ b/mappings/net/minecraft/datafixer/TypeReferences.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_1208 net/minecraft/datafixer/TypeReferences FIELD field_45095 SAVED_DATA_RANDOM_SEQUENCES Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_45096 SAVED_DATA_STRUCTURE_FEATURE_INDICES Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_45097 SAVED_DATA_SCOREBOARD Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_47727 FLAT_BLOCK_STATE Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5710 LEVEL Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5711 RECIPE Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5712 ITEM_STACK Lcom/mojang/datafixers/DSL$TypeReference; diff --git a/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping index 5af3d8d350..641c869cef 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping @@ -3,9 +3,11 @@ CLASS net/minecraft/class_3579 net/minecraft/datafixer/fix/BlockNameFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V ARG 1 outputSchema ARG 2 name + METHOD method_15588 fixBlockState (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_15589 create (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix; ARG 0 outputSchema ARG 1 name ARG 2 rename METHOD method_15593 rename (Ljava/lang/String;)Ljava/lang/String; ARG 1 oldName + METHOD method_55639 fixFlatBlockState (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeMovementUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeMovementUtil.mapping new file mode 100644 index 0000000000..5779a0a028 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeMovementUtil.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_9075 net/minecraft/entity/ai/brain/task/BreezeMovementUtil + FIELD field_47817 MAX_MOVE_DISTANCE D + METHOD method_55751 getRandomPosBehindTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_5819;)Lnet/minecraft/class_243; + ARG 0 target + ARG 1 random + METHOD method_55752 canMoveTo (Lnet/minecraft/class_8949;Lnet/minecraft/class_243;)Z + ARG 0 breeze + ARG 1 pos diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index f5e14302ca..6a3f5b31a7 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity FIELD field_22381 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; FIELD field_23738 cannotHunt Z FIELD field_25164 DANCING Lnet/minecraft/class_2940; + FIELD field_47818 babyDimensions Lnet/minecraft/class_4048; METHOD method_24695 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping index 3adc7ee789..401db733db 100644 --- a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1506 net/minecraft/entity/mob/SkeletonHorseEntity FIELD field_30427 DESPAWN_AGE I + FIELD field_47809 babyDimensions Lnet/minecraft/class_4048; FIELD field_7003 trapTriggerGoal Lnet/minecraft/class_1505; FIELD field_7004 trapTime I FIELD field_7005 trapped Z diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index a0803e6e15..f9f409e162 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity FIELD field_19015 DOOR_BREAK_DIFFICULTY_CHECKER Ljava/util/function/Predicate; + FIELD field_47811 babyDimensions Lnet/minecraft/class_4048; FIELD field_7424 ticksUntilWaterConversion I FIELD field_7425 CONVERTING_IN_WATER Lnet/minecraft/class_2940; FIELD field_7426 inWaterTime I diff --git a/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping index 4dd26e50f8..0cdce212d0 100644 --- a/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1507 net/minecraft/entity/mob/ZombieHorseEntity + FIELD field_47810 babyDimensions Lnet/minecraft/class_4048; METHOD method_26902 createZombieHorseAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55002 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index 4e87c42e61..d87b0c10df 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_6019; FIELD field_25608 angerPassingCooldown I FIELD field_25609 ANGER_PASSING_COOLDOWN_RANGE Lnet/minecraft/class_6019; + FIELD field_47812 babyDimensions Lnet/minecraft/class_4048; FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7308 angrySoundDelay I FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping index ad7dc2e50e..60ea178033 100644 --- a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1492 net/minecraft/entity/passive/AbstractDonkeyEntity + FIELD field_47806 babyDimensions Lnet/minecraft/class_4048; FIELD field_6943 CHEST Lnet/minecraft/class_2940; METHOD method_26898 createAbstractDonkeyAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_45374 addChest (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping index ed8d555451..250610ed93 100644 --- a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1428 net/minecraft/entity/passive/ChickenEntity + FIELD field_47770 babyDimensions Lnet/minecraft/class_4048; FIELD field_6736 prevFlapProgress F FIELD field_6737 flapSpeed F FIELD field_6738 prevMaxWingDeviation F diff --git a/mappings/net/minecraft/entity/passive/CowEntity.mapping b/mappings/net/minecraft/entity/passive/CowEntity.mapping index ac4d6368a3..b8465f4ff8 100644 --- a/mappings/net/minecraft/entity/passive/CowEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CowEntity.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_1430 net/minecraft/entity/passive/CowEntity + FIELD field_47771 babyDimensions Lnet/minecraft/class_4048; METHOD method_26883 createCowAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 878e50ae2a..1b159e465d 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity FIELD field_30333 WALKING_FLAG I FIELD field_30334 AGGRESSIVE_FLAG I FIELD field_30335 EATING_DURATION I + FIELD field_47772 babyDimensions Lnet/minecraft/class_4048; METHOD method_18253 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_18254 (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index f99a07250d..94056dfaac 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity + FIELD field_47807 babyDimensions Lnet/minecraft/class_4048; FIELD field_6985 HORSE_ARMOR_BONUS_ID Ljava/util/UUID; FIELD field_6990 VARIANT Lnet/minecraft/class_2940; METHOD method_18445 equipArmor (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 77c0105310..4d4f65584c 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity FIELD field_25375 TAMING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_30425 MAX_STRENGTH I + FIELD field_47808 babyDimensions Lnet/minecraft/class_4048; FIELD field_6995 CARPET_COLOR Lnet/minecraft/class_2940; FIELD field_6996 VARIANT Lnet/minecraft/class_2940; FIELD field_6997 follower Lnet/minecraft/class_1501; diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index e4e039dda8..d548fc8046 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity FIELD field_30347 LYING_ON_BACK_FLAG I FIELD field_30348 EATING_ANIMATION_INTERVAL I FIELD field_30349 HIDDEN_GENE_MUTATION_CHANCE I + FIELD field_47773 babyDimensions Lnet/minecraft/class_4048; FIELD field_6764 ASK_FOR_BAMBOO_TICKS Lnet/minecraft/class_2940; FIELD field_6765 IS_FOOD Ljava/util/function/Predicate; FIELD field_6766 MAIN_GENE Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index d0596acf1c..a91a99f4fb 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity FIELD field_28406 BREEDING_ITEM Lnet/minecraft/class_1856; + FIELD field_47775 babyDimensions Lnet/minecraft/class_4048; FIELD field_6918 sandDiggingCounter I FIELD field_6919 HAS_EGG Lnet/minecraft/class_2940; FIELD field_6920 HOME_POS Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index b29b057b7d..5daa8bdce2 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_39445 lastDeathPos Ljava/util/Optional; FIELD field_41765 damageTiltYaw F FIELD field_46174 DEFAULT_MAIN_ARM Lnet/minecraft/class_1306; + FIELD field_47821 VEHICLE_ATTACHMENT_POS Lnet/minecraft/class_243; FIELD field_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/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 969ff26635..2255d35437 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -37,6 +37,8 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 2 notifiesClient METHOD method_37417 dropSelectedItem (Z)Lnet/minecraft/class_1799; ARG 1 entireStack + METHOD method_55753 contains (Ljava/util/function/Predicate;)Z + ARG 1 predicate METHOD method_7364 getChangeCount ()I METHOD method_7365 swapSlotWithHotbar (I)V ARG 1 slot diff --git a/mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping b/mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping new file mode 100644 index 0000000000..06488ee9e8 --- /dev/null +++ b/mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4058 net/minecraft/item/DyeableAnimalArmorItem diff --git a/mappings/net/minecraft/item/DyeableHorseArmorItem.mapping b/mappings/net/minecraft/item/DyeableHorseArmorItem.mapping deleted file mode 100644 index 1e42381200..0000000000 --- a/mappings/net/minecraft/item/DyeableHorseArmorItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4058 net/minecraft/item/DyeableHorseArmorItem diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 85145e5dcf..091dbcaf4d 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -117,6 +117,10 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_37343 iconCountNotLessThan (I)Z ARG 1 iconCount METHOD method_52611 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; + METHOD method_55784 createMapPredicate (Lnet/minecraft/class_1799;)Ljava/util/function/Predicate; + ARG 0 stack + METHOD method_55785 (Lnet/minecraft/class_1799;Ljava/lang/Integer;Lnet/minecraft/class_1799;)Z + ARG 2 stack2 CLASS class_23 PlayerUpdateTracker FIELD field_124 emptyPacketsRequested I FIELD field_125 player Lnet/minecraft/class_1657; diff --git a/mappings/net/minecraft/server/function/FunctionBuilder.mapping b/mappings/net/minecraft/server/function/FunctionBuilder.mapping index 29b81cb1bf..6b80012f17 100644 --- a/mappings/net/minecraft/server/function/FunctionBuilder.mapping +++ b/mappings/net/minecraft/server/function/FunctionBuilder.mapping @@ -11,5 +11,6 @@ CLASS net/minecraft/class_8867 net/minecraft/server/function/FunctionBuilder METHOD method_54421 addMacroCommand (Ljava/lang/String;ILnet/minecraft/class_8839;)V ARG 1 command ARG 2 lineNum + ARG 3 commandSource METHOD method_54422 indicesOfVariables (Ljava/util/List;)Lit/unimi/dsi/fastutil/ints/IntList; ARG 1 variables diff --git a/mappings/net/minecraft/server/function/Macro.mapping b/mappings/net/minecraft/server/function/Macro.mapping index cc1c3ce943..166fd78f1a 100644 --- a/mappings/net/minecraft/server/function/Macro.mapping +++ b/mappings/net/minecraft/server/function/Macro.mapping @@ -30,12 +30,15 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro METHOD method_54429 instantiate (Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2960;)Lnet/minecraft/class_8856; ARG 1 args ARG 2 dispatcher + ARG 3 id CLASS class_8870 VariableLine FIELD field_46760 invocation Lnet/minecraft/class_8873; FIELD field_46761 variableIndices Lit/unimi/dsi/fastutil/ints/IntList; + FIELD field_47891 commandSource Lnet/minecraft/class_8839; METHOD (Lnet/minecraft/class_8873;Lit/unimi/dsi/fastutil/ints/IntList;Lnet/minecraft/class_8839;)V ARG 1 invocation ARG 2 variableIndices + ARG 3 commandSource CLASS class_8871 FixedLine FIELD field_46762 action Lnet/minecraft/class_8856; METHOD (Lnet/minecraft/class_8856;)V diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index f0f37da5c0..6db668c667 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -376,6 +376,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 4 errorMessage METHOD method_52889 expectEntityHasEffect (Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;I)V ARG 1 entity + ARG 2 effect ARG 3 amplifier METHOD method_54143 expectItem (Lnet/minecraft/class_1792;)V ARG 1 item diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index f7fd23c5b0..308043a0f8 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -60,6 +60,10 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 2 pos ARG 3 sound ARG 4 category + METHOD method_55764 emitGameEvent (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712$class_7397;)V + ARG 1 event + ARG 2 pos + ARG 3 emitter METHOD method_8396 playSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V ARG 1 source ARG 2 pos diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 9665238f15..e705b96129 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents FIELD field_31116 ENDER_DRAGON_DIES I COMMENT An ender dragon dies. COMMENT
Plays the ender dragon death sound event. - COMMENT
This is a global event. + COMMENT

This is a global event. COMMENT

Called by {@link net.minecraft.entity.boss.dragon.EnderDragonEntity#updatePostDeath() EnderDragonEntity#updatePostDeath} FIELD field_31117 ANVIL_DESTROYED I COMMENT An anvil is destroyed from damage. @@ -55,7 +55,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents FIELD field_31126 END_PORTAL_OPENED I COMMENT An end portal is opened. COMMENT
Plays the end portal spawn sound event. - COMMENT
This is a global event. + COMMENT

This is a global event. COMMENT

Called by {@link net.minecraft.item.EnderEyeItem#useOnBlock(net.minecraft.item.ItemUsageContext) EnderEyeItem#useOnBlock} FIELD field_31127 PHANTOM_BITES I COMMENT A phantom bites its victim. @@ -132,7 +132,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents FIELD field_31143 DISPENSER_ACTIVATED I COMMENT A dispenser is activated. COMMENT
Shoots smoke particles. - COMMENT
The ordinal direction the dispenser is facing must be supplied as extra data. + COMMENT

The ordinal direction the dispenser is facing must be supplied as extra data. COMMENT

Called by {@link net.minecraft.block.dispenser.ItemDispenserBehavior#spawnParticles(net.minecraft.util.math.BlockPointer, net.minecraft.util.math.Direction) ItemDispenserBehavior#spawnParticles} FIELD field_31144 BLOCK_BROKEN I COMMENT A block is broken. @@ -233,7 +233,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents FIELD field_31167 FIRE_EXTINGUISHED I COMMENT Fire is extinguished. COMMENT
Plays the appropriate fire extinguish sound event. - COMMENT
A {@code 1} should be supplied as extra data if an entity was extinguished, and {@code 0} for a block. + COMMENT

A {@code 1} should be supplied as extra data if an entity was extinguished, and {@code 0} for a block. COMMENT

Called by {@link net.minecraft.block.AbstractFireBlock#onBreak(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, net.minecraft.entity.player.PlayerEntity) AbstractFireBlock#onBreak}, COMMENT {@link net.minecraft.entity.projectile.thrown.PotionEntity#extinguishFire(net.minecraft.util.math.BlockPos) PotionEntity#extinguishFire}, COMMENT and {@link net.minecraft.item.ShovelItem#useOnBlock(net.minecraft.item.ItemUsageContext) ShovelItem#useOnBlock} @@ -273,7 +273,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents FIELD field_31181 WITHER_SPAWNS I COMMENT A wither is spawned. COMMENT
Plays the wither spawn sound event. - COMMENT
This is a global event. + COMMENT

This is a global event. COMMENT

Called by {@link net.minecraft.entity.boss.WitherEntity#mobTick() WitherEntity#mobTick} FIELD field_31182 WITHER_SHOOTS I COMMENT A wither shoots a wither skull. @@ -286,6 +286,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents FIELD field_33511 BONE_MEAL_USED I COMMENT Bone meal is used. COMMENT
Plays the bone meal item used sound event and spawns happy villager particles. + COMMENT

The amount of particles to spawn must be supplied as extra data. COMMENT

Called by {@link net.minecraft.item.BoneMealItem#useOnBlock(net.minecraft.item.ItemUsageContext) BoneMealItem#useOnBlock}, COMMENT an anonymous class in {@link net.minecraft.block.dispenser.DispenserBehavior#registerDefaults() DispenserBehavior#registerDefaults}, COMMENT and {@link net.minecraft.entity.ai.brain.task.BoneMealTask#keepRunning(net.minecraft.server.world.ServerWorld, net.minecraft.entity.passive.VillagerEntity, long) BoneMealTask#keepRunning} @@ -348,3 +349,13 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT A trial spawner ejects loot. COMMENT
Plays the ejection sound and spawns ejection particles. COMMENT

Called by {@link net.minecraft.block.spawner.TrialSpawnerLogic#ejectLootTable}. + FIELD field_47837 BEE_FERTILIZES_PLANT I + COMMENT A plant is fertilized by a bee. + COMMENT
Spawns happy villager particles. + COMMENT

The amount of particles to spawn must be supplied as extra data. + COMMENT

Called by {@link net.minecraft.entity.passive.BeeEntity.GrowCropsGoal#tick() BeeEntity.GrowCropsGoal#tick} + FIELD field_47838 TURTLE_EGG_PLACED I + COMMENT A turtle egg is placed on sand. + COMMENT
Spawns happy villager particles. + COMMENT

The amount of particles to spawn must be supplied as extra data. + COMMENT

Called by {@link net.minecraft.block.TurtleEggBlock#onBlockAdded(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, boolean) TurtleEggBlock#onBlockAdded} diff --git a/mappings/net/minecraft/world/WorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandler.mapping index a46ed33391..b3e1c5a2ac 100644 --- a/mappings/net/minecraft/world/WorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/WorldSaveHandler.mapping @@ -2,10 +2,19 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler FIELD field_144 playerDataDir Ljava/io/File; FIELD field_148 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_149 LOGGER Lorg/slf4j/Logger; + FIELD field_47840 dateTimeFormatter Ljava/time/format/DateTimeFormatter; METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V ARG 1 session ARG 2 dataFixer METHOD method_261 loadPlayerData (Lnet/minecraft/class_1657;Ljava/lang/String;)Ljava/util/Optional; ARG 1 player + ARG 2 extension METHOD method_262 savePlayerData (Lnet/minecraft/class_1657;)V ARG 1 player + METHOD method_55787 backupCorruptedPlayerData (Lnet/minecraft/class_1657;Ljava/lang/String;)V + ARG 1 player + ARG 2 extension + METHOD method_55788 (Lnet/minecraft/class_1657;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 2 data + METHOD method_55789 loadPlayerData (Lnet/minecraft/class_1657;)Ljava/util/Optional; + ARG 1 player diff --git a/unpick-definitions/world_events.unpick b/unpick-definitions/world_events.unpick index 3ac4d639ec..31ce730b7f 100644 --- a/unpick-definitions/world_events.unpick +++ b/unpick-definitions/world_events.unpick @@ -50,7 +50,6 @@ constant world_events net/minecraft/world/WorldEvents BLOCK_BROKEN constant world_events net/minecraft/world/WorldEvents SPLASH_POTION_SPLASHED constant world_events net/minecraft/world/WorldEvents EYE_OF_ENDER_BREAKS constant world_events net/minecraft/world/WorldEvents SPAWNER_SPAWNS_MOB -constant world_events net/minecraft/world/WorldEvents PLANT_FERTILIZED constant world_events net/minecraft/world/WorldEvents DRAGON_BREATH_CLOUD_SPAWNS constant world_events net/minecraft/world/WorldEvents INSTANT_SPLASH_POTION_SPLASHED constant world_events net/minecraft/world/WorldEvents ENDER_DRAGON_BREAKS_BLOCK @@ -74,6 +73,8 @@ constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_SPAWNS_MOB constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_SPAWNS_MOB_AT_SPAWN_POS constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_DETECTS_PLAYER constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_EJECTS_ITEM +constant world_events net/minecraft/world/WorldEvents BEE_FERTILIZES_PLANT +constant world_events net/minecraft/world/WorldEvents TURTLE_EGG_PLACED target_method net/minecraft/world/WorldAccess syncWorldEvent (Lnet/minecraft/entity/player/PlayerEntity;ILnet/minecraft/util/math/BlockPos;I)V param 1 world_events From 302d5a04faf8c70a7722dcadf669278fc33a1aeb Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Mon, 25 Dec 2023 23:37:27 +0900 Subject: [PATCH 05/47] 23w51b yet more stuff (#3756) * 23w51b yet more stuff * Delete mappings/net/minecraft/entity/ai/brain/task/BreezeUtil.mapping --- mappings/net/minecraft/block/BedBlock.mapping | 2 + .../net/minecraft/block/Fertilizable.mapping | 2 +- .../net/minecraft/block/FlowerBlock.mapping | 2 +- .../block/cauldron/CauldronBehavior.mapping | 10 ++--- mappings/net/minecraft/client/Mouse.mapping | 6 +-- .../client/gui/hud/InGameHud.mapping | 3 +- .../MultiplayerServerListPinger.mapping | 1 + .../entity/StriderEntityRenderer.mapping | 2 +- .../datafixer/schema/Schema3799.mapping | 2 + mappings/net/minecraft/entity/Entity.mapping | 6 ++- .../entity/EntityAttachments.mapping | 6 ++- .../net/minecraft/entity/EntityType.mapping | 15 ++++++- .../net/minecraft/entity/LivingEntity.mapping | 2 +- .../entity/effect/StatusEffect.mapping | 11 ++++- .../effect/StatusEffectInstance.mapping | 40 +++++++++++++++++++ .../minecraft/entity/mob/PiglinEntity.mapping | 2 +- .../entity/mob/SkeletonHorseEntity.mapping | 2 +- .../minecraft/entity/mob/ZombieEntity.mapping | 2 +- .../entity/mob/ZombieHorseEntity.mapping | 2 +- .../entity/mob/ZombifiedPiglinEntity.mapping | 2 +- .../passive/AbstractDonkeyEntity.mapping | 2 +- .../entity/passive/ChickenEntity.mapping | 2 +- .../entity/passive/CowEntity.mapping | 2 +- .../entity/passive/FoxEntity.mapping | 2 +- .../entity/passive/HorseEntity.mapping | 2 +- .../entity/passive/LlamaEntity.mapping | 2 +- .../entity/passive/PandaEntity.mapping | 2 +- .../entity/passive/TurtleEntity.mapping | 3 +- .../net/minecraft/item/map/MapState.mapping | 4 +- .../c2s/play/UpdateBeaconC2SPacket.mapping | 2 + .../play/EntityStatusEffectS2CPacket.mapping | 3 ++ .../net/minecraft/potion/PotionUtil.mapping | 3 ++ .../minecraft/server/PlayerManager.mapping | 2 + .../server/function/FunctionBuilder.mapping | 2 +- .../minecraft/server/function/Macro.mapping | 4 +- .../minecraft/world/WorldSaveHandler.mapping | 4 +- .../minecraft/world/event/Vibrations.mapping | 3 +- 37 files changed, 125 insertions(+), 39 deletions(-) diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 83b6b05f79..16ea9e7da2 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -61,6 +61,8 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock ARG 1 respawnDirection METHOD method_53978 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_55767 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1657$class_1658;)V + ARG 1 reason METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;F)Ljava/util/Optional; ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/block/Fertilizable.mapping b/mappings/net/minecraft/block/Fertilizable.mapping index 05e17c7877..7d33524ff2 100644 --- a/mappings/net/minecraft/block/Fertilizable.mapping +++ b/mappings/net/minecraft/block/Fertilizable.mapping @@ -16,4 +16,4 @@ CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable ARG 2 random ARG 3 pos ARG 4 state - CLASS class_9077 Type + CLASS class_9077 FertilizableType diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 242a3e68aa..2722fdfba0 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock ARG 1 stewEffects ARG 2 settings METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_4970$class_2251;)V - ARG 1 effect + ARG 1 stewEffect ARG 2 duration ARG 3 settings METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Ljava/util/List; diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index b69d5487d3..11ae5e679a 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -73,8 +73,8 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior METHOD interact (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; COMMENT Called when a player interacts with a cauldron. COMMENT - COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if this behavior succeeds, - COMMENT {@link ActionResult#PASS} otherwise + COMMENT @return a {@linkplain ItemActionResult#isAccepted successful} action result if this behavior succeeds, + COMMENT {@link ItemActionResult#PASS_TO_DEFAULT_BLOCK_INTERACTION} otherwise ARG 1 state COMMENT the current cauldron block state ARG 2 world @@ -92,7 +92,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT corresponding cauldron behaviors. COMMENT COMMENT

The default return value in the map is a cauldron behavior - COMMENT that returns {@link ActionResult#PASS} for all items. + COMMENT that returns {@link ItemActionResult#PASS_TO_DEFAULT_BLOCK_INTERACTION} for all items. COMMENT COMMENT @return the created map ARG 0 name @@ -102,7 +102,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT

The filled bucket stack will be replaced by an empty bucket in the player's COMMENT inventory. COMMENT - COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result + COMMENT @return a {@linkplain ItemActionResult#isAccepted successful} action result ARG 0 world COMMENT the world where the cauldron is located ARG 1 pos @@ -129,7 +129,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_9062; COMMENT Empties a cauldron if it's full. COMMENT - COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if emptied, {@link ActionResult#PASS} otherwise + COMMENT @return a {@linkplain ItemActionResult#isAccepted successful} action result if emptied, {@link ItemActionResult#ASS_TO_DEFAULT_BLOCK_INTERACTION} otherwise ARG 0 state COMMENT the cauldron block state ARG 1 world diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index d5248fb786..5068a91464 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_1795 x D FIELD field_45296 eventDeltaHorizontalWheel D FIELD field_45297 eventDeltaVerticalWheel D - FIELD field_47842 lastUpdateTime D + FIELD field_47842 lastTickTime D METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1598 onMouseScroll (JDD)V @@ -40,7 +40,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse METHOD method_1603 getX ()D METHOD method_1604 getY ()D METHOD method_1606 updateMouse (D)V - ARG 1 delta + ARG 1 timeDelta METHOD method_1607 setup (J)V ARG 1 window METHOD method_1608 wasLeftButtonClicked ()Z @@ -70,4 +70,4 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse ARG 3 paths METHOD method_30134 setResolutionChanged ()V METHOD method_35707 wasMiddleButtonClicked ()Z - METHOD method_55793 updateMouse ()V + METHOD method_55793 tick ()V diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 9d72093a3d..6528bfec6b 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -144,6 +144,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 7 seed METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_332;F)V ARG 1 context + ARG 2 tickDelta METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_332;F)V ARG 1 context ARG 2 tickDelta @@ -209,7 +210,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_55799 renderSleepOverlay (Lnet/minecraft/class_332;F)V ARG 1 context ARG 2 tickDelta - METHOD method_55800 renderMessageOverlay (Lnet/minecraft/class_332;F)V + METHOD method_55800 renderOverlayMessage (Lnet/minecraft/class_332;F)V ARG 1 context ARG 2 tickDelta METHOD method_55801 renderTitleAndSubtitle (Lnet/minecraft/class_332;F)V diff --git a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping index 93e83cbb4d..12da7fc575 100644 --- a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping +++ b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_644 net/minecraft/client/network/MultiplayerServerList METHOD method_3003 add (Lnet/minecraft/class_642;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 entry ARG 2 saver + ARG 3 pingCallback METHOD method_3004 cancel ()V METHOD method_36897 showError (Lnet/minecraft/class_2561;Lnet/minecraft/class_642;)V ARG 1 error diff --git a/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping index 11fd39b6e3..6a9b706436 100644 --- a/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_4999 net/minecraft/client/render/entity/StriderEntityRenderer FIELD field_23372 TEXTURE Lnet/minecraft/class_2960; FIELD field_23937 COLD_TEXTURE Lnet/minecraft/class_2960; - FIELD field_47888 BABY_SCALE_MULTIPLIER F + FIELD field_47888 BABY_SHADOW_RADIUS_SCALE F diff --git a/mappings/net/minecraft/datafixer/schema/Schema3799.mapping b/mappings/net/minecraft/datafixer/schema/Schema3799.mapping index fac1190549..c05ecd4c3b 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3799.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3799.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_9061 net/minecraft/datafixer/schema/Schema3799 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index d3153a3f80..d0f0c34a2e 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -683,7 +683,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

A common example is a game event called in {@link #interact}, where the player COMMENT interacting with the entity is the emitter of the event. COMMENT - COMMENT @see #emitGameEvent(GameEvent) + COMMENT @see #emitGameEvent(RegistryEntry) ARG 1 event ARG 2 entity COMMENT the entity that emitted the game event, or {@code null} if there is none @@ -993,6 +993,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_54756 (Lnet/minecraft/class_1297;)Z ARG 0 passenger METHOD method_54757 getPlayerPassengers ()I + METHOD method_55665 getPassengerAttachmentPos (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_9066;)Lnet/minecraft/class_243; + ARG 0 vehicle + ARG 1 passenger + ARG 2 attachments METHOD method_55666 onDeflectProjectile (Lnet/minecraft/class_1676;)V ARG 1 projectile METHOD method_55667 getBlockStateAtPos ()Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/entity/EntityAttachments.mapping b/mappings/net/minecraft/entity/EntityAttachments.mapping index 11143e1979..65df05aa2b 100644 --- a/mappings/net/minecraft/entity/EntityAttachments.mapping +++ b/mappings/net/minecraft/entity/EntityAttachments.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_9066 net/minecraft/entity/EntityAttachments - FIELD field_47751 DEFAULT Lnet/minecraft/class_9066; FIELD field_47752 points Ljava/util/Map; METHOD (Ljava/util/Map;)V ARG 1 points - METHOD method_55673 create ()Lnet/minecraft/class_9066$class_9067; + METHOD method_55673 builder ()Lnet/minecraft/class_9066$class_9067; METHOD method_55674 scale (FFF)Lnet/minecraft/class_9066; ARG 1 xScale ARG 2 yScale @@ -28,6 +27,9 @@ CLASS net/minecraft/class_9066 net/minecraft/entity/EntityAttachments ARG 1 type ARG 2 index ARG 3 yaw + METHOD method_55844 of (FF)Lnet/minecraft/class_9066; + ARG 0 width + ARG 1 height CLASS class_9067 Builder FIELD field_47753 points Ljava/util/Map; METHOD method_55680 build (FF)Lnet/minecraft/class_9066; diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 885792230b..b8b1d0fde2 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -171,6 +171,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_24088 trackingTickInterval I FIELD field_25356 canSpawnInside Lcom/google/common/collect/ImmutableSet; FIELD field_40117 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_47755 attachments Lnet/minecraft/class_9066$class_9067; FIELD field_6148 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6149 spawnGroup Lnet/minecraft/class_1311; FIELD field_6150 summonable Z @@ -178,7 +179,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;)V ARG 1 factory ARG 2 spawnGroup - METHOD method_17687 setDimensions (FF)Lnet/minecraft/class_1299$class_1300; + METHOD method_17687 dimensions (FF)Lnet/minecraft/class_1299$class_1300; ARG 1 width ARG 2 height METHOD method_19947 makeFireImmune ()Lnet/minecraft/class_1299$class_1300; @@ -199,6 +200,18 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 blocks METHOD method_45323 requires ([Lnet/minecraft/class_7696;)Lnet/minecraft/class_1299$class_1300; ARG 1 features + METHOD method_55687 eyeHeight (F)Lnet/minecraft/class_1299$class_1300; + ARG 1 eyeHeight + METHOD method_55688 vehicleAttachment (Lnet/minecraft/class_243;)Lnet/minecraft/class_1299$class_1300; + ARG 1 vehicleAttachment + METHOD method_55689 passengerAttachments ([F)Lnet/minecraft/class_1299$class_1300; + ARG 1 offsetYs + METHOD method_55690 passengerAttachments ([Lnet/minecraft/class_243;)Lnet/minecraft/class_1299$class_1300; + ARG 1 passengerAttachments + METHOD method_55691 vehicleAttachment (F)Lnet/minecraft/class_1299$class_1300; + ARG 1 offsetY + METHOD method_55692 nameTagAttachment (F)Lnet/minecraft/class_1299$class_1300; + ARG 1 offsetY METHOD method_5900 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index f2ab78e31d..f1ac8ab5d0 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -608,7 +608,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT Removes a status effect from this entity without calling any listener. COMMENT COMMENT

This method does not perform any cleanup or synchronization operation. - COMMENT Under most circumstances, calling {@link #removeStatusEffect(StatusEffect)} is highly preferable. + COMMENT Under most circumstances, calling {@link #removeStatusEffect(RegistryEntry)} is highly preferable. COMMENT COMMENT @return the status effect removed ARG 1 effect diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 737648267c..f9986fc238 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect FIELD field_18270 category Lnet/minecraft/class_4081; + FIELD field_47738 fadeTicks I FIELD field_5883 translationKey Ljava/lang/String; FIELD field_5885 attributeModifiers Ljava/util/Map; FIELD field_5886 color I @@ -28,11 +29,19 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 3 target ARG 4 amplifier ARG 5 proximity - METHOD method_55650 (ILjava/util/function/BiConsumer;)V + METHOD method_55649 fadeTicks (I)Lnet/minecraft/class_1291; + COMMENT Sets the duration of effect fade-in and fade-out. + COMMENT + COMMENT @return this effect, for chaining + COMMENT @see StatusEffectInstance#getFadeFactor + ARG 1 fadeTicks + METHOD method_55650 forEachAttributeModifier (ILjava/util/function/BiConsumer;)V ARG 1 amplifier + ARG 2 consumer METHOD method_55651 (Ljava/util/function/BiConsumer;ILnet/minecraft/class_6880;Lnet/minecraft/class_1291$class_8634;)V ARG 3 attribute ARG 4 modifier + METHOD method_55652 getFadeOutTicks ()I METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_6880;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291; ARG 1 attribute ARG 2 uuid diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index ead3af89e9..f2c3e7470b 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_45734 DURATION_NBT_KEY Ljava/lang/String; FIELD field_45735 SHOW_PARTICLES_NBT_KEY Ljava/lang/String; FIELD field_45736 SHOW_ICON_NBT_KEY Ljava/lang/String; + FIELD field_47739 fading Lnet/minecraft/class_1293$class_9063; FIELD field_5889 showIcon Z FIELD field_5890 showParticles Z FIELD field_5892 ambient Z @@ -76,10 +77,24 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_48563 getDurationString ()Ljava/lang/String; METHOD method_52523 onApplied (Lnet/minecraft/class_1309;)V ARG 1 entity + METHOD method_55653 getFadeFactor (Lnet/minecraft/class_1309;F)F + COMMENT {@return the factor (multiplier) for effect fade-in and fade-out} + COMMENT + COMMENT

The return value is between {@code 0.0f} and {@code 1.0f} (both inclusive). + COMMENT + COMMENT @see StatusEffect#fadeTicks(int) + ARG 1 entity + ARG 2 tickDelta METHOD method_55654 equals (Lnet/minecraft/class_6880;)Z ARG 1 effect METHOD method_55655 (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_1293; ARG 1 effect + METHOD method_55656 copyFadingFrom (Lnet/minecraft/class_1293;)V + ARG 1 effect + METHOD method_55657 skipFading ()V + COMMENT Skips fade-in or fade-out currently in progress, instantly setting it + COMMENT to the final state (factor {@code 1.0f} or {@code 0.0f}, depending on the + COMMENT effect's duration). METHOD method_5578 getAmplifier ()I METHOD method_5579 getEffectType ()Lnet/minecraft/class_6880; METHOD method_5581 shouldShowParticles ()Z @@ -97,3 +112,28 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 1 that METHOD method_5591 isAmbient ()Z METHOD method_5592 shouldShowIcon ()Z + CLASS class_9063 Fading + COMMENT Computes the factor (multiplier) for effect fade-in and fade-out. + COMMENT + COMMENT

This is used by {@link StatusEffects#DARKNESS} in vanilla. + COMMENT + COMMENT @see StatusEffect#fadeTicks(int) + COMMENT @see StatusEffect#getFadeTicks + FIELD field_47740 factor F + FIELD field_47741 prevFactor F + METHOD method_55658 copyFrom (Lnet/minecraft/class_1293$class_9063;)V + ARG 1 fading + METHOD method_55659 skipFading (Lnet/minecraft/class_1293;)V + COMMENT Skips fade-in or fade-out currently in progress, instantly setting it + COMMENT to the final state (factor {@code 1.0f} or {@code 0.0f}, depending on the + COMMENT effect's duration). + ARG 1 effect + METHOD method_55660 calculate (Lnet/minecraft/class_1309;F)F + ARG 1 entity + ARG 2 tickDelta + METHOD method_55661 update (Lnet/minecraft/class_1293;)V + ARG 1 effect + METHOD method_55662 getTarget (Lnet/minecraft/class_1293;)F + ARG 0 effect + METHOD method_55663 getFadeTicks (Lnet/minecraft/class_1293;)I + ARG 0 effect diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index 6a3f5b31a7..644ba1920e 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity FIELD field_22381 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; FIELD field_23738 cannotHunt Z FIELD field_25164 DANCING Lnet/minecraft/class_2940; - FIELD field_47818 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47818 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; METHOD method_24695 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping index 401db733db..0dada3d787 100644 --- a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1506 net/minecraft/entity/mob/SkeletonHorseEntity FIELD field_30427 DESPAWN_AGE I - FIELD field_47809 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47809 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_7003 trapTriggerGoal Lnet/minecraft/class_1505; FIELD field_7004 trapTime I FIELD field_7005 trapped Z diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index f9f409e162..99c794d968 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity FIELD field_19015 DOOR_BREAK_DIFFICULTY_CHECKER Ljava/util/function/Predicate; - FIELD field_47811 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47811 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_7424 ticksUntilWaterConversion I FIELD field_7425 CONVERTING_IN_WATER Lnet/minecraft/class_2940; FIELD field_7426 inWaterTime I diff --git a/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping index 0cdce212d0..5c509dd673 100644 --- a/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1507 net/minecraft/entity/mob/ZombieHorseEntity - FIELD field_47810 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47810 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; METHOD method_26902 createZombieHorseAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55002 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index d87b0c10df..f990cdf85e 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_6019; FIELD field_25608 angerPassingCooldown I FIELD field_25609 ANGER_PASSING_COOLDOWN_RANGE Lnet/minecraft/class_6019; - FIELD field_47812 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47812 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7308 angrySoundDelay I FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping index 60ea178033..811ac73e27 100644 --- a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1492 net/minecraft/entity/passive/AbstractDonkeyEntity - FIELD field_47806 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47806 babyBaseDimensions Lnet/minecraft/class_4048; FIELD field_6943 CHEST Lnet/minecraft/class_2940; METHOD method_26898 createAbstractDonkeyAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_45374 addChest (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping index 250610ed93..9ea5f26174 100644 --- a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1428 net/minecraft/entity/passive/ChickenEntity - FIELD field_47770 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47770 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6736 prevFlapProgress F FIELD field_6737 flapSpeed F FIELD field_6738 prevMaxWingDeviation F diff --git a/mappings/net/minecraft/entity/passive/CowEntity.mapping b/mappings/net/minecraft/entity/passive/CowEntity.mapping index b8465f4ff8..78eb63f1a8 100644 --- a/mappings/net/minecraft/entity/passive/CowEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CowEntity.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_1430 net/minecraft/entity/passive/CowEntity - FIELD field_47771 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47771 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; METHOD method_26883 createCowAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 1b159e465d..79088403c2 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity FIELD field_30333 WALKING_FLAG I FIELD field_30334 AGGRESSIVE_FLAG I FIELD field_30335 EATING_DURATION I - FIELD field_47772 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47772 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; METHOD method_18253 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_18254 (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index 94056dfaac..852e3c51cb 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity - FIELD field_47807 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47807 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6985 HORSE_ARMOR_BONUS_ID Ljava/util/UUID; FIELD field_6990 VARIANT Lnet/minecraft/class_2940; METHOD method_18445 equipArmor (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 4d4f65584c..006daf1416 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity FIELD field_25375 TAMING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_30425 MAX_STRENGTH I - FIELD field_47808 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47808 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6995 CARPET_COLOR Lnet/minecraft/class_2940; FIELD field_6996 VARIANT Lnet/minecraft/class_2940; FIELD field_6997 follower Lnet/minecraft/class_1501; diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index d548fc8046..7d2507eb91 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity FIELD field_30347 LYING_ON_BACK_FLAG I FIELD field_30348 EATING_ANIMATION_INTERVAL I FIELD field_30349 HIDDEN_GENE_MUTATION_CHANCE I - FIELD field_47773 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47773 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6764 ASK_FOR_BAMBOO_TICKS Lnet/minecraft/class_2940; FIELD field_6765 IS_FOOD Ljava/util/function/Predicate; FIELD field_6766 MAIN_GENE Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index a91a99f4fb..b357a1299f 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity FIELD field_28406 BREEDING_ITEM Lnet/minecraft/class_1856; - FIELD field_47775 babyDimensions Lnet/minecraft/class_4048; + FIELD field_47774 BABY_SCALE F + FIELD field_47775 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6918 sandDiggingCounter I FIELD field_6919 HAS_EGG Lnet/minecraft/class_2940; FIELD field_6920 HOME_POS Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 091dbcaf4d..2bafa8cec3 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -117,10 +117,10 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_37343 iconCountNotLessThan (I)Z ARG 1 iconCount METHOD method_52611 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; - METHOD method_55784 createMapPredicate (Lnet/minecraft/class_1799;)Ljava/util/function/Predicate; + METHOD method_55784 getEqualPredicate (Lnet/minecraft/class_1799;)Ljava/util/function/Predicate; ARG 0 stack METHOD method_55785 (Lnet/minecraft/class_1799;Ljava/lang/Integer;Lnet/minecraft/class_1799;)Z - ARG 2 stack2 + ARG 2 other CLASS class_23 PlayerUpdateTracker FIELD field_124 emptyPacketsRequested I FIELD field_125 player Lnet/minecraft/class_1657; diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 9ebb62044f..a334154d78 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -6,9 +6,11 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaco ARG 1 buf METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 + ARG 1 secondary METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; ARG 0 buf2 METHOD method_43366 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 + ARG 1 primary METHOD method_43367 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; ARG 0 buf2 diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index a8a7cf58a8..36d18e76cf 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -7,9 +7,11 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu FIELD field_33356 AMBIENT_MASK I FIELD field_33357 SHOW_PARTICLES_MASK I FIELD field_33358 SHOW_ICON_MASK I + FIELD field_47706 KEEP_FADING_MASK I METHOD (ILnet/minecraft/class_1293;Z)V ARG 1 entityId ARG 2 effect + ARG 3 keepFading METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11942 shouldShowIcon ()Z @@ -19,3 +21,4 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11946 getEffectId ()Lnet/minecraft/class_6880; METHOD method_11949 shouldShowParticles ()Z METHOD method_11950 isAmbient ()Z + METHOD method_55629 keepFading ()Z diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index 3d0343b1f4..c4d148fcd1 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 1 list ARG 2 durationMultiplier ARG 3 tickRate + METHOD method_55762 (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 1 attribute + ARG 2 modifier METHOD method_8055 getColor (Ljava/util/Collection;)I ARG 0 effects METHOD method_8056 setCustomPotionEffects (Lnet/minecraft/class_1799;Ljava/util/Collection;)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 7caaedad90..c1ca6f2d5e 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -226,3 +226,5 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 message METHOD method_52449 disconnectDuplicateLogins (Lcom/mojang/authlib/GameProfile;)Z ARG 1 profile + METHOD method_55634 (Lnet/minecraft/class_2487;)Ljava/util/Optional; + ARG 0 nbt diff --git a/mappings/net/minecraft/server/function/FunctionBuilder.mapping b/mappings/net/minecraft/server/function/FunctionBuilder.mapping index 6b80012f17..5d3e79e149 100644 --- a/mappings/net/minecraft/server/function/FunctionBuilder.mapping +++ b/mappings/net/minecraft/server/function/FunctionBuilder.mapping @@ -11,6 +11,6 @@ CLASS net/minecraft/class_8867 net/minecraft/server/function/FunctionBuilder METHOD method_54421 addMacroCommand (Ljava/lang/String;ILnet/minecraft/class_8839;)V ARG 1 command ARG 2 lineNum - ARG 3 commandSource + ARG 3 source METHOD method_54422 indicesOfVariables (Ljava/util/List;)Lit/unimi/dsi/fastutil/ints/IntList; ARG 1 variables diff --git a/mappings/net/minecraft/server/function/Macro.mapping b/mappings/net/minecraft/server/function/Macro.mapping index 166fd78f1a..9176ce3e2f 100644 --- a/mappings/net/minecraft/server/function/Macro.mapping +++ b/mappings/net/minecraft/server/function/Macro.mapping @@ -34,11 +34,11 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro CLASS class_8870 VariableLine FIELD field_46760 invocation Lnet/minecraft/class_8873; FIELD field_46761 variableIndices Lit/unimi/dsi/fastutil/ints/IntList; - FIELD field_47891 commandSource Lnet/minecraft/class_8839; + FIELD field_47891 source Lnet/minecraft/class_8839; METHOD (Lnet/minecraft/class_8873;Lit/unimi/dsi/fastutil/ints/IntList;Lnet/minecraft/class_8839;)V ARG 1 invocation ARG 2 variableIndices - ARG 3 commandSource + ARG 3 source CLASS class_8871 FixedLine FIELD field_46762 action Lnet/minecraft/class_8856; METHOD (Lnet/minecraft/class_8856;)V diff --git a/mappings/net/minecraft/world/WorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandler.mapping index b3e1c5a2ac..161cd1cd0c 100644 --- a/mappings/net/minecraft/world/WorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/WorldSaveHandler.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler FIELD field_144 playerDataDir Ljava/io/File; FIELD field_148 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_149 LOGGER Lorg/slf4j/Logger; - FIELD field_47840 dateTimeFormatter Ljava/time/format/DateTimeFormatter; + FIELD field_47840 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V ARG 1 session ARG 2 dataFixer @@ -15,6 +15,6 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler ARG 1 player ARG 2 extension METHOD method_55788 (Lnet/minecraft/class_1657;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 2 data + ARG 2 nbt METHOD method_55789 loadPlayerData (Lnet/minecraft/class_1657;)Ljava/util/Optional; ARG 1 player diff --git a/mappings/net/minecraft/world/event/Vibrations.mapping b/mappings/net/minecraft/world/event/Vibrations.mapping index 0a608ffd9a..c9a3542c22 100644 --- a/mappings/net/minecraft/world/event/Vibrations.mapping +++ b/mappings/net/minecraft/world/event/Vibrations.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations FIELD field_44638 RESONATIONS Ljava/util/List; FIELD field_44639 FREQUENCIES Ljava/util/function/ToIntFunction; + FIELD field_47839 DEFAULT_FREQUENCY I METHOD method_51298 getVibrationListenerData ()Lnet/minecraft/class_8514$class_8515; METHOD method_51299 getVibrationCallback ()Lnet/minecraft/class_8514$class_5719; METHOD method_51383 (Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;)V @@ -12,7 +13,7 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations ARG 0 gameEvent METHOD method_51386 getResonation (I)Lnet/minecraft/class_5321; ARG 0 frequency - METHOD method_55783 getFrequencyOrZero (Lnet/minecraft/class_6880;)I + METHOD method_55783 getFrequency (Lnet/minecraft/class_6880;)I ARG 0 gameEvent CLASS class_5719 Callback METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V From e003d7446f7df9669a4e6521e949634c21edf935 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 17 Jan 2024 16:52:02 +0000 Subject: [PATCH 06/47] 24w03a --- build.gradle | 2 +- .../minecraft/advancement/Advancement.mapping | 9 +- .../advancement/AdvancementDisplay.mapping | 6 +- .../advancement/AdvancementEntry.mapping | 4 - .../net/minecraft/block/AbstractBlock.mapping | 3 + .../net/minecraft/block/BeehiveBlock.mapping | 2 - mappings/net/minecraft/block/Block.mapping | 8 -- .../net/minecraft/block/PumpkinBlock.mapping | 2 - mappings/net/minecraft/block/TntBlock.mapping | 2 - .../block/entity/ViewerCountManager.mapping | 3 - mappings/net/minecraft/class_9104.mapping | 3 + mappings/net/minecraft/class_9107.mapping | 3 + .../minecraft/client/MinecraftClient.mapping | 2 +- .../client/font/RenderableGlyph.mapping | 2 - .../client/font/TrueTypeFont.mapping | 20 +--- .../gui/screen/ingame/InventoryScreen.mapping | 3 +- .../screen/multiplayer/ConnectScreen.mapping | 4 +- .../MultiplayerServerListWidget.mapping | 1 - .../gui/screen/world/EditWorldScreen.mapping | 2 - .../gui/screen/world/WorldListWidget.mapping | 1 - .../client/gui/tooltip/Tooltip.mapping | 13 --- .../client/gui/widget/ClickableWidget.mapping | 5 +- .../network/ClientLoginNetworkHandler.mapping | 2 +- .../client/network/ServerInfo.mapping | 4 - .../realms/gui/RealmsWorldSlotButton.mapping | 1 - .../screen/RealmsCreateWorldScreen.mapping | 11 -- .../gui/screen/RealmsMainScreen.mapping | 10 +- .../RealmsSelectFileToUploadScreen.mapping | 6 -- .../gui/screen/RealmsUploadScreen.mapping | 9 -- .../entity/LivingEntityRenderer.mapping | 2 +- .../client/texture/NativeImage.mapping | 12 +-- .../client/world/ClientWorld.mapping | 3 - mappings/net/minecraft/data/DataCache.mapping | 2 - .../enchantment/DamageEnchantment.mapping | 11 +- .../minecraft/enchantment/Enchantment.mapping | 8 +- .../enchantment/EnchantmentHelper.mapping | 5 +- .../enchantment/EnchantmentTarget.mapping | 3 - .../enchantment/ThornsEnchantment.mapping | 2 - mappings/net/minecraft/entity/Entity.mapping | 2 - .../net/minecraft/entity/EntityGroup.mapping | 6 -- .../net/minecraft/entity/LivingEntity.mapping | 8 -- .../entity/ai/brain/task/BreedTask.mapping | 3 +- .../task/GatherItemsVillagerTask.mapping | 2 - .../ai/brain/task/LookTargetUtil.mapping | 4 +- .../ai/brain/task/VillagerBreedTask.mapping | 2 - .../attribute/EntityAttributeModifier.mapping | 4 - .../minecraft/entity/data/DataTracker.mapping | 9 +- .../entity/data/TrackedDataHandler.mapping | 22 ---- .../data/TrackedDataHandlerRegistry.mapping | 6 -- .../entity/mob/CreeperEntity.mapping | 2 - .../minecraft/entity/mob/HoglinEntity.mapping | 2 - .../minecraft/entity/mob/MobEntity.mapping | 4 - .../minecraft/entity/mob/PiglinEntity.mapping | 2 - .../entity/mob/ShulkerEntity.mapping | 9 +- .../entity/passive/ArmadilloEntity.mapping | 6 +- .../entity/passive/CamelEntity.mapping | 3 - .../entity/passive/CatEntity.mapping | 2 - .../entity/passive/GoatBrain.mapping | 1 - .../entity/passive/MooshroomEntity.mapping | 2 - .../entity/passive/SheepEntity.mapping | 2 - .../entity/passive/SnowGolemEntity.mapping | 2 - .../entity/passive/WolfEntity.mapping | 2 - .../entity/player/PlayerEntity.mapping | 5 +- .../entity/player/PlayerInventory.mapping | 2 - .../PersistentProjectileEntity.mapping | 2 - .../projectile/ProjectileEntity.mapping | 1 - .../entity/vehicle/VehicleInventory.mapping | 2 +- .../net/minecraft/inventory/Inventory.mapping | 3 +- mappings/net/minecraft/item/AxeItem.mapping | 2 - .../net/minecraft/item/BoneMealItem.mapping | 4 - mappings/net/minecraft/item/BowItem.mapping | 2 - mappings/net/minecraft/item/BrushItem.mapping | 2 - .../net/minecraft/item/CrossbowItem.mapping | 2 - .../net/minecraft/item/FishingRodItem.mapping | 2 - .../minecraft/item/FlintAndSteelItem.mapping | 4 - .../net/minecraft/item/GoatHornItem.mapping | 2 - mappings/net/minecraft/item/HoeItem.mapping | 2 - mappings/net/minecraft/item/ItemStack.mapping | 12 +-- .../net/minecraft/item/MiningToolItem.mapping | 4 - .../net/minecraft/item/OnAStickItem.mapping | 2 - .../net/minecraft/item/ShearsItem.mapping | 4 - .../net/minecraft/item/ShovelItem.mapping | 2 - mappings/net/minecraft/item/SwordItem.mapping | 4 - .../net/minecraft/item/TridentItem.mapping | 6 -- .../net/minecraft/item/Vanishable.mapping | 2 - .../network/ClientConnection.mapping | 29 +---- .../minecraft/network/NetworkState.mapping | 62 +---------- .../minecraft/network/PacketByteBuf.mapping | 91 +++------------- .../network/handler/DecoderHandler.mapping | 4 - .../NetworkStateTransitionHandler.mapping | 3 - .../handler/PacketBundleHandler.mapping | 8 +- .../network/handler/PacketBundler.mapping | 4 - .../network/handler/PacketEncoder.mapping | 3 - .../network/handler/PacketUnbundler.mapping | 3 - .../network/handler/PacketValidator.mapping | 20 ---- .../network/packet/BrandCustomPayload.mapping | 1 - .../network/packet/CustomPayload.mapping | 2 - .../minecraft/network/packet/Packet.mapping | 9 -- .../c2s/common/CustomPayloadC2SPacket.mapping | 9 -- .../packet/c2s/config/ReadyC2SPacket.mapping | 2 - .../c2s/handshake/ConnectionIntent.mapping | 1 - .../login/EnterConfigurationC2SPacket.mapping | 2 - .../login/LoginQueryResponseC2SPacket.mapping | 1 + ...cknowledgeReconfigurationC2SPacket.mapping | 2 - .../c2s/play/ClickSlotC2SPacket.mapping | 4 - .../CreativeInventoryActionC2SPacket.mapping | 2 - .../c2s/play/UpdateBeaconC2SPacket.mapping | 12 --- .../c2s/query/QueryRequestC2SPacket.mapping | 2 - .../s2c/common/CustomPayloadS2CPacket.mapping | 9 -- .../packet/s2c/config/ReadyS2CPacket.mapping | 2 - .../s2c/custom/DebugBeeCustomPayload.mapping | 2 +- .../custom/DebugBrainCustomPayload.mapping | 1 - .../custom/DebugBreezeCustomPayload.mapping | 1 - .../DebugGameEventCustomPayload.mapping | 1 - ...bugGameEventListenersCustomPayload.mapping | 3 - ...ebugGameTestAddMarkerCustomPayload.mapping | 1 - .../DebugGameTestClearCustomPayload.mapping | 1 - .../DebugGoalSelectorCustomPayload.mapping | 1 - .../s2c/custom/DebugHiveCustomPayload.mapping | 1 - .../DebugNeighborsUpdateCustomPayload.mapping | 1 - .../s2c/custom/DebugPathCustomPayload.mapping | 1 - .../custom/DebugPoiAddedCustomPayload.mapping | 1 - .../DebugPoiRemovedCustomPayload.mapping | 1 - .../DebugPoiTicketCountCustomPayload.mapping | 1 - .../custom/DebugRaidsCustomPayload.mapping | 1 - .../DebugStructuresCustomPayload.mapping | 1 - .../DebugVillageSectionsCustomPayload.mapping | 1 - .../DebugWorldgenAttemptCustomPayload.mapping | 1 - .../s2c/login/LoginHelloS2CPacket.mapping | 2 +- .../play/AdvancementUpdateS2CPacket.mapping | 5 - .../play/BlockEntityUpdateS2CPacket.mapping | 6 -- .../s2c/play/BlockEventS2CPacket.mapping | 2 - .../s2c/play/BlockUpdateS2CPacket.mapping | 2 - .../network/packet/s2c/play/ChunkData.mapping | 18 +--- .../s2c/play/ChunkDataS2CPacket.mapping | 2 - .../s2c/play/CooldownUpdateS2CPacket.mapping | 13 +-- .../s2c/play/EnterCombatS2CPacket.mapping | 2 - .../EnterReconfigurationS2CPacket.mapping | 2 - .../play/EntityAttributesS2CPacket.mapping | 12 --- .../EntityEquipmentUpdateS2CPacket.mapping | 2 - .../s2c/play/EntitySpawnS2CPacket.mapping | 2 - .../play/EntityStatusEffectS2CPacket.mapping | 2 - .../play/EntityTrackerUpdateS2CPacket.mapping | 8 +- .../s2c/play/ExplosionS2CPacket.mapping | 15 +-- .../packet/s2c/play/GameJoinS2CPacket.mapping | 2 +- .../s2c/play/InventoryS2CPacket.mapping | 2 - .../s2c/play/OpenScreenS2CPacket.mapping | 6 -- .../packet/s2c/play/ParticleS2CPacket.mapping | 5 - .../play/PlaySoundFromEntityS2CPacket.mapping | 2 - .../s2c/play/PlaySoundS2CPacket.mapping | 2 - .../RemoveEntityStatusEffectS2CPacket.mapping | 2 - ...ScoreboardObjectiveUpdateS2CPacket.mapping | 6 +- .../ScoreboardScoreUpdateS2CPacket.mapping | 2 - .../ScreenHandlerSlotUpdateS2CPacket.mapping | 2 - .../s2c/play/ServerMetadataS2CPacket.mapping | 5 +- .../s2c/play/SetTradeOffersS2CPacket.mapping | 2 - .../s2c/play/StartChunkSendS2CPacket.mapping | 2 - .../s2c/play/StatisticsS2CPacket.mapping | 16 +-- .../play/SynchronizeRecipesS2CPacket.mapping | 9 -- .../s2c/query/PingResultS2CPacket.mapping | 4 +- .../AbstractDustParticleEffect.mapping | 2 - .../minecraft/particle/ParticleEffect.mapping | 5 - .../minecraft/particle/ParticleTypes.mapping | 2 +- .../particle/VibrationParticleEffect.mapping | 4 - .../net/minecraft/recipe/Ingredient.mapping | 4 - .../minecraft/recipe/RawShapedRecipe.mapping | 8 +- .../minecraft/recipe/RecipeSerializer.mapping | 19 ---- .../book/CraftingRecipeCategory.mapping | 2 +- .../number/NumberFormatType.mapping | 5 - .../number/NumberFormatTypes.mapping | 5 - .../screen/MerchantScreenHandler.mapping | 2 +- .../minecraft/server/MinecraftServer.mapping | 2 - .../WorldGenerationProgressTracker.mapping | 2 - .../server/command/TestCommand.mapping | 102 +----------------- .../network/ConnectedClientData.mapping | 2 +- .../network/ServerLoginNetworkHandler.mapping | 3 +- .../server/network/ServerPlayerEntity.mapping | 4 - .../net/minecraft/sound/SoundEvent.mapping | 4 - .../net/minecraft/test/GameTestBatch.mapping | 16 ++- .../net/minecraft/test/GameTestState.mapping | 21 +--- .../test/StructureTestListener.mapping | 8 -- .../minecraft/test/StructureTestUtil.mapping | 6 +- .../net/minecraft/test/TestFunction.mapping | 39 +++---- .../net/minecraft/test/TestFunctions.mapping | 6 +- .../net/minecraft/test/TestListener.mapping | 4 +- .../net/minecraft/test/TestRunner.mapping | 36 ------- .../net/minecraft/test/TestServer.mapping | 1 - mappings/net/minecraft/test/TestUtil.mapping | 34 ------ .../packageinfo/PackageInfo9092.mapping | 1 + .../packageinfo/PackageInfo9101.mapping | 1 + .../packageinfo/PackageInfo9144.mapping | 1 + .../net/minecraft/util/math/BlockPos.mapping | 31 +----- .../net/minecraft/util/math/GlobalPos.mapping | 8 +- .../util/profiling/jfr/FlightProfiler.mapping | 6 +- .../profiling/jfr/event/PacketEvent.mapping | 5 +- .../jfr/sample/NetworkIoStatistics.mapping | 9 +- .../net/minecraft/village/TradeOffer.mapping | 10 +- .../minecraft/village/TradeOfferList.mapping | 9 -- .../net/minecraft/village/TradeOffers.mapping | 4 +- .../net/minecraft/world/GameRules.mapping | 1 - .../world/MutableWorldProperties.mapping | 8 -- mappings/net/minecraft/world/World.mapping | 6 +- .../minecraft/world/WorldProperties.mapping | 3 - .../world/event/PositionSourceType.mapping | 10 -- .../world/explosion/Explosion.mapping | 10 +- .../world/gen/feature/CoralFeature.mapping | 6 -- .../world/level/LevelProperties.mapping | 32 +----- 207 files changed, 168 insertions(+), 1184 deletions(-) create mode 100644 mappings/net/minecraft/class_9104.mapping create mode 100644 mappings/net/minecraft/class_9107.mapping delete mode 100644 mappings/net/minecraft/enchantment/EnchantmentTarget.mapping delete mode 100644 mappings/net/minecraft/entity/EntityGroup.mapping delete mode 100644 mappings/net/minecraft/item/Vanishable.mapping delete mode 100644 mappings/net/minecraft/network/handler/PacketValidator.mapping delete mode 100644 mappings/net/minecraft/test/TestRunner.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9092.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9101.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9144.mapping diff --git a/build.gradle b/build.gradle index 9fbe31f27a..de8249efad 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w51b" +def minecraft_version = "24w03a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 822feb10d7..73b19fe9f4 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -14,16 +14,11 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 0 identifiedAdvancement METHOD method_53623 createNameFromDisplay (Lnet/minecraft/class_185;)Lnet/minecraft/class_2561; ARG 0 display - METHOD method_53627 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_53628 (Lnet/minecraft/class_2540;Lnet/minecraft/class_185;)V - ARG 0 buf - ARG 1 display + METHOD method_53627 write (Lnet/minecraft/class_9129;)V METHOD method_53629 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_53630 isRoot ()Z - METHOD method_53632 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_161; - ARG 0 buf + METHOD method_53632 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_161; METHOD method_54910 validate (Lnet/minecraft/class_161;)Lcom/mojang/serialization/DataResult; ARG 0 advancement METHOD method_54911 (Lnet/minecraft/class_161;Lnet/minecraft/class_8782;)Lnet/minecraft/class_161; diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping index f53a7e4709..c9a42bfa92 100644 --- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping +++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping @@ -24,8 +24,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay METHOD method_808 shouldAnnounceToChat ()Z METHOD method_811 getTitle ()Lnet/minecraft/class_2561; METHOD method_812 getBackground ()Ljava/util/Optional; - METHOD method_813 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_813 toPacket (Lnet/minecraft/class_9129;)V METHOD method_815 getFrame ()Lnet/minecraft/class_189; METHOD method_816 setPos (FF)V ARG 1 x @@ -33,8 +32,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay METHOD method_817 getDescription ()Lnet/minecraft/class_2561; METHOD method_818 getX ()F METHOD method_819 getY ()F - METHOD method_820 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_185; - ARG 0 buf + METHOD method_820 fromPacket (Lnet/minecraft/class_9129;)Lnet/minecraft/class_185; METHOD method_821 getIcon ()Lnet/minecraft/class_1799; METHOD method_823 shouldShowToast ()Z METHOD method_824 isHidden ()Z diff --git a/mappings/net/minecraft/advancement/AdvancementEntry.mapping b/mappings/net/minecraft/advancement/AdvancementEntry.mapping index e9d6089744..6da16f53cb 100644 --- a/mappings/net/minecraft/advancement/AdvancementEntry.mapping +++ b/mappings/net/minecraft/advancement/AdvancementEntry.mapping @@ -5,7 +5,3 @@ CLASS net/minecraft/class_8779 net/minecraft/advancement/AdvancementEntry METHOD comp_1920 value ()Lnet/minecraft/class_161; METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_53635 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_53636 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8779; - ARG 0 buf diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 51a10bf770..21af4c6478 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -516,6 +516,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 3 pos ARG 4 newState ARG 5 moved + METHOD method_9542 hasRandomTicks (Lnet/minecraft/class_2680;)Z METHOD method_9545 getFluidState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610; COMMENT {@return the state's associated fluid state} COMMENT @@ -695,11 +696,13 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 state ARG 2 world ARG 3 pos + METHOD method_9573 getSoundGroup (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2498; METHOD method_9575 getAmbientOcclusionLightLevel (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F COMMENT @deprecated Consider calling {@link AbstractBlockState#getAmbientOcclusionLightLevel} instead. See why these methods are deprecated. ARG 1 state ARG 2 world ARG 3 pos + METHOD method_9579 isTransparent (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z METHOD method_9584 getRaycastShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; COMMENT @deprecated Consider calling {@link AbstractBlockState#getRaycastShape} instead. See why these methods are deprecated. ARG 1 state diff --git a/mappings/net/minecraft/block/BeehiveBlock.mapping b/mappings/net/minecraft/block/BeehiveBlock.mapping index 2f6c551b1a..079847d702 100644 --- a/mappings/net/minecraft/block/BeehiveBlock.mapping +++ b/mappings/net/minecraft/block/BeehiveBlock.mapping @@ -39,5 +39,3 @@ CLASS net/minecraft/class_4481 net/minecraft/block/BeehiveBlock METHOD method_23894 hasBees (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos - METHOD method_55768 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index b0193bd7ea..c12a3f9dcb 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -203,8 +203,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 6 maxX ARG 8 maxY ARG 10 maxZ - METHOD method_9542 hasRandomTicks (Lnet/minecraft/class_2680;)Z - ARG 1 state METHOD method_9543 hasDynamicBounds ()Z METHOD method_9544 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 2 stack @@ -276,8 +274,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 world ARG 3 tooltip ARG 4 options - METHOD method_9573 getSoundGroup (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2498; - ARG 1 state METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; COMMENT {@return the new item stack when using pick block functionality} COMMENT @@ -314,10 +310,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 0 world ARG 1 pos ARG 2 stack - METHOD method_9579 isTransparent (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z - ARG 1 state - ARG 2 world - ARG 3 pos METHOD method_9581 cannotConnect (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_9582 pushEntitiesUpBeforeBlockChange (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/block/PumpkinBlock.mapping b/mappings/net/minecraft/block/PumpkinBlock.mapping index 5bbd5f115d..35e3e063f0 100644 --- a/mappings/net/minecraft/block/PumpkinBlock.mapping +++ b/mappings/net/minecraft/block/PumpkinBlock.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_2445 net/minecraft/block/PumpkinBlock FIELD field_46419 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_55777 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx diff --git a/mappings/net/minecraft/block/TntBlock.mapping b/mappings/net/minecraft/block/TntBlock.mapping index f855a5565f..ad7640a0b8 100644 --- a/mappings/net/minecraft/block/TntBlock.mapping +++ b/mappings/net/minecraft/block/TntBlock.mapping @@ -8,5 +8,3 @@ CLASS net/minecraft/class_2530 net/minecraft/block/TntBlock METHOD method_10738 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos - METHOD method_55778 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx diff --git a/mappings/net/minecraft/block/entity/ViewerCountManager.mapping b/mappings/net/minecraft/block/entity/ViewerCountManager.mapping index f8ffb5cd14..50a15d966a 100644 --- a/mappings/net/minecraft/block/entity/ViewerCountManager.mapping +++ b/mappings/net/minecraft/block/entity/ViewerCountManager.mapping @@ -7,9 +7,6 @@ CLASS net/minecraft/class_5561 net/minecraft/block/entity/ViewerCountManager METHOD method_31679 isPlayerViewing (Lnet/minecraft/class_1657;)Z COMMENT Determines whether the given player is currently viewing this container. ARG 1 player - METHOD method_31680 getInRangeViewerCount (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I - ARG 1 world - ARG 2 pos METHOD method_31681 onContainerOpen (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V COMMENT Run when this container is opened (when the viewer count becomes nonzero). ARG 1 world diff --git a/mappings/net/minecraft/class_9104.mapping b/mappings/net/minecraft/class_9104.mapping new file mode 100644 index 0000000000..fc87720c09 --- /dev/null +++ b/mappings/net/minecraft/class_9104.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9104 + CLASS class_9105 + FIELD comp_2029 player Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_9107.mapping b/mappings/net/minecraft/class_9107.mapping new file mode 100644 index 0000000000..476ce8c815 --- /dev/null +++ b/mappings/net/minecraft/class_9107.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9107 + CLASS class_9108 + FIELD comp_2029 player Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index cf0c8a3fde..c2fa31a291 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -311,7 +311,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_17533 (I)Lnet/minecraft/class_3949; ARG 1 spawnChunkRadius METHOD method_18095 getSplashTextLoader ()Lnet/minecraft/class_4008; - METHOD method_18096 disconnect (Lnet/minecraft/class_437;)V + METHOD method_18096 disconnect (Lnet/minecraft/class_437;Z)V ARG 1 disconnectionScreen METHOD method_18097 setWorld (Lnet/minecraft/class_638;)V ARG 1 world diff --git a/mappings/net/minecraft/client/font/RenderableGlyph.mapping b/mappings/net/minecraft/client/font/RenderableGlyph.mapping index aee6d12ee8..f6bf68dc03 100644 --- a/mappings/net/minecraft/client/font/RenderableGlyph.mapping +++ b/mappings/net/minecraft/client/font/RenderableGlyph.mapping @@ -10,5 +10,3 @@ CLASS net/minecraft/class_383 net/minecraft/client/font/RenderableGlyph METHOD method_2033 hasColor ()Z METHOD method_2034 getXMin ()F METHOD method_2035 getOversample ()F - METHOD method_41712 getBearingX ()F - METHOD method_41713 getAscent ()F diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping index 788754b017..ab679007cc 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFont.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping @@ -1,23 +1,13 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont FIELD field_21839 buffer Ljava/nio/ByteBuffer; - FIELD field_2318 shiftY F FIELD field_2319 excludedCharacters Lit/unimi/dsi/fastutil/ints/IntSet; - FIELD field_2320 shiftX F FIELD field_2321 oversample F - FIELD field_2323 info Lorg/lwjgl/stb/STBTTFontinfo; - FIELD field_2324 ascent F - FIELD field_2325 scaleFactor F - METHOD (Ljava/nio/ByteBuffer;Lorg/lwjgl/stb/STBTTFontinfo;FFFFLjava/lang/String;)V + METHOD (Ljava/nio/ByteBuffer;Lorg/lwjgl/util/freetype/FT_Face;FFFFLjava/lang/String;)V ARG 1 buffer - ARG 2 info - ARG 3 size ARG 4 oversample - ARG 5 shiftX ARG 6 shiftY ARG 7 excludedCharacters - METHOD method_27443 (I)Z - ARG 1 codePoint - METHOD method_51884 getInfo ()Lorg/lwjgl/stb/STBTTFontinfo; + METHOD method_51884 getInfo ()Lorg/lwjgl/util/freetype/FT_Face; CLASS class_397 TtfGlyph FIELD field_2332 advance F FIELD field_2333 ascent F @@ -25,11 +15,7 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont FIELD field_2335 glyphIndex I FIELD field_2337 height I FIELD field_2338 width I - METHOD (Lnet/minecraft/class_395;IIIIFFI)V - ARG 2 x1 - ARG 3 x2 + METHOD (Lnet/minecraft/class_395;FFIIFI)V ARG 4 y2 ARG 5 y1 ARG 6 advance - ARG 7 bearingX - ARG 8 glyphIndex diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index f34c0647e3..70bd7615dc 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -18,9 +18,8 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc ARG 7 mouseX ARG 8 mouseY ARG 9 entity - METHOD method_48472 drawEntity (Lnet/minecraft/class_332;FFILorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V + METHOD method_48472 drawEntity (Lnet/minecraft/class_332;FFFLorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V ARG 0 context ARG 1 x ARG 2 y - ARG 3 size ARG 7 entity diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping index bdb3788f0b..b8b5c5a59b 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping @@ -22,13 +22,13 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/multiplayer/Connec ARG 2 failureErrorMessage METHOD method_19800 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_2130 connect (Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;)V + METHOD method_2130 connect (Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;Lnet/minecraft/class_9112;)V ARG 1 client ARG 2 address ARG 3 info METHOD method_2131 setStatus (Lnet/minecraft/class_2561;)V ARG 1 status - METHOD method_36877 connect (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;Z)V + METHOD method_36877 connect (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;ZLnet/minecraft/class_9112;)V ARG 0 screen ARG 1 client ARG 2 address diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 7bf52f790b..7090def805 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget FIELD field_19104 LOGGER Lorg/slf4j/Logger; FIELD field_19105 SERVER_PINGER_THREAD_POOL Ljava/util/concurrent/ThreadPoolExecutor; - FIELD field_19106 UNKNOWN_SERVER_TEXTURE Lnet/minecraft/class_2960; FIELD field_19108 screen Lnet/minecraft/class_500; FIELD field_19109 servers Ljava/util/List; FIELD field_19110 scanningEntry Lnet/minecraft/class_4267$class_504; diff --git a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping index b2039998ef..2a71d733a8 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping @@ -38,8 +38,6 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScr ARG 1 button METHOD method_54602 (Lnet/minecraft/class_4185;Ljava/lang/String;)V ARG 1 name - METHOD method_54603 (Lnet/minecraft/class_342;Lnet/minecraft/class_4185;)V - ARG 2 button METHOD method_54604 (Lnet/minecraft/class_524;Lnet/minecraft/class_364;)V ARG 1 child METHOD method_54606 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 5c8dd9e8c4..eb78aef336 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWidget FIELD field_19132 DATE_FORMAT Ljava/time/format/DateTimeFormatter; - FIELD field_19133 UNKNOWN_SERVER_LOCATION Lnet/minecraft/class_2960; FIELD field_26606 FROM_NEWER_VERSION_FIRST_LINE Lnet/minecraft/class_2561; FIELD field_26607 FROM_NEWER_VERSION_SECOND_LINE Lnet/minecraft/class_2561; FIELD field_26608 SNAPSHOT_FIRST_LINE Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping b/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping index c200a970a8..c88af69894 100644 --- a/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip FIELD field_41102 content Lnet/minecraft/class_2561; FIELD field_41103 lines Ljava/util/List; FIELD field_41104 narration Lnet/minecraft/class_2561; - FIELD field_46719 delay I - FIELD field_46720 renderCheckTime J - FIELD field_46721 prevShouldRender Z METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 content ARG 2 narration @@ -19,13 +16,3 @@ CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip METHOD method_47408 of (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7919; ARG 0 content ARG 1 narration - METHOD method_54383 setDelay (I)V - ARG 1 delay - METHOD method_54384 render (ZZLnet/minecraft/class_8030;)V - ARG 1 hovered - ARG 2 focused - ARG 3 focus - METHOD method_54385 createPositioner (ZZLnet/minecraft/class_8030;)Lnet/minecraft/class_8000; - ARG 1 hovered - ARG 2 focused - ARG 3 focus diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 27132f22d0..2f5d9ad25e 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget FIELD field_22763 active Z FIELD field_22764 visible Z FIELD field_22765 alpha F - FIELD field_41095 tooltip Lnet/minecraft/class_7919; + FIELD field_41095 tooltip Lnet/minecraft/class_9110; FIELD field_42116 navigationOrder I METHOD (IIIILnet/minecraft/class_2561;)V ARG 1 x @@ -61,8 +61,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 1 builder METHOD method_47400 setTooltip (Lnet/minecraft/class_7919;)V ARG 1 tooltip - METHOD method_47402 setTooltipDelay (I)V - ARG 1 delay + METHOD method_47402 setTooltipDelay (Ljava/time/Duration;)V METHOD method_48579 renderWidget (Lnet/minecraft/class_332;IIF)V ARG 1 context ARG 2 mouseX diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index 55bca67067..2d063bcc9a 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan FIELD field_41384 worldLoadTime Ljava/time/Duration; FIELD field_44809 minigameName Ljava/lang/String; FIELD field_46192 state Ljava/util/concurrent/atomic/AtomicReference; - METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_642;Lnet/minecraft/class_437;ZLjava/time/Duration;Ljava/util/function/Consumer;)V + METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_642;Lnet/minecraft/class_437;ZLjava/time/Duration;Ljava/util/function/Consumer;Lnet/minecraft/class_9112;)V ARG 1 connection ARG 2 client ARG 3 serverInfo diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 92588349d9..5b00cf2538 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo FIELD field_3760 version Lnet/minecraft/class_2561; FIELD field_3761 address Ljava/lang/String; FIELD field_3762 playerListSummary Ljava/util/List; - FIELD field_39918 secureChatEnforced Z FIELD field_41861 players Lnet/minecraft/class_2926$class_2927; FIELD field_42889 LOGGER Lorg/slf4j/Logger; FIELD field_42890 favicon [B @@ -43,9 +42,6 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo ARG 1 serverInfo METHOD method_44292 copyFrom (Lnet/minecraft/class_642;)V ARG 1 serverInfo - METHOD method_45055 setSecureChatEnforced (Z)V - ARG 1 secureChatEnforced - METHOD method_45056 isSecureChatEnforced ()Z METHOD method_49305 setFavicon ([B)V ARG 1 favicon METHOD method_49306 getFavicon ()[B diff --git a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping index d3069122aa..e23a448f7c 100644 --- a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping +++ b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu FIELD field_26470 TOOLTIP Lnet/minecraft/class_2561; FIELD field_39067 CHECKMARK Lnet/minecraft/class_2960; FIELD field_44894 MINIGAME_SLOT_NAME Lnet/minecraft/class_2561; - FIELD field_46846 worldTooltip Lnet/minecraft/class_7919; METHOD (IIIIILnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping index aa13ced95f..b1d978a17c 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping @@ -14,7 +14,6 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea FIELD field_22709 EXPERIENCE_TEXTURE Lnet/minecraft/class_2960; FIELD field_22710 INSPIRATION_TEXTURE Lnet/minecraft/class_2960; FIELD field_22711 callback Ljava/lang/Runnable; - FIELD field_22713 SLOT_FRAME_TEXTURE Lnet/minecraft/class_2960; FIELD field_22714 UPLOAD_TEXTURE Lnet/minecraft/class_2960; FIELD field_22715 ADVENTURE_TEXTURE Lnet/minecraft/class_2960; FIELD field_22716 SURVIVAL_SPAWN_TEXTURE Lnet/minecraft/class_2960; @@ -51,10 +50,6 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea ARG 7 taskTitle ARG 8 creationTask ARG 9 callback - METHOD method_21377 switchSlot (Ljava/lang/Runnable;)V - ARG 1 callback - METHOD method_21384 frame (I)I - ARG 1 i METHOD method_25211 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25212 (Lnet/minecraft/class_4185;)V @@ -93,9 +88,3 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea ARG 1 task CLASS class_4411 FrameButton FIELD field_20032 image Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_4410;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V - ARG 2 x - ARG 3 y - ARG 4 message - ARG 5 image - ARG 6 onPress diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index ab8de9a24e..fe82d5a77f 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -184,7 +184,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain CLASS class_4329 RealmSelectionList CLASS class_4330 RealmSelectionListEntry FIELD field_19518 server Lnet/minecraft/class_4877; - FIELD field_46686 tooltip Lnet/minecraft/class_7919; + FIELD field_46686 tooltip Lnet/minecraft/class_9110; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V ARG 2 server METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877; @@ -291,15 +291,11 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain CLASS class_8802 EmptyEntry CLASS class_8840 SnapshotEntry FIELD field_46676 START_TEXT Lnet/minecraft/class_2561; - FIELD field_46678 tooltip Lnet/minecraft/class_7919; + FIELD field_46678 tooltip Lnet/minecraft/class_9110; FIELD field_46679 server Lnet/minecraft/class_4877; - METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V - ARG 2 server METHOD method_54343 (Lnet/minecraft/class_8816;)V ARG 1 screen METHOD method_54344 showPopup ()V CLASS class_8841 ParentRealmSelectionListEntry FIELD field_46684 server Lnet/minecraft/class_4877; - FIELD field_46685 tooltip Lnet/minecraft/class_7919; - METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V - ARG 2 server + FIELD field_46685 tooltip Lnet/minecraft/class_9110; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping index 1833703a44..556d2c4f72 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping @@ -13,18 +13,12 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_26508 CHEATS_TEXT Lnet/minecraft/class_2561; FIELD field_44909 LOADING_ERROR_TEXT Lnet/minecraft/class_2561; FIELD field_46131 TITLE Lnet/minecraft/class_2561; - METHOD (JILnet/minecraft/class_4410;)V - ARG 1 worldId - ARG 3 slotId - ARG 4 parent METHOD method_21396 loadLevelList ()V METHOD method_21400 getGameModeName (Lnet/minecraft/class_34;)Lnet/minecraft/class_2561; ARG 0 summary METHOD method_21401 upload ()V METHOD method_21404 getLastPlayed (Lnet/minecraft/class_34;)Ljava/lang/String; ARG 0 summary - METHOD method_25220 (Lnet/minecraft/class_34;)Z - ARG 0 a METHOD method_25221 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_38508 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping index d650694117..4e1521add5 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping @@ -22,11 +22,6 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo FIELD field_20196 UPLOAD_LOCK Ljava/util/concurrent/locks/ReentrantLock; FIELD field_20503 statusTexts [Lnet/minecraft/class_2561; FIELD field_26526 VERIFYING_TEXT Lnet/minecraft/class_2561; - METHOD (JILnet/minecraft/class_4410;Lnet/minecraft/class_34;)V - ARG 1 worldId - ARG 3 slotId - ARG 4 parent - ARG 5 selectedLevel METHOD method_21515 verify (Ljava/io/File;)Z ARG 1 archive METHOD method_21516 addFileToTarGz (Lorg/apache/commons/compress/archivers/tar/TarArchiveOutputStream;Ljava/lang/String;Ljava/lang/String;Z)V @@ -41,16 +36,12 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo ARG 1 context ARG 2 bytesPerSecond METHOD method_21528 onCancel ()V - METHOD method_21530 drawDots (Lnet/minecraft/class_332;)V - ARG 1 context METHOD method_21532 drawProgressBar (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_21534 drawUploadSpeed (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_21536 upload ()V METHOD method_21538 uploadCancelled ()V - METHOD method_22105 (JLnet/minecraft/class_4429;)V - ARG 3 result METHOD method_25276 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25277 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index aee4a8eb24..a11b5963d2 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -45,7 +45,7 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen ARG 1 feature METHOD method_4056 isVisible (Lnet/minecraft/class_1309;)Z ARG 1 entity - METHOD method_4058 setupTransforms (Lnet/minecraft/class_1309;Lnet/minecraft/class_4587;FFF)V + METHOD method_4058 setupTransforms (Lnet/minecraft/class_1309;Lnet/minecraft/class_4587;FFFF)V ARG 1 entity ARG 2 matrices ARG 3 animationProgress diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index badce1cb0f..63689738d1 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -131,17 +131,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage COMMENT @return the color, with red at smallest and alpha at biggest bits ARG 1 x ARG 2 y - METHOD method_4316 makeGlyphBitmapSubpixel (Lorg/lwjgl/stb/STBTTFontinfo;IIIFFFFII)V - ARG 1 fontInfo - ARG 2 glyphIndex - ARG 3 width - ARG 4 height - ARG 5 scaleX - ARG 6 scaleY - ARG 7 shiftX - ARG 8 shiftY - ARG 9 startX - ARG 10 startY + METHOD method_4316 makeGlyphBitmapSubpixel (Lorg/lwjgl/util/freetype/FT_Face;I)V METHOD method_4317 copyFrom (Lnet/minecraft/class_1011;)V ARG 1 image METHOD method_4318 getFormat ()Lnet/minecraft/class_1011$class_1012; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 77607d08ad..be4984b921 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -163,9 +163,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld CLASS class_5271 Properties FIELD field_24433 hardcore Z FIELD field_24434 gameRules Lnet/minecraft/class_1928; - FIELD field_24435 spawnX I - FIELD field_24436 spawnY I - FIELD field_24437 spawnZ I FIELD field_24438 time J FIELD field_24439 timeOfDay J FIELD field_24440 raining Z diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index 4de1f0ab9a..c562181ce2 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache METHOD method_43348 parseOrCreateCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2408$class_7405; ARG 0 root ARG 1 dataProviderPath - METHOD method_43351 (Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/Set;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/nio/file/Path;)V - ARG 4 path METHOD method_43353 getPath (Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 providerName METHOD method_46568 (Lnet/minecraft/class_2408$class_7404;Ljava/lang/Object;)Lnet/minecraft/class_2408$class_7860; diff --git a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping index 763423b6ec..ddb79e9997 100644 --- a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_1882 net/minecraft/enchantment/DamageEnchantment - FIELD field_30947 ALL_INDEX I - FIELD field_30948 UNDEAD_INDEX I - FIELD field_30949 ARTHROPODS_INDEX I - FIELD field_9063 BASE_POWERS [I - FIELD field_9064 MIN_MAX_POWER_DIFFERENCES [I - FIELD field_9065 TYPE_NAMES [Ljava/lang/String; - FIELD field_9066 POWERS_PER_LEVEL [I - FIELD field_9067 typeIndex I - METHOD (Lnet/minecraft/class_1887$class_1888;I[Lnet/minecraft/class_1304;)V + METHOD (Lnet/minecraft/class_1887$class_1888;IIILjava/util/Optional;[Lnet/minecraft/class_1304;)V ARG 1 weight ARG 2 typeIndex - ARG 3 slots diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index b851bb208a..d2fdb673f7 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment FIELD field_45769 registryEntry Lnet/minecraft/class_6880$class_6883; - FIELD field_9083 target Lnet/minecraft/class_1886; FIELD field_9084 translationKey Ljava/lang/String; FIELD field_9085 rarity Lnet/minecraft/class_1887$class_1888; FIELD field_9086 slotTypes [Lnet/minecraft/class_1304; - METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1886;[Lnet/minecraft/class_1304;)V + METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_6862;[Lnet/minecraft/class_1304;)V ARG 1 rarity - ARG 2 target ARG 3 slotTypes METHOD method_20742 getMaxPower (I)I ARG 1 level @@ -51,12 +49,10 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment METHOD method_8191 byRawId (I)Lnet/minecraft/class_1887; ARG 0 id METHOD method_8192 isAcceptableItem (Lnet/minecraft/class_1799;)Z - ARG 1 stack METHOD method_8193 isTreasure ()Z METHOD method_8195 isCursed ()Z - METHOD method_8196 getAttackDamage (ILnet/minecraft/class_1310;)F + METHOD method_8196 getAttackDamage (ILnet/minecraft/class_1299;)F ARG 1 level - ARG 2 group CLASS class_1888 Rarity COMMENT The rarity is an attribute of an enchantment. COMMENT diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 37c73e38be..a3163e6f9c 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -79,7 +79,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_8207 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_1887;I)V ARG 2 enchantment ARG 3 level - METHOD method_8208 (Lorg/apache/commons/lang3/mutable/MutableFloat;Lnet/minecraft/class_1310;Lnet/minecraft/class_1887;I)V + METHOD method_8208 (Lorg/apache/commons/lang3/mutable/MutableFloat;Lnet/minecraft/class_1299;Lnet/minecraft/class_1887;I)V ARG 2 enchantment ARG 3 level METHOD method_8209 forEachEnchantment (Lnet/minecraft/class_1890$class_1891;Ljava/lang/Iterable;)V @@ -112,9 +112,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 entity METHOD method_8217 getSweepingMultiplier (Lnet/minecraft/class_1309;)F ARG 0 entity - METHOD method_8218 getAttackDamage (Lnet/minecraft/class_1799;Lnet/minecraft/class_1310;)F + METHOD method_8218 getAttackDamage (Lnet/minecraft/class_1799;Lnet/minecraft/class_1299;)F ARG 0 stack - ARG 1 group METHOD method_8219 getProtectionAmount (Ljava/lang/Iterable;Lnet/minecraft/class_1282;)I ARG 0 equipment ARG 1 source diff --git a/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping b/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping deleted file mode 100644 index 5dd5995da4..0000000000 --- a/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_1886 net/minecraft/enchantment/EnchantmentTarget - METHOD method_8177 isAcceptableItem (Lnet/minecraft/class_1792;)Z - ARG 1 item diff --git a/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping b/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping index 8ed03c6eea..420eba919d 100644 --- a/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_1906 net/minecraft/enchantment/ThornsEnchantment METHOD (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V ARG 1 weight ARG 2 slotTypes - METHOD method_30345 (Ljava/util/Map$Entry;Lnet/minecraft/class_1309;)V - ARG 1 entity METHOD method_8242 getDamageAmount (ILnet/minecraft/class_5819;)I ARG 0 level ARG 1 random diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index d0f0c34a2e..cf37d4cc2b 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -997,8 +997,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 0 vehicle ARG 1 passenger ARG 2 attachments - METHOD method_55666 onDeflectProjectile (Lnet/minecraft/class_1676;)V - ARG 1 projectile METHOD method_55667 getBlockStateAtPos ()Lnet/minecraft/class_2680; COMMENT {@return the block state at the entity's position} COMMENT diff --git a/mappings/net/minecraft/entity/EntityGroup.mapping b/mappings/net/minecraft/entity/EntityGroup.mapping deleted file mode 100644 index ec9e2bedc8..0000000000 --- a/mappings/net/minecraft/entity/EntityGroup.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_1310 net/minecraft/entity/EntityGroup - FIELD field_6289 UNDEAD Lnet/minecraft/class_1310; - FIELD field_6290 DEFAULT Lnet/minecraft/class_1310; - FIELD field_6291 ILLAGER Lnet/minecraft/class_1310; - FIELD field_6292 AQUATIC Lnet/minecraft/class_1310; - FIELD field_6293 ARTHROPOD Lnet/minecraft/class_1310; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index f1ac8ab5d0..a057be02d2 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -151,12 +151,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 stack METHOD method_20235 sendEquipmentBreakStatus (Lnet/minecraft/class_1304;)V ARG 1 slot - METHOD method_20236 sendToolBreakStatus (Lnet/minecraft/class_1268;)V - ARG 1 hand METHOD method_20237 getEquipmentBreakStatus (Lnet/minecraft/class_1304;)B ARG 0 slot - METHOD method_20238 (Lnet/minecraft/class_1309;)V - ARG 0 player METHOD method_21753 getStingerCount ()I METHOD method_21754 isHoldingOntoLadder ()Z COMMENT @return {@code true} if this entity should not lose height while in a climbing state @@ -215,8 +211,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT the effect to set ARG 2 source COMMENT the source entity or {@code null} for non-entity sources - METHOD method_26084 (Lnet/minecraft/class_1309;)V - ARG 0 player METHOD method_26317 applyFluidMovingSpeed (DZLnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 gravity ARG 3 falling @@ -397,7 +391,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 source METHOD method_6012 clearStatusEffects ()Z METHOD method_6013 playHurtSound (Lnet/minecraft/class_1282;)V - ARG 1 source METHOD method_6014 getItemUseTimeLeft ()I METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V ARG 1 attacker @@ -466,7 +459,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6044 endCombat ()V METHOD method_6045 playEquipmentBreakEffects (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_6046 getGroup ()Lnet/minecraft/class_1310; METHOD method_6047 getMainHandStack ()Lnet/minecraft/class_1799; METHOD method_6048 getItemUseTime ()I METHOD method_6049 canHaveStatusEffect (Lnet/minecraft/class_1293;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping index ff76bd1c3b..a8925a545f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping @@ -5,9 +5,8 @@ CLASS net/minecraft/class_4806 net/minecraft/entity/ai/brain/task/BreedTask FIELD field_30104 MAX_RANGE I FIELD field_30105 MIN_BREED_TIME I FIELD field_30106 RUN_TIME I - METHOD (Lnet/minecraft/class_1299;F)V + METHOD (Lnet/minecraft/class_1299;)V ARG 1 targetType - ARG 2 speed METHOD method_24542 getBreedTarget (Lnet/minecraft/class_1429;)Lnet/minecraft/class_1429; ARG 1 animal METHOD method_24545 (Lnet/minecraft/class_1429;Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping index d75ef4b380..63e3ee1319 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_4126 net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask FIELD field_18389 items Ljava/util/Set; - FIELD field_30182 MAX_RANGE I - FIELD field_30183 WALK_TOGETHER_SPEED F METHOD method_19013 giveHalfOfStack (Lnet/minecraft/class_1646;Ljava/util/Set;Lnet/minecraft/class_1309;)V ARG 0 villager ARG 1 validItems diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping index 01d89087b5..29ab58d7c2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_19547 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;)Z ARG 1 entity - METHOD method_19548 lookAtAndWalkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;F)V + METHOD method_19548 lookAtAndWalkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;FI)V ARG 0 first ARG 1 second ARG 2 speed @@ -20,7 +20,7 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_19554 lookAt (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V ARG 0 entity ARG 1 target - METHOD method_19555 walkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;F)V + METHOD method_19555 walkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;FI)V ARG 0 first ARG 1 second ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping index 41545ecacf..5da8fea966 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_4111 net/minecraft/entity/ai/brain/task/VillagerBreedTask FIELD field_18368 breedEndTime J - FIELD field_30190 MAX_DISTANCE I - FIELD field_30191 APPROACH_SPEED F METHOD method_18970 createChild (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)Ljava/util/Optional; ARG 1 world ARG 2 parent diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 0671d02fad..108c9337b3 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -41,10 +41,6 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod COMMENT Multiplies the total value of the attribute. COMMENT COMMENT

The total value is equal to the sum of all additions and base multiplications applied by an attribute modifier. - FIELD field_6332 VALUES [Lnet/minecraft/class_1322$class_1323; METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 name ARG 4 id - METHOD method_6190 fromId (I)Lnet/minecraft/class_1322$class_1323; - ARG 0 id - METHOD method_6191 getId ()I diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index f9ba664d43..a991ded472 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -62,12 +62,9 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker METHOD method_46360 of (Lnet/minecraft/class_2940;Ljava/lang/Object;)Lnet/minecraft/class_2945$class_7834; ARG 0 data ARG 1 value - METHOD method_46361 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_46362 fromBuf (Lnet/minecraft/class_2540;I)Lnet/minecraft/class_2945$class_7834; - ARG 0 buf + METHOD method_46361 write (Lnet/minecraft/class_9129;)V + METHOD method_46362 fromBuf (Lnet/minecraft/class_9129;I)Lnet/minecraft/class_2945$class_7834; ARG 1 id - METHOD method_46363 fromBuf (Lnet/minecraft/class_2540;ILnet/minecraft/class_2941;)Lnet/minecraft/class_2945$class_7834; - ARG 0 buf + METHOD method_46363 fromBuf (Lnet/minecraft/class_9129;ILnet/minecraft/class_2941;)Lnet/minecraft/class_2945$class_7834; ARG 1 id ARG 2 handler diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping index 376300a2a7..3f7375fa4c 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping @@ -1,28 +1,6 @@ CLASS net/minecraft/class_2941 net/minecraft/entity/data/TrackedDataHandler METHOD method_12714 copy (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 value - METHOD method_12715 write (Lnet/minecraft/class_2540;Ljava/lang/Object;)V - ARG 1 buf - ARG 2 value - METHOD method_12716 read (Lnet/minecraft/class_2540;)Ljava/lang/Object; - ARG 1 buf METHOD method_12717 create (I)Lnet/minecraft/class_2940; ARG 1 id - METHOD method_43237 of (Lnet/minecraft/class_2359;)Lnet/minecraft/class_2941; - ARG 0 registry - METHOD method_43238 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2540;)Ljava/lang/Object; - ARG 1 buf - METHOD method_43239 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2540;Ljava/lang/Object;)V - ARG 1 buf - ARG 2 value - METHOD method_43240 ofEnum (Ljava/lang/Class;)Lnet/minecraft/class_2941; - ARG 0 enum_ - METHOD method_43241 (Ljava/lang/Class;Lnet/minecraft/class_2540;)Ljava/lang/Enum; - ARG 1 buf - METHOD method_43242 of (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7461;)Lnet/minecraft/class_2941; - ARG 0 writer - ARG 1 reader - METHOD method_43243 ofOptional (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7461;)Lnet/minecraft/class_2941; - ARG 0 writer - ARG 1 reader CLASS class_7394 ImmutableHandler diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 3968eaa137..f8e792668b 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -35,10 +35,4 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis ARG 0 handler METHOD method_12721 get (I)Lnet/minecraft/class_2941; ARG 0 id - METHOD method_43248 (Lnet/minecraft/class_2540;Ljava/lang/Byte;)V - ARG 0 buf - ARG 1 byte_ CLASS 3 - METHOD method_12744 read (Lnet/minecraft/class_2540;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; - ARG 1 buf - ARG 2 type diff --git a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping index 91b4a3a1f6..6cea3cb6cb 100644 --- a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping +++ b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_1548 net/minecraft/entity/mob/CreeperEntity FIELD field_7229 lastFuseTime I FIELD field_7230 FUSE_SPEED Lnet/minecraft/class_2940; FIELD field_7231 IGNITED Lnet/minecraft/class_2940; - METHOD method_20256 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_26908 createCreeperAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_7000 isIgnited ()Z METHOD method_7001 spawnEffectsCloud ()V diff --git a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping index 74690dcd0e..9d85a4f930 100644 --- a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping @@ -29,5 +29,3 @@ CLASS net/minecraft/class_4760 net/minecraft/entity/mob/HoglinEntity ARG 1 immuneToZombification METHOD method_26949 setCannotBeHunted (Z)V ARG 1 cannotBeHunted - METHOD method_30081 playSound (Lnet/minecraft/class_3414;)V - ARG 1 sound diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 06b50dd3b8..131a469d6e 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -91,10 +91,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_20820 canGather (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_23734 isDisallowedInPeaceful ()Z - METHOD method_24521 disablePlayerShield (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V - ARG 1 player - ARG 2 mobStack - ARG 3 playerStack METHOD method_24522 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1308;)V ARG 2 entity METHOD method_24523 tryEquip (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index 644ba1920e..3c7f81f1e8 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -46,5 +46,3 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity METHOD method_29272 isDancing ()Z METHOD method_29274 setDancing (Z)V ARG 1 dancing - METHOD method_30086 playSound (Lnet/minecraft/class_3414;)V - ARG 1 sound diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index 6e7587210f..6b45d92656 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -18,13 +18,8 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity METHOD method_31547 spawnNewShulker ()V METHOD method_33342 getExtraLength (F)F ARG 0 openProgress - METHOD method_33346 calculateBoundingBox (Lnet/minecraft/class_2350;F)Lnet/minecraft/class_238; - ARG 0 direction - ARG 1 extraLength - METHOD method_33347 calculateBoundingBox (Lnet/minecraft/class_2350;FF)Lnet/minecraft/class_238; - ARG 0 direction - ARG 1 prevExtraLength - ARG 2 extraLength + METHOD method_33346 calculateBoundingBox (FLnet/minecraft/class_2350;F)Lnet/minecraft/class_238; + METHOD method_33347 calculateBoundingBox (FLnet/minecraft/class_2350;FF)Lnet/minecraft/class_238; METHOD method_33348 tryAttachOrTeleport ()V METHOD method_33349 tickOpenProgress ()Z METHOD method_33350 moveEntities ()V diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping index 7ffbd491e8..1e529b1990 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity FIELD field_47786 currentStateTicks J FIELD field_47787 nextScuteShedCooldown I METHOD method_55711 isRolledUp ()Z - METHOD method_55712 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_55713 setState (Lnet/minecraft/class_9069$class_9070;)V ARG 1 state METHOD method_55714 shouldSwitchToScaredState ()Z @@ -20,13 +18,13 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity ARG 1 entity METHOD method_55722 createArmadilloAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55723 isNotIdle ()Z - METHOD method_55724 unroll (Z)V + METHOD method_55724 unroll ()V METHOD method_55725 setRolling (Z)V ARG 1 rolling CLASS class_9070 State FIELD field_47793 name Ljava/lang/String; FIELD field_47794 CODEC Lnet/minecraft/class_3542$class_7292; - METHOD (Ljava/lang/String;ILjava/lang/String;)V + METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 name METHOD method_55727 fromName (Ljava/lang/String;)Lnet/minecraft/class_9069$class_9070; ARG 0 name diff --git a/mappings/net/minecraft/entity/passive/CamelEntity.mapping b/mappings/net/minecraft/entity/passive/CamelEntity.mapping index 4ba3db3281..dbfad55957 100644 --- a/mappings/net/minecraft/entity/passive/CamelEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CamelEntity.mapping @@ -30,9 +30,6 @@ CLASS net/minecraft/class_7689 net/minecraft/entity/passive/CamelEntity METHOD method_45362 setDashing (Z)V ARG 1 dashing METHOD method_46398 shouldPlaySittingTransitionAnimation ()Z - METHOD method_48159 clampHeadYaw (Lnet/minecraft/class_1297;F)V - ARG 1 entity - ARG 2 range METHOD method_48160 initLastPoseTick (J)V ARG 1 time METHOD method_48573 shouldUpdateSittingAnimations ()Z diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 063528f821..5bec5e1d43 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -43,8 +43,6 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_43088 (Lnet/minecraft/class_6880;)V ARG 1 variant - METHOD method_43089 (Lnet/minecraft/class_5425;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 list CLASS class_3698 CatFleeGoal FIELD field_16293 cat Lnet/minecraft/class_1451; METHOD (Lnet/minecraft/class_1451;Ljava/lang/Class;FDD)V diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping index bb418ea525..b3fedc1445 100644 --- a/mappings/net/minecraft/entity/passive/GoatBrain.mapping +++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain - FIELD field_30405 BREEDING_WALK_SPEED F FIELD field_30406 FOLLOWING_TARGET_WALK_SPEED F FIELD field_30407 WALKING_SPEED Lnet/minecraft/class_6019; FIELD field_30408 TEMPTED_WALK_SPEED F diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index 10699b1b20..26f43815ac 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity ARG 1 mooshroom METHOD method_18436 getStewEffectFrom (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 flower - METHOD method_20253 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_20665 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 0caa5f9998..0b7f4dd266 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_8566; ARG 0 firstColor ARG 1 secondColor - METHOD method_20254 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_26893 createSheepAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6628 getNeckAngle (F)F ARG 1 delta diff --git a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping index faa39214b0..a7b01a4a3a 100644 --- a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_1473 net/minecraft/entity/passive/SnowGolemEntity FIELD field_6873 SNOW_GOLEM_FLAGS Lnet/minecraft/class_2940; METHOD method_18443 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_20255 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_26894 createSnowGolemAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6642 setHasPumpkin (Z)V ARG 1 hasPumpkin diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 54675ccb57..83e9088941 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -27,8 +27,6 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity ARG 4 random METHOD method_55708 setArmored (Z)V ARG 1 armored - METHOD method_55709 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_55710 hasArmor ()Z METHOD method_6707 getFurWetBrightnessMultiplier (F)F COMMENT Returns this wolf's brightness multiplier based on the fur wetness. diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 5daa8bdce2..4bb290c408 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -74,8 +74,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 0 entityType METHOD method_17853 (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_20266 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 player METHOD method_21701 isBlockBreakingRestricted (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1934;)Z ARG 1 world ARG 2 pos @@ -187,8 +185,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 1 stat METHOD method_7283 setMainArm (Lnet/minecraft/class_1306;)V ARG 1 arm - METHOD method_7284 disableShield (Z)V - ARG 1 sprinting + METHOD method_7284 disableShield ()V METHOD method_7285 addScore (I)V ARG 1 score METHOD method_7286 applyEnchantmentCosts (Lnet/minecraft/class_1799;I)V diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 2255d35437..e52f1be203 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -26,8 +26,6 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory FIELD field_7548 armor Lnet/minecraft/class_2371; METHOD (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_20265 (ILnet/minecraft/class_1657;)V - ARG 1 player METHOD method_29280 remove (Ljava/util/function/Predicate;ILnet/minecraft/class_1263;)I ARG 1 shouldRemove ARG 2 maxCount diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index e6aacfda8a..f7afb1c430 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -44,8 +44,6 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject COMMENT

This is the original stack used to spawn the projectile. {@link #asItemStack} COMMENT returns a copy of that stack which can be safely changed. Additionally, COMMENT {@link #asItemStack} reflects changes to the entity data, such as custom potion ID. - METHOD method_55052 deflect (Lnet/minecraft/class_1297;)V - ARG 1 entity METHOD method_7433 setNoClip (Z)V ARG 1 noClip METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966; diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 2cacd1b28f..bf6730e0ce 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -64,4 +64,3 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity COMMENT mobs/tools have higher values; some mobs have difficulty-adjusted COMMENT values METHOD method_7488 onCollision (Lnet/minecraft/class_239;)V - ARG 1 hitResult diff --git a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping index 725afe354d..fea287fdd3 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping @@ -36,5 +36,5 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory ARG 1 slot METHOD method_42293 clearInventory ()V METHOD method_42294 canPlayerAccess (Lnet/minecraft/class_1657;)Z - ARG 1 player METHOD method_42295 isInventoryEmpty ()Z + METHOD method_5829 getBoundingBox ()Lnet/minecraft/class_238; diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 955e47f25d..5c7f6d8464 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -68,7 +68,7 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory COMMENT @see #canPlayerUse(BlockEntity, PlayerEntity, int) ARG 0 blockEntity ARG 1 player - METHOD method_49106 canPlayerUse (Lnet/minecraft/class_2586;Lnet/minecraft/class_1657;I)Z + METHOD method_49106 canPlayerUse (Lnet/minecraft/class_2586;Lnet/minecraft/class_1657;F)Z COMMENT {@return whether {@code player} can use this {@code blockEntity}} COMMENT COMMENT @apiNote This is used by block entities to implement {@link @@ -80,7 +80,6 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory COMMENT @see #canPlayerUse(BlockEntity, PlayerEntity) ARG 0 blockEntity ARG 1 player - ARG 2 range METHOD method_5431 markDirty ()V COMMENT Marks the inventory as modified. Implementations should call this method COMMENT every time the inventory is changed in any way. diff --git a/mappings/net/minecraft/item/AxeItem.mapping b/mappings/net/minecraft/item/AxeItem.mapping index 8c7f9a3a77..9d1dcd2860 100644 --- a/mappings/net/minecraft/item/AxeItem.mapping +++ b/mappings/net/minecraft/item/AxeItem.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_1743 net/minecraft/item/AxeItem ARG 2 attackDamage ARG 3 attackSpeed ARG 4 settings - METHOD method_20269 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p METHOD method_34716 getStrippedState (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 1 state METHOD method_34717 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/item/BoneMealItem.mapping b/mappings/net/minecraft/item/BoneMealItem.mapping index 5045613c67..e542a4c65a 100644 --- a/mappings/net/minecraft/item/BoneMealItem.mapping +++ b/mappings/net/minecraft/item/BoneMealItem.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/class_1752 net/minecraft/item/BoneMealItem METHOD method_40006 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state - METHOD method_40127 (Lnet/minecraft/class_1937;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks METHOD method_40128 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2680; ARG 0 blockEntry - METHOD method_40129 (Lnet/minecraft/class_1937;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks METHOD method_40130 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2680; ARG 0 blockEntry METHOD method_7719 useOnGround (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/item/BowItem.mapping b/mappings/net/minecraft/item/BowItem.mapping index d1cbdb6777..b57056091d 100644 --- a/mappings/net/minecraft/item/BowItem.mapping +++ b/mappings/net/minecraft/item/BowItem.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_1753 net/minecraft/item/BowItem FIELD field_30855 TICKS_PER_SECOND I FIELD field_30856 RANGE I - METHOD method_20270 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1657;)V - ARG 1 p METHOD method_7722 getPullProgress (I)F ARG 0 useTicks diff --git a/mappings/net/minecraft/item/BrushItem.mapping b/mappings/net/minecraft/item/BrushItem.mapping index db93d2aeff..b20e975845 100644 --- a/mappings/net/minecraft/item/BrushItem.mapping +++ b/mappings/net/minecraft/item/BrushItem.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_8162 net/minecraft/item/BrushItem ARG 5 arm METHOD method_49999 getHitResult (Lnet/minecraft/class_1657;)Lnet/minecraft/class_239; ARG 1 user - METHOD method_51163 (Lnet/minecraft/class_1304;Lnet/minecraft/class_1309;)V - ARG 1 userx METHOD method_51309 (Lnet/minecraft/class_1297;)Z ARG 0 entity CLASS class_8163 DustParticlesOffset diff --git a/mappings/net/minecraft/item/CrossbowItem.mapping b/mappings/net/minecraft/item/CrossbowItem.mapping index f43d5ea0a6..cc7ff5a380 100644 --- a/mappings/net/minecraft/item/CrossbowItem.mapping +++ b/mappings/net/minecraft/item/CrossbowItem.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem ARG 1 entity ARG 2 crossbow ARG 3 arrow - METHOD method_20272 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1309;)V - ARG 1 e METHOD method_20309 getSpeed (Lnet/minecraft/class_1799;)F ARG 0 stack METHOD method_7763 shoot (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;FZFFF)V diff --git a/mappings/net/minecraft/item/FishingRodItem.mapping b/mappings/net/minecraft/item/FishingRodItem.mapping index 1782654718..11370606da 100644 --- a/mappings/net/minecraft/item/FishingRodItem.mapping +++ b/mappings/net/minecraft/item/FishingRodItem.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_1787 net/minecraft/item/FishingRodItem - METHOD method_20275 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 p diff --git a/mappings/net/minecraft/item/FlintAndSteelItem.mapping b/mappings/net/minecraft/item/FlintAndSteelItem.mapping index 936ddb58f4..59be428126 100644 --- a/mappings/net/minecraft/item/FlintAndSteelItem.mapping +++ b/mappings/net/minecraft/item/FlintAndSteelItem.mapping @@ -1,5 +1 @@ CLASS net/minecraft/class_1786 net/minecraft/item/FlintAndSteelItem - METHOD method_20276 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p - METHOD method_20277 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p diff --git a/mappings/net/minecraft/item/GoatHornItem.mapping b/mappings/net/minecraft/item/GoatHornItem.mapping index 35abfac97a..d3994b6af1 100644 --- a/mappings/net/minecraft/item/GoatHornItem.mapping +++ b/mappings/net/minecraft/item/GoatHornItem.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem ARG 0 world ARG 1 player ARG 2 instrument - METHOD method_43710 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 entryList METHOD method_43711 getInstrument (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 stack METHOD method_45432 (Lnet/minecraft/class_6880;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/item/HoeItem.mapping b/mappings/net/minecraft/item/HoeItem.mapping index 5ee7f048d0..449cbf3d51 100644 --- a/mappings/net/minecraft/item/HoeItem.mapping +++ b/mappings/net/minecraft/item/HoeItem.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_1794 net/minecraft/item/HoeItem ARG 2 attackDamage ARG 3 attackSpeed ARG 4 settings - METHOD method_20279 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p METHOD method_36984 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1838;)V ARG 1 context METHOD method_36985 createTillAndDropAction (Lnet/minecraft/class_2680;Lnet/minecraft/class_1935;)Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 92d1f94871..1bfce019aa 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -450,7 +450,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7954 toHoverableText ()Lnet/minecraft/class_2561; COMMENT {@return a text consisting of the bracketed {@linkplain #getName stack name} that COMMENT can be hovered to show the item stack's tooltip} - METHOD method_7956 damage (ILnet/minecraft/class_1309;Ljava/util/function/Consumer;)V + METHOD method_7956 damage (ILnet/minecraft/class_5819;Lnet/minecraft/class_3222;Ljava/lang/Runnable;)V COMMENT Damages this item stack. This method should be used when an entity, including a player, COMMENT damages the stack. This does not damage {@linkplain #isDamageable non-damageable} COMMENT stacks, and the {@linkplain net.minecraft.enchantment.UnbreakingEnchantment @@ -466,11 +466,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT by a player. The callback should call {@link LivingEntity#sendEquipmentBreakStatus} COMMENT or {@link LivingEntity#sendToolBreakStatus}. ARG 1 amount - ARG 2 entity - COMMENT the entity that holds the stack to be damaged - ARG 3 breakCallback - COMMENT the callback that takes the entity holding the stack and is executed - COMMENT when the item breaks METHOD method_7958 hasGlint ()Z METHOD method_7959 setSubNbt (Ljava/lang/String;Lnet/minecraft/class_2520;)V COMMENT Sets the given NBT element in the item stack's custom NBT at the specified key. @@ -507,7 +502,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT {@return the custom NBT of this item stack, may be {@code null}} COMMENT COMMENT @see Item Stack NBT Operations - METHOD method_7970 damage (ILnet/minecraft/class_5819;Lnet/minecraft/class_3222;)Z + METHOD method_7970 damage (ILnet/minecraft/class_1309;Lnet/minecraft/class_1304;)V COMMENT Damages this item stack. This method should be used when a non-entity, such as a COMMENT dispenser, damages the stack. This does not damage {@linkplain #isDamageable non-damageable} COMMENT stacks, and the {@linkplain net.minecraft.enchantment.UnbreakingEnchantment @@ -522,9 +517,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @return whether the stack's damage is equal to or above {@linkplain Item#getMaxDamage COMMENT the maximum damage} (i.e. whether the item is "broken") ARG 1 amount - ARG 2 random - ARG 3 player - COMMENT the player that holds the stack to be damaged, or {@code null} if inapplicable METHOD method_7971 split (I)Lnet/minecraft/class_1799; COMMENT {@return the copy of the stack "split" from the current stack with item count COMMENT being at most {@code amount}} diff --git a/mappings/net/minecraft/item/MiningToolItem.mapping b/mappings/net/minecraft/item/MiningToolItem.mapping index a2ba3e4dc1..a30bc175fe 100644 --- a/mappings/net/minecraft/item/MiningToolItem.mapping +++ b/mappings/net/minecraft/item/MiningToolItem.mapping @@ -9,8 +9,4 @@ CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem ARG 3 material ARG 4 effectiveBlocks ARG 5 settings - METHOD method_20273 (Lnet/minecraft/class_1309;)V - ARG 0 e - METHOD method_20274 (Lnet/minecraft/class_1309;)V - ARG 0 e METHOD method_26366 getAttackDamage ()F diff --git a/mappings/net/minecraft/item/OnAStickItem.mapping b/mappings/net/minecraft/item/OnAStickItem.mapping index b41fffcf96..4d01fe4d13 100644 --- a/mappings/net/minecraft/item/OnAStickItem.mapping +++ b/mappings/net/minecraft/item/OnAStickItem.mapping @@ -5,5 +5,3 @@ CLASS net/minecraft/class_1758 net/minecraft/item/OnAStickItem ARG 1 settings ARG 2 target ARG 3 damagePerUse - METHOD method_20271 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 p diff --git a/mappings/net/minecraft/item/ShearsItem.mapping b/mappings/net/minecraft/item/ShearsItem.mapping index 6b8a0c0d74..ec63c66cc8 100644 --- a/mappings/net/minecraft/item/ShearsItem.mapping +++ b/mappings/net/minecraft/item/ShearsItem.mapping @@ -1,5 +1 @@ CLASS net/minecraft/class_1820 net/minecraft/item/ShearsItem - METHOD method_20280 (Lnet/minecraft/class_1309;)V - ARG 0 e - METHOD method_38078 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 player diff --git a/mappings/net/minecraft/item/ShovelItem.mapping b/mappings/net/minecraft/item/ShovelItem.mapping index 413992abf0..a5fc2f733a 100644 --- a/mappings/net/minecraft/item/ShovelItem.mapping +++ b/mappings/net/minecraft/item/ShovelItem.mapping @@ -5,5 +5,3 @@ CLASS net/minecraft/class_1821 net/minecraft/item/ShovelItem ARG 2 attackDamage ARG 3 attackSpeed ARG 4 settings - METHOD method_20281 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p diff --git a/mappings/net/minecraft/item/SwordItem.mapping b/mappings/net/minecraft/item/SwordItem.mapping index fc46bd46da..2326fe456f 100644 --- a/mappings/net/minecraft/item/SwordItem.mapping +++ b/mappings/net/minecraft/item/SwordItem.mapping @@ -6,8 +6,4 @@ CLASS net/minecraft/class_1829 net/minecraft/item/SwordItem ARG 2 attackDamage ARG 3 attackSpeed ARG 4 settings - METHOD method_20282 (Lnet/minecraft/class_1309;)V - ARG 0 e - METHOD method_20283 (Lnet/minecraft/class_1309;)V - ARG 0 e METHOD method_8020 getAttackDamage ()F diff --git a/mappings/net/minecraft/item/TridentItem.mapping b/mappings/net/minecraft/item/TridentItem.mapping index 29ca0398a6..dbf9c1055f 100644 --- a/mappings/net/minecraft/item/TridentItem.mapping +++ b/mappings/net/minecraft/item/TridentItem.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_1835 net/minecraft/item/TridentItem FIELD field_23746 attributeModifiers Lcom/google/common/collect/Multimap; FIELD field_30927 ATTACK_DAMAGE F - METHOD method_20284 (Lnet/minecraft/class_1309;)V - ARG 0 e - METHOD method_20285 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1657;)V - ARG 1 p - METHOD method_20286 (Lnet/minecraft/class_1309;)V - ARG 0 e diff --git a/mappings/net/minecraft/item/Vanishable.mapping b/mappings/net/minecraft/item/Vanishable.mapping deleted file mode 100644 index 5949614899..0000000000 --- a/mappings/net/minecraft/item/Vanishable.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_5150 net/minecraft/item/Vanishable - COMMENT Represents a type of item that can have the {@code minecraft:vanishing_curse} enchantment. diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 5fdcfc7a2d..d5730aa2b5 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -31,8 +31,6 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection FIELD field_36379 PACKET_RECEIVED_MARKER Lorg/slf4j/Marker; FIELD field_36380 PACKET_SENT_MARKER Lorg/slf4j/Marker; FIELD field_44972 pendingDisconnectionReason Lnet/minecraft/class_2561; - FIELD field_45666 SERVERBOUND_PROTOCOL_KEY Lio/netty/util/AttributeKey; - FIELD field_45667 CLIENTBOUND_PROTOCOL_KEY Lio/netty/util/AttributeKey; FIELD field_45668 queuedTasks Ljava/util/Queue; FIELD field_45669 prePlayStateListener Lnet/minecraft/class_2547; FIELD field_45955 packetSizeLogger Lnet/minecraft/class_8762; @@ -88,13 +86,6 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 2 rejectsBadPackets COMMENT whether this connection may abort if a compressed packet with a bad size is received METHOD method_10762 getAveragePacketsReceived ()F - METHOD method_10763 setPacketListener (Lnet/minecraft/class_2547;)V - COMMENT Sets the packet listener that will handle oncoming packets, including - COMMENT ones that are not yet handled by the current packet listener. - COMMENT - COMMENT @apiNote This may be called from the {@linkplain #packetListener} stored - COMMENT in this connection. - ARG 1 packetListener METHOD method_10764 sendImmediately (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Z)V ARG 1 packet ARG 2 callbacks @@ -131,13 +122,6 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 address ARG 1 useEpoll ARG 2 connection - METHOD method_52898 disableAutoRead ()V - METHOD method_52899 setS2CPacketHandler (Lnet/minecraft/class_8592;)V - ARG 1 intent - METHOD method_52900 (Lnet/minecraft/class_8592;Lnet/minecraft/class_2547;Ljava/lang/String;ILnet/minecraft/class_2535;)V - ARG 5 connection - METHOD method_52901 setHandlers (Lio/netty/channel/Channel;)V - ARG 0 channel METHOD method_52902 connect (Ljava/lang/String;ILnet/minecraft/class_2896;)V ARG 1 address ARG 2 port @@ -146,11 +130,9 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 1 address ARG 2 port ARG 3 listener - METHOD method_52904 connect (Ljava/lang/String;ILnet/minecraft/class_2547;Lnet/minecraft/class_8592;)V + METHOD method_52904 connect (Ljava/lang/String;ILnet/minecraft/class_9127;Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Lnet/minecraft/class_8592;)V ARG 1 address ARG 2 port - ARG 3 listener - ARG 4 intent METHOD method_52905 submit (Ljava/util/function/Consumer;)V ARG 1 task METHOD method_52906 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Z)V @@ -159,11 +141,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 3 flush METHOD method_52907 (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;ZLnet/minecraft/class_2535;)V ARG 3 connection - METHOD method_52908 getProtocolAttributeKey (Lnet/minecraft/class_2598;)Lio/netty/util/AttributeKey; - ARG 0 side METHOD method_52909 getAddressAsString (Z)Ljava/lang/String; ARG 1 logIps - METHOD method_52910 enableAutoRead ()V METHOD method_52911 addValidator (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V ARG 0 pipeline ARG 1 side @@ -174,9 +153,6 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection COMMENT @see #setPacketListener ARG 1 packetListener METHOD method_52915 flush ()V - METHOD method_52916 addValidatorInternal (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V - ARG 0 pipeline - ARG 1 side METHOD method_52918 flushInternal ()V METHOD method_53505 resetPacketSizeLog (Lnet/minecraft/class_8743;)V ARG 1 log @@ -185,6 +161,3 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel - CLASS 2 - METHOD initChannel (Lio/netty/channel/Channel;)V - ARG 1 channel diff --git a/mappings/net/minecraft/network/NetworkState.mapping b/mappings/net/minecraft/network/NetworkState.mapping index 0a18225109..0c433547fa 100644 --- a/mappings/net/minecraft/network/NetworkState.mapping +++ b/mappings/net/minecraft/network/NetworkState.mapping @@ -1,65 +1,5 @@ CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState FIELD field_20594 stateId Ljava/lang/String; - FIELD field_20595 packetHandlers Ljava/util/Map; - FIELD field_41866 UNKNOWN_PACKET_ID I - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_2539$class_4533;)V + METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 stateId - ARG 4 initializer METHOD method_10785 getId ()Ljava/lang/String; - METHOD method_22308 createPacketHandlerInitializer ()Lnet/minecraft/class_2539$class_4533; - METHOD method_39498 getPacketIdToPacketMap (Lnet/minecraft/class_2598;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - ARG 1 side - METHOD method_52921 getHandler (Lnet/minecraft/class_2598;)Lnet/minecraft/class_2539$class_8698; - ARG 1 side - CLASS class_4532 InternalPacketHandler - FIELD field_20596 packetIds Lit/unimi/dsi/fastutil/objects/Object2IntMap; - FIELD field_20597 packetFactories Ljava/util/List; - FIELD field_36381 LOGGER Lorg/slf4j/Logger; - FIELD field_41867 bundler Lnet/minecraft/class_8039; - FIELD field_41868 bundlePacketTypes Ljava/util/Set; - METHOD method_22310 createPacket (ILnet/minecraft/class_2540;)Lnet/minecraft/class_2596; - ARG 1 id - ARG 2 buf - METHOD method_22311 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V - ARG 0 map - METHOD method_22312 getId (Ljava/lang/Class;)I - ARG 1 packet - METHOD method_22313 register (Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/class_2539$class_4532; - ARG 1 type - ARG 2 packetFactory - METHOD method_48313 getBundler ()Lnet/minecraft/class_8039; - METHOD method_48315 (Lnet/minecraft/class_8037;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8037; - ARG 1 buf - METHOD method_48317 registerBundlePacket (Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/class_2539$class_4532; - ARG 1 bundlePacketType - ARG 2 bundleFunction - METHOD method_52929 canHandle (Ljava/lang/Class;)Z - ARG 1 clazz - CLASS class_4533 PacketHandlerInitializer - FIELD field_20598 packetHandlers Ljava/util/Map; - METHOD method_22315 setup (Lnet/minecraft/class_2598;Lnet/minecraft/class_2539$class_4532;)Lnet/minecraft/class_2539$class_4533; - ARG 1 side - ARG 2 handler - METHOD method_52930 createSideToHandlerMap (Lnet/minecraft/class_2539;)Ljava/util/Map; - ARG 1 state - CLASS class_8698 PacketHandler - FIELD field_45672 state Lnet/minecraft/class_2539; - FIELD field_45673 side Lnet/minecraft/class_2598; - FIELD field_45674 backingHandler Lnet/minecraft/class_2539$class_4532; - METHOD (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;Lnet/minecraft/class_2539$class_4532;)V - ARG 1 state - ARG 2 side - ARG 3 backingHandler - METHOD method_52922 getState ()Lnet/minecraft/class_2539; - METHOD method_52923 createPacket (ILnet/minecraft/class_2540;)Lnet/minecraft/class_2596; - ARG 1 id - ARG 2 buf - METHOD method_52924 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;Ljava/lang/Class;Ljava/lang/Integer;)V - ARG 1 packet - ARG 2 id - METHOD method_52925 getId (Lnet/minecraft/class_2596;)I - ARG 1 packet - METHOD method_52926 getSide ()Lnet/minecraft/class_2598; - METHOD method_52927 canHandle (Lnet/minecraft/class_2596;)Z - ARG 1 packet - METHOD method_52928 getPacketIdToPacketMap ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 594e8a8deb..04df11060d 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -332,16 +332,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the value read COMMENT @see #writeVarLong(long) - METHOD method_10793 writeItemStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2540; - COMMENT Writes an item stack to this buf. An item stack is represented by a - COMMENT boolean indicating whether it exists; if it exists, it is followed by - COMMENT a var int for its raw id, a byte for its count, and an NBT compound for - COMMENT its tag. - COMMENT - COMMENT @return this buf, for chaining - COMMENT @see #readItemStack() - ARG 1 stack - COMMENT the stack to write METHOD method_10794 writeNbt (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2540; COMMENT Writes an NBT element to this buf. The binary representation of NBT is COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If {@code nbt} is {@code @@ -352,7 +342,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT written COMMENT @see #readNbt() COMMENT @see #readNbt(NbtSizeTracker) - ARG 1 nbt METHOD method_10795 readByteArray ()[B COMMENT Reads an array of primitive bytes from this buf. The array first has a COMMENT var int indicating its length, followed by the actual bytes. The array @@ -590,14 +579,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #writeEnumConstant(Enum) ARG 1 enumClass COMMENT the enum class, for constant lookup - METHOD method_10819 readItemStack ()Lnet/minecraft/class_1799; - COMMENT Reads an item stack from this buf. An item stack is represented by a - COMMENT boolean indicating whether it exists; if it exists, it is followed by - COMMENT a var int for its raw id, a byte for its count, and an NBT compound for - COMMENT its tag. - COMMENT - COMMENT @return the read item stack - COMMENT @see #writeItemStack(ItemStack) METHOD method_17813 writeBlockHitResult (Lnet/minecraft/class_3965;)V COMMENT Writes a block hit result to this buf. A block hit result is represented COMMENT by a block position, a direction enum constant, 3 floats for the hit @@ -707,7 +688,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT the list to write METHOD method_34061 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; ARG 1 error - METHOD method_34062 writeCollection (Ljava/util/Collection;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_34062 writeCollection (Ljava/util/Collection;Lnet/minecraft/class_9142;)V COMMENT Writes a collection to this buf. The collection is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by the entries COMMENT sequentially. @@ -717,7 +698,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 collection COMMENT the collection to write ARG 2 writer - METHOD method_34063 writeMap (Ljava/util/Map;Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_34063 writeMap (Ljava/util/Map;Lnet/minecraft/class_9142;Lnet/minecraft/class_9142;)V COMMENT Writes a map to this buf. The map is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by each key and value COMMENT pair. @@ -729,7 +710,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT the map to write ARG 2 keyWriter ARG 3 valueWriter - METHOD method_34064 (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;Ljava/lang/Object;)V + METHOD method_34064 (Lnet/minecraft/class_9142;Lnet/minecraft/class_9142;Ljava/lang/Object;Ljava/lang/Object;)V ARG 3 key ARG 4 value METHOD method_34065 forEachInCollection (Ljava/util/function/Consumer;)V @@ -740,14 +721,14 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readCollection(IntFunction, PacketByteBuf.PacketReader) ARG 1 consumer COMMENT the consumer to read entries - METHOD method_34066 readList (Lnet/minecraft/class_2540$class_7461;)Ljava/util/List; + METHOD method_34066 readList (Lnet/minecraft/class_9141;)Ljava/util/List; COMMENT Reads a collection from this buf as an array list. COMMENT COMMENT @param the list's entry type COMMENT @return the read list COMMENT @see #readCollection(IntFunction, PacketByteBuf.PacketReader) ARG 1 reader - METHOD method_34067 readMap (Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Map; + METHOD method_34067 readMap (Lnet/minecraft/class_9141;Lnet/minecraft/class_9141;)Ljava/util/Map; COMMENT Reads a map from this buf as a hash map. COMMENT COMMENT @param the key type @@ -756,7 +737,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readMap(IntFunction, PacketByteBuf.PacketReader, PacketByteBuf.PacketReader) ARG 1 keyReader ARG 2 valueReader - METHOD method_34068 readCollection (Ljava/util/function/IntFunction;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Collection; + METHOD method_34068 readCollection (Ljava/util/function/IntFunction;Lnet/minecraft/class_9141;)Ljava/util/Collection; COMMENT Reads a collection from this buf. The collection is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by the entries COMMENT sequentially. @@ -769,7 +750,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 collectionFactory COMMENT a factory that creates a collection with a given size ARG 2 reader - METHOD method_34069 readMap (Ljava/util/function/IntFunction;Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Map; + METHOD method_34069 readMap (Ljava/util/function/IntFunction;Lnet/minecraft/class_9141;Lnet/minecraft/class_9141;)Ljava/util/Map; COMMENT Reads a map from this buf. The map is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by each key and value COMMENT pair. @@ -782,8 +763,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readMap(PacketByteBuf.PacketReader, PacketByteBuf.PacketReader) ARG 1 mapFactory COMMENT a factory that creates a map with a given size - ARG 2 keyReader - ARG 3 valueReader METHOD method_34070 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; ARG 1 error METHOD method_36130 writeChunkPos (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2540; @@ -808,7 +787,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the read chunk position COMMENT @see #writeChunkPos(ChunkPos) - METHOD method_37435 writeOptional (Ljava/util/Optional;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_37435 writeOptional (Ljava/util/Optional;Lnet/minecraft/class_9142;)V COMMENT Writes an optional value to this buf. An optional value is represented by COMMENT a boolean indicating if the value is present, followed by the value only if COMMENT the value is present. @@ -816,7 +795,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readOptional(PacketByteBuf.PacketReader) ARG 1 value ARG 2 writer - METHOD method_37436 readOptional (Lnet/minecraft/class_2540$class_7461;)Ljava/util/Optional; + METHOD method_37436 readOptional (Lnet/minecraft/class_9141;)Ljava/util/Optional; COMMENT Reads an optional value from this buf. An optional value is represented by COMMENT a boolean indicating if the value is present, followed by the value only if COMMENT the value is present. @@ -829,30 +808,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf METHOD method_37453 getMaxValidator (Ljava/util/function/IntFunction;I)Ljava/util/function/IntFunction; ARG 0 applier ARG 1 max - METHOD method_42064 readRegistryValue (Lnet/minecraft/class_2359;)Ljava/lang/Object; - COMMENT Reads a value from a registry (or other {@link IndexedIterable}s). The value - COMMENT is stored using its raw ID as a {@linkplain #readVarInt() var int}. - COMMENT - COMMENT

Callers must ensure that the registry (or the indexed iterable) is - COMMENT properly synchronized between the client and the server. - COMMENT - COMMENT @return the value, or {@code null} if it is missing from {@code registry} - COMMENT @see #writeRegistryValue(IndexedIterable, Object) - ARG 1 registry - COMMENT the registry (or an indexed iterable) that contains the value - METHOD method_42065 writeRegistryValue (Lnet/minecraft/class_2359;Ljava/lang/Object;)V - COMMENT Writes a value from a registry (or other {@link IndexedIterable}s). The value - COMMENT is stored using its raw ID as a {@linkplain #readVarInt() var int}. - COMMENT - COMMENT

Callers must ensure that the registry (or the indexed iterable) is - COMMENT properly synchronized between the client and the server. - COMMENT - COMMENT @throws IllegalArgumentException if {@code value} is not in {@code registry} - COMMENT @see #readRegistryValue(IndexedIterable) - ARG 1 registry - COMMENT the registry (or an indexed iterable) that contains the value - ARG 2 value - COMMENT a value to write, must be in {@code registry} METHOD method_43616 writeGameProfile (Lcom/mojang/authlib/GameProfile;)V COMMENT Writes a game profile to this buf. A game profile is represented by a COMMENT {@linkplain #writeUuid(UUID) uuid}, a username string, and a collection of @@ -867,7 +822,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT exists if signed). COMMENT COMMENT @see #readProperty() - METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_9142;Lnet/minecraft/class_9142;)V COMMENT Writes an {@code Either} to this buf. An either is represented by COMMENT a boolean indicating if the left side or the right side of the either, COMMENT followed by the value. @@ -876,11 +831,11 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 either ARG 2 leftWriter ARG 3 rightWriter - METHOD method_43620 (Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;)V + METHOD method_43620 (Lnet/minecraft/class_9142;Ljava/lang/Object;)V ARG 2 object - METHOD method_43621 (Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;)V + METHOD method_43621 (Lnet/minecraft/class_9142;Ljava/lang/Object;)V ARG 2 object - METHOD method_43622 readEither (Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Lcom/mojang/datafixers/util/Either; + METHOD method_43622 readEither (Lnet/minecraft/class_9141;Lnet/minecraft/class_9141;)Lcom/mojang/datafixers/util/Either; COMMENT Reads an {@code Either} from this buf. An either is represented by COMMENT a boolean indicating if the left side or the right side of the either, COMMENT followed by the value. @@ -904,7 +859,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the property COMMENT @see #writeProperty(Property) - METHOD method_43826 writeNullable (Ljava/lang/Object;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_43826 writeNullable (Ljava/lang/Object;Lnet/minecraft/class_9142;)V COMMENT Writes a nullable value to this buf. A nullable value is represented by COMMENT a boolean indicating if the value is not null, followed by the value only if COMMENT the value is not null. @@ -912,7 +867,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readNullable(PacketByteBuf.PacketReader) ARG 1 value ARG 2 writer - METHOD method_43827 readNullable (Lnet/minecraft/class_2540$class_7461;)Ljava/lang/Object; + METHOD method_43827 readNullable (Lnet/minecraft/class_9141;)Ljava/lang/Object; COMMENT Reads a nullable value from this buf. A nullable value is represented by COMMENT a boolean indicating if the value is not null, followed by the value only if COMMENT the value is not null. @@ -1019,13 +974,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT collection of properties. COMMENT COMMENT @see #writePropertyMap - METHOD method_47989 writeRegistryEntry (Lnet/minecraft/class_2359;Lnet/minecraft/class_6880;Lnet/minecraft/class_2540$class_7462;)V - ARG 1 registryEntries - ARG 2 entry - ARG 3 writer - METHOD method_47990 readRegistryEntry (Lnet/minecraft/class_2359;Lnet/minecraft/class_2540$class_7461;)Lnet/minecraft/class_6880; - ARG 1 registryEntries - ARG 2 reader METHOD method_49067 writeQuaternionf (Lorg/joml/Quaternionf;)V COMMENT Writes a {@link Quaternionf} to this buf. A {@link Quaternionf} is represented COMMENT by four {@code float}s. @@ -1337,12 +1285,3 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 length METHOD writerIndex (I)Lio/netty/buffer/ByteBuf; ARG 1 index - CLASS class_7461 PacketReader - COMMENT A functional interface to read a value from {@link PacketByteBuf}. - METHOD method_43828 (Lnet/minecraft/class_2540;)Ljava/util/Optional; - ARG 1 buf - CLASS class_7462 PacketWriter - COMMENT A functional interface to write a value to {@link PacketByteBuf}. - METHOD method_43829 (Lnet/minecraft/class_2540;Ljava/util/Optional;)V - ARG 1 buf - ARG 2 value diff --git a/mappings/net/minecraft/network/handler/DecoderHandler.mapping b/mappings/net/minecraft/network/handler/DecoderHandler.mapping index 6cabf884f7..5c18a48788 100644 --- a/mappings/net/minecraft/network/handler/DecoderHandler.mapping +++ b/mappings/net/minecraft/network/handler/DecoderHandler.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_2543 net/minecraft/network/handler/DecoderHandler FIELD field_11715 LOGGER Lorg/slf4j/Logger; - FIELD field_45677 protocolKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;)V - ARG 1 protocolKey METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V - ARG 1 ctx ARG 2 buf ARG 3 objects diff --git a/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping index b641e1c39f..152218ad2d 100644 --- a/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping +++ b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_8700 net/minecraft/network/handler/NetworkStateTransitionHandler - METHOD method_53011 handle (Lio/netty/util/Attribute;Lnet/minecraft/class_2596;)V - ARG 0 protocolAttribute - ARG 1 packet diff --git a/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping index 71eebde4fd..228002cafa 100644 --- a/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping +++ b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_8039 net/minecraft/network/handler/PacketBundleHandler FIELD field_41878 MAX_PACKETS I - FIELD field_41879 NOOP Lnet/minecraft/class_8039; - METHOD method_48325 create (Ljava/lang/Class;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_8039; - ARG 0 bundlePacketType + METHOD method_48325 create (Lnet/minecraft/class_9145;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_8039; ARG 1 bundleFunction ARG 2 splitter METHOD method_48326 createBundler (Lnet/minecraft/class_2596;)Lnet/minecraft/class_8039$class_8040; @@ -10,11 +8,9 @@ CLASS net/minecraft/class_8039 net/minecraft/network/handler/PacketBundleHandler METHOD method_48327 forEachPacket (Lnet/minecraft/class_2596;Ljava/util/function/Consumer;)V ARG 1 packet ARG 2 consumer - CLASS 2 + CLASS 1 CLASS 1 FIELD field_41884 packets Ljava/util/List; CLASS class_8040 Bundler METHOD method_48328 add (Lnet/minecraft/class_2596;)Lnet/minecraft/class_2596; ARG 1 packet - CLASS class_8041 BundlerGetter - METHOD method_48312 getBundler ()Lnet/minecraft/class_8039; diff --git a/mappings/net/minecraft/network/handler/PacketBundler.mapping b/mappings/net/minecraft/network/handler/PacketBundler.mapping index 4a54df5844..dd41eeab68 100644 --- a/mappings/net/minecraft/network/handler/PacketBundler.mapping +++ b/mappings/net/minecraft/network/handler/PacketBundler.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_8035 net/minecraft/network/handler/PacketBundler FIELD field_41869 currentBundler Lnet/minecraft/class_8039$class_8040; - FIELD field_41870 bundleHandler Lnet/minecraft/class_8039; - FIELD field_45675 protocolKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;)V - ARG 1 protocolKey METHOD decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V ARG 1 context ARG 2 packet diff --git a/mappings/net/minecraft/network/handler/PacketEncoder.mapping b/mappings/net/minecraft/network/handler/PacketEncoder.mapping index 9c85828551..76b6c2ecfa 100644 --- a/mappings/net/minecraft/network/handler/PacketEncoder.mapping +++ b/mappings/net/minecraft/network/handler/PacketEncoder.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_2545 net/minecraft/network/handler/PacketEncoder FIELD field_11721 LOGGER Lorg/slf4j/Logger; - FIELD field_45678 protocolKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;)V - ARG 1 protocolKey METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V ARG 1 ctx ARG 2 packet diff --git a/mappings/net/minecraft/network/handler/PacketUnbundler.mapping b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping index c751c302eb..7f6c9e8090 100644 --- a/mappings/net/minecraft/network/handler/PacketUnbundler.mapping +++ b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_8036 net/minecraft/network/handler/PacketUnbundler - FIELD field_45676 protocolKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;)V - ARG 1 protocolKey METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V ARG 1 context ARG 2 packet diff --git a/mappings/net/minecraft/network/handler/PacketValidator.mapping b/mappings/net/minecraft/network/handler/PacketValidator.mapping deleted file mode 100644 index adfeeec61b..0000000000 --- a/mappings/net/minecraft/network/handler/PacketValidator.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/class_8699 net/minecraft/network/handler/PacketValidator - FIELD field_45679 LOGGER Lorg/slf4j/Logger; - FIELD field_45680 receivingSideKey Lio/netty/util/AttributeKey; - FIELD field_45681 sendingSideKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;Lio/netty/util/AttributeKey;)V - ARG 1 receivingSideKey - ARG 2 sendingSideKey - METHOD decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V - ARG 1 context - ARG 2 packet - ARG 3 packets - METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V - ARG 1 context - ARG 2 packet - ARG 3 packets - METHOD method_53009 handle (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/class_2596;Ljava/util/List;Lio/netty/util/AttributeKey;)V - ARG 0 context - ARG 1 packet - ARG 2 packets - ARG 3 key diff --git a/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping index aa686fa783..7c170d3cf8 100644 --- a/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8709 net/minecraft/network/packet/BrandCustomPayload - FIELD field_45697 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/CustomPayload.mapping b/mappings/net/minecraft/network/packet/CustomPayload.mapping index 180f7749a7..8b43d0b10d 100644 --- a/mappings/net/minecraft/network/packet/CustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/CustomPayload.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8710 net/minecraft/network/packet/CustomPayload - METHOD method_53028 write (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/Packet.mapping b/mappings/net/minecraft/network/packet/Packet.mapping index b8e76d2dea..0c054d74c3 100644 --- a/mappings/net/minecraft/network/packet/Packet.mapping +++ b/mappings/net/minecraft/network/packet/Packet.mapping @@ -2,14 +2,5 @@ CLASS net/minecraft/class_2596 net/minecraft/network/packet/Packet METHOD method_11051 isWritingErrorSkippable ()Z COMMENT {@return whether a throwable in writing of this packet allows the COMMENT connection to simply skip the packet's sending than disconnecting} - METHOD method_11052 write (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11054 apply (Lnet/minecraft/class_2547;)V ARG 1 listener - METHOD method_52273 getNewNetworkState ()Lnet/minecraft/class_2539; - COMMENT {@return a new network state to transition to, or {@code null} - COMMENT to indicate no state change} - COMMENT

- COMMENT The state transition is done on both the sender and receiver sides, but it - COMMENT is only in one direction (out of C2S and S2C). Another packet must be processed - COMMENT in the reverse direction to ensure the state in both directions are updated. diff --git a/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping index 96c09a5e93..ab11e9e7ce 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping @@ -1,11 +1,2 @@ CLASS net/minecraft/class_2817 net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket FIELD field_33361 MAX_PAYLOAD_SIZE I - FIELD field_45694 ID_TO_READER Ljava/util/Map; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_53026 readPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8710; - ARG 0 id - ARG 1 buf - METHOD method_53027 readUnknownPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8711; - ARG 0 id - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping index a64cacd9ad..863949c8a8 100644 --- a/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8736 net/minecraft/network/packet/c2s/config/ReadyC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping index fd40468685..c52d039dbc 100644 --- a/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping +++ b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping @@ -4,4 +4,3 @@ CLASS net/minecraft/class_8592 net/minecraft/network/packet/c2s/handshake/Connec METHOD method_52283 getId ()I METHOD method_52284 byId (I)Lnet/minecraft/class_8592; ARG 0 id - METHOD method_52285 getState ()Lnet/minecraft/class_2539; diff --git a/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping index 5e609a8d40..118e2084f3 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8593 net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping index ffe36093de..1c271fa8d4 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQuery FIELD field_33374 MAX_PAYLOAD_SIZE I METHOD comp_1569 queryId ()I METHOD comp_1570 response ()Lnet/minecraft/class_8594; + METHOD method_11052 write (Lnet/minecraft/class_2540;)V METHOD method_52290 readPayload (ILnet/minecraft/class_2540;)Lnet/minecraft/class_8594; COMMENT {@return the response payload read from {@code buf}} COMMENT diff --git a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping index 2eb305fe0e..2c6b9e5872 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8591 net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index bf4c7e781f..e033eeacda 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping @@ -15,14 +15,10 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 ARG 5 actionType ARG 6 stack ARG 7 modifiedStacks - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_12190 getStack ()Lnet/minecraft/class_1799; METHOD method_12192 getSlot ()I METHOD method_12193 getButton ()I METHOD method_12194 getSyncId ()I METHOD method_12195 getActionType ()Lnet/minecraft/class_1713; - METHOD method_34677 (Lnet/minecraft/class_2540;)Ljava/lang/Integer; - ARG 0 bufx METHOD method_34678 getModifiedStacks ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD method_37440 getRevision ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping index 41d8119f38..99694f9d92 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping @@ -4,7 +4,5 @@ CLASS net/minecraft/class_2873 net/minecraft/network/packet/c2s/play/CreativeInv METHOD (ILnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_12479 getStack ()Lnet/minecraft/class_1799; METHOD method_12481 getSlot ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index a334154d78..582ce9c11e 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -2,15 +2,3 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaco METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 primaryEffectId ARG 2 secondaryEffectId - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V - ARG 0 buf2 - ARG 1 secondary - METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; - ARG 0 buf2 - METHOD method_43366 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V - ARG 0 buf2 - ARG 1 primary - METHOD method_43367 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; - ARG 0 buf2 diff --git a/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping index 92f66aa283..ee31f471bb 100644 --- a/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_2937 net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping index d60c11ff52..900ec290dd 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping @@ -1,11 +1,2 @@ CLASS net/minecraft/class_2658 net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket FIELD field_33326 MAX_PAYLOAD_SIZE I - FIELD field_45693 ID_TO_READER Ljava/util/Map; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_53023 readPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8710; - ARG 0 id - ARG 1 buf - METHOD method_53025 readUnknownPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8711; - ARG 0 id - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping index 427059ef96..c56ed193a5 100644 --- a/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8733 net/minecraft/network/packet/s2c/config/ReadyS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping index d9f36b5667..4283b0e56e 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_8707 net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload - FIELD field_45695 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_53028 write (Lnet/minecraft/class_2540;)V CLASS class_5243 Bee FIELD comp_1650 entityId I FIELD comp_1657 disallowedHives Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping index ea3a089a6a..223b5c46e7 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8708 net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload - FIELD field_45696 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_4232 Brain diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping index 798c0efbec..8bce6ead90 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_9004 net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload - FIELD field_47514 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_9005 BreezeInfo diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping index ed249a6dd9..8e613d3820 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8712 net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload - FIELD field_45698 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping index 951ab3ecaf..8919d0f1f6 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_8713 net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload - FIELD field_45699 ID Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping index ff17c9e971..0978ef3fe1 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8714 net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload - FIELD field_45700 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping index 7e54a9b8b4..a2eb999a8a 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8715 net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload - FIELD field_45701 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping index 4835d2152d..5be2675c3c 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8716 net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload - FIELD field_45702 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53034 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8716$class_8717;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping index c71b4933b8..0c9f4d297d 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8718 net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload - FIELD field_45703 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_8719 HiveInfo diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping index 1641bb46b7..88314b76ae 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8720 net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload - FIELD field_45704 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping index 3d7b6b8e1c..394bf144ac 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8721 net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload - FIELD field_45705 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping index 4c865a0c6b..efe2d63ced 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8722 net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload - FIELD field_45706 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping index 97c4133e8e..15d691f858 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8723 net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload - FIELD field_45707 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping index 702bb93bca..470cb709c2 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8724 net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload - FIELD field_45708 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping index cb1283553d..bd6ef26e3b 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8725 net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload - FIELD field_45709 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping index c60d1854a5..48f773cf29 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8726 net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload - FIELD field_45710 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53037 writeBox (Lnet/minecraft/class_2540;Lnet/minecraft/class_3341;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping index b99f1e3317..ad2f530bce 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8728 net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload - FIELD field_45711 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping index 5d9ea278d7..45a443bbb6 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8729 net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload - FIELD field_45712 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping index 9759f59fcb..abe296fda5 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello FIELD field_13209 serverId Ljava/lang/String; FIELD field_13210 nonce [B FIELD field_13211 publicKey [B - METHOD (Ljava/lang/String;[B[B)V + METHOD (Ljava/lang/String;[B[BZ)V ARG 1 serverId ARG 2 publicKey ARG 3 nonce diff --git a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping index 33d505a7b9..d816b39a48 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement FIELD field_12716 toSetProgress Ljava/util/Map; FIELD field_12717 toEarn Ljava/util/List; FIELD field_12718 clearCurrent Z - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (ZLjava/util/Collection;Ljava/util/Set;Ljava/util/Map;)V ARG 1 clearCurrent ARG 2 toEarn @@ -17,6 +15,3 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement METHOD method_34197 (Lnet/minecraft/class_2540;Lnet/minecraft/class_167;)V ARG 0 buf2 ARG 1 progress - METHOD method_34198 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8779;)V - ARG 0 buf2 - ARG 1 task diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping index 8aab0f9759..4c4bd01e07 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping @@ -2,12 +2,6 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntity FIELD field_12038 blockEntityType Lnet/minecraft/class_2591; FIELD field_12039 nbt Lnet/minecraft/class_2487; FIELD field_12040 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V - ARG 1 pos - ARG 2 blockEntityType - ARG 3 nbt - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11290 getNbt ()Lnet/minecraft/class_2487; METHOD method_11291 getBlockEntityType ()Lnet/minecraft/class_2591; METHOD method_11293 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping index 89413a0e0f..17ccc42074 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_2623 net/minecraft/network/packet/s2c/play/BlockEventS ARG 2 block ARG 3 type ARG 4 data - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11294 getType ()I METHOD method_11295 getBlock ()Lnet/minecraft/class_2248; METHOD method_11296 getData ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping index e1f15ef2e1..a7325aa8cd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping @@ -7,7 +7,5 @@ CLASS net/minecraft/class_2626 net/minecraft/network/packet/s2c/play/BlockUpdate METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11308 getState ()Lnet/minecraft/class_2680; METHOD method_11309 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping index bbddda2b45..365be63358 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping @@ -3,12 +3,11 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData FIELD field_34863 heightmap Lnet/minecraft/class_2487; FIELD field_34864 sectionsData [B FIELD field_34865 blockEntities Ljava/util/List; - METHOD (Lnet/minecraft/class_2540;II)V - ARG 1 buf - ARG 2 x - ARG 3 z METHOD (Lnet/minecraft/class_2818;)V ARG 1 chunk + METHOD (Lnet/minecraft/class_9129;II)V + ARG 2 x + ARG 3 z METHOD method_38586 getSectionsDataBuf ()Lnet/minecraft/class_2540; METHOD method_38587 getBlockEntities (II)Ljava/util/function/Consumer; ARG 1 x @@ -17,14 +16,10 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData ARG 3 visitor METHOD method_38589 getSectionsPacketSize (Lnet/minecraft/class_2818;)I ARG 0 chunk - METHOD method_38590 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_38590 write (Lnet/minecraft/class_9129;)V METHOD method_38591 writeSections (Lnet/minecraft/class_2540;Lnet/minecraft/class_2818;)V ARG 0 buf ARG 1 chunk - METHOD method_38592 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6603$class_6604;)V - ARG 0 buf2 - ARG 1 entry METHOD method_38593 iterateBlockEntities (Lnet/minecraft/class_6603$class_6605;II)V ARG 1 consumer ARG 2 x @@ -41,12 +36,9 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData ARG 2 y ARG 3 type ARG 4 nbt - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_38596 of (Lnet/minecraft/class_2586;)Lnet/minecraft/class_6603$class_6604; ARG 0 blockEntity - METHOD method_38597 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_38597 write (Lnet/minecraft/class_9129;)V CLASS class_6605 BlockEntityVisitor METHOD accept (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V ARG 1 pos diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping index 700d76b509..308ab37355 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2 FIELD field_12236 chunkX I FIELD field_34870 chunkData Lnet/minecraft/class_6603; FIELD field_34871 lightData Lnet/minecraft/class_6606; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (Lnet/minecraft/class_2818;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;)V ARG 1 chunk ARG 2 lightProvider diff --git a/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping index c47bb325f7..5471049c94 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/class_2656 net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket - FIELD field_12154 item Lnet/minecraft/class_1792; - FIELD field_12155 cooldown I - METHOD (Lnet/minecraft/class_1792;I)V - ARG 1 item - ARG 2 cooldown - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_11453 getItem ()Lnet/minecraft/class_1792; - METHOD method_11454 getCooldown ()I + FIELD comp_2198 item Lnet/minecraft/class_1792; + FIELD comp_2199 cooldown I + METHOD comp_2198 item ()Lnet/minecraft/class_1792; + METHOD comp_2199 cooldown ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping index 5fc836a1c2..adcb9c355e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_5891 net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping index c5b6e8f947..bca7bf51cd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8588 net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping index a13f587337..9725c0c92c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping @@ -4,20 +4,8 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri METHOD (ILjava/util/Collection;)V ARG 1 entityId ARG 2 attributes - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11937 getEntityId ()I METHOD method_11938 getEntries ()Ljava/util/List; - METHOD method_34199 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1322;)V - ARG 0 buf3 - ARG 1 modifier - METHOD method_34200 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2781$class_2782;)V - ARG 0 buf2 - ARG 1 attribute - METHOD method_34201 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2781$class_2782; - ARG 0 buf2 - METHOD method_34202 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1322; - ARG 0 modifiers CLASS class_2782 Entry METHOD (Lnet/minecraft/class_6880;DLjava/util/Collection;)V ARG 2 baseValue diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping index bb34150be7..d634907a5d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping @@ -4,7 +4,5 @@ CLASS net/minecraft/class_2744 net/minecraft/network/packet/s2c/play/EntityEquip METHOD (ILjava/util/List;)V ARG 1 id ARG 2 equipmentList - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11820 getId ()I METHOD method_30145 getEquipmentList ()Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping index bb9c550e0b..dfb7e36ea7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping @@ -37,8 +37,6 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn ARG 1 entity ARG 2 entityData ARG 3 pos - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11164 getUuid ()Ljava/util/UUID; METHOD method_11166 getEntityData ()I METHOD method_11167 getId ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index 36d18e76cf..db0da1f6f6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu ARG 1 entityId ARG 2 effect ARG 3 keepFading - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11942 shouldShowIcon ()Z METHOD method_11943 getEntityId ()I METHOD method_11944 getDuration ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping index 054f41216a..a85b53fe46 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping @@ -4,12 +4,8 @@ CLASS net/minecraft/class_2739 net/minecraft/network/packet/s2c/play/EntityTrack FIELD field_40850 MARKER_ID I METHOD (ILjava/util/List;)V ARG 1 id - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD comp_1127 id ()I METHOD comp_1128 trackedValues ()Ljava/util/List; - METHOD method_46615 write (Ljava/util/List;Lnet/minecraft/class_2540;)V + METHOD method_46615 write (Ljava/util/List;Lnet/minecraft/class_9129;)V ARG 0 trackedValues - ARG 1 buf - METHOD method_46616 read (Lnet/minecraft/class_2540;)Ljava/util/List; - ARG 0 buf + METHOD method_46616 read (Lnet/minecraft/class_9129;)Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping index 7fb4415672..07d6d7a382 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping @@ -17,8 +17,8 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 FIELD field_47515 particle Lnet/minecraft/class_2394; FIELD field_47516 emitterParticle Lnet/minecraft/class_2394; FIELD field_47517 destructionType Lnet/minecraft/class_1927$class_4179; - FIELD field_47518 soundEvent Lnet/minecraft/class_3414; - METHOD (DDDFLjava/util/List;Lnet/minecraft/class_243;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)V + FIELD field_47518 soundEvent Lnet/minecraft/class_6880; + METHOD (DDDFLjava/util/List;Lnet/minecraft/class_243;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)V ARG 1 x ARG 3 y ARG 5 z @@ -28,9 +28,6 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 ARG 10 destructionType ARG 11 particle ARG 12 emitterParticle - ARG 13 soundEvent - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11472 getPlayerVelocityX ()F METHOD method_11473 getPlayerVelocityY ()F METHOD method_11474 getPlayerVelocityZ ()F @@ -44,13 +41,7 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 METHOD method_34122 (IIILnet/minecraft/class_2540;Lnet/minecraft/class_2338;)V ARG 3 buf2 ARG 4 pos - METHOD method_55327 readParticleEffect (Lnet/minecraft/class_2540;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; - ARG 1 buf - ARG 2 particleType METHOD method_55328 getDestructionType ()Lnet/minecraft/class_1927$class_4179; METHOD method_55329 getParticle ()Lnet/minecraft/class_2394; METHOD method_55330 getEmitterParticle ()Lnet/minecraft/class_2394; - METHOD method_55331 getSoundEvent ()Lnet/minecraft/class_3414; - METHOD method_55628 writeParticleEffect (Lnet/minecraft/class_2540;Lnet/minecraft/class_2394;)V - ARG 1 buf - ARG 2 particleEffect + METHOD method_55331 getSoundEvent ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index d699054a5c..42e0917862 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD comp_97 maxPlayers I FIELD comp_98 viewDistance I FIELD comp_99 reducedDebugInfo Z - METHOD (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;)V + METHOD (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;Z)V ARG 1 playerEntityId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping index ab7e65a7bb..e071e87b58 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping @@ -11,8 +11,6 @@ CLASS net/minecraft/class_2649 net/minecraft/network/packet/s2c/play/InventoryS2 ARG 2 revision ARG 3 contents ARG 4 cursorStack - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11440 getSyncId ()I METHOD method_11441 getContents ()Ljava/util/List; METHOD method_37437 getCursorStack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping index ed901a76ff..235963dcb2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping @@ -2,12 +2,6 @@ CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenScreenS FIELD field_17436 syncId I FIELD field_17437 screenHandlerId Lnet/minecraft/class_3917; FIELD field_17438 name Lnet/minecraft/class_2561; - METHOD (ILnet/minecraft/class_3917;Lnet/minecraft/class_2561;)V - ARG 1 syncId - ARG 2 type - ARG 3 name - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_17592 getSyncId ()I METHOD method_17593 getScreenHandlerType ()Lnet/minecraft/class_3917; METHOD method_17594 getName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping index 4fc3791e68..aca2f9f619 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping @@ -20,11 +20,6 @@ CLASS net/minecraft/class_2675 net/minecraft/network/packet/s2c/play/ParticleS2C ARG 11 offsetZ ARG 12 speed ARG 13 count - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_11542 readParticleParameters (Lnet/minecraft/class_2540;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; - ARG 1 buf - ARG 2 type METHOD method_11543 getSpeed ()F METHOD method_11544 getX ()D METHOD method_11545 getCount ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping index 5bcd5d75d2..16b5c5c1c7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr FIELD field_12641 category Lnet/minecraft/class_3419; FIELD field_12642 sound Lnet/minecraft/class_6880; FIELD field_38819 seed J - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V ARG 1 sound ARG 2 category diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping index 91fe732cd8..ca0001be23 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 FIELD field_12662 pitch F FIELD field_33353 COORDINATE_SCALE F FIELD field_38820 seed J - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;DDDFFJ)V ARG 1 sound ARG 2 category diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping index 88c9d03c92..1daf4d7ed8 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket METHOD (ILnet/minecraft/class_6880;)V ARG 1 entityId - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11767 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping index c99a2b9c06..85f95e6f1b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping @@ -6,9 +6,7 @@ CLASS net/minecraft/class_2751 net/minecraft/network/packet/s2c/play/ScoreboardO FIELD field_33343 ADD_MODE I FIELD field_33344 REMOVE_MODE I FIELD field_33345 UPDATE_MODE I - FIELD field_47519 numberFormat Lnet/minecraft/class_9022; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf + FIELD field_47519 numberFormat Ljava/util/Optional; METHOD (Lnet/minecraft/class_266;I)V ARG 1 objective ARG 2 mode @@ -16,4 +14,4 @@ CLASS net/minecraft/class_2751 net/minecraft/network/packet/s2c/play/ScoreboardO METHOD method_11836 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_11837 getMode ()I METHOD method_11839 getType ()Lnet/minecraft/class_274$class_275; - METHOD method_55336 getNumberFormat ()Lnet/minecraft/class_9022; + METHOD method_55336 getNumberFormat ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping index ce7b854e7f..c0f532bc40 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_2757 net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket FIELD comp_2122 scoreHolderName Ljava/lang/String; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD comp_2122 scoreHolderName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping index ce33b3408e..609cc5b734 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandl ARG 2 revision ARG 3 slot ARG 4 stack - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11449 getStack ()Lnet/minecraft/class_1799; METHOD method_11450 getSlot ()I METHOD method_11452 getSyncId ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping index 1a93ab06cc..01f4eca067 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping @@ -1,13 +1,10 @@ CLASS net/minecraft/class_7495 net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket FIELD field_39387 description Lnet/minecraft/class_2561; - FIELD field_39920 secureChatEnforced Z FIELD field_42967 favicon Ljava/util/Optional; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_2561;Ljava/util/Optional;Z)V + METHOD (Lnet/minecraft/class_2561;Ljava/util/Optional;)V ARG 1 description ARG 2 favicon - ARG 3 previewsChat METHOD method_44132 getDescription ()Lnet/minecraft/class_2561; - METHOD method_45058 isSecureChatEnforced ()Z METHOD method_49398 getFavicon ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping index 4bb3a8d1ab..6bf7e72e2f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_3943 net/minecraft/network/packet/s2c/play/SetTradeOff ARG 4 experience ARG 5 leveled ARG 6 refreshable - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_17589 getSyncId ()I METHOD method_17590 getOffers ()Lnet/minecraft/class_1916; METHOD method_19458 getLevelProgress ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping index c0db450c0e..ca4cde21a3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8739 net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping index 929cdb6cc5..1b14c63248 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping @@ -1,15 +1,3 @@ CLASS net/minecraft/class_2617 net/minecraft/network/packet/s2c/play/StatisticsS2CPacket - FIELD field_12030 stats Lit/unimi/dsi/fastutil/objects/Object2IntMap; - METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntMap;)V - ARG 1 stats - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_11273 getStats ()Ljava/util/Map; - METHOD method_34087 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_3445;)V - ARG 0 buf - ARG 1 stat - METHOD method_34088 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2540;)Lnet/minecraft/class_3445; - ARG 1 bufx - METHOD method_42066 getOrCreateStat (Lnet/minecraft/class_2540;Lnet/minecraft/class_3448;)Lnet/minecraft/class_3445; - ARG 0 buf - ARG 1 statType + FIELD comp_2197 stats Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD comp_2197 stats ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping index ddacd7b1bb..f5c832575b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping @@ -1,12 +1,3 @@ CLASS net/minecraft/class_2788 net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket FIELD field_12751 recipes Ljava/util/List; - METHOD (Ljava/util/Collection;)V - ARG 1 recipes - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11998 getRecipes ()Ljava/util/List; - METHOD method_17816 writeRecipe (Lnet/minecraft/class_2540;Lnet/minecraft/class_8786;)V - ARG 0 buf - ARG 1 recipe - METHOD method_17817 readRecipe (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8786; - ARG 0 buf diff --git a/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping index 8087393363..b8d849401f 100644 --- a/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2923 net/minecraft/network/packet/s2c/query/PingResultS2CPacket - FIELD field_13280 startTime J + FIELD comp_2201 startTime J METHOD (J)V ARG 1 startTime METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_36180 getStartTime ()J + METHOD comp_2201 startTime ()J diff --git a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping index 0753bd7f8f..9d452f8472 100644 --- a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping @@ -10,5 +10,3 @@ CLASS net/minecraft/class_5744 net/minecraft/particle/AbstractDustParticleEffect ARG 0 reader METHOD method_33119 getColor ()Lorg/joml/Vector3f; METHOD method_33120 getScale ()F - METHOD method_33466 readColor (Lnet/minecraft/class_2540;)Lorg/joml/Vector3f; - ARG 0 buf diff --git a/mappings/net/minecraft/particle/ParticleEffect.mapping b/mappings/net/minecraft/particle/ParticleEffect.mapping index d2d7245b25..d467f12ca1 100644 --- a/mappings/net/minecraft/particle/ParticleEffect.mapping +++ b/mappings/net/minecraft/particle/ParticleEffect.mapping @@ -1,12 +1,7 @@ CLASS net/minecraft/class_2394 net/minecraft/particle/ParticleEffect METHOD method_10293 asString ()Ljava/lang/String; - METHOD method_10294 write (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_10295 getType ()Lnet/minecraft/class_2396; CLASS class_2395 Factory METHOD method_10296 read (Lnet/minecraft/class_2396;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2394; ARG 1 type ARG 2 reader - METHOD method_10297 read (Lnet/minecraft/class_2396;Lnet/minecraft/class_2540;)Lnet/minecraft/class_2394; - ARG 1 type - ARG 2 buf diff --git a/mappings/net/minecraft/particle/ParticleTypes.mapping b/mappings/net/minecraft/particle/ParticleTypes.mapping index fd2696e299..31606fdb44 100644 --- a/mappings/net/minecraft/particle/ParticleTypes.mapping +++ b/mappings/net/minecraft/particle/ParticleTypes.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes METHOD method_10303 register (Ljava/lang/String;Z)Lnet/minecraft/class_2400; ARG 0 name ARG 1 alwaysShow - METHOD method_42022 register (Ljava/lang/String;ZLnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;)Lnet/minecraft/class_2396; + METHOD method_42022 register (Ljava/lang/String;ZLnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_2396; ARG 0 name ARG 1 alwaysShow ARG 2 factory diff --git a/mappings/net/minecraft/particle/VibrationParticleEffect.mapping b/mappings/net/minecraft/particle/VibrationParticleEffect.mapping index eeb7e42d69..b3bd87b8c7 100644 --- a/mappings/net/minecraft/particle/VibrationParticleEffect.mapping +++ b/mappings/net/minecraft/particle/VibrationParticleEffect.mapping @@ -6,11 +6,7 @@ CLASS net/minecraft/class_5745 net/minecraft/particle/VibrationParticleEffect METHOD (Lnet/minecraft/class_5716;I)V ARG 1 destination ARG 2 arrivalInTicks - METHOD method_33124 (Lnet/minecraft/class_5745;)Lnet/minecraft/class_5716; - ARG 0 effect METHOD method_33125 getVibration ()Lnet/minecraft/class_5716; METHOD method_42622 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_42623 (Lnet/minecraft/class_5745;)Ljava/lang/Integer; - ARG 0 effect METHOD method_42624 getArrivalInTicks ()I diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index d8e0f34b27..7fbda05c4a 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -28,10 +28,6 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient ARG 1 entries METHOD method_53725 createCodec (Z)Lcom/mojang/serialization/Codec; ARG 0 allowEmpty - METHOD method_8086 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1856; - ARG 0 buf - METHOD method_8088 write (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_8091 ofItems ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_1856; ARG 0 items METHOD method_8092 ofEntries (Ljava/util/stream/Stream;)Lnet/minecraft/class_1856; diff --git a/mappings/net/minecraft/recipe/RawShapedRecipe.mapping b/mappings/net/minecraft/recipe/RawShapedRecipe.mapping index 407a280beb..deec5ba431 100644 --- a/mappings/net/minecraft/recipe/RawShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/RawShapedRecipe.mapping @@ -41,14 +41,12 @@ CLASS net/minecraft/class_8957 net/minecraft/recipe/RawShapedRecipe METHOD method_55086 create (Ljava/util/Map;[Ljava/lang/String;)Lnet/minecraft/class_8957; ARG 0 key ARG 1 pattern - METHOD method_55087 writeToBuf (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_55088 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1856;)Lnet/minecraft/class_1856; + METHOD method_55087 writeToBuf (Lnet/minecraft/class_9129;)V + METHOD method_55088 (Lnet/minecraft/class_9129;Lnet/minecraft/class_1856;)Lnet/minecraft/class_1856; ARG 1 ingredient METHOD method_55089 findLastSymbol (Ljava/lang/String;)I ARG 0 line - METHOD method_55090 readFromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8957; - ARG 0 buf + METHOD method_55090 readFromBuf (Lnet/minecraft/class_9129;)Lnet/minecraft/class_8957; CLASS class_8958 Data FIELD field_47323 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_47324 PATTERN_CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/recipe/RecipeSerializer.mapping b/mappings/net/minecraft/recipe/RecipeSerializer.mapping index 5b39a28161..5b9a1229aa 100644 --- a/mappings/net/minecraft/recipe/RecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializer.mapping @@ -33,22 +33,3 @@ CLASS net/minecraft/class_1865 net/minecraft/recipe/RecipeSerializer ARG 0 id ARG 1 serializer METHOD method_53736 codec ()Lcom/mojang/serialization/Codec; - METHOD method_8122 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1860; - COMMENT Reads a recipe from a packet byte buf, usually on the client. - COMMENT - COMMENT

This can throw whatever exception the packet byte buf throws. This may be - COMMENT called in the netty event loop than the client game engine thread. - COMMENT - COMMENT @return the read recipe - ARG 1 buf - METHOD method_8124 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_1860;)V - COMMENT Writes a recipe to a packet byte buf, usually on the server. - COMMENT - COMMENT

The recipe's ID is already written into the buf when this is called. - COMMENT - COMMENT

This can throw whatever exception the packet byte buf throws. This may be - COMMENT called in the netty event loop than the server game engine thread. - ARG 1 buf - COMMENT the recipe buf - ARG 2 recipe - COMMENT the recipe diff --git a/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping index 79a9ab251e..3bb034d0b7 100644 --- a/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping +++ b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_7710 net/minecraft/recipe/book/CraftingRecipeCategory FIELD field_40252 CODEC Lcom/mojang/serialization/Codec; FIELD field_40253 id Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V + METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 id diff --git a/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping b/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping index 4602494a45..c953ac255e 100644 --- a/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping +++ b/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping @@ -1,7 +1,2 @@ CLASS net/minecraft/class_9023 net/minecraft/scoreboard/number/NumberFormatType METHOD method_55458 getCodec ()Lcom/mojang/serialization/MapCodec; - METHOD method_55461 toBuf (Lnet/minecraft/class_2540;Lnet/minecraft/class_9022;)V - ARG 1 buf - ARG 2 format - METHOD method_55462 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9022; - ARG 1 buf diff --git a/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping b/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping index 5a4e0b8eb6..75e037de53 100644 --- a/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping +++ b/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping @@ -3,10 +3,5 @@ CLASS net/minecraft/class_9024 net/minecraft/scoreboard/number/NumberFormatTypes FIELD field_47564 CODEC Lcom/mojang/serialization/Codec; METHOD method_55466 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_9023; ARG 0 registry - METHOD method_55467 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9022; - ARG 0 buf - METHOD method_55468 toBuf (Lnet/minecraft/class_2540;Lnet/minecraft/class_9022;)V - ARG 0 buf - ARG 1 format METHOD method_55469 (Lnet/minecraft/class_9023;)Lcom/mojang/serialization/Codec; ARG 0 formatType diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index 046a251a02..68a4d65e1a 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler ARG 1 levelProgress METHOD method_19258 getLevelProgress ()I METHOD method_19259 isLeveled ()Z - METHOD method_20214 autofill (ILnet/minecraft/class_1799;)V + METHOD method_20214 autofill (ILnet/minecraft/class_1799;Z)V ARG 1 slot ARG 2 stack METHOD method_20215 switchTo (I)V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 3b8afd79a3..ea6998daa7 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -30,9 +30,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_24372 saveProperties Lnet/minecraft/class_5219; FIELD field_25132 combinedDynamicRegistries Lnet/minecraft/class_7780; FIELD field_25318 resourceManagerHolder Lnet/minecraft/server/MinecraftServer$class_6897; - FIELD field_33210 START_TICKET_CHUNK_RADIUS I FIELD field_33211 MAX_WORLD_BORDER_RADIUS I - FIELD field_33219 START_TICKET_CHUNKS I FIELD field_33975 recorderResultConsumer Ljava/util/function/Consumer; FIELD field_33976 recorderDumpConsumer Ljava/util/function/Consumer; FIELD field_33977 needsRecorderSetup Z diff --git a/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping b/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping index cde1fd2928..f89c404349 100644 --- a/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping +++ b/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_3953 net/minecraft/server/WorldGenerationProgressTrack FIELD field_17478 radius I FIELD field_17479 size I FIELD field_17480 running Z - METHOD (I)V - ARG 1 radius METHOD method_17676 getChunkStatus (II)Lnet/minecraft/class_2806; ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 5dcf81c6bb..eb5b78498c 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -5,69 +5,28 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22264 executePos (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 variableName - METHOD method_22265 executeClearAll (Lnet/minecraft/class_2168;I)I - ARG 0 source - ARG 1 radius - METHOD method_22266 executeRun (Lnet/minecraft/class_2168;Lnet/minecraft/class_4529;I)I - ARG 0 source - ARG 1 testFunction - ARG 2 rotationSteps - METHOD method_22267 executeRunAll (Lnet/minecraft/class_2168;Ljava/lang/String;II)I - ARG 0 source - ARG 1 testClass - ARG 2 rotationSteps - ARG 3 testsPerRow METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Ljava/lang/String;III)I ARG 0 source ARG 1 testName ARG 2 x ARG 3 y ARG 4 z - METHOD method_22269 run (Lnet/minecraft/class_2168;Ljava/util/Collection;II)V - ARG 0 source - ARG 1 testFunctions - ARG 2 rotationSteps - ARG 3 testsPerRow METHOD method_22270 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_22271 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22272 run (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_4524;Z)V - ARG 0 world - ARG 1 pos - ARG 2 tests - ARG 3 rerunUntilFailed - METHOD method_22274 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;ZLnet/minecraft/class_2338;)V - ARG 3 pos METHOD method_22275 sendMessage (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_124;)V ARG 0 world ARG 1 message ARG 2 formatting METHOD method_22276 (Lnet/minecraft/class_3222;)Z ARG 0 player - METHOD method_22277 executeRunThis (Lnet/minecraft/class_2168;Z)I - ARG 0 source - ARG 1 rerunUntilFailed METHOD method_22278 sendMessage (Lnet/minecraft/class_2168;Ljava/lang/String;)V ARG 0 source ARG 1 message - METHOD method_22279 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22280 onCompletion (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;)V - ARG 0 world - ARG 1 tests - METHOD method_22281 executeRunThese (Lnet/minecraft/class_2168;Z)I - ARG 0 source - ARG 1 rerunUntilFailed METHOD method_22282 executeExport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 testName METHOD method_22283 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_22284 executeRunAll (Lnet/minecraft/class_2168;II)I - ARG 0 source - ARG 1 rotationSteps - ARG 2 testsPerRow METHOD method_22285 executeImport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 testName @@ -81,71 +40,20 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 context METHOD method_22290 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_22291 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22292 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22293 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22294 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22295 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_23647 beforeBatch (Lnet/minecraft/class_4529;Lnet/minecraft/class_3218;)V - ARG 0 testFunction - ARG 1 world METHOD method_23648 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_29411 executeRerunFailed (Lnet/minecraft/class_2168;ZII)I - ARG 0 source - ARG 1 requiredOnly - ARG 2 rotationSteps - ARG 3 testsPerRow - METHOD method_29412 (Lnet/minecraft/class_4517;)V - ARG 0 test - METHOD method_29413 executeExport (Lnet/minecraft/class_2168;)I - ARG 0 source - METHOD method_29414 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29415 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29416 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29417 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29418 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29419 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29420 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29421 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29422 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29423 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_52890 executeExportThese (Lnet/minecraft/class_2168;)I - ARG 0 source - METHOD method_52891 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_54147 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context METHOD method_54850 getStructurePos (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2338; ARG 0 source - METHOD method_54904 checkStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_4517;)Z + METHOD method_54904 checkStructure (Lnet/minecraft/class_3218;Ljava/lang/String;)Z ARG 0 world - ARG 1 state METHOD method_54905 export (Lnet/minecraft/class_2168;Lnet/minecraft/class_2633;)I ARG 0 source ARG 1 blockEntity - METHOD method_55454 executeResetThis (Lnet/minecraft/class_2168;)I - ARG 0 source - METHOD method_55455 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context CLASS class_4528 Listener - FIELD field_20581 world Lnet/minecraft/class_3218; - FIELD field_20582 tests Lnet/minecraft/class_4524; + FIELD comp_2216 world Lnet/minecraft/class_3218; + FIELD comp_2217 tests Lnet/minecraft/class_4524; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;)V ARG 1 world ARG 2 tests + METHOD comp_2216 world ()Lnet/minecraft/class_3218; + METHOD comp_2217 tests ()Lnet/minecraft/class_4524; diff --git a/mappings/net/minecraft/server/network/ConnectedClientData.mapping b/mappings/net/minecraft/server/network/ConnectedClientData.mapping index f022516c89..2b1f165fba 100644 --- a/mappings/net/minecraft/server/network/ConnectedClientData.mapping +++ b/mappings/net/minecraft/server/network/ConnectedClientData.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_8792 net/minecraft/server/network/ConnectedClientData FIELD comp_1961 syncedOptions Lnet/minecraft/class_8791; METHOD comp_1961 syncedOptions ()Lnet/minecraft/class_8791; - METHOD method_53824 createDefault (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_8792; + METHOD method_53824 createDefault (Lcom/mojang/authlib/GameProfile;Z)Lnet/minecraft/class_8792; ARG 0 profile diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 1cda7558b2..9995d97309 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -21,10 +21,9 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_14166 LOGGER Lorg/slf4j/Logger; FIELD field_14167 nonce [B FIELD field_29779 TIMEOUT_TICKS I - FIELD field_45027 UNEXPECTED_QUERY_RESPONSE_TEXT Lnet/minecraft/class_2561; FIELD field_45028 profileName Ljava/lang/String; FIELD field_45029 profile Lcom/mojang/authlib/GameProfile; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Z)V ARG 1 server ARG 2 connection METHOD method_14380 disconnect (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 27b063cd0c..ceb21d69d7 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -263,10 +263,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 4 deltaZ METHOD method_54934 (Lnet/minecraft/class_2960;)Ljava/util/stream/Stream; ARG 1 recipe - METHOD method_55631 isBoxInEntityInteractionRange (Lnet/minecraft/class_238;)Z - ARG 1 box - METHOD method_55632 isPosInBlockInteractionRange (Lnet/minecraft/class_2338;)Z - ARG 1 pos METHOD method_55633 updateCreativeInteractionRangeModifiers ()V METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode diff --git a/mappings/net/minecraft/sound/SoundEvent.mapping b/mappings/net/minecraft/sound/SoundEvent.mapping index 386a488b0c..b22fc9916b 100644 --- a/mappings/net/minecraft/sound/SoundEvent.mapping +++ b/mappings/net/minecraft/sound/SoundEvent.mapping @@ -20,8 +20,4 @@ CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent METHOD method_47956 of (Lnet/minecraft/class_2960;Ljava/util/Optional;)Lnet/minecraft/class_3414; ARG 0 id ARG 1 distanceToTravel - METHOD method_47958 writeBuf (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_47959 getStaticDistanceToTravel ()Ljava/util/Optional; - METHOD method_47961 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_3414; - ARG 0 buf diff --git a/mappings/net/minecraft/test/GameTestBatch.mapping b/mappings/net/minecraft/test/GameTestBatch.mapping index 1631c8ba6b..2744ea1442 100644 --- a/mappings/net/minecraft/test/GameTestBatch.mapping +++ b/mappings/net/minecraft/test/GameTestBatch.mapping @@ -1,17 +1,13 @@ CLASS net/minecraft/class_4514 net/minecraft/test/GameTestBatch - FIELD field_20543 id Ljava/lang/String; - FIELD field_20544 testFunctions Ljava/util/Collection; - FIELD field_20545 beforeBatchConsumer Ljava/util/function/Consumer; - FIELD field_27801 afterBatchConsumer Ljava/util/function/Consumer; + FIELD comp_2209 id Ljava/lang/String; + FIELD comp_2211 beforeBatchConsumer Ljava/util/function/Consumer; + FIELD comp_2212 afterBatchConsumer Ljava/util/function/Consumer; FIELD field_33145 DEFAULT_BATCH Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/util/Collection;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V ARG 1 id ARG 2 testFunctions ARG 3 beforeBatchConsumer ARG 4 afterBatchConsumer - METHOD method_22152 getId ()Ljava/lang/String; - METHOD method_22153 startBatch (Lnet/minecraft/class_3218;)V - ARG 1 world - METHOD method_22154 getTestFunctions ()Ljava/util/Collection; - METHOD method_32237 finishBatch (Lnet/minecraft/class_3218;)V - ARG 1 world + METHOD comp_2209 id ()Ljava/lang/String; + METHOD comp_2211 beforeBatchConsumer ()Ljava/util/function/Consumer; + METHOD comp_2212 afterBatchConsumer ()Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index 240b1cd69b..9f8ec4da92 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -14,24 +14,19 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch; FIELD field_25301 rotation Lnet/minecraft/class_2470; FIELD field_27805 structureBlockEntity Lnet/minecraft/class_2633; - FIELD field_46593 rerunUntilFailed Z FIELD field_47172 initialDelay I FIELD field_47173 initialized Z FIELD field_47174 tickedOnce Z - METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V - ARG 1 testFunction + METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)V ARG 2 rotation ARG 3 world - METHOD method_22165 tick ()V - METHOD method_22166 init (Lnet/minecraft/class_2338;)V - ARG 1 pos + METHOD method_22165 tick (Lnet/minecraft/class_4520;)V + METHOD method_22166 init ()Lnet/minecraft/class_4517; METHOD method_22167 addListener (Lnet/minecraft/class_4518;)V ARG 1 listener METHOD method_22168 fail (Ljava/lang/Throwable;)V ARG 1 throwable METHOD method_22169 getTemplatePath ()Ljava/lang/String; - METHOD method_22171 (Lnet/minecraft/class_4518;)V - ARG 1 listener METHOD method_22172 getPos ()Lnet/minecraft/class_2338; METHOD method_22175 (Lnet/minecraft/class_4518;)V ARG 1 listener @@ -43,7 +38,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_22182 getThrowable ()Ljava/lang/Throwable; METHOD method_22183 isRequired ()Z METHOD method_22184 isOptional ()Z - METHOD method_23634 startCountdown ()V + METHOD method_23634 startCountdown (I)Lnet/minecraft/class_4517; METHOD method_23635 setPos (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_23636 (Lnet/minecraft/class_4693;)V @@ -55,31 +50,23 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_23640 complete ()V METHOD method_29402 getRotation ()Lnet/minecraft/class_2470; METHOD method_29403 getTestFunction ()Lnet/minecraft/class_4529; - METHOD method_32240 clearArea ()V METHOD method_32241 isFlaky ()Z METHOD method_32242 getMaxAttempts ()I METHOD method_32243 getRequiredSuccesses ()I METHOD method_33315 tickTests ()V - METHOD method_33316 (Lnet/minecraft/class_4518;)V - ARG 1 listener METHOD method_36059 getStructureBlockBlockEntity ()Lnet/minecraft/class_2633; METHOD method_36060 runAtTick (JLjava/lang/Runnable;)V ARG 1 tick ARG 3 runnable - METHOD method_36061 getSize ()Lnet/minecraft/class_2382; METHOD method_36062 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_36063 getElapsedMilliseconds ()J METHOD method_36064 completeIfSuccessful ()V METHOD method_36065 getTick ()J METHOD method_36066 createTimedTaskRunner ()Lnet/minecraft/class_4693; METHOD method_36067 getTicksLeft ()I - METHOD method_54145 shouldRerunUntilFailed ()Z - METHOD method_54146 setRerunUntilFailed (Z)V - ARG 1 rerunUntilFailed METHOD method_54434 (Lnet/minecraft/class_1297;)V ARG 0 entity METHOD method_54435 (Lnet/minecraft/class_1297;)Z ARG 0 entity - METHOD method_54843 getStructureBlockPos ()Lnet/minecraft/class_2338; METHOD method_54900 (Lnet/minecraft/class_1923;)Z ARG 1 chunkPos diff --git a/mappings/net/minecraft/test/StructureTestListener.mapping b/mappings/net/minecraft/test/StructureTestListener.mapping index 38b5ba25e5..ef509440c8 100644 --- a/mappings/net/minecraft/test/StructureTestListener.mapping +++ b/mappings/net/minecraft/test/StructureTestListener.mapping @@ -1,14 +1,6 @@ CLASS net/minecraft/class_5624 net/minecraft/test/StructureTestListener FIELD field_27808 attempt I FIELD field_27809 successes I - FIELD field_27810 test Lnet/minecraft/class_4517; - FIELD field_27811 testManager Lnet/minecraft/class_4521; - FIELD field_27812 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_4517;Lnet/minecraft/class_4521;Lnet/minecraft/class_2338;)V - ARG 1 test - ARG 2 testManager - ARG 3 pos - METHOD method_32246 init ()V METHOD method_32247 addGameTestMarker (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/lang/String;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 4e7e939fe8..289d99e87a 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -39,14 +39,14 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 3 world METHOD method_22254 (ILnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 2 pos - METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_2338; + METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Optional; ARG 0 pos ARG 1 radius ARG 2 world METHOD method_22256 forceLoadNearbyChunks (Lnet/minecraft/class_3341;Lnet/minecraft/class_3218;)V ARG 0 box ARG 1 world - METHOD method_22258 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Collection; + METHOD method_22258 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/stream/Stream; ARG 0 pos ARG 1 radius ARG 2 world @@ -64,8 +64,6 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 structureBlockEntity METHOD method_36105 getRotationSteps (Lnet/minecraft/class_2470;)I ARG 0 rotation - METHOD method_54845 (Lnet/minecraft/class_3218;Ljava/util/Collection;Lnet/minecraft/class_2338;)V - ARG 2 blockPos METHOD method_54847 getStructureBlockBoxCornerPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; ARG 0 pos ARG 1 size diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping index c6e37b12c0..d9e2e887a3 100644 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ b/mappings/net/minecraft/test/TestFunction.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction - FIELD field_20583 batchId Ljava/lang/String; - FIELD field_20584 templatePath Ljava/lang/String; - FIELD field_20585 templateName Ljava/lang/String; - FIELD field_20586 required Z - FIELD field_20587 starter Ljava/util/function/Consumer; - FIELD field_20588 tickLimit I - FIELD field_21460 duration J - FIELD field_25306 rotation Lnet/minecraft/class_2470; - FIELD field_27814 maxAttempts I - FIELD field_27815 requiredSuccesses I + FIELD comp_2218 batchId Ljava/lang/String; + FIELD comp_2219 templatePath Ljava/lang/String; + FIELD comp_2220 templateName Ljava/lang/String; + FIELD comp_2221 rotation Lnet/minecraft/class_2470; + FIELD comp_2222 tickLimit I + FIELD comp_2223 duration J + FIELD comp_2224 required Z + FIELD comp_2225 maxAttempts I + FIELD comp_2226 requiredSuccesses I + FIELD comp_2227 starter Ljava/util/function/Consumer; METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IJZLjava/util/function/Consumer;)V ARG 1 batchId ARG 2 templatePath @@ -37,15 +37,16 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction ARG 6 duration ARG 8 required ARG 9 starter - METHOD method_22296 getTemplatePath ()Ljava/lang/String; + METHOD comp_2218 batchId ()Ljava/lang/String; + METHOD comp_2219 templatePath ()Ljava/lang/String; + METHOD comp_2220 templateName ()Ljava/lang/String; + METHOD comp_2221 rotation ()Lnet/minecraft/class_2470; + METHOD comp_2222 tickLimit ()I + METHOD comp_2223 duration ()J + METHOD comp_2224 required ()Z + METHOD comp_2225 maxAttempts ()I + METHOD comp_2226 requiredSuccesses ()I + METHOD comp_2227 starter ()Ljava/util/function/Consumer; METHOD method_22297 start (Lnet/minecraft/class_4516;)V ARG 1 context - METHOD method_22298 getTemplateName ()Ljava/lang/String; - METHOD method_22299 getTickLimit ()I - METHOD method_22300 isRequired ()Z - METHOD method_22301 getBatchId ()Ljava/lang/String; - METHOD method_23649 getDuration ()J - METHOD method_29424 getRotation ()Lnet/minecraft/class_2470; METHOD method_32257 isFlaky ()Z - METHOD method_32258 getMaxAttempts ()I - METHOD method_32259 getRequiredSuccesses ()I diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping index 4978ddd47c..c7587d7f25 100644 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ b/mappings/net/minecraft/test/TestFunctions.mapping @@ -2,13 +2,13 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions FIELD field_20570 TEST_FUNCTIONS Ljava/util/Collection; FIELD field_20571 TEST_CLASSES Ljava/util/Set; FIELD field_20572 BEFORE_BATCH_CONSUMERS Ljava/util/Map; - FIELD field_25302 FAILED_TEST_FUNCTIONS Ljava/util/Collection; + FIELD field_25302 FAILED_TEST_FUNCTIONS Ljava/util/Set; FIELD field_27806 AFTER_BATCH_CONSUMERS Ljava/util/Map; METHOD method_22191 getTestFunctions ()Ljava/util/Collection; METHOD method_22192 isInClass (Lnet/minecraft/class_4529;Ljava/lang/String;)Z ARG 0 testFunction ARG 1 testClass - METHOD method_22193 getTestFunctions (Ljava/lang/String;)Ljava/util/Collection; + METHOD method_22193 getTestFunctions (Ljava/lang/String;)Ljava/util/stream/Stream; ARG 0 testClass METHOD method_22194 (Ljava/lang/String;Lnet/minecraft/class_4529;)Z ARG 1 testFunction @@ -25,7 +25,7 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions ARG 0 structurePath METHOD method_29404 addFailedTestFunction (Lnet/minecraft/class_4529;)V ARG 0 testFunction - METHOD method_29405 getFailedTestFunctions ()Ljava/util/Collection; + METHOD method_29405 getFailedTestFunctions ()Ljava/util/stream/Stream; METHOD method_29406 clearFailedTestFunctions ()V METHOD method_32244 getAfterBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; ARG 0 batchId diff --git a/mappings/net/minecraft/test/TestListener.mapping b/mappings/net/minecraft/test/TestListener.mapping index a6a4261207..91e9096eb3 100644 --- a/mappings/net/minecraft/test/TestListener.mapping +++ b/mappings/net/minecraft/test/TestListener.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4518 net/minecraft/test/TestListener METHOD method_22188 onStarted (Lnet/minecraft/class_4517;)V ARG 1 test - METHOD method_22190 onFailed (Lnet/minecraft/class_4517;)V + METHOD method_22190 onFailed (Lnet/minecraft/class_4517;Lnet/minecraft/class_4520;)V ARG 1 test - METHOD method_33317 onPassed (Lnet/minecraft/class_4517;)V + METHOD method_33317 onPassed (Lnet/minecraft/class_4517;Lnet/minecraft/class_4520;)V ARG 1 test diff --git a/mappings/net/minecraft/test/TestRunner.mapping b/mappings/net/minecraft/test/TestRunner.mapping deleted file mode 100644 index 14f33e883d..0000000000 --- a/mappings/net/minecraft/test/TestRunner.mapping +++ /dev/null @@ -1,36 +0,0 @@ -CLASS net/minecraft/class_4515 net/minecraft/test/TestRunner - FIELD field_20546 LOGGER Lorg/slf4j/Logger; - FIELD field_20547 batches Ljava/util/List; - FIELD field_20548 pos Lnet/minecraft/class_2338; - FIELD field_20549 world Lnet/minecraft/class_3218; - FIELD field_20550 testManager Lnet/minecraft/class_4521; - FIELD field_20551 tests Ljava/util/List; - FIELD field_20555 reusablePos Lnet/minecraft/class_2338$class_2339; - FIELD field_20556 sizeZ I - FIELD field_46071 testCount I - FIELD field_46072 rowBoundingBox Lnet/minecraft/class_238; - METHOD (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)V - ARG 1 batches - ARG 2 pos - ARG 3 rotation - ARG 4 world - ARG 5 testManager - ARG 6 sizeZ - METHOD method_22155 getTests ()Ljava/util/List; - METHOD method_22156 runBatch (I)V - ARG 1 index - METHOD method_22160 run ()V - METHOD method_22164 (Ljava/util/Map;Lnet/minecraft/class_4517;)V - ARG 2 gameTest - METHOD method_29401 alignTestStructures (Ljava/util/Collection;)Ljava/util/Map; - ARG 1 gameTests - METHOD method_33312 (Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4514;)Lcom/mojang/datafixers/util/Pair; - ARG 2 batch - METHOD method_33313 (Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517; - ARG 2 testFunction - METHOD method_33314 (Lcom/mojang/datafixers/util/Pair;)Ljava/util/stream/Stream; - ARG 0 batch - CLASS 1 - METHOD method_32239 onFinished ()V - METHOD method_54842 (J)V - ARG 1 chunkPos diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 87e945655d..0fe44922b3 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer ARG 2 session ARG 3 dataPackManager ARG 4 saveLoader - ARG 5 batches ARG 6 pos METHOD method_36094 (Lnet/minecraft/class_1928;)V ARG 0 gameRules diff --git a/mappings/net/minecraft/test/TestUtil.mapping b/mappings/net/minecraft/test/TestUtil.mapping index 8fd101049c..e1c74f0755 100644 --- a/mappings/net/minecraft/test/TestUtil.mapping +++ b/mappings/net/minecraft/test/TestUtil.mapping @@ -1,37 +1,3 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil - FIELD field_33152 MAX_BATCH_SIZE I - METHOD method_22203 startTest (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_4521;)V - ARG 0 test - ARG 1 pos - ARG 2 testManager - METHOD method_22209 createBatches (Ljava/util/Collection;)Ljava/util/Collection; - ARG 0 testFunctions - METHOD method_22210 runTestBatches (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)Ljava/util/Collection; - ARG 0 batches - ARG 1 pos - ARG 2 rotation - ARG 3 world - ARG 4 testManager - ARG 5 sizeZ METHOD method_22213 clearDebugMarkers (Lnet/minecraft/class_3218;)V ARG 0 world - METHOD method_22215 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 1 posx - METHOD method_22216 clearTests (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_4521;I)V - ARG 0 world - ARG 1 pos - ARG 2 testManager - ARG 3 radius - METHOD method_22222 runTestFunctions (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)Ljava/util/Collection; - ARG 0 testFunctions - ARG 1 pos - ARG 2 rotation - ARG 3 world - ARG 4 testManager - ARG 5 sizeZ - METHOD method_22223 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 1 posx - METHOD method_23641 (Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/function/Consumer;Ljava/util/function/Consumer;Ljava/util/List;)Lnet/minecraft/class_4514; - ARG 4 testFunctionsx - METHOD method_33318 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; - ARG 0 entry diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9092.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9092.mapping new file mode 100644 index 0000000000..f85126a159 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9092.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9092 net/minecraft/unused/packageinfo/PackageInfo9092 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9101.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9101.mapping new file mode 100644 index 0000000000..c28e03e576 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9101.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9101 net/minecraft/unused/packageinfo/PackageInfo9101 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9144.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9144.mapping new file mode 100644 index 0000000000..ed14e47f78 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9144.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9144 net/minecraft/unused/packageinfo/PackageInfo9144 diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index d2c4359401..f129d4f5e3 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -214,40 +214,11 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos ARG 2 queuedPos METHOD method_51686 streamSouthEastSquare (Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; ARG 0 pos - CLASS 1 - FIELD field_23945 pos Lnet/minecraft/class_2338$class_2339; - FIELD field_23946 remaining I CLASS 2 - FIELD field_23094 maxDistance I - FIELD field_23095 rangeX I - FIELD field_23096 rangeY I - FIELD field_23097 rangeZ I - FIELD field_23099 manhattanDistance I - FIELD field_23100 limitX I - FIELD field_23101 limitY I - FIELD field_23102 dx I - FIELD field_23103 dy I - FIELD field_23378 pos Lnet/minecraft/class_2338$class_2339; - FIELD field_23379 swapZ Z CLASS 3 - FIELD field_23105 size I - FIELD field_23106 sizeX I - FIELD field_23107 sizeY I - FIELD field_23108 startX I - FIELD field_23109 startY I - FIELD field_23110 startZ I - FIELD field_23111 index I FIELD field_23380 pos Lnet/minecraft/class_2338$class_2339; CLASS 4 - FIELD field_25903 directions [Lnet/minecraft/class_2350; - FIELD field_25904 pos Lnet/minecraft/class_2338$class_2339; - FIELD field_25905 maxDirectionChanges I - FIELD field_25906 directionChangeCount I - FIELD field_25907 maxSteps I - FIELD field_25908 steps I - FIELD field_25909 currentX I - FIELD field_25910 currentY I - FIELD field_25911 currentZ I + CLASS 5 CLASS class_2339 Mutable METHOD (DDD)V ARG 1 x diff --git a/mappings/net/minecraft/util/math/GlobalPos.mapping b/mappings/net/minecraft/util/math/GlobalPos.mapping index 39cddf41a8..c0787de44c 100644 --- a/mappings/net/minecraft/util/math/GlobalPos.mapping +++ b/mappings/net/minecraft/util/math/GlobalPos.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_4208 net/minecraft/util/math/GlobalPos - FIELD field_18790 dimension Lnet/minecraft/class_5321; - FIELD field_18791 pos Lnet/minecraft/class_2338; + FIELD comp_2207 dimension Lnet/minecraft/class_5321; + FIELD comp_2208 pos Lnet/minecraft/class_2338; FIELD field_25066 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)V ARG 1 dimension ARG 2 pos + METHOD comp_2207 dimension ()Lnet/minecraft/class_5321; + METHOD comp_2208 pos ()Lnet/minecraft/class_2338; METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_19442 getDimension ()Lnet/minecraft/class_5321; METHOD method_19443 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)Lnet/minecraft/class_4208; ARG 0 dimension ARG 1 pos - METHOD method_19446 getPos ()Lnet/minecraft/class_2338; METHOD method_29096 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping index 0965e9538a..9c6de23f78 100644 --- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping @@ -10,14 +10,12 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler ARG 1 chunkPos ARG 2 world ARG 3 targetStatus - METHOD method_38656 onPacketReceived (Lnet/minecraft/class_2539;ILjava/net/SocketAddress;I)V + METHOD method_38656 onPacketReceived (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V ARG 1 state - ARG 2 packetId ARG 3 remoteAddress ARG 4 bytes - METHOD method_38657 onPacketSent (Lnet/minecraft/class_2539;ILjava/net/SocketAddress;I)V + METHOD method_38657 onPacketSent (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V ARG 1 state - ARG 2 packetId ARG 3 remoteAddress ARG 4 bytes METHOD method_38658 isAvailable ()Z diff --git a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping index 6cc1b19d78..c53652d4f2 100644 --- a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_6509 net/minecraft/util/profiling/jfr/event/PacketEvent - METHOD (Ljava/lang/String;ILjava/net/SocketAddress;I)V + METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/SocketAddress;I)V ARG 1 protocolId - ARG 2 packetId - ARG 3 remoteAddress - ARG 4 bytes CLASS class_6510 Names FIELD field_34419 REMOTE_ADDRESS Ljava/lang/String; FIELD field_34421 BYTES Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping index cfea703f36..03575183b4 100644 --- a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping @@ -15,12 +15,7 @@ CLASS net/minecraft/class_6767 net/minecraft/util/profiling/jfr/sample/NetworkIo METHOD method_39444 add (Lnet/minecraft/class_6767$class_6768;)Lnet/minecraft/class_6767$class_6768; ARG 1 statistics CLASS class_6769 Packet - FIELD comp_259 side Lnet/minecraft/class_2598; - FIELD field_35587 PACKET_TO_NAME Ljava/util/Map; - METHOD comp_259 side ()Lnet/minecraft/class_2598; - METHOD method_39445 getName ()Ljava/lang/String; - METHOD method_39446 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2598;Lnet/minecraft/class_2539;Ljava/lang/Integer;Ljava/lang/Class;)V - ARG 3 packetId - ARG 4 clazz + FIELD comp_259 side Ljava/lang/String; + METHOD comp_259 side ()Ljava/lang/String; METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6767$class_6769; ARG 0 event diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index c2339c45ed..c75634601a 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 4 maxUses ARG 5 merchantExperience ARG 6 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIF)V + METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFI)V ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 sellItem @@ -30,7 +30,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 5 maxUses ARG 6 merchantExperience ARG 7 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFI)V + METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFIZ)V ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 sellItem @@ -44,14 +44,10 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - ARG 1 first - ARG 2 second METHOD method_16953 depleteBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 firstBuyStack ARG 2 secondBuyStack - METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - ARG 1 given - ARG 2 sample + METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Z)Z METHOD method_18019 copySellItem ()Lnet/minecraft/class_1799; COMMENT Returns a copy of the sell item of this trade offer. METHOD method_19272 getAdjustedFirstBuyItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping index be7b00dc52..31577edd2b 100644 --- a/mappings/net/minecraft/village/TradeOfferList.mapping +++ b/mappings/net/minecraft/village/TradeOfferList.mapping @@ -3,18 +3,9 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList ARG 1 size METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt - METHOD method_43715 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1914;)V - ARG 0 buf2 - ARG 1 offer - METHOD method_43716 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1914; - ARG 0 buf2 METHOD method_53882 copy ()Lnet/minecraft/class_1916; - METHOD method_8265 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1916; - ARG 0 buf METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914; ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 index METHOD method_8268 toNbt ()Lnet/minecraft/class_2487; - METHOD method_8270 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index c9fd8c500b..c3dd169d28 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -149,7 +149,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers 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 + METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIFZ)V ARG 1 item ARG 2 count ARG 3 price @@ -158,7 +158,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 6 maxUses ARG 7 experience ARG 8 multiplier - METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1799;IIIF)V + METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1799;IIIFZ)V ARG 1 item ARG 2 count ARG 3 price diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 2f23cbbfa3..f301d8645e 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -158,7 +158,6 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules COMMENT Validates that an input is valid for this rule, and sets the rule's value if successful. COMMENT COMMENT @return whether the input is valid - ARG 1 input METHOD method_35236 set (ILnet/minecraft/server/MinecraftServer;)V ARG 1 value ARG 2 server diff --git a/mappings/net/minecraft/world/MutableWorldProperties.mapping b/mappings/net/minecraft/world/MutableWorldProperties.mapping index 64f546e52a..50939d0acf 100644 --- a/mappings/net/minecraft/world/MutableWorldProperties.mapping +++ b/mappings/net/minecraft/world/MutableWorldProperties.mapping @@ -2,11 +2,3 @@ CLASS net/minecraft/class_5269 net/minecraft/world/MutableWorldProperties METHOD method_187 setSpawnPos (Lnet/minecraft/class_2338;F)V ARG 1 pos ARG 2 angle - METHOD method_27416 setSpawnX (I)V - ARG 1 spawnX - METHOD method_27417 setSpawnY (I)V - ARG 1 spawnY - METHOD method_27419 setSpawnZ (I)V - ARG 1 spawnZ - METHOD method_30657 setSpawnAngle (F)V - ARG 1 spawnAngle diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 69a2e2d638..4bdb74f060 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -193,7 +193,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 5 power ARG 6 createFire ARG 7 explosionSourceType - METHOD method_46668 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;ZLnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1927; + METHOD method_46668 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;ZLnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1927; ARG 1 entity ARG 2 damageSource ARG 3 behavior @@ -206,7 +206,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 13 particles ARG 14 particle ARG 15 emitterParticle - ARG 16 soundEvent METHOD method_46669 getDestructionType (Lnet/minecraft/class_1928$class_4313;)Lnet/minecraft/class_1927$class_4179; ARG 1 gameRuleKey METHOD method_47574 collectEntitiesByType (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Predicate;Ljava/util/List;)V @@ -325,7 +324,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT @see #updateNeighborsExcept(BlockPos, Block, Direction) ARG 1 pos ARG 2 sourceBlock - METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1927; + METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1927; COMMENT Creates an explosion. ARG 1 entity COMMENT the entity that exploded (like TNT) or {@code null} to indicate no entity exploded @@ -343,7 +342,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 12 explosionSourceType ARG 13 particle ARG 14 emitterParticle - ARG 15 soundEvent METHOD method_8455 updateComparators (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos ARG 2 block diff --git a/mappings/net/minecraft/world/WorldProperties.mapping b/mappings/net/minecraft/world/WorldProperties.mapping index e9e0e97c6c..d17d8120df 100644 --- a/mappings/net/minecraft/world/WorldProperties.mapping +++ b/mappings/net/minecraft/world/WorldProperties.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_5217 net/minecraft/world/WorldProperties - METHOD method_144 getSpawnY ()I METHOD method_146 getGameRules ()Lnet/minecraft/class_1928; METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;Lnet/minecraft/class_5539;)V ARG 1 reportSection @@ -8,11 +7,9 @@ CLASS net/minecraft/class_5217 net/minecraft/world/WorldProperties METHOD method_156 isRaining ()Z METHOD method_157 setRaining (Z)V ARG 1 raining - METHOD method_166 getSpawnZ ()I METHOD method_188 getTime ()J METHOD method_197 isDifficultyLocked ()Z METHOD method_203 isThundering ()Z METHOD method_207 getDifficulty ()Lnet/minecraft/class_1267; - METHOD method_215 getSpawnX ()I METHOD method_217 getTimeOfDay ()J METHOD method_30656 getSpawnAngle ()F diff --git a/mappings/net/minecraft/world/event/PositionSourceType.mapping b/mappings/net/minecraft/world/event/PositionSourceType.mapping index a6b98f46eb..93b58968d2 100644 --- a/mappings/net/minecraft/world/event/PositionSourceType.mapping +++ b/mappings/net/minecraft/world/event/PositionSourceType.mapping @@ -1,15 +1,5 @@ CLASS net/minecraft/class_5717 net/minecraft/world/event/PositionSourceType METHOD method_32957 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_32958 write (Lnet/minecraft/class_5716;Lnet/minecraft/class_2540;)V - ARG 0 positionSource - ARG 1 buf METHOD method_32959 register (Ljava/lang/String;Lnet/minecraft/class_5717;)Lnet/minecraft/class_5717; ARG 0 id ARG 1 positionSourceType - METHOD method_32960 writeToBuf (Lnet/minecraft/class_2540;Lnet/minecraft/class_5716;)V - ARG 1 buf - ARG 2 positionSource - METHOD method_32962 readFromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5716; - ARG 1 buf - METHOD method_32963 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5716; - ARG 0 buf diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index b848d0d99e..ac8ebba8ac 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion FIELD field_25818 DEFAULT_BEHAVIOR Lnet/minecraft/class_5362; FIELD field_47328 particle Lnet/minecraft/class_2394; FIELD field_47329 emitterParticle Lnet/minecraft/class_2394; - FIELD field_47330 soundEvent Lnet/minecraft/class_3414; + FIELD field_47330 soundEvent Lnet/minecraft/class_6880; FIELD field_9184 destructionType Lnet/minecraft/class_1927$class_4179; FIELD field_9185 entity Lnet/minecraft/class_1297; FIELD field_9186 createFire Z @@ -16,7 +16,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion FIELD field_9193 damageSource Lnet/minecraft/class_1282; FIELD field_9194 affectedPlayers Ljava/util/Map; FIELD field_9195 x D - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFLjava/util/List;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFLjava/util/List;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)V ARG 1 world ARG 2 entity ARG 3 x @@ -27,7 +27,6 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 11 destructionType ARG 12 particle ARG 13 emitterParticle - ARG 14 soundEvent METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFZLnet/minecraft/class_1927$class_4179;)V ARG 1 world ARG 2 entity @@ -47,7 +46,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 10 createFire ARG 11 destructionType ARG 12 affectedBlocks - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)V ARG 1 world ARG 2 entity ARG 3 damageSource @@ -60,7 +59,6 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 13 destructionType ARG 14 particle ARG 15 emitterParticle - ARG 16 soundEvent METHOD method_17752 getExposure (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)F ARG 0 source ARG 1 entity @@ -85,7 +83,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion METHOD method_55111 getDestructionType ()Lnet/minecraft/class_1927$class_4179; METHOD method_55112 getParticle ()Lnet/minecraft/class_2394; METHOD method_55113 getEmitterParticle ()Lnet/minecraft/class_2394; - METHOD method_55114 getSoundEvent ()Lnet/minecraft/class_3414; + METHOD method_55114 getSoundEvent ()Lnet/minecraft/class_6880; METHOD method_8346 getAffectedBlocks ()Ljava/util/List; METHOD method_8347 getCausingEntity ()Lnet/minecraft/class_1309; METHOD method_8348 collectBlocksAndDamageEntities ()V diff --git a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping index fc96ae350a..312700ea71 100644 --- a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping @@ -13,9 +13,3 @@ CLASS net/minecraft/class_2978 net/minecraft/world/gen/feature/CoralFeature ARG 2 block METHOD method_40030 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 3 block - METHOD method_40160 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks - METHOD method_40161 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks - METHOD method_40162 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 7ec28818a1..6c01d82745 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties - FIELD field_151 spawnX I FIELD field_156 customBossEvents Lnet/minecraft/class_2487; FIELD field_157 difficultyLocked Z FIELD field_158 version I - FIELD field_167 spawnY I FIELD field_168 thundering Z FIELD field_170 playerData Lnet/minecraft/class_2487; FIELD field_173 thunderTime I @@ -11,7 +9,6 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_17736 wanderingTraderSpawnDelay I FIELD field_17737 wanderingTraderSpawnChance I FIELD field_17738 wanderingTraderId Ljava/util/UUID; - FIELD field_182 spawnZ I FIELD field_185 initialized Z FIELD field_189 time J FIELD field_190 raining Z @@ -37,36 +34,9 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties ARG 2 generatorOptions ARG 3 specialProperty ARG 4 lifecycle - METHOD (Lnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V + METHOD (Lnet/minecraft/class_2487;ZLnet/minecraft/class_2338;FJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V ARG 1 playerData ARG 2 modded - ARG 3 spawnX - ARG 4 spawnY - ARG 5 spawnZ - ARG 6 spawnAngle - ARG 7 time - ARG 9 timeOfDay - ARG 11 version - ARG 12 clearWeatherTime - ARG 13 rainTime - ARG 14 raining - ARG 15 thunderTime - ARG 16 thundering - ARG 17 initialized - ARG 18 difficultyLocked - ARG 19 worldBorder - ARG 20 wanderingTraderSpawnDelay - ARG 21 wanderingTraderSpawnChance - ARG 22 wanderingTraderId - ARG 23 serverBrands - ARG 24 removedFeatures - ARG 25 scheduledEvents - ARG 26 customBossEvents - ARG 27 dragonFight - ARG 28 levelInfo - ARG 29 generatorOptions - ARG 30 specialProperty - ARG 31 lifecycle METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V ARG 1 registryManager ARG 2 levelNbt From ef3371726703715cff6d28ccfb7a576184686c04 Mon Sep 17 00:00:00 2001 From: Matias Koivikko Date: Wed, 17 Jan 2024 21:51:34 +0200 Subject: [PATCH 07/47] Map packet codecs (24w03a) (#3762) * Begin work on packet codecs * Recipe packet codecs * misc packet codec & *packet* packet codecs * more misc packet codecs * fix typos --- .../minecraft/advancement/Advancement.mapping | 3 + .../advancement/AdvancementDisplay.mapping | 1 + .../advancement/AdvancementEntry.mapping | 2 + .../net/minecraft/entity/EntityPose.mapping | 6 ++ .../entity/data/TrackedDataHandler.mapping | 2 + .../data/TrackedDataHandlerRegistry.mapping | 2 + .../entity/passive/ArmadilloEntity.mapping | 5 ++ .../entity/passive/SnifferEntity.mapping | 6 ++ mappings/net/minecraft/item/ItemStack.mapping | 4 ++ .../minecraft/network/PacketByteBuf.mapping | 24 +++++++ .../network/codec/PacketCodec.mapping | 41 +++++++++++ .../network/codec/PacketCodecs.mapping | 70 +++++++++++++++++++ .../network/codec/PacketDecoder.mapping | 3 + .../network/codec/PacketEncoder.mapping | 4 ++ .../network/codec/RegistryByteBuf.mapping | 10 +++ .../network/codec/ValueFirstEncoder.mapping | 4 ++ .../network/packet/CustomPayload.mapping | 23 ++++++ .../minecraft/network/packet/Packet.mapping | 3 + .../c2s/common/ClientOptionsC2SPacket.mapping | 2 + .../c2s/common/CommonPongC2SPacket.mapping | 2 + .../c2s/common/KeepAliveC2SPacket.mapping | 2 + .../ResourcePackStatusC2SPacket.mapping | 2 + .../packet/c2s/config/ReadyC2SPacket.mapping | 2 + .../c2s/handshake/HandshakeC2SPacket.mapping | 2 + .../login/EnterConfigurationC2SPacket.mapping | 2 + .../c2s/login/LoginHelloC2SPacket.mapping | 2 + .../c2s/login/LoginKeyC2SPacket.mapping | 2 + .../login/LoginQueryResponseC2SPacket.mapping | 1 + .../play/AcknowledgeChunksC2SPacket.mapping | 2 + ...cknowledgeReconfigurationC2SPacket.mapping | 2 + .../c2s/play/AdvancementTabC2SPacket.mapping | 2 + .../c2s/play/BoatPaddleStateC2SPacket.mapping | 2 + .../c2s/play/BookUpdateC2SPacket.mapping | 2 + .../c2s/play/ButtonClickC2SPacket.mapping | 2 + .../c2s/play/ChatMessageC2SPacket.mapping | 2 + .../c2s/play/ClickSlotC2SPacket.mapping | 3 + .../c2s/play/ClientCommandC2SPacket.mapping | 2 + .../c2s/play/ClientStatusC2SPacket.mapping | 2 + .../play/CloseHandledScreenC2SPacket.mapping | 2 + .../play/CommandExecutionC2SPacket.mapping | 2 + .../c2s/play/CraftRequestC2SPacket.mapping | 2 + .../CreativeInventoryActionC2SPacket.mapping | 2 + .../c2s/play/HandSwingC2SPacket.mapping | 2 + .../play/JigsawGeneratingC2SPacket.mapping | 2 + .../MessageAcknowledgmentC2SPacket.mapping | 2 + .../play/PickFromInventoryC2SPacket.mapping | 2 + .../c2s/play/PlayerActionC2SPacket.mapping | 2 + .../c2s/play/PlayerInputC2SPacket.mapping | 2 + .../play/PlayerInteractBlockC2SPacket.mapping | 2 + .../PlayerInteractEntityC2SPacket.mapping | 2 + .../play/PlayerInteractItemC2SPacket.mapping | 2 + .../c2s/play/PlayerMoveC2SPacket.mapping | 8 +++ .../c2s/play/PlayerSessionC2SPacket.mapping | 2 + .../c2s/play/QueryBlockNbtC2SPacket.mapping | 2 + .../c2s/play/QueryEntityNbtC2SPacket.mapping | 2 + .../c2s/play/RecipeBookDataC2SPacket.mapping | 2 + .../RecipeCategoryOptionsC2SPacket.mapping | 2 + .../c2s/play/RenameItemC2SPacket.mapping | 2 + ...RequestCommandCompletionsC2SPacket.mapping | 2 + .../play/SelectMerchantTradeC2SPacket.mapping | 2 + .../play/SlotChangedStateC2SPacket.mapping | 2 + .../play/SpectatorTeleportC2SPacket.mapping | 2 + .../c2s/play/TeleportConfirmC2SPacket.mapping | 2 + .../c2s/play/UpdateBeaconC2SPacket.mapping | 1 + .../play/UpdateCommandBlockC2SPacket.mapping | 2 + ...pdateCommandBlockMinecartC2SPacket.mapping | 2 + .../play/UpdateDifficultyC2SPacket.mapping | 2 + .../UpdateDifficultyLockC2SPacket.mapping | 2 + .../c2s/play/UpdateJigsawC2SPacket.mapping | 2 + .../UpdatePlayerAbilitiesC2SPacket.mapping | 2 + .../play/UpdateSelectedSlotC2SPacket.mapping | 2 + .../c2s/play/UpdateSignC2SPacket.mapping | 2 + .../UpdateStructureBlockC2SPacket.mapping | 2 + .../c2s/play/VehicleMoveC2SPacket.mapping | 2 + .../c2s/query/QueryPingC2SPacket.mapping | 2 + .../c2s/query/QueryRequestC2SPacket.mapping | 2 + .../s2c/common/CommonPingS2CPacket.mapping | 2 + .../s2c/common/DisconnectS2CPacket.mapping | 2 + .../s2c/common/KeepAliveS2CPacket.mapping | 2 + .../ResourcePackRemoveS2CPacket.mapping | 3 + .../common/ResourcePackSendS2CPacket.mapping | 2 + .../common/SynchronizeTagsS2CPacket.mapping | 2 + .../config/DynamicRegistriesS2CPacket.mapping | 2 + .../s2c/config/FeaturesS2CPacket.mapping | 2 + .../packet/s2c/config/ReadyS2CPacket.mapping | 2 + ...bugGameEventListenersCustomPayload.mapping | 2 + .../login/LoginCompressionS2CPacket.mapping | 2 + .../login/LoginDisconnectS2CPacket.mapping | 2 + .../s2c/login/LoginHelloS2CPacket.mapping | 2 + .../login/LoginQueryRequestS2CPacket.mapping | 2 + .../s2c/login/LoginSuccessS2CPacket.mapping | 2 + .../play/AdvancementUpdateS2CPacket.mapping | 2 + .../BlockBreakingProgressS2CPacket.mapping | 2 + .../play/BlockEntityUpdateS2CPacket.mapping | 1 + .../s2c/play/BlockEventS2CPacket.mapping | 2 + .../s2c/play/BlockUpdateS2CPacket.mapping | 1 + .../packet/s2c/play/BossBarS2CPacket.mapping | 2 + .../s2c/play/ChatMessageS2CPacket.mapping | 2 + .../s2c/play/ChatSuggestionsS2CPacket.mapping | 2 + .../s2c/play/ChunkBiomeDataS2CPacket.mapping | 2 + .../network/packet/s2c/play/ChunkData.mapping | 6 ++ .../play/ChunkDeltaUpdateS2CPacket.mapping | 2 + .../play/ChunkLoadDistanceS2CPacket.mapping | 2 + ...ChunkRenderDistanceCenterS2CPacket.mapping | 2 + .../s2c/play/ChunkSentS2CPacket.mapping | 2 + .../s2c/play/ClearTitleS2CPacket.mapping | 2 + .../s2c/play/CloseScreenS2CPacket.mapping | 2 + .../play/CommandSuggestionsS2CPacket.mapping | 2 + .../s2c/play/CommandTreeS2CPacket.mapping | 2 + .../s2c/play/CooldownUpdateS2CPacket.mapping | 1 + .../play/CraftFailedResponseS2CPacket.mapping | 2 + .../s2c/play/DamageTiltS2CPacket.mapping | 2 + .../s2c/play/DeathMessageS2CPacket.mapping | 2 + .../s2c/play/DifficultyS2CPacket.mapping | 2 + .../s2c/play/EndCombatS2CPacket.mapping | 2 + .../s2c/play/EnterCombatS2CPacket.mapping | 2 + .../EnterReconfigurationS2CPacket.mapping | 2 + .../s2c/play/EntitiesDestroyS2CPacket.mapping | 2 + .../s2c/play/EntityAnimationS2CPacket.mapping | 2 + .../s2c/play/EntityAttachS2CPacket.mapping | 2 + .../play/EntityAttributesS2CPacket.mapping | 6 ++ .../s2c/play/EntityDamageS2CPacket.mapping | 2 + .../EntityEquipmentUpdateS2CPacket.mapping | 2 + .../play/EntityPassengersSetS2CPacket.mapping | 2 + .../s2c/play/EntityPositionS2CPacket.mapping | 2 + .../packet/s2c/play/EntityS2CPacket.mapping | 6 ++ .../play/EntitySetHeadYawS2CPacket.mapping | 2 + .../s2c/play/EntitySpawnS2CPacket.mapping | 2 + .../play/EntityStatusEffectS2CPacket.mapping | 2 + .../s2c/play/EntityStatusS2CPacket.mapping | 2 + .../play/EntityTrackerUpdateS2CPacket.mapping | 2 + .../EntityVelocityUpdateS2CPacket.mapping | 2 + .../play/ExperienceBarUpdateS2CPacket.mapping | 2 + .../play/ExperienceOrbSpawnS2CPacket.mapping | 2 + .../s2c/play/ExplosionS2CPacket.mapping | 2 + .../packet/s2c/play/GameJoinS2CPacket.mapping | 2 + .../s2c/play/GameMessageS2CPacket.mapping | 2 + .../s2c/play/GameStateChangeS2CPacket.mapping | 2 + .../s2c/play/HealthUpdateS2CPacket.mapping | 2 + .../s2c/play/InventoryS2CPacket.mapping | 2 + .../play/ItemPickupAnimationS2CPacket.mapping | 3 + .../s2c/play/LightUpdateS2CPacket.mapping | 2 + .../packet/s2c/play/LookAtS2CPacket.mapping | 2 + .../s2c/play/MapUpdateS2CPacket.mapping | 2 + .../play/NbtQueryResponseS2CPacket.mapping | 2 + .../s2c/play/OpenHorseScreenS2CPacket.mapping | 2 + .../s2c/play/OpenScreenS2CPacket.mapping | 1 + .../s2c/play/OpenWrittenBookS2CPacket.mapping | 2 + .../s2c/play/OverlayMessageS2CPacket.mapping | 2 + .../packet/s2c/play/ParticleS2CPacket.mapping | 2 + .../play/PlaySoundFromEntityS2CPacket.mapping | 2 + .../s2c/play/PlaySoundS2CPacket.mapping | 2 + .../s2c/play/PlayerAbilitiesS2CPacket.mapping | 2 + .../PlayerActionResponseS2CPacket.mapping | 2 + .../play/PlayerListHeaderS2CPacket.mapping | 2 + .../s2c/play/PlayerListS2CPacket.mapping | 2 + .../play/PlayerPositionLookS2CPacket.mapping | 2 + .../s2c/play/PlayerRemoveS2CPacket.mapping | 2 + .../s2c/play/PlayerRespawnS2CPacket.mapping | 2 + .../play/PlayerSpawnPositionS2CPacket.mapping | 2 + .../ProfilelessChatMessageS2CPacket.mapping | 2 + .../RemoveEntityStatusEffectS2CPacket.mapping | 1 + .../s2c/play/RemoveMessageS2CPacket.mapping | 2 + .../play/ScoreboardDisplayS2CPacket.mapping | 2 + ...ScoreboardObjectiveUpdateS2CPacket.mapping | 2 + .../ScoreboardScoreResetS2CPacket.mapping | 2 + .../ScoreboardScoreUpdateS2CPacket.mapping | 2 + ...reenHandlerPropertyUpdateS2CPacket.mapping | 2 + .../ScreenHandlerSlotUpdateS2CPacket.mapping | 2 + .../SelectAdvancementTabS2CPacket.mapping | 2 + .../s2c/play/ServerMetadataS2CPacket.mapping | 2 + .../s2c/play/SetCameraEntityS2CPacket.mapping | 2 + .../s2c/play/SetTradeOffersS2CPacket.mapping | 2 + .../s2c/play/SignEditorOpenS2CPacket.mapping | 2 + .../play/SimulationDistanceS2CPacket.mapping | 2 + .../s2c/play/StartChunkSendS2CPacket.mapping | 2 + .../s2c/play/StopSoundS2CPacket.mapping | 2 + .../packet/s2c/play/SubtitleS2CPacket.mapping | 2 + .../play/SynchronizeRecipesS2CPacket.mapping | 1 + .../packet/s2c/play/TeamS2CPacket.mapping | 2 + .../packet/s2c/play/TickStepS2CPacket.mapping | 2 + .../s2c/play/TitleFadeS2CPacket.mapping | 2 + .../packet/s2c/play/TitleS2CPacket.mapping | 2 + .../s2c/play/UnloadChunkS2CPacket.mapping | 2 + .../s2c/play/UnlockRecipesS2CPacket.mapping | 2 + .../play/UpdateSelectedSlotS2CPacket.mapping | 2 + .../s2c/play/UpdateTickRateS2CPacket.mapping | 2 + .../s2c/play/VehicleMoveS2CPacket.mapping | 2 + .../WorldBorderCenterChangedS2CPacket.mapping | 2 + .../WorldBorderInitializeS2CPacket.mapping | 2 + ...orldBorderInterpolateSizeS2CPacket.mapping | 2 + .../WorldBorderSizeChangedS2CPacket.mapping | 2 + ...orderWarningBlocksChangedS2CPacket.mapping | 2 + ...dBorderWarningTimeChangedS2CPacket.mapping | 2 + .../s2c/play/WorldEventS2CPacket.mapping | 2 + .../s2c/play/WorldTimeUpdateS2CPacket.mapping | 2 + .../s2c/query/PingResultS2CPacket.mapping | 2 + .../s2c/query/QueryResponseS2CPacket.mapping | 2 + .../particle/DefaultParticleType.mapping | 1 + .../DustColorTransitionParticleEffect.mapping | 1 + .../particle/DustParticleEffect.mapping | 1 + .../minecraft/particle/ParticleType.mapping | 1 + .../minecraft/particle/ParticleTypes.mapping | 3 + .../SculkChargeParticleEffect.mapping | 1 + .../particle/ShriekParticleEffect.mapping | 3 + .../particle/VibrationParticleEffect.mapping | 1 + .../recipe/CookingRecipeSerializer.mapping | 6 ++ .../minecraft/recipe/CuttingRecipe.mapping | 1 + .../net/minecraft/recipe/Ingredient.mapping | 1 + .../minecraft/recipe/RawShapedRecipe.mapping | 1 + mappings/net/minecraft/recipe/Recipe.mapping | 1 + .../net/minecraft/recipe/RecipeEntry.mapping | 1 + .../minecraft/recipe/RecipeSerializer.mapping | 1 + .../net/minecraft/recipe/ShapedRecipe.mapping | 6 ++ .../minecraft/recipe/ShapelessRecipe.mapping | 6 ++ .../recipe/SmithingTransformRecipe.mapping | 6 ++ .../recipe/SmithingTrimRecipe.mapping | 6 ++ .../recipe/SpecialRecipeSerializer.mapping | 1 + .../book/CraftingRecipeCategory.mapping | 5 ++ .../minecraft/registry/RegistryKey.mapping | 2 + .../number/BlankNumberFormat.mapping | 1 + .../number/FixedNumberFormat.mapping | 1 + .../number/NumberFormatType.mapping | 1 + .../number/NumberFormatTypes.mapping | 2 + .../number/StyledNumberFormat.mapping | 1 + .../net/minecraft/sound/SoundEvent.mapping | 2 + mappings/net/minecraft/stat/Stat.mapping | 1 + mappings/net/minecraft/stat/StatType.mapping | 2 + mappings/net/minecraft/text/Style.mapping | 1 + .../net/minecraft/text/TextCodecs.mapping | 1 + .../net/minecraft/util/Identifier.mapping | 1 + mappings/net/minecraft/util/Uuids.mapping | 1 + .../util/collection/IndexedIterable.mapping | 2 + .../net/minecraft/util/math/BlockPos.mapping | 1 + .../net/minecraft/util/math/Direction.mapping | 2 + .../minecraft/util/math/EulerAngle.mapping | 1 + .../net/minecraft/util/math/GlobalPos.mapping | 1 + .../net/minecraft/village/TradeOffer.mapping | 6 ++ .../minecraft/village/TradeOfferList.mapping | 1 + .../minecraft/village/VillagerData.mapping | 1 + .../world/event/BlockPositionSource.mapping | 1 + .../world/event/EntityPositionSource.mapping | 1 + .../world/event/PositionSource.mapping | 1 + .../world/event/PositionSourceType.mapping | 1 + 244 files changed, 676 insertions(+) create mode 100644 mappings/net/minecraft/network/codec/PacketCodec.mapping create mode 100644 mappings/net/minecraft/network/codec/PacketCodecs.mapping create mode 100644 mappings/net/minecraft/network/codec/PacketDecoder.mapping create mode 100644 mappings/net/minecraft/network/codec/PacketEncoder.mapping create mode 100644 mappings/net/minecraft/network/codec/RegistryByteBuf.mapping create mode 100644 mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 73b19fe9f4..773f9dd26a 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement FIELD field_47179 CODEC Lcom/mojang/serialization/Codec; FIELD field_47180 CRITERIA_CODEC Lcom/mojang/serialization/Codec; + FIELD field_47996 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_170;Ljava/util/Map;Lnet/minecraft/class_8782;Z)V ARG 1 parent ARG 2 display @@ -15,10 +16,12 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement METHOD method_53623 createNameFromDisplay (Lnet/minecraft/class_185;)Lnet/minecraft/class_2561; ARG 0 display METHOD method_53627 write (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_53629 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_53630 isRoot ()Z METHOD method_53632 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_161; + ARG 0 buf METHOD method_54910 validate (Lnet/minecraft/class_161;)Lcom/mojang/serialization/DataResult; ARG 0 advancement METHOD method_54911 (Lnet/minecraft/class_161;Lnet/minecraft/class_8782;)Lnet/minecraft/class_161; diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping index c9a42bfa92..51b9b64d05 100644 --- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping +++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay FIELD field_1244 y F FIELD field_1245 x F FIELD field_47190 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48276 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/util/Optional;Lnet/minecraft/class_189;ZZZ)V ARG 1 icon ARG 2 title diff --git a/mappings/net/minecraft/advancement/AdvancementEntry.mapping b/mappings/net/minecraft/advancement/AdvancementEntry.mapping index 6da16f53cb..88f07d6eab 100644 --- a/mappings/net/minecraft/advancement/AdvancementEntry.mapping +++ b/mappings/net/minecraft/advancement/AdvancementEntry.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_8779 net/minecraft/advancement/AdvancementEntry FIELD comp_1919 id Lnet/minecraft/class_2960; FIELD comp_1920 value Lnet/minecraft/class_161; + FIELD field_48180 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48181 LIST_PACKET_CODEC Lnet/minecraft/class_9139; METHOD comp_1919 id ()Lnet/minecraft/class_2960; METHOD comp_1920 value ()Lnet/minecraft/class_161; METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/entity/EntityPose.mapping b/mappings/net/minecraft/entity/EntityPose.mapping index cd8505df67..39270014f4 100644 --- a/mappings/net/minecraft/entity/EntityPose.mapping +++ b/mappings/net/minecraft/entity/EntityPose.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_4050 net/minecraft/entity/EntityPose + FIELD field_48322 INDEX_TO_VALUE Ljava/util/function/IntFunction; + FIELD field_48323 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48324 index I + METHOD (Ljava/lang/String;II)V + ARG 3 index + METHOD method_56081 getIndex ()I diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping index 3f7375fa4c..5c148435ea 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping @@ -3,4 +3,6 @@ CLASS net/minecraft/class_2941 net/minecraft/entity/data/TrackedDataHandler ARG 1 value METHOD method_12717 create (I)Lnet/minecraft/class_2940; ARG 1 id + METHOD method_56031 create (Lnet/minecraft/class_9139;)Lnet/minecraft/class_2941; + ARG 0 codec CLASS class_7394 ImmutableHandler diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index f8e792668b..56c9b3681e 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis FIELD field_42237 VECTOR3F Lnet/minecraft/class_2941; FIELD field_42543 SNIFFER_STATE Lnet/minecraft/class_2941; FIELD field_47707 ARMADILLO_STATE Lnet/minecraft/class_2941; + FIELD field_48265 OPTIONAL_BLOCK_STATE_CODEC Lnet/minecraft/class_9139; + FIELD field_48266 OPTIONAL_INT_CODEC Lnet/minecraft/class_9139; METHOD method_12719 getId (Lnet/minecraft/class_2941;)I ARG 0 handler METHOD method_12720 register (Lnet/minecraft/class_2941;)V diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping index 1e529b1990..2e9f807326 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -24,7 +24,12 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity CLASS class_9070 State FIELD field_47793 name Ljava/lang/String; FIELD field_47794 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_48335 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48336 INDEX_TO_VALUE Ljava/util/function/IntFunction; + FIELD field_48337 index I METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 name + ARG 4 index METHOD method_55727 fromName (Ljava/lang/String;)Lnet/minecraft/class_9069$class_9070; ARG 0 name + METHOD method_56084 getIndex ()I diff --git a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping index 08206999af..ae21f1da7d 100644 --- a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping @@ -38,3 +38,9 @@ CLASS net/minecraft/class_8153 net/minecraft/entity/passive/SnifferEntity METHOD method_51301 isSearching ()Z METHOD method_51508 getDigPos ()Lnet/minecraft/class_2338; CLASS class_8154 State + FIELD field_48340 INDEX_TO_VALUE Ljava/util/function/IntFunction; + FIELD field_48341 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48342 index I + METHOD (Ljava/lang/String;II)V + ARG 3 index + METHOD method_56085 getIndex ()I diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 1bfce019aa..21dc845bb2 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -110,6 +110,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_47310 INGREDIENT_ENTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_47311 CUTTING_RECIPE_RESULT_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_47312 ITEM_CODEC Lcom/mojang/serialization/Codec; + FIELD field_48349 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48350 LIST_PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_8029 MODIFIER_FORMAT Ljava/text/DecimalFormat; FIELD field_8030 bobbingAnimationTime I FIELD field_8031 count I @@ -608,6 +610,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @see #isDamageable COMMENT @see #getDamage + CLASS 1 + FIELD field_48351 ITEM_PACKET_CODEC Lnet/minecraft/class_9139; CLASS class_5422 TooltipSection FIELD field_25775 flag I METHOD method_30269 getFlag ()I diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 04df11060d..215b3bac06 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -342,6 +342,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT written COMMENT @see #readNbt() COMMENT @see #readNbt(NbtSizeTracker) + ARG 1 nbt METHOD method_10795 readByteArray ()[B COMMENT Reads an array of primitive bytes from this buf. The array first has a COMMENT var int indicating its length, followed by the actual bytes. The array @@ -1072,6 +1073,29 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @return the read text COMMENT @see #readText() COMMENT @see #writeText(Text) + METHOD method_56337 writeUuid (Lio/netty/buffer/ByteBuf;Ljava/util/UUID;)V + ARG 0 buf + ARG 1 uuid + METHOD method_56338 writeQuaternionf (Lio/netty/buffer/ByteBuf;Lorg/joml/Quaternionf;)V + ARG 0 buf + ARG 1 quaternion + METHOD method_56339 writeVector3f (Lio/netty/buffer/ByteBuf;Lorg/joml/Vector3f;)V + ARG 0 buf + ARG 1 vector + METHOD method_56340 readNbt (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; + ARG 0 buf + ARG 1 sizeTracker + METHOD method_56341 writeNbt (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_2520;)V + ARG 0 buf + ARG 1 nbt + METHOD method_56342 readVector3f (Lio/netty/buffer/ByteBuf;)Lorg/joml/Vector3f; + ARG 0 buf + METHOD method_56343 readQuaternionf (Lio/netty/buffer/ByteBuf;)Lorg/joml/Quaternionf; + ARG 0 buf + METHOD method_56344 readUuid (Lio/netty/buffer/ByteBuf;)Ljava/util/UUID; + ARG 0 buf + METHOD method_56345 readNbt (Lio/netty/buffer/ByteBuf;)Lnet/minecraft/class_2487; + ARG 0 buf METHOD nioBuffer (II)Ljava/nio/ByteBuffer; ARG 1 index ARG 2 length diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping new file mode 100644 index 0000000000..df91044ecb --- /dev/null +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec + METHOD method_56430 cast ()Lnet/minecraft/class_9139; + METHOD method_56431 unit (Ljava/lang/Object;)Lnet/minecraft/class_9139; + ARG 0 value + METHOD method_56432 xmap (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + ARG 1 to + ARG 2 from + METHOD method_56433 mapResult (Lnet/minecraft/class_9139$class_9140;)Lnet/minecraft/class_9139; + ARG 1 function + METHOD method_56434 record (Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + ARG 0 codec + ARG 1 from + ARG 2 to + METHOD method_56435 record (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/class_9139; + ARG 0 codec1 + ARG 1 from1 + ARG 2 codec2 + ARG 3 from2 + ARG 4 to + METHOD method_56436 record (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/class_9139; + ARG 0 codec1 + ARG 1 from1 + ARG 2 codec2 + ARG 3 from2 + ARG 4 codec3 + ARG 5 from3 + ARG 6 to + METHOD method_56437 of (Lnet/minecraft/class_9142;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; + ARG 0 encoder + ARG 1 decoder + METHOD method_56438 of (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; + ARG 0 encoder + ARG 1 decoder + METHOD method_56439 mapBuf (Ljava/util/function/Function;)Lnet/minecraft/class_9139; + ARG 1 function + METHOD method_56440 dispatch (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + ARG 1 type + ARG 2 codec + CLASS class_9140 ResultFunction + METHOD apply (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + ARG 1 codec diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping new file mode 100644 index 0000000000..2e28545a35 --- /dev/null +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -0,0 +1,70 @@ +CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs + FIELD field_48547 BOOL Lnet/minecraft/class_9139; + FIELD field_48548 BYTE Lnet/minecraft/class_9139; + FIELD field_48549 SHORT Lnet/minecraft/class_9139; + FIELD field_48550 VAR_INT Lnet/minecraft/class_9139; + FIELD field_48551 VAR_LONG Lnet/minecraft/class_9139; + FIELD field_48552 FLOAT Lnet/minecraft/class_9139; + FIELD field_48553 DOUBLE Lnet/minecraft/class_9139; + FIELD field_48554 STRING Lnet/minecraft/class_9139; + FIELD field_48555 NBT_ELEMENT Lnet/minecraft/class_9139; + FIELD field_48556 NBT_COMPUND Lnet/minecraft/class_9139; + FIELD field_48557 OPTIONAL_NBT Lnet/minecraft/class_9139; + FIELD field_48558 VECTOR3F Lnet/minecraft/class_9139; + FIELD field_48559 QUATERNION Lnet/minecraft/class_9139; + METHOD method_56363 listMapper ()Lnet/minecraft/class_9139$class_9140; + METHOD method_56364 string (I)Lnet/minecraft/class_9139; + ARG 0 length + METHOD method_56365 registry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + ARG 0 registry + METHOD method_56366 registry (Lnet/minecraft/class_5321;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + ARG 0 registry + ARG 1 registryTransformer + METHOD method_56367 registryEntry (Lnet/minecraft/class_5321;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + ARG 0 registry + ARG 1 fallback + METHOD method_56368 ofCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; + ARG 0 codec + METHOD method_56369 (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)Lnet/minecraft/class_2520; + ARG 1 value + METHOD method_56370 (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2520;)Ljava/lang/Object; + ARG 1 nbt + METHOD method_56371 ofIterable (Lnet/minecraft/class_2359;)Lnet/minecraft/class_9139; + ARG 0 iterable + METHOD method_56373 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; + ARG 1 error + METHOD method_56374 collectionMapper (Ljava/util/function/IntFunction;)Lnet/minecraft/class_9139$class_9140; + ARG 0 factory + METHOD method_56375 indexed (Ljava/util/function/IntFunction;Ljava/util/function/ToIntFunction;)Lnet/minecraft/class_9139; + ARG 0 from + ARG 1 to + METHOD method_56376 collection (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + ARG 0 factory + ARG 1 elementCodec + METHOD method_56377 map (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + ARG 0 factory + ARG 1 keyCodec + ARG 2 valueCodec + METHOD method_56378 nbt (Ljava/util/function/Supplier;)Lnet/minecraft/class_9139; + ARG 0 sizeTracker + METHOD method_56379 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2520; + ARG 0 nbt + METHOD method_56380 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2487; + ARG 0 nbt + METHOD method_56381 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + ARG 1 error + METHOD method_56382 optional (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + ARG 0 codec + METHOD method_56383 registryEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + ARG 0 registry + METHOD method_56384 (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + ARG 1 codec + METHOD method_56385 (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + ARG 0 codec + CLASS 9 + METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; + ARG 1 buf + CLASS 10 + FIELD field_48562 DIRECT_ENTRY_MARKER I + METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; + ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/PacketDecoder.mapping b/mappings/net/minecraft/network/codec/PacketDecoder.mapping new file mode 100644 index 0000000000..370840c930 --- /dev/null +++ b/mappings/net/minecraft/network/codec/PacketDecoder.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9141 net/minecraft/network/codec/PacketDecoder + METHOD decode (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/PacketEncoder.mapping b/mappings/net/minecraft/network/codec/PacketEncoder.mapping new file mode 100644 index 0000000000..22bd7f9fd4 --- /dev/null +++ b/mappings/net/minecraft/network/codec/PacketEncoder.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9142 net/minecraft/network/codec/PacketEncoder + METHOD encode (Ljava/lang/Object;Ljava/lang/Object;)V + ARG 1 buf + ARG 2 value diff --git a/mappings/net/minecraft/network/codec/RegistryByteBuf.mapping b/mappings/net/minecraft/network/codec/RegistryByteBuf.mapping new file mode 100644 index 0000000000..e296bb567a --- /dev/null +++ b/mappings/net/minecraft/network/codec/RegistryByteBuf.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_9129 net/minecraft/network/codec/RegistryByteBuf + FIELD field_48538 registryManager Lnet/minecraft/class_5455; + METHOD (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_5455;)V + ARG 1 buf + ARG 2 registryManager + METHOD method_56349 getRegistryManager ()Lnet/minecraft/class_5455; + METHOD method_56350 makeFactory (Lnet/minecraft/class_5455;)Ljava/util/function/Function; + ARG 0 registryManager + METHOD method_56351 (Lnet/minecraft/class_5455;Lio/netty/buffer/ByteBuf;)Lnet/minecraft/class_9129; + ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping b/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping new file mode 100644 index 0000000000..ce0f31fdbb --- /dev/null +++ b/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9143 net/minecraft/network/codec/ValueFirstEncoder + METHOD encode (Ljava/lang/Object;Ljava/lang/Object;)V + ARG 1 value + ARG 2 buf diff --git a/mappings/net/minecraft/network/packet/CustomPayload.mapping b/mappings/net/minecraft/network/packet/CustomPayload.mapping index 8b43d0b10d..256eff06b5 100644 --- a/mappings/net/minecraft/network/packet/CustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/CustomPayload.mapping @@ -1 +1,24 @@ CLASS net/minecraft/class_8710 net/minecraft/network/packet/CustomPayload + METHOD method_56479 getKey ()Lnet/minecraft/class_8710$class_9154; + METHOD method_56483 keyOf (Ljava/lang/String;)Lnet/minecraft/class_8710$class_9154; + ARG 0 id + METHOD method_56484 codecOf (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; + ARG 0 encoder + ARG 1 decoder + METHOD method_56485 createCodec (Lnet/minecraft/class_8710$class_9153;Ljava/util/List;)Lnet/minecraft/class_9139; + ARG 0 factory + ARG 1 codecs + METHOD method_56486 (Lnet/minecraft/class_8710$class_9155;)Lnet/minecraft/class_2960; + ARG 0 pair + CLASS 1 + METHOD method_56487 getCodec (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; + ARG 1 id + METHOD method_56489 encode (Lnet/minecraft/class_2540;Lnet/minecraft/class_8710$class_9154;Lnet/minecraft/class_8710;)V + ARG 1 value + ARG 2 type + ARG 3 payload + CLASS class_9153 CodecFactory + METHOD create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; + ARG 1 id + CLASS class_9154 Type + CLASS class_9155 CodecPair diff --git a/mappings/net/minecraft/network/packet/Packet.mapping b/mappings/net/minecraft/network/packet/Packet.mapping index 0c054d74c3..b96ca38153 100644 --- a/mappings/net/minecraft/network/packet/Packet.mapping +++ b/mappings/net/minecraft/network/packet/Packet.mapping @@ -4,3 +4,6 @@ CLASS net/minecraft/class_2596 net/minecraft/network/packet/Packet COMMENT connection to simply skip the packet's sending than disconnecting} METHOD method_11054 apply (Lnet/minecraft/class_2547;)V ARG 1 listener + METHOD method_56443 createCodec (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; + ARG 0 encoder + ARG 1 decoder diff --git a/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping index eecb3a4cf8..e170619c6f 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket FIELD comp_1963 options Lnet/minecraft/class_8791; + FIELD field_48645 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_1963 options ()Lnet/minecraft/class_8791; + METHOD method_56474 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping index 6d8fc78918..275a849e02 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping @@ -7,8 +7,10 @@ CLASS net/minecraft/class_6374 net/minecraft/network/packet/c2s/common/CommonPon COMMENT @see net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket COMMENT @see net.minecraft.network.packet.c2s.query.QueryPingC2SPacket FIELD field_33752 parameter I + FIELD field_48648 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 parameter METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_36960 getParameter ()I + METHOD method_56477 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping index 5d7069c9f1..5cf7cbfe49 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2827 net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket FIELD field_12883 id J + FIELD field_48647 CODEC Lnet/minecraft/class_9139; METHOD (J)V ARG 1 id METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12267 getId ()J + METHOD method_56476 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping index 8c6515decc..197bbae8cd 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2856 net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket FIELD comp_2164 status Lnet/minecraft/class_2856$class_2857; + FIELD field_48649 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_2164 status ()Lnet/minecraft/class_2856$class_2857; + METHOD method_56478 write (Lnet/minecraft/class_2540;)V CLASS class_2857 Status METHOD method_55627 hasFinished ()Z diff --git a/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping index 863949c8a8..bee8cd5827 100644 --- a/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8736 net/minecraft/network/packet/c2s/config/ReadyC2SPacket + FIELD field_48700 INSTANCE Lnet/minecraft/class_8736; + FIELD field_48701 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping index 93e9775508..395153d934 100644 --- a/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping @@ -4,9 +4,11 @@ CLASS net/minecraft/class_2889 net/minecraft/network/packet/c2s/handshake/Handsh FIELD comp_1565 port I FIELD comp_1566 intendedState Lnet/minecraft/class_8592; FIELD field_33372 MAX_ADDRESS_LENGTH I + FIELD field_48229 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_1563 protocolVersion ()I METHOD comp_1564 address ()Ljava/lang/String; METHOD comp_1565 port ()I METHOD comp_1566 intendedState ()Lnet/minecraft/class_8592; + METHOD method_56007 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping index 118e2084f3..1f904f7306 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8593 net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket + FIELD field_48252 INSTANCE Lnet/minecraft/class_8593; + FIELD field_48253 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping index 3071366e53..14caa8e342 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2915 net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket + FIELD field_48250 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56020 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping index baa1bdfec2..cae5d2d32e 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2 COMMENT and the server verifies it by decrypting and comparing nonces. If signed, then it must COMMENT be done so using the user's private key provided from Mojang's server, and the server COMMENT verifies by checking if the reconstructed data can be verified using the public key. + FIELD field_48251 CODEC Lnet/minecraft/class_9139; METHOD (Ljavax/crypto/SecretKey;Ljava/security/PublicKey;[B)V ARG 1 secretKey ARG 2 publicKey @@ -19,3 +20,4 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2 METHOD method_43643 verifySignedNonce ([BLjava/security/PrivateKey;)Z ARG 1 nonce ARG 2 privateKey + METHOD method_56021 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping index 1c271fa8d4..abd43f84c8 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQuery FIELD comp_1569 queryId I FIELD comp_1570 response Lnet/minecraft/class_8594; FIELD field_33374 MAX_PAYLOAD_SIZE I + FIELD field_48249 CODEC Lnet/minecraft/class_9139; METHOD comp_1569 queryId ()I METHOD comp_1570 response ()Lnet/minecraft/class_8594; METHOD method_11052 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping index 66223a8be6..40438671a5 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_8590 net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket + FIELD field_48183 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55967 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping index 2c6b9e5872..854cf9baee 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8591 net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket + FIELD field_48186 INSTANCE Lnet/minecraft/class_8591; + FIELD field_48187 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping index a447f45c1a..5c6500b7a0 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2859 net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket FIELD field_13020 tabToOpen Lnet/minecraft/class_2960; FIELD field_13021 action Lnet/minecraft/class_2859$class_2860; + FIELD field_48213 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2859$class_2860;Lnet/minecraft/class_2960;)V @@ -11,4 +12,5 @@ CLASS net/minecraft/class_2859 net/minecraft/network/packet/c2s/play/Advancement METHOD method_12416 getTabToOpen ()Lnet/minecraft/class_2960; METHOD method_12418 open (Lnet/minecraft/class_8779;)Lnet/minecraft/class_2859; ARG 0 advancement + METHOD method_55994 write (Lnet/minecraft/class_2540;)V CLASS class_2860 Action diff --git a/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping index 93c31b50ec..8a50419b44 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2836 net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket FIELD field_12906 rightPaddling Z FIELD field_12907 leftPaddling Z + FIELD field_48203 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (ZZ)V @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2836 net/minecraft/network/packet/c2s/play/BoatPaddleS ARG 2 rightPaddling METHOD method_12284 isLeftPaddling ()Z METHOD method_12285 isRightPaddling ()Z + METHOD method_55984 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping index f61ea4b127..01acf82fa2 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC FIELD field_34041 pages Ljava/util/List; FIELD field_34042 title Ljava/util/Optional; FIELD field_34046 MAX_PAGES I + FIELD field_48193 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/util/List;Ljava/util/Optional;)V ARG 1 slot ARG 2 pages @@ -24,3 +25,4 @@ CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC METHOD method_37445 getTitle ()Ljava/util/Optional; METHOD method_37446 (Lnet/minecraft/class_2540;)Ljava/lang/String; ARG 0 buf2 + METHOD method_55974 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping index f3b38141cc..1b4ee95bde 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2811 net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket FIELD field_12812 buttonId I FIELD field_12813 syncId I + FIELD field_48188 CODEC Lnet/minecraft/class_9139; METHOD (II)V ARG 1 syncId ARG 2 buttonId @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2811 net/minecraft/network/packet/c2s/play/ButtonClick ARG 1 buf METHOD method_12186 getButtonId ()I METHOD method_12187 getSyncId ()I + METHOD method_55970 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index 24420c7b43..9e12052d41 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage FIELD comp_945 chatMessage Ljava/lang/String; FIELD comp_946 timestamp Ljava/time/Instant; FIELD comp_970 acknowledgment Lnet/minecraft/class_7635$class_7636; + FIELD field_48179 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7469;Lnet/minecraft/class_7635$class_7636;)V ARG 2 timestamp ARG 3 salt @@ -33,3 +34,4 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage METHOD comp_945 chatMessage ()Ljava/lang/String; METHOD comp_946 timestamp ()Ljava/time/Instant; METHOD comp_970 acknowledgment ()Lnet/minecraft/class_7635$class_7636; + METHOD method_55965 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index e033eeacda..e7b596a823 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 FIELD field_29540 modifiedStacks Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_34037 revision I FIELD field_34045 MAX_MODIFIED_STACKS I + FIELD field_48189 CODEC Lnet/minecraft/class_9139; + FIELD field_48190 STACK_MAP_CODEC Lnet/minecraft/class_9139; METHOD (IIIILnet/minecraft/class_1713;Lnet/minecraft/class_1799;Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;)V ARG 1 syncId ARG 2 revision @@ -22,3 +24,4 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 METHOD method_12195 getActionType ()Lnet/minecraft/class_1713; METHOD method_34678 getModifiedStacks ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD method_37440 getRevision ()I + METHOD method_55971 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping index c09307689d..20eb8d6e4b 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2848 net/minecraft/network/packet/c2s/play/ClientComma FIELD field_12976 mountJumpHeight I FIELD field_12977 entityId I FIELD field_12978 mode Lnet/minecraft/class_2848$class_2849; + FIELD field_48208 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;Lnet/minecraft/class_2848$class_2849;)V ARG 1 entity ARG 2 mode @@ -14,4 +15,5 @@ CLASS net/minecraft/class_2848 net/minecraft/network/packet/c2s/play/ClientComma METHOD method_12365 getMode ()Lnet/minecraft/class_2848$class_2849; METHOD method_12366 getMountJumpHeight ()I METHOD method_36173 getEntityId ()I + METHOD method_55989 write (Lnet/minecraft/class_2540;)V CLASS class_2849 Mode diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping index 465b93fcbb..dbeed97abb 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_2799 net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket FIELD field_12773 mode Lnet/minecraft/class_2799$class_2800; + FIELD field_48184 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2799$class_2800;)V ARG 1 mode METHOD method_12119 getMode ()Lnet/minecraft/class_2799$class_2800; + METHOD method_55968 write (Lnet/minecraft/class_2540;)V CLASS class_2800 Mode diff --git a/mappings/net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket.mapping index 5c50ddb6ff..489d19ec3e 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2815 net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket FIELD field_12827 syncId I + FIELD field_48191 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 syncId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_36168 getSyncId ()I + METHOD method_55972 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping index d56838efbd..6523767c7d 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExec COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onCommandExecution FIELD comp_809 timestamp Ljava/time/Instant; FIELD comp_969 acknowledgment Lnet/minecraft/class_7635$class_7636; + FIELD field_48178 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7450;Lnet/minecraft/class_7635$class_7636;)V ARG 2 timestamp ARG 3 salt @@ -31,3 +32,4 @@ CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExec ARG 1 buf METHOD comp_809 timestamp ()Ljava/time/Instant; METHOD comp_969 acknowledgment ()Lnet/minecraft/class_7635$class_7636; + METHOD method_55964 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping index 16a443b33f..1806717192 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2840 net/minecraft/network/packet/c2s/play/CraftReques FIELD field_12931 recipe Lnet/minecraft/class_2960; FIELD field_12932 craftAll Z FIELD field_12933 syncId I + FIELD field_48205 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_8786;Z)V ARG 1 syncId ARG 2 recipe @@ -11,3 +12,4 @@ CLASS net/minecraft/class_2840 net/minecraft/network/packet/c2s/play/CraftReques METHOD method_12318 getSyncId ()I METHOD method_12319 shouldCraftAll ()Z METHOD method_12320 getRecipe ()Lnet/minecraft/class_2960; + METHOD method_55986 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping index 99694f9d92..805d5cee5e 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_2873 net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket FIELD field_13070 stack Lnet/minecraft/class_1799; FIELD field_13071 slot I + FIELD field_48219 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack METHOD method_12479 getStack ()Lnet/minecraft/class_1799; METHOD method_12481 getSlot ()I + METHOD method_55999 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping index a706012dff..d8469de9ad 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2879 net/minecraft/network/packet/c2s/play/HandSwingC2SPacket FIELD field_13102 hand Lnet/minecraft/class_1268; + FIELD field_48223 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1268;)V ARG 1 hand METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12512 getHand ()Lnet/minecraft/class_1268; + METHOD method_56003 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping index ef311e082f..3da6b7ee97 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5194 net/minecraft/network/packet/c2s/play/JigsawGener FIELD field_24054 pos Lnet/minecraft/class_2338; FIELD field_24055 maxDepth I FIELD field_25323 keepJigsaws Z + FIELD field_48196 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2338;IZ)V ARG 1 pos ARG 2 maxDepth @@ -11,3 +12,4 @@ CLASS net/minecraft/class_5194 net/minecraft/network/packet/c2s/play/JigsawGener METHOD method_27275 getPos ()Lnet/minecraft/class_2338; METHOD method_27276 getMaxDepth ()I METHOD method_29446 shouldKeepJigsaws ()Z + METHOD method_55977 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping index 196e624fce..e2f8ca4dc4 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7640 net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket + FIELD field_48177 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55963 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping index d041147dad..7aaba30952 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2838 net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket FIELD field_12908 slot I + FIELD field_48204 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 slot METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12293 getSlot ()I + METHOD method_55985 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping index 04691a412f..03afb04e57 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2846 net/minecraft/network/packet/c2s/play/PlayerActio FIELD field_12966 action Lnet/minecraft/class_2846$class_2847; FIELD field_12967 pos Lnet/minecraft/class_2338; FIELD field_38048 sequence I + FIELD field_48207 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2846$class_2847;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V @@ -18,4 +19,5 @@ CLASS net/minecraft/class_2846 net/minecraft/network/packet/c2s/play/PlayerActio METHOD method_12362 getPos ()Lnet/minecraft/class_2338; METHOD method_12363 getAction ()Lnet/minecraft/class_2846$class_2847; METHOD method_42079 getSequence ()I + METHOD method_55988 write (Lnet/minecraft/class_2540;)V CLASS class_2847 Action diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping index bdc623f7a0..3cea8b27e7 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2851 net/minecraft/network/packet/c2s/play/PlayerInput FIELD field_12997 jumping Z FIELD field_33363 JUMPING_MASK I FIELD field_33364 SNEAKING_MASK I + FIELD field_48209 CODEC Lnet/minecraft/class_9139; METHOD (FFZZ)V ARG 1 sideways ARG 2 forward @@ -16,3 +17,4 @@ CLASS net/minecraft/class_2851 net/minecraft/network/packet/c2s/play/PlayerInput METHOD method_12371 isJumping ()Z METHOD method_12372 getSideways ()F METHOD method_12373 getForward ()F + METHOD method_55990 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping index 98db4a13fd..59f457572c 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2885 net/minecraft/network/packet/c2s/play/PlayerInter FIELD field_13134 hand Lnet/minecraft/class_1268; FIELD field_17602 blockHitResult Lnet/minecraft/class_3965; FIELD field_38049 sequence I + FIELD field_48225 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;I)V ARG 1 hand ARG 2 blockHitResult @@ -11,3 +12,4 @@ CLASS net/minecraft/class_2885 net/minecraft/network/packet/c2s/play/PlayerInter METHOD method_12543 getBlockHitResult ()Lnet/minecraft/class_3965; METHOD method_12546 getHand ()Lnet/minecraft/class_1268; METHOD method_42080 getSequence ()I + METHOD method_56005 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping index 67f019e798..b5da758967 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2824 net/minecraft/network/packet/c2s/play/PlayerInter FIELD field_12871 type Lnet/minecraft/class_2824$class_5906; FIELD field_25660 playerSneaking Z FIELD field_29170 ATTACK Lnet/minecraft/class_2824$class_5906; + FIELD field_48195 CODEC Lnet/minecraft/class_9139; METHOD (IZLnet/minecraft/class_2824$class_5906;)V ARG 1 entityId ARG 2 playerSneaking @@ -26,6 +27,7 @@ CLASS net/minecraft/class_2824 net/minecraft/network/packet/c2s/play/PlayerInter ARG 3 pos METHOD method_34209 handle (Lnet/minecraft/class_2824$class_5908;)V ARG 1 handler + METHOD method_55976 write (Lnet/minecraft/class_2540;)V CLASS class_5906 InteractTypeHandler METHOD method_34211 getType ()Lnet/minecraft/class_2824$class_5907; METHOD method_34212 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping index 5131f29768..7221fc118a 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2886 net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket FIELD field_13136 hand Lnet/minecraft/class_1268; FIELD field_38050 sequence I + FIELD field_48226 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1268;I)V ARG 1 hand ARG 2 sequence @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2886 net/minecraft/network/packet/c2s/play/PlayerInter ARG 1 buf METHOD method_12551 getHand ()Lnet/minecraft/class_1268; METHOD method_42081 getSequence ()I + METHOD method_56006 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping index aa70710199..8d2a52f7ae 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC METHOD method_36171 changesPosition ()Z METHOD method_36172 changesLook ()Z CLASS class_2829 PositionAndOnGround + FIELD field_48198 CODEC Lnet/minecraft/class_9139; METHOD (DDDZ)V ARG 1 x ARG 3 y @@ -38,7 +39,9 @@ CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC ARG 7 onGround METHOD method_34221 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_2829; ARG 0 buf + METHOD method_55979 write (Lnet/minecraft/class_2540;)V CLASS class_2830 Full + FIELD field_48199 CODEC Lnet/minecraft/class_9139; METHOD (DDDFFZ)V ARG 1 x ARG 3 y @@ -48,15 +51,20 @@ CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC ARG 9 onGround METHOD method_34222 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_2830; ARG 0 buf + METHOD method_55980 write (Lnet/minecraft/class_2540;)V CLASS class_2831 LookAndOnGround + FIELD field_48200 CODEC Lnet/minecraft/class_9139; METHOD (FFZ)V ARG 1 yaw ARG 2 pitch ARG 3 onGround METHOD method_34223 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_2831; ARG 0 buf + METHOD method_55981 write (Lnet/minecraft/class_2540;)V CLASS class_5911 OnGroundOnly + FIELD field_48201 CODEC Lnet/minecraft/class_9139; METHOD (Z)V ARG 1 onGround METHOD method_34224 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_5911; ARG 0 buf + METHOD method_55982 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping index 9f22bc5972..15e04483dc 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7861 net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket + FIELD field_48182 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55966 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping index 0e98748304..d2bdbd6c47 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2795 net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket FIELD field_12762 transactionId I FIELD field_12763 pos Lnet/minecraft/class_2338; + FIELD field_48175 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_2338;)V ARG 1 transactionId ARG 2 pos @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2795 net/minecraft/network/packet/c2s/play/QueryBlockN ARG 1 buf METHOD method_12094 getPos ()Lnet/minecraft/class_2338; METHOD method_12096 getTransactionId ()I + METHOD method_55961 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping index bff38cb38c..2bb0fdcce8 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2822 net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket FIELD field_12867 entityId I FIELD field_12868 transactionId I + FIELD field_48194 CODEC Lnet/minecraft/class_9139; METHOD (II)V ARG 1 transactionId ARG 2 entityId @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2822 net/minecraft/network/packet/c2s/play/QueryEntity ARG 1 buf METHOD method_12244 getEntityId ()I METHOD method_12245 getTransactionId ()I + METHOD method_55975 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping index 07bdfacbf3..74d3b0f53f 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2853 net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket FIELD field_13004 recipeId Lnet/minecraft/class_2960; + FIELD field_48211 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_8786;)V ARG 1 recipe METHOD method_12406 getRecipeId ()Lnet/minecraft/class_2960; + METHOD method_55992 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping index 18225ffef1..34d0af0124 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5427 net/minecraft/network/packet/c2s/play/RecipeCateg FIELD field_25798 category Lnet/minecraft/class_5421; FIELD field_25799 guiOpen Z FIELD field_25800 filteringCraftable Z + FIELD field_48210 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_5421;ZZ)V @@ -11,3 +12,4 @@ CLASS net/minecraft/class_5427 net/minecraft/network/packet/c2s/play/RecipeCateg METHOD method_30305 getCategory ()Lnet/minecraft/class_5421; METHOD method_30306 isGuiOpen ()Z METHOD method_30307 isFilteringCraftable ()Z + METHOD method_55991 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping index bc0b249a17..9b34680806 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2855 net/minecraft/network/packet/c2s/play/RenameItemC2SPacket FIELD field_13013 name Ljava/lang/String; + FIELD field_48212 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;)V ARG 1 name METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12407 getName ()Ljava/lang/String; + METHOD method_55993 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping index 60f5a92831..6582304384 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2805 net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket FIELD field_12784 completionId I FIELD field_12785 partialCommand Ljava/lang/String; + FIELD field_48185 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/lang/String;)V ARG 1 completionId ARG 2 partialCommand @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2805 net/minecraft/network/packet/c2s/play/RequestComm ARG 1 buf METHOD method_12148 getPartialCommand ()Ljava/lang/String; METHOD method_12149 getCompletionId ()I + METHOD method_55969 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping index 8b126db0a3..c5b8d94933 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2863 net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket FIELD field_13036 tradeId I + FIELD field_48214 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 tradeId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12431 getTradeId ()I + METHOD method_55995 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/SlotChangedStateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SlotChangedStateC2SPacket.mapping index c8c1d0ac03..2f542e96f6 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/SlotChangedStateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/SlotChangedStateC2SPacket.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_8875 net/minecraft/network/packet/c2s/play/SlotChangedStateC2SPacket FIELD comp_1999 screenHandlerId I + FIELD field_48192 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_1999 screenHandlerId ()I + METHOD method_55973 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping index 75cd7dc084..8714e15484 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_2884 net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket FIELD field_13129 targetUuid Ljava/util/UUID; + FIELD field_48224 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/util/UUID;)V ARG 1 targetUuid METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12541 getTarget (Lnet/minecraft/class_3218;)Lnet/minecraft/class_1297; ARG 1 world + METHOD method_56004 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping index ea0f6f674d..a5fca3a28e 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2793 net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket FIELD field_12758 teleportId I + FIELD field_48174 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 teleportId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12086 getTeleportId ()I + METHOD method_55960 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 582ce9c11e..2b2deddd42 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket + FIELD field_48215 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 primaryEffectId ARG 2 secondaryEffectId diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping index 2e039a7a6b..496f140f03 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2870 net/minecraft/network/packet/c2s/play/UpdateComma FIELD field_33365 TRACK_OUTPUT_MASK I FIELD field_33366 CONDITIONAL_MASK I FIELD field_33367 ALWAYS_ACTIVE_MASK I + FIELD field_48217 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2338;Ljava/lang/String;Lnet/minecraft/class_2593$class_2594;ZZZ)V ARG 1 pos ARG 2 command @@ -23,3 +24,4 @@ CLASS net/minecraft/class_2870 net/minecraft/network/packet/c2s/play/UpdateComma METHOD method_12472 shouldTrackOutput ()Z METHOD method_12473 getPos ()Lnet/minecraft/class_2338; METHOD method_12474 isAlwaysActive ()Z + METHOD method_55997 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping index 7d242a494f..c3e6d57efc 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2871 net/minecraft/network/packet/c2s/play/UpdateComma FIELD field_13066 trackOutput Z FIELD field_13067 entityId I FIELD field_13068 command Ljava/lang/String; + FIELD field_48218 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/lang/String;Z)V ARG 1 entityId ARG 2 command @@ -12,3 +13,4 @@ CLASS net/minecraft/class_2871 net/minecraft/network/packet/c2s/play/UpdateComma METHOD method_12476 getMinecartCommandExecutor (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1918; ARG 1 world METHOD method_12478 shouldTrackOutput ()Z + METHOD method_55998 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping index 50678c246b..ca8001883c 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_4210 net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket FIELD field_18805 difficulty Lnet/minecraft/class_1267; + FIELD field_48176 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1267;)V ARG 1 difficulty METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_19478 getDifficulty ()Lnet/minecraft/class_1267; + METHOD method_55962 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping index dd94a3a98b..275aa571e0 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_4211 net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket FIELD field_18806 difficultyLocked Z + FIELD field_48197 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Z)V ARG 1 difficultyLocked METHOD method_19485 isDifficultyLocked ()Z + METHOD method_55978 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping index d9a47e936f..ad30612ea1 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_3753 net/minecraft/network/packet/c2s/play/UpdateJigsa FIELD field_23402 jointType Lnet/minecraft/class_3751$class_4991; FIELD field_46917 selectionPriority I FIELD field_46918 placementPriority I + FIELD field_48220 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_3751$class_4991;II)V ARG 1 pos ARG 2 name @@ -26,3 +27,4 @@ CLASS net/minecraft/class_3753 net/minecraft/network/packet/c2s/play/UpdateJigsa METHOD method_26436 getJointType ()Lnet/minecraft/class_3751$class_4991; METHOD method_54668 getSelectionPriority ()I METHOD method_54669 getPlacementPriority ()I + METHOD method_56000 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping index 315991c28e..3625ab5ce2 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_2842 net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket FIELD field_12948 flying Z FIELD field_33362 FLYING_MASK I + FIELD field_48206 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1656;)V ARG 1 abilities METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12346 isFlying ()Z + METHOD method_55987 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping index 2b7d4bc34c..67e14deac8 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2868 net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket FIELD field_13052 selectedSlot I + FIELD field_48216 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 selectedSlot METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12442 getSelectedSlot ()I + METHOD method_55996 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping index f002854b55..e30960ad72 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2877 net/minecraft/network/packet/c2s/play/UpdateSignC FIELD field_13101 pos Lnet/minecraft/class_2338; FIELD field_33371 MAX_LINE_LENGTH I FIELD field_43153 front Z + FIELD field_48222 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2338;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V ARG 1 pos ARG 2 front @@ -15,3 +16,4 @@ CLASS net/minecraft/class_2877 net/minecraft/network/packet/c2s/play/UpdateSignC METHOD method_12508 getText ()[Ljava/lang/String; METHOD method_12510 getPos ()Lnet/minecraft/class_2338; METHOD method_49751 isFront ()Z + METHOD method_56002 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping index 13bcf3a4e0..694de2e306 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStruc FIELD field_33368 IGNORE_ENTITIES_MASK I FIELD field_33369 SHOW_AIR_MASK I FIELD field_33370 SHOW_BOUNDING_BOX_MASK I + FIELD field_48221 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2633$class_2634;Lnet/minecraft/class_2776;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Ljava/lang/String;ZZZFJ)V ARG 1 pos ARG 2 action @@ -47,3 +48,4 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStruc METHOD method_12504 getMode ()Lnet/minecraft/class_2776; METHOD method_12505 shouldShowBoundingBox ()Z METHOD method_12506 shouldIgnoreEntities ()Z + METHOD method_56001 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping index ecff939e62..6100c2741c 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2833 net/minecraft/network/packet/c2s/play/VehicleMove FIELD field_12897 y D FIELD field_12898 yaw F FIELD field_12899 x D + FIELD field_48202 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD (Lnet/minecraft/class_2540;)V @@ -13,3 +14,4 @@ CLASS net/minecraft/class_2833 net/minecraft/network/packet/c2s/play/VehicleMove METHOD method_12279 getX ()D METHOD method_12280 getY ()D METHOD method_12281 getYaw ()F + METHOD method_55983 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping index 66206a1381..06acd6d341 100644 --- a/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2935 net/minecraft/network/packet/c2s/query/QueryPingC2SPacket FIELD field_13292 startTime J + FIELD field_48257 CODEC Lnet/minecraft/class_9139; METHOD (J)V ARG 1 startTime METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12700 getStartTime ()J + METHOD method_56025 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping index ee31f471bb..4d5676a26d 100644 --- a/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_2937 net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket + FIELD field_48259 INSTANCE Lnet/minecraft/class_2937; + FIELD field_48260 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping index a869ccf7ed..d463767282 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping @@ -11,8 +11,10 @@ CLASS net/minecraft/class_6373 net/minecraft/network/packet/s2c/common/CommonPin COMMENT ticks. It is possible to be a tick number given the reply packet is sent on COMMENT the client on the main thread's tick, and the number is sent as a regular int COMMENT than a varint. + FIELD field_48624 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 parameter METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_36950 getParameter ()I + METHOD method_56464 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping index 2af67f3a4e..5094ab84f8 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2661 net/minecraft/network/packet/s2c/common/DisconnectS2CPacket FIELD field_12173 reason Lnet/minecraft/class_2561; + FIELD field_48622 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2561;)V ARG 1 reason METHOD method_11468 getReason ()Lnet/minecraft/class_2561; + METHOD method_56462 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping index 8b3fcbc8cf..ec2406fc31 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2670 net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket FIELD field_12211 id J + FIELD field_48623 CODEC Lnet/minecraft/class_9139; METHOD (J)V ARG 1 id METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11517 getId ()J + METHOD method_56463 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackRemoveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackRemoveS2CPacket.mapping index a1afc9570a..b12a706f9b 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackRemoveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackRemoveS2CPacket.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_9053 net/minecraft/network/packet/s2c/common/ResourcePackRemoveS2CPacket + FIELD field_48625 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56465 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping index 6348105ca4..3d158d45c7 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket FIELD field_33340 MAX_HASH_LENGTH I + FIELD field_48626 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56466 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping index c89d25ca77..67f72b3fa7 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket FIELD field_12757 groups Ljava/util/Map; + FIELD field_48630 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/util/Map;)V ARG 1 groups METHOD (Lnet/minecraft/class_2540;)V @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/common/Synchroni METHOD method_34203 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6864$class_5748;)V ARG 0 bufx ARG 1 serializedGroup + METHOD method_56471 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping index c944afdd9c..0891a915b0 100644 --- a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_8734 net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket FIELD comp_1724 registryManager Lnet/minecraft/class_5455$class_6890; FIELD field_45713 VANILLA_REGISTRY_OPS Lnet/minecraft/class_6903; + FIELD field_48692 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_1724 registryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD method_56508 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping index 03233b3c43..3296b592a7 100644 --- a/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7832 net/minecraft/network/packet/s2c/config/FeaturesS2CPacket + FIELD field_48693 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56509 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping index c56ed193a5..16d10607fa 100644 --- a/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8733 net/minecraft/network/packet/s2c/config/ReadyS2CPacket + FIELD field_48690 INSTANCE Lnet/minecraft/class_8733; + FIELD field_48691 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping index 8919d0f1f6..9e4539838c 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8713 net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload + FIELD field_48662 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48663 PAYLOAD_TYPE Lnet/minecraft/class_8710$class_9154; diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping index 850dcce286..5c6e924c6d 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2907 net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket FIELD field_13232 compressionThreshold I + FIELD field_48236 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 compressionThreshold METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12634 getCompressionThreshold ()I + METHOD method_56014 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping index f16a784753..f0dc263996 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2909 net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket FIELD field_13243 reason Lnet/minecraft/class_2561; + FIELD field_48237 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2561;)V ARG 1 reason METHOD method_12638 getReason ()Lnet/minecraft/class_2561; + METHOD method_56015 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping index abe296fda5..614f6f4b67 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello FIELD field_13209 serverId Ljava/lang/String; FIELD field_13210 nonce [B FIELD field_13211 publicKey [B + FIELD field_48234 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;[B[BZ)V ARG 1 serverId ARG 2 publicKey @@ -11,3 +12,4 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello METHOD method_12610 getServerId ()Ljava/lang/String; METHOD method_12611 getPublicKey ()Ljava/security/PublicKey; METHOD method_12613 getNonce ()[B + METHOD method_56012 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping index dafbf0b80e..8553d4cf76 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2899 net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket FIELD comp_1567 queryId I FIELD field_33373 MAX_PAYLOAD_SIZE I + FIELD field_48232 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_8595;)V ARG 1 queryId METHOD (Lnet/minecraft/class_2540;)V @@ -12,3 +13,4 @@ CLASS net/minecraft/class_2899 net/minecraft/network/packet/s2c/login/LoginQuery METHOD method_52288 readUnknownPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8597; ARG 0 id ARG 1 buf + METHOD method_56010 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping index 67e32c398e..61d8f3facd 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2901 net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket FIELD field_13190 profile Lcom/mojang/authlib/GameProfile; + FIELD field_48233 CODEC Lnet/minecraft/class_9139; METHOD (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12593 getProfile ()Lcom/mojang/authlib/GameProfile; + METHOD method_56011 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping index d816b39a48..addb813971 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement FIELD field_12716 toSetProgress Ljava/util/Map; FIELD field_12717 toEarn Ljava/util/List; FIELD field_12718 clearCurrent Z + FIELD field_48007 CODEC Lnet/minecraft/class_9139; METHOD (ZLjava/util/Collection;Ljava/util/Set;Ljava/util/Map;)V ARG 1 clearCurrent ARG 2 toEarn @@ -15,3 +16,4 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement METHOD method_34197 (Lnet/minecraft/class_2540;Lnet/minecraft/class_167;)V ARG 0 buf2 ARG 1 progress + METHOD method_55952 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping index 40414d11a1..fb4124f966 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2620 net/minecraft/network/packet/s2c/play/BlockBreaki FIELD field_12032 progress I FIELD field_12033 entityId I FIELD field_12034 pos Lnet/minecraft/class_2338; + FIELD field_47902 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_2338;I)V ARG 1 entityId ARG 2 pos @@ -11,3 +12,4 @@ CLASS net/minecraft/class_2620 net/minecraft/network/packet/s2c/play/BlockBreaki METHOD method_11277 getPos ()Lnet/minecraft/class_2338; METHOD method_11278 getProgress ()I METHOD method_11280 getEntityId ()I + METHOD method_55859 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping index 4c4bd01e07..1512602ece 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntity FIELD field_12038 blockEntityType Lnet/minecraft/class_2591; FIELD field_12039 nbt Lnet/minecraft/class_2487; FIELD field_12040 pos Lnet/minecraft/class_2338; + FIELD field_47903 CODEC Lnet/minecraft/class_9139; METHOD method_11290 getNbt ()Lnet/minecraft/class_2487; METHOD method_11291 getBlockEntityType ()Lnet/minecraft/class_2591; METHOD method_11293 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping index 17ccc42074..1bc62a0aaf 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2623 net/minecraft/network/packet/s2c/play/BlockEventS FIELD field_12042 type I FIELD field_12043 block Lnet/minecraft/class_2248; FIELD field_12044 pos Lnet/minecraft/class_2338; + FIELD field_47904 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;II)V ARG 1 pos ARG 2 block @@ -12,3 +13,4 @@ CLASS net/minecraft/class_2623 net/minecraft/network/packet/s2c/play/BlockEventS METHOD method_11295 getBlock ()Lnet/minecraft/class_2248; METHOD method_11296 getData ()I METHOD method_11298 getPos ()Lnet/minecraft/class_2338; + METHOD method_55860 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping index a7325aa8cd..4f2bf579ae 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2626 net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket FIELD field_12051 state Lnet/minecraft/class_2680; FIELD field_12052 pos Lnet/minecraft/class_2338; + FIELD field_47905 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping index a116d92d33..7da1a62a0d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP FIELD field_33314 DARKEN_SKY_MASK I FIELD field_33315 DRAGON_MUSIC_MASK I FIELD field_33316 THICKEN_FOG_MASK I + FIELD field_47906 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/util/UUID;Lnet/minecraft/class_2629$class_5882;)V ARG 1 uuid ARG 2 action @@ -28,6 +29,7 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP ARG 0 bar METHOD method_34098 updateProperties (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629; ARG 0 bar + METHOD method_55861 write (Lnet/minecraft/class_2540;)V CLASS class_5880 AddAction FIELD field_29100 name Lnet/minecraft/class_2561; FIELD field_29101 percent F diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping index 3a3b1c6135..f0c38f13a2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -20,6 +20,8 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage COMMENT @see net.minecraft.server.network.ServerPlayerEntity#sendChatMessage COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onChatMessage FIELD comp_943 serializedParameters Lnet/minecraft/class_2556$class_7603; + FIELD field_47949 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7603; + METHOD method_55898 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping index a92529fc5a..c3bec61fae 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_7597 net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket + FIELD field_47920 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55872 write (Lnet/minecraft/class_2540;)V CLASS class_7598 Action diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping index fa22e521fb..c813b44bb5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_8212 net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket FIELD field_43094 MAX_SIZE I + FIELD field_47911 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_49685 create (Ljava/util/List;)Lnet/minecraft/class_8212; @@ -7,6 +8,7 @@ CLASS net/minecraft/class_8212 net/minecraft/network/packet/s2c/play/ChunkBiomeD METHOD method_49686 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8212$class_8213;)V ARG 0 bufx ARG 1 data + METHOD method_55864 write (Lnet/minecraft/class_2540;)V CLASS class_8213 Serialized METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping index 365be63358..5331c0b489 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData METHOD (Lnet/minecraft/class_2818;)V ARG 1 chunk METHOD (Lnet/minecraft/class_9129;II)V + ARG 1 buf ARG 2 x ARG 3 z METHOD method_38586 getSectionsDataBuf ()Lnet/minecraft/class_2540; @@ -31,14 +32,19 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData FIELD field_34867 y I FIELD field_34868 type Lnet/minecraft/class_2591; FIELD field_34869 nbt Lnet/minecraft/class_2487; + FIELD field_47931 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_47932 LIST_PACKET_CODEC Lnet/minecraft/class_9139; METHOD (IILnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V ARG 1 localXz ARG 2 y ARG 3 type ARG 4 nbt + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_38596 of (Lnet/minecraft/class_2586;)Lnet/minecraft/class_6603$class_6604; ARG 0 blockEntity METHOD method_38597 write (Lnet/minecraft/class_9129;)V + ARG 1 buf CLASS class_6605 BlockEntityVisitor METHOD accept (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V ARG 1 pos diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping index 591271562f..5b881f269c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2637 net/minecraft/network/packet/s2c/play/ChunkDeltaU COMMENT COMMENT @see ChunkSectionPos#packLocal(BlockPos) FIELD field_26347 blockStates [Lnet/minecraft/class_2680; + FIELD field_47964 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_4076;Lit/unimi/dsi/fastutil/shorts/ShortSet;Lnet/minecraft/class_2826;)V @@ -15,3 +16,4 @@ CLASS net/minecraft/class_2637 net/minecraft/network/packet/s2c/play/ChunkDeltaU METHOD method_30621 visitUpdates (Ljava/util/function/BiConsumer;)V COMMENT Calls the given consumer for each pair of block position and block state contained in this packet. ARG 1 visitor + METHOD method_55911 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping index bd5aee03a1..5fd70c230d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_4273 net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket FIELD field_19146 distance I + FIELD field_47976 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 distance METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_20206 getDistance ()I + METHOD method_55923 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping index e0d0ed252e..388c1a9616 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4282 net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket FIELD field_19206 chunkX I FIELD field_19207 chunkZ I + FIELD field_47975 CODEC Lnet/minecraft/class_9139; METHOD (II)V ARG 1 x ARG 2 z @@ -8,3 +9,4 @@ CLASS net/minecraft/class_4282 net/minecraft/network/packet/s2c/play/ChunkRender ARG 1 buf METHOD method_20322 getChunkX ()I METHOD method_20323 getChunkZ ()I + METHOD method_55922 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping index b912dc071d..73daad9198 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_8738 net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket + FIELD field_47908 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55863 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ClearTitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ClearTitleS2CPacket.mapping index 728a2edbe3..c78c8868b5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ClearTitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ClearTitleS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5888 net/minecraft/network/packet/s2c/play/ClearTitleS2CPacket FIELD field_29122 reset Z + FIELD field_47912 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Z)V ARG 1 reset METHOD method_34116 shouldReset ()Z + METHOD method_55865 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping index 0c3cf0b195..1f3b712e18 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2645 net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket FIELD field_12137 syncId I + FIELD field_47915 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 syncId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_36148 getSyncId ()I + METHOD method_55868 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping index 1997dc7166..ebbcb662cd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket FIELD field_12121 suggestions Lcom/mojang/brigadier/suggestion/Suggestions; FIELD field_12122 completionId I + FIELD field_47913 CODEC Lnet/minecraft/class_9139; METHOD (ILcom/mojang/brigadier/suggestion/Suggestions;)V ARG 1 completionId ARG 2 suggestions @@ -16,3 +17,4 @@ CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSugg METHOD method_43880 (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/Message;)V ARG 0 buf3 ARG 1 tooltip + METHOD method_55866 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping index 9f4f16a87d..582282b65f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2641 net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket FIELD field_38038 rootSize I FIELD field_38039 nodes Ljava/util/List; + FIELD field_47914 CODEC Lnet/minecraft/class_9139; METHOD (Lcom/mojang/brigadier/tree/RootCommandNode;)V ARG 1 rootNode METHOD (Lnet/minecraft/class_2540;)V @@ -29,6 +30,7 @@ CLASS net/minecraft/class_2641 net/minecraft/network/packet/s2c/play/CommandTree ARG 1 validator METHOD method_42068 (Ljava/util/function/BiPredicate;Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntSet;I)Z ARG 0 index + METHOD method_55867 write (Lnet/minecraft/class_2540;)V CLASS class_2642 CommandNodeData FIELD field_12124 flags I FIELD field_12125 childNodeIndices [I diff --git a/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping index 5471049c94..4cc402fa15 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2656 net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket FIELD comp_2198 item Lnet/minecraft/class_1792; FIELD comp_2199 cooldown I + FIELD field_47919 CODEC Lnet/minecraft/class_9139; METHOD comp_2198 item ()Lnet/minecraft/class_1792; METHOD comp_2199 cooldown ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping index 93690b39cb..737b281038 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2695 net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket FIELD field_12332 recipeId Lnet/minecraft/class_2960; FIELD field_12333 syncId I + FIELD field_47947 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_8786;)V ARG 1 syncId ARG 2 recipe @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2695 net/minecraft/network/packet/s2c/play/CraftFailed ARG 1 buf METHOD method_11684 getRecipeId ()Lnet/minecraft/class_2960; METHOD method_11685 getSyncId ()I + METHOD method_55896 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping index 4bffd300c0..721d739519 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_8043 net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket + FIELD field_47929 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1309;)V ARG 1 entity METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55881 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping index d2ef187d84..a6c29dc12b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5892 net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket FIELD field_29133 entityId I FIELD field_29135 message Lnet/minecraft/class_2561; + FIELD field_47953 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_2561;)V ARG 1 entityId ARG 2 message @@ -8,3 +9,4 @@ CLASS net/minecraft/class_5892 net/minecraft/network/packet/s2c/play/DeathMessag ARG 1 buf METHOD method_34144 getEntityId ()I METHOD method_34145 getMessage ()Lnet/minecraft/class_2561; + METHOD method_55900 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping index 5a415a5db7..5485eda0d5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2632 net/minecraft/network/packet/s2c/play/DifficultyS2CPacket FIELD field_12090 difficulty Lnet/minecraft/class_1267; FIELD field_12091 difficultyLocked Z + FIELD field_47907 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1267;Z)V ARG 1 difficulty ARG 2 difficultyLocked @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2632 net/minecraft/network/packet/s2c/play/DifficultyS ARG 1 buf METHOD method_11340 isDifficultyLocked ()Z METHOD method_11342 getDifficulty ()Lnet/minecraft/class_1267; + METHOD method_55862 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping index 3aacfc93b6..387e2ea8db 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_5890 net/minecraft/network/packet/s2c/play/EndCombatS2CPacket FIELD field_29132 timeSinceLastAttack I + FIELD field_47950 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 timeSinceLastAttack METHOD (Lnet/minecraft/class_1283;)V ARG 1 damageTracker METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55899 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping index adcb9c355e..47cfb0cf38 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_5891 net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket + FIELD field_47951 INSTANCE Lnet/minecraft/class_5891; + FIELD field_47952 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping index bca7bf51cd..7f207c82fb 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8588 net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket + FIELD field_47997 INSTANCE Lnet/minecraft/class_8588; + FIELD field_47998 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping index 762ec7bc39..86b5a0d239 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2716 net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket FIELD field_33690 entityIds Lit/unimi/dsi/fastutil/ints/IntList; + FIELD field_47959 CODEC Lnet/minecraft/class_9139; METHOD (Lit/unimi/dsi/fastutil/ints/IntList;)V ARG 1 entityIds METHOD (Lnet/minecraft/class_2540;)V @@ -7,3 +8,4 @@ CLASS net/minecraft/class_2716 net/minecraft/network/packet/s2c/play/EntitiesDes METHOD ([I)V ARG 1 entityIds METHOD method_36548 getEntityIds ()Lit/unimi/dsi/fastutil/ints/IntList; + METHOD method_55906 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping index 2349a31a40..955a21ca07 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2616 net/minecraft/network/packet/s2c/play/EntityAnima FIELD field_33298 SWING_OFF_HAND I FIELD field_33299 CRIT I FIELD field_33300 ENCHANTED_HIT I + FIELD field_47898 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;I)V ARG 1 entity ARG 2 animationId @@ -13,3 +14,4 @@ CLASS net/minecraft/class_2616 net/minecraft/network/packet/s2c/play/EntityAnima ARG 1 buf METHOD method_11267 getAnimationId ()I METHOD method_11269 getId ()I + METHOD method_55857 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping index 4ad2c93714..5a2ecb373f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2740 net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket FIELD field_12478 holdingEntityId I FIELD field_12479 attachedEntityId I + FIELD field_47980 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V ARG 1 attachedEntity ARG 2 holdingEntity @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2740 net/minecraft/network/packet/s2c/play/EntityAttac ARG 1 buf METHOD method_11810 getHoldingEntityId ()I METHOD method_11812 getAttachedEntityId ()I + METHOD method_55927 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping index 9725c0c92c..6aabd59a7f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping @@ -1,12 +1,18 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket FIELD field_12719 entityId I FIELD field_12720 entries Ljava/util/List; + FIELD field_48008 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/util/Collection;)V ARG 1 entityId ARG 2 attributes + METHOD (ILjava/util/List;)V + ARG 1 entityId + ARG 2 attributes METHOD method_11937 getEntityId ()I METHOD method_11938 getEntries ()Ljava/util/List; CLASS class_2782 Entry + FIELD field_48009 MODIFIER_CODEC Lnet/minecraft/class_9139; + FIELD field_48010 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_6880;DLjava/util/Collection;)V ARG 2 baseValue ARG 4 modifiers diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping index e5c56643e1..17183b5a2a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket + FIELD field_47921 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V ARG 1 entity ARG 2 damageSource @@ -16,3 +17,4 @@ CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamag ARG 0 buf METHOD method_49076 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_243; ARG 0 pos + METHOD method_55873 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping index d634907a5d..92351cffc1 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_2744 net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket FIELD field_12565 id I FIELD field_25721 equipmentList Ljava/util/List; + FIELD field_47982 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/util/List;)V ARG 1 id ARG 2 equipmentList METHOD method_11820 getId ()I METHOD method_30145 getEquipmentList ()Ljava/util/List; + METHOD method_55929 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping index 5c5a233214..13fbfadf70 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_2752 net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket FIELD field_12593 passengerIds [I FIELD field_12594 id I + FIELD field_47986 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11840 getPassengerIds ()[I METHOD method_11841 getId ()I + METHOD method_55933 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping index 37ec60d4c3..75b42b64eb 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2777 net/minecraft/network/packet/s2c/play/EntityPosit FIELD field_12705 id I FIELD field_12706 pitch B FIELD field_12707 yaw B + FIELD field_48004 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD (Lnet/minecraft/class_2540;)V @@ -17,3 +18,4 @@ CLASS net/minecraft/class_2777 net/minecraft/network/packet/s2c/play/EntityPosit METHOD method_11920 getYaw ()B METHOD method_11921 getPitch ()B METHOD method_11923 isOnGround ()Z + METHOD method_55949 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping index 92b212cbf5..d9c5f0e2d2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPa METHOD method_36151 getDeltaY ()S METHOD method_36152 getDeltaZ ()S CLASS class_2685 MoveRelative + FIELD field_47940 CODEC Lnet/minecraft/class_9139; METHOD (ISSSZ)V ARG 1 entityId ARG 2 deltaX @@ -37,7 +38,9 @@ CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPa ARG 5 onGround METHOD method_34138 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2684$class_2685; ARG 0 buf + METHOD method_55890 write (Lnet/minecraft/class_2540;)V CLASS class_2686 RotateAndMoveRelative + FIELD field_47941 CODEC Lnet/minecraft/class_9139; METHOD (ISSSBBZ)V ARG 1 entityId ARG 2 deltaX @@ -48,7 +51,9 @@ CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPa ARG 7 onGround METHOD method_34139 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2684$class_2686; ARG 0 buf + METHOD method_55891 write (Lnet/minecraft/class_2540;)V CLASS class_2687 Rotate + FIELD field_47942 CODEC Lnet/minecraft/class_9139; METHOD (IBBZ)V ARG 1 entityId ARG 2 yaw @@ -56,3 +61,4 @@ CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPa ARG 4 onGround METHOD method_34140 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2684$class_2687; ARG 0 buf + METHOD method_55892 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping index 20110e4024..e4d0ab5b2d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2726 net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket FIELD field_12436 headYaw B FIELD field_12437 entity I + FIELD field_47963 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;B)V ARG 1 entity ARG 2 headYaw @@ -9,3 +10,4 @@ CLASS net/minecraft/class_2726 net/minecraft/network/packet/s2c/play/EntitySetHe METHOD method_11786 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world METHOD method_11787 getHeadYaw ()B + METHOD method_55910 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping index dfb7e36ea7..f9b1c68a46 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn COMMENT The maximum absolute value allowed for each scalar value (velocity x, y, z) COMMENT in the velocity vector sent by this packet. FIELD field_38817 headYaw B + FIELD field_47896 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/util/UUID;DDDFFLnet/minecraft/class_1299;ILnet/minecraft/class_243;D)V ARG 1 id ARG 2 uuid @@ -50,3 +51,4 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn METHOD method_11175 getX ()D METHOD method_11176 getZ ()D METHOD method_43233 getHeadYaw ()F + METHOD method_55855 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index db0da1f6f6..aa4e1e0daa 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu FIELD field_33357 SHOW_PARTICLES_MASK I FIELD field_33358 SHOW_ICON_MASK I FIELD field_47706 KEEP_FADING_MASK I + FIELD field_48011 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_1293;Z)V ARG 1 entityId ARG 2 effect @@ -20,3 +21,4 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11949 shouldShowParticles ()Z METHOD method_11950 isAmbient ()Z METHOD method_55629 keepFading ()Z + METHOD method_55954 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping index d8cf71f5b4..19285a84b4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2663 net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket FIELD field_12174 status B FIELD field_12175 id I + FIELD field_47924 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;B)V ARG 1 entity ARG 2 status @@ -9,3 +10,4 @@ CLASS net/minecraft/class_2663 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11469 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world METHOD method_11470 getStatus ()B + METHOD method_55876 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping index a85b53fe46..0efab70e36 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2739 net/minecraft/network/packet/s2c/play/EntityTrack FIELD comp_1127 id I FIELD comp_1128 trackedValues Ljava/util/List; FIELD field_40850 MARKER_ID I + FIELD field_47979 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/util/List;)V ARG 1 id METHOD comp_1127 id ()I @@ -9,3 +10,4 @@ CLASS net/minecraft/class_2739 net/minecraft/network/packet/s2c/play/EntityTrack METHOD method_46615 write (Ljava/util/List;Lnet/minecraft/class_9129;)V ARG 0 trackedValues METHOD method_46616 read (Lnet/minecraft/class_9129;)Ljava/util/List; + METHOD method_55926 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping index cc5adc9ce7..36b2b10f15 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2743 net/minecraft/network/packet/s2c/play/EntityVeloc FIELD field_12562 velocityY I FIELD field_12563 velocityX I FIELD field_12564 id I + FIELD field_47981 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_243;)V ARG 1 id ARG 2 velocity @@ -19,3 +20,4 @@ CLASS net/minecraft/class_2743 net/minecraft/network/packet/s2c/play/EntityVeloc METHOD method_11816 getVelocityY ()I METHOD method_11818 getId ()I METHOD method_11819 getVelocityZ ()I + METHOD method_55928 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping index 280f6ee5e6..ab92ef33c1 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2748 net/minecraft/network/packet/s2c/play/ExperienceB FIELD field_12580 barProgress F FIELD field_12581 experience I FIELD field_12582 experienceLevel I + FIELD field_47983 CODEC Lnet/minecraft/class_9139; METHOD (FII)V ARG 1 barProgress ARG 2 experienceLevel @@ -11,3 +12,4 @@ CLASS net/minecraft/class_2748 net/minecraft/network/packet/s2c/play/ExperienceB METHOD method_11827 getExperienceLevel ()I METHOD method_11828 getExperience ()I METHOD method_11830 getBarProgress ()F + METHOD method_55930 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping index c0074139b3..791db2efe5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2606 net/minecraft/network/packet/s2c/play/ExperienceO FIELD field_11972 x D FIELD field_11973 experience I FIELD field_11974 id I + FIELD field_47897 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1303;)V ARG 1 experienceOrbEntity METHOD (Lnet/minecraft/class_2540;)V @@ -13,3 +14,4 @@ CLASS net/minecraft/class_2606 net/minecraft/network/packet/s2c/play/ExperienceO METHOD method_11183 getId ()I METHOD method_11184 getExperience ()I METHOD method_11185 getX ()D + METHOD method_55856 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping index 07d6d7a382..012600c8cf 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 FIELD field_47516 emitterParticle Lnet/minecraft/class_2394; FIELD field_47517 destructionType Lnet/minecraft/class_1927$class_4179; FIELD field_47518 soundEvent Lnet/minecraft/class_6880; + FIELD field_47925 CODEC Lnet/minecraft/class_9139; METHOD (DDDFLjava/util/List;Lnet/minecraft/class_243;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)V ARG 1 x ARG 3 y @@ -45,3 +46,4 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 METHOD method_55329 getParticle ()Lnet/minecraft/class_2394; METHOD method_55330 getEmitterParticle ()Lnet/minecraft/class_2394; METHOD method_55331 getSoundEvent ()Lnet/minecraft/class_6880; + METHOD method_55877 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 42e0917862..6422df8f74 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD comp_97 maxPlayers I FIELD comp_98 viewDistance I FIELD comp_99 reducedDebugInfo Z + FIELD field_47937 CODEC Lnet/minecraft/class_9139; METHOD (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;Z)V ARG 1 playerEntityId METHOD (Lnet/minecraft/class_2540;)V @@ -19,3 +20,4 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C METHOD comp_99 reducedDebugInfo ()Z METHOD method_34135 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5321; ARG 0 b + METHOD method_55887 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping index 41a1bc2f51..721dddca44 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7439 net/minecraft/network/packet/s2c/play/GameMessageS2CPacket + FIELD field_48000 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55945 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping index f1363de605..8aca2c0164 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_2668 net/minecraft/network/packet/s2c/play/GameStateCh FIELD field_33332 DEMO_EXPIRY_NOTICE I FIELD field_46189 LIMITED_CRAFTING_TOGGLED Lnet/minecraft/class_2668$class_5402; FIELD field_46637 INITIAL_CHUNKS_COMING Lnet/minecraft/class_2668$class_5402; + FIELD field_47927 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2668$class_5402;F)V @@ -27,6 +28,7 @@ CLASS net/minecraft/class_2668 net/minecraft/network/packet/s2c/play/GameStateCh ARG 2 value METHOD method_11491 getReason ()Lnet/minecraft/class_2668$class_5402; METHOD method_11492 getValue ()F + METHOD method_55879 write (Lnet/minecraft/class_2540;)V CLASS class_5402 Reason FIELD field_25657 REASONS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_25658 id I diff --git a/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping index 47bbbfd757..5b670aea38 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2749 net/minecraft/network/packet/s2c/play/HealthUpdat FIELD field_12583 saturation F FIELD field_12584 health F FIELD field_12585 food I + FIELD field_47984 CODEC Lnet/minecraft/class_9139; METHOD (FIF)V ARG 1 health ARG 2 food @@ -11,3 +12,4 @@ CLASS net/minecraft/class_2749 net/minecraft/network/packet/s2c/play/HealthUpdat METHOD method_11831 getFood ()I METHOD method_11833 getHealth ()F METHOD method_11834 getSaturation ()F + METHOD method_55931 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping index e071e87b58..f198087107 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2649 net/minecraft/network/packet/s2c/play/InventoryS2 FIELD field_12147 contents Ljava/util/List; FIELD field_34034 revision I FIELD field_34035 cursorStack Lnet/minecraft/class_1799; + FIELD field_47916 CODEC Lnet/minecraft/class_9139; METHOD (IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;)V ARG 1 syncId ARG 2 revision @@ -15,3 +16,4 @@ CLASS net/minecraft/class_2649 net/minecraft/network/packet/s2c/play/InventoryS2 METHOD method_11441 getContents ()Ljava/util/List; METHOD method_37437 getCursorStack ()Lnet/minecraft/class_1799; METHOD method_37438 getRevision ()I + METHOD method_55869 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ItemPickupAnimationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ItemPickupAnimationS2CPacket.mapping index 6642e8fa5c..d0ceb9cc72 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ItemPickupAnimationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ItemPickupAnimationS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2775 net/minecraft/network/packet/s2c/play/ItemPickupA FIELD field_12692 stackAmount I FIELD field_12693 collectorEntityId I FIELD field_12694 entityId I + FIELD field_48003 CODEC Lnet/minecraft/class_9139; METHOD (III)V ARG 1 entityId ARG 2 collectorId @@ -11,3 +12,5 @@ CLASS net/minecraft/class_2775 net/minecraft/network/packet/s2c/play/ItemPickupA METHOD method_11912 getCollectorEntityId ()I METHOD method_11913 getStackAmount ()I METHOD method_11915 getEntityId ()I + METHOD method_55948 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping index c4b1ab1402..9197934112 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2676 net/minecraft/network/packet/s2c/play/LightUpdate FIELD field_12264 chunkZ I FIELD field_12265 chunkX I FIELD field_34872 data Lnet/minecraft/class_6606; + FIELD field_47936 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;)V ARG 1 chunkPos ARG 2 lightProvider @@ -12,3 +13,4 @@ CLASS net/minecraft/class_2676 net/minecraft/network/packet/s2c/play/LightUpdate METHOD method_11554 getChunkZ ()I METHOD method_11558 getChunkX ()I METHOD method_38600 getData ()Lnet/minecraft/class_6606; + METHOD method_55886 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping index c6f36b7742..fd1dbca1d0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2707 net/minecraft/network/packet/s2c/play/LookAtS2CPa FIELD field_12387 lookAtEntity Z FIELD field_12388 entityId I FIELD field_12389 targetAnchor Lnet/minecraft/class_2183$class_2184; + FIELD field_47956 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2183$class_2184;DDD)V ARG 1 selfAnchor ARG 2 targetX @@ -20,3 +21,4 @@ CLASS net/minecraft/class_2707 net/minecraft/network/packet/s2c/play/LookAtS2CPa METHOD method_11730 getSelfAnchor ()Lnet/minecraft/class_2183$class_2184; METHOD method_11732 getTargetPosition (Lnet/minecraft/class_1937;)Lnet/minecraft/class_243; ARG 1 world + METHOD method_55903 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index 2f11232710..9506e8aac3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2 FIELD field_12304 icons Ljava/util/List; FIELD field_17433 locked Z FIELD field_28016 updateData Lnet/minecraft/class_22$class_5637; + FIELD field_47938 CODEC Lnet/minecraft/class_9139; METHOD (IBZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V ARG 1 id ARG 2 scale @@ -27,3 +28,4 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2 ARG 0 buf2 METHOD method_43883 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_20; ARG 0 buf3 + METHOD method_55888 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping index 4fdbe2335a..cd29dc5f1d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2774 net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket FIELD field_12690 nbt Lnet/minecraft/class_2487; FIELD field_12691 transactionId I + FIELD field_48002 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_2487;)V ARG 1 transactionId ARG 2 nbt @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2774 net/minecraft/network/packet/s2c/play/NbtQueryRes ARG 1 buf METHOD method_11910 getTransactionId ()I METHOD method_11911 getNbt ()Lnet/minecraft/class_2487; + METHOD method_55947 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping index 6cf909fceb..47b72183d6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2648 net/minecraft/network/packet/s2c/play/OpenHorseSc FIELD field_12142 horseId I FIELD field_12143 slotCount I FIELD field_12144 syncId I + FIELD field_47928 CODEC Lnet/minecraft/class_9139; METHOD (III)V ARG 1 syncId ARG 2 slotCount @@ -11,3 +12,4 @@ CLASS net/minecraft/class_2648 net/minecraft/network/packet/s2c/play/OpenHorseSc METHOD method_11432 getSyncId ()I METHOD method_11433 getHorseId ()I METHOD method_11434 getSlotCount ()I + METHOD method_55880 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping index 235963dcb2..042fb3caa0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenScreenS FIELD field_17436 syncId I FIELD field_17437 screenHandlerId Lnet/minecraft/class_3917; FIELD field_17438 name Lnet/minecraft/class_2561; + FIELD field_47945 CODEC Lnet/minecraft/class_9139; METHOD method_17592 getSyncId ()I METHOD method_17593 getScreenHandlerType ()Lnet/minecraft/class_3917; METHOD method_17594 getName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping index 4d7d8bea88..3d50097c9e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_3895 net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket FIELD field_17199 hand Lnet/minecraft/class_1268; + FIELD field_47944 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1268;)V ARG 1 hand METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_17188 getHand ()Lnet/minecraft/class_1268; + METHOD method_55894 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping index 2e035ce8d1..d707d36098 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5894 net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket FIELD field_29142 message Lnet/minecraft/class_2561; + FIELD field_47967 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2561;)V ARG 1 message METHOD method_34155 getMessage ()Lnet/minecraft/class_2561; + METHOD method_55914 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping index aca2f9f619..6f2230c586 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_2675 net/minecraft/network/packet/s2c/play/ParticleS2C FIELD field_12258 x D FIELD field_12259 parameters Lnet/minecraft/class_2394; FIELD field_12260 speed F + FIELD field_47935 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2394;ZDDDFFFFI)V ARG 1 parameters ARG 2 longDistance @@ -30,3 +31,4 @@ CLASS net/minecraft/class_2675 net/minecraft/network/packet/s2c/play/ParticleS2C METHOD method_11550 getOffsetZ ()F METHOD method_11551 getParameters ()Lnet/minecraft/class_2394; METHOD method_11552 isLongDistance ()Z + METHOD method_55885 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping index 16b5c5c1c7..709aab2267 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr FIELD field_12641 category Lnet/minecraft/class_3419; FIELD field_12642 sound Lnet/minecraft/class_6880; FIELD field_38819 seed J + FIELD field_47994 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V ARG 1 sound ARG 2 category @@ -18,3 +19,4 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr METHOD method_11883 getEntityId ()I METHOD method_11885 getVolume ()F METHOD method_43235 getSeed ()J + METHOD method_55941 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping index ca0001be23..dd145d9b3e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 FIELD field_12662 pitch F FIELD field_33353 COORDINATE_SCALE F FIELD field_38820 seed J + FIELD field_47995 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;DDDFFJ)V ARG 1 sound ARG 2 category @@ -25,3 +26,4 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 METHOD method_11893 getZ ()D METHOD method_11894 getSound ()Lnet/minecraft/class_6880; METHOD method_43236 getSeed ()J + METHOD method_55942 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping index 56b8cd8f4d..3cef206e40 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_2696 net/minecraft/network/packet/s2c/play/PlayerAbili FIELD field_33337 FLYING_MASK I FIELD field_33338 ALLOW_FLYING_MASK I FIELD field_33339 CREATIVE_MODE_MASK I + FIELD field_47948 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1656;)V ARG 1 abilities METHOD (Lnet/minecraft/class_2540;)V @@ -19,3 +20,4 @@ CLASS net/minecraft/class_2696 net/minecraft/network/packet/s2c/play/PlayerAbili METHOD method_11696 isCreativeMode ()Z METHOD method_11698 isFlying ()Z METHOD method_11699 allowFlying ()Z + METHOD method_55897 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping index 5a13cca298..69f795cb30 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_4463 net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket + FIELD field_47901 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55858 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping index fbaa3ab12e..1cde18f5fd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2772 net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket FIELD field_12683 header Lnet/minecraft/class_2561; FIELD field_12684 footer Lnet/minecraft/class_2561; + FIELD field_48001 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2772 net/minecraft/network/packet/s2c/play/PlayerListH ARG 2 footer METHOD method_11906 getFooter ()Lnet/minecraft/class_2561; METHOD method_11908 getHeader ()Lnet/minecraft/class_2561; + METHOD method_55946 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping index fb6cf9e061..b6d640b02c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS2CPacket FIELD field_12369 entries Ljava/util/List; FIELD field_40698 actions Ljava/util/EnumSet; + FIELD field_47955 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/util/EnumSet;Ljava/util/Collection;)V ARG 1 actions ARG 2 players @@ -19,6 +20,7 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS ARG 1 buf2 METHOD method_46329 getEntries ()Ljava/util/List; METHOD method_46330 getPlayerAdditionEntries ()Ljava/util/List; + METHOD method_55902 write (Lnet/minecraft/class_2540;)V CLASS class_2705 Entry FIELD comp_1107 profile Lcom/mojang/authlib/GameProfile; FIELD comp_1109 latency I diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping index c0d02fb80b..9da2a66eb1 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit FIELD field_12394 teleportId I FIELD field_12395 x D FIELD field_12396 flags Ljava/util/Set; + FIELD field_47957 CODEC Lnet/minecraft/class_9139; METHOD (DDDFFLjava/util/Set;I)V ARG 1 x ARG 3 y @@ -23,3 +24,4 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit METHOD method_11737 getTeleportId ()I METHOD method_11738 getZ ()D METHOD method_11739 getPitch ()F + METHOD method_55904 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping index 896ad94019..69bc5c3c0a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7828 net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket + FIELD field_47954 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55901 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index 4bb2f23a42..78c71e53c6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -3,8 +3,10 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa FIELD field_41730 KEEP_ATTRIBUTES B FIELD field_41731 KEEP_TRACKED_DATA B FIELD field_41732 KEEP_ALL B + FIELD field_47962 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_1729 flag ()B METHOD method_48016 hasFlag (B)Z ARG 1 flag + METHOD method_55909 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping index 12c8c4209a..8f7de7cdc4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2759 net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket FIELD field_12615 pos Lnet/minecraft/class_2338; FIELD field_26381 angle F + FIELD field_47977 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2338;F)V ARG 1 pos ARG 2 angle @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2759 net/minecraft/network/packet/s2c/play/PlayerSpawn ARG 1 buf METHOD method_11870 getPos ()Lnet/minecraft/class_2338; METHOD method_30732 getAngle ()F + METHOD method_55924 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping index 173b5c2601..81b50b5faf 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7827 net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket + FIELD field_47923 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55875 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping index 1daf4d7ed8..330937a992 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket + FIELD field_47960 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_6880;)V ARG 1 entityId METHOD method_11767 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping index 9b17f2dcec..09c10d0179 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7617 net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket + FIELD field_47922 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55874 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping index 60eb84195b..446ae76151 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2736 net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket FIELD field_12464 slot Lnet/minecraft/class_8646; FIELD field_12465 name Ljava/lang/String; + FIELD field_47978 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)V @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2736 net/minecraft/network/packet/s2c/play/ScoreboardD ARG 2 objective METHOD method_11804 getName ()Ljava/lang/String; METHOD method_11806 getSlot ()Lnet/minecraft/class_8646; + METHOD method_55925 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping index 85f95e6f1b..fe1d41a470 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2751 net/minecraft/network/packet/s2c/play/ScoreboardO FIELD field_33344 REMOVE_MODE I FIELD field_33345 UPDATE_MODE I FIELD field_47519 numberFormat Ljava/util/Optional; + FIELD field_47985 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_266;I)V ARG 1 objective ARG 2 mode @@ -15,3 +16,4 @@ CLASS net/minecraft/class_2751 net/minecraft/network/packet/s2c/play/ScoreboardO METHOD method_11837 getMode ()I METHOD method_11839 getType ()Lnet/minecraft/class_274$class_275; METHOD method_55336 getNumberFormat ()Ljava/util/Optional; + METHOD method_55932 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreResetS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreResetS2CPacket.mapping index 8e0a77adc0..7a1e51f969 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreResetS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreResetS2CPacket.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_9006 net/minecraft/network/packet/s2c/play/ScoreboardScoreResetS2CPacket FIELD comp_2120 scoreHolderName Ljava/lang/String; + FIELD field_47961 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_2120 scoreHolderName ()Ljava/lang/String; + METHOD method_55908 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping index c0f532bc40..9ae90790b5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2757 net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket FIELD comp_2122 scoreHolderName Ljava/lang/String; + FIELD field_47988 CODEC Lnet/minecraft/class_9139; METHOD comp_2122 scoreHolderName ()Ljava/lang/String; + METHOD method_55935 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping index c4399816e8..04c96c4e58 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2651 net/minecraft/network/packet/s2c/play/ScreenHandl FIELD field_12148 value I FIELD field_12149 propertyId I FIELD field_12150 syncId I + FIELD field_47917 CODEC Lnet/minecraft/class_9139; METHOD (III)V ARG 1 syncId ARG 2 propertyId @@ -11,3 +12,4 @@ CLASS net/minecraft/class_2651 net/minecraft/network/packet/s2c/play/ScreenHandl METHOD method_11445 getPropertyId ()I METHOD method_11446 getValue ()I METHOD method_11448 getSyncId ()I + METHOD method_55870 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping index 609cc5b734..253ae112be 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandl FIELD field_33324 UPDATE_CURSOR_SYNC_ID I FIELD field_33325 UPDATE_PLAYER_INVENTORY_SYNC_ID I FIELD field_34036 revision I + FIELD field_47918 CODEC Lnet/minecraft/class_9139; METHOD (IIILnet/minecraft/class_1799;)V ARG 1 syncId ARG 2 revision @@ -14,3 +15,4 @@ CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandl METHOD method_11450 getSlot ()I METHOD method_11452 getSyncId ()I METHOD method_37439 getRevision ()I + METHOD method_55871 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping index e2f0f90d19..1f1cd46103 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2729 net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket FIELD field_12440 tabId Lnet/minecraft/class_2960; + FIELD field_47965 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2960;)V ARG 1 tabId METHOD method_11793 getTabId ()Lnet/minecraft/class_2960; + METHOD method_55912 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping index 01f4eca067..96372eea8a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_7495 net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket FIELD field_39387 description Lnet/minecraft/class_2561; FIELD field_42967 favicon Ljava/util/Optional; + FIELD field_47966 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2561;Ljava/util/Optional;)V @@ -8,3 +9,4 @@ CLASS net/minecraft/class_7495 net/minecraft/network/packet/s2c/play/ServerMetad ARG 2 favicon METHOD method_44132 getDescription ()Lnet/minecraft/class_2561; METHOD method_49398 getFavicon ()Ljava/util/Optional; + METHOD method_55913 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping index dce4be09ae..cfd195a414 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_2734 net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket FIELD field_12462 entityId I + FIELD field_47973 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11800 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world + METHOD method_55920 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping index 6bf7e72e2f..d732213833 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_3943 net/minecraft/network/packet/s2c/play/SetTradeOff FIELD field_18802 experience I FIELD field_18803 leveled Z FIELD field_19376 refreshable Z + FIELD field_47939 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_1916;IIZZ)V ARG 1 syncId ARG 2 offers @@ -18,3 +19,4 @@ CLASS net/minecraft/class_3943 net/minecraft/network/packet/s2c/play/SetTradeOff METHOD method_19459 getExperience ()I METHOD method_19460 isLeveled ()Z METHOD method_20722 isRefreshable ()Z + METHOD method_55889 write (Lnet/minecraft/class_9129;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping index 94b400bdb5..d32d04f34e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2693 net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket FIELD field_12325 pos Lnet/minecraft/class_2338; FIELD field_43387 front Z + FIELD field_47946 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2338;Z)V ARG 1 pos ARG 2 front @@ -8,3 +9,4 @@ CLASS net/minecraft/class_2693 net/minecraft/network/packet/s2c/play/SignEditorO ARG 1 buf METHOD method_11677 getPos ()Lnet/minecraft/class_2338; METHOD method_49995 isFront ()Z + METHOD method_55895 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping index 1298e8d46f..ca0c610656 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_6682 net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket + FIELD field_47989 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55936 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping index ca4cde21a3..60f8376d63 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8739 net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket + FIELD field_47909 INSTANCE Lnet/minecraft/class_8739; + FIELD field_47910 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping index d6e832cd10..c36a5ff3ab 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2770 net/minecraft/network/packet/s2c/play/StopSoundS2 FIELD field_12677 category Lnet/minecraft/class_3419; FIELD field_33354 CATEGORY_MASK I FIELD field_33355 SOUND_ID_MASK I + FIELD field_47999 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;)V @@ -10,3 +11,4 @@ CLASS net/minecraft/class_2770 net/minecraft/network/packet/s2c/play/StopSoundS2 ARG 2 category METHOD method_11903 getCategory ()Lnet/minecraft/class_3419; METHOD method_11904 getSoundId ()Lnet/minecraft/class_2960; + METHOD method_55944 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping index e8215f1327..92001b8cfb 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5903 net/minecraft/network/packet/s2c/play/SubtitleS2CPacket FIELD field_29165 subtitle Lnet/minecraft/class_2561; + FIELD field_47990 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2561;)V ARG 1 subtitle METHOD method_34190 getSubtitle ()Lnet/minecraft/class_2561; + METHOD method_55937 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping index f5c832575b..a9da8f3d86 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_2788 net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket FIELD field_12751 recipes Ljava/util/List; + FIELD field_48012 CODEC Lnet/minecraft/class_9139; METHOD method_11998 getRecipes ()Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping index 24e5901e96..bc86d870db 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack FIELD field_33352 SECOND_MAX_VISIBILITY_OR_COLLISION_RULE_LENGTH I COMMENT One of the name tag visibility rule or collision rule strings' max length. COMMENT Has value {@value}. + FIELD field_47987 CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;ILjava/util/Optional;Ljava/util/Collection;)V ARG 1 teamName ARG 2 packetType @@ -47,6 +48,7 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack METHOD method_34177 getTeamName ()Ljava/lang/String; METHOD method_34178 getPlayerNames ()Ljava/util/Collection; METHOD method_34179 getTeam ()Ljava/util/Optional; + METHOD method_55934 write (Lnet/minecraft/class_2540;)V CLASS class_5901 Operation CLASS class_5902 SerializableTeam FIELD field_29158 displayName Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/TickStepS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TickStepS2CPacket.mapping index 04d76415fc..e9e92fb5ec 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TickStepS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TickStepS2CPacket.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_8914 net/minecraft/network/packet/s2c/play/TickStepS2CPacket + FIELD field_48006 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_54666 create (Lnet/minecraft/class_8921;)Lnet/minecraft/class_8914; ARG 0 tickManager + METHOD method_55951 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/TitleFadeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TitleFadeS2CPacket.mapping index e26c78abac..b1dac1f9a0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TitleFadeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TitleFadeS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5905 net/minecraft/network/packet/s2c/play/TitleFadeS2 FIELD field_29167 fadeInTicks I FIELD field_29168 stayTicks I FIELD field_29169 fadeOutTicks I + FIELD field_47993 CODEC Lnet/minecraft/class_9139; METHOD (III)V ARG 1 fadeInTicks ARG 2 stayTicks @@ -11,3 +12,4 @@ CLASS net/minecraft/class_5905 net/minecraft/network/packet/s2c/play/TitleFadeS2 METHOD method_34194 getFadeInTicks ()I METHOD method_34195 getStayTicks ()I METHOD method_34196 getFadeOutTicks ()I + METHOD method_55940 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping index e303be0f09..036bce91a0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5904 net/minecraft/network/packet/s2c/play/TitleS2CPacket FIELD field_29166 title Lnet/minecraft/class_2561; + FIELD field_47992 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2561;)V ARG 1 title METHOD method_34192 getTitle ()Lnet/minecraft/class_2561; + METHOD method_55939 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping index 9f578cd60e..0f391f6044 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2666 net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket + FIELD field_47926 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_55878 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping index 4295adfe6c..f9c504a19f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2713 net/minecraft/network/packet/s2c/play/UnlockRecip FIELD field_12409 recipeIdsToInit Ljava/util/List; FIELD field_12414 recipeIdsToChange Ljava/util/List; FIELD field_25797 options Lnet/minecraft/class_5411; + FIELD field_47958 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2713$class_2714;Ljava/util/Collection;Ljava/util/Collection;Lnet/minecraft/class_5411;)V @@ -14,4 +15,5 @@ CLASS net/minecraft/class_2713 net/minecraft/network/packet/s2c/play/UnlockRecip METHOD method_11751 getAction ()Lnet/minecraft/class_2713$class_2714; METHOD method_11756 getOptions ()Lnet/minecraft/class_5411; METHOD method_11757 getRecipeIdsToInit ()Ljava/util/List; + METHOD method_55905 write (Lnet/minecraft/class_2540;)V CLASS class_2714 Action diff --git a/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping index 1285cb148d..d0ae5af959 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2735 net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket FIELD field_12463 slot I + FIELD field_47974 CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 slot METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11803 getSlot ()I + METHOD method_55921 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket.mapping index cf11134916..57aff7eab4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_8913 net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket + FIELD field_48005 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_54664 create (Lnet/minecraft/class_8921;)Lnet/minecraft/class_8913; ARG 0 tickManager + METHOD method_55950 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping index 343b95868a..cffd377c58 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2692 net/minecraft/network/packet/s2c/play/VehicleMove FIELD field_12322 y D FIELD field_12323 yaw F FIELD field_12324 x D + FIELD field_47943 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD (Lnet/minecraft/class_2540;)V @@ -13,3 +14,4 @@ CLASS net/minecraft/class_2692 net/minecraft/network/packet/s2c/play/VehicleMove METHOD method_11673 getX ()D METHOD method_11674 getY ()D METHOD method_11675 getYaw ()F + METHOD method_55893 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderCenterChangedS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderCenterChangedS2CPacket.mapping index ee52f3d3fd..d815933cb4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderCenterChangedS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderCenterChangedS2CPacket.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_5895 net/minecraft/network/packet/s2c/play/WorldBorderCenterChangedS2CPacket FIELD field_29143 centerX D FIELD field_29144 centerZ D + FIELD field_47968 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2784;)V ARG 1 worldBorder METHOD method_34157 getCenterZ ()D METHOD method_34158 getCenterX ()D + METHOD method_55915 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInitializeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInitializeS2CPacket.mapping index f5c17a3ab2..749930765e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInitializeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInitializeS2CPacket.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_5889 net/minecraft/network/packet/s2c/play/WorldBorder FIELD field_29128 maxRadius I FIELD field_29129 warningBlocks I FIELD field_29130 warningTime I + FIELD field_47930 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2784;)V @@ -19,3 +20,4 @@ CLASS net/minecraft/class_5889 net/minecraft/network/packet/s2c/play/WorldBorder METHOD method_34129 getMaxRadius ()I METHOD method_34130 getWarningTime ()I METHOD method_34131 getWarningBlocks ()I + METHOD method_55882 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInterpolateSizeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInterpolateSizeS2CPacket.mapping index 4e2caeae40..3adce00b56 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInterpolateSizeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInterpolateSizeS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5896 net/minecraft/network/packet/s2c/play/WorldBorder FIELD field_29145 size D FIELD field_29146 sizeLerpTarget D FIELD field_29147 sizeLerpTime J + FIELD field_47969 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2784;)V @@ -9,3 +10,4 @@ CLASS net/minecraft/class_5896 net/minecraft/network/packet/s2c/play/WorldBorder METHOD method_34160 getSize ()D METHOD method_34161 getSizeLerpTarget ()D METHOD method_34162 getSizeLerpTime ()J + METHOD method_55916 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderSizeChangedS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderSizeChangedS2CPacket.mapping index 74255628a6..0e8b7cfe06 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderSizeChangedS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderSizeChangedS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5897 net/minecraft/network/packet/s2c/play/WorldBorderSizeChangedS2CPacket FIELD field_29148 sizeLerpTarget D + FIELD field_47970 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2784;)V ARG 1 worldBorder METHOD method_34164 getSizeLerpTarget ()D + METHOD method_55917 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningBlocksChangedS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningBlocksChangedS2CPacket.mapping index 83c2e6b3a0..16d853cb26 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningBlocksChangedS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningBlocksChangedS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5899 net/minecraft/network/packet/s2c/play/WorldBorderWarningBlocksChangedS2CPacket FIELD field_29150 warningBlocks I + FIELD field_47972 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2784;)V ARG 1 worldBorder METHOD method_34168 getWarningBlocks ()I + METHOD method_55919 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningTimeChangedS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningTimeChangedS2CPacket.mapping index a7e7f4a68a..d356c4ddab 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningTimeChangedS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningTimeChangedS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5898 net/minecraft/network/packet/s2c/play/WorldBorderWarningTimeChangedS2CPacket FIELD field_29149 warningTime I + FIELD field_47971 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2784;)V ARG 1 worldBorder METHOD method_34166 getWarningTime ()I + METHOD method_55918 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping index 4f3b8643f1..0ef37b9b71 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2673 net/minecraft/network/packet/s2c/play/WorldEventS FIELD field_12240 global Z FIELD field_12241 eventId I FIELD field_12242 pos Lnet/minecraft/class_2338; + FIELD field_47934 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_2338;IZ)V ARG 1 eventId ARG 2 pos @@ -14,3 +15,4 @@ CLASS net/minecraft/class_2673 net/minecraft/network/packet/s2c/play/WorldEventS METHOD method_11532 getEventId ()I METHOD method_11533 isGlobal ()Z METHOD method_11534 getData ()I + METHOD method_55884 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping index 3d543c83a5..80985a1e44 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2761 net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket FIELD field_12620 timeOfDay J FIELD field_12621 time J + FIELD field_47991 CODEC Lnet/minecraft/class_9139; METHOD (JJZ)V ARG 1 time ARG 3 timeOfDay @@ -9,3 +10,4 @@ CLASS net/minecraft/class_2761 net/minecraft/network/packet/s2c/play/WorldTimeUp ARG 1 buf METHOD method_11871 getTime ()J METHOD method_11873 getTimeOfDay ()J + METHOD method_55938 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping index b8d849401f..d4507fb2c3 100644 --- a/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2923 net/minecraft/network/packet/s2c/query/PingResultS2CPacket FIELD comp_2201 startTime J + FIELD field_48254 CODEC Lnet/minecraft/class_9139; METHOD (J)V ARG 1 startTime METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_2201 startTime ()J + METHOD method_56022 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping index 7faf42c575..d473fb80d9 100644 --- a/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2924 net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket FIELD comp_1272 metadata Lnet/minecraft/class_2926; + FIELD field_48258 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2926;)V ARG 1 metadata METHOD comp_1272 metadata ()Lnet/minecraft/class_2926; + METHOD method_56026 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/particle/DefaultParticleType.mapping b/mappings/net/minecraft/particle/DefaultParticleType.mapping index 7a45123395..7810fb0013 100644 --- a/mappings/net/minecraft/particle/DefaultParticleType.mapping +++ b/mappings/net/minecraft/particle/DefaultParticleType.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2400 net/minecraft/particle/DefaultParticleType FIELD field_11259 PARAMETER_FACTORY Lnet/minecraft/class_2394$class_2395; FIELD field_25127 codec Lcom/mojang/serialization/Codec; + FIELD field_48460 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Z)V ARG 1 alwaysShow diff --git a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping index d2d467b40a..de61cfa564 100644 --- a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticl FIELD field_28269 CODEC Lcom/mojang/serialization/Codec; FIELD field_28270 FACTORY Lnet/minecraft/class_2394$class_2395; FIELD field_28271 toColor Lorg/joml/Vector3f; + FIELD field_48454 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;F)V ARG 1 fromColor ARG 2 toColor diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping index 48767287c6..11706f59aa 100644 --- a/mappings/net/minecraft/particle/DustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect FIELD field_11189 PARAMETERS_FACTORY Lnet/minecraft/class_2394$class_2395; FIELD field_25124 CODEC Lcom/mojang/serialization/Codec; FIELD field_28272 RED Lorg/joml/Vector3f; + FIELD field_48455 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_33115 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_33116 (Lnet/minecraft/class_2390;)Ljava/lang/Float; diff --git a/mappings/net/minecraft/particle/ParticleType.mapping b/mappings/net/minecraft/particle/ParticleType.mapping index e695bb03c6..08a7906c35 100644 --- a/mappings/net/minecraft/particle/ParticleType.mapping +++ b/mappings/net/minecraft/particle/ParticleType.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_2396 net/minecraft/particle/ParticleType METHOD method_10298 getParametersFactory ()Lnet/minecraft/class_2394$class_2395; METHOD method_10299 shouldAlwaysSpawn ()Z METHOD method_29138 getCodec ()Lcom/mojang/serialization/Codec; + METHOD method_56179 getPacketCodec ()Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/particle/ParticleTypes.mapping b/mappings/net/minecraft/particle/ParticleTypes.mapping index 31606fdb44..fc5dc4fe87 100644 --- a/mappings/net/minecraft/particle/ParticleTypes.mapping +++ b/mappings/net/minecraft/particle/ParticleTypes.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes FIELD field_25125 TYPE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_48456 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_10303 register (Ljava/lang/String;Z)Lnet/minecraft/class_2400; ARG 0 name ARG 1 alwaysShow @@ -10,3 +11,5 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes ARG 3 codecGetter METHOD method_42616 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec; ARG 0 type + METHOD method_56180 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139; + ARG 0 type diff --git a/mappings/net/minecraft/particle/SculkChargeParticleEffect.mapping b/mappings/net/minecraft/particle/SculkChargeParticleEffect.mapping index 6307ab16f9..980737065c 100644 --- a/mappings/net/minecraft/particle/SculkChargeParticleEffect.mapping +++ b/mappings/net/minecraft/particle/SculkChargeParticleEffect.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_7227 net/minecraft/particle/SculkChargeParticleEffect FIELD field_38005 CODEC Lcom/mojang/serialization/Codec; FIELD field_38006 FACTORY Lnet/minecraft/class_2394$class_2395; + FIELD field_48458 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_42024 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_42025 (Lnet/minecraft/class_7227;)Ljava/lang/Float; diff --git a/mappings/net/minecraft/particle/ShriekParticleEffect.mapping b/mappings/net/minecraft/particle/ShriekParticleEffect.mapping index 57f1753dca..67151e4aff 100644 --- a/mappings/net/minecraft/particle/ShriekParticleEffect.mapping +++ b/mappings/net/minecraft/particle/ShriekParticleEffect.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_7290 net/minecraft/particle/ShriekParticleEffect FIELD field_38358 CODEC Lcom/mojang/serialization/Codec; FIELD field_38359 FACTORY Lnet/minecraft/class_2394$class_2395; FIELD field_38360 delay I + FIELD field_48459 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 delay METHOD method_42617 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; @@ -9,3 +10,5 @@ CLASS net/minecraft/class_7290 net/minecraft/particle/ShriekParticleEffect METHOD method_42618 (Lnet/minecraft/class_7290;)Ljava/lang/Integer; ARG 0 particleEffect METHOD method_42619 getDelay ()I + METHOD method_56186 (Lnet/minecraft/class_7290;)Ljava/lang/Integer; + ARG 0 effect diff --git a/mappings/net/minecraft/particle/VibrationParticleEffect.mapping b/mappings/net/minecraft/particle/VibrationParticleEffect.mapping index b3bd87b8c7..641656ed7b 100644 --- a/mappings/net/minecraft/particle/VibrationParticleEffect.mapping +++ b/mappings/net/minecraft/particle/VibrationParticleEffect.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_5745 net/minecraft/particle/VibrationParticleEffect FIELD field_28278 PARAMETERS_FACTORY Lnet/minecraft/class_2394$class_2395; FIELD field_38361 destination Lnet/minecraft/class_5716; FIELD field_38362 arrivalInTicks I + FIELD field_48461 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_5716;I)V ARG 1 destination ARG 2 arrivalInTicks diff --git a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping index 7661502fe3..d9dda52b1b 100644 --- a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_3957 net/minecraft/recipe/CookingRecipeSerializer FIELD field_17552 recipeFactory Lnet/minecraft/class_1874$class_3958; FIELD field_46105 codec Lcom/mojang/serialization/Codec; + FIELD field_48361 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1874$class_3958;I)V ARG 1 recipeFactory ARG 2 cookingTime + METHOD method_17735 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_1874;)V + ARG 1 buf + ARG 2 recipe + METHOD method_17737 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_1874; + ARG 1 buf METHOD method_53766 (ILnet/minecraft/class_1874$class_3958;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 2 instance METHOD method_53767 (Lnet/minecraft/class_1874;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index 545d615b3f..00f73ed569 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe CLASS class_3973 Serializer FIELD field_17648 recipeFactory Lnet/minecraft/class_3972$class_3974; FIELD field_46107 codec Lcom/mojang/serialization/Codec; + FIELD field_48363 packetCodec Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_3972$class_3974;)V ARG 1 recipeFactory METHOD method_53774 (Lnet/minecraft/class_3972$class_3974;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 7fbda05c4a..7bbac22bd8 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient FIELD field_46095 ALLOW_EMPTY_CODEC Lcom/mojang/serialization/Codec; FIELD field_46096 DISALLOW_EMPTY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_48355 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_9016 ids Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_9017 EMPTY Lnet/minecraft/class_1856; FIELD field_9018 matchingStacks [Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/recipe/RawShapedRecipe.mapping b/mappings/net/minecraft/recipe/RawShapedRecipe.mapping index deec5ba431..7931e89a71 100644 --- a/mappings/net/minecraft/recipe/RawShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/RawShapedRecipe.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_8957 net/minecraft/recipe/RawShapedRecipe FIELD field_47321 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_47322 MAX_WIDTH_AND_HEIGHT I + FIELD field_48359 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_55078 matches (Lnet/minecraft/class_8566;)Z ARG 1 inventory METHOD method_55079 matches (Lnet/minecraft/class_8566;IIZ)Z diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping index 2c7adf41aa..7d82287091 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe COMMENT or recipe books. Users can have stub implementations if they do not use COMMENT those functionalities. FIELD field_47319 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48356 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_17447 createIcon ()Lnet/minecraft/class_1799; COMMENT {@return an item rendered on the top left of the {@linkplain #getResult(DynamicRegistryManager) COMMENT output preview} on the recipe toast when a new recipe is unlocked} This diff --git a/mappings/net/minecraft/recipe/RecipeEntry.mapping b/mappings/net/minecraft/recipe/RecipeEntry.mapping index 1cf744d851..0891413346 100644 --- a/mappings/net/minecraft/recipe/RecipeEntry.mapping +++ b/mappings/net/minecraft/recipe/RecipeEntry.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_8786 net/minecraft/recipe/RecipeEntry FIELD comp_1932 id Lnet/minecraft/class_2960; FIELD comp_1933 value Lnet/minecraft/class_1860; + FIELD field_48357 PACKET_CODEC Lnet/minecraft/class_9139; METHOD comp_1932 id ()Lnet/minecraft/class_2960; METHOD comp_1933 value ()Lnet/minecraft/class_1860; METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/recipe/RecipeSerializer.mapping b/mappings/net/minecraft/recipe/RecipeSerializer.mapping index 5b9a1229aa..42fbd81504 100644 --- a/mappings/net/minecraft/recipe/RecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializer.mapping @@ -33,3 +33,4 @@ CLASS net/minecraft/class_1865 net/minecraft/recipe/RecipeSerializer ARG 0 id ARG 1 serializer METHOD method_53736 codec ()Lcom/mojang/serialization/Codec; + METHOD method_56104 packetCodec ()Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/recipe/ShapedRecipe.mapping b/mappings/net/minecraft/recipe/ShapedRecipe.mapping index e60f2bf54f..39e6a334e4 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe METHOD method_8158 getHeight ()I CLASS class_1870 Serializer FIELD field_46102 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48358 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_55071 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_55072 (Lnet/minecraft/class_1869;)Ljava/lang/Boolean; @@ -35,3 +36,8 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe ARG 0 recipe METHOD method_55076 (Lnet/minecraft/class_1869;)Ljava/lang/String; ARG 0 recipe + METHOD method_8163 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_1869; + ARG 0 buf + METHOD method_8165 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_1869;)V + ARG 0 buf + ARG 1 recipe diff --git a/mappings/net/minecraft/recipe/ShapelessRecipe.mapping b/mappings/net/minecraft/recipe/ShapelessRecipe.mapping index 83c8164509..7431c24383 100644 --- a/mappings/net/minecraft/recipe/ShapelessRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapelessRecipe.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_1867 net/minecraft/recipe/ShapelessRecipe ARG 4 ingredients CLASS class_1868 Serializer FIELD field_46104 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48360 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_53757 (Lnet/minecraft/class_1856;)Z ARG 0 ingredient METHOD method_53758 (Lnet/minecraft/class_1867;)Lnet/minecraft/class_2371; @@ -24,3 +25,8 @@ CLASS net/minecraft/class_1867 net/minecraft/recipe/ShapelessRecipe ARG 0 recipe METHOD method_53765 (Lnet/minecraft/class_1867;)Ljava/lang/String; ARG 0 recipe + METHOD method_8141 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_1867; + ARG 0 buf + METHOD method_8143 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_1867;)V + ARG 0 buf + ARG 1 recipe diff --git a/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping b/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping index 1951dbd4a3..b1f0f02d93 100644 --- a/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping @@ -10,6 +10,12 @@ CLASS net/minecraft/class_8060 net/minecraft/recipe/SmithingTransformRecipe ARG 4 result CLASS class_8061 Serializer FIELD field_46108 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48364 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_48456 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_8060; + ARG 0 buf + METHOD method_48457 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_8060;)V + ARG 0 buf + ARG 1 recipe METHOD method_53779 (Lnet/minecraft/class_8060;)Lnet/minecraft/class_1799; ARG 0 recipe METHOD method_53780 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping index 24201c8147..afa28c6832 100644 --- a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping @@ -8,6 +8,12 @@ CLASS net/minecraft/class_8062 net/minecraft/recipe/SmithingTrimRecipe ARG 3 addition CLASS class_8063 Serializer FIELD field_46109 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48365 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_48460 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_8062; + ARG 0 buf + METHOD method_48461 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_8062;)V + ARG 0 buf + ARG 1 recipe METHOD method_53784 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_1856; ARG 0 recipe METHOD method_53785 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping b/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping index 0a9a52bbc7..ea7f1c00fb 100644 --- a/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1866 net/minecraft/recipe/SpecialRecipeSerializer COMMENT serializer have IDs starting with {@code crafting_special_}. All of their logic and ingredients COMMENT are also defined in code, which distinguishes them from "non-special" recipes. FIELD field_46106 codec Lcom/mojang/serialization/Codec; + FIELD field_48362 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_9046 factory Lnet/minecraft/class_1866$class_7711; METHOD (Lnet/minecraft/class_1866$class_7711;)V ARG 1 factory diff --git a/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping index 3bb034d0b7..c51c9d4c06 100644 --- a/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping +++ b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_7710 net/minecraft/recipe/book/CraftingRecipeCategory FIELD field_40252 CODEC Lcom/mojang/serialization/Codec; FIELD field_40253 id Ljava/lang/String; + FIELD field_48352 INDEX_TO_VALUE Ljava/util/function/IntFunction; + FIELD field_48353 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48354 index I METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 id + ARG 4 index + METHOD method_56101 getIndex ()I diff --git a/mappings/net/minecraft/registry/RegistryKey.mapping b/mappings/net/minecraft/registry/RegistryKey.mapping index b1ec48ea58..d694df50a9 100644 --- a/mappings/net/minecraft/registry/RegistryKey.mapping +++ b/mappings/net/minecraft/registry/RegistryKey.mapping @@ -58,6 +58,8 @@ CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey COMMENT by passing the registry {@code E}. ARG 1 registryRef METHOD method_41185 getRegistry ()Lnet/minecraft/class_2960; + METHOD method_56038 createPacketCodec (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + ARG 0 registry 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/scoreboard/number/BlankNumberFormat.mapping b/mappings/net/minecraft/scoreboard/number/BlankNumberFormat.mapping index 7f46458296..f23fdffeb9 100644 --- a/mappings/net/minecraft/scoreboard/number/BlankNumberFormat.mapping +++ b/mappings/net/minecraft/scoreboard/number/BlankNumberFormat.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_9020 net/minecraft/scoreboard/number/BlankNumberFormat FIELD field_47558 TYPE Lnet/minecraft/class_9023; CLASS 1 FIELD field_47559 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_48542 PACKET_CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/scoreboard/number/FixedNumberFormat.mapping b/mappings/net/minecraft/scoreboard/number/FixedNumberFormat.mapping index c8200565dc..e2fc53c93d 100644 --- a/mappings/net/minecraft/scoreboard/number/FixedNumberFormat.mapping +++ b/mappings/net/minecraft/scoreboard/number/FixedNumberFormat.mapping @@ -5,5 +5,6 @@ CLASS net/minecraft/class_9021 net/minecraft/scoreboard/number/FixedNumberFormat ARG 1 text CLASS 1 FIELD field_47562 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_48543 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_55465 (Lnet/minecraft/class_9021;)Lnet/minecraft/class_2561; ARG 0 format diff --git a/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping b/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping index c953ac255e..2a80c3f861 100644 --- a/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping +++ b/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_9023 net/minecraft/scoreboard/number/NumberFormatType METHOD method_55458 getCodec ()Lcom/mojang/serialization/MapCodec; + METHOD method_56360 getPacketCodec ()Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping b/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping index 75e037de53..fc71fa8a7d 100644 --- a/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping +++ b/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_9024 net/minecraft/scoreboard/number/NumberFormatTypes FIELD field_47563 REGISTRY_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_47564 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48544 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48545 OPTIONAL_PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_55466 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_9023; ARG 0 registry METHOD method_55469 (Lnet/minecraft/class_9023;)Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/scoreboard/number/StyledNumberFormat.mapping b/mappings/net/minecraft/scoreboard/number/StyledNumberFormat.mapping index cf5b93f9f0..e0abbcb0a6 100644 --- a/mappings/net/minecraft/scoreboard/number/StyledNumberFormat.mapping +++ b/mappings/net/minecraft/scoreboard/number/StyledNumberFormat.mapping @@ -8,5 +8,6 @@ CLASS net/minecraft/class_9025 net/minecraft/scoreboard/number/StyledNumberForma ARG 1 style CLASS 1 FIELD field_47570 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_48546 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_55472 (Lnet/minecraft/class_9025;)Lnet/minecraft/class_2583; ARG 0 format diff --git a/mappings/net/minecraft/sound/SoundEvent.mapping b/mappings/net/minecraft/sound/SoundEvent.mapping index b22fc9916b..54cba73fd3 100644 --- a/mappings/net/minecraft/sound/SoundEvent.mapping +++ b/mappings/net/minecraft/sound/SoundEvent.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent FIELD field_41661 DEFAULT_DISTANCE_TO_TRAVEL F FIELD field_41698 CODEC Lcom/mojang/serialization/Codec; FIELD field_41699 ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_48278 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48279 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2960;FZ)V ARG 1 id ARG 2 distanceToTravel diff --git a/mappings/net/minecraft/stat/Stat.mapping b/mappings/net/minecraft/stat/Stat.mapping index d56d058be0..2e49ebfeb2 100644 --- a/mappings/net/minecraft/stat/Stat.mapping +++ b/mappings/net/minecraft/stat/Stat.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3445 net/minecraft/stat/Stat FIELD field_15319 formatter Lnet/minecraft/class_3446; FIELD field_15320 value Ljava/lang/Object; FIELD field_15321 type Lnet/minecraft/class_3448; + FIELD field_48280 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_3448;Ljava/lang/Object;Lnet/minecraft/class_3446;)V ARG 1 type ARG 2 value diff --git a/mappings/net/minecraft/stat/StatType.mapping b/mappings/net/minecraft/stat/StatType.mapping index 8b742f1ff7..b3b6404cb6 100644 --- a/mappings/net/minecraft/stat/StatType.mapping +++ b/mappings/net/minecraft/stat/StatType.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3448 net/minecraft/stat/StatType FIELD field_15323 registry Lnet/minecraft/class_2378; FIELD field_15324 stats Ljava/util/Map; FIELD field_26382 name Lnet/minecraft/class_2561; + FIELD field_48281 packetCodec Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2561;)V ARG 1 registry ARG 2 name @@ -16,3 +17,4 @@ CLASS net/minecraft/class_3448 net/minecraft/stat/StatType METHOD method_14961 (Lnet/minecraft/class_3446;Ljava/lang/Object;)Lnet/minecraft/class_3445; ARG 2 value METHOD method_30739 getName ()Lnet/minecraft/class_2561; + METHOD method_56054 getPacketCodec ()Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping index e1972187fa..9f74dedfe2 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -158,6 +158,7 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style COMMENT Contains codecs to serialize {@link Style}s. FIELD field_46612 MAP_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_46613 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48541 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_54211 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_54212 (Lnet/minecraft/class_2583;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/text/TextCodecs.mapping b/mappings/net/minecraft/text/TextCodecs.mapping index 06dea601a0..b2999f2686 100644 --- a/mappings/net/minecraft/text/TextCodecs.mapping +++ b/mappings/net/minecraft/text/TextCodecs.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_8824 net/minecraft/text/TextCodecs FIELD field_46597 CODEC Lcom/mojang/serialization/Codec; FIELD field_46598 STRINGIFIED_CODEC Lcom/mojang/serialization/Codec; + FIELD field_48540 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_54164 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; ARG 0 json METHOD method_54165 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index c291995e0a..e529de251c 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -91,6 +91,7 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier FIELD field_33380 NAMESPACE_SEPARATOR C FIELD field_33381 DEFAULT_NAMESPACE Ljava/lang/String; FIELD field_33382 REALMS_NAMESPACE Ljava/lang/String; + FIELD field_48267 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;)V COMMENT

Takes a string of the form {@code :} or {@code } which will use the default namespace, for example {@code minecraft:iron_ingot} or {@code iron_ingot}. COMMENT

The string will be split (on the {@code :}) into an identifier with the specified path and namespace. diff --git a/mappings/net/minecraft/util/Uuids.mapping b/mappings/net/minecraft/util/Uuids.mapping index 325888eca0..9d9ff55299 100644 --- a/mappings/net/minecraft/util/Uuids.mapping +++ b/mappings/net/minecraft/util/Uuids.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4844 net/minecraft/util/Uuids FIELD field_41525 STRING_CODEC Lcom/mojang/serialization/Codec; FIELD field_46588 STRICT_CODEC Lcom/mojang/serialization/Codec; FIELD field_47491 SET_CODEC Lcom/mojang/serialization/Codec; + FIELD field_48453 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_26274 toIntArray (JJ)[I ARG 0 uuidMost ARG 2 uuidLeast diff --git a/mappings/net/minecraft/util/collection/IndexedIterable.mapping b/mappings/net/minecraft/util/collection/IndexedIterable.mapping index 6caf8dfcb4..7ba7166aea 100644 --- a/mappings/net/minecraft/util/collection/IndexedIterable.mapping +++ b/mappings/net/minecraft/util/collection/IndexedIterable.mapping @@ -10,3 +10,5 @@ CLASS net/minecraft/class_2359 net/minecraft/util/collection/IndexedIterable COMMENT COMMENT @throws IllegalArgumentException if the value is {@code null} ARG 1 index + METHOD method_56158 getRawIdOrThrow (Ljava/lang/Object;)I + ARG 1 value diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index f129d4f5e3..d742041f97 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos FIELD field_10983 BIT_SHIFT_Z I FIELD field_18789 LOGGER Lorg/slf4j/Logger; FIELD field_25064 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48404 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2382;)V ARG 1 pos METHOD method_10060 offset (JLnet/minecraft/class_2350;)J diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index 8705e62756..791beca77f 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction FIELD field_11047 axis Lnet/minecraft/class_2350$class_2351; FIELD field_29502 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_35088 VERTICAL_CODEC Lcom/mojang/serialization/Codec; + FIELD field_48449 ID_TO_VALUE_FUNCTION Ljava/util/function/IntFunction; + FIELD field_48450 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;IIIILjava/lang/String;Lnet/minecraft/class_2350$class_2352;Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_2382;)V ARG 3 id ARG 4 idOpposite diff --git a/mappings/net/minecraft/util/math/EulerAngle.mapping b/mappings/net/minecraft/util/math/EulerAngle.mapping index 21b113ed68..551201a512 100644 --- a/mappings/net/minecraft/util/math/EulerAngle.mapping +++ b/mappings/net/minecraft/util/math/EulerAngle.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2379 net/minecraft/util/math/EulerAngle FIELD field_11163 roll F FIELD field_11164 yaw F FIELD field_11165 pitch F + FIELD field_48452 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (FFF)V ARG 1 pitch ARG 2 yaw diff --git a/mappings/net/minecraft/util/math/GlobalPos.mapping b/mappings/net/minecraft/util/math/GlobalPos.mapping index c0787de44c..44bf5da9e0 100644 --- a/mappings/net/minecraft/util/math/GlobalPos.mapping +++ b/mappings/net/minecraft/util/math/GlobalPos.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4208 net/minecraft/util/math/GlobalPos FIELD comp_2207 dimension Lnet/minecraft/class_5321; FIELD comp_2208 pos Lnet/minecraft/class_2338; FIELD field_25066 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48451 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)V ARG 1 dimension ARG 2 pos diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index c75634601a..acab40e1d4 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer FIELD field_18677 demandBonus I FIELD field_18678 priceMultiplier F FIELD field_18679 merchantExperience I + FIELD field_48371 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_9143 secondBuyItem Lnet/minecraft/class_1799; FIELD field_9144 maxUses I FIELD field_9145 rewardingPlayerExperience Z @@ -91,6 +92,11 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer COMMENT

Checks if the number of times this trade offer has been used COMMENT is greater than 0. METHOD method_53881 copy ()Lnet/minecraft/class_1914; + METHOD method_56110 write (Lnet/minecraft/class_9129;)Lnet/minecraft/class_1914; + ARG 0 buf + METHOD method_56111 read (Lnet/minecraft/class_9129;Lnet/minecraft/class_1914;)V + ARG 0 buf + ARG 1 offer METHOD method_8244 use ()V COMMENT Increments the number of times this trade offer has been used. METHOD method_8245 increaseSpecialPrice (I)V diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping index 31577edd2b..3df4de5e40 100644 --- a/mappings/net/minecraft/village/TradeOfferList.mapping +++ b/mappings/net/minecraft/village/TradeOfferList.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList + FIELD field_48373 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 size METHOD (Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/village/VillagerData.mapping b/mappings/net/minecraft/village/VillagerData.mapping index d331e7ca2e..4097bda46a 100644 --- a/mappings/net/minecraft/village/VillagerData.mapping +++ b/mappings/net/minecraft/village/VillagerData.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_3850 net/minecraft/village/VillagerData FIELD field_24669 CODEC Lcom/mojang/serialization/Codec; FIELD field_30613 MIN_LEVEL I FIELD field_30614 MAX_LEVEL I + FIELD field_48345 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_3854;Lnet/minecraft/class_3852;I)V ARG 1 type ARG 2 profession diff --git a/mappings/net/minecraft/world/event/BlockPositionSource.mapping b/mappings/net/minecraft/world/event/BlockPositionSource.mapping index bd6940f22c..b84760f6cb 100644 --- a/mappings/net/minecraft/world/event/BlockPositionSource.mapping +++ b/mappings/net/minecraft/world/event/BlockPositionSource.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5707 net/minecraft/world/event/BlockPositionSource FIELD field_28137 CODEC Lcom/mojang/serialization/Codec; FIELD field_28138 pos Lnet/minecraft/class_2338; + FIELD field_48377 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_32927 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/world/event/EntityPositionSource.mapping b/mappings/net/minecraft/world/event/EntityPositionSource.mapping index e672fa9fdd..66f7ef6779 100644 --- a/mappings/net/minecraft/world/event/EntityPositionSource.mapping +++ b/mappings/net/minecraft/world/event/EntityPositionSource.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5709 net/minecraft/world/event/EntityPositionSource FIELD field_28139 CODEC Lcom/mojang/serialization/Codec; FIELD field_38242 yOffset F FIELD field_38424 source Lcom/mojang/datafixers/util/Either; + FIELD field_48378 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lcom/mojang/datafixers/util/Either;F)V ARG 1 source ARG 2 yOffset diff --git a/mappings/net/minecraft/world/event/PositionSource.mapping b/mappings/net/minecraft/world/event/PositionSource.mapping index cc87ae848d..e2a65356a4 100644 --- a/mappings/net/minecraft/world/event/PositionSource.mapping +++ b/mappings/net/minecraft/world/event/PositionSource.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_5716 net/minecraft/world/event/PositionSource FIELD field_28184 CODEC Lcom/mojang/serialization/Codec; COMMENT A codec for encoding and decoding any position source whose {@link #getType() type} COMMENT is in the {@link net.minecraft.registry.Registries#POSITION_SOURCE_TYPE registry}. + FIELD field_48379 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_32955 getType ()Lnet/minecraft/class_5717; COMMENT Returns the type of this position source. METHOD method_32956 getPos (Lnet/minecraft/class_1937;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/world/event/PositionSourceType.mapping b/mappings/net/minecraft/world/event/PositionSourceType.mapping index 93b58968d2..983e396462 100644 --- a/mappings/net/minecraft/world/event/PositionSourceType.mapping +++ b/mappings/net/minecraft/world/event/PositionSourceType.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_5717 net/minecraft/world/event/PositionSourceType METHOD method_32959 register (Ljava/lang/String;Lnet/minecraft/class_5717;)Lnet/minecraft/class_5717; ARG 0 id ARG 1 positionSourceType + METHOD method_56123 getPacketCodec ()Lnet/minecraft/class_9139; From 22ce794c1236a75002d34c739110bc28e3532ad2 Mon Sep 17 00:00:00 2001 From: William Gaylord Date: Wed, 17 Jan 2024 13:52:08 -0600 Subject: [PATCH 08/47] Add basic class mappings for new packets added in 24w04a (#3761) * Add basic class mappings for new packets added in 24w04a * Fix typo in CookieRequestResponse packet name * Map CODEC field and write field in packets, also map MAX_COOKIE_LENGTH, move ServerTransfer Packet to correct package. * Fix typo where packet direction was wrong in class name --- .../packet/c2s/common/CookieRequestResponseC2SPacket.mapping | 3 +++ .../network/packet/s2c/common/CookieRequestS2CPacket.mapping | 3 +++ .../network/packet/s2c/common/ServerTransferS2CPacket.mapping | 3 +++ .../network/packet/s2c/common/StoreCookieS2CPacket.mapping | 4 ++++ 4 files changed, 13 insertions(+) create mode 100644 mappings/net/minecraft/network/packet/c2s/common/CookieRequestResponseC2SPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping diff --git a/mappings/net/minecraft/network/packet/c2s/common/CookieRequestResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CookieRequestResponseC2SPacket.mapping new file mode 100644 index 0000000000..e5a96ee52a --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/common/CookieRequestResponseC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9091 net/minecraft/network/packet/c2s/common/CookieRequestResponseC2SPacket + FIELD field_47895 CODEC Lnet/minecraft/class_9139; + METHOD method_55853 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket.mapping new file mode 100644 index 0000000000..7af26c6505 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9088 net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket + FIELD field_47892 CODEC Lnet/minecraft/class_9139; + METHOD method_55848 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket.mapping new file mode 100644 index 0000000000..29ee750174 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9151 net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket + FIELD field_48629 CODEC Lnet/minecraft/class_9139; + METHOD method_56469 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping new file mode 100644 index 0000000000..6bc46d077c --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9150 net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket + FIELD field_48627 CODEC Lnet/minecraft/class_9139; + FIELD field_48628 MAX_COOKIE_LENGTH I + METHOD method_56467 write (Lnet/minecraft/class_2540;)V From 45161af845ac1c998e881f7451f65ba423991137 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 18 Jan 2024 13:27:51 +1100 Subject: [PATCH 09/47] 24w03a stuff (that isn't packets or networking) (#3763) * 24w03a stuff No packet or networking stuff here! Just the not-packet-or-networking stuff. * damnit github * a bit more --- .../criterion/AnyBlockUseCriterion.mapping | 16 ++++++++++++ .../advancement/criterion/Criteria.mapping | 2 ++ .../DefaultBlockUseCriterion.mapping | 15 +++++++++++ .../net/minecraft/block/AbstractBlock.mapping | 5 ++++ .../minecraft/block/PlayerSkullBlock.mapping | 4 +++ .../minecraft/block/WallTorchBlock.mapping | 4 +++ .../minecraft/block/WitherSkullBlock.mapping | 3 +++ .../entity/AbstractFurnaceBlockEntity.mapping | 2 ++ .../block/entity/ViewerCountManager.mapping | 4 +++ mappings/net/minecraft/class_9104.mapping | 3 --- mappings/net/minecraft/class_9107.mapping | 3 --- .../minecraft/client/MinecraftClient.mapping | 2 ++ .../gui/screen/ingame/InventoryScreen.mapping | 1 + .../entity/LivingEntityRenderer.mapping | 1 + .../fix/RenameEnchantmentFix.mapping | 14 ++++++++++ .../enchantment/DamageEnchantment.mapping | 10 ++++++- .../minecraft/enchantment/Enchantment.mapping | 5 ++++ .../enchantment/EnchantmentHelper.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 5 ++++ .../net/minecraft/entity/LivingEntity.mapping | 10 ++++++- .../entity/ProjectileDeflector.mapping | 15 +++++++++++ .../attribute/EntityAttributeModifier.mapping | 2 ++ .../minecraft/entity/mob/BreezeEntity.mapping | 7 +++++ .../minecraft/entity/mob/MobEntity.mapping | 1 + .../entity/mob/ShulkerEntity.mapping | 7 +++++ .../minecraft/entity/mob/SpiderEntity.mapping | 2 ++ .../entity/passive/ArmadilloBrain.mapping | 10 +++++++ .../entity/passive/ArmadilloEntity.mapping | 6 +++++ .../entity/passive/SheepEntity.mapping | 2 ++ .../entity/player/PlayerEntity.mapping | 9 +++++++ .../projectile/ProjectileEntity.mapping | 1 + .../entity/vehicle/VehicleInventory.mapping | 1 + .../net/minecraft/inventory/Inventory.mapping | 1 + mappings/net/minecraft/item/ItemStack.mapping | 6 +++++ .../net/minecraft/registry/Registry.mapping | 5 ++++ .../screen/MerchantScreenHandler.mapping | 1 + .../WorldGenerationProgressListener.mapping | 2 ++ .../net/minecraft/util/math/GlobalPos.mapping | 4 --- .../net/minecraft/village/TradeOffer.mapping | 17 ++++++++++++ .../net/minecraft/world/GameRules.mapping | 7 +++++ mappings/net/minecraft/world/World.mapping | 2 ++ .../minecraft/world/WorldProperties.mapping | 1 + .../world/explosion/Explosion.mapping | 1 + .../world/level/LevelProperties.mapping | 26 +++++++++++++++++++ 44 files changed, 234 insertions(+), 12 deletions(-) create mode 100644 mappings/net/minecraft/advancement/criterion/AnyBlockUseCriterion.mapping create mode 100644 mappings/net/minecraft/advancement/criterion/DefaultBlockUseCriterion.mapping delete mode 100644 mappings/net/minecraft/class_9104.mapping delete mode 100644 mappings/net/minecraft/class_9107.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/RenameEnchantmentFix.mapping create mode 100644 mappings/net/minecraft/entity/ProjectileDeflector.mapping diff --git a/mappings/net/minecraft/advancement/criterion/AnyBlockUseCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AnyBlockUseCriterion.mapping new file mode 100644 index 0000000000..59b81310c5 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/AnyBlockUseCriterion.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_9104 net/minecraft/advancement/criterion/AnyBlockUseCriterion + METHOD method_56049 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V + ARG 1 player + ARG 2 pos + ARG 3 stack + METHOD method_56050 (Lnet/minecraft/class_47;Lnet/minecraft/class_9104$class_9105;)Z + ARG 1 conditions + CLASS class_9105 Conditions + FIELD comp_2029 player Ljava/util/Optional; + FIELD field_48277 CODEC Lcom/mojang/serialization/Codec; + METHOD method_56051 (Lnet/minecraft/class_8944;Lnet/minecraft/class_5258;)V + ARG 1 location + METHOD method_56052 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_56053 test (Lnet/minecraft/class_47;)Z + ARG 1 location diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index 56247e3ad2..9a4207c825 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -52,6 +52,8 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_38838 AVOID_VIBRATION Lnet/minecraft/class_2135; FIELD field_44587 RECIPE_CRAFTED Lnet/minecraft/class_8508; FIELD field_47187 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48268 DEFAULT_BLOCK_USE Lnet/minecraft/class_9107; + FIELD field_48269 ANY_BLOCK_USE Lnet/minecraft/class_9104; METHOD method_54933 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_179; ARG 0 registry METHOD method_767 register (Ljava/lang/String;Lnet/minecraft/class_179;)Lnet/minecraft/class_179; diff --git a/mappings/net/minecraft/advancement/criterion/DefaultBlockUseCriterion.mapping b/mappings/net/minecraft/advancement/criterion/DefaultBlockUseCriterion.mapping new file mode 100644 index 0000000000..daab2b372d --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/DefaultBlockUseCriterion.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_9107 net/minecraft/advancement/criterion/DefaultBlockUseCriterion + METHOD method_56066 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;)V + ARG 1 player + ARG 2 pos + METHOD method_56067 (Lnet/minecraft/class_47;Lnet/minecraft/class_9107$class_9108;)Z + ARG 1 conditions + CLASS class_9108 Conditions + FIELD comp_2029 player Ljava/util/Optional; + FIELD field_48317 CODEC Lcom/mojang/serialization/Codec; + METHOD method_56068 (Lnet/minecraft/class_8944;Lnet/minecraft/class_5258;)V + ARG 1 location + METHOD method_56069 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_56070 test (Lnet/minecraft/class_47;)Z + ARG 1 location diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 21af4c6478..0c0bbe2e44 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -517,6 +517,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 4 newState ARG 5 moved METHOD method_9542 hasRandomTicks (Lnet/minecraft/class_2680;)Z + ARG 1 state METHOD method_9545 getFluidState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610; COMMENT {@return the state's associated fluid state} COMMENT @@ -697,12 +698,16 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 world ARG 3 pos METHOD method_9573 getSoundGroup (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2498; + ARG 1 state METHOD method_9575 getAmbientOcclusionLightLevel (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F COMMENT @deprecated Consider calling {@link AbstractBlockState#getAmbientOcclusionLightLevel} instead. See why these methods are deprecated. ARG 1 state ARG 2 world ARG 3 pos METHOD method_9579 isTransparent (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_9584 getRaycastShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; COMMENT @deprecated Consider calling {@link AbstractBlockState#getRaycastShape} instead. See why these methods are deprecated. ARG 1 state diff --git a/mappings/net/minecraft/block/PlayerSkullBlock.mapping b/mappings/net/minecraft/block/PlayerSkullBlock.mapping index c0466ed896..0479e94641 100644 --- a/mappings/net/minecraft/block/PlayerSkullBlock.mapping +++ b/mappings/net/minecraft/block/PlayerSkullBlock.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_2435 net/minecraft/block/PlayerSkullBlock FIELD field_46411 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_56117 resolveSkullOwner (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V + ARG 0 world + ARG 1 pos + ARG 2 stack diff --git a/mappings/net/minecraft/block/WallTorchBlock.mapping b/mappings/net/minecraft/block/WallTorchBlock.mapping index 035e3c207d..6b29b9a430 100644 --- a/mappings/net/minecraft/block/WallTorchBlock.mapping +++ b/mappings/net/minecraft/block/WallTorchBlock.mapping @@ -8,3 +8,7 @@ CLASS net/minecraft/class_2555 net/minecraft/block/WallTorchBlock ARG 0 instance METHOD method_54067 (Lnet/minecraft/class_2555;)Lnet/minecraft/class_2400; ARG 0 block + METHOD method_56118 canPlaceAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 0 world + ARG 1 pos + ARG 2 facing diff --git a/mappings/net/minecraft/block/WitherSkullBlock.mapping b/mappings/net/minecraft/block/WitherSkullBlock.mapping index 47608f6869..e18f421917 100644 --- a/mappings/net/minecraft/block/WitherSkullBlock.mapping +++ b/mappings/net/minecraft/block/WitherSkullBlock.mapping @@ -20,3 +20,6 @@ CLASS net/minecraft/class_2570 net/minecraft/block/WitherSkullBlock ARG 0 pos METHOD method_51175 (Lnet/minecraft/class_2694;)Z ARG 0 pos + METHOD method_56119 onPlaced (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 pos diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index ff6c824610..5d65614a09 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn FIELD field_31293 PROPERTY_COUNT I FIELD field_31294 DEFAULT_COOK_TIME I FIELD field_38234 matchGetter Lnet/minecraft/class_1863$class_7266; + FIELD field_48375 FUEL_TIMES Ljava/util/Map; METHOD (Lnet/minecraft/class_2591;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3956;)V ARG 1 blockEntityType ARG 2 pos @@ -77,3 +78,4 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 3 blockEntity METHOD method_53790 (Lnet/minecraft/class_8786;)Ljava/lang/Integer; ARG 0 recipe + METHOD method_56120 clearFuelTimes ()V diff --git a/mappings/net/minecraft/block/entity/ViewerCountManager.mapping b/mappings/net/minecraft/block/entity/ViewerCountManager.mapping index 50a15d966a..ca108a0df3 100644 --- a/mappings/net/minecraft/block/entity/ViewerCountManager.mapping +++ b/mappings/net/minecraft/block/entity/ViewerCountManager.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_5561 net/minecraft/block/entity/ViewerCountManager COMMENT ender chests, and barrels. FIELD field_27215 viewerCount I FIELD field_31339 SCHEDULE_TICK_DELAY I + FIELD field_48376 maxBlockInteractionRange D METHOD method_31678 getViewerCount ()I METHOD method_31679 isPlayerViewing (Lnet/minecraft/class_1657;)Z COMMENT Determines whether the given player is currently viewing this container. @@ -43,3 +44,6 @@ CLASS net/minecraft/class_5561 net/minecraft/block/entity/ViewerCountManager ARG 0 world ARG 1 pos ARG 2 state + METHOD method_56121 getViewingPlayers (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Ljava/util/List; + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/class_9104.mapping b/mappings/net/minecraft/class_9104.mapping deleted file mode 100644 index fc87720c09..0000000000 --- a/mappings/net/minecraft/class_9104.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_9104 - CLASS class_9105 - FIELD comp_2029 player Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_9107.mapping b/mappings/net/minecraft/class_9107.mapping deleted file mode 100644 index 476ce8c815..0000000000 --- a/mappings/net/minecraft/class_9107.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_9107 - CLASS class_9108 - FIELD comp_2029 player Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index c2fa31a291..203e825418 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -551,6 +551,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_55505 onDisconnected ()V METHOD method_55606 providesProfileKeys ()Z METHOD method_55607 getUserProperties ()Lcom/mojang/authlib/minecraft/UserApiService$UserProperties; + METHOD method_56134 disconnect (Lnet/minecraft/class_437;)V + ARG 1 disconnectionScreen CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index 70bd7615dc..653c05775c 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -22,4 +22,5 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc ARG 0 context ARG 1 x ARG 2 y + ARG 3 size ARG 7 entity diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index a11b5963d2..90e7bb0550 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -51,3 +51,4 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen ARG 3 animationProgress ARG 4 bodyYaw ARG 5 tickDelta + ARG 6 scale diff --git a/mappings/net/minecraft/datafixer/fix/RenameEnchantmentFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameEnchantmentFix.mapping new file mode 100644 index 0000000000..5aa88adb4a --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/RenameEnchantmentFix.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_9106 net/minecraft/datafixer/fix/RenameEnchantmentFix + FIELD field_48315 name Ljava/lang/String; + FIELD field_48316 oldToNewIds Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/Map;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 oldToNewIds + METHOD method_56057 fixIds (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 data + METHOD method_56060 fixIds (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 data + ARG 2 key + METHOD method_56064 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 2 oldId diff --git a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping index ddb79e9997..f6f15c8f1d 100644 --- a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping @@ -1,4 +1,12 @@ CLASS net/minecraft/class_1882 net/minecraft/enchantment/DamageEnchantment + FIELD field_48366 basePower I + FIELD field_48367 powerPerLevel I + FIELD field_48368 minMaxPowerDifference I + FIELD field_48369 applicableEntities Ljava/util/Optional; METHOD (Lnet/minecraft/class_1887$class_1888;IIILjava/util/Optional;[Lnet/minecraft/class_1304;)V ARG 1 weight - ARG 2 typeIndex + ARG 2 basePower + ARG 3 powerPerLevel + ARG 4 minMaxPowerDifference + ARG 5 applicableEntities + ARG 6 slotTypes diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index d2fdb673f7..1c39ad4205 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment FIELD field_45769 registryEntry Lnet/minecraft/class_6880$class_6883; + FIELD field_48370 applicableItems Lnet/minecraft/class_6862; FIELD field_9084 translationKey Ljava/lang/String; FIELD field_9085 rarity Lnet/minecraft/class_1887$class_1888; FIELD field_9086 slotTypes [Lnet/minecraft/class_1304; METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_6862;[Lnet/minecraft/class_1304;)V ARG 1 rarity + ARG 2 applicableItems ARG 3 slotTypes METHOD method_20742 getMaxPower (I)I ARG 1 level @@ -15,6 +17,7 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment COMMENT {@return whether this enchantment will appear in the enchanting table or COMMENT loots with random enchant function} METHOD method_53216 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; + METHOD method_56109 getApplicableItems ()Lnet/minecraft/class_6862; METHOD method_8178 onUserDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;I)V ARG 1 user ARG 2 attacker @@ -49,10 +52,12 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment METHOD method_8191 byRawId (I)Lnet/minecraft/class_1887; ARG 0 id METHOD method_8192 isAcceptableItem (Lnet/minecraft/class_1799;)Z + ARG 1 stack METHOD method_8193 isTreasure ()Z METHOD method_8195 isCursed ()Z METHOD method_8196 getAttackDamage (ILnet/minecraft/class_1299;)F ARG 1 level + ARG 2 entityType CLASS class_1888 Rarity COMMENT The rarity is an attribute of an enchantment. COMMENT diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index a3163e6f9c..2c5f9c9aeb 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -114,6 +114,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 entity METHOD method_8218 getAttackDamage (Lnet/minecraft/class_1799;Lnet/minecraft/class_1299;)F ARG 0 stack + ARG 1 entityType METHOD method_8219 getProtectionAmount (Ljava/lang/Iterable;Lnet/minecraft/class_1282;)I ARG 0 equipment ARG 1 source diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index cf37d4cc2b..720e00d8f8 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1007,6 +1007,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #getSteppingBlockState METHOD method_55668 getVehicleAttachmentPos (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; ARG 1 vehicle + METHOD method_56071 getProjectileDeflector (Lnet/minecraft/class_1676;)Lnet/minecraft/class_9109; + ARG 1 projectile + METHOD method_56072 getAttachments ()Lnet/minecraft/class_9066; + METHOD method_56073 setOnFireForTicks (I)V + ARG 1 ticks 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/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index a057be02d2..c264e04e59 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -342,6 +342,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_51851 getLootTableSeed ()J METHOD method_52197 sendEffectToControllingPlayer (Lnet/minecraft/class_1293;)V ARG 1 effect + METHOD method_52539 lerpHeadYaw (ID)V + ARG 1 headTrackingIncrements + ARG 2 serverHeadYaw METHOD method_52540 updateAttribute (Lnet/minecraft/class_6880;)V ARG 1 attribute METHOD method_52541 getMaxAbsorption ()F @@ -359,6 +362,10 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_55693 getScale ()F METHOD method_55694 getBaseDimensions (Lnet/minecraft/class_4050;)Lnet/minecraft/class_4048; ARG 1 pose + METHOD method_56078 playSound (Lnet/minecraft/class_3414;)V + ARG 1 sound + METHOD method_56079 getSlotForHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1304; + ARG 0 hand METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; @@ -368,7 +375,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 target METHOD method_5998 getStackInHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1799; ARG 1 hand - METHOD method_5999 isUndead ()Z + METHOD method_5999 hasInvertedHealingAndHarm ()Z METHOD method_6000 enterCombat ()V METHOD method_6002 getDeathSound ()Lnet/minecraft/class_3414; METHOD method_6003 getRoll ()I @@ -391,6 +398,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 source METHOD method_6012 clearStatusEffects ()Z METHOD method_6013 playHurtSound (Lnet/minecraft/class_1282;)V + ARG 1 damageSource METHOD method_6014 getItemUseTimeLeft ()I METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V ARG 1 attacker diff --git a/mappings/net/minecraft/entity/ProjectileDeflector.mapping b/mappings/net/minecraft/entity/ProjectileDeflector.mapping new file mode 100644 index 0000000000..9b07441dea --- /dev/null +++ b/mappings/net/minecraft/entity/ProjectileDeflector.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_9109 net/minecraft/entity/ProjectileDeflector + FIELD field_48347 NONE Lnet/minecraft/class_9109; + FIELD field_48348 SIMPLE Lnet/minecraft/class_9109; + METHOD deflect (Lnet/minecraft/class_1676;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)V + ARG 1 projectile + ARG 2 hitEntity + ARG 3 random + METHOD method_56095 (Lnet/minecraft/class_1676;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)V + ARG 0 projectile + ARG 1 hitEntity + ARG 2 random + METHOD method_56096 (Lnet/minecraft/class_1676;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)V + ARG 0 projectile + ARG 1 hitEntity + ARG 2 random diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 108c9337b3..6bc89f75c1 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod COMMENT Represents an operation which can be applied to an attribute modifier. FIELD field_45742 CODEC Lcom/mojang/serialization/Codec; FIELD field_45743 name Ljava/lang/String; + FIELD field_48325 ID_TO_VALUE Ljava/util/function/IntFunction; FIELD field_6328 ADDITION Lnet/minecraft/class_1322$class_1323; COMMENT Adds to the base value of an attribute. FIELD field_6329 id I @@ -44,3 +45,4 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 name ARG 4 id + METHOD method_56082 getId ()I diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index 66035b4137..b29e268723 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity FIELD field_47279 longJumpingParticleAddCount I FIELD field_47280 inhalingAnimationState Lnet/minecraft/class_7094; FIELD field_47281 shootingAnimationState Lnet/minecraft/class_7094; + FIELD field_48344 PROJECTILE_DEFLECTOR Lnet/minecraft/class_9109; METHOD method_55006 addGustDustParticles ()Lnet/minecraft/class_8949; METHOD method_55007 addBlockParticles (I)V ARG 1 count @@ -14,3 +15,9 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity METHOD method_55014 createBreezeAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55015 resetLongJumpingParticleAddCount ()Lnet/minecraft/class_8949; METHOD method_55747 playWhirlSound ()V + METHOD method_56087 (Lnet/minecraft/class_1676;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)V + ARG 0 projectile + ARG 1 hitEntity + ARG 2 random + METHOD method_56088 (Lnet/minecraft/class_1299;)Ljava/lang/Boolean; + ARG 0 projectileOwnerType diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 131a469d6e..01bf1f438f 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -149,6 +149,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT COMMENT @see LivingEntity#getHitbox METHOD method_55695 stopMovement ()V + METHOD method_56080 clampHeadYaw ()V METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F ARG 1 slot METHOD method_5930 setForwardSpeed (F)V diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index 6b45d92656..95f9c53ff7 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -19,7 +19,14 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity METHOD method_33342 getExtraLength (F)F ARG 0 openProgress METHOD method_33346 calculateBoundingBox (FLnet/minecraft/class_2350;F)Lnet/minecraft/class_238; + ARG 0 scale + ARG 1 facing + ARG 2 extraLength METHOD method_33347 calculateBoundingBox (FLnet/minecraft/class_2350;FF)Lnet/minecraft/class_238; + ARG 0 scale + ARG 1 facing + ARG 2 prevExtraLength + ARG 3 extraLength METHOD method_33348 tryAttachOrTeleport ()V METHOD method_33349 tickOpenProgress ()Z METHOD method_33350 moveEntities ()V diff --git a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping index d1033f6ac6..53e77daf39 100644 --- a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_1628 net/minecraft/entity/mob/SpiderEntity COMMENT The tracked flags of spiders. Only has the {@code 1} bit for {@linkplain COMMENT #isClimbingWall() wall climbing}. METHOD method_26923 createSpiderAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_56086 (Lnet/minecraft/class_1309;)Z + ARG 0 entity METHOD method_7166 setClimbingWall (Z)V ARG 1 climbing METHOD method_7167 isClimbingWall ()Z diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping index 20386e2644..9bbbb77ab1 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping @@ -1,18 +1,28 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain FIELD field_47796 BREEDING_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_47802 WALK_TOWARDS_CLOSEST_ADULT_RANGE Lnet/minecraft/class_6019; FIELD field_47803 SENSOR_TYPES Lcom/google/common/collect/ImmutableList; FIELD field_47804 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; + FIELD field_47805 UNROLL_TASK Lnet/minecraft/class_7894; METHOD method_55728 createBrainProfile ()Lnet/minecraft/class_4095$class_5303; METHOD method_55729 (Lnet/minecraft/class_3218;Lnet/minecraft/class_9069;J)Z ARG 1 armadillo + METHOD method_55730 (Lnet/minecraft/class_1309;)Ljava/lang/Double; + ARG 0 armadillo METHOD method_55731 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain + METHOD method_55732 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context METHOD method_55734 updateActivities (Lnet/minecraft/class_9069;)V ARG 0 armadillo METHOD method_55735 getBreedingIngredient ()Lnet/minecraft/class_1856; + METHOD method_55736 (Lnet/minecraft/class_1309;)Ljava/lang/Float; + ARG 0 armadillo METHOD method_55737 addCoreActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_55738 addIdleActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_55739 addPanicActivities (Lnet/minecraft/class_4095;)V ARG 0 brain + CLASS class_9072 RollUpTask + CLASS class_9073 UnrollAndFleeTask diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping index 2e9f807326..934f9f8334 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -21,6 +21,12 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity METHOD method_55724 unroll ()V METHOD method_55725 setRolling (Z)V ARG 1 rolling + METHOD method_56083 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z + ARG 0 entityType + ARG 1 world + ARG 2 spawnReason + ARG 3 pos + ARG 4 random CLASS class_9070 State FIELD field_47793 name Ljava/lang/String; FIELD field_47794 CODEC Lnet/minecraft/class_3542$class_7292; diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 0b7f4dd266..410426d17b 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity FIELD field_6868 DROPS Ljava/util/Map; FIELD field_6869 eatGrassGoal Lnet/minecraft/class_1345; FIELD field_6870 COLOR Lnet/minecraft/class_2940; + METHOD method_17689 (Lnet/minecraft/class_8566;Lnet/minecraft/class_8786;)Lnet/minecraft/class_1799; + ARG 2 recipe METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_8566; ARG 0 firstColor ARG 1 secondColor diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 4bb290c408..41750473bc 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -139,6 +139,15 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 0 name METHOD method_55754 getBlockInteractionRange ()D METHOD method_55755 getEntityInteractionRange ()D + METHOD method_56092 canInteractWithEntityIn (Lnet/minecraft/class_238;D)Z + ARG 1 box + ARG 2 range + METHOD method_56093 canInteractWithBlockAt (Lnet/minecraft/class_2338;D)Z + ARG 1 pos + ARG 2 range + METHOD method_56094 canInteractWithEntity (Lnet/minecraft/class_1297;D)Z + ARG 1 entity + ARG 2 range METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index bf6730e0ce..2cacd1b28f 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -64,3 +64,4 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity COMMENT mobs/tools have higher values; some mobs have difficulty-adjusted COMMENT values METHOD method_7488 onCollision (Lnet/minecraft/class_239;)V + ARG 1 hitResult diff --git a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping index fea287fdd3..39beb29812 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping @@ -36,5 +36,6 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory ARG 1 slot METHOD method_42293 clearInventory ()V METHOD method_42294 canPlayerAccess (Lnet/minecraft/class_1657;)Z + ARG 1 player METHOD method_42295 isInventoryEmpty ()Z METHOD method_5829 getBoundingBox ()Lnet/minecraft/class_238; diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 5c7f6d8464..4e40f57bbf 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -80,6 +80,7 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory COMMENT @see #canPlayerUse(BlockEntity, PlayerEntity) ARG 0 blockEntity ARG 1 player + ARG 2 range METHOD method_5431 markDirty ()V COMMENT Marks the inventory as modified. Implementations should call this method COMMENT every time the inventory is changed in any way. diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 21dc845bb2..0c1bc76e90 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -258,6 +258,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 0 instance METHOD method_55067 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_56098 isUnbreakable ()Z METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT @@ -468,6 +469,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT by a player. The callback should call {@link LivingEntity#sendEquipmentBreakStatus} COMMENT or {@link LivingEntity#sendToolBreakStatus}. ARG 1 amount + ARG 2 random + ARG 3 entity + ARG 4 breakCallback METHOD method_7958 hasGlint ()Z METHOD method_7959 setSubNbt (Ljava/lang/String;Lnet/minecraft/class_2520;)V COMMENT Sets the given NBT element in the item stack's custom NBT at the specified key. @@ -519,6 +523,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @return whether the stack's damage is equal to or above {@linkplain Item#getMaxDamage COMMENT the maximum damage} (i.e. whether the item is "broken") ARG 1 amount + ARG 2 entity + ARG 3 slot METHOD method_7971 split (I)Lnet/minecraft/class_1799; COMMENT {@return the copy of the stack "split" from the current stack with item count COMMENT being at most {@code amount}} diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index a9a0a64c77..517502a937 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -284,6 +284,11 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry ARG 2 entry METHOD method_55841 getEntry (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id + METHOD method_56159 getRandomEntry (Lnet/minecraft/class_6862;Lnet/minecraft/class_5819;)Ljava/util/Optional; + ARG 1 tag + ARG 2 random + METHOD method_56160 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; + ARG 1 entryList CLASS 1 METHOD method_46773 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; ARG 0 entry diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index 68a4d65e1a..85a14cdbc6 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -38,6 +38,7 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler METHOD method_20214 autofill (ILnet/minecraft/class_1799;Z)V ARG 1 slot ARG 2 stack + ARG 3 ignoreTags METHOD method_20215 switchTo (I)V ARG 1 recipeIndex METHOD method_20595 playYesSound ()V diff --git a/mappings/net/minecraft/server/WorldGenerationProgressListener.mapping b/mappings/net/minecraft/server/WorldGenerationProgressListener.mapping index e85612ff6f..f881b2fb6c 100644 --- a/mappings/net/minecraft/server/WorldGenerationProgressListener.mapping +++ b/mappings/net/minecraft/server/WorldGenerationProgressListener.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_3949 net/minecraft/server/WorldGenerationProgressListe ARG 2 status METHOD method_17671 stop ()V METHOD method_17675 start ()V + METHOD method_56041 getStartRegionSize (I)I + ARG 0 spawnChunkRadius diff --git a/mappings/net/minecraft/util/math/GlobalPos.mapping b/mappings/net/minecraft/util/math/GlobalPos.mapping index 44bf5da9e0..5150a6d144 100644 --- a/mappings/net/minecraft/util/math/GlobalPos.mapping +++ b/mappings/net/minecraft/util/math/GlobalPos.mapping @@ -1,13 +1,9 @@ CLASS net/minecraft/class_4208 net/minecraft/util/math/GlobalPos - FIELD comp_2207 dimension Lnet/minecraft/class_5321; - FIELD comp_2208 pos Lnet/minecraft/class_2338; FIELD field_25066 CODEC Lcom/mojang/serialization/Codec; FIELD field_48451 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)V ARG 1 dimension ARG 2 pos - METHOD comp_2207 dimension ()Lnet/minecraft/class_5321; - METHOD comp_2208 pos ()Lnet/minecraft/class_2338; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_19443 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)Lnet/minecraft/class_4208; diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index acab40e1d4..3a12fa02ca 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer FIELD field_18678 priceMultiplier F FIELD field_18679 merchantExperience I FIELD field_48371 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48372 ignoreTags Z FIELD field_9143 secondBuyItem Lnet/minecraft/class_1799; FIELD field_9144 maxUses I FIELD field_9145 rewardingPlayerExperience Z @@ -23,6 +24,14 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 4 maxUses ARG 5 merchantExperience ARG 6 priceMultiplier + METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIF)V + ARG 1 firstBuyItem + ARG 2 secondBuyItem + ARG 3 sellItem + ARG 4 uses + ARG 5 maxUses + ARG 6 merchantExperience + ARG 7 priceMultiplier METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFI)V ARG 1 firstBuyItem ARG 2 secondBuyItem @@ -31,6 +40,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 5 maxUses ARG 6 merchantExperience ARG 7 priceMultiplier + ARG 8 demandBonus METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFIZ)V ARG 1 firstBuyItem ARG 2 secondBuyItem @@ -40,15 +50,21 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 6 merchantExperience ARG 7 priceMultiplier ARG 8 demandBonus + ARG 9 ignoreTags METHOD (Lnet/minecraft/class_1914;)V ARG 1 offer METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 offered + ARG 2 buyItem METHOD method_16953 depleteBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 firstBuyStack ARG 2 secondBuyStack METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Z)Z + ARG 0 offered + ARG 1 buyItem + ARG 2 ignoreTags METHOD method_18019 copySellItem ()Lnet/minecraft/class_1799; COMMENT Returns a copy of the sell item of this trade offer. METHOD method_19272 getAdjustedFirstBuyItem ()Lnet/minecraft/class_1799; @@ -97,6 +113,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer METHOD method_56111 read (Lnet/minecraft/class_9129;Lnet/minecraft/class_1914;)V ARG 0 buf ARG 1 offer + METHOD method_56112 shouldIgnoreTags ()Z METHOD method_8244 use ()V COMMENT Increments the number of times this trade offer has been used. METHOD method_8245 increaseSpecialPrice (I)V diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index f301d8645e..9e06f31aa7 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -161,6 +161,13 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules METHOD method_35236 set (ILnet/minecraft/server/MinecraftServer;)V ARG 1 value ARG 2 server + METHOD method_56115 create (IIILjava/util/function/BiConsumer;)Lnet/minecraft/class_1928$class_4314; + ARG 0 initialValue + ARG 1 min + ARG 2 max + ARG 3 changeCallback + METHOD method_56116 (ILnet/minecraft/class_1928$class_4314;)Lnet/minecraft/class_1928$class_4312; + ARG 1 type CLASS class_4313 Key FIELD field_19413 name Ljava/lang/String; FIELD field_24103 category Lnet/minecraft/class_1928$class_5198; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 4bdb74f060..dedc396945 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -206,6 +206,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 13 particles ARG 14 particle ARG 15 emitterParticle + ARG 16 soundEvent METHOD method_46669 getDestructionType (Lnet/minecraft/class_1928$class_4313;)Lnet/minecraft/class_1927$class_4179; ARG 1 gameRuleKey METHOD method_47574 collectEntitiesByType (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Predicate;Ljava/util/List;)V @@ -342,6 +343,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 12 explosionSourceType ARG 13 particle ARG 14 emitterParticle + ARG 15 soundEvent METHOD method_8455 updateComparators (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos ARG 2 block diff --git a/mappings/net/minecraft/world/WorldProperties.mapping b/mappings/net/minecraft/world/WorldProperties.mapping index d17d8120df..8243726334 100644 --- a/mappings/net/minecraft/world/WorldProperties.mapping +++ b/mappings/net/minecraft/world/WorldProperties.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_5217 net/minecraft/world/WorldProperties METHOD method_207 getDifficulty ()Lnet/minecraft/class_1267; METHOD method_217 getTimeOfDay ()J METHOD method_30656 getSpawnAngle ()F + METHOD method_56126 getSpawnPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index ac8ebba8ac..1dff132b7b 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -59,6 +59,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 13 destructionType ARG 14 particle ARG 15 emitterParticle + ARG 16 soundEvent METHOD method_17752 getExposure (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)F ARG 0 source ARG 1 entity diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 6c01d82745..fabc88fcef 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_40372 specialProperty Lnet/minecraft/class_31$class_7729; FIELD field_43352 removedFeatures Ljava/util/Set; FIELD field_46838 LEVEL_NAME_KEY Ljava/lang/String; + FIELD field_48380 spawnPos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V ARG 1 levelInfo ARG 2 generatorOptions @@ -37,6 +38,31 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties METHOD (Lnet/minecraft/class_2487;ZLnet/minecraft/class_2338;FJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V ARG 1 playerData ARG 2 modded + ARG 3 spawnPos + ARG 4 spawnAngle + ARG 5 time + ARG 7 timeOfDay + ARG 9 version + ARG 10 clearWeatherTime + ARG 11 rainTime + ARG 12 raining + ARG 13 thunderTime + ARG 14 thundering + ARG 15 initialized + ARG 16 difficultyLocked + ARG 17 worldBorder + ARG 18 wanderingTraderSpawnDelay + ARG 19 wanderingTraderSpawnChance + ARG 20 wanderingTraderId + ARG 21 serverBrands + ARG 22 removedFeatures + ARG 23 scheduledEvents + ARG 24 customBossEvents + ARG 25 dragonFight + ARG 26 levelInfo + ARG 27 generatorOptions + ARG 28 specialProperty + ARG 29 lifecycle METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V ARG 1 registryManager ARG 2 levelNbt From b19e943dde5bf1f8f6b17f7744aa96275e4ba554 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 18 Jan 2024 13:28:48 +1100 Subject: [PATCH 10/47] Make an implNote for spawnParticle methods (#3764) --- mappings/net/minecraft/server/world/ServerWorld.mapping | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index e6e002915b..acd3cde76d 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -54,6 +54,9 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT COMMENT @return whether the particle packet was sent COMMENT + COMMENT @implNote If {@code count} is {@code 0}, a single particle will be spawned with its + COMMENT velocity being {@code deltaX},{@code deltaY},{@code deltaZ} multiplied by {@code speed}. + COMMENT COMMENT @see #spawnParticles(ParticleEffect, double, double, double, int, double, double, double, double) ARG 1 viewer ARG 2 particle @@ -115,6 +118,9 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT COMMENT @return the number of players the particle packet was sent to COMMENT + COMMENT @implNote If {@code count} is {@code 0}, a single particle will be spawned with its + COMMENT velocity being {@code deltaX},{@code deltaY},{@code deltaZ} multiplied by {@code speed}. + COMMENT COMMENT @see #spawnParticles(ServerPlayerEntity, ParticleEffect, boolean, double, double, double, int, double, double, double, double) ARG 1 particle ARG 2 x From a83c057077129f744240f074db212501e7a97922 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 18 Jan 2024 14:28:29 +1100 Subject: [PATCH 11/47] 24w03a packet stuff (#3765) * 24w03a packet stuff * a bit more --- .../net/minecraft/client/MinecraftClient.mapping | 1 + .../gui/screen/multiplayer/ConnectScreen.mapping | 1 + .../network/ClientCommonNetworkHandler.mapping | 2 ++ .../client/network/CookieStorage.mapping | 1 + .../attribute/EntityAttributeModifier.mapping | 1 + .../minecraft/network/ClientConnection.mapping | 6 ++++++ .../net/minecraft/network/NetworkSide.mapping | 4 ++++ .../net/minecraft/network/PacketByteBuf.mapping | 7 +++++++ .../network/handler/PacketBundler.mapping | 3 +++ .../listener/ClientCommonPacketListener.mapping | 4 ++++ .../ClientCookieRequestPacketListener.mapping | 3 +++ .../ServerCookieResponsePacketListener.mapping | 3 +++ .../network/packet/BrandCustomPayload.mapping | 4 ++++ .../network/packet/CommonPackets.mapping | 9 +++++++++ .../network/packet/ConfigPackets.mapping | 7 +++++++ .../network/packet/CookiePackets.mapping | 5 +++++ .../network/packet/HandshakePackets.mapping | 3 +++ .../minecraft/network/packet/LoginPackets.mapping | 7 +++++++ .../net/minecraft/network/packet/Packet.mapping | 1 + .../network/packet/PacketIdentifier.mapping | 1 + .../minecraft/network/packet/PingPackets.mapping | 5 +++++ .../minecraft/network/packet/PlayPackets.mapping | 15 +++++++++++++++ .../network/packet/StatusPackets.mapping | 5 +++++ .../c2s/common/ClientOptionsC2SPacket.mapping | 1 + .../packet/c2s/common/CommonPongC2SPacket.mapping | 1 + ...et.mapping => CookieResponseC2SPacket.mapping} | 7 ++++++- .../c2s/common/CustomPayloadC2SPacket.mapping | 1 + .../packet/c2s/common/KeepAliveC2SPacket.mapping | 1 + .../common/ResourcePackStatusC2SPacket.mapping | 1 + .../packet/c2s/handshake/ConnectionIntent.mapping | 1 + .../c2s/handshake/HandshakeC2SPacket.mapping | 1 + .../packet/c2s/login/LoginHelloC2SPacket.mapping | 1 + .../packet/c2s/login/LoginKeyC2SPacket.mapping | 1 + .../c2s/login/LoginQueryResponseC2SPacket.mapping | 1 + .../c2s/play/AcknowledgeChunksC2SPacket.mapping | 1 + .../c2s/play/AdvancementTabC2SPacket.mapping | 1 + .../c2s/play/BoatPaddleStateC2SPacket.mapping | 1 + .../packet/c2s/play/BookUpdateC2SPacket.mapping | 1 + .../packet/c2s/play/ButtonClickC2SPacket.mapping | 1 + .../packet/c2s/play/ChatMessageC2SPacket.mapping | 1 + .../packet/c2s/play/ClickSlotC2SPacket.mapping | 3 +++ .../c2s/play/ClientCommandC2SPacket.mapping | 1 + .../packet/c2s/play/ClientStatusC2SPacket.mapping | 1 + .../c2s/play/CloseHandledScreenC2SPacket.mapping | 1 + .../c2s/play/CommandExecutionC2SPacket.mapping | 1 + .../packet/c2s/play/CraftRequestC2SPacket.mapping | 1 + .../play/CreativeInventoryActionC2SPacket.mapping | 3 +++ .../packet/c2s/play/HandSwingC2SPacket.mapping | 1 + .../c2s/play/JigsawGeneratingC2SPacket.mapping | 1 + .../play/MessageAcknowledgmentC2SPacket.mapping | 1 + .../c2s/play/PickFromInventoryC2SPacket.mapping | 1 + .../packet/c2s/play/PlayerActionC2SPacket.mapping | 1 + .../packet/c2s/play/PlayerInputC2SPacket.mapping | 1 + .../c2s/play/PlayerInteractBlockC2SPacket.mapping | 1 + .../play/PlayerInteractEntityC2SPacket.mapping | 1 + .../c2s/play/PlayerInteractItemC2SPacket.mapping | 1 + .../packet/c2s/play/PlayerMoveC2SPacket.mapping | 4 ++++ .../c2s/play/PlayerSessionC2SPacket.mapping | 1 + .../c2s/play/QueryBlockNbtC2SPacket.mapping | 1 + .../c2s/play/QueryEntityNbtC2SPacket.mapping | 1 + .../c2s/play/RecipeBookDataC2SPacket.mapping | 1 + .../play/RecipeCategoryOptionsC2SPacket.mapping | 1 + .../packet/c2s/play/RenameItemC2SPacket.mapping | 1 + .../RequestCommandCompletionsC2SPacket.mapping | 1 + .../c2s/play/SelectMerchantTradeC2SPacket.mapping | 1 + .../c2s/play/SlotChangedStateC2SPacket.mapping | 1 + .../c2s/play/SpectatorTeleportC2SPacket.mapping | 1 + .../c2s/play/TeleportConfirmC2SPacket.mapping | 1 + .../c2s/play/UpdateCommandBlockC2SPacket.mapping | 1 + .../UpdateCommandBlockMinecartC2SPacket.mapping | 1 + .../c2s/play/UpdateDifficultyC2SPacket.mapping | 1 + .../play/UpdateDifficultyLockC2SPacket.mapping | 1 + .../packet/c2s/play/UpdateJigsawC2SPacket.mapping | 1 + .../play/UpdatePlayerAbilitiesC2SPacket.mapping | 1 + .../c2s/play/UpdateSelectedSlotC2SPacket.mapping | 1 + .../packet/c2s/play/UpdateSignC2SPacket.mapping | 1 + .../play/UpdateStructureBlockC2SPacket.mapping | 1 + .../packet/c2s/play/VehicleMoveC2SPacket.mapping | 1 + .../packet/c2s/query/QueryPingC2SPacket.mapping | 1 + .../packet/s2c/common/CommonPingS2CPacket.mapping | 1 + .../s2c/common/CookieRequestS2CPacket.mapping | 3 +++ .../packet/s2c/common/DisconnectS2CPacket.mapping | 1 + .../packet/s2c/common/KeepAliveS2CPacket.mapping | 1 + .../s2c/common/ResourcePackSendS2CPacket.mapping | 1 + .../s2c/common/ServerTransferS2CPacket.mapping | 3 +++ .../s2c/common/StoreCookieS2CPacket.mapping | 3 +++ .../s2c/common/SynchronizeTagsS2CPacket.mapping | 1 + .../s2c/config/DynamicRegistriesS2CPacket.mapping | 1 + .../packet/s2c/config/FeaturesS2CPacket.mapping | 1 + .../s2c/custom/DebugBeeCustomPayload.mapping | 3 +++ .../s2c/custom/DebugBrainCustomPayload.mapping | 4 ++++ .../s2c/custom/DebugBreezeCustomPayload.mapping | 4 ++++ .../custom/DebugGameEventCustomPayload.mapping | 4 ++++ .../DebugGameTestAddMarkerCustomPayload.mapping | 4 ++++ .../DebugGameTestClearCustomPayload.mapping | 4 ++++ .../custom/DebugGoalSelectorCustomPayload.mapping | 4 ++++ .../s2c/custom/DebugHiveCustomPayload.mapping | 4 ++++ .../DebugNeighborsUpdateCustomPayload.mapping | 4 ++++ .../s2c/custom/DebugPathCustomPayload.mapping | 4 ++++ .../s2c/custom/DebugPoiAddedCustomPayload.mapping | 4 ++++ .../custom/DebugPoiRemovedCustomPayload.mapping | 4 ++++ .../DebugPoiTicketCountCustomPayload.mapping | 4 ++++ .../s2c/custom/DebugRaidsCustomPayload.mapping | 4 ++++ .../custom/DebugStructuresCustomPayload.mapping | 4 ++++ .../DebugVillageSectionsCustomPayload.mapping | 4 ++++ .../DebugWorldgenAttemptCustomPayload.mapping | 4 ++++ .../s2c/login/LoginCompressionS2CPacket.mapping | 1 + .../s2c/login/LoginDisconnectS2CPacket.mapping | 1 + .../packet/s2c/login/LoginHelloS2CPacket.mapping | 1 + .../s2c/login/LoginQueryRequestS2CPacket.mapping | 1 + .../s2c/login/LoginSuccessS2CPacket.mapping | 1 + .../s2c/play/AdvancementUpdateS2CPacket.mapping | 3 +++ .../play/BlockBreakingProgressS2CPacket.mapping | 1 + .../s2c/play/BlockEntityUpdateS2CPacket.mapping | 4 ++++ .../packet/s2c/play/BlockEventS2CPacket.mapping | 3 +++ .../packet/s2c/play/BossBarS2CPacket.mapping | 1 + .../s2c/play/BundleDelimiterS2CPacket.mapping | 1 + .../packet/s2c/play/ChatMessageS2CPacket.mapping | 1 + .../s2c/play/ChatSuggestionsS2CPacket.mapping | 1 + .../s2c/play/ChunkBiomeDataS2CPacket.mapping | 1 + .../network/packet/s2c/play/ChunkData.mapping | 1 + .../packet/s2c/play/ChunkDataS2CPacket.mapping | 5 +++++ .../s2c/play/ChunkDeltaUpdateS2CPacket.mapping | 1 + .../s2c/play/ChunkLoadDistanceS2CPacket.mapping | 1 + .../ChunkRenderDistanceCenterS2CPacket.mapping | 1 + .../packet/s2c/play/ChunkSentS2CPacket.mapping | 1 + .../packet/s2c/play/ClearTitleS2CPacket.mapping | 1 + .../packet/s2c/play/CloseScreenS2CPacket.mapping | 1 + .../s2c/play/CommandSuggestionsS2CPacket.mapping | 1 + .../packet/s2c/play/CommandTreeS2CPacket.mapping | 1 + .../s2c/play/CraftFailedResponseS2CPacket.mapping | 1 + .../packet/s2c/play/DamageTiltS2CPacket.mapping | 1 + .../packet/s2c/play/DeathMessageS2CPacket.mapping | 1 + .../packet/s2c/play/DifficultyS2CPacket.mapping | 1 + .../packet/s2c/play/EndCombatS2CPacket.mapping | 1 + .../s2c/play/EntitiesDestroyS2CPacket.mapping | 1 + .../s2c/play/EntityAnimationS2CPacket.mapping | 1 + .../packet/s2c/play/EntityAttachS2CPacket.mapping | 1 + .../packet/s2c/play/EntityDamageS2CPacket.mapping | 1 + .../play/EntityEquipmentUpdateS2CPacket.mapping | 3 +++ .../s2c/play/EntityPassengersSetS2CPacket.mapping | 1 + .../s2c/play/EntityPositionS2CPacket.mapping | 1 + .../packet/s2c/play/EntityS2CPacket.mapping | 3 +++ .../s2c/play/EntitySetHeadYawS2CPacket.mapping | 1 + .../packet/s2c/play/EntitySpawnS2CPacket.mapping | 3 +++ .../s2c/play/EntityStatusEffectS2CPacket.mapping | 3 +++ .../packet/s2c/play/EntityStatusS2CPacket.mapping | 1 + .../s2c/play/EntityTrackerUpdateS2CPacket.mapping | 5 +++++ .../play/EntityVelocityUpdateS2CPacket.mapping | 1 + .../s2c/play/ExperienceBarUpdateS2CPacket.mapping | 1 + .../s2c/play/ExperienceOrbSpawnS2CPacket.mapping | 1 + .../packet/s2c/play/ExplosionS2CPacket.mapping | 3 +++ .../packet/s2c/play/GameJoinS2CPacket.mapping | 1 + .../packet/s2c/play/GameMessageS2CPacket.mapping | 1 + .../s2c/play/GameStateChangeS2CPacket.mapping | 1 + .../packet/s2c/play/HealthUpdateS2CPacket.mapping | 1 + .../packet/s2c/play/InventoryS2CPacket.mapping | 3 +++ .../packet/s2c/play/LightUpdateS2CPacket.mapping | 1 + .../packet/s2c/play/LookAtS2CPacket.mapping | 1 + .../packet/s2c/play/MapUpdateS2CPacket.mapping | 1 + .../s2c/play/NbtQueryResponseS2CPacket.mapping | 1 + .../s2c/play/OpenHorseScreenS2CPacket.mapping | 1 + .../packet/s2c/play/OpenScreenS2CPacket.mapping | 4 ++++ .../s2c/play/OpenWrittenBookS2CPacket.mapping | 1 + .../s2c/play/OverlayMessageS2CPacket.mapping | 1 + .../packet/s2c/play/ParticleS2CPacket.mapping | 3 +++ .../s2c/play/PlaySoundFromEntityS2CPacket.mapping | 3 +++ .../packet/s2c/play/PlaySoundS2CPacket.mapping | 3 +++ .../s2c/play/PlayerAbilitiesS2CPacket.mapping | 1 + .../play/PlayerActionResponseS2CPacket.mapping | 1 + .../s2c/play/PlayerListHeaderS2CPacket.mapping | 1 + .../packet/s2c/play/PlayerListS2CPacket.mapping | 1 + .../s2c/play/PlayerPositionLookS2CPacket.mapping | 1 + .../packet/s2c/play/PlayerRemoveS2CPacket.mapping | 1 + .../s2c/play/PlayerRespawnS2CPacket.mapping | 1 + .../s2c/play/PlayerSpawnPositionS2CPacket.mapping | 1 + .../play/ProfilelessChatMessageS2CPacket.mapping | 1 + .../s2c/play/RemoveMessageS2CPacket.mapping | 1 + .../s2c/play/ScoreboardDisplayS2CPacket.mapping | 1 + .../ScoreboardObjectiveUpdateS2CPacket.mapping | 3 +++ .../play/ScoreboardScoreResetS2CPacket.mapping | 1 + .../play/ScoreboardScoreUpdateS2CPacket.mapping | 3 +++ .../ScreenHandlerPropertyUpdateS2CPacket.mapping | 1 + .../play/ScreenHandlerSlotUpdateS2CPacket.mapping | 3 +++ .../play/SelectAdvancementTabS2CPacket.mapping | 1 + .../s2c/play/ServerMetadataS2CPacket.mapping | 1 + .../s2c/play/SetCameraEntityS2CPacket.mapping | 1 + .../s2c/play/SetTradeOffersS2CPacket.mapping | 3 +++ .../s2c/play/SignEditorOpenS2CPacket.mapping | 1 + .../s2c/play/SimulationDistanceS2CPacket.mapping | 1 + .../packet/s2c/play/StopSoundS2CPacket.mapping | 1 + .../packet/s2c/play/SubtitleS2CPacket.mapping | 1 + .../s2c/play/SynchronizeRecipesS2CPacket.mapping | 2 ++ .../network/packet/s2c/play/TeamS2CPacket.mapping | 1 + .../packet/s2c/play/TickStepS2CPacket.mapping | 1 + .../packet/s2c/play/TitleFadeS2CPacket.mapping | 1 + .../packet/s2c/play/TitleS2CPacket.mapping | 1 + .../packet/s2c/play/UnloadChunkS2CPacket.mapping | 1 + .../s2c/play/UnlockRecipesS2CPacket.mapping | 1 + .../s2c/play/UpdateSelectedSlotS2CPacket.mapping | 1 + .../s2c/play/UpdateTickRateS2CPacket.mapping | 1 + .../packet/s2c/play/VehicleMoveS2CPacket.mapping | 1 + .../WorldBorderCenterChangedS2CPacket.mapping | 1 + .../play/WorldBorderInitializeS2CPacket.mapping | 1 + .../WorldBorderInterpolateSizeS2CPacket.mapping | 1 + .../play/WorldBorderSizeChangedS2CPacket.mapping | 1 + ...rldBorderWarningBlocksChangedS2CPacket.mapping | 1 + ...WorldBorderWarningTimeChangedS2CPacket.mapping | 1 + .../packet/s2c/play/WorldEventS2CPacket.mapping | 1 + .../s2c/play/WorldTimeUpdateS2CPacket.mapping | 1 + .../packet/s2c/query/PingResultS2CPacket.mapping | 1 + .../s2c/query/QueryResponseS2CPacket.mapping | 1 + .../particle/BlockStateParticleEffect.mapping | 6 ++++++ mappings/net/minecraft/screen/ScreenTexts.mapping | 1 + .../network/ServerCommonNetworkHandler.mapping | 2 ++ 215 files changed, 409 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/client/network/CookieStorage.mapping create mode 100644 mappings/net/minecraft/network/listener/ClientCookieRequestPacketListener.mapping create mode 100644 mappings/net/minecraft/network/listener/ServerCookieResponsePacketListener.mapping create mode 100644 mappings/net/minecraft/network/packet/CommonPackets.mapping create mode 100644 mappings/net/minecraft/network/packet/ConfigPackets.mapping create mode 100644 mappings/net/minecraft/network/packet/CookiePackets.mapping create mode 100644 mappings/net/minecraft/network/packet/HandshakePackets.mapping create mode 100644 mappings/net/minecraft/network/packet/LoginPackets.mapping create mode 100644 mappings/net/minecraft/network/packet/PacketIdentifier.mapping create mode 100644 mappings/net/minecraft/network/packet/PingPackets.mapping create mode 100644 mappings/net/minecraft/network/packet/PlayPackets.mapping create mode 100644 mappings/net/minecraft/network/packet/StatusPackets.mapping rename mappings/net/minecraft/network/packet/c2s/common/{CookieRequestResponseC2SPacket.mapping => CookieResponseC2SPacket.mapping} (51%) create mode 100644 mappings/net/minecraft/network/packet/s2c/play/BundleDelimiterS2CPacket.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 203e825418..71dc3cca4f 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -313,6 +313,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_18095 getSplashTextLoader ()Lnet/minecraft/class_4008; METHOD method_18096 disconnect (Lnet/minecraft/class_437;Z)V ARG 1 disconnectionScreen + ARG 2 transferring METHOD method_18097 setWorld (Lnet/minecraft/class_638;)V ARG 1 world METHOD method_18098 reset (Lnet/minecraft/class_437;)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping index b8b5c5a59b..30d5b0178a 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/multiplayer/Connec ARG 2 address ARG 3 info ARG 4 quickPlay + ARG 5 cookieStorage CLASS 1 METHOD method_55509 toAcceptanceStatus (Lnet/minecraft/class_642$class_643;)Lnet/minecraft/class_9044$class_9047; ARG 0 policy diff --git a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping index 893f4dea76..38214623d7 100644 --- a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH FIELD field_45594 LOST_CONNECTION_TEXT Lnet/minecraft/class_2561; FIELD field_45595 queuedPackets Ljava/util/List; FIELD field_45944 LOGGER Lorg/slf4j/Logger; + FIELD field_48398 transferring Z + FIELD field_48399 serverCookies Ljava/util/Map; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V ARG 1 client ARG 2 connection diff --git a/mappings/net/minecraft/client/network/CookieStorage.mapping b/mappings/net/minecraft/client/network/CookieStorage.mapping new file mode 100644 index 0000000000..cef78ee513 --- /dev/null +++ b/mappings/net/minecraft/client/network/CookieStorage.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9112 net/minecraft/client/network/CookieStorage diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 6bc89f75c1..d769ed9f32 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod FIELD field_45742 CODEC Lcom/mojang/serialization/Codec; FIELD field_45743 name Ljava/lang/String; FIELD field_48325 ID_TO_VALUE Ljava/util/function/IntFunction; + FIELD field_48326 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_6328 ADDITION Lnet/minecraft/class_1322$class_1323; COMMENT Adds to the base value of an attribute. FIELD field_6329 id I diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index d5730aa2b5..d4048a2965 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -133,6 +133,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_52904 connect (Ljava/lang/String;ILnet/minecraft/class_9127;Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Lnet/minecraft/class_8592;)V ARG 1 address ARG 2 port + ARG 5 prePlayStateListener + ARG 6 intent METHOD method_52905 submit (Ljava/util/function/Consumer;)V ARG 1 task METHOD method_52906 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Z)V @@ -158,6 +160,10 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 1 log METHOD method_53859 addFlowControlHandler (Lio/netty/channel/ChannelPipeline;)V ARG 1 pipeline + METHOD method_56326 connect (Ljava/lang/String;ILnet/minecraft/class_9127;Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Z)V + ARG 1 address + ARG 2 port + ARG 6 transfer CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel diff --git a/mappings/net/minecraft/network/NetworkSide.mapping b/mappings/net/minecraft/network/NetworkSide.mapping index 3aeab82fe5..6222babbe5 100644 --- a/mappings/net/minecraft/network/NetworkSide.mapping +++ b/mappings/net/minecraft/network/NetworkSide.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_2598 net/minecraft/network/NetworkSide + FIELD field_48613 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name METHOD method_36146 getOpposite ()Lnet/minecraft/class_2598; + METHOD method_56444 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 215b3bac06..11fe32153c 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -299,6 +299,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readString() COMMENT @see #readString(int) COMMENT @see #writeString(String) + ARG 1 string ARG 2 maxLength COMMENT the max length of the byte array METHOD method_10789 writeLongArray ([J)Lnet/minecraft/class_2540; @@ -823,6 +824,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT exists if signed). COMMENT COMMENT @see #readProperty() + ARG 1 property METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_9142;Lnet/minecraft/class_9142;)V COMMENT Writes an {@code Either} to this buf. An either is represented by COMMENT a boolean indicating if the left side or the right side of the either, @@ -1073,6 +1075,11 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @return the read text COMMENT @see #readText() COMMENT @see #writeText(Text) + METHOD method_56335 readBlockPos (Lio/netty/buffer/ByteBuf;)Lnet/minecraft/class_2338; + ARG 0 buf + METHOD method_56336 writeBlockPos (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_2338;)V + ARG 0 buf + ARG 1 pos METHOD method_56337 writeUuid (Lio/netty/buffer/ByteBuf;Ljava/util/UUID;)V ARG 0 buf ARG 1 uuid diff --git a/mappings/net/minecraft/network/handler/PacketBundler.mapping b/mappings/net/minecraft/network/handler/PacketBundler.mapping index dd41eeab68..f836a14a58 100644 --- a/mappings/net/minecraft/network/handler/PacketBundler.mapping +++ b/mappings/net/minecraft/network/handler/PacketBundler.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_8035 net/minecraft/network/handler/PacketBundler FIELD field_41869 currentBundler Lnet/minecraft/class_8039$class_8040; + FIELD field_48534 handler Lnet/minecraft/class_8039; + METHOD (Lnet/minecraft/class_8039;)V + ARG 1 handler METHOD decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V ARG 1 context ARG 2 packet diff --git a/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping index 216491b9f4..6676e14252 100644 --- a/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping @@ -13,3 +13,7 @@ CLASS net/minecraft/class_8705 net/minecraft/network/listener/ClientCommonPacket ARG 1 packet METHOD method_55512 onResourcePackRemove (Lnet/minecraft/class_9053;)V ARG 1 packet + METHOD method_56149 onStoreCookie (Lnet/minecraft/class_9150;)V + ARG 1 packet + METHOD method_56150 onServerTransfer (Lnet/minecraft/class_9151;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ClientCookieRequestPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientCookieRequestPacketListener.mapping new file mode 100644 index 0000000000..98d07576c4 --- /dev/null +++ b/mappings/net/minecraft/network/listener/ClientCookieRequestPacketListener.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9087 net/minecraft/network/listener/ClientCookieRequestPacketListener + METHOD method_55845 onCookieRequest (Lnet/minecraft/class_9088;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerCookieResponsePacketListener.mapping b/mappings/net/minecraft/network/listener/ServerCookieResponsePacketListener.mapping new file mode 100644 index 0000000000..5fab0bbd02 --- /dev/null +++ b/mappings/net/minecraft/network/listener/ServerCookieResponsePacketListener.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9090 net/minecraft/network/listener/ServerCookieResponsePacketListener + METHOD method_55851 onCookieResponse (Lnet/minecraft/class_9091;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping index 7c170d3cf8..db6e6d5268 100644 --- a/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8709 net/minecraft/network/packet/BrandCustomPayload + FIELD field_48654 CODEC Lnet/minecraft/class_9139; + FIELD field_48655 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56481 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/CommonPackets.mapping b/mappings/net/minecraft/network/packet/CommonPackets.mapping new file mode 100644 index 0000000000..7b0abaeb1b --- /dev/null +++ b/mappings/net/minecraft/network/packet/CommonPackets.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_9152 net/minecraft/network/packet/CommonPackets + FIELD field_48631 CUSTOM_PAYLOAD_S2C Lnet/minecraft/class_9145; + FIELD field_48633 KEEP_ALIVE_S2C Lnet/minecraft/class_9145; + FIELD field_48641 CUSTOM_PAYLOAD_C2S Lnet/minecraft/class_9145; + FIELD field_48642 KEEP_ALIVE_C2S Lnet/minecraft/class_9145; + METHOD method_56472 s2c (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id + METHOD method_56473 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/ConfigPackets.mapping b/mappings/net/minecraft/network/packet/ConfigPackets.mapping new file mode 100644 index 0000000000..fde35a3e6f --- /dev/null +++ b/mappings/net/minecraft/network/packet/ConfigPackets.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9156 net/minecraft/network/packet/ConfigPackets + FIELD field_48694 FINISH_CONFIGURATION_S2C Lnet/minecraft/class_9145; + FIELD field_48697 FINISH_CONFIGURATION_C2S Lnet/minecraft/class_9145; + METHOD method_56510 s2c (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id + METHOD method_56511 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/CookiePackets.mapping b/mappings/net/minecraft/network/packet/CookiePackets.mapping new file mode 100644 index 0000000000..a05fcef97d --- /dev/null +++ b/mappings/net/minecraft/network/packet/CookiePackets.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9089 net/minecraft/network/packet/CookiePackets + METHOD method_55849 s2c (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id + METHOD method_55850 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/HandshakePackets.mapping b/mappings/net/minecraft/network/packet/HandshakePackets.mapping new file mode 100644 index 0000000000..b46cf239b7 --- /dev/null +++ b/mappings/net/minecraft/network/packet/HandshakePackets.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9096 net/minecraft/network/packet/HandshakePackets + METHOD method_56008 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/LoginPackets.mapping b/mappings/net/minecraft/network/packet/LoginPackets.mapping new file mode 100644 index 0000000000..a41c98f0e1 --- /dev/null +++ b/mappings/net/minecraft/network/packet/LoginPackets.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9098 net/minecraft/network/packet/LoginPackets + FIELD field_48240 HELLO_S2C Lnet/minecraft/class_9145; + FIELD field_48244 HELLO_C2S Lnet/minecraft/class_9145; + METHOD method_56016 s2c (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id + METHOD method_56017 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/Packet.mapping b/mappings/net/minecraft/network/packet/Packet.mapping index b96ca38153..bb8dc49dd5 100644 --- a/mappings/net/minecraft/network/packet/Packet.mapping +++ b/mappings/net/minecraft/network/packet/Packet.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2596 net/minecraft/network/packet/Packet COMMENT connection to simply skip the packet's sending than disconnecting} METHOD method_11054 apply (Lnet/minecraft/class_2547;)V ARG 1 listener + METHOD method_55846 getPacketId ()Lnet/minecraft/class_9145; METHOD method_56443 createCodec (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; ARG 0 encoder ARG 1 decoder diff --git a/mappings/net/minecraft/network/packet/PacketIdentifier.mapping b/mappings/net/minecraft/network/packet/PacketIdentifier.mapping new file mode 100644 index 0000000000..1a8f1ed1ce --- /dev/null +++ b/mappings/net/minecraft/network/packet/PacketIdentifier.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9145 net/minecraft/network/packet/PacketIdentifier diff --git a/mappings/net/minecraft/network/packet/PingPackets.mapping b/mappings/net/minecraft/network/packet/PingPackets.mapping new file mode 100644 index 0000000000..be38c617a0 --- /dev/null +++ b/mappings/net/minecraft/network/packet/PingPackets.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9100 net/minecraft/network/packet/PingPackets + METHOD method_56023 s2c (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id + METHOD method_56024 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/PlayPackets.mapping b/mappings/net/minecraft/network/packet/PlayPackets.mapping new file mode 100644 index 0000000000..597f8a0fd2 --- /dev/null +++ b/mappings/net/minecraft/network/packet/PlayPackets.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_9094 net/minecraft/network/packet/PlayPackets + FIELD field_48032 MOVE_VEHICLE_S2C Lnet/minecraft/class_9145; + FIELD field_48037 PLAYER_ABILITIES_S2C Lnet/minecraft/class_9145; + FIELD field_48088 SET_CARRIED_ITEM_S2C Lnet/minecraft/class_9145; + FIELD field_48094 MOVE_VEHICLE_C2S Lnet/minecraft/class_9145; + FIELD field_48098 PLAYER_ABILITIES_C2S Lnet/minecraft/class_9145; + FIELD field_48108 SET_CARRIED_ITEM_C2S Lnet/minecraft/class_9145; + FIELD field_48124 CHANGE_DIFFICULTY_C2S Lnet/minecraft/class_9145; + FIELD field_48135 CONTAINER_CLOSE_C2S Lnet/minecraft/class_9145; + FIELD field_48158 CHANGE_DIFFICULTY_S2C Lnet/minecraft/class_9145; + FIELD field_48165 CONTAINER_CLOSE_S2C Lnet/minecraft/class_9145; + METHOD method_55956 s2c (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id + METHOD method_55957 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/StatusPackets.mapping b/mappings/net/minecraft/network/packet/StatusPackets.mapping new file mode 100644 index 0000000000..29ddce0c55 --- /dev/null +++ b/mappings/net/minecraft/network/packet/StatusPackets.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9102 net/minecraft/network/packet/StatusPackets + METHOD method_56027 s2c (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id + METHOD method_56028 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping index e170619c6f..bf9f624b82 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/ClientOptionsC2SPacket.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/common/ClientOpt ARG 1 buf METHOD comp_1963 options ()Lnet/minecraft/class_8791; METHOD method_56474 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping index 275a849e02..d321f6e764 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_6374 net/minecraft/network/packet/c2s/common/CommonPon ARG 1 buf METHOD method_36960 getParameter ()I METHOD method_56477 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/common/CookieRequestResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping similarity index 51% rename from mappings/net/minecraft/network/packet/c2s/common/CookieRequestResponseC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping index e5a96ee52a..f3c13f3d3e 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/CookieRequestResponseC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping @@ -1,3 +1,8 @@ -CLASS net/minecraft/class_9091 net/minecraft/network/packet/c2s/common/CookieRequestResponseC2SPacket +CLASS net/minecraft/class_9091 net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket FIELD field_47895 CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_55853 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_55854 (Lnet/minecraft/class_2540;)[B + ARG 0 bufx diff --git a/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping index ab11e9e7ce..cee7580934 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_2817 net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket FIELD field_33361 MAX_PAYLOAD_SIZE I + FIELD field_48646 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping index 5cf7cbfe49..6a8fdfd757 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2827 net/minecraft/network/packet/c2s/common/KeepAlive ARG 1 buf METHOD method_12267 getId ()J METHOD method_56476 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping index 197bbae8cd..99ac619ead 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping @@ -5,5 +5,6 @@ CLASS net/minecraft/class_2856 net/minecraft/network/packet/c2s/common/ResourceP ARG 1 buf METHOD comp_2164 status ()Lnet/minecraft/class_2856$class_2857; METHOD method_56478 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2857 Status METHOD method_55627 hasFinished ()Z diff --git a/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping index c52d039dbc..5139056b2f 100644 --- a/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping +++ b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_8592 net/minecraft/network/packet/c2s/handshake/ConnectionIntent FIELD field_44976 STATUS_ID I FIELD field_44977 LOGIN_ID I + FIELD field_48228 TRANSFER_ID I METHOD method_52283 getId ()I METHOD method_52284 byId (I)Lnet/minecraft/class_8592; ARG 0 id diff --git a/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping index 395153d934..3d342be976 100644 --- a/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping @@ -12,3 +12,4 @@ CLASS net/minecraft/class_2889 net/minecraft/network/packet/c2s/handshake/Handsh METHOD comp_1565 port ()I METHOD comp_1566 intendedState ()Lnet/minecraft/class_8592; METHOD method_56007 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping index 14caa8e342..a0f98b42d8 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_2915 net/minecraft/network/packet/c2s/login/LoginHello METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56020 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping index cae5d2d32e..12f4ef72b9 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping @@ -21,3 +21,4 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2 ARG 1 nonce ARG 2 privateKey METHOD method_56021 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping index abd43f84c8..613bdc9010 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQuery METHOD comp_1569 queryId ()I METHOD comp_1570 response ()Lnet/minecraft/class_8594; METHOD method_11052 write (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_52290 readPayload (ILnet/minecraft/class_2540;)Lnet/minecraft/class_8594; COMMENT {@return the response payload read from {@code buf}} COMMENT diff --git a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping index 40438671a5..f690c6f082 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_8590 net/minecraft/network/packet/c2s/play/Acknowledge METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55967 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping index 5c6500b7a0..608f792996 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping @@ -13,4 +13,5 @@ CLASS net/minecraft/class_2859 net/minecraft/network/packet/c2s/play/Advancement METHOD method_12418 open (Lnet/minecraft/class_8779;)Lnet/minecraft/class_2859; ARG 0 advancement METHOD method_55994 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2860 Action diff --git a/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping index 8a50419b44..9141fade14 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/BoatPaddleStateC2SPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2836 net/minecraft/network/packet/c2s/play/BoatPaddleS METHOD method_12284 isLeftPaddling ()Z METHOD method_12285 isRightPaddling ()Z METHOD method_55984 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping index 01acf82fa2..214a38ac42 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping @@ -26,3 +26,4 @@ CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC METHOD method_37446 (Lnet/minecraft/class_2540;)Ljava/lang/String; ARG 0 buf2 METHOD method_55974 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping index 1b4ee95bde..975980dff7 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ButtonClickC2SPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2811 net/minecraft/network/packet/c2s/play/ButtonClick METHOD method_12186 getButtonId ()I METHOD method_12187 getSyncId ()I METHOD method_55970 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index 9e12052d41..1315e4f2e2 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -35,3 +35,4 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage METHOD comp_946 timestamp ()Ljava/time/Instant; METHOD comp_970 acknowledgment ()Lnet/minecraft/class_7635$class_7636; METHOD method_55965 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index e7b596a823..5399de205b 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 ARG 5 actionType ARG 6 stack ARG 7 modifiedStacks + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_12190 getStack ()Lnet/minecraft/class_1799; METHOD method_12192 getSlot ()I METHOD method_12193 getButton ()I @@ -25,3 +27,4 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 METHOD method_34678 getModifiedStacks ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD method_37440 getRevision ()I METHOD method_55971 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping index 20eb8d6e4b..988baa4c83 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientCommandC2SPacket.mapping @@ -16,4 +16,5 @@ CLASS net/minecraft/class_2848 net/minecraft/network/packet/c2s/play/ClientComma METHOD method_12366 getMountJumpHeight ()I METHOD method_36173 getEntityId ()I METHOD method_55989 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2849 Mode diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping index dbeed97abb..d88416a4f3 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientStatusC2SPacket.mapping @@ -7,4 +7,5 @@ CLASS net/minecraft/class_2799 net/minecraft/network/packet/c2s/play/ClientStatu ARG 1 mode METHOD method_12119 getMode ()Lnet/minecraft/class_2799$class_2800; METHOD method_55968 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2800 Mode diff --git a/mappings/net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket.mapping index 489d19ec3e..fc540426a8 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CloseHandledScreenC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2815 net/minecraft/network/packet/c2s/play/CloseHandle ARG 1 buf METHOD method_36168 getSyncId ()I METHOD method_55972 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping index 6523767c7d..ac9b9d95e1 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping @@ -33,3 +33,4 @@ CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExec METHOD comp_809 timestamp ()Ljava/time/Instant; METHOD comp_969 acknowledgment ()Lnet/minecraft/class_7635$class_7636; METHOD method_55964 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping index 1806717192..c0d7202d12 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_2840 net/minecraft/network/packet/c2s/play/CraftReques METHOD method_12319 shouldCraftAll ()Z METHOD method_12320 getRecipe ()Lnet/minecraft/class_2960; METHOD method_55986 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping index 805d5cee5e..27762eae01 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_2873 net/minecraft/network/packet/c2s/play/CreativeInv METHOD (ILnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_12479 getStack ()Lnet/minecraft/class_1799; METHOD method_12481 getSlot ()I METHOD method_55999 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping index d8469de9ad..6337db727b 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/HandSwingC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2879 net/minecraft/network/packet/c2s/play/HandSwingC2 ARG 1 buf METHOD method_12512 getHand ()Lnet/minecraft/class_1268; METHOD method_56003 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping index 3da6b7ee97..1f787a1a40 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_5194 net/minecraft/network/packet/c2s/play/JigsawGener METHOD method_27276 getMaxDepth ()I METHOD method_29446 shouldKeepJigsaws ()Z METHOD method_55977 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping index e2f8ca4dc4..170a2d9403 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_7640 net/minecraft/network/packet/c2s/play/MessageAckn METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55963 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping index 7aaba30952..9a0d37702c 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PickFromInventoryC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2838 net/minecraft/network/packet/c2s/play/PickFromInv ARG 1 buf METHOD method_12293 getSlot ()I METHOD method_55985 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping index 03afb04e57..86c0da817a 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerActionC2SPacket.mapping @@ -20,4 +20,5 @@ CLASS net/minecraft/class_2846 net/minecraft/network/packet/c2s/play/PlayerActio METHOD method_12363 getAction ()Lnet/minecraft/class_2846$class_2847; METHOD method_42079 getSequence ()I METHOD method_55988 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2847 Action diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping index 3cea8b27e7..5c65c36494 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInputC2SPacket.mapping @@ -18,3 +18,4 @@ CLASS net/minecraft/class_2851 net/minecraft/network/packet/c2s/play/PlayerInput METHOD method_12372 getSideways ()F METHOD method_12373 getForward ()F METHOD method_55990 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping index 59f457572c..e64786ebd0 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_2885 net/minecraft/network/packet/c2s/play/PlayerInter METHOD method_12546 getHand ()Lnet/minecraft/class_1268; METHOD method_42080 getSequence ()I METHOD method_56005 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping index b5da758967..7ddc670804 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_2824 net/minecraft/network/packet/c2s/play/PlayerInter METHOD method_34209 handle (Lnet/minecraft/class_2824$class_5908;)V ARG 1 handler METHOD method_55976 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_5906 InteractTypeHandler METHOD method_34211 getType ()Lnet/minecraft/class_2824$class_5907; METHOD method_34212 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping index 7221fc118a..6104ea1087 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractItemC2SPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2886 net/minecraft/network/packet/c2s/play/PlayerInter METHOD method_12551 getHand ()Lnet/minecraft/class_1268; METHOD method_42081 getSequence ()I METHOD method_56006 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping index 8d2a52f7ae..83d78040f7 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC METHOD method_34221 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_2829; ARG 0 buf METHOD method_55979 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2830 Full FIELD field_48199 CODEC Lnet/minecraft/class_9139; METHOD (DDDFFZ)V @@ -52,6 +53,7 @@ CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC METHOD method_34222 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_2830; ARG 0 buf METHOD method_55980 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2831 LookAndOnGround FIELD field_48200 CODEC Lnet/minecraft/class_9139; METHOD (FFZ)V @@ -61,6 +63,7 @@ CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC METHOD method_34223 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_2831; ARG 0 buf METHOD method_55981 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_5911 OnGroundOnly FIELD field_48201 CODEC Lnet/minecraft/class_9139; METHOD (Z)V @@ -68,3 +71,4 @@ CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC METHOD method_34224 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_5911; ARG 0 buf METHOD method_55982 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping index 15e04483dc..1cee4b4c0e 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_7861 net/minecraft/network/packet/c2s/play/PlayerSessi METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55966 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping index d2bdbd6c47..6c818e2e96 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/QueryBlockNbtC2SPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2795 net/minecraft/network/packet/c2s/play/QueryBlockN METHOD method_12094 getPos ()Lnet/minecraft/class_2338; METHOD method_12096 getTransactionId ()I METHOD method_55961 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping index 2bb0fdcce8..c91ca3dc0f 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/QueryEntityNbtC2SPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2822 net/minecraft/network/packet/c2s/play/QueryEntity METHOD method_12244 getEntityId ()I METHOD method_12245 getTransactionId ()I METHOD method_55975 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping index 74d3b0f53f..934487d7a2 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2853 net/minecraft/network/packet/c2s/play/RecipeBookD ARG 1 recipe METHOD method_12406 getRecipeId ()Lnet/minecraft/class_2960; METHOD method_55992 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping index 34d0af0124..a52444e458 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_5427 net/minecraft/network/packet/c2s/play/RecipeCateg METHOD method_30306 isGuiOpen ()Z METHOD method_30307 isFilteringCraftable ()Z METHOD method_55991 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping index 9b34680806..bc687fba1c 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RenameItemC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2855 net/minecraft/network/packet/c2s/play/RenameItemC ARG 1 buf METHOD method_12407 getName ()Ljava/lang/String; METHOD method_55993 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping index 6582304384..d4c63247d0 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RequestCommandCompletionsC2SPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2805 net/minecraft/network/packet/c2s/play/RequestComm METHOD method_12148 getPartialCommand ()Ljava/lang/String; METHOD method_12149 getCompletionId ()I METHOD method_55969 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping index c5b8d94933..c882a11934 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2863 net/minecraft/network/packet/c2s/play/SelectMerch ARG 1 buf METHOD method_12431 getTradeId ()I METHOD method_55995 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/SlotChangedStateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SlotChangedStateC2SPacket.mapping index 2f542e96f6..85b7eda6a8 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/SlotChangedStateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/SlotChangedStateC2SPacket.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_8875 net/minecraft/network/packet/c2s/play/SlotChanged ARG 1 buf METHOD comp_1999 screenHandlerId ()I METHOD method_55973 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping index 8714e15484..4dfc29d7f3 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/SpectatorTeleportC2SPacket.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_2884 net/minecraft/network/packet/c2s/play/SpectatorTe METHOD method_12541 getTarget (Lnet/minecraft/class_3218;)Lnet/minecraft/class_1297; ARG 1 world METHOD method_56004 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping index a5fca3a28e..eaa1118566 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/TeleportConfirmC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2793 net/minecraft/network/packet/c2s/play/TeleportCon ARG 1 buf METHOD method_12086 getTeleportId ()I METHOD method_55960 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping index 496f140f03..3de153c5ec 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping @@ -25,3 +25,4 @@ CLASS net/minecraft/class_2870 net/minecraft/network/packet/c2s/play/UpdateComma METHOD method_12473 getPos ()Lnet/minecraft/class_2338; METHOD method_12474 isAlwaysActive ()Z METHOD method_55997 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping index c3e6d57efc..da4e8fd65c 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockMinecartC2SPacket.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_2871 net/minecraft/network/packet/c2s/play/UpdateComma ARG 1 world METHOD method_12478 shouldTrackOutput ()Z METHOD method_55998 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping index ca8001883c..00bfb83d47 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_4210 net/minecraft/network/packet/c2s/play/UpdateDiffi ARG 1 buf METHOD method_19478 getDifficulty ()Lnet/minecraft/class_1267; METHOD method_55962 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping index 275aa571e0..851b6b1071 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateDifficultyLockC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_4211 net/minecraft/network/packet/c2s/play/UpdateDiffi ARG 1 difficultyLocked METHOD method_19485 isDifficultyLocked ()Z METHOD method_55978 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping index ad30612ea1..e14711efea 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping @@ -28,3 +28,4 @@ CLASS net/minecraft/class_3753 net/minecraft/network/packet/c2s/play/UpdateJigsa METHOD method_54668 getSelectionPriority ()I METHOD method_54669 getPlacementPriority ()I METHOD method_56000 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping index 3625ab5ce2..4080e7adeb 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdatePlayerAbilitiesC2SPacket.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_2842 net/minecraft/network/packet/c2s/play/UpdatePlaye ARG 1 buf METHOD method_12346 isFlying ()Z METHOD method_55987 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping index 67e14deac8..d6f4848c84 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2868 net/minecraft/network/packet/c2s/play/UpdateSelec ARG 1 buf METHOD method_12442 getSelectedSlot ()I METHOD method_55996 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping index e30960ad72..45c98fbf1e 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping @@ -17,3 +17,4 @@ CLASS net/minecraft/class_2877 net/minecraft/network/packet/c2s/play/UpdateSignC METHOD method_12510 getPos ()Lnet/minecraft/class_2338; METHOD method_49751 isFront ()Z METHOD method_56002 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping index 694de2e306..2975b764b2 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping @@ -49,3 +49,4 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStruc METHOD method_12505 shouldShowBoundingBox ()Z METHOD method_12506 shouldIgnoreEntities ()Z METHOD method_56001 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping index 6100c2741c..34b856dd2e 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/class_2833 net/minecraft/network/packet/c2s/play/VehicleMove METHOD method_12280 getY ()D METHOD method_12281 getYaw ()F METHOD method_55983 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping index 06acd6d341..30389429e7 100644 --- a/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/query/QueryPingC2SPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2935 net/minecraft/network/packet/c2s/query/QueryPingC ARG 1 buf METHOD method_12700 getStartTime ()J METHOD method_56025 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping index d463767282..0e3bbe10c7 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping @@ -18,3 +18,4 @@ CLASS net/minecraft/class_6373 net/minecraft/network/packet/s2c/common/CommonPin ARG 1 buf METHOD method_36950 getParameter ()I METHOD method_56464 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket.mapping index 7af26c6505..5f58d77fe0 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_9088 net/minecraft/network/packet/s2c/common/CookieRequestS2CPacket FIELD field_47892 CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_55848 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping index 5094ab84f8..aabcbae2c7 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2661 net/minecraft/network/packet/s2c/common/Disconnec ARG 1 reason METHOD method_11468 getReason ()Lnet/minecraft/class_2561; METHOD method_56462 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping index ec2406fc31..43b782b7f0 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2670 net/minecraft/network/packet/s2c/common/KeepAlive ARG 1 buf METHOD method_11517 getId ()J METHOD method_56463 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping index 3d158d45c7..36472b972f 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/common/ResourceP METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56466 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket.mapping index 29ee750174..1bdd52a50f 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_9151 net/minecraft/network/packet/s2c/common/ServerTransferS2CPacket FIELD field_48629 CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_56469 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping index 6bc46d077c..7879633c2d 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_9150 net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket FIELD field_48627 CODEC Lnet/minecraft/class_9139; FIELD field_48628 MAX_COOKIE_LENGTH I + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_56467 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping index 67f72b3fa7..e9ea54f18e 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/common/Synchroni ARG 0 bufx ARG 1 serializedGroup METHOD method_56471 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping index 0891a915b0..fb57a118c6 100644 --- a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_8734 net/minecraft/network/packet/s2c/config/DynamicRe ARG 1 buf METHOD comp_1724 registryManager ()Lnet/minecraft/class_5455$class_6890; METHOD method_56508 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping index 3296b592a7..a736a64f25 100644 --- a/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_7832 net/minecraft/network/packet/s2c/config/FeaturesS METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56509 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping index 4283b0e56e..4d2348168d 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_8707 net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload + FIELD field_48650 CODEC Lnet/minecraft/class_9139; + FIELD field_48651 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53028 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_5243 Bee FIELD comp_1650 entityId I FIELD comp_1657 disallowedHives Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping index 223b5c46e7..c2dbb64572 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_8708 net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload + FIELD field_48652 CODEC Lnet/minecraft/class_9139; + FIELD field_48653 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56480 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_4232 Brain FIELD comp_1660 entityId I FIELD comp_1671 possibleActivities Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping index 8bce6ead90..f2b6d3c6f8 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_9004 net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload + FIELD field_48656 CODEC Lnet/minecraft/class_9139; + FIELD field_48657 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56482 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_9005 BreezeInfo METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping index 8e613d3820..63fb7397f1 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8712 net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload + FIELD field_48660 CODEC Lnet/minecraft/class_9139; + FIELD field_48661 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56494 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping index 0978ef3fe1..8cef57108d 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8714 net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload + FIELD field_48664 CODEC Lnet/minecraft/class_9139; + FIELD field_48665 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56495 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping index a2eb999a8a..14231f7854 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8715 net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload + FIELD field_48666 CODEC Lnet/minecraft/class_9139; + FIELD field_48667 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56496 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping index 5be2675c3c..43225bbf3a 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping @@ -1,9 +1,13 @@ CLASS net/minecraft/class_8716 net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload + FIELD field_48668 CODEC Lnet/minecraft/class_9139; + FIELD field_48669 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53034 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8716$class_8717;)V ARG 0 buf ARG 1 goal + METHOD method_56497 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_8717 Goal METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping index 0c9f4d297d..efe9d9b04e 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_8718 net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload + FIELD field_48670 CODEC Lnet/minecraft/class_9139; + FIELD field_48671 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56498 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_8719 HiveInfo METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping index 88314b76ae..9dc52f3855 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8720 net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload + FIELD field_48672 CODEC Lnet/minecraft/class_9139; + FIELD field_48673 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56499 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping index 394bf144ac..cc7401178e 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8721 net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload + FIELD field_48674 CODEC Lnet/minecraft/class_9139; + FIELD field_48675 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56500 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping index efe2d63ced..29a392b9e0 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8722 net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload + FIELD field_48676 CODEC Lnet/minecraft/class_9139; + FIELD field_48677 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56501 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping index 15d691f858..89ca11583c 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8723 net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload + FIELD field_48678 CODEC Lnet/minecraft/class_9139; + FIELD field_48679 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56502 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping index 470cb709c2..e7f02c239b 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8724 net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload + FIELD field_48680 CODEC Lnet/minecraft/class_9139; + FIELD field_48681 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56503 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping index bd6ef26e3b..4be4dffd68 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8725 net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload + FIELD field_48682 CODEC Lnet/minecraft/class_9139; + FIELD field_48683 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56504 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping index 48f773cf29..832ff6e837 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_8726 net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload + FIELD field_48684 CODEC Lnet/minecraft/class_9139; + FIELD field_48685 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53037 writeBox (Lnet/minecraft/class_2540;Lnet/minecraft/class_3341;)V @@ -9,6 +11,8 @@ CLASS net/minecraft/class_8726 net/minecraft/network/packet/s2c/custom/DebugStru ARG 2 piece METHOD method_53039 readBox (Lnet/minecraft/class_2540;)Lnet/minecraft/class_3341; ARG 0 buf + METHOD method_56505 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_8727 Piece METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping index ad2f530bce..c760350fd4 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8728 net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload + FIELD field_48686 CODEC Lnet/minecraft/class_9139; + FIELD field_48687 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56506 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping index 45a443bbb6..cb70ae837a 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_8729 net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload + FIELD field_48688 CODEC Lnet/minecraft/class_9139; + FIELD field_48689 KEY Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56507 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping index 5c6e924c6d..cf1690529c 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginCompressionS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2907 net/minecraft/network/packet/s2c/login/LoginCompr ARG 1 buf METHOD method_12634 getCompressionThreshold ()I METHOD method_56014 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping index f0dc263996..7307a748e1 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2909 net/minecraft/network/packet/s2c/login/LoginDisco ARG 1 reason METHOD method_12638 getReason ()Lnet/minecraft/class_2561; METHOD method_56015 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping index 614f6f4b67..f3e63a668a 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello METHOD method_12611 getPublicKey ()Ljava/security/PublicKey; METHOD method_12613 getNonce ()[B METHOD method_56012 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping index 8553d4cf76..c216344e9f 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_2899 net/minecraft/network/packet/s2c/login/LoginQuery ARG 0 id ARG 1 buf METHOD method_56010 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping index 61d8f3facd..adeb5c8c7e 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2901 net/minecraft/network/packet/s2c/login/LoginSucce ARG 1 buf METHOD method_12593 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_56011 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping index addb813971..5fabf1cf23 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement FIELD field_12717 toEarn Ljava/util/List; FIELD field_12718 clearCurrent Z FIELD field_48007 CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD (ZLjava/util/Collection;Ljava/util/Set;Ljava/util/Map;)V ARG 1 clearCurrent ARG 2 toEarn @@ -17,3 +19,4 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement ARG 0 buf2 ARG 1 progress METHOD method_55952 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping index fb4124f966..b51a329031 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockBreakingProgressS2CPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_2620 net/minecraft/network/packet/s2c/play/BlockBreaki METHOD method_11278 getProgress ()I METHOD method_11280 getEntityId ()I METHOD method_55859 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping index 1512602ece..8f077197c2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntity FIELD field_12039 nbt Lnet/minecraft/class_2487; FIELD field_12040 pos Lnet/minecraft/class_2338; FIELD field_47903 CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V + ARG 1 pos + ARG 2 blockEntityType + ARG 3 nbt METHOD method_11290 getNbt ()Lnet/minecraft/class_2487; METHOD method_11291 getBlockEntityType ()Lnet/minecraft/class_2591; METHOD method_11293 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping index 1bc62a0aaf..6d9112d453 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping @@ -9,8 +9,11 @@ CLASS net/minecraft/class_2623 net/minecraft/network/packet/s2c/play/BlockEventS ARG 2 block ARG 3 type ARG 4 data + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11294 getType ()I METHOD method_11295 getBlock ()Lnet/minecraft/class_2248; METHOD method_11296 getData ()I METHOD method_11298 getPos ()Lnet/minecraft/class_2338; METHOD method_55860 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping index 7da1a62a0d..5e2460a570 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP METHOD method_34098 updateProperties (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629; ARG 0 bar METHOD method_55861 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_5880 AddAction FIELD field_29100 name Lnet/minecraft/class_2561; FIELD field_29101 percent F diff --git a/mappings/net/minecraft/network/packet/s2c/play/BundleDelimiterS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BundleDelimiterS2CPacket.mapping new file mode 100644 index 0000000000..98173a02a4 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/BundleDelimiterS2CPacket.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9093 net/minecraft/network/packet/s2c/play/BundleDelimiterS2CPacket diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping index f0c38f13a2..0d68b0234d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -25,3 +25,4 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage ARG 1 buf METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7603; METHOD method_55898 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping index c3bec61fae..cec2a01f8a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping @@ -3,4 +3,5 @@ CLASS net/minecraft/class_7597 net/minecraft/network/packet/s2c/play/ChatSuggest METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55872 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_7598 Action diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping index c813b44bb5..474effc861 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_8212 net/minecraft/network/packet/s2c/play/ChunkBiomeD ARG 0 bufx ARG 1 data METHOD method_55864 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_8213 Serialized METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping index 5331c0b489..62a981d8b3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData METHOD method_38589 getSectionsPacketSize (Lnet/minecraft/class_2818;)I ARG 0 chunk METHOD method_38590 write (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_38591 writeSections (Lnet/minecraft/class_2540;Lnet/minecraft/class_2818;)V ARG 0 buf ARG 1 chunk diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping index 308ab37355..ad25ae7ecb 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping @@ -3,12 +3,17 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2 FIELD field_12236 chunkX I FIELD field_34870 chunkData Lnet/minecraft/class_6603; FIELD field_34871 lightData Lnet/minecraft/class_6606; + FIELD field_47933 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_2818;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;)V ARG 1 chunk ARG 2 lightProvider ARG 3 skyBits ARG 4 blockBits + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11523 getChunkX ()I METHOD method_11524 getChunkZ ()I METHOD method_38598 getChunkData ()Lnet/minecraft/class_6603; METHOD method_38599 getLightData ()Lnet/minecraft/class_6606; + METHOD method_55883 (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping index 5b881f269c..8619c2b5b5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping @@ -17,3 +17,4 @@ CLASS net/minecraft/class_2637 net/minecraft/network/packet/s2c/play/ChunkDeltaU COMMENT Calls the given consumer for each pair of block position and block state contained in this packet. ARG 1 visitor METHOD method_55911 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping index 5fd70c230d..7bad2253a6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkLoadDistanceS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_4273 net/minecraft/network/packet/s2c/play/ChunkLoadDi ARG 1 buf METHOD method_20206 getDistance ()I METHOD method_55923 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping index 388c1a9616..a52fd283e5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkRenderDistanceCenterS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_4282 net/minecraft/network/packet/s2c/play/ChunkRender METHOD method_20322 getChunkX ()I METHOD method_20323 getChunkZ ()I METHOD method_55922 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping index 73daad9198..f90ea0343f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_8738 net/minecraft/network/packet/s2c/play/ChunkSentS2 METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55863 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ClearTitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ClearTitleS2CPacket.mapping index c78c8868b5..0fbe24fb91 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ClearTitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ClearTitleS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_5888 net/minecraft/network/packet/s2c/play/ClearTitleS ARG 1 reset METHOD method_34116 shouldReset ()Z METHOD method_55865 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping index 1f3b712e18..42b871c22c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2645 net/minecraft/network/packet/s2c/play/CloseScreen ARG 1 buf METHOD method_36148 getSyncId ()I METHOD method_55868 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping index ebbcb662cd..2815398a35 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping @@ -18,3 +18,4 @@ CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSugg ARG 0 buf3 ARG 1 tooltip METHOD method_55866 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping index 582282b65f..fbdbb305cd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_2641 net/minecraft/network/packet/s2c/play/CommandTree METHOD method_42068 (Ljava/util/function/BiPredicate;Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntSet;I)Z ARG 0 index METHOD method_55867 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2642 CommandNodeData FIELD field_12124 flags I FIELD field_12125 childNodeIndices [I diff --git a/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping index 737b281038..40499e803a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2695 net/minecraft/network/packet/s2c/play/CraftFailed METHOD method_11684 getRecipeId ()Lnet/minecraft/class_2960; METHOD method_11685 getSyncId ()I METHOD method_55896 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping index 721d739519..60e6bb180b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_8043 net/minecraft/network/packet/s2c/play/DamageTiltS METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55881 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping index a6c29dc12b..a56051d8ab 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_5892 net/minecraft/network/packet/s2c/play/DeathMessag METHOD method_34144 getEntityId ()I METHOD method_34145 getMessage ()Lnet/minecraft/class_2561; METHOD method_55900 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping index 5485eda0d5..5a83c1f2f0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DifficultyS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2632 net/minecraft/network/packet/s2c/play/DifficultyS METHOD method_11340 isDifficultyLocked ()Z METHOD method_11342 getDifficulty ()Lnet/minecraft/class_1267; METHOD method_55862 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping index 387e2ea8db..e723cc078e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_5890 net/minecraft/network/packet/s2c/play/EndCombatS2 METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55899 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping index 86b5a0d239..e57084bff6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping @@ -9,3 +9,4 @@ CLASS net/minecraft/class_2716 net/minecraft/network/packet/s2c/play/EntitiesDes ARG 1 entityIds METHOD method_36548 getEntityIds ()Lit/unimi/dsi/fastutil/ints/IntList; METHOD method_55906 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping index 955a21ca07..5a638477d4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/class_2616 net/minecraft/network/packet/s2c/play/EntityAnima METHOD method_11267 getAnimationId ()I METHOD method_11269 getId ()I METHOD method_55857 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping index 5a2ecb373f..d304d007b0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2740 net/minecraft/network/packet/s2c/play/EntityAttac METHOD method_11810 getHoldingEntityId ()I METHOD method_11812 getAttachedEntityId ()I METHOD method_55927 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping index 17183b5a2a..4289118255 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping @@ -18,3 +18,4 @@ CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamag METHOD method_49076 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_243; ARG 0 pos METHOD method_55873 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping index 92351cffc1..0cbb178a49 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_2744 net/minecraft/network/packet/s2c/play/EntityEquip METHOD (ILjava/util/List;)V ARG 1 id ARG 2 equipmentList + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11820 getId ()I METHOD method_30145 getEquipmentList ()Ljava/util/List; METHOD method_55929 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping index 13fbfadf70..424a0783ff 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping @@ -9,3 +9,4 @@ CLASS net/minecraft/class_2752 net/minecraft/network/packet/s2c/play/EntityPasse METHOD method_11840 getPassengerIds ()[I METHOD method_11841 getId ()I METHOD method_55933 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping index 75b42b64eb..c5f20e3890 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping @@ -19,3 +19,4 @@ CLASS net/minecraft/class_2777 net/minecraft/network/packet/s2c/play/EntityPosit METHOD method_11921 getPitch ()B METHOD method_11923 isOnGround ()Z METHOD method_55949 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping index d9c5f0e2d2..57a85c0279 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPa METHOD method_34138 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2684$class_2685; ARG 0 buf METHOD method_55890 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2686 RotateAndMoveRelative FIELD field_47941 CODEC Lnet/minecraft/class_9139; METHOD (ISSSBBZ)V @@ -52,6 +53,7 @@ CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPa METHOD method_34139 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2684$class_2686; ARG 0 buf METHOD method_55891 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2687 Rotate FIELD field_47942 CODEC Lnet/minecraft/class_9139; METHOD (IBBZ)V @@ -62,3 +64,4 @@ CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPa METHOD method_34140 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2684$class_2687; ARG 0 buf METHOD method_55892 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping index e4d0ab5b2d..d9557197f1 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping @@ -11,3 +11,4 @@ CLASS net/minecraft/class_2726 net/minecraft/network/packet/s2c/play/EntitySetHe ARG 1 world METHOD method_11787 getHeadYaw ()B METHOD method_55910 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping index f9b1c68a46..a26da710a6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping @@ -38,6 +38,8 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn ARG 1 entity ARG 2 entityData ARG 3 pos + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11164 getUuid ()Ljava/util/UUID; METHOD method_11166 getEntityData ()I METHOD method_11167 getId ()I @@ -52,3 +54,4 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn METHOD method_11176 getZ ()D METHOD method_43233 getHeadYaw ()F METHOD method_55855 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index aa4e1e0daa..3fd9d1dbc0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu ARG 1 entityId ARG 2 effect ARG 3 keepFading + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11942 shouldShowIcon ()Z METHOD method_11943 getEntityId ()I METHOD method_11944 getDuration ()I @@ -22,3 +24,4 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11950 isAmbient ()Z METHOD method_55629 keepFading ()Z METHOD method_55954 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping index 19285a84b4..2f077708a0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping @@ -11,3 +11,4 @@ CLASS net/minecraft/class_2663 net/minecraft/network/packet/s2c/play/EntityStatu ARG 1 world METHOD method_11470 getStatus ()B METHOD method_55876 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping index 0efab70e36..255339639b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping @@ -5,9 +5,14 @@ CLASS net/minecraft/class_2739 net/minecraft/network/packet/s2c/play/EntityTrack FIELD field_47979 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/util/List;)V ARG 1 id + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD comp_1127 id ()I METHOD comp_1128 trackedValues ()Ljava/util/List; METHOD method_46615 write (Ljava/util/List;Lnet/minecraft/class_9129;)V ARG 0 trackedValues + ARG 1 buf METHOD method_46616 read (Lnet/minecraft/class_9129;)Ljava/util/List; + ARG 0 buf METHOD method_55926 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping index 36b2b10f15..d15ecb5601 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping @@ -21,3 +21,4 @@ CLASS net/minecraft/class_2743 net/minecraft/network/packet/s2c/play/EntityVeloc METHOD method_11818 getId ()I METHOD method_11819 getVelocityZ ()I METHOD method_55928 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping index ab92ef33c1..a08ccf75aa 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExperienceBarUpdateS2CPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_2748 net/minecraft/network/packet/s2c/play/ExperienceB METHOD method_11828 getExperience ()I METHOD method_11830 getBarProgress ()F METHOD method_55930 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping index 791db2efe5..f7cd7184ce 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/class_2606 net/minecraft/network/packet/s2c/play/ExperienceO METHOD method_11184 getExperience ()I METHOD method_11185 getX ()D METHOD method_55856 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping index 012600c8cf..4fb3ad18d8 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 ARG 10 destructionType ARG 11 particle ARG 12 emitterParticle + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11472 getPlayerVelocityX ()F METHOD method_11473 getPlayerVelocityY ()F METHOD method_11474 getPlayerVelocityZ ()F @@ -47,3 +49,4 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 METHOD method_55330 getEmitterParticle ()Lnet/minecraft/class_2394; METHOD method_55331 getSoundEvent ()Lnet/minecraft/class_6880; METHOD method_55877 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 6422df8f74..35d62c1849 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -21,3 +21,4 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C METHOD method_34135 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5321; ARG 0 b METHOD method_55887 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping index 721dddca44..7fcaa68860 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_7439 net/minecraft/network/packet/s2c/play/GameMessage METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55945 write (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 8aca2c0164..6c20dc7539 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_2668 net/minecraft/network/packet/s2c/play/GameStateCh METHOD method_11491 getReason ()Lnet/minecraft/class_2668$class_5402; METHOD method_11492 getValue ()F METHOD method_55879 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_5402 Reason FIELD field_25657 REASONS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_25658 id I diff --git a/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping index 5b670aea38..5a1c1e1275 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/HealthUpdateS2CPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_2749 net/minecraft/network/packet/s2c/play/HealthUpdat METHOD method_11833 getHealth ()F METHOD method_11834 getSaturation ()F METHOD method_55931 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping index f198087107..184879fbe7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping @@ -12,8 +12,11 @@ CLASS net/minecraft/class_2649 net/minecraft/network/packet/s2c/play/InventoryS2 ARG 2 revision ARG 3 contents ARG 4 cursorStack + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11440 getSyncId ()I METHOD method_11441 getContents ()Ljava/util/List; METHOD method_37437 getCursorStack ()Lnet/minecraft/class_1799; METHOD method_37438 getRevision ()I METHOD method_55869 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping index 9197934112..81af475b29 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_2676 net/minecraft/network/packet/s2c/play/LightUpdate METHOD method_11558 getChunkX ()I METHOD method_38600 getData ()Lnet/minecraft/class_6606; METHOD method_55886 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping index fd1dbca1d0..6ac6f1f9d7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping @@ -22,3 +22,4 @@ CLASS net/minecraft/class_2707 net/minecraft/network/packet/s2c/play/LookAtS2CPa METHOD method_11732 getTargetPosition (Lnet/minecraft/class_1937;)Lnet/minecraft/class_243; ARG 1 world METHOD method_55903 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index 9506e8aac3..15ce437426 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -29,3 +29,4 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2 METHOD method_43883 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_20; ARG 0 buf3 METHOD method_55888 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping index cd29dc5f1d..fedbfee8b5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2774 net/minecraft/network/packet/s2c/play/NbtQueryRes METHOD method_11910 getTransactionId ()I METHOD method_11911 getNbt ()Lnet/minecraft/class_2487; METHOD method_55947 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping index 47b72183d6..688ef683c9 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_2648 net/minecraft/network/packet/s2c/play/OpenHorseSc METHOD method_11433 getHorseId ()I METHOD method_11434 getSlotCount ()I METHOD method_55880 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping index 042fb3caa0..dbbbfcd6e9 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenScreenS FIELD field_17437 screenHandlerId Lnet/minecraft/class_3917; FIELD field_17438 name Lnet/minecraft/class_2561; FIELD field_47945 CODEC Lnet/minecraft/class_9139; + METHOD (ILnet/minecraft/class_3917;Lnet/minecraft/class_2561;)V + ARG 1 syncId + ARG 2 screenHandlerId + ARG 3 name METHOD method_17592 getSyncId ()I METHOD method_17593 getScreenHandlerType ()Lnet/minecraft/class_3917; METHOD method_17594 getName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping index 3d50097c9e..ec7c9e8ab0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenWrittenBookS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_3895 net/minecraft/network/packet/s2c/play/OpenWritten ARG 1 buf METHOD method_17188 getHand ()Lnet/minecraft/class_1268; METHOD method_55894 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping index d707d36098..66cf0a1eba 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_5894 net/minecraft/network/packet/s2c/play/OverlayMess ARG 1 message METHOD method_34155 getMessage ()Lnet/minecraft/class_2561; METHOD method_55914 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping index 6f2230c586..25a3595046 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_2675 net/minecraft/network/packet/s2c/play/ParticleS2C ARG 11 offsetZ ARG 12 speed ARG 13 count + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11543 getSpeed ()F METHOD method_11544 getX ()D METHOD method_11545 getCount ()I @@ -32,3 +34,4 @@ CLASS net/minecraft/class_2675 net/minecraft/network/packet/s2c/play/ParticleS2C METHOD method_11551 getParameters ()Lnet/minecraft/class_2394; METHOD method_11552 isLongDistance ()Z METHOD method_55885 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping index 709aab2267..75ed2fc5d8 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr ARG 4 volume ARG 5 pitch ARG 6 seed + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11880 getPitch ()F METHOD method_11881 getCategory ()Lnet/minecraft/class_3419; METHOD method_11882 getSound ()Lnet/minecraft/class_6880; @@ -20,3 +22,4 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr METHOD method_11885 getVolume ()F METHOD method_43235 getSeed ()J METHOD method_55941 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping index dd145d9b3e..4ba85633f3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 ARG 9 volume ARG 10 pitch ARG 11 seed + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11888 getCategory ()Lnet/minecraft/class_3419; METHOD method_11889 getY ()D METHOD method_11890 getX ()D @@ -27,3 +29,4 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 METHOD method_11894 getSound ()Lnet/minecraft/class_6880; METHOD method_43236 getSeed ()J METHOD method_55942 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping index 3cef206e40..a6a71f65d9 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerAbilitiesS2CPacket.mapping @@ -21,3 +21,4 @@ CLASS net/minecraft/class_2696 net/minecraft/network/packet/s2c/play/PlayerAbili METHOD method_11698 isFlying ()Z METHOD method_11699 allowFlying ()Z METHOD method_55897 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping index 69f795cb30..169e84fd99 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerActionResponseS2CPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_4463 net/minecraft/network/packet/s2c/play/PlayerActio METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55858 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping index 1cde18f5fd..d020f9b391 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2772 net/minecraft/network/packet/s2c/play/PlayerListH METHOD method_11906 getFooter ()Lnet/minecraft/class_2561; METHOD method_11908 getHeader ()Lnet/minecraft/class_2561; METHOD method_55946 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping index b6d640b02c..0b6f227198 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS METHOD method_46329 getEntries ()Ljava/util/List; METHOD method_46330 getPlayerAdditionEntries ()Ljava/util/List; METHOD method_55902 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2705 Entry FIELD comp_1107 profile Lcom/mojang/authlib/GameProfile; FIELD comp_1109 latency I diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping index 9da2a66eb1..d131f84e44 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping @@ -25,3 +25,4 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit METHOD method_11738 getZ ()D METHOD method_11739 getPitch ()F METHOD method_55904 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping index 69bc5c3c0a..5e5bb701f1 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_7828 net/minecraft/network/packet/s2c/play/PlayerRemov METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55901 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index 78c71e53c6..1850a80235 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa METHOD method_48016 hasFlag (B)Z ARG 1 flag METHOD method_55909 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping index 8f7de7cdc4..b531abf315 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerSpawnPositionS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2759 net/minecraft/network/packet/s2c/play/PlayerSpawn METHOD method_11870 getPos ()Lnet/minecraft/class_2338; METHOD method_30732 getAngle ()F METHOD method_55924 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping index 81b50b5faf..a4fa429ac9 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_7827 net/minecraft/network/packet/s2c/play/Profileless METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55875 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping index 09c10d0179..a232b6b551 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_7617 net/minecraft/network/packet/s2c/play/RemoveMessa METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55874 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping index 446ae76151..673a59071e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2736 net/minecraft/network/packet/s2c/play/ScoreboardD METHOD method_11804 getName ()Ljava/lang/String; METHOD method_11806 getSlot ()Lnet/minecraft/class_8646; METHOD method_55925 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping index fe1d41a470..de8542ba32 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping @@ -11,9 +11,12 @@ CLASS net/minecraft/class_2751 net/minecraft/network/packet/s2c/play/ScoreboardO METHOD (Lnet/minecraft/class_266;I)V ARG 1 objective ARG 2 mode + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11835 getName ()Ljava/lang/String; METHOD method_11836 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_11837 getMode ()I METHOD method_11839 getType ()Lnet/minecraft/class_274$class_275; METHOD method_55336 getNumberFormat ()Ljava/util/Optional; METHOD method_55932 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreResetS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreResetS2CPacket.mapping index 7a1e51f969..b9b6bcf6ff 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreResetS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreResetS2CPacket.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_9006 net/minecraft/network/packet/s2c/play/ScoreboardS ARG 1 buf METHOD comp_2120 scoreHolderName ()Ljava/lang/String; METHOD method_55908 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping index 9ae90790b5..c033244df7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_2757 net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket FIELD comp_2122 scoreHolderName Ljava/lang/String; FIELD field_47988 CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD comp_2122 scoreHolderName ()Ljava/lang/String; METHOD method_55935 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping index 04c96c4e58..7b709837d0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_2651 net/minecraft/network/packet/s2c/play/ScreenHandl METHOD method_11446 getValue ()I METHOD method_11448 getSyncId ()I METHOD method_55870 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping index 253ae112be..3f069b8e1d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping @@ -11,8 +11,11 @@ CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandl ARG 2 revision ARG 3 slot ARG 4 stack + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_11449 getStack ()Lnet/minecraft/class_1799; METHOD method_11450 getSlot ()I METHOD method_11452 getSyncId ()I METHOD method_37439 getRevision ()I METHOD method_55871 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping index 1f1cd46103..1644a26776 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2729 net/minecraft/network/packet/s2c/play/SelectAdvan ARG 1 tabId METHOD method_11793 getTabId ()Lnet/minecraft/class_2960; METHOD method_55912 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping index 96372eea8a..e14f3c3258 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_7495 net/minecraft/network/packet/s2c/play/ServerMetad METHOD method_44132 getDescription ()Lnet/minecraft/class_2561; METHOD method_49398 getFavicon ()Ljava/util/Optional; METHOD method_55913 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping index cfd195a414..368fd34844 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SetCameraEntityS2CPacket.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_2734 net/minecraft/network/packet/s2c/play/SetCameraEn METHOD method_11800 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world METHOD method_55920 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping index d732213833..af20e14fc4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_3943 net/minecraft/network/packet/s2c/play/SetTradeOff ARG 4 experience ARG 5 leveled ARG 6 refreshable + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_17589 getSyncId ()I METHOD method_17590 getOffers ()Lnet/minecraft/class_1916; METHOD method_19458 getLevelProgress ()I @@ -20,3 +22,4 @@ CLASS net/minecraft/class_3943 net/minecraft/network/packet/s2c/play/SetTradeOff METHOD method_19460 isLeveled ()Z METHOD method_20722 isRefreshable ()Z METHOD method_55889 write (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping index d32d04f34e..b3f8d92be2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_2693 net/minecraft/network/packet/s2c/play/SignEditorO METHOD method_11677 getPos ()Lnet/minecraft/class_2338; METHOD method_49995 isFront ()Z METHOD method_55895 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping index ca0c610656..3348ca42b4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SimulationDistanceS2CPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_6682 net/minecraft/network/packet/s2c/play/SimulationD METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55936 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping index c36a5ff3ab..7df92d94e6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StopSoundS2CPacket.mapping @@ -12,3 +12,4 @@ CLASS net/minecraft/class_2770 net/minecraft/network/packet/s2c/play/StopSoundS2 METHOD method_11903 getCategory ()Lnet/minecraft/class_3419; METHOD method_11904 getSoundId ()Lnet/minecraft/class_2960; METHOD method_55944 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping index 92001b8cfb..eaa8680db3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_5903 net/minecraft/network/packet/s2c/play/SubtitleS2C ARG 1 subtitle METHOD method_34190 getSubtitle ()Lnet/minecraft/class_2561; METHOD method_55937 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping index a9da8f3d86..c10273b0da 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_2788 net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket FIELD field_12751 recipes Ljava/util/List; FIELD field_48012 CODEC Lnet/minecraft/class_9139; + METHOD (Ljava/util/Collection;)V + ARG 1 recipes METHOD method_11998 getRecipes ()Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping index bc86d870db..4828e3b2a7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping @@ -49,6 +49,7 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack METHOD method_34178 getPlayerNames ()Ljava/util/Collection; METHOD method_34179 getTeam ()Ljava/util/Optional; METHOD method_55934 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_5901 Operation CLASS class_5902 SerializableTeam FIELD field_29158 displayName Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/TickStepS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TickStepS2CPacket.mapping index e9e92fb5ec..d9b39b6a92 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TickStepS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TickStepS2CPacket.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_8914 net/minecraft/network/packet/s2c/play/TickStepS2C METHOD method_54666 create (Lnet/minecraft/class_8921;)Lnet/minecraft/class_8914; ARG 0 tickManager METHOD method_55951 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/TitleFadeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TitleFadeS2CPacket.mapping index b1dac1f9a0..f34271152a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TitleFadeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TitleFadeS2CPacket.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_5905 net/minecraft/network/packet/s2c/play/TitleFadeS2 METHOD method_34195 getStayTicks ()I METHOD method_34196 getFadeOutTicks ()I METHOD method_55940 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping index 036bce91a0..49358e77d1 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_5904 net/minecraft/network/packet/s2c/play/TitleS2CPac ARG 1 title METHOD method_34192 getTitle ()Lnet/minecraft/class_2561; METHOD method_55939 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping index 0f391f6044..4008ff12b7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_2666 net/minecraft/network/packet/s2c/play/UnloadChunk METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_55878 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping index f9c504a19f..497f612e4a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping @@ -16,4 +16,5 @@ CLASS net/minecraft/class_2713 net/minecraft/network/packet/s2c/play/UnlockRecip METHOD method_11756 getOptions ()Lnet/minecraft/class_5411; METHOD method_11757 getRecipeIdsToInit ()Ljava/util/List; METHOD method_55905 write (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_2714 Action diff --git a/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping index d0ae5af959..4344dd3ce1 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2735 net/minecraft/network/packet/s2c/play/UpdateSelec ARG 1 buf METHOD method_11803 getSlot ()I METHOD method_55921 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket.mapping index 57aff7eab4..c999f22804 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_8913 net/minecraft/network/packet/s2c/play/UpdateTickR METHOD method_54664 create (Lnet/minecraft/class_8921;)Lnet/minecraft/class_8913; ARG 0 tickManager METHOD method_55950 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping index cffd377c58..ba391123be 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/class_2692 net/minecraft/network/packet/s2c/play/VehicleMove METHOD method_11674 getY ()D METHOD method_11675 getYaw ()F METHOD method_55893 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderCenterChangedS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderCenterChangedS2CPacket.mapping index d815933cb4..35e5fcfcd0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderCenterChangedS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderCenterChangedS2CPacket.mapping @@ -9,3 +9,4 @@ CLASS net/minecraft/class_5895 net/minecraft/network/packet/s2c/play/WorldBorder METHOD method_34157 getCenterZ ()D METHOD method_34158 getCenterX ()D METHOD method_55915 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInitializeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInitializeS2CPacket.mapping index 749930765e..107303095f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInitializeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInitializeS2CPacket.mapping @@ -21,3 +21,4 @@ CLASS net/minecraft/class_5889 net/minecraft/network/packet/s2c/play/WorldBorder METHOD method_34130 getWarningTime ()I METHOD method_34131 getWarningBlocks ()I METHOD method_55882 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInterpolateSizeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInterpolateSizeS2CPacket.mapping index 3adce00b56..017b6c94a3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInterpolateSizeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderInterpolateSizeS2CPacket.mapping @@ -11,3 +11,4 @@ CLASS net/minecraft/class_5896 net/minecraft/network/packet/s2c/play/WorldBorder METHOD method_34161 getSizeLerpTarget ()D METHOD method_34162 getSizeLerpTime ()J METHOD method_55916 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderSizeChangedS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderSizeChangedS2CPacket.mapping index 0e8b7cfe06..982441c348 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderSizeChangedS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderSizeChangedS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_5897 net/minecraft/network/packet/s2c/play/WorldBorder ARG 1 worldBorder METHOD method_34164 getSizeLerpTarget ()D METHOD method_55917 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningBlocksChangedS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningBlocksChangedS2CPacket.mapping index 16d853cb26..0c544985e0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningBlocksChangedS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningBlocksChangedS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_5899 net/minecraft/network/packet/s2c/play/WorldBorder ARG 1 worldBorder METHOD method_34168 getWarningBlocks ()I METHOD method_55919 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningTimeChangedS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningTimeChangedS2CPacket.mapping index d356c4ddab..1b5f64498a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningTimeChangedS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldBorderWarningTimeChangedS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_5898 net/minecraft/network/packet/s2c/play/WorldBorder ARG 1 worldBorder METHOD method_34166 getWarningTime ()I METHOD method_55918 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping index 0ef37b9b71..09ac9666f0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldEventS2CPacket.mapping @@ -16,3 +16,4 @@ CLASS net/minecraft/class_2673 net/minecraft/network/packet/s2c/play/WorldEventS METHOD method_11533 isGlobal ()Z METHOD method_11534 getData ()I METHOD method_55884 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping index 80985a1e44..2945c957c9 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/WorldTimeUpdateS2CPacket.mapping @@ -11,3 +11,4 @@ CLASS net/minecraft/class_2761 net/minecraft/network/packet/s2c/play/WorldTimeUp METHOD method_11871 getTime ()J METHOD method_11873 getTimeOfDay ()J METHOD method_55938 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping index d4507fb2c3..ab55b8cd66 100644 --- a/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2923 net/minecraft/network/packet/s2c/query/PingResult ARG 1 buf METHOD comp_2201 startTime ()J METHOD method_56022 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping index d473fb80d9..21708ecee5 100644 --- a/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2924 net/minecraft/network/packet/s2c/query/QueryRespo ARG 1 metadata METHOD comp_1272 metadata ()Lnet/minecraft/class_2926; METHOD method_56026 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping b/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping index f738908f63..33fa6196c9 100644 --- a/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping +++ b/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping @@ -12,3 +12,9 @@ CLASS net/minecraft/class_2388 net/minecraft/particle/BlockStateParticleEffect ARG 0 type METHOD method_29129 (Lnet/minecraft/class_2396;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2388; ARG 1 state + METHOD method_56168 (Lnet/minecraft/class_2388;)Lnet/minecraft/class_2680; + ARG 0 effect + METHOD method_56169 (Lnet/minecraft/class_2396;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2388; + ARG 1 state + METHOD method_56170 createPacketCodec (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139; + ARG 0 type diff --git a/mappings/net/minecraft/screen/ScreenTexts.mapping b/mappings/net/minecraft/screen/ScreenTexts.mapping index 5733144f2d..d67e642083 100644 --- a/mappings/net/minecraft/screen/ScreenTexts.mapping +++ b/mappings/net/minecraft/screen/ScreenTexts.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_5244 net/minecraft/screen/ScreenTexts FIELD field_44968 OPEN_LINK Lnet/minecraft/class_2561; FIELD field_44969 COPY_LINK_TO_CLIPBOARD Lnet/minecraft/class_2561; FIELD field_45692 DISCONNECT Lnet/minecraft/class_2561; + FIELD field_48539 CONNECT_FAILED_TRANSFER Lnet/minecraft/class_2561; METHOD method_30619 composeToggleText (Lnet/minecraft/class_2561;Z)Lnet/minecraft/class_5250; ARG 0 text ARG 1 value diff --git a/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping index 8e3b78c52d..da13159aec 100644 --- a/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_8609 net/minecraft/server/network/ServerCommonNetworkH FIELD field_45018 keepAliveId J FIELD field_45019 latency I FIELD field_45715 flushDisabled Z + FIELD field_48273 UNEXPECTED_QUERY_RESPONSE_TEXT Lnet/minecraft/class_2561; + FIELD field_48274 transferred Z METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_8792;)V ARG 1 server ARG 2 connection From d0db89512a8cf9bf87e40f754c5ab1d49ef122ed Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 19 Jan 2024 00:07:47 +0900 Subject: [PATCH 12/47] 24w03a stuff (#3766) --- .../advancement/AdvancementDisplay.mapping | 2 + .../net/minecraft/block/AbstractBlock.mapping | 107 +++++++--------- .../entity/AbstractFurnaceBlockEntity.mapping | 2 +- .../RealmsSelectFileToUploadScreen.mapping | 6 + .../argument/TestFunctionArgumentType.mapping | 3 + mappings/net/minecraft/data/DataCache.mapping | 4 + .../net/minecraft/inventory/Inventory.mapping | 1 + .../loot/context/LootContextTypes.mapping | 2 + .../network/codec/PacketCodec.mapping | 6 +- .../network/packet/CustomPayload.mapping | 18 +-- .../minecraft/network/packet/Packet.mapping | 5 + .../network/packet/PacketIdentifier.mapping | 2 + .../packet/UnknownCustomPayload.mapping | 8 ++ .../DustColorTransitionParticleEffect.mapping | 6 + .../particle/DustParticleEffect.mapping | 4 + .../particle/ItemStackParticleEffect.mapping | 6 + .../minecraft/particle/ParticleTypes.mapping | 17 +++ .../SculkChargeParticleEffect.mapping | 2 + .../minecraft/recipe/CuttingRecipe.mapping | 6 + .../minecraft/recipe/RawShapedRecipe.mapping | 2 + .../minecraft/recipe/ShapelessRecipe.mapping | 2 + .../minecraft/registry/RegistryKey.mapping | 2 + .../number/FixedNumberFormat.mapping | 2 + .../number/StyledNumberFormat.mapping | 2 + .../WorldGenerationProgressLogger.mapping | 5 + .../WorldGenerationProgressTracker.mapping | 10 ++ .../server/command/TestCommand.mapping | 120 ++++++++++++++++++ .../server/command/TestFinder.mapping | 42 ++++++ .../net/minecraft/test/BatchListener.mapping | 5 + mappings/net/minecraft/test/Batches.mapping | 28 ++++ .../net/minecraft/test/GameTestBatch.mapping | 6 +- .../net/minecraft/test/GameTestState.mapping | 24 +++- .../test/StructureBlockFinder.mapping | 1 + .../test/StructureTestListener.mapping | 4 + .../minecraft/test/StructureTestUtil.mapping | 16 +++ .../minecraft/test/TestAttemptConfig.mapping | 8 ++ .../net/minecraft/test/TestContext.mapping | 29 +++++ .../net/minecraft/test/TestFunction.mapping | 12 +- .../minecraft/test/TestFunctionFinder.mapping | 1 + .../net/minecraft/test/TestFunctions.mapping | 4 + .../net/minecraft/test/TestListener.mapping | 6 + .../net/minecraft/test/TestManager.mapping | 5 + .../net/minecraft/test/TestRunContext.mapping | 82 ++++++++++++ .../net/minecraft/test/TestServer.mapping | 3 + mappings/net/minecraft/test/TestSet.mapping | 2 + .../test/TestStructurePlacer.mapping | 11 ++ mappings/net/minecraft/test/TestUtil.mapping | 3 - .../net/minecraft/util/math/BlockPos.mapping | 19 +++ .../net/minecraft/village/TradeOffer.mapping | 8 +- .../net/minecraft/village/TradeOffers.mapping | 21 +++ .../minecraft/village/VillagerData.mapping | 12 ++ .../net/minecraft/world/GameRules.mapping | 4 + .../world/event/BlockPositionSource.mapping | 2 + .../world/event/EntityPositionSource.mapping | 5 + .../world/level/storage/LevelSummary.mapping | 1 + 55 files changed, 615 insertions(+), 101 deletions(-) create mode 100644 mappings/net/minecraft/server/command/TestFinder.mapping create mode 100644 mappings/net/minecraft/test/BatchListener.mapping create mode 100644 mappings/net/minecraft/test/Batches.mapping create mode 100644 mappings/net/minecraft/test/StructureBlockFinder.mapping create mode 100644 mappings/net/minecraft/test/TestAttemptConfig.mapping create mode 100644 mappings/net/minecraft/test/TestFunctionFinder.mapping create mode 100644 mappings/net/minecraft/test/TestRunContext.mapping create mode 100644 mappings/net/minecraft/test/TestStructurePlacer.mapping delete mode 100644 mappings/net/minecraft/test/TestUtil.mapping diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping index 51b9b64d05..fd1184dad8 100644 --- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping +++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay METHOD method_811 getTitle ()Lnet/minecraft/class_2561; METHOD method_812 getBackground ()Ljava/util/Optional; METHOD method_813 toPacket (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_815 getFrame ()Lnet/minecraft/class_189; METHOD method_816 setPos (FF)V ARG 1 x @@ -34,6 +35,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay METHOD method_818 getX ()F METHOD method_819 getY ()F METHOD method_820 fromPacket (Lnet/minecraft/class_9129;)Lnet/minecraft/class_185; + ARG 0 buf METHOD method_821 getIcon ()Lnet/minecraft/class_1799; METHOD method_823 shouldShowToast ()Z METHOD method_824 isHidden ()Z diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 0c0bbe2e44..00b6e4ef47 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -8,15 +8,10 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT {@link WorldAccess} as a parameter. In this case, a {@link net.minecraft.world.ChunkRegion} COMMENT is passed to the parameter, which is not a subclass of {@link World}. COMMENT - COMMENT

Deprecated methods in this class mean they - COMMENT should only be called from the corresponding method in {@link - COMMENT AbstractBlockState} or subclasses of this class. Overriding the - COMMENT methods is an expected usage and is not deprecated in any way. - COMMENT COMMENT @apiNote In vanilla subclasses, these methods are called either to do the - COMMENT default behavior (e.g. {@code super.onUse(...)}) or to delegate logic to - COMMENT other blocks (e.g. {@link net.minecraft.block.StairsBlock#randomTick - COMMENT StairsBlock#randomTick} calls {@code randomTick} of its base block). + COMMENT default behavior (e.g. {@code super.onUse(...)}). Because the methods are {@code protected}, + COMMENT you must use these methods via the corresponding method in {@link + COMMENT AbstractBlockState}. COMMENT COMMENT

Many methods of this class are called on both the logical client and logical server, COMMENT so take caution when using those methods. The logical side can be checked using @@ -254,8 +249,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT when overriding this method. The logical side can be checked using {@link COMMENT World#isClient}. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#createScreenHandlerFactory} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#createScreenHandlerFactory COMMENT @see net.minecraft.screen.SimpleNamedScreenHandlerFactory COMMENT @see net.minecraft.block.entity.LockableContainerBlockEntity ARG 1 state @@ -276,8 +270,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT

  • {@link AbstractCandleBlock} lights on fire when hit by a projectile on fire.
    • COMMENT COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#onProjectileHit} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#onProjectileHit COMMENT @see ProjectileEntity#onBlockHit COMMENT @see #onEntityCollision ARG 1 world @@ -294,19 +287,18 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT when overriding this method. The logical side can be checked using {@link COMMENT World#isClient}. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#canBucketPlace} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#canBucketPlace COMMENT @see #canReplace COMMENT @see AbstractBlockState#isReplaceable ARG 1 state ARG 2 fluid METHOD method_25959 getSidesShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; - COMMENT @deprecated Consider calling {@link AbstractBlockState#getSidesShape} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getSidesShape ARG 1 state ARG 2 world ARG 3 pos METHOD method_26159 getCameraCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; - COMMENT @deprecated Consider calling {@link AbstractBlockState#getCameraCollisionShape} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getCameraCollisionShape ARG 1 state ARG 2 world ARG 3 pos @@ -321,7 +313,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_36555 getHardness ()F METHOD method_37247 getVerticalModelOffsetMultiplier ()F METHOD method_37403 isShapeFullCube (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z - COMMENT @deprecated Consider calling {@link AbstractBlockState#isFullCube} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#isFullCube ARG 1 state ARG 2 world ARG 3 pos @@ -371,12 +363,12 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT

    This does not check the current comparator output of the block. COMMENT Use {@link #getComparatorOutput} in that case. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#hasComparatorOutput} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#hasComparatorOutput COMMENT COMMENT @see #getComparatorOutput ARG 1 state METHOD method_9505 getOpacity (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I - COMMENT @deprecated Consider calling {@link AbstractBlockState#getOpacity} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getOpacity ARG 1 state ARG 2 world ARG 3 pos @@ -386,7 +378,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT

    This does not return whether the block is currently emitting redstone power. COMMENT Use {@link World#isEmittingRedstonePower} in that case. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#emitsRedstonePower} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#emitsRedstonePower COMMENT COMMENT @see World#isEmittingRedstonePower ARG 1 state @@ -411,7 +403,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT

  • {@link LeavesBlock} uses this to decay when far from logs.
    • COMMENT COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#randomTick} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#randomTick COMMENT COMMENT @see CropBlock COMMENT @see #scheduledTick @@ -425,7 +417,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT @apiNote Subclasses may override this to prevent or restrict pathfinding through the COMMENT block. For example, {@link DoorBlock} restricts it to open doors only. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#canPathfindThrough} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#canPathfindThrough ARG 1 state ARG 2 world ARG 3 pos @@ -441,8 +433,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT @apiNote This is used by {@link RedstoneWireBlock} to update connected redstone wire. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#prepare(WorldAccess, BlockPos, int, int)} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#prepare(WorldAccess, BlockPos, int, int) COMMENT @see #getStateForNeighborUpdate COMMENT @see #neighborUpdate ARG 1 state @@ -451,7 +442,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 4 flags ARG 5 maxUpdateDepth METHOD method_9522 isSideInvisible (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z - COMMENT @deprecated Consider calling {@link AbstractBlockState#isSideInvisible} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#isSideInvisible ARG 1 state ARG 2 stateFrom ARG 3 direction @@ -466,7 +457,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT redstone power only. {@link LeverBlock} and {@link ButtonBlock} emits both COMMENT weak and strong redstone power depending on the direction. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#getWeakRedstonePower} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getWeakRedstonePower COMMENT COMMENT @see #emitsRedstonePower COMMENT @see #getStrongRedstonePower @@ -478,10 +469,10 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_9526 hasSidedTransparency (Lnet/minecraft/class_2680;)Z COMMENT {@return whether the block's transparency depends on the side of the block, like slabs} COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#hasSidedTransparency} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#hasSidedTransparency ARG 1 state METHOD method_9530 getOutlineShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; - COMMENT @deprecated Consider calling {@link AbstractBlockState#getOutlineShape(BlockView, BlockPos, ShapeContext)} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getOutlineShape(BlockView, BlockPos, ShapeContext) ARG 1 state ARG 2 world ARG 3 pos @@ -492,7 +483,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT

    This is usually the hash code of {@code pos}. Tall or wide blocks (such as doors or COMMENT beds) should override this to make sure both parts of the block have the same seed. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#getRenderingSeed} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getRenderingSeed ARG 1 state ARG 2 pos METHOD method_9536 onStateReplaced (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V @@ -506,7 +497,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT super.onStateReplaced(state, world, pos, newState, moved);} after COMMENT invoking {@code ItemScatterer} methods. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#onStateReplaced} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#onStateReplaced COMMENT COMMENT @see net.minecraft.util.ItemScatterer#onStateReplaced COMMENT @see net.minecraft.util.ItemScatterer#spawn(World, BlockPos, net.minecraft.inventory.Inventory) @@ -524,8 +515,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT

    {@linkplain Waterloggable Waterloggable blocks} must override this to return {@code Fluids.WATER.getStill(false)} COMMENT when waterlogged. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#getFluidState} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#getFluidState COMMENT @see net.minecraft.fluid.Fluids#WATER ARG 1 state METHOD method_9548 onEntityCollision (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)V @@ -546,8 +536,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT

  • {@link HopperBlock} collects the item entity.
    • COMMENT COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#onEntityCollision} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#onEntityCollision COMMENT @see Block#onSteppedOn COMMENT @see #onProjectileHit ARG 1 state @@ -555,7 +544,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 3 pos ARG 4 entity METHOD method_9549 getCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; - COMMENT @deprecated Consider calling {@link AbstractBlockState#getCollisionShape(BlockView, BlockPos, ShapeContext)} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getCollisionShape(BlockView, BlockPos, ShapeContext) ARG 1 state ARG 2 world ARG 3 pos @@ -576,8 +565,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT when overriding this method. The logical side can be checked using {@link COMMENT World#isClient}. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#canPlaceAt} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#canPlaceAt COMMENT @see #getStateForNeighborUpdate ARG 1 state ARG 2 world @@ -612,8 +600,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT fall if needed. COMMENT COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#getStateForNeighborUpdate} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#getStateForNeighborUpdate COMMENT @see #neighborUpdate COMMENT @see #prepare COMMENT @see #canPlaceAt @@ -644,8 +631,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT #onStateReplaced} should be used instead) or to drop experience orbs ({@link COMMENT #onStacksDropped} should be used instead). COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#getDroppedStacks} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#getDroppedStacks COMMENT @see #onStateReplaced COMMENT @see #onStacksDropped COMMENT @see ItemStack#split @@ -662,8 +648,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT {@link Block#dropExperienceWhenMined} can be used to drop experience orbs. COMMENT {@link ExperienceDroppingBlock} provides the implementation for experience-dropping blocks. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#onStacksDropped} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#onStacksDropped COMMENT @see ExperienceDroppingBlock COMMENT @see Block#dropExperienceWhenMined COMMENT @see #getDroppedStacks @@ -678,11 +663,11 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT

    By default, this returns the provided block state. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#mirror} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#mirror ARG 1 state ARG 2 mirror METHOD method_9571 getCullingShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; - COMMENT @deprecated Consider calling {@link AbstractBlockState#getCullingShape} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getCullingShape ARG 1 state ARG 2 world ARG 3 pos @@ -691,8 +676,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT

    When overriding this, {@link #hasComparatorOutput} must also be overridden. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#getComparatorOutput} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#getComparatorOutput COMMENT @see #hasComparatorOutput ARG 1 state ARG 2 world @@ -700,7 +684,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_9573 getSoundGroup (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2498; ARG 1 state METHOD method_9575 getAmbientOcclusionLightLevel (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F - COMMENT @deprecated Consider calling {@link AbstractBlockState#getAmbientOcclusionLightLevel} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getAmbientOcclusionLightLevel ARG 1 state ARG 2 world ARG 3 pos @@ -709,7 +693,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 world ARG 3 pos METHOD method_9584 getRaycastShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; - COMMENT @deprecated Consider calling {@link AbstractBlockState#getRaycastShape} instead. See why these methods are deprecated. + COMMENT @see @link AbstractBlockState#getRaycastShape ARG 1 state ARG 2 world ARG 3 pos @@ -732,8 +716,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT

  • {@link FallingBlock} tries to fall.
    • COMMENT COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#scheduledTick} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#scheduledTick COMMENT @see WorldAccess#scheduleBlockTick(BlockPos, Block, int) COMMENT @see #getStateForNeighborUpdate COMMENT @see #randomTick @@ -746,8 +729,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT @return whether the event was handled successfully COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#onSyncedBlockEvent} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#onSyncedBlockEvent COMMENT @see World#addSyncedBlockEvent ARG 1 state ARG 2 world @@ -755,7 +737,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 4 type ARG 5 data METHOD method_9594 calcBlockBreakingDelta (Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F - COMMENT @deprecated Consider calling {@link AbstractBlockState#calcBlockBreakingDelta} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#calcBlockBreakingDelta ARG 1 state ARG 2 player ARG 3 world @@ -765,7 +747,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT

    By default, this returns the provided block state. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#rotate} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#rotate ARG 1 state ARG 2 rotation METHOD method_9603 getStrongRedstonePower (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I @@ -779,7 +761,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT redstone power only. {@link LeverBlock} and {@link ButtonBlock} emits both COMMENT weak and strong redstone power. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#getStrongRedstonePower} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getStrongRedstonePower COMMENT COMMENT @see #emitsRedstonePower COMMENT @see #getWeakRedstonePower @@ -794,7 +776,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT @apiNote {@link BlockWithEntity} overrides this to return {@link BlockRenderType#INVISIBLE}; COMMENT therefore, custom blocks extending that class must override it again to render the block. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#getRenderType} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#getRenderType ARG 1 state METHOD method_9606 onBlockBreakStart (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V COMMENT Called when a player starts breaking the block (including when instant-mining). @@ -803,7 +785,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT when overriding this method. The logical side can be checked using {@link COMMENT World#isClient}. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#onBlockBreakStart} instead. See why these methods are deprecated. + COMMENT @see AbstractBlockState#onBlockBreakStart ARG 1 state ARG 2 world ARG 3 pos @@ -821,8 +803,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT when overriding this method. The logical side can be checked using {@link COMMENT World#isClient}. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#neighborUpdate} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#neighborUpdate COMMENT @see #getStateForNeighborUpdate COMMENT @see net.minecraft.world.RedstoneView#isReceivingRedstonePower ARG 1 state @@ -844,8 +825,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT

  • When {@linkplain AbstractFireBlock fire} lights a portal
    • COMMENT COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#onBlockAdded} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#onBlockAdded COMMENT @see #onStateReplaced ARG 1 state ARG 2 world @@ -863,8 +843,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT when overriding this method. The logical side can be checked using {@link COMMENT World#isClient}. COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#canReplace} instead. See why these methods are deprecated. - COMMENT + COMMENT @see AbstractBlockState#canReplace COMMENT @see #canBucketPlace COMMENT @see AbstractBlockState#isReplaceable ARG 1 state diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index 5d65614a09..845337bd1c 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn FIELD field_31293 PROPERTY_COUNT I FIELD field_31294 DEFAULT_COOK_TIME I FIELD field_38234 matchGetter Lnet/minecraft/class_1863$class_7266; - FIELD field_48375 FUEL_TIMES Ljava/util/Map; + FIELD field_48375 fuelTimes Ljava/util/Map; METHOD (Lnet/minecraft/class_2591;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3956;)V ARG 1 blockEntityType ARG 2 pos diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping index 556d2c4f72..614fc42582 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping @@ -13,6 +13,12 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_26508 CHEATS_TEXT Lnet/minecraft/class_2561; FIELD field_44909 LOADING_ERROR_TEXT Lnet/minecraft/class_2561; FIELD field_46131 TITLE Lnet/minecraft/class_2561; + FIELD field_48387 creationTask Lnet/minecraft/class_4445; + METHOD (Lnet/minecraft/class_4445;JILnet/minecraft/class_4410;)V + ARG 1 creationTask + ARG 2 worldId + ARG 4 slotId + ARG 5 parent METHOD method_21396 loadLevelList ()V METHOD method_21400 getGameModeName (Lnet/minecraft/class_34;)Lnet/minecraft/class_2561; ARG 0 summary diff --git a/mappings/net/minecraft/command/argument/TestFunctionArgumentType.mapping b/mappings/net/minecraft/command/argument/TestFunctionArgumentType.mapping index 3355c36006..e804275741 100644 --- a/mappings/net/minecraft/command/argument/TestFunctionArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/TestFunctionArgumentType.mapping @@ -7,5 +7,8 @@ CLASS net/minecraft/class_4530 net/minecraft/command/argument/TestFunctionArgume ARG 0 context ARG 1 name METHOD method_22371 testFunction ()Lnet/minecraft/class_4530; + METHOD method_56325 suggestTestNames (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 builder METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index c562181ce2..823cdd4d53 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -31,6 +31,10 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache METHOD method_46571 (Ljava/util/Set;Ljava/lang/String;Lnet/minecraft/class_2408$class_7405;)V ARG 2 providerName ARG 3 cachedData + CLASS 1 + METHOD visitFile (Ljava/lang/Object;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult; + ARG 1 path + ARG 2 attributes CLASS class_7404 CachedDataWriter FIELD field_38919 oldCache Lnet/minecraft/class_2408$class_7405; FIELD field_38920 newCache Lnet/minecraft/class_2408$class_7858; diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 4e40f57bbf..5781beb0fb 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory COMMENT @see net.minecraft.entity.vehicle.VehicleInventory COMMENT @see net.minecraft.block.entity.LockableContainerBlockEntity FIELD field_29952 MAX_COUNT_PER_STACK I + FIELD field_48319 DEFAULT_MAX_INTERACTION_RANGE F METHOD method_18861 count (Lnet/minecraft/class_1792;)I COMMENT {@return the number of times {@code item} occurs in this inventory COMMENT across all stored stacks} diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index ee64bf6985..e41a345930 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -19,6 +19,8 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 0 builder METHOD method_53401 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; ARG 0 id + METHOD method_56128 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder METHOD method_755 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_756 (Lnet/minecraft/class_176$class_177;)V diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index df91044ecb..67f2bdfe5c 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -7,17 +7,17 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec ARG 2 from METHOD method_56433 mapResult (Lnet/minecraft/class_9139$class_9140;)Lnet/minecraft/class_9139; ARG 1 function - METHOD method_56434 record (Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + METHOD method_56434 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; ARG 0 codec ARG 1 from ARG 2 to - METHOD method_56435 record (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/class_9139; + METHOD method_56435 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/class_9139; ARG 0 codec1 ARG 1 from1 ARG 2 codec2 ARG 3 from2 ARG 4 to - METHOD method_56436 record (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/class_9139; + METHOD method_56436 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/class_9139; ARG 0 codec1 ARG 1 from1 ARG 2 codec2 diff --git a/mappings/net/minecraft/network/packet/CustomPayload.mapping b/mappings/net/minecraft/network/packet/CustomPayload.mapping index 256eff06b5..41d87ba044 100644 --- a/mappings/net/minecraft/network/packet/CustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/CustomPayload.mapping @@ -1,24 +1,26 @@ CLASS net/minecraft/class_8710 net/minecraft/network/packet/CustomPayload - METHOD method_56479 getKey ()Lnet/minecraft/class_8710$class_9154; - METHOD method_56483 keyOf (Ljava/lang/String;)Lnet/minecraft/class_8710$class_9154; + METHOD method_56479 getId ()Lnet/minecraft/class_8710$class_9154; + METHOD method_56483 id (Ljava/lang/String;)Lnet/minecraft/class_8710$class_9154; ARG 0 id METHOD method_56484 codecOf (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; ARG 0 encoder ARG 1 decoder METHOD method_56485 createCodec (Lnet/minecraft/class_8710$class_9153;Ljava/util/List;)Lnet/minecraft/class_9139; - ARG 0 factory - ARG 1 codecs + ARG 0 unknownCodecFactory + ARG 1 types METHOD method_56486 (Lnet/minecraft/class_8710$class_9155;)Lnet/minecraft/class_2960; - ARG 0 pair + ARG 0 type CLASS 1 METHOD method_56487 getCodec (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; ARG 1 id METHOD method_56489 encode (Lnet/minecraft/class_2540;Lnet/minecraft/class_8710$class_9154;Lnet/minecraft/class_8710;)V ARG 1 value - ARG 2 type + ARG 2 id ARG 3 payload CLASS class_9153 CodecFactory METHOD create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; ARG 1 id - CLASS class_9154 Type - CLASS class_9155 CodecPair + CLASS class_9154 Id + CLASS class_9155 Type + FIELD comp_2243 id Lnet/minecraft/class_8710$class_9154; + METHOD comp_2243 id ()Lnet/minecraft/class_8710$class_9154; diff --git a/mappings/net/minecraft/network/packet/Packet.mapping b/mappings/net/minecraft/network/packet/Packet.mapping index bb8dc49dd5..dfe56dd80b 100644 --- a/mappings/net/minecraft/network/packet/Packet.mapping +++ b/mappings/net/minecraft/network/packet/Packet.mapping @@ -5,6 +5,11 @@ CLASS net/minecraft/class_2596 net/minecraft/network/packet/Packet METHOD method_11054 apply (Lnet/minecraft/class_2547;)V ARG 1 listener METHOD method_55846 getPacketId ()Lnet/minecraft/class_9145; + METHOD method_55943 transitionsNetworkState ()Z + COMMENT {@return {@code true} if the packet signals transitioning between {@link + COMMENT net.minecraft.network.NetworkState}s} + COMMENT + COMMENT

    Such packets cannot be {@linkplain BundlePacket bundled}. METHOD method_56443 createCodec (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; ARG 0 encoder ARG 1 decoder diff --git a/mappings/net/minecraft/network/packet/PacketIdentifier.mapping b/mappings/net/minecraft/network/packet/PacketIdentifier.mapping index 1a8f1ed1ce..7f231fec0e 100644 --- a/mappings/net/minecraft/network/packet/PacketIdentifier.mapping +++ b/mappings/net/minecraft/network/packet/PacketIdentifier.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_9145 net/minecraft/network/packet/PacketIdentifier + FIELD comp_2230 side Lnet/minecraft/class_2598; + METHOD comp_2230 side ()Lnet/minecraft/class_2598; diff --git a/mappings/net/minecraft/network/packet/UnknownCustomPayload.mapping b/mappings/net/minecraft/network/packet/UnknownCustomPayload.mapping index edb3c3b31d..0541800d9f 100644 --- a/mappings/net/minecraft/network/packet/UnknownCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/UnknownCustomPayload.mapping @@ -1 +1,9 @@ CLASS net/minecraft/class_8711 net/minecraft/network/packet/UnknownCustomPayload + METHOD method_56491 (ILnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8711; + ARG 2 buf + METHOD method_56492 createCodec (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_9139; + ARG 0 id + ARG 1 maxBytes + METHOD method_56493 (Lnet/minecraft/class_8711;Lnet/minecraft/class_2540;)V + ARG 0 value + ARG 1 buf diff --git a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping index de61cfa564..2910d20a87 100644 --- a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping @@ -19,3 +19,9 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticl METHOD method_33111 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; ARG 0 effect METHOD method_33112 getToColor ()Lorg/joml/Vector3f; + METHOD method_56171 (Lnet/minecraft/class_5743;)Ljava/lang/Float; + ARG 0 effect + METHOD method_56172 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; + ARG 0 effect + METHOD method_56173 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; + ARG 0 effect diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping index 11706f59aa..6019024102 100644 --- a/mappings/net/minecraft/particle/DustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -10,3 +10,7 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect ARG 0 effect METHOD method_33117 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f; ARG 0 effect + METHOD method_56174 (Lnet/minecraft/class_2390;)Ljava/lang/Float; + ARG 0 effect + METHOD method_56175 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f; + ARG 0 effect diff --git a/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping b/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping index 30a4e29a7e..107be4ffdc 100644 --- a/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping +++ b/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping @@ -12,3 +12,9 @@ CLASS net/minecraft/class_2392 net/minecraft/particle/ItemStackParticleEffect ARG 0 type METHOD method_29137 (Lnet/minecraft/class_2396;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2392; ARG 1 stack + METHOD method_56176 (Lnet/minecraft/class_2392;)Lnet/minecraft/class_1799; + ARG 0 effect + METHOD method_56177 (Lnet/minecraft/class_2396;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2392; + ARG 1 stack + METHOD method_56178 createPacketCodec (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139; + ARG 0 type diff --git a/mappings/net/minecraft/particle/ParticleTypes.mapping b/mappings/net/minecraft/particle/ParticleTypes.mapping index fc5dc4fe87..ad7325fb4b 100644 --- a/mappings/net/minecraft/particle/ParticleTypes.mapping +++ b/mappings/net/minecraft/particle/ParticleTypes.mapping @@ -4,12 +4,29 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes METHOD method_10303 register (Ljava/lang/String;Z)Lnet/minecraft/class_2400; ARG 0 name ARG 1 alwaysShow + METHOD method_29139 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec; + ARG 0 type + METHOD method_33121 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec; + ARG 0 type + METHOD method_33122 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec; + ARG 0 type METHOD method_42022 register (Ljava/lang/String;ZLnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_2396; ARG 0 name ARG 1 alwaysShow ARG 2 factory ARG 3 codecGetter + ARG 4 packetCodecGetter + METHOD method_42023 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec; + ARG 0 type METHOD method_42616 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec; ARG 0 type METHOD method_56180 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139; ARG 0 type + METHOD method_56181 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139; + ARG 0 type + METHOD method_56182 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139; + ARG 0 type + METHOD method_56183 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139; + ARG 0 type + METHOD method_56184 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139; + ARG 0 type diff --git a/mappings/net/minecraft/particle/SculkChargeParticleEffect.mapping b/mappings/net/minecraft/particle/SculkChargeParticleEffect.mapping index 980737065c..c0a573d102 100644 --- a/mappings/net/minecraft/particle/SculkChargeParticleEffect.mapping +++ b/mappings/net/minecraft/particle/SculkChargeParticleEffect.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_7227 net/minecraft/particle/SculkChargeParticleEffect ARG 0 instance METHOD method_42025 (Lnet/minecraft/class_7227;)Ljava/lang/Float; ARG 0 particleEffect + METHOD method_56185 (Lnet/minecraft/class_7227;)Ljava/lang/Float; + ARG 0 effect diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index 00f73ed569..74c68a0340 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -26,6 +26,12 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe ARG 0 recipe METHOD method_53879 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1799; ARG 0 recipe + METHOD method_56106 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1799; + ARG 0 recipe + METHOD method_56107 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1856; + ARG 0 recipe + METHOD method_56108 (Lnet/minecraft/class_3972;)Ljava/lang/String; + ARG 0 recipe CLASS class_3974 RecipeFactory METHOD create (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)Lnet/minecraft/class_3972; ARG 1 group diff --git a/mappings/net/minecraft/recipe/RawShapedRecipe.mapping b/mappings/net/minecraft/recipe/RawShapedRecipe.mapping index 7931e89a71..d4d8127fbd 100644 --- a/mappings/net/minecraft/recipe/RawShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/RawShapedRecipe.mapping @@ -43,11 +43,13 @@ CLASS net/minecraft/class_8957 net/minecraft/recipe/RawShapedRecipe ARG 0 key ARG 1 pattern METHOD method_55087 writeToBuf (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_55088 (Lnet/minecraft/class_9129;Lnet/minecraft/class_1856;)Lnet/minecraft/class_1856; ARG 1 ingredient METHOD method_55089 findLastSymbol (Ljava/lang/String;)I ARG 0 line METHOD method_55090 readFromBuf (Lnet/minecraft/class_9129;)Lnet/minecraft/class_8957; + ARG 0 buf CLASS class_8958 Data FIELD field_47323 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_47324 PATTERN_CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/recipe/ShapelessRecipe.mapping b/mappings/net/minecraft/recipe/ShapelessRecipe.mapping index 7431c24383..f254a9c5f6 100644 --- a/mappings/net/minecraft/recipe/ShapelessRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapelessRecipe.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_1867 net/minecraft/recipe/ShapelessRecipe ARG 0 recipe METHOD method_53765 (Lnet/minecraft/class_1867;)Ljava/lang/String; ARG 0 recipe + METHOD method_56105 (Lnet/minecraft/class_9129;Lnet/minecraft/class_1856;)Lnet/minecraft/class_1856; + ARG 1 empty METHOD method_8141 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_1867; ARG 0 buf METHOD method_8143 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_1867;)V diff --git a/mappings/net/minecraft/registry/RegistryKey.mapping b/mappings/net/minecraft/registry/RegistryKey.mapping index d694df50a9..73fb3bbb60 100644 --- a/mappings/net/minecraft/registry/RegistryKey.mapping +++ b/mappings/net/minecraft/registry/RegistryKey.mapping @@ -60,6 +60,8 @@ CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey METHOD method_41185 getRegistry ()Lnet/minecraft/class_2960; METHOD method_56038 createPacketCodec (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; ARG 0 registry + METHOD method_56039 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 1 id 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/scoreboard/number/FixedNumberFormat.mapping b/mappings/net/minecraft/scoreboard/number/FixedNumberFormat.mapping index e2fc53c93d..fd4f0f65b3 100644 --- a/mappings/net/minecraft/scoreboard/number/FixedNumberFormat.mapping +++ b/mappings/net/minecraft/scoreboard/number/FixedNumberFormat.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_9021 net/minecraft/scoreboard/number/FixedNumberFormat FIELD field_48543 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_55465 (Lnet/minecraft/class_9021;)Lnet/minecraft/class_2561; ARG 0 format + METHOD method_56361 (Lnet/minecraft/class_9021;)Lnet/minecraft/class_2561; + ARG 0 format diff --git a/mappings/net/minecraft/scoreboard/number/StyledNumberFormat.mapping b/mappings/net/minecraft/scoreboard/number/StyledNumberFormat.mapping index e0abbcb0a6..91f0047560 100644 --- a/mappings/net/minecraft/scoreboard/number/StyledNumberFormat.mapping +++ b/mappings/net/minecraft/scoreboard/number/StyledNumberFormat.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_9025 net/minecraft/scoreboard/number/StyledNumberForma FIELD field_48546 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_55472 (Lnet/minecraft/class_9025;)Lnet/minecraft/class_2583; ARG 0 format + METHOD method_56362 (Lnet/minecraft/class_9025;)Lnet/minecraft/class_2583; + ARG 0 format diff --git a/mappings/net/minecraft/server/WorldGenerationProgressLogger.mapping b/mappings/net/minecraft/server/WorldGenerationProgressLogger.mapping index 0c01cde9aa..0c2b7d11ee 100644 --- a/mappings/net/minecraft/server/WorldGenerationProgressLogger.mapping +++ b/mappings/net/minecraft/server/WorldGenerationProgressLogger.mapping @@ -7,3 +7,8 @@ CLASS net/minecraft/class_3951 net/minecraft/server/WorldGenerationProgressLogge METHOD (I)V ARG 1 radius METHOD method_17672 getProgressPercentage ()I + METHOD method_56042 create (I)Lnet/minecraft/class_3951; + ARG 0 spawnChunkRadius + METHOD method_56043 noSpawnChunks ()Lnet/minecraft/class_3951; + METHOD method_56044 forSpawnChunks (I)Lnet/minecraft/class_3951; + ARG 0 spawnChunkRadius diff --git a/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping b/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping index f89c404349..0b568edad6 100644 --- a/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping +++ b/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping @@ -6,9 +6,19 @@ CLASS net/minecraft/class_3953 net/minecraft/server/WorldGenerationProgressTrack FIELD field_17478 radius I FIELD field_17479 size I FIELD field_17480 running Z + METHOD (Lnet/minecraft/class_3951;III)V + ARG 1 progressLogger + ARG 2 centerSize + ARG 3 radius + ARG 4 size METHOD method_17676 getChunkStatus (II)Lnet/minecraft/class_2806; ARG 1 x ARG 2 z METHOD method_17677 getCenterSize ()I METHOD method_17678 getSize ()I METHOD method_17679 getProgressPercentage ()I + METHOD method_56045 create (I)Lnet/minecraft/class_3953; + ARG 0 spawnChunkRadius + METHOD method_56046 noSpawnChunks ()Lnet/minecraft/class_3953; + METHOD method_56047 forSpawnChunks (I)Lnet/minecraft/class_3953; + ARG 0 spawnChunkRadius diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index eb5b78498c..323bfae34c 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand FIELD field_45665 LOGGER Lorg/slf4j/Logger; + FIELD field_48504 BLOCK_ENTITY_NOT_FOUND_TEXT Ljava/lang/String; + FIELD field_48505 RUNNERS Lnet/minecraft/class_9123$class_9124; METHOD method_22263 (Ljava/lang/String;Lnet/minecraft/class_124;Lnet/minecraft/class_3222;)V ARG 2 player METHOD method_22264 executePos (Lnet/minecraft/class_2168;Ljava/lang/String;)I @@ -46,9 +48,90 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 source METHOD method_54904 checkStructure (Lnet/minecraft/class_3218;Ljava/lang/String;)Z ARG 0 world + ARG 1 templateId METHOD method_54905 export (Lnet/minecraft/class_2168;Lnet/minecraft/class_2633;)I ARG 0 source ARG 1 blockEntity + METHOD method_56254 stop ()I + METHOD method_56255 (ILnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517; + ARG 3 testFunction + METHOD method_56256 (Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 extraConfigAdder + METHOD method_56257 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 builder + ARG 1 callback + METHOD method_56258 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 builder + ARG 1 callback + ARG 2 extraConfigAdder + METHOD method_56259 start (Lnet/minecraft/class_2168;Lnet/minecraft/class_3218;Lnet/minecraft/class_4520;)I + ARG 0 source + ARG 1 world + ARG 2 context + METHOD method_56260 (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_2338;)Ljava/util/Optional; + ARG 2 pos + METHOD method_56261 stream (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_9119;)Ljava/util/stream/Stream; + ARG 0 source + ARG 1 config + ARG 2 finder + METHOD method_56262 stream (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_9125;I)Ljava/util/stream/Stream; + ARG 0 source + ARG 1 config + ARG 2 finder + ARG 3 rotationSteps + METHOD method_56263 (Lnet/minecraft/class_2168;Lnet/minecraft/class_4529;)Z + ARG 1 testFunction + METHOD method_56264 find (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)Ljava/util/Optional; + ARG 0 pos + ARG 1 world + ARG 2 config + METHOD method_56265 (Ljava/util/function/Function;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 1 extraConfigAdder + METHOD method_56266 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_56267 reset (Lnet/minecraft/class_4517;)I + ARG 0 state + METHOD method_56268 testAttemptAndPlacementConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 builder + ARG 1 callback + METHOD method_56269 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_56270 (Lnet/minecraft/class_4517;)V + ARG 0 state + METHOD method_56271 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_56272 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_56273 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_56274 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56275 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56276 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56277 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56278 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56279 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56280 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56281 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56282 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56283 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56284 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56285 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_4527$class_9121; + ARG 0 context + METHOD method_56286 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_4527$class_9121; + ARG 0 context + METHOD method_56287 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_4527$class_9121; + ARG 0 context CLASS class_4528 Listener FIELD comp_2216 world Lnet/minecraft/class_3218; FIELD comp_2217 tests Lnet/minecraft/class_4524; @@ -57,3 +140,40 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 2 tests METHOD comp_2216 world ()Lnet/minecraft/class_3218; METHOD comp_2217 tests ()Lnet/minecraft/class_4524; + METHOD method_56304 onFinished (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;)V + ARG 0 world + ARG 1 tests + CLASS class_9121 Runner + FIELD field_48506 finder Lnet/minecraft/class_9123; + METHOD (Lnet/minecraft/class_9123;)V + ARG 1 finder + METHOD method_56288 reset ()I + METHOD method_56289 runOnce (I)I + ARG 1 rotationSteps + METHOD method_56290 runOnce (II)I + ARG 1 rotationSteps + ARG 2 testsPerRow + METHOD method_56292 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I + ARG 1 pos + METHOD method_56293 (Lnet/minecraft/class_3218;Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;)I + ARG 3 pos + METHOD method_56294 (Lnet/minecraft/class_2168;Ljava/lang/Integer;)V + ARG 1 count + METHOD method_56295 forEach (Ljava/util/stream/Stream;Ljava/util/function/ToIntFunction;Ljava/lang/Runnable;Ljava/util/function/Consumer;)V + ARG 1 finder + ARG 2 consumer + ARG 3 emptyCallback + ARG 4 finishCallback + METHOD method_56296 run (Lnet/minecraft/class_9118;)I + ARG 1 config + METHOD method_56297 run (Lnet/minecraft/class_9118;I)I + ARG 1 config + ARG 2 rotationSteps + METHOD method_56298 start (Lnet/minecraft/class_9118;II)I + ARG 1 config + ARG 2 rotationSteps + ARG 3 testsPerRow + METHOD method_56299 clear ()I + METHOD method_56302 export ()I + METHOD method_56303 runOnce ()I + CLASS class_9122 ReportingBatchListener diff --git a/mappings/net/minecraft/server/command/TestFinder.mapping b/mappings/net/minecraft/server/command/TestFinder.mapping new file mode 100644 index 0000000000..00b7ca740e --- /dev/null +++ b/mappings/net/minecraft/server/command/TestFinder.mapping @@ -0,0 +1,42 @@ +CLASS net/minecraft/class_9123 net/minecraft/server/command/TestFinder + FIELD field_48507 NOOP_TEST_FUNCTION_FINDER Lnet/minecraft/class_9125; + FIELD field_48508 NOOP_STRUCTURE_BLOCK_FINDER Lnet/minecraft/class_9119; + FIELD field_48509 testFunctionFinder Lnet/minecraft/class_9125; + FIELD field_48510 structureBlockPosFinder Lnet/minecraft/class_9119; + FIELD field_48511 commandSource Lnet/minecraft/class_2168; + FIELD field_48512 runnerFactory Ljava/util/function/Function; + METHOD (Lnet/minecraft/class_2168;Ljava/util/function/Function;Lnet/minecraft/class_9125;Lnet/minecraft/class_9119;)V + ARG 1 commandSource + ARG 2 runnerFactory + ARG 3 testFunctionFinder + ARG 4 structureBlockPosFinder + METHOD method_56305 getCommandSource ()Lnet/minecraft/class_2168; + METHOD method_56306 createRunner ()Ljava/lang/Object; + CLASS class_9124 Runners + FIELD field_48513 runnerFactory Ljava/util/function/Function; + METHOD (Ljava/util/function/Function;)V + ARG 1 runnerFactory + METHOD method_56309 nearest (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; + ARG 1 context + METHOD method_56310 surface (Lcom/mojang/brigadier/context/CommandContext;I)Ljava/lang/Object; + ARG 1 context + ARG 2 radius + METHOD method_56311 in (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/Object; + ARG 1 context + ARG 2 testClass + METHOD method_56312 failed (Lcom/mojang/brigadier/context/CommandContext;Z)Ljava/lang/Object; + ARG 1 context + ARG 2 onlyRequired + METHOD method_56317 (ZLnet/minecraft/class_4529;)Z + ARG 1 function + METHOD method_56318 allStructures (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; + ARG 1 context + METHOD method_56319 named (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/Object; + ARG 1 context + ARG 2 name + METHOD method_56321 targeted (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; + ARG 1 context + METHOD method_56323 allTestFunctions (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; + ARG 1 context + METHOD method_56324 failed (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; + ARG 1 context diff --git a/mappings/net/minecraft/test/BatchListener.mapping b/mappings/net/minecraft/test/BatchListener.mapping new file mode 100644 index 0000000000..4a6d38be64 --- /dev/null +++ b/mappings/net/minecraft/test/BatchListener.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9114 net/minecraft/test/BatchListener + METHOD method_56199 onStarted (Lnet/minecraft/class_4514;)V + ARG 1 batch + METHOD method_56200 onFinished (Lnet/minecraft/class_4514;)V + ARG 1 batch diff --git a/mappings/net/minecraft/test/Batches.mapping b/mappings/net/minecraft/test/Batches.mapping new file mode 100644 index 0000000000..da92a05bec --- /dev/null +++ b/mappings/net/minecraft/test/Batches.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_9113 net/minecraft/test/Batches + FIELD field_48467 BATCH_SIZE I + METHOD method_56188 defaultBatcher ()Lnet/minecraft/class_4520$class_9116; + METHOD method_56189 (Lnet/minecraft/class_3218;Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/List;)Lnet/minecraft/class_4514; + ARG 3 batchedFunctions + METHOD method_56190 (Lnet/minecraft/class_3218;Ljava/util/Map$Entry;)Ljava/util/stream/Stream; + ARG 1 entry + METHOD method_56191 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517; + ARG 1 testFunction + METHOD method_56192 (Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/List;)Lnet/minecraft/class_4514; + ARG 2 batchStates + METHOD method_56193 (Ljava/util/Collection;)Ljava/util/Collection; + ARG 0 states + METHOD method_56194 createBatches (Ljava/util/Collection;Lnet/minecraft/class_3218;)Ljava/util/Collection; + ARG 0 testFunctions + ARG 1 world + METHOD method_56195 create (Ljava/util/List;Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;)Lnet/minecraft/class_4514; + ARG 0 states + ARG 1 batchId + ARG 2 index + METHOD method_56196 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; + ARG 0 entry + METHOD method_56197 (Lnet/minecraft/class_4517;)Ljava/lang/String; + ARG 0 state + METHOD method_56198 createState (Lnet/minecraft/class_4529;ILnet/minecraft/class_3218;)Lnet/minecraft/class_4517; + ARG 0 testFunction + ARG 1 rotationSteps + ARG 2 world diff --git a/mappings/net/minecraft/test/GameTestBatch.mapping b/mappings/net/minecraft/test/GameTestBatch.mapping index 2744ea1442..7c4bc1bbee 100644 --- a/mappings/net/minecraft/test/GameTestBatch.mapping +++ b/mappings/net/minecraft/test/GameTestBatch.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4514 net/minecraft/test/GameTestBatch FIELD comp_2209 id Ljava/lang/String; - FIELD comp_2211 beforeBatchConsumer Ljava/util/function/Consumer; - FIELD comp_2212 afterBatchConsumer Ljava/util/function/Consumer; + FIELD comp_2210 states Ljava/util/Collection; FIELD field_33145 DEFAULT_BATCH Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/util/Collection;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V ARG 1 id @@ -9,5 +8,4 @@ CLASS net/minecraft/class_4514 net/minecraft/test/GameTestBatch ARG 3 beforeBatchConsumer ARG 4 afterBatchConsumer METHOD comp_2209 id ()Ljava/lang/String; - METHOD comp_2211 beforeBatchConsumer ()Ljava/util/function/Consumer; - METHOD comp_2212 afterBatchConsumer ()Ljava/util/function/Consumer; + METHOD comp_2210 states ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index 9f8ec4da92..aa4d8ff593 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -3,13 +3,13 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState FIELD field_20560 pos Lnet/minecraft/class_2338; FIELD field_20561 world Lnet/minecraft/class_3218; FIELD field_20562 listeners Ljava/util/Collection; - FIELD field_20563 ticksLeft I + FIELD field_20563 tickLimit I FIELD field_20565 started Z FIELD field_20567 completed Z FIELD field_20569 throwable Ljava/lang/Throwable; FIELD field_21452 timedTaskRunners Ljava/util/Collection; FIELD field_21453 ticksByRunnables Lit/unimi/dsi/fastutil/objects/Object2LongMap; - FIELD field_21454 expectedStopTime J + FIELD field_21454 startTime J FIELD field_21455 tick J FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch; FIELD field_25301 rotation Lnet/minecraft/class_2470; @@ -17,16 +17,23 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState FIELD field_47172 initialDelay I FIELD field_47173 initialized Z FIELD field_47174 tickedOnce Z + FIELD field_48468 boxMinPos Lnet/minecraft/class_2338; + FIELD field_48469 testAttemptConfig Lnet/minecraft/class_9118; METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)V + ARG 1 testFunction ARG 2 rotation ARG 3 world + ARG 4 testAttemptConfig METHOD method_22165 tick (Lnet/minecraft/class_4520;)V + ARG 1 context METHOD method_22166 init ()Lnet/minecraft/class_4517; METHOD method_22167 addListener (Lnet/minecraft/class_4518;)V ARG 1 listener METHOD method_22168 fail (Ljava/lang/Throwable;)V ARG 1 throwable METHOD method_22169 getTemplatePath ()Ljava/lang/String; + METHOD method_22171 (Lnet/minecraft/class_4520;Lnet/minecraft/class_4518;)V + ARG 2 listener METHOD method_22172 getPos ()Lnet/minecraft/class_2338; METHOD method_22175 (Lnet/minecraft/class_4518;)V ARG 1 listener @@ -39,6 +46,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_22183 isRequired ()Z METHOD method_22184 isOptional ()Z METHOD method_23634 startCountdown (I)Lnet/minecraft/class_4517; + ARG 1 additionalExpectedStopTime METHOD method_23635 setPos (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_23636 (Lnet/minecraft/class_4693;)V @@ -54,6 +62,8 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_32242 getMaxAttempts ()I METHOD method_32243 getRequiredSuccesses ()I METHOD method_33315 tickTests ()V + METHOD method_33316 (Lnet/minecraft/class_4520;Lnet/minecraft/class_4518;)V + ARG 2 listener METHOD method_36059 getStructureBlockBlockEntity ()Lnet/minecraft/class_2633; METHOD method_36060 runAtTick (JLjava/lang/Runnable;)V ARG 1 tick @@ -63,10 +73,18 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_36064 completeIfSuccessful ()V METHOD method_36065 getTick ()J METHOD method_36066 createTimedTaskRunner ()Lnet/minecraft/class_4693; - METHOD method_36067 getTicksLeft ()I + METHOD method_36067 getTickLimit ()I METHOD method_54434 (Lnet/minecraft/class_1297;)V ARG 0 entity METHOD method_54435 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_54900 (Lnet/minecraft/class_1923;)Z ARG 1 chunkPos + METHOD method_56209 streamListeners ()Ljava/util/stream/Stream; + METHOD method_56210 copy ()Lnet/minecraft/class_4517; + METHOD method_56211 initialize ()Z + METHOD method_56212 getBoxMinPos ()Lnet/minecraft/class_2338; + METHOD method_56213 initializeImmediately ()Lnet/minecraft/class_4517; + METHOD method_56214 setBoxMinPos (Lnet/minecraft/class_2338;)V + ARG 1 boxMinPos + METHOD method_56215 getTestAttemptConfig ()Lnet/minecraft/class_9118; diff --git a/mappings/net/minecraft/test/StructureBlockFinder.mapping b/mappings/net/minecraft/test/StructureBlockFinder.mapping new file mode 100644 index 0000000000..3f65fa11f6 --- /dev/null +++ b/mappings/net/minecraft/test/StructureBlockFinder.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9119 net/minecraft/test/StructureBlockFinder diff --git a/mappings/net/minecraft/test/StructureTestListener.mapping b/mappings/net/minecraft/test/StructureTestListener.mapping index ef509440c8..b3babd1007 100644 --- a/mappings/net/minecraft/test/StructureTestListener.mapping +++ b/mappings/net/minecraft/test/StructureTestListener.mapping @@ -37,3 +37,7 @@ CLASS net/minecraft/class_5624 net/minecraft/test/StructureTestListener METHOD method_33321 finishPassedTest (Lnet/minecraft/class_4517;Ljava/lang/String;)V ARG 0 test ARG 1 output + METHOD method_56244 retry (Lnet/minecraft/class_4517;Lnet/minecraft/class_4520;Z)V + ARG 1 state + ARG 2 context + ARG 3 prevPassed diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 289d99e87a..5ffa06f1f8 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -64,6 +64,8 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 structureBlockEntity METHOD method_36105 getRotationSteps (Lnet/minecraft/class_2470;)I ARG 0 rotation + METHOD method_54845 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 p METHOD method_54847 getStructureBlockBoxCornerPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; ARG 0 pos ARG 1 size @@ -77,3 +79,17 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 1 pos ARG 2 rotation ARG 3 world + METHOD method_56249 findSurfaceStructureBlocks (ILnet/minecraft/class_243;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream; + ARG 0 radius + ARG 1 pos + ARG 2 world + METHOD method_56250 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional; + ARG 1 p + METHOD method_56251 (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2633;)Z + ARG 2 blockEntity + METHOD method_56252 findTargetedStructureBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream; + ARG 0 pos + ARG 1 entity + ARG 2 world + METHOD method_56253 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 p diff --git a/mappings/net/minecraft/test/TestAttemptConfig.mapping b/mappings/net/minecraft/test/TestAttemptConfig.mapping new file mode 100644 index 0000000000..f96a693d2b --- /dev/null +++ b/mappings/net/minecraft/test/TestAttemptConfig.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_9118 net/minecraft/test/TestAttemptConfig + FIELD field_48496 ONCE Lnet/minecraft/class_9118; + METHOD method_56245 once ()Lnet/minecraft/class_9118; + METHOD method_56246 shouldTestAgain (II)Z + ARG 1 attempt + ARG 2 successes + METHOD method_56247 isDisabled ()Z + METHOD method_56248 needsMultipleAttempts ()Z diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 6db668c667..ebcb54a3c8 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -390,3 +390,32 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_55452 forceTickIceAndSnow ()V METHOD method_55453 forceTickIceAndSnow (Lnet/minecraft/class_2338;)V ARG 1 pos + METHOD method_56201 expectEntityAtOrigin (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1297; + ARG 1 type + METHOD method_56202 expectEntity (Lnet/minecraft/class_1299;IIID)Lnet/minecraft/class_1297; + ARG 1 type + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 margin + METHOD method_56203 getEntitiesAround (Lnet/minecraft/class_1299;Lnet/minecraft/class_243;D)Ljava/util/List; + ARG 1 type + ARG 2 pos + ARG 3 margin + METHOD method_56204 (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;)Z + ARG 1 entity + METHOD method_56205 (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)I + ARG 1 a + ARG 2 b + METHOD method_56206 assertEquals (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;)V + ARG 1 actual + ARG 2 expected + ARG 3 name + METHOD method_56207 getEntitiesAround (Lnet/minecraft/class_1299;IIID)Ljava/util/List; + ARG 1 type + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 margin + METHOD method_56208 getEntities (Lnet/minecraft/class_1299;)Ljava/util/List; + ARG 1 type diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping index d9e2e887a3..e2c957a6a2 100644 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ b/mappings/net/minecraft/test/TestFunction.mapping @@ -2,12 +2,7 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction FIELD comp_2218 batchId Ljava/lang/String; FIELD comp_2219 templatePath Ljava/lang/String; FIELD comp_2220 templateName Ljava/lang/String; - FIELD comp_2221 rotation Lnet/minecraft/class_2470; FIELD comp_2222 tickLimit I - FIELD comp_2223 duration J - FIELD comp_2224 required Z - FIELD comp_2225 maxAttempts I - FIELD comp_2226 requiredSuccesses I FIELD comp_2227 starter Ljava/util/function/Consumer; METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IJZLjava/util/function/Consumer;)V ARG 1 batchId @@ -34,18 +29,13 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction ARG 3 templateName ARG 4 rotation ARG 5 tickLimit - ARG 6 duration + ARG 6 setupTicks ARG 8 required ARG 9 starter METHOD comp_2218 batchId ()Ljava/lang/String; METHOD comp_2219 templatePath ()Ljava/lang/String; METHOD comp_2220 templateName ()Ljava/lang/String; - METHOD comp_2221 rotation ()Lnet/minecraft/class_2470; METHOD comp_2222 tickLimit ()I - METHOD comp_2223 duration ()J - METHOD comp_2224 required ()Z - METHOD comp_2225 maxAttempts ()I - METHOD comp_2226 requiredSuccesses ()I METHOD comp_2227 starter ()Ljava/util/function/Consumer; METHOD method_22297 start (Lnet/minecraft/class_4516;)V ARG 1 context diff --git a/mappings/net/minecraft/test/TestFunctionFinder.mapping b/mappings/net/minecraft/test/TestFunctionFinder.mapping new file mode 100644 index 0000000000..f28dcd5022 --- /dev/null +++ b/mappings/net/minecraft/test/TestFunctionFinder.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9125 net/minecraft/test/TestFunctionFinder diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping index c7587d7f25..a867e213e1 100644 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ b/mappings/net/minecraft/test/TestFunctions.mapping @@ -46,3 +46,7 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions ARG 0 method METHOD method_36074 getInvoker (Ljava/lang/reflect/Method;)Ljava/util/function/Consumer; ARG 0 method + METHOD method_56217 (Lnet/minecraft/class_3218;)V + ARG 0 world + METHOD method_56218 (Lnet/minecraft/class_3218;)V + ARG 0 world diff --git a/mappings/net/minecraft/test/TestListener.mapping b/mappings/net/minecraft/test/TestListener.mapping index 91e9096eb3..f34d416639 100644 --- a/mappings/net/minecraft/test/TestListener.mapping +++ b/mappings/net/minecraft/test/TestListener.mapping @@ -3,5 +3,11 @@ CLASS net/minecraft/class_4518 net/minecraft/test/TestListener ARG 1 test METHOD method_22190 onFailed (Lnet/minecraft/class_4517;Lnet/minecraft/class_4520;)V ARG 1 test + ARG 2 context METHOD method_33317 onPassed (Lnet/minecraft/class_4517;Lnet/minecraft/class_4520;)V ARG 1 test + ARG 2 context + METHOD method_56216 onRetry (Lnet/minecraft/class_4517;Lnet/minecraft/class_4517;Lnet/minecraft/class_4520;)V + ARG 1 prevState + ARG 2 nextState + ARG 3 context diff --git a/mappings/net/minecraft/test/TestManager.mapping b/mappings/net/minecraft/test/TestManager.mapping index 7b31c443cc..ddc9298b9e 100644 --- a/mappings/net/minecraft/test/TestManager.mapping +++ b/mappings/net/minecraft/test/TestManager.mapping @@ -1,7 +1,12 @@ CLASS net/minecraft/class_4521 net/minecraft/test/TestManager FIELD field_20574 INSTANCE Lnet/minecraft/class_4521; FIELD field_20575 tests Ljava/util/Collection; + FIELD field_48495 runContext Lnet/minecraft/class_4520; METHOD method_22226 clear ()V METHOD method_22227 start (Lnet/minecraft/class_4517;)V ARG 1 test METHOD method_22228 tick ()V + METHOD method_56241 setRunContext (Lnet/minecraft/class_4520;)V + ARG 1 runContext + METHOD method_56242 (Lnet/minecraft/class_4517;)V + ARG 1 test diff --git a/mappings/net/minecraft/test/TestRunContext.mapping b/mappings/net/minecraft/test/TestRunContext.mapping new file mode 100644 index 0000000000..209d173b75 --- /dev/null +++ b/mappings/net/minecraft/test/TestRunContext.mapping @@ -0,0 +1,82 @@ +CLASS net/minecraft/class_4520 net/minecraft/test/TestRunContext + FIELD field_33151 DEFAULT_TESTS_PER_ROW I + FIELD field_48470 LOGGER Lorg/slf4j/Logger; + FIELD field_48471 world Lnet/minecraft/class_3218; + FIELD field_48472 manager Lnet/minecraft/class_4521; + FIELD field_48473 states Ljava/util/List; + FIELD field_48474 batches Lcom/google/common/collect/ImmutableList; + FIELD field_48475 batchListeners Ljava/util/List; + FIELD field_48476 toBeRetried Ljava/util/List; + FIELD field_48477 batcher Lnet/minecraft/class_4520$class_9116; + FIELD field_48478 stopped Z + FIELD field_48479 currentBatch Lnet/minecraft/class_4514; + FIELD field_48480 reuseSpawner Lnet/minecraft/class_4520$class_9117; + FIELD field_48481 initialSpawner Lnet/minecraft/class_4520$class_9117; + METHOD (Lnet/minecraft/class_4520$class_9116;Ljava/util/Collection;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;Lnet/minecraft/class_4520$class_9117;Lnet/minecraft/class_4520$class_9117;)V + ARG 1 batcher + ARG 2 batches + ARG 3 world + ARG 4 manager + ARG 5 reuseSpawner + ARG 6 initialSpawner + METHOD method_22213 clearDebugMarkers (Lnet/minecraft/class_3218;)V + ARG 0 world + METHOD method_56219 getStates ()Ljava/util/List; + METHOD method_56220 runBatch (I)V + ARG 1 batchIndex + METHOD method_56221 prepareStructures (Ljava/util/Collection;)Ljava/util/Collection; + ARG 1 oldStates + METHOD method_56222 (Lnet/minecraft/class_4514;)Ljava/util/stream/Stream; + ARG 0 batch + METHOD method_56223 addBatchListener (Lnet/minecraft/class_9114;)V + ARG 1 batchListener + METHOD method_56224 retry (Lnet/minecraft/class_4517;)V + ARG 1 state + METHOD method_56225 (Lnet/minecraft/class_4517;Lnet/minecraft/class_4517;Lnet/minecraft/class_4518;)V + ARG 3 listener + METHOD method_56226 start ()V + METHOD method_56227 (Lnet/minecraft/class_9114;)V + ARG 1 listener + METHOD method_56228 prepareStructure (Lnet/minecraft/class_4517;)Ljava/util/Optional; + ARG 1 oldState + METHOD method_56229 clear ()V + METHOD method_56230 (Lnet/minecraft/class_4517;)V + ARG 0 state + METHOD method_56231 onFinish ()V + CLASS 1 + METHOD method_56232 onFinished ()V + METHOD method_56233 (J)V + ARG 1 chunkPos + METHOD method_56234 (Lnet/minecraft/class_9114;)V + ARG 1 listener + CLASS class_9115 Builder + FIELD field_48485 world Lnet/minecraft/class_3218; + FIELD field_48486 manager Lnet/minecraft/class_4521; + FIELD field_48487 batcher Lnet/minecraft/class_4520$class_9116; + FIELD field_48488 reuseSpawner Lnet/minecraft/class_4520$class_9117; + FIELD field_48489 initialSpawner Lnet/minecraft/class_4520$class_9117; + FIELD field_48490 batches Ljava/util/Collection; + METHOD (Ljava/util/Collection;Lnet/minecraft/class_3218;)V + ARG 1 batches + ARG 2 world + METHOD method_56235 build ()Lnet/minecraft/class_4520; + METHOD method_56236 of (Ljava/util/Collection;Lnet/minecraft/class_3218;)Lnet/minecraft/class_4520$class_9115; + ARG 0 batches + ARG 1 world + METHOD method_56237 initialSpawner (Lnet/minecraft/class_4520$class_9117;)Lnet/minecraft/class_4520$class_9115; + ARG 1 initialSpawner + METHOD method_56238 ofStates (Ljava/util/Collection;Lnet/minecraft/class_3218;)Lnet/minecraft/class_4520$class_9115; + ARG 0 states + ARG 1 world + CLASS class_9116 Batcher + METHOD batch (Ljava/util/Collection;)Ljava/util/Collection; + ARG 1 states + CLASS class_9117 TestStructureSpawner + FIELD field_48491 REUSE Lnet/minecraft/class_4520$class_9117; + FIELD field_48492 NOOP Lnet/minecraft/class_4520$class_9117; + METHOD method_56239 (Lnet/minecraft/class_4517;)Ljava/util/Optional; + ARG 0 oldState + METHOD method_56240 (Lnet/minecraft/class_4517;)Ljava/util/Optional; + ARG 0 oldState + METHOD spawnStructure (Lnet/minecraft/class_4517;)Ljava/util/Optional; + ARG 1 oldState diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 0fe44922b3..b2ebf184be 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -8,11 +8,14 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer FIELD field_33162 testSet Lnet/minecraft/class_4524; FIELD field_39441 NONE_API_SERVICES Lnet/minecraft/class_7497; FIELD field_47175 TEST_POS_XZ_RANGE I + FIELD field_48493 testFunctions Ljava/util/List; + FIELD field_48494 stopwatch Lcom/google/common/base/Stopwatch; METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/util/Collection;Lnet/minecraft/class_2338;)V ARG 1 serverThread ARG 2 session ARG 3 dataPackManager ARG 4 saveLoader + ARG 5 testFunctions ARG 6 pos METHOD method_36094 (Lnet/minecraft/class_1928;)V ARG 0 gameRules diff --git a/mappings/net/minecraft/test/TestSet.mapping b/mappings/net/minecraft/test/TestSet.mapping index cc2f1458ce..f61116d02b 100644 --- a/mappings/net/minecraft/test/TestSet.mapping +++ b/mappings/net/minecraft/test/TestSet.mapping @@ -28,3 +28,5 @@ CLASS net/minecraft/class_4524 net/minecraft/test/TestSet ARG 1 onFailed METHOD method_36103 getRequiredTests ()Ljava/util/Collection; METHOD method_36104 getOptionalTests ()Ljava/util/Collection; + METHOD method_56243 remove (Lnet/minecraft/class_4517;)V + ARG 1 state diff --git a/mappings/net/minecraft/test/TestStructurePlacer.mapping b/mappings/net/minecraft/test/TestStructurePlacer.mapping new file mode 100644 index 0000000000..548f38b18b --- /dev/null +++ b/mappings/net/minecraft/test/TestStructurePlacer.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_9120 net/minecraft/test/TestStructurePlacer + FIELD field_48497 MARGIN_X I + FIELD field_48498 MARGIN_Z I + FIELD field_48499 testsPerRow I + FIELD field_48500 testsInCurrentRow I + FIELD field_48501 box Lnet/minecraft/class_238; + FIELD field_48502 mutablePos Lnet/minecraft/class_2338$class_2339; + FIELD field_48503 origin Lnet/minecraft/class_2338; + METHOD (Lnet/minecraft/class_2338;I)V + ARG 1 origin + ARG 2 testsPerRow diff --git a/mappings/net/minecraft/test/TestUtil.mapping b/mappings/net/minecraft/test/TestUtil.mapping deleted file mode 100644 index e1c74f0755..0000000000 --- a/mappings/net/minecraft/test/TestUtil.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil - METHOD method_22213 clearDebugMarkers (Lnet/minecraft/class_3218;)V - ARG 0 world diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index d742041f97..8351ee6b02 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -216,10 +216,29 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos METHOD method_51686 streamSouthEastSquare (Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; ARG 0 pos CLASS 2 + FIELD field_48405 pos Lnet/minecraft/class_2338$class_2339; + FIELD field_48406 remaining I CLASS 3 FIELD field_23380 pos Lnet/minecraft/class_2338$class_2339; + FIELD field_48422 manhattanDistance I + FIELD field_48423 limitX I + FIELD field_48424 limitY I + FIELD field_48425 dx I + FIELD field_48426 dy I + FIELD field_48427 swapZ Z CLASS 4 + FIELD field_48434 pos Lnet/minecraft/class_2338$class_2339; + FIELD field_48435 index I CLASS 5 + FIELD field_48440 directions [Lnet/minecraft/class_2350; + FIELD field_48441 pos Lnet/minecraft/class_2338$class_2339; + FIELD field_48442 maxDirectionChanges I + FIELD field_48443 directionChangeCount I + FIELD field_48444 maxSteps I + FIELD field_48445 steps I + FIELD field_48446 currentX I + FIELD field_48447 currentY I + FIELD field_48448 currentZ I CLASS class_2339 Mutable METHOD (DDD)V ARG 1 x diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 3a12fa02ca..68cab0c67d 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer FIELD field_18678 priceMultiplier F FIELD field_18679 merchantExperience I FIELD field_48371 PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_48372 ignoreTags Z + FIELD field_48372 ignoreNbt Z FIELD field_9143 secondBuyItem Lnet/minecraft/class_1799; FIELD field_9144 maxUses I FIELD field_9145 rewardingPlayerExperience Z @@ -50,7 +50,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 6 merchantExperience ARG 7 priceMultiplier ARG 8 demandBonus - ARG 9 ignoreTags + ARG 9 ignoreNbt METHOD (Lnet/minecraft/class_1914;)V ARG 1 offer METHOD (Lnet/minecraft/class_2487;)V @@ -64,7 +64,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Z)Z ARG 0 offered ARG 1 buyItem - ARG 2 ignoreTags + ARG 2 ignoreNbt METHOD method_18019 copySellItem ()Lnet/minecraft/class_1799; COMMENT Returns a copy of the sell item of this trade offer. METHOD method_19272 getAdjustedFirstBuyItem ()Lnet/minecraft/class_1799; @@ -113,7 +113,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer METHOD method_56111 read (Lnet/minecraft/class_9129;Lnet/minecraft/class_1914;)V ARG 0 buf ARG 1 offer - METHOD method_56112 shouldIgnoreTags ()Z + METHOD method_56112 shouldIgnoreNbt ()Z METHOD method_8244 use ()V COMMENT Increments the number of times this trade offer has been used. METHOD method_8245 increaseSpecialPrice (I)V diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index c3dd169d28..b14131966a 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -149,6 +149,16 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers FIELD field_18568 maxUses I FIELD field_18569 experience I FIELD field_18570 multiplier F + FIELD field_48346 ignoreNbt Z + METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIF)V + ARG 1 item + ARG 2 count + ARG 3 price + ARG 4 processed + ARG 5 processedCount + ARG 6 maxUses + ARG 7 experience + ARG 8 mutiplier METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIFZ)V ARG 1 item ARG 2 count @@ -158,6 +168,16 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 6 maxUses ARG 7 experience ARG 8 multiplier + ARG 9 ignoreNbt + METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1799;IIIF)V + ARG 1 item + 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;IIIFZ)V ARG 1 item ARG 2 count @@ -167,6 +187,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 6 maxUses ARG 7 experience ARG 8 multiplier + ARG 9 ignoreNbt CLASS class_4165 SellItemFactory FIELD field_18571 sell Lnet/minecraft/class_1799; FIELD field_18572 price I diff --git a/mappings/net/minecraft/village/VillagerData.mapping b/mappings/net/minecraft/village/VillagerData.mapping index 4097bda46a..a355a6e9b0 100644 --- a/mappings/net/minecraft/village/VillagerData.mapping +++ b/mappings/net/minecraft/village/VillagerData.mapping @@ -26,5 +26,17 @@ CLASS net/minecraft/class_3850 net/minecraft/village/VillagerData ARG 0 level METHOD method_19196 canLevelUp (I)Z ARG 0 level + METHOD method_28371 (Lnet/minecraft/class_3850;)Ljava/lang/Integer; + ARG 0 data METHOD method_28372 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28373 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_3852; + ARG 0 data + METHOD method_28374 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_3854; + ARG 0 data + METHOD method_56089 (Lnet/minecraft/class_3850;)Ljava/lang/Integer; + ARG 0 data + METHOD method_56090 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_3852; + ARG 0 data + METHOD method_56091 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_3854; + ARG 0 data diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 9e06f31aa7..c323374810 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -83,6 +83,9 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules METHOD method_53839 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1928$class_4310;)V ARG 0 server ARG 1 rule + METHOD method_56113 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1928$class_4312;)V + ARG 0 server + ARG 1 value 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 @@ -158,6 +161,7 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules COMMENT Validates that an input is valid for this rule, and sets the rule's value if successful. COMMENT COMMENT @return whether the input is valid + ARG 1 input METHOD method_35236 set (ILnet/minecraft/server/MinecraftServer;)V ARG 1 value ARG 2 server diff --git a/mappings/net/minecraft/world/event/BlockPositionSource.mapping b/mappings/net/minecraft/world/event/BlockPositionSource.mapping index b84760f6cb..71fa31b7ed 100644 --- a/mappings/net/minecraft/world/event/BlockPositionSource.mapping +++ b/mappings/net/minecraft/world/event/BlockPositionSource.mapping @@ -8,4 +8,6 @@ CLASS net/minecraft/class_5707 net/minecraft/world/event/BlockPositionSource ARG 0 instance METHOD method_32928 (Lnet/minecraft/class_5707;)Lnet/minecraft/class_2338; ARG 0 blockPositionSource + METHOD method_56122 (Lnet/minecraft/class_5707;)Lnet/minecraft/class_2338; + ARG 0 source CLASS class_5708 Type diff --git a/mappings/net/minecraft/world/event/EntityPositionSource.mapping b/mappings/net/minecraft/world/event/EntityPositionSource.mapping index 66f7ef6779..d3c5b237c8 100644 --- a/mappings/net/minecraft/world/event/EntityPositionSource.mapping +++ b/mappings/net/minecraft/world/event/EntityPositionSource.mapping @@ -36,4 +36,9 @@ CLASS net/minecraft/class_5709 net/minecraft/world/event/EntityPositionSource METHOD method_42682 (Lcom/mojang/datafixers/util/Either;)Ljava/util/UUID; ARG 0 entityId METHOD method_42683 getEntityId ()I + METHOD method_56124 (Lnet/minecraft/class_5709;)Ljava/lang/Float; + ARG 0 source + METHOD method_56125 (Ljava/lang/Integer;Ljava/lang/Float;)Lnet/minecraft/class_5709; + ARG 0 entityId + ARG 1 yOffset CLASS class_5710 Type diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 91f75b4845..ec2e42a86c 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_54553 isEditable ()Z METHOD method_54554 isRecreatable ()Z METHOD method_54555 isDeletable ()Z + METHOD method_56127 isImmediatelyLoadable ()Z CLASS class_5781 ConversionWarning FIELD field_28440 backup Z FIELD field_28441 dangerous Z From 662a3acfb88c515bc7ff7456b6ce0064bcc74d81 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 18 Jan 2024 16:23:06 +0000 Subject: [PATCH 13/47] 24w03b --- build.gradle | 2 +- mappings/net/minecraft/block/CrafterBlock.mapping | 2 -- .../minecraft/client/particle/GustDustParticle.mapping | 9 --------- mappings/net/minecraft/entity/mob/BreezeEntity.mapping | 1 - .../server/network/ServerPlayNetworkHandler.mapping | 1 - mappings/net/minecraft/test/TestContext.mapping | 4 ---- mappings/net/minecraft/world/WorldEvents.mapping | 2 -- 7 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 mappings/net/minecraft/client/particle/GustDustParticle.mapping diff --git a/build.gradle b/build.gradle index de8249efad..8b7033cc5a 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w03a" +def minecraft_version = "24w03b" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/CrafterBlock.mapping b/mappings/net/minecraft/block/CrafterBlock.mapping index a5b63e5777..5c14b0329a 100644 --- a/mappings/net/minecraft/block/CrafterBlock.mapping +++ b/mappings/net/minecraft/block/CrafterBlock.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_8886 net/minecraft/block/CrafterBlock FIELD field_46801 ORIENTATION Lnet/minecraft/class_2754; FIELD field_46803 recipeCache Lnet/minecraft/class_8884; FIELD field_47521 TRIGGER_DELAY I - METHOD method_54473 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8887;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)V - ARG 5 stack METHOD method_54474 (Lnet/minecraft/class_1799;)V ARG 0 stack METHOD method_54475 getCraftingRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_8566;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/particle/GustDustParticle.mapping b/mappings/net/minecraft/client/particle/GustDustParticle.mapping deleted file mode 100644 index c8d0f78cbb..0000000000 --- a/mappings/net/minecraft/client/particle/GustDustParticle.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_8975 net/minecraft/client/particle/GustDustParticle - FIELD field_47451 START_COLOR Lorg/joml/Vector3f; - FIELD field_47452 END_COLOR Lorg/joml/Vector3f; - METHOD method_55241 lerpColor (F)V - ARG 1 tickDelta - CLASS class_8976 Factory - FIELD field_47453 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index b29e268723..7b57ed1a0d 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity FIELD field_47280 inhalingAnimationState Lnet/minecraft/class_7094; FIELD field_47281 shootingAnimationState Lnet/minecraft/class_7094; FIELD field_48344 PROJECTILE_DEFLECTOR Lnet/minecraft/class_9109; - METHOD method_55006 addGustDustParticles ()Lnet/minecraft/class_8949; METHOD method_55007 addBlockParticles (I)V ARG 1 count METHOD method_55008 addLongJumpingParticles ()V diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 4254c1ff2c..5f84c693fe 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -39,7 +39,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_45026 chunkDataSender Lnet/minecraft/class_8608; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;Lnet/minecraft/class_8792;)V ARG 1 server - ARG 2 connection ARG 3 player ARG 4 clientData METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index ebcb54a3c8..cb03e115eb 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -407,10 +407,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_56205 (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)I ARG 1 a ARG 2 b - METHOD method_56206 assertEquals (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;)V - ARG 1 actual - ARG 2 expected - ARG 3 name METHOD method_56207 getEntitiesAround (Lnet/minecraft/class_1299;IIID)Ljava/util/List; ARG 1 type ARG 2 x diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index e705b96129..e31a8dcc01 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -330,8 +330,6 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT
    Shoots white smoke particles. COMMENT

    The ordinal direction the crafter is facing must be supplied as extra data. COMMENT

    Called by {@link net.minecraft.block.CrafterBlock#transferOrSpawnStack(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.entity.CrafterBlockEntity, net.minecraft.item.ItemStack, net.minecraft.block.BlockState) CrafterBlock#transferOrSpawnStack} - FIELD field_47339 GUST_DUST I - COMMENT A gust dust particle is spawned. FIELD field_47340 TRIAL_SPAWNER_SPAWNS_MOB I COMMENT A trial spawner spawns a mob. Triggered at the position of the spawner. COMMENT
    Spawns mob spawn particles. From 9e564d640262badf8b9a785a32fa9c18badeeca0 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:06:48 +0900 Subject: [PATCH 14/47] 24w03a/b networking (#3768) --- .../network/ClientLoginNetworkHandler.mapping | 7 + .../network/ClientPlayNetworkHandler.mapping | 1 + .../network/ClientConnection.mapping | 38 +++- .../minecraft/network/NetworkState.mapping | 11 +- .../network/NetworkStateBuilder.mapping | 52 +++++ .../network/NetworkStateType.mapping | 5 + .../minecraft/network/PacketByteBuf.mapping | 8 +- .../{codec => }/RegistryByteBuf.mapping | 5 +- .../network/codec/PacketCodec.mapping | 85 +++++++- .../network/codec/PacketCodecs.mapping | 182 ++++++++++++++++-- .../network/codec/PacketDecoder.mapping | 7 + .../network/codec/PacketEncoder.mapping | 7 + .../network/codec/ValueFirstEncoder.mapping | 7 + .../network/encoding/StringEncoding.mapping | 4 +- .../network/handler/DecoderHandler.mapping | 4 + .../network/handler/EncoderHandler.mapping | 9 + .../network/handler/HandlerNames.mapping | 17 ++ .../NetworkStateTransitionHandler.mapping | 6 + .../handler/NetworkStateTransitions.mapping | 36 ++++ .../handler/PacketBundleHandler.mapping | 1 + .../network/handler/PacketBundler.mapping | 2 + .../handler/PacketCodecDispatcher.mapping | 25 +++ .../network/handler/PacketEncoder.mapping | 6 - .../network/handler/PacketUnbundler.mapping | 3 + ...eValidatingDispatchingCodecBuilder.mapping | 9 + .../s2c/common/CustomPayloadS2CPacket.mapping | 6 + .../s2c/login/LoginHelloS2CPacket.mapping | 3 + .../s2c/play/StatisticsS2CPacket.mapping | 2 + .../play/SynchronizeRecipesS2CPacket.mapping | 2 + .../network/state/ConfigurationStates.mapping | 7 + .../network/state/HandshakeStates.mapping | 2 + .../network/state/LoginStates.mapping | 7 + .../network/state/PlayStateFactories.mapping | 7 + .../network/state/QueryStates.mapping | 7 + .../minecraft/server/MinecraftServer.mapping | 1 + .../ServerHandshakeNetworkHandler.mapping | 3 + .../network/ServerLoginNetworkHandler.mapping | 2 + 37 files changed, 552 insertions(+), 34 deletions(-) create mode 100644 mappings/net/minecraft/network/NetworkStateBuilder.mapping create mode 100644 mappings/net/minecraft/network/NetworkStateType.mapping rename mappings/net/minecraft/network/{codec => }/RegistryByteBuf.mapping (65%) create mode 100644 mappings/net/minecraft/network/handler/EncoderHandler.mapping create mode 100644 mappings/net/minecraft/network/handler/HandlerNames.mapping create mode 100644 mappings/net/minecraft/network/handler/NetworkStateTransitions.mapping create mode 100644 mappings/net/minecraft/network/handler/PacketCodecDispatcher.mapping delete mode 100644 mappings/net/minecraft/network/handler/PacketEncoder.mapping create mode 100644 mappings/net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder.mapping create mode 100644 mappings/net/minecraft/network/state/ConfigurationStates.mapping create mode 100644 mappings/net/minecraft/network/state/HandshakeStates.mapping create mode 100644 mappings/net/minecraft/network/state/LoginStates.mapping create mode 100644 mappings/net/minecraft/network/state/PlayStateFactories.mapping create mode 100644 mappings/net/minecraft/network/state/QueryStates.mapping diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index 2d063bcc9a..1488ee1dac 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan FIELD field_41384 worldLoadTime Ljava/time/Duration; FIELD field_44809 minigameName Ljava/lang/String; FIELD field_46192 state Ljava/util/concurrent/atomic/AtomicReference; + FIELD field_48400 serverCookies Ljava/util/Map; + FIELD field_48401 hasCookies Z METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_642;Lnet/minecraft/class_437;ZLjava/time/Duration;Ljava/util/function/Consumer;Lnet/minecraft/class_9112;)V ARG 1 connection ARG 2 client @@ -17,6 +19,7 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan ARG 5 newWorld ARG 6 worldLoadTime ARG 7 statusConsumer + ARG 8 cookieStorage METHOD method_2891 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_2892 joinServerSession (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 serverId @@ -31,6 +34,10 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan ARG 1 state METHOD method_53873 (Lnet/minecraft/class_635$class_8798;Lnet/minecraft/class_635$class_8798;)Lnet/minecraft/class_635$class_8798; ARG 1 currentState + METHOD method_56151 setupEncryption (Lnet/minecraft/class_2917;Ljavax/crypto/Cipher;Ljavax/crypto/Cipher;)V + ARG 1 keyPacket + ARG 2 decryptionCipher + ARG 3 encryptionCipher CLASS class_8798 State FIELD field_46197 name Lnet/minecraft/class_2561; FIELD field_46198 prevStates Ljava/util/Set; diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 10eea89241..f807a20bb2 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -33,6 +33,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_46187 worldCleared Z FIELD field_46578 worldLoadingState Lnet/minecraft/class_8819; FIELD field_47878 scoreboard Lnet/minecraft/class_269; + FIELD field_48403 secureChatEnforced 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/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index d4048a2965..d818468fde 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -34,6 +34,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection FIELD field_45668 queuedTasks Ljava/util/Queue; FIELD field_45669 prePlayStateListener Lnet/minecraft/class_2547; FIELD field_45955 packetSizeLogger Lnet/minecraft/class_8762; + FIELD field_48514 C2S_HANDSHAKE_STATE Lnet/minecraft/class_9127; + FIELD field_48515 duringLogin Z METHOD (Lnet/minecraft/class_2598;)V ARG 1 side METHOD channelActive (Lio/netty/channel/ChannelHandlerContext;)V @@ -122,6 +124,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 address ARG 1 useEpoll ARG 2 connection + METHOD method_52900 (Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Ljava/lang/String;ILnet/minecraft/class_8592;Lnet/minecraft/class_9127;Lnet/minecraft/class_2535;)V + ARG 7 connection METHOD method_52902 connect (Ljava/lang/String;ILnet/minecraft/class_2896;)V ARG 1 address ARG 2 port @@ -133,6 +137,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_52904 connect (Ljava/lang/String;ILnet/minecraft/class_9127;Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Lnet/minecraft/class_8592;)V ARG 1 address ARG 2 port + ARG 3 outboundState + ARG 4 inboundState ARG 5 prePlayStateListener ARG 6 intent METHOD method_52905 submit (Ljava/util/function/Consumer;)V @@ -152,7 +158,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection COMMENT Sets the initial packet listener. COMMENT COMMENT @throws IllegalStateException if the listener was already set - COMMENT @see #setPacketListener + COMMENT @see #transitionInbound + COMMENT @see #transitionOutbound ARG 1 packetListener METHOD method_52915 flush ()V METHOD method_52918 flushInternal ()V @@ -163,7 +170,36 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_56326 connect (Ljava/lang/String;ILnet/minecraft/class_9127;Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Z)V ARG 1 address ARG 2 port + ARG 3 outboundState + ARG 4 inboundState + ARG 5 prePlayStateListener ARG 6 transfer + METHOD method_56327 (Lnet/minecraft/class_8035;Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD method_56328 (Lnet/minecraft/class_8036;Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD method_56329 transitionOutbound (Lnet/minecraft/class_9127;)V + ARG 1 newState + METHOD method_56330 transitionInbound (Lnet/minecraft/class_9127;Lnet/minecraft/class_2547;)V + ARG 1 state + ARG 2 packetListener + METHOD method_56331 (ZLio/netty/channel/ChannelHandlerContext;)V + ARG 2 context + METHOD method_56332 setPacketListener (Lnet/minecraft/class_9127;Lnet/minecraft/class_2547;)V + ARG 1 state + ARG 2 listener + METHOD method_56333 getOutboundHandlerName (Z)Ljava/lang/String; + ARG 0 sendingSide + METHOD method_56334 getInboundHandlerName (Z)Ljava/lang/String; + ARG 0 receivingSide CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel + CLASS 2 + METHOD write (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/channel/ChannelPromise;)V + ARG 1 context + ARG 2 value + ARG 3 promise + CLASS 3 + METHOD initChannel (Lio/netty/channel/Channel;)V + ARG 1 channel diff --git a/mappings/net/minecraft/network/NetworkState.mapping b/mappings/net/minecraft/network/NetworkState.mapping index 0c433547fa..61ea029234 100644 --- a/mappings/net/minecraft/network/NetworkState.mapping +++ b/mappings/net/minecraft/network/NetworkState.mapping @@ -1,5 +1,6 @@ -CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState - FIELD field_20594 stateId Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 stateId - METHOD method_10785 getId ()Ljava/lang/String; +CLASS net/minecraft/class_9127 net/minecraft/network/NetworkState + METHOD comp_2235 side ()Lnet/minecraft/class_2598; + METHOD comp_2237 bundleHandler ()Lnet/minecraft/class_8039; + CLASS class_9128 Factory + METHOD bind (Ljava/util/function/Function;)Lnet/minecraft/class_9127; + ARG 1 registryBinder diff --git a/mappings/net/minecraft/network/NetworkStateBuilder.mapping b/mappings/net/minecraft/network/NetworkStateBuilder.mapping new file mode 100644 index 0000000000..a9dbe02f34 --- /dev/null +++ b/mappings/net/minecraft/network/NetworkStateBuilder.mapping @@ -0,0 +1,52 @@ +CLASS net/minecraft/class_9147 net/minecraft/network/NetworkStateBuilder + FIELD field_48616 type Lnet/minecraft/class_2539; + FIELD field_48617 side Lnet/minecraft/class_2598; + FIELD field_48618 packetTypes Ljava/util/List; + FIELD field_48619 bundleHandler Lnet/minecraft/class_8039; + METHOD (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;)V + ARG 1 type + ARG 2 side + METHOD method_56447 buildFactory ()Lnet/minecraft/class_9127$class_9128; + METHOD method_56448 (Ljava/util/List;Lnet/minecraft/class_8039;Ljava/util/function/Function;)Lnet/minecraft/class_9127; + ARG 3 bufUpgrader + METHOD method_56449 build (Ljava/util/function/Function;)Lnet/minecraft/class_9127; + ARG 1 bufUpgrader + METHOD method_56450 createCodec (Ljava/util/function/Function;Ljava/util/List;)Lnet/minecraft/class_9139; + ARG 1 bufUpgrader + ARG 2 packetTypes + METHOD method_56451 c2s (Lnet/minecraft/class_2539;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127; + ARG 0 type + ARG 1 registrar + METHOD method_56452 build (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127; + ARG 0 type + ARG 1 side + ARG 2 registrar + METHOD method_56453 addBundle (Lnet/minecraft/class_9145;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_9147; + ARG 1 id + ARG 2 bundler + ARG 3 splitter + METHOD method_56454 add (Lnet/minecraft/class_9145;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9147; + ARG 1 id + ARG 2 codec + METHOD method_56455 s2c (Lnet/minecraft/class_2539;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127; + ARG 0 type + ARG 1 registrar + METHOD method_56456 buildFactory (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127$class_9128; + ARG 0 type + ARG 1 side + ARG 2 registrar + METHOD method_56457 c2sFactory (Lnet/minecraft/class_2539;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127$class_9128; + ARG 0 type + ARG 1 registrar + METHOD method_56458 s2cFactory (Lnet/minecraft/class_2539;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127$class_9128; + ARG 0 type + ARG 1 registrar + CLASS class_9148 PacketType + FIELD comp_2232 id Lnet/minecraft/class_9145; + FIELD comp_2233 codec Lnet/minecraft/class_9139; + METHOD comp_2232 id ()Lnet/minecraft/class_9145; + METHOD comp_2233 codec ()Lnet/minecraft/class_9139; + METHOD method_56459 add (Lnet/minecraft/class_9146;Ljava/util/function/Function;)V + ARG 1 builder + ARG 2 bufUpgrader + CLASS class_9149 NetworkStateImpl diff --git a/mappings/net/minecraft/network/NetworkStateType.mapping b/mappings/net/minecraft/network/NetworkStateType.mapping new file mode 100644 index 0000000000..35389f36e2 --- /dev/null +++ b/mappings/net/minecraft/network/NetworkStateType.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_2539 net/minecraft/network/NetworkStateType + FIELD field_20594 stateId Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 stateId + METHOD method_10785 getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 11fe32153c..b2f2e462a7 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -15,9 +15,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT Codec-based (JSON){@link #decodeAsJson(Codec)}{@link #encodeAsJson(Codec, Object)} COMMENT COMMENT - COMMENT {@link net.minecraft.registry.Registry} value{@link #readRegistryValue(IndexedIterable)}{@link #writeRegistryValue(IndexedIterable, Object)} - COMMENT - COMMENT COMMENT Integer-identified value{@link #decode(IntFunction)}{@link #encode(ToIntFunction, Object)} COMMENT COMMENT @@ -90,9 +87,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link NbtCompound}{@link #readNbt()}{@link #writeNbt(NbtCompound)} COMMENT COMMENT - COMMENT {@link ItemStack}{@link #readItemStack()}{@link #writeItemStack(ItemStack)} - COMMENT - COMMENT COMMENT {@link String}{@link #readString()}{@link #writeString(String)} COMMENT COMMENT @@ -765,6 +759,8 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readMap(PacketByteBuf.PacketReader, PacketByteBuf.PacketReader) ARG 1 mapFactory COMMENT a factory that creates a map with a given size + ARG 2 keyReader + ARG 3 valueReader METHOD method_34070 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; ARG 1 error METHOD method_36130 writeChunkPos (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2540; diff --git a/mappings/net/minecraft/network/codec/RegistryByteBuf.mapping b/mappings/net/minecraft/network/RegistryByteBuf.mapping similarity index 65% rename from mappings/net/minecraft/network/codec/RegistryByteBuf.mapping rename to mappings/net/minecraft/network/RegistryByteBuf.mapping index e296bb567a..46fb88b7e0 100644 --- a/mappings/net/minecraft/network/codec/RegistryByteBuf.mapping +++ b/mappings/net/minecraft/network/RegistryByteBuf.mapping @@ -1,4 +1,7 @@ -CLASS net/minecraft/class_9129 net/minecraft/network/codec/RegistryByteBuf +CLASS net/minecraft/class_9129 net/minecraft/network/RegistryByteBuf + COMMENT A packet byte buffer bound to a particular {@link DynamicRegistryManager} instance. + COMMENT + COMMENT

    This is used during the {@link NetworkStateType#PLAY} phase only. FIELD field_48538 registryManager Lnet/minecraft/class_5455; METHOD (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_5455;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index 67f2bdfe5c..435cf4b9ba 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -1,23 +1,81 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec + COMMENT A codec that is used for serializing a packet. + COMMENT + COMMENT

    Packet codecs serialize to, and deserialize from, {@link net.minecraft.network.PacketByteBuf}, + COMMENT which is a stream of data. To integrate the classic {@link net.minecraft.network.PacketByteBuf}-based + COMMENT code, use {@link #of(ValueFirstEncoder, PacketDecoder)} + COMMENT like this: + COMMENT + COMMENT 

    {@code
+	COMMENT public static final PacketCodec CODEC = PacketCodec.of(MyPacket::write, MyPacket::new);
+	COMMENT
+	COMMENT private MyPacket(PacketByteBuf buf) {
+	COMMENT \tthis.text = buf.readString();
+	COMMENT }
+	COMMENT
+	COMMENT private void write(PacketByteBuf buf) {
+	COMMENT \tbuf.writeString(this.text);
+	COMMENT }
+	COMMENT }
    + COMMENT + COMMENT

    While this serves similar functions as codecs in the DataFixerUpper library, + COMMENT the two are wholly separate and DataFixerUpper methods cannot be used with this. + COMMENT However, a packet codec may reference a regular codec by using {@link + COMMENT PacketCodecs#codec}, which serializes the data to NBT. + COMMENT + COMMENT

    See {@link PacketCodecs} for codecs to serialize various objects. + COMMENT + COMMENT @param the type of the buffer; {@link net.minecraft.network.RegistryByteBuf} + COMMENT for play-phase packets, {@link net.minecraft.network.PacketByteBuf} for other + COMMENT phases (like configuration) + COMMENT @param the type of the value to be encoded/decoded METHOD method_56430 cast ()Lnet/minecraft/class_9139; METHOD method_56431 unit (Ljava/lang/Object;)Lnet/minecraft/class_9139; + COMMENT {@return a codec that always returns {@code value}} + COMMENT + COMMENT

    This does not encode anything. Instead, it throws {@link + COMMENT IllegalStateException} when the value does not + COMMENT equal {@code value}. This comparison is made with {@code equals()}, not + COMMENT reference equality ({@code ==}). ARG 0 value METHOD method_56432 xmap (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + COMMENT {@return a codec that maps its encode input and decode output with {@code from} + COMMENT and {@code to}, respectively} + COMMENT + COMMENT

    This can be used to transform a codec for a simple value (like a string) + COMMENT into a corresponding, more complex value (like an identifier). An example: + COMMENT + COMMENT 

    {@code
+		COMMENT public static final PacketCodec PACKET_CODEC = PacketCodecs.STRING.xmap(Identifier::new, Identifier::toString);
+		COMMENT }
    ARG 1 to ARG 2 from - METHOD method_56433 mapResult (Lnet/minecraft/class_9139$class_9140;)Lnet/minecraft/class_9139; + METHOD method_56433 collect (Lnet/minecraft/class_9139$class_9140;)Lnet/minecraft/class_9139; + COMMENT {@return the result mapped with {@code function}} + COMMENT + COMMENT

    For example, passing {@code PacketCodecs::optional} makes the value + COMMENT optional. Additionally, this method can be used like Stream {@link + COMMENT java.util.stream.Collectors} - hence its name. For example, to make a codec + COMMENT for a list of something, write {@code parentCodec.collect(PacketCodecs.toList())}. + COMMENT + COMMENT @see PacketCodecs#optional + COMMENT @see PacketCodecs#toCollection + COMMENT @see PacketCodecs#toList ARG 1 function METHOD method_56434 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding one value} ARG 0 codec ARG 1 from ARG 2 to METHOD method_56435 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding two values} ARG 0 codec1 ARG 1 from1 ARG 2 codec2 ARG 3 from2 ARG 4 to METHOD method_56436 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding three values} ARG 0 codec1 ARG 1 from1 ARG 2 codec2 @@ -26,16 +84,41 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec ARG 5 from3 ARG 6 to METHOD method_56437 of (Lnet/minecraft/class_9142;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; + COMMENT {@return a packet codec from the {@code encoder} and {@code decoder}} + COMMENT + COMMENT @apiNote This is useful for integrating with code that uses static methods for + COMMENT packet writing, where the buffer is the first argument, like + COMMENT {@code static void write(PacketByteBuf buf, Data data)}. + COMMENT For code that uses instance methods like {@code void write(PacketByteBuf buf)}, + COMMENT use {@link #of(ValueFirstEncoder, PacketDecoder)}. ARG 0 encoder ARG 1 decoder METHOD method_56438 of (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; + COMMENT {@return a packet codec from the {@code encoder} and {@code decoder}} + COMMENT + COMMENT @apiNote This is useful for integrating with code that uses instance methods for + COMMENT packet writing, like {@code void write(PacketByteBuf buf)}. + COMMENT For code that uses static methods like {@code static void write(PacketByteBuf buf, Data data)}, + COMMENT where the buffer is the first argument, use {@link #of(PacketEncoder, PacketDecoder)}. ARG 0 encoder ARG 1 decoder METHOD method_56439 mapBuf (Ljava/util/function/Function;)Lnet/minecraft/class_9139; ARG 1 function METHOD method_56440 dispatch (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + COMMENT {@return a codec that dispatches one of the sub-codecs based on the type} + COMMENT + COMMENT

    For example, subtypes of {@link net.minecraft.stat.Stat} requires different values + COMMENT to be serialized, yet it makes sense to use the same codec for all stats. + COMMENT This method should be called on the codec for the "type" - like {@link + COMMENT net.minecraft.stat.StatType}. An example: + COMMENT + COMMENT 

    {@code
+		COMMENT public static final PacketCodec> PACKET_CODEC = PacketCodecs.registryValue(RegistryKeys.THING_TYPE).dispatch(Thing::getType, ThingType::getPacketCodec);
+		COMMENT }
    ARG 1 type + COMMENT a function that, given a value, returns its "type" ARG 2 codec + COMMENT a function that, given a "type", returns the codec for encoding/decoding the value CLASS class_9140 ResultFunction METHOD apply (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 1 codec diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index 2e28545a35..244e502595 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -1,51 +1,187 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs + COMMENT A set of pre-defined packet codecs. + COMMENT + COMMENT @see PacketCodec FIELD field_48547 BOOL Lnet/minecraft/class_9139; + COMMENT A codec for a boolean value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readBoolean + COMMENT @see io.netty.buffer.ByteBuf#writeBoolean FIELD field_48548 BYTE Lnet/minecraft/class_9139; + COMMENT A codec for a byte value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readByte + COMMENT @see io.netty.buffer.ByteBuf#writeByte FIELD field_48549 SHORT Lnet/minecraft/class_9139; + COMMENT A codec for a short value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readShort + COMMENT @see io.netty.buffer.ByteBuf#writeShort FIELD field_48550 VAR_INT Lnet/minecraft/class_9139; + COMMENT A codec for a variable-length integer (var int) value. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readVarInt + COMMENT @see net.minecraft.network.PacketByteBuf#writeVarInt FIELD field_48551 VAR_LONG Lnet/minecraft/class_9139; + COMMENT A codec for a variable-length long (var long) value. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readVarLong + COMMENT @see net.minecraft.network.PacketByteBuf#writeVarLong FIELD field_48552 FLOAT Lnet/minecraft/class_9139; + COMMENT A codec for a float value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readFloat + COMMENT @see io.netty.buffer.ByteBuf#writeFloat FIELD field_48553 DOUBLE Lnet/minecraft/class_9139; + COMMENT A codec for a double value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readDouble + COMMENT @see io.netty.buffer.ByteBuf#writeDouble FIELD field_48554 STRING Lnet/minecraft/class_9139; + COMMENT A codec for a string value with maximum length {@value Short.MAX_VALUE}. + COMMENT + COMMENT @see #string + COMMENT @see net.minecraft.network.PacketByteBuf#readString() + COMMENT @see net.minecraft.network.PacketByteBuf#writeString(String) FIELD field_48555 NBT_ELEMENT Lnet/minecraft/class_9139; - FIELD field_48556 NBT_COMPUND Lnet/minecraft/class_9139; + COMMENT A codec for an NBT element of unlimited size. + COMMENT + COMMENT @see #nbt + COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(NbtSizeTracker) + COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(NbtElement) + FIELD field_48556 NBT_COMPOUND Lnet/minecraft/class_9139; + COMMENT A codec for an NBT compound of unlimited size. + COMMENT + COMMENT @see #nbt + COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(NbtSizeTracker) + COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(NbtElement) FIELD field_48557 OPTIONAL_NBT Lnet/minecraft/class_9139; + COMMENT A codec for an optional NBT compound of up to {@value + COMMENT net.minecraft.network.PacketByteBuf#MAX_READ_NBT_SIZE} bytes. + COMMENT + COMMENT @see #nbt + COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(PacketByteBuf) + COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(PacketByteBuf, NbtCompound) FIELD field_48558 VECTOR3F Lnet/minecraft/class_9139; - FIELD field_48559 QUATERNION Lnet/minecraft/class_9139; - METHOD method_56363 listMapper ()Lnet/minecraft/class_9139$class_9140; + COMMENT A codec for a {@link org.joml.Vector3f}. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readVector3f() + COMMENT @see net.minecraft.network.PacketByteBuf#writeVector3f(Vector3f) + FIELD field_48559 QUATERNIONF Lnet/minecraft/class_9139; + COMMENT A codec for a {@link org.joml.Quaternionf}. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readQuaternionf() + COMMENT @see net.minecraft.network.PacketByteBuf#writeQuaternionf(Quaternionf) + METHOD method_56363 toList ()Lnet/minecraft/class_9139$class_9140; + COMMENT Used to make a codec for a list of values using {@link PacketCodec#collect}. + COMMENT This creates an {@link java.util.ArrayList}, so the decoded result can be modified. + COMMENT + COMMENT

    For example, to make a codec for a list of values, write {@code + COMMENT codec.collect(PacketCodecs.toList())}. + COMMENT + COMMENT @see #toCollection METHOD method_56364 string (I)Lnet/minecraft/class_9139; - ARG 0 length - METHOD method_56365 registry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a string value with maximum length {@code maxLength}} + COMMENT + COMMENT @see #STRING + COMMENT @see net.minecraft.network.PacketByteBuf#readString(int) + COMMENT @see net.minecraft.network.PacketByteBuf#writeString(String, int) + ARG 0 maxLength + METHOD method_56365 registryValue (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a {@link net.minecraft.registry.Registry}-registered value} + COMMENT + COMMENT

    This codec only works with {@link net.minecraft.network.RegistryByteBuf}, used + COMMENT during the play phase. Consider using {@link #entryOf} for encoding a value of a + COMMENT static registry during login or configuration phases. + COMMENT + COMMENT @implNote The value is serialized as the corresponding raw ID (as {@link #VAR_INT + COMMENT a var int}). + COMMENT + COMMENT @see #entryOf ARG 0 registry METHOD method_56366 registry (Lnet/minecraft/class_5321;Ljava/util/function/Function;)Lnet/minecraft/class_9139; ARG 0 registry ARG 1 registryTransformer METHOD method_56367 registryEntry (Lnet/minecraft/class_5321;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a {@link net.minecraft.registry.entry.RegistryEntry}} + COMMENT + COMMENT

    This codec only works with {@link net.minecraft.network.RegistryByteBuf}, used + COMMENT during the play phase. Consider using {@link #entryOf} for encoding a value of a + COMMENT static registry during login or configuration phases. + COMMENT + COMMENT @implNote If the entry is a reference entry, the value is serialized as the + COMMENT corresponding raw ID (as {@link #VAR_INT a var int}). If it is a direct entry, + COMMENT it is encoded using {@code directCodec}. + COMMENT + COMMENT @see #registryValue + COMMENT @see #registryEntry(RegistryKey) ARG 0 registry - ARG 1 fallback - METHOD method_56368 ofCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; + ARG 1 directCodec + METHOD method_56368 codec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; + COMMENT {@return a codec from DataFixerUpper codec {@code codec}} + COMMENT + COMMENT

    Internally, the data is serialized as an NBT element of unlimited size. ARG 0 codec METHOD method_56369 (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)Lnet/minecraft/class_2520; ARG 1 value METHOD method_56370 (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2520;)Ljava/lang/Object; ARG 1 nbt - METHOD method_56371 ofIterable (Lnet/minecraft/class_2359;)Lnet/minecraft/class_9139; + METHOD method_56371 entryOf (Lnet/minecraft/class_2359;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for an entry of {@code iterable}} + COMMENT + COMMENT @see #indexed ARG 0 iterable + METHOD method_56372 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2359; + ARG 0 registry METHOD method_56373 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; ARG 1 error - METHOD method_56374 collectionMapper (Ljava/util/function/IntFunction;)Lnet/minecraft/class_9139$class_9140; - ARG 0 factory + METHOD method_56374 toCollection (Ljava/util/function/IntFunction;)Lnet/minecraft/class_9139$class_9140; + COMMENT Used to make a codec for a collection of values using {@link PacketCodec#collect}. + COMMENT + COMMENT

    For example, to make a codec for a set of values, write {@code + COMMENT codec.collect(PacketCodecs.toCollection(HashSet::new))}. + COMMENT + COMMENT @see #toList + ARG 0 collectionFactory + COMMENT a function that, given the collection's size, returns a new empty collection METHOD method_56375 indexed (Ljava/util/function/IntFunction;Ljava/util/function/ToIntFunction;)Lnet/minecraft/class_9139; - ARG 0 from - ARG 1 to + COMMENT {@return a codec for an indexed value} + COMMENT + COMMENT

    An example of an indexed value is an enum. + COMMENT + COMMENT @see net.minecraft.util.function.ValueLists + COMMENT @see net.minecraft.network.PacketByteBuf#encode(ToIntFunction, Object) + COMMENT @see net.minecraft.network.PacketByteBuf#decode(IntFunction) + ARG 0 indexToValue + COMMENT a function that gets a value from its index + ARG 1 valueToIndex + COMMENT a function that gets a value's index METHOD method_56376 collection (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a collection of values} + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readCollection + COMMENT @see net.minecraft.network.PacketByteBuf#writeCollection ARG 0 factory + COMMENT a function that, given the collection's size, returns a new empty collection ARG 1 elementCodec + COMMENT the codec of the collection's elements METHOD method_56377 map (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a map} + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readMap(IntFunction, PacketDecoder, PacketDecoder) + COMMENT @see net.minecraft.network.PacketByteBuf#writeMap(java.util.Map, PacketEncoder, PacketEncoder) ARG 0 factory + COMMENT a function that, given the map's size, returns a new empty map ARG 1 keyCodec + COMMENT the codec for the map's keys ARG 2 valueCodec + COMMENT the codec for the map's values METHOD method_56378 nbt (Ljava/util/function/Supplier;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for an NBT element} + COMMENT + COMMENT @see #NBT_ELEMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(NbtSizeTracker) + COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(NbtElement) ARG 0 sizeTracker METHOD method_56379 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2520; ARG 0 nbt @@ -54,13 +190,35 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs METHOD method_56381 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; ARG 1 error METHOD method_56382 optional (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + COMMENT {@return a codec wrapping another codec, the value of which is optional} + COMMENT + COMMENT

    This can be used with {@link PacketCodec#collect} like + COMMENT {@code codec.collect(PacketCodecs::optional)}. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readOptional + COMMENT @see net.minecraft.network.PacketByteBuf#writeOptional ARG 0 codec METHOD method_56383 registryEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a reference {@link net.minecraft.registry.entry.RegistryEntry}} + COMMENT + COMMENT

    This codec only works with {@link net.minecraft.network.RegistryByteBuf}, used + COMMENT during the play phase. Consider using {@link #entryOf} for encoding a value of a + COMMENT static registry during login or configuration phases. + COMMENT + COMMENT @implNote The value is serialized as the corresponding raw ID (as {@link #VAR_INT + COMMENT a var int}). This does not handle direct (unregistered) entries. + COMMENT + COMMENT @see #registryValue + COMMENT @see #registryEntry(RegistryKey, PacketCodec) ARG 0 registry METHOD method_56384 (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 1 codec METHOD method_56385 (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 0 codec + CLASS 7 + METHOD method_56419 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V + ARG 3 k + ARG 4 v CLASS 9 METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/PacketDecoder.mapping b/mappings/net/minecraft/network/codec/PacketDecoder.mapping index 370840c930..69c8fc8c47 100644 --- a/mappings/net/minecraft/network/codec/PacketDecoder.mapping +++ b/mappings/net/minecraft/network/codec/PacketDecoder.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_9141 net/minecraft/network/codec/PacketDecoder + COMMENT A functional interface that, given a buffer, decodes a value. + COMMENT + COMMENT

    A constructor taking {@link net.minecraft.network.PacketByteBuf} as an + COMMENT argument can be used as a decoder. + COMMENT + COMMENT @see PacketEncoder + COMMENT @see ValueFirstEncoder METHOD decode (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/PacketEncoder.mapping b/mappings/net/minecraft/network/codec/PacketEncoder.mapping index 22bd7f9fd4..3c2b171ebc 100644 --- a/mappings/net/minecraft/network/codec/PacketEncoder.mapping +++ b/mappings/net/minecraft/network/codec/PacketEncoder.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_9142 net/minecraft/network/codec/PacketEncoder + COMMENT A functional interface that, given a buffer and a value, encodes it. + COMMENT + COMMENT

    A static method taking {@link net.minecraft.network.PacketByteBuf} and the + COMMENT value as the arguments can be used as an encoder. + COMMENT + COMMENT @see PacketDecoder + COMMENT @see ValueFirstEncoder METHOD encode (Ljava/lang/Object;Ljava/lang/Object;)V ARG 1 buf ARG 2 value diff --git a/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping b/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping index ce0f31fdbb..a9d6c0be31 100644 --- a/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping +++ b/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_9143 net/minecraft/network/codec/ValueFirstEncoder + COMMENT A functional interface that, given a value and a buffer, encodes it. + COMMENT + COMMENT

    An instance method taking {@link net.minecraft.network.PacketByteBuf} as an + COMMENT argument can be used as a value-first encoder. + COMMENT + COMMENT @see PacketDecoder + COMMENT @see PacketEncoder METHOD encode (Ljava/lang/Object;Ljava/lang/Object;)V ARG 1 value ARG 2 buf diff --git a/mappings/net/minecraft/network/encoding/StringEncoding.mapping b/mappings/net/minecraft/network/encoding/StringEncoding.mapping index ac356c2865..769946c79c 100644 --- a/mappings/net/minecraft/network/encoding/StringEncoding.mapping +++ b/mappings/net/minecraft/network/encoding/StringEncoding.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_8702 net/minecraft/network/encoding/StringEncoding METHOD method_53012 decode (Lio/netty/buffer/ByteBuf;I)Ljava/lang/String; ARG 0 buf - ARG 1 length + ARG 1 maxLength METHOD method_53013 encode (Lio/netty/buffer/ByteBuf;Ljava/lang/CharSequence;I)V ARG 0 buf ARG 1 string - ARG 2 length + ARG 2 maxLength diff --git a/mappings/net/minecraft/network/handler/DecoderHandler.mapping b/mappings/net/minecraft/network/handler/DecoderHandler.mapping index 5c18a48788..121eb484cc 100644 --- a/mappings/net/minecraft/network/handler/DecoderHandler.mapping +++ b/mappings/net/minecraft/network/handler/DecoderHandler.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_2543 net/minecraft/network/handler/DecoderHandler FIELD field_11715 LOGGER Lorg/slf4j/Logger; + FIELD field_48536 state Lnet/minecraft/class_9127; + METHOD (Lnet/minecraft/class_9127;)V + ARG 1 state METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V + ARG 1 context ARG 2 buf ARG 3 objects diff --git a/mappings/net/minecraft/network/handler/EncoderHandler.mapping b/mappings/net/minecraft/network/handler/EncoderHandler.mapping new file mode 100644 index 0000000000..28d26472c7 --- /dev/null +++ b/mappings/net/minecraft/network/handler/EncoderHandler.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_2545 net/minecraft/network/handler/EncoderHandler + FIELD field_11721 LOGGER Lorg/slf4j/Logger; + FIELD field_48537 state Lnet/minecraft/class_9127; + METHOD (Lnet/minecraft/class_9127;)V + ARG 1 state + METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V + ARG 1 context + ARG 2 packet + ARG 3 out diff --git a/mappings/net/minecraft/network/handler/HandlerNames.mapping b/mappings/net/minecraft/network/handler/HandlerNames.mapping new file mode 100644 index 0000000000..08b1745a20 --- /dev/null +++ b/mappings/net/minecraft/network/handler/HandlerNames.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_9126 net/minecraft/network/handler/HandlerNames + FIELD field_48518 DECOMPRESS Ljava/lang/String; + FIELD field_48519 COMPRESS Ljava/lang/String; + FIELD field_48520 DECODER Ljava/lang/String; + FIELD field_48521 ENCODER Ljava/lang/String; + FIELD field_48522 INBOUND_CONFIG Ljava/lang/String; + FIELD field_48523 OUTBOUND_CONFIG Ljava/lang/String; + FIELD field_48524 SPLITTER Ljava/lang/String; + FIELD field_48525 PREPENDER Ljava/lang/String; + FIELD field_48526 DECRYPT Ljava/lang/String; + FIELD field_48527 ENCRYPT Ljava/lang/String; + FIELD field_48528 UNBUNDLER Ljava/lang/String; + FIELD field_48529 BUNDLER Ljava/lang/String; + FIELD field_48530 PACKET_HANDLER Ljava/lang/String; + FIELD field_48531 TIMEOUT Ljava/lang/String; + FIELD field_48532 LEGACY_QUERY Ljava/lang/String; + FIELD field_48533 LATENCY Ljava/lang/String; diff --git a/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping index 152218ad2d..284a95c1b7 100644 --- a/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping +++ b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_8700 net/minecraft/network/handler/NetworkStateTransitionHandler + METHOD method_56347 onDecoded (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/class_2596;)V + ARG 0 context + ARG 1 packet + METHOD method_56348 onEncoded (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/class_2596;)V + ARG 0 context + ARG 1 packet diff --git a/mappings/net/minecraft/network/handler/NetworkStateTransitions.mapping b/mappings/net/minecraft/network/handler/NetworkStateTransitions.mapping new file mode 100644 index 0000000000..1286a331ee --- /dev/null +++ b/mappings/net/minecraft/network/handler/NetworkStateTransitions.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_9130 net/minecraft/network/handler/NetworkStateTransitions + METHOD method_56352 decoderSwapper (Lio/netty/channel/ChannelInboundHandler;)Lnet/minecraft/class_9130$class_9132; + ARG 0 newDecoder + METHOD method_56353 (Lio/netty/channel/ChannelInboundHandler;Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD method_56354 encoderSwapper (Lio/netty/channel/ChannelOutboundHandler;)Lnet/minecraft/class_9130$class_9134; + ARG 0 newEncoder + METHOD method_56355 (Lio/netty/channel/ChannelOutboundHandler;Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD method_56356 decoderTransitioner (Lnet/minecraft/class_9127;)Lnet/minecraft/class_9130$class_9132; + ARG 0 newState + METHOD method_56357 encoderTransitioner (Lnet/minecraft/class_9127;)Lnet/minecraft/class_9130$class_9134; + ARG 0 newState + CLASS class_9131 InboundConfigurer + METHOD channelRead (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V + ARG 1 context + ARG 2 received + METHOD write (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/channel/ChannelPromise;)V + ARG 1 context + ARG 2 received + ARG 3 promise + CLASS class_9132 DecoderTransitioner + METHOD method_56358 (Lnet/minecraft/class_9130$class_9132;Lio/netty/channel/ChannelHandlerContext;)V + ARG 2 context + METHOD run (Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + CLASS class_9133 OutboundConfigurer + METHOD write (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/channel/ChannelPromise;)V + ARG 1 context + ARG 2 received + ARG 3 promise + CLASS class_9134 EncoderTransitioner + METHOD method_56359 (Lnet/minecraft/class_9130$class_9134;Lio/netty/channel/ChannelHandlerContext;)V + ARG 2 context + METHOD run (Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context diff --git a/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping index 228002cafa..36c47efba6 100644 --- a/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping +++ b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_8039 net/minecraft/network/handler/PacketBundleHandler FIELD field_41878 MAX_PACKETS I METHOD method_48325 create (Lnet/minecraft/class_9145;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_8039; + ARG 0 id ARG 1 bundleFunction ARG 2 splitter METHOD method_48326 createBundler (Lnet/minecraft/class_2596;)Lnet/minecraft/class_8039$class_8040; diff --git a/mappings/net/minecraft/network/handler/PacketBundler.mapping b/mappings/net/minecraft/network/handler/PacketBundler.mapping index f836a14a58..b5f0e5bc7b 100644 --- a/mappings/net/minecraft/network/handler/PacketBundler.mapping +++ b/mappings/net/minecraft/network/handler/PacketBundler.mapping @@ -7,3 +7,5 @@ CLASS net/minecraft/class_8035 net/minecraft/network/handler/PacketBundler ARG 1 context ARG 2 packet ARG 3 packets + METHOD method_56346 ensureNotTransitioning (Lnet/minecraft/class_2596;)V + ARG 0 packet diff --git a/mappings/net/minecraft/network/handler/PacketCodecDispatcher.mapping b/mappings/net/minecraft/network/handler/PacketCodecDispatcher.mapping new file mode 100644 index 0000000000..67ea700e0a --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketCodecDispatcher.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_9136 net/minecraft/network/handler/PacketCodecDispatcher + FIELD field_48576 UNKNOWN_PACKET_INDEX I + FIELD field_48577 packetIdGetter Ljava/util/function/Function; + FIELD field_48578 packetTypes Ljava/util/List; + FIELD field_48579 typeToIndex Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD (Ljava/util/function/Function;Ljava/util/List;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)V + ARG 1 packetIdGetter + ARG 2 packetTypes + ARG 3 typeToIndex + METHOD method_56427 builder (Ljava/util/function/Function;)Lnet/minecraft/class_9136$class_9137; + ARG 0 packetIdGetter + CLASS class_9137 Builder + FIELD field_48580 packetTypes Ljava/util/List; + FIELD field_48581 packetIdGetter Ljava/util/function/Function; + METHOD (Ljava/util/function/Function;)V + ARG 1 packetIdGetter + METHOD method_56428 build ()Lnet/minecraft/class_9136; + METHOD method_56429 add (Ljava/lang/Object;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9136$class_9137; + ARG 1 id + ARG 2 codec + CLASS class_9138 PacketType + FIELD comp_2228 codec Lnet/minecraft/class_9139; + FIELD comp_2229 id Ljava/lang/Object; + METHOD comp_2228 codec ()Lnet/minecraft/class_9139; + METHOD comp_2229 id ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/network/handler/PacketEncoder.mapping b/mappings/net/minecraft/network/handler/PacketEncoder.mapping deleted file mode 100644 index 76b6c2ecfa..0000000000 --- a/mappings/net/minecraft/network/handler/PacketEncoder.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_2545 net/minecraft/network/handler/PacketEncoder - FIELD field_11721 LOGGER Lorg/slf4j/Logger; - METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V - ARG 1 ctx - ARG 2 packet - ARG 3 out diff --git a/mappings/net/minecraft/network/handler/PacketUnbundler.mapping b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping index 7f6c9e8090..acfe517bf9 100644 --- a/mappings/net/minecraft/network/handler/PacketUnbundler.mapping +++ b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_8036 net/minecraft/network/handler/PacketUnbundler + FIELD field_48535 bundleHandler Lnet/minecraft/class_8039; + METHOD (Lnet/minecraft/class_8039;)V + ARG 1 bundleHandler METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V ARG 1 context ARG 2 packet diff --git a/mappings/net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder.mapping b/mappings/net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder.mapping new file mode 100644 index 0000000000..940b483221 --- /dev/null +++ b/mappings/net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_9146 net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder + FIELD field_48614 backingBuilder Lnet/minecraft/class_9136$class_9137; + FIELD field_48615 side Lnet/minecraft/class_2598; + METHOD (Lnet/minecraft/class_2598;)V + ARG 1 side + METHOD method_56445 build ()Lnet/minecraft/class_9139; + METHOD method_56446 add (Lnet/minecraft/class_9145;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9146; + ARG 1 id + ARG 2 codec diff --git a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping index 900ec290dd..9499766a54 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping @@ -1,2 +1,8 @@ CLASS net/minecraft/class_2658 net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket FIELD field_33326 MAX_PAYLOAD_SIZE I + FIELD field_48620 PLAY_CODEC Lnet/minecraft/class_9139; + FIELD field_48621 CONFIGURATION_CODEC Lnet/minecraft/class_9139; + METHOD method_56460 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; + ARG 0 id + METHOD method_56461 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping index f3e63a668a..c3ddd125fd 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping @@ -3,10 +3,12 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello FIELD field_13210 nonce [B FIELD field_13211 publicKey [B FIELD field_48234 CODEC Lnet/minecraft/class_9139; + FIELD field_48235 needsAuthentication Z METHOD (Ljava/lang/String;[B[BZ)V ARG 1 serverId ARG 2 publicKey ARG 3 nonce + ARG 4 needsAuthentication METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12610 getServerId ()Ljava/lang/String; @@ -14,3 +16,4 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello METHOD method_12613 getNonce ()[B METHOD method_56012 write (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56013 needsAuthentication ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping index 1b14c63248..584cd31f94 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2617 net/minecraft/network/packet/s2c/play/StatisticsS2CPacket FIELD comp_2197 stats Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_47899 CODEC Lnet/minecraft/class_9139; + FIELD field_47900 STAT_MAP_CODEC Lnet/minecraft/class_9139; METHOD comp_2197 stats ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping index c10273b0da..5c3cabd35c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping @@ -4,3 +4,5 @@ CLASS net/minecraft/class_2788 net/minecraft/network/packet/s2c/play/Synchronize METHOD (Ljava/util/Collection;)V ARG 1 recipes METHOD method_11998 getRecipes ()Ljava/util/List; + METHOD method_55955 (Lnet/minecraft/class_2788;)Ljava/util/List; + ARG 0 packet diff --git a/mappings/net/minecraft/network/state/ConfigurationStates.mapping b/mappings/net/minecraft/network/state/ConfigurationStates.mapping new file mode 100644 index 0000000000..1ed5d06f86 --- /dev/null +++ b/mappings/net/minecraft/network/state/ConfigurationStates.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9157 net/minecraft/network/state/ConfigurationStates + FIELD field_48698 C2S Lnet/minecraft/class_9127; + FIELD field_48699 S2C Lnet/minecraft/class_9127; + METHOD method_56512 (Lnet/minecraft/class_9147;)V + ARG 0 builder + METHOD method_56513 (Lnet/minecraft/class_9147;)V + ARG 0 builder diff --git a/mappings/net/minecraft/network/state/HandshakeStates.mapping b/mappings/net/minecraft/network/state/HandshakeStates.mapping new file mode 100644 index 0000000000..b0a15d0f10 --- /dev/null +++ b/mappings/net/minecraft/network/state/HandshakeStates.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9097 net/minecraft/network/state/HandshakeStates + FIELD field_48231 C2S Lnet/minecraft/class_9127; diff --git a/mappings/net/minecraft/network/state/LoginStates.mapping b/mappings/net/minecraft/network/state/LoginStates.mapping new file mode 100644 index 0000000000..80814b4ae8 --- /dev/null +++ b/mappings/net/minecraft/network/state/LoginStates.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9099 net/minecraft/network/state/LoginStates + FIELD field_48247 C2S Lnet/minecraft/class_9127; + FIELD field_48248 S2C Lnet/minecraft/class_9127; + METHOD method_56018 (Lnet/minecraft/class_9147;)V + ARG 0 builder + METHOD method_56019 (Lnet/minecraft/class_9147;)V + ARG 0 builder diff --git a/mappings/net/minecraft/network/state/PlayStateFactories.mapping b/mappings/net/minecraft/network/state/PlayStateFactories.mapping new file mode 100644 index 0000000000..e909e8141e --- /dev/null +++ b/mappings/net/minecraft/network/state/PlayStateFactories.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9095 net/minecraft/network/state/PlayStateFactories + FIELD field_48172 C2S Lnet/minecraft/class_9127$class_9128; + FIELD field_48173 S2C Lnet/minecraft/class_9127$class_9128; + METHOD method_55958 (Lnet/minecraft/class_9147;)V + ARG 0 builder + METHOD method_55959 (Lnet/minecraft/class_9147;)V + ARG 0 builder diff --git a/mappings/net/minecraft/network/state/QueryStates.mapping b/mappings/net/minecraft/network/state/QueryStates.mapping new file mode 100644 index 0000000000..933901f95d --- /dev/null +++ b/mappings/net/minecraft/network/state/QueryStates.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9103 net/minecraft/network/state/QueryStates + FIELD field_48263 C2S Lnet/minecraft/class_9127; + FIELD field_48264 S2C Lnet/minecraft/class_9127; + METHOD method_56029 (Lnet/minecraft/class_9147;)V + ARG 0 builder + METHOD method_56030 (Lnet/minecraft/class_9147;)V + ARG 0 builder diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index ea6998daa7..c1ca9732ff 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -450,6 +450,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_54834 getAverageNanosPerTick ()J METHOD method_54835 getTickTimes ()[J METHOD method_54837 getAutosaveInterval ()I + METHOD method_56040 acceptsTransfers ()Z CLASS class_6414 DebugStart FIELD field_33980 time J FIELD field_33981 tick I diff --git a/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping index acf0c45870..0429bfa0bd 100644 --- a/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping @@ -5,3 +5,6 @@ CLASS net/minecraft/class_3246 net/minecraft/server/network/ServerHandshakeNetwo METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V ARG 1 server ARG 2 connection + METHOD method_56048 login (Lnet/minecraft/class_2889;Z)V + ARG 1 packet + ARG 2 transfer diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 9995d97309..94f01b41f6 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -23,9 +23,11 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_29779 TIMEOUT_TICKS I FIELD field_45028 profileName Ljava/lang/String; FIELD field_45029 profile Lcom/mojang/authlib/GameProfile; + FIELD field_48275 transferred Z METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Z)V ARG 1 server ARG 2 connection + ARG 3 transferred METHOD method_14380 disconnect (Lnet/minecraft/class_2561;)V ARG 1 reason METHOD method_14383 getConnectionInfo ()Ljava/lang/String; From 46d17a733a17cb0f7a1b7aef4df720abd1b2eaf7 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:06:56 +0900 Subject: [PATCH 15/47] 24w03a/b more stuff (#3767) * 24w03a/b more stuff * Javadocs, bug fixes, etc * More stuff --- .../net/minecraft/block/AbstractBlock.mapping | 10 ++-- .../block/cauldron/CauldronBehavior.mapping | 2 +- .../client/font/FreeTypeUtil.mapping | 15 +++++ .../client/font/RenderableGlyph.mapping | 2 + .../client/font/TrueTypeFont.mapping | 11 +++- .../client/gui/hud/InGameHud.mapping | 4 ++ .../AccessibilityOnboardingScreen.mapping | 1 + .../client/gui/screen/Screen.mapping | 1 + .../SocialInteractionsPlayerListEntry.mapping | 1 + .../gui/screen/world/EditWorldScreen.mapping | 3 + .../client/gui/tooltip/TooltipState.mapping | 20 +++++++ .../client/gui/widget/ClickableWidget.mapping | 1 + .../screen/RealmsCreateWorldScreen.mapping | 8 +++ .../gui/screen/RealmsMainScreen.mapping | 4 ++ .../gui/screen/RealmsUploadScreen.mapping | 12 ++++ .../client/render/GameRenderer.mapping | 11 +++- .../client/texture/NativeImage.mapping | 2 + .../client/world/ClientWorld.mapping | 1 + .../command/EntitySelectorOptions.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 2 +- .../entity/EntityAttachmentType.mapping | 4 ++ .../net/minecraft/entity/EntityType.mapping | 8 +++ .../net/minecraft/entity/LivingEntity.mapping | 2 + .../entity/ai/brain/task/BreedTask.mapping | 6 ++ .../ai/brain/task/LookTargetUtil.mapping | 2 + .../minecraft/entity/data/DataTracker.mapping | 3 + .../entity/effect/StatusEffect.mapping | 2 +- .../entity/player/PlayerEntity.mapping | 27 +++++++-- mappings/net/minecraft/item/Item.mapping | 4 +- mappings/net/minecraft/item/ItemStack.mapping | 56 +++++++++++-------- .../recipe/CookingRecipeSerializer.mapping | 2 +- .../minecraft/recipe/RecipeManager.mapping | 1 - .../net/minecraft/registry/Registry.mapping | 2 + ...ingWorldGenerationProgressListener.mapping | 1 + .../dedicated/ServerPropertiesHandler.mapping | 1 + .../server/world/ServerWorld.mapping | 1 + .../net/minecraft/sound/SoundEvent.mapping | 2 + .../net/minecraft/village/TradeOffer.mapping | 4 +- .../net/minecraft/world/WorldEvents.mapping | 2 +- unpick-definitions/world_events.unpick | 1 - 40 files changed, 195 insertions(+), 49 deletions(-) create mode 100644 mappings/net/minecraft/client/font/FreeTypeUtil.mapping create mode 100644 mappings/net/minecraft/client/gui/tooltip/TooltipState.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 00b6e4ef47..d8cfc4edc4 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -384,8 +384,8 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 state METHOD method_9514 randomTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V COMMENT Called server-side when a block gets ticked randomly. This can be overridden to implement - COMMENT various logics, most commonly plant growth. Default implementation calls - COMMENT {@link #scheduledTick}. To control the rate of the action, use {@code random}. + COMMENT various logics, most commonly plant growth. Default implementation does + COMMENT nothing. To control the rate of the action, use {@code random}. COMMENT COMMENT

    Random tick speed is controlled by the game rule {@link COMMENT net.minecraft.world.GameRules#RANDOM_TICK_SPEED randomTickSpeed} and can be disabled. @@ -693,16 +693,14 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 world ARG 3 pos METHOD method_9584 getRaycastShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; - COMMENT @see @link AbstractBlockState#getRaycastShape + COMMENT @see AbstractBlockState#getRaycastShape ARG 1 state ARG 2 world ARG 3 pos METHOD method_9588 scheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V COMMENT Called server-side when a block receives a scheduled tick. This can be used like a timer. COMMENT Scheduled ticks are added using {@link - COMMENT WorldAccess#scheduleBlockTick(BlockPos, Block, int)}. Additionally, {@link - COMMENT #randomTick} by default calls this method; override {@link #randomTick} to disable this - COMMENT behavior. + COMMENT WorldAccess#scheduleBlockTick(BlockPos, Block, int)}. COMMENT COMMENT

    Scheduled ticks are often used inside {@link #getStateForNeighborUpdate}. COMMENT diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index 11ae5e679a..c5fe186d9b 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -129,7 +129,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_9062; COMMENT Empties a cauldron if it's full. COMMENT - COMMENT @return a {@linkplain ItemActionResult#isAccepted successful} action result if emptied, {@link ItemActionResult#ASS_TO_DEFAULT_BLOCK_INTERACTION} otherwise + COMMENT @return a {@linkplain ItemActionResult#isAccepted successful} action result if emptied, {@link ItemActionResult#PASS_TO_DEFAULT_BLOCK_INTERACTION} otherwise ARG 0 state COMMENT the cauldron block state ARG 1 world diff --git a/mappings/net/minecraft/client/font/FreeTypeUtil.mapping b/mappings/net/minecraft/client/font/FreeTypeUtil.mapping new file mode 100644 index 0000000000..75f7c9c9ad --- /dev/null +++ b/mappings/net/minecraft/client/font/FreeTypeUtil.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_9111 net/minecraft/client/font/FreeTypeUtil + FIELD field_48394 freeType J + METHOD method_56143 initialize ()J + METHOD method_56144 getErrorMessage (I)Ljava/lang/String; + ARG 0 code + METHOD method_56145 checkError (ILjava/lang/String;)V + ARG 0 code + ARG 1 description + METHOD method_56146 getX (Lorg/lwjgl/util/freetype/FT_Vector;)F + ARG 0 vec + METHOD method_56147 set (Lorg/lwjgl/util/freetype/FT_Vector;FF)Lorg/lwjgl/util/freetype/FT_Vector; + ARG 0 vec + ARG 1 x + ARG 2 y + METHOD method_56148 release ()V diff --git a/mappings/net/minecraft/client/font/RenderableGlyph.mapping b/mappings/net/minecraft/client/font/RenderableGlyph.mapping index f6bf68dc03..bbbdbc4ae2 100644 --- a/mappings/net/minecraft/client/font/RenderableGlyph.mapping +++ b/mappings/net/minecraft/client/font/RenderableGlyph.mapping @@ -10,3 +10,5 @@ CLASS net/minecraft/class_383 net/minecraft/client/font/RenderableGlyph METHOD method_2033 hasColor ()Z METHOD method_2034 getXMin ()F METHOD method_2035 getOversample ()F + METHOD method_56129 getBearingX ()F + METHOD method_56130 getAscent ()F diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping index ab679007cc..03322ceb06 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFont.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping @@ -2,9 +2,13 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont FIELD field_21839 buffer Ljava/nio/ByteBuffer; FIELD field_2319 excludedCharacters Lit/unimi/dsi/fastutil/ints/IntSet; FIELD field_2321 oversample F + FIELD field_48383 face Lorg/lwjgl/util/freetype/FT_Face; METHOD (Ljava/nio/ByteBuffer;Lorg/lwjgl/util/freetype/FT_Face;FFFFLjava/lang/String;)V ARG 1 buffer + ARG 2 face + ARG 3 size ARG 4 oversample + ARG 5 shiftX ARG 6 shiftY ARG 7 excludedCharacters METHOD method_51884 getInfo ()Lorg/lwjgl/util/freetype/FT_Face; @@ -16,6 +20,9 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont FIELD field_2337 height I FIELD field_2338 width I METHOD (Lnet/minecraft/class_395;FFIIFI)V - ARG 4 y2 - ARG 5 y1 + ARG 2 bearingX + ARG 3 ascent + ARG 4 width + ARG 5 height ARG 6 advance + ARG 7 glyphIndex diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 6528bfec6b..fb6a271ad4 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -237,6 +237,10 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_55808 (Lnet/minecraft/class_332;F)V ARG 1 context ARG 2 tickDelta + METHOD method_56135 shouldRenderExperience ()Z + METHOD method_56136 renderExperienceLevel (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 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/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping index d14b1572aa..4decaa170c 100644 --- a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_8032 net/minecraft/client/gui/screen/AccessibilityOnbo FIELD field_41845 textWidget Lnet/minecraft/class_8019; FIELD field_42038 isNarratorUsable Z FIELD field_46008 onClose Ljava/lang/Runnable; + FIELD field_48395 narratorWidget Lnet/minecraft/class_339; METHOD (Lnet/minecraft/class_315;Ljava/lang/Runnable;)V ARG 1 gameOptions ARG 2 onClose diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index ae31ec55f6..a6f764bda0 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -169,6 +169,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen COMMENT Renders the translucent background gradient used as the in-game screen background. ARG 1 context METHOD method_53870 getUsageNarrationText ()Lnet/minecraft/class_2561; + METHOD method_56131 setInitialFocus ()V CLASS class_6390 SelectedElementNarrationData FIELD field_33825 selectable Lnet/minecraft/class_6379; FIELD field_33826 index I diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index b29e63b779..2f8f1b6b02 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_26907 OFFLINE_TEXT Lnet/minecraft/class_2561; FIELD field_26908 HIDDEN_OFFLINE_TEXT Lnet/minecraft/class_2561; FIELD field_26909 BLOCKED_OFFLINE_TEXT Lnet/minecraft/class_2561; + FIELD field_32418 TOOLTIP_DELAY Ljava/time/Duration; FIELD field_33837 hideText Lnet/minecraft/class_2561; FIELD field_33838 showText Lnet/minecraft/class_2561; FIELD field_39622 reportButton Lnet/minecraft/class_4185; diff --git a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping index 2a71d733a8..5f75fa18eb 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScr FIELD field_46891 CONFIRM_DESCRIPTION_TEXT Lnet/minecraft/class_2561; FIELD field_46892 SAVE_TEXT Lnet/minecraft/class_2561; FIELD field_46896 layout Lnet/minecraft/class_8667; + FIELD field_48397 nameFieldWidget Lnet/minecraft/class_342; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Ljava/lang/String;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;)V ARG 1 client ARG 2 session @@ -38,6 +39,8 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScr ARG 1 button METHOD method_54602 (Lnet/minecraft/class_4185;Ljava/lang/String;)V ARG 1 name + METHOD method_54603 (Lnet/minecraft/class_4185;)V + ARG 1 button METHOD method_54604 (Lnet/minecraft/class_524;Lnet/minecraft/class_364;)V ARG 1 child METHOD method_54606 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipState.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipState.mapping new file mode 100644 index 0000000000..8e5043499c --- /dev/null +++ b/mappings/net/minecraft/client/gui/tooltip/TooltipState.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_9110 net/minecraft/client/gui/tooltip/TooltipState + FIELD field_48390 tooltip Lnet/minecraft/class_7919; + FIELD field_48391 delay Ljava/time/Duration; + FIELD field_48392 renderCheckTime J + FIELD field_48393 prevShouldRender Z + METHOD method_56137 getTooltip ()Lnet/minecraft/class_7919; + METHOD method_56138 setTooltip (Lnet/minecraft/class_7919;)V + ARG 1 tooltip + METHOD method_56139 appendNarrations (Lnet/minecraft/class_6382;)V + ARG 1 builder + METHOD method_56140 createPositioner (Lnet/minecraft/class_8030;ZZ)Lnet/minecraft/class_8000; + ARG 1 focus + ARG 2 hovered + ARG 3 focused + METHOD method_56141 setDelay (Ljava/time/Duration;)V + ARG 1 delay + METHOD method_56142 render (ZZLnet/minecraft/class_8030;)V + ARG 1 hovered + ARG 2 focused + ARG 3 focus diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 2f5d9ad25e..404852b0ef 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -62,6 +62,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget METHOD method_47400 setTooltip (Lnet/minecraft/class_7919;)V ARG 1 tooltip METHOD method_47402 setTooltipDelay (Ljava/time/Duration;)V + ARG 1 tooltipDelay METHOD method_48579 renderWidget (Lnet/minecraft/class_332;IIF)V ARG 1 context ARG 2 mouseX diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping index b1d978a17c..a150b55239 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping @@ -88,3 +88,11 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea ARG 1 task CLASS class_4411 FrameButton FIELD field_20032 image Lnet/minecraft/class_2960; + FIELD field_46130 TEXTURE_SIZE I + 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_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V + ARG 2 message + ARG 3 image + ARG 4 onPress diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index fe82d5a77f..9200eaa453 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -293,9 +293,13 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_46676 START_TEXT Lnet/minecraft/class_2561; FIELD field_46678 tooltip Lnet/minecraft/class_9110; FIELD field_46679 server Lnet/minecraft/class_4877; + METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V + ARG 2 server METHOD method_54343 (Lnet/minecraft/class_8816;)V ARG 1 screen METHOD method_54344 showPopup ()V CLASS class_8841 ParentRealmSelectionListEntry FIELD field_46684 server Lnet/minecraft/class_4877; FIELD field_46685 tooltip Lnet/minecraft/class_9110; + METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V + ARG 2 server diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping index 4e1521add5..026012e794 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping @@ -22,6 +22,14 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo FIELD field_20196 UPLOAD_LOCK Ljava/util/concurrent/locks/ReentrantLock; FIELD field_20503 statusTexts [Lnet/minecraft/class_2561; FIELD field_26526 VERIFYING_TEXT Lnet/minecraft/class_2561; + FIELD field_48388 creationTask Lnet/minecraft/class_4445; + FIELD field_48389 layout Lnet/minecraft/class_8132; + METHOD (Lnet/minecraft/class_4445;JILnet/minecraft/class_4410;Lnet/minecraft/class_34;)V + ARG 1 creationTask + ARG 2 worldId + ARG 4 slotId + ARG 5 parent + ARG 6 selectedLevel METHOD method_21515 verify (Ljava/io/File;)Z ARG 1 archive METHOD method_21516 addFileToTarGz (Lorg/apache/commons/compress/archivers/tar/TarArchiveOutputStream;Ljava/lang/String;Ljava/lang/String;Z)V @@ -42,6 +50,8 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo ARG 1 context METHOD method_21536 upload ()V METHOD method_21538 uploadCancelled ()V + METHOD method_22105 (Lnet/minecraft/class_4429;)V + ARG 1 result METHOD method_25276 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25277 (Lnet/minecraft/class_4185;)V @@ -49,3 +59,5 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo METHOD method_27460 setStatusTexts ([Lnet/minecraft/class_2561;)V ARG 1 statusTexts METHOD method_37014 getNarration ()Lnet/minecraft/class_2561; + METHOD method_56133 (Lnet/minecraft/class_4427;Lnet/minecraft/class_364;)V + ARG 1 child diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 3eded9f428..c5f78e4f2c 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -149,7 +149,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 4 matrices METHOD method_3189 showFloatingItem (Lnet/minecraft/class_1799;)V ARG 1 floatingItem - METHOD method_3190 updateTargetedEntity (F)V + METHOD method_3190 updateCrosshairTarget (F)V ARG 1 tickDelta METHOD method_3192 render (FJZ)V ARG 1 tickDelta @@ -396,6 +396,15 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_55249 getRenderTypeBreezeWindProgram ()Lnet/minecraft/class_5944; METHOD method_55250 (Lnet/minecraft/class_5944;)V ARG 0 program + METHOD method_56153 findCrosshairTarget (Lnet/minecraft/class_1297;DDF)Lnet/minecraft/class_239; + ARG 1 camera + ARG 2 blockInteractionRange + ARG 4 entityInteractionRange + ARG 6 tickDelta + METHOD method_56154 ensureTargetInRange (Lnet/minecraft/class_239;Lnet/minecraft/class_243;D)Lnet/minecraft/class_239; + ARG 0 hitResult + ARG 1 cameraPos + ARG 2 interactionRange CLASS 1 METHOD method_45775 (Lnet/minecraft/class_2960;)Z ARG 0 id diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index 63689738d1..a9d87f4b92 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -132,6 +132,8 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 1 x ARG 2 y METHOD method_4316 makeGlyphBitmapSubpixel (Lorg/lwjgl/util/freetype/FT_Face;I)V + ARG 1 face + ARG 2 glyphIndex METHOD method_4317 copyFrom (Lnet/minecraft/class_1011;)V ARG 1 image METHOD method_4318 getFormat ()Lnet/minecraft/class_1011$class_1012; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index be4984b921..1d8264b013 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -170,6 +170,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_24442 difficultyLocked Z FIELD field_24607 flatWorld Z FIELD field_26372 spawnAngle F + FIELD field_48402 spawnPos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_1267;ZZ)V ARG 1 difficulty ARG 2 hardcore diff --git a/mappings/net/minecraft/command/EntitySelectorOptions.mapping b/mappings/net/minecraft/command/EntitySelectorOptions.mapping index 4ceff7b2b8..09d39ae31c 100644 --- a/mappings/net/minecraft/command/EntitySelectorOptions.mapping +++ b/mappings/net/minecraft/command/EntitySelectorOptions.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions METHOD method_9919 (Lnet/minecraft/class_1299;ZLnet/minecraft/class_1297;)Z ARG 2 entity METHOD method_9920 (Ljava/lang/String;ZLnet/minecraft/class_1297;)Z - ARG 2 readerx + ARG 2 entity METHOD method_9921 (Lnet/minecraft/class_2303;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder ARG 2 consumer diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 720e00d8f8..c452567813 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -690,7 +690,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_32876 emitGameEvent (Lnet/minecraft/class_6880;)V COMMENT Emits a game event originating from this entity at this entity's position. COMMENT - COMMENT @see #emitGameEvent(GameEvent, Entity) + COMMENT @see #emitGameEvent(RegistryEntry, Entity) ARG 1 event METHOD method_33189 occludeVibrationSignals ()Z COMMENT {@return whether the entity should not emit vibrations} diff --git a/mappings/net/minecraft/entity/EntityAttachmentType.mapping b/mappings/net/minecraft/entity/EntityAttachmentType.mapping index 8647206a95..468093a2d1 100644 --- a/mappings/net/minecraft/entity/EntityAttachmentType.mapping +++ b/mappings/net/minecraft/entity/EntityAttachmentType.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_9064 net/minecraft/entity/EntityAttachmentType FIELD field_47748 NONE Ljava/util/List; FIELD field_47749 ZERO Lnet/minecraft/class_9064$class_9065; FIELD field_47750 AT_HEIGHT Lnet/minecraft/class_9064$class_9065; + FIELD field_48321 WARDEN_CHEST Lnet/minecraft/class_9064$class_9065; METHOD create (FF)Ljava/util/List; ARG 1 width ARG 2 height @@ -18,3 +19,6 @@ CLASS net/minecraft/class_9064 net/minecraft/entity/EntityAttachmentType METHOD method_55672 (FF)Ljava/util/List; ARG 0 width ARG 1 height + METHOD method_56074 (FF)Ljava/util/List; + ARG 0 width + ARG 1 height diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index b8b1d0fde2..fc069ec9b8 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -212,6 +212,14 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 offsetY METHOD method_55692 nameTagAttachment (F)Lnet/minecraft/class_1299$class_1300; ARG 1 offsetY + METHOD method_56075 attachment (Lnet/minecraft/class_9064;FFF)Lnet/minecraft/class_1299$class_1300; + ARG 1 type + ARG 2 offsetX + ARG 3 offsetY + ARG 4 offsetZ + METHOD method_56076 attachment (Lnet/minecraft/class_9064;Lnet/minecraft/class_243;)Lnet/minecraft/class_1299$class_1300; + ARG 1 type + ARG 2 offset METHOD method_5900 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index c264e04e59..598f1f4cdd 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -362,6 +362,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_55693 getScale ()F METHOD method_55694 getBaseDimensions (Lnet/minecraft/class_4050;)Lnet/minecraft/class_4048; ARG 1 pose + METHOD method_56077 clampScale (F)F + ARG 1 scale METHOD method_56078 playSound (Lnet/minecraft/class_3414;)V ARG 1 sound METHOD method_56079 getSlotForHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1304; diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping index a8925a545f..b10829ea12 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping @@ -5,8 +5,14 @@ CLASS net/minecraft/class_4806 net/minecraft/entity/ai/brain/task/BreedTask FIELD field_30104 MAX_RANGE I FIELD field_30105 MIN_BREED_TIME I FIELD field_30106 RUN_TIME I + FIELD field_48327 approachDistance I + FIELD field_48328 DEFAULT_APPROACH_DISTANCE I METHOD (Lnet/minecraft/class_1299;)V ARG 1 targetType + METHOD (Lnet/minecraft/class_1299;FI)V + ARG 1 targetType + ARG 2 speed + ARG 3 approachDistance METHOD method_24542 getBreedTarget (Lnet/minecraft/class_1429;)Lnet/minecraft/class_1429; ARG 1 animal METHOD method_24545 (Lnet/minecraft/class_1429;Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping index 29ab58d7c2..1a3ca7d578 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil ARG 0 first ARG 1 second ARG 2 speed + ARG 3 walkCompletionRange METHOD method_19550 canSee (Lnet/minecraft/class_4095;Lnet/minecraft/class_1309;)Z ARG 0 brain ARG 1 target @@ -24,6 +25,7 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil ARG 0 first ARG 1 second ARG 2 speed + ARG 3 completionRange METHOD method_19949 give (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_243;)V ARG 0 entity ARG 1 stack diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index a991ded472..3a6f1b5fbf 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -63,8 +63,11 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker ARG 0 data ARG 1 value METHOD method_46361 write (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_46362 fromBuf (Lnet/minecraft/class_9129;I)Lnet/minecraft/class_2945$class_7834; + ARG 0 buf ARG 1 id METHOD method_46363 fromBuf (Lnet/minecraft/class_9129;ILnet/minecraft/class_2941;)Lnet/minecraft/class_2945$class_7834; + ARG 0 buf ARG 1 id ARG 2 handler diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index f9986fc238..84aca60ebe 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect METHOD method_55651 (Ljava/util/function/BiConsumer;ILnet/minecraft/class_6880;Lnet/minecraft/class_1291$class_8634;)V ARG 3 attribute ARG 4 modifier - METHOD method_55652 getFadeOutTicks ()I + METHOD method_55652 getFadeTicks ()I METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_6880;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291; ARG 1 attribute ARG 2 uuid diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 41750473bc..706bb401a7 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -63,8 +63,13 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 6 refreshable METHOD method_17355 openHandledScreen (Lnet/minecraft/class_3908;)Ljava/util/OptionalInt; ARG 1 factory - METHOD method_17356 playSound (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V - ARG 1 event + METHOD method_17356 playSoundToPlayer (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V + COMMENT Plays {@code sound} to this player only. + COMMENT + COMMENT

    Use {@link #playSound(SoundEvent, float, float)} to play sound that can be heard by + COMMENT nearby players. Unlike that method, this method should be called on only one side + COMMENT (i.e. either the server or the client, alone). + ARG 1 sound ARG 2 category ARG 3 volume ARG 4 pitch @@ -140,14 +145,26 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_55754 getBlockInteractionRange ()D METHOD method_55755 getEntityInteractionRange ()D METHOD method_56092 canInteractWithEntityIn (Lnet/minecraft/class_238;D)Z + COMMENT {@return whether the player can interact with entity whose bounding box + COMMENT is {@code box}} ARG 1 box - ARG 2 range + ARG 2 additionalRange + COMMENT the player's additional interaction range added to {@linkplain + COMMENT #getEntityInteractionRange the default range} METHOD method_56093 canInteractWithBlockAt (Lnet/minecraft/class_2338;D)Z + COMMENT {@return whether the player can interact with block at {@code pos}} ARG 1 pos - ARG 2 range + ARG 2 additionalRange + COMMENT the player's additional interaction range added to {@linkplain + COMMENT #getBlockInteractionRange the default range} METHOD method_56094 canInteractWithEntity (Lnet/minecraft/class_1297;D)Z + COMMENT {@return whether the player can interact with {@code entity}} + COMMENT + COMMENT

    This returns {@code false} for {@linkplain Entity#isRemoved removed} entities. ARG 1 entity - ARG 2 range + ARG 2 additionalRange + COMMENT the player's additional interaction range added to {@linkplain + COMMENT #getEntityInteractionRange the default range} METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 88fb75bd5e..3e31438763 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -323,7 +323,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT

    Tools and melee weapons should override this to damage the stack. COMMENT COMMENT @return whether the item's use stat should be incremented - COMMENT @see ItemStack#damage(int, LivingEntity, java.util.function.Consumer) + COMMENT @see ItemStack#damage(int, LivingEntity, EquipmentSlot) ARG 1 stack ARG 2 target ARG 3 attacker @@ -347,7 +347,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT COMMENT @return whether the item's use stat should be incremented COMMENT @see net.minecraft.block.AbstractBlock.AbstractBlockState#getHardness - COMMENT @see ItemStack#damage(int, LivingEntity, java.util.function.Consumer) + COMMENT @see ItemStack#damage(int, LivingEntity, EquipmentSlot) ARG 1 stack ARG 2 world ARG 3 state diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 0c1bc76e90..2051c4935a 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -259,6 +259,14 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_55067 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_56098 isUnbreakable ()Z + COMMENT {@return whether the item stack can never be broken} + COMMENT + COMMENT

    Item stacks with {@value #UNBREAKABLE_KEY} NBT set to {@code 1b} cannot be damaged. + COMMENT + COMMENT @see Item#getMaxDamage + COMMENT @see #isDamaged + COMMENT @see #getDamage + COMMENT @see #isDamageable METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT @@ -454,24 +462,23 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT {@return a text consisting of the bracketed {@linkplain #getName stack name} that COMMENT can be hovered to show the item stack's tooltip} METHOD method_7956 damage (ILnet/minecraft/class_5819;Lnet/minecraft/class_3222;Ljava/lang/Runnable;)V - COMMENT Damages this item stack. This method should be used when an entity, including a player, - COMMENT damages the stack. This does not damage {@linkplain #isDamageable non-damageable} + COMMENT Damages this item stack. This method should be used when a non-entity, such as a + COMMENT dispenser, damages the stack. This does not damage {@linkplain #isDamageable non-damageable} COMMENT stacks, and the {@linkplain net.minecraft.enchantment.UnbreakingEnchantment - COMMENT unbreaking enchantment} is applied to {@code amount} before damaging. Additionally, - COMMENT if {@code entity} is a player in creative mode, the stack will not be damaged. + COMMENT unbreaking enchantment} is applied to {@code amount} before damaging. COMMENT - COMMENT

    If {@code entity} is a player, this triggers {@link + COMMENT

    If {@code player} is not {@code null}, this triggers {@link COMMENT net.minecraft.advancement.criterion.Criteria#ITEM_DURABILITY_CHANGED}. COMMENT - COMMENT

    If the stack's damage is equal to or above {@linkplain Item#getMaxDamage the maximum - COMMENT damage} (i.e. the item is "broken"), this will call {@code breakCallback}, decrement the - COMMENT stack, and increment {@link net.minecraft.stat.Stats#BROKEN} if the stack is held - COMMENT by a player. The callback should call {@link LivingEntity#sendEquipmentBreakStatus} - COMMENT or {@link LivingEntity#sendToolBreakStatus}. + COMMENT

    When the item "breaks", that is, the stack's damage is equal to or above + COMMENT {@linkplain Item#getMaxDamage the maximum damage}, {@code breakCallback} is run. + COMMENT Callers should decrement the stack size inside the callback. ARG 1 amount ARG 2 random - ARG 3 entity + ARG 3 player + COMMENT the player that damaged the stack, or {@code null} if no player is involved ARG 4 breakCallback + COMMENT a callback run when the item "breaks" METHOD method_7958 hasGlint ()Z METHOD method_7959 setSubNbt (Ljava/lang/String;Lnet/minecraft/class_2520;)V COMMENT Sets the given NBT element in the item stack's custom NBT at the specified key. @@ -498,6 +505,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see Item#getMaxDamage COMMENT @see #isDamaged COMMENT @see #getDamage + COMMENT @see #isUnbreakable METHOD method_7964 getName ()Lnet/minecraft/class_2561; COMMENT {@return the custom name of the stack if it exists, or the item's name} METHOD method_7965 getBobbingAnimationTime ()I @@ -509,22 +517,24 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @see Item Stack NBT Operations METHOD method_7970 damage (ILnet/minecraft/class_1309;Lnet/minecraft/class_1304;)V - COMMENT Damages this item stack. This method should be used when a non-entity, such as a - COMMENT dispenser, damages the stack. This does not damage {@linkplain #isDamageable non-damageable} + COMMENT Damages this item stack. This method should be used when an entity, including a player, + COMMENT damages the stack. This does not damage {@linkplain #isDamageable non-damageable} COMMENT stacks, and the {@linkplain net.minecraft.enchantment.UnbreakingEnchantment - COMMENT unbreaking enchantment} is applied to {@code amount} before damaging. + COMMENT unbreaking enchantment} is applied to {@code amount} before damaging. Additionally, + COMMENT if {@code entity} is a player in creative mode, the stack will not be damaged. COMMENT - COMMENT

    If {@code player} is not {@code null}, this triggers {@link + COMMENT

    If {@code entity} is a player, this triggers {@link COMMENT net.minecraft.advancement.criterion.Criteria#ITEM_DURABILITY_CHANGED}. COMMENT - COMMENT

    This method does not decrement the item count when the item "breaks". Callers should - COMMENT check the returned value and decrement themselves. - COMMENT - COMMENT @return whether the stack's damage is equal to or above {@linkplain Item#getMaxDamage - COMMENT the maximum damage} (i.e. whether the item is "broken") + COMMENT

    If the stack's damage is equal to or above {@linkplain Item#getMaxDamage the maximum + COMMENT damage} (i.e. the item is "broken"), this will {@linkplain + COMMENT LivingEntity#sendEquipmentBreakStatus send the equipment break status}, decrement the + COMMENT stack, and increment {@link net.minecraft.stat.Stats#BROKEN} if the stack is held + COMMENT by a player. ARG 1 amount ARG 2 entity ARG 3 slot + COMMENT the slot in which the stack is held METHOD method_7971 split (I)Lnet/minecraft/class_1799; COMMENT {@return the copy of the stack "split" from the current stack with item count COMMENT being at most {@code amount}} @@ -558,11 +568,11 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT Sets the stack's damage to {@code damage}. COMMENT COMMENT

    This does not break the item if the damage reaches {@linkplain Item#getMaxDamage - COMMENT the maximum}, unlike {@link #damage(int, LivingEntity, Consumer)}. + COMMENT the maximum}, unlike {@link #damage(int, LivingEntity, EquipmentSlot)}. COMMENT COMMENT @see #getDamage - COMMENT @see #damage(int, Random, ServerPlayerEntity) - COMMENT @see #damage(int, LivingEntity, Consumer) + COMMENT @see #damage(int, Random, ServerPlayerEntity, Runnable) + COMMENT @see #damage(int, LivingEntity, EquipmentSlot) ARG 1 damage METHOD method_7976 getUseAction ()Lnet/minecraft/class_1839; METHOD method_7977 setCustomName (Lnet/minecraft/class_2561;)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping index d9dda52b1b..1235e2b53d 100644 --- a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3957 net/minecraft/recipe/CookingRecipeSerializer FIELD field_17552 recipeFactory Lnet/minecraft/class_1874$class_3958; FIELD field_46105 codec Lcom/mojang/serialization/Codec; - FIELD field_48361 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48361 packetCodec Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1874$class_3958;I)V ARG 1 recipeFactory ARG 2 cookingTime diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index fa50b3bf69..ad219798c2 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -21,7 +21,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT COMMENT @throws com.google.gson.JsonParseException if the recipe JSON is invalid COMMENT @return the read recipe - COMMENT @see RecipeSerializer#read ARG 0 id COMMENT the recipe's ID ARG 1 json diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index 517502a937..ffec291a6b 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -285,6 +285,8 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry METHOD method_55841 getEntry (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id METHOD method_56159 getRandomEntry (Lnet/minecraft/class_6862;Lnet/minecraft/class_5819;)Ljava/util/Optional; + COMMENT {@return a random entry from {@code tag}, or an empty {@link Optional} if the + COMMENT tag is empty} ARG 1 tag ARG 2 random METHOD method_56160 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/server/QueueingWorldGenerationProgressListener.mapping b/mappings/net/minecraft/server/QueueingWorldGenerationProgressListener.mapping index 63533e9a69..2cd52271f0 100644 --- a/mappings/net/minecraft/server/QueueingWorldGenerationProgressListener.mapping +++ b/mappings/net/minecraft/server/QueueingWorldGenerationProgressListener.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3952 net/minecraft/server/QueueingWorldGenerationProgressListener FIELD field_17472 progressListener Lnet/minecraft/class_3949; FIELD field_17473 queue Lnet/minecraft/class_3846; + FIELD field_48272 running Z METHOD (Lnet/minecraft/class_3949;Ljava/util/concurrent/Executor;)V ARG 1 progressListener ARG 2 executor diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index 0c9121559c..8396a31dda 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -54,6 +54,7 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_39982 COMMA_SPLITTER Lcom/google/common/base/Splitter; FIELD field_39983 worldGenProperties Lnet/minecraft/class_3806$class_7044; FIELD field_44985 logIps Z + FIELD field_48270 acceptsTransfers Z METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806; ARG 0 path METHOD method_16715 (Ljava/lang/Integer;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index acd3cde76d..bd3ca19026 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -35,6 +35,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_41750 RAIN_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; FIELD field_41751 THUNDER_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; FIELD field_44857 randomSequences Lnet/minecraft/class_8565; + FIELD field_48271 spawnChunkRadius I METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;ZLnet/minecraft/class_8565;)V ARG 1 server ARG 2 workerExecutor diff --git a/mappings/net/minecraft/sound/SoundEvent.mapping b/mappings/net/minecraft/sound/SoundEvent.mapping index 54cba73fd3..5e03140c60 100644 --- a/mappings/net/minecraft/sound/SoundEvent.mapping +++ b/mappings/net/minecraft/sound/SoundEvent.mapping @@ -22,4 +22,6 @@ CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent METHOD method_47956 of (Lnet/minecraft/class_2960;Ljava/util/Optional;)Lnet/minecraft/class_3414; ARG 0 id ARG 1 distanceToTravel + METHOD method_47957 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_47959 getStaticDistanceToTravel ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 68cab0c67d..bd83edd3de 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -108,9 +108,9 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer COMMENT

    Checks if the number of times this trade offer has been used COMMENT is greater than 0. METHOD method_53881 copy ()Lnet/minecraft/class_1914; - METHOD method_56110 write (Lnet/minecraft/class_9129;)Lnet/minecraft/class_1914; + METHOD method_56110 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_1914; ARG 0 buf - METHOD method_56111 read (Lnet/minecraft/class_9129;Lnet/minecraft/class_1914;)V + METHOD method_56111 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_1914;)V ARG 0 buf ARG 1 offer METHOD method_56112 shouldIgnoreNbt ()Z diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index e31a8dcc01..99d70cbe29 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -102,7 +102,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT An item is composted in a composter. COMMENT
    Plays the appropriate composting sound event and spawns composter particles. COMMENT

    A {@code 1} should be passed as extra data if the use of the composter added to the level of compost inside. - COMMENT

    Called by {@link net.minecraft.block.ComposterBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.Hand, net.minecraft.util.hit.BlockHitResult) ComposterBlock#onUse}, + COMMENT

    Called by {@link net.minecraft.block.ComposterBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.hit.BlockHitResult) ComposterBlock#onUse}, COMMENT {@link net.minecraft.block.ComposterBlock.ComposterInventory#markDirty() ComposterBlock.ComposterInventory#markDirty}, COMMENT and {@link net.minecraft.entity.ai.brain.task.FarmerWorkTask#syncComposterEvent(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) FarmerWorkTask#syncComposterEvent} FIELD field_31138 LAVA_EXTINGUISHED I diff --git a/unpick-definitions/world_events.unpick b/unpick-definitions/world_events.unpick index 31ce730b7f..98c7df2ca6 100644 --- a/unpick-definitions/world_events.unpick +++ b/unpick-definitions/world_events.unpick @@ -68,7 +68,6 @@ constant world_events net/minecraft/world/WorldEvents SNIFFER_EGG_CRACKS constant world_events net/minecraft/world/WorldEvents CRAFTER_CRAFTS constant world_events net/minecraft/world/WorldEvents CRAFTER_FAILS constant world_events net/minecraft/world/WorldEvents CRAFTER_SHOOTS -constant world_events net/minecraft/world/WorldEvents GUST_DUST constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_SPAWNS_MOB constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_SPAWNS_MOB_AT_SPAWN_POS constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_DETECTS_PLAYER From 8d3224b03a30b3377f93297c1a2895cb84770dd9 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sat, 20 Jan 2024 15:11:24 +1100 Subject: [PATCH 16/47] A few packet related renames (#3769) Renamed CustomPayload KEY fields to ID, and PacketIdentifier to PacketType --- .../net/minecraft/network/packet/BrandCustomPayload.mapping | 2 +- .../packet/{PacketIdentifier.mapping => PacketType.mapping} | 2 +- .../network/packet/s2c/custom/DebugBeeCustomPayload.mapping | 2 +- .../network/packet/s2c/custom/DebugBrainCustomPayload.mapping | 2 +- .../network/packet/s2c/custom/DebugBreezeCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugGameEventCustomPayload.mapping | 2 +- .../s2c/custom/DebugGameEventListenersCustomPayload.mapping | 2 +- .../s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugGameTestClearCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping | 2 +- .../network/packet/s2c/custom/DebugHiveCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping | 2 +- .../network/packet/s2c/custom/DebugPathCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugPoiAddedCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping | 2 +- .../network/packet/s2c/custom/DebugRaidsCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugStructuresCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping | 2 +- .../packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) rename mappings/net/minecraft/network/packet/{PacketIdentifier.mapping => PacketType.mapping} (92%) diff --git a/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping index db6e6d5268..8ab4f1341e 100644 --- a/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8709 net/minecraft/network/packet/BrandCustomPayload FIELD field_48654 CODEC Lnet/minecraft/class_9139; - FIELD field_48655 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48655 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56481 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/PacketIdentifier.mapping b/mappings/net/minecraft/network/packet/PacketType.mapping similarity index 92% rename from mappings/net/minecraft/network/packet/PacketIdentifier.mapping rename to mappings/net/minecraft/network/packet/PacketType.mapping index 7f231fec0e..b052c7ee7f 100644 --- a/mappings/net/minecraft/network/packet/PacketIdentifier.mapping +++ b/mappings/net/minecraft/network/packet/PacketType.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_9145 net/minecraft/network/packet/PacketIdentifier +CLASS net/minecraft/class_9145 net/minecraft/network/packet/PacketType FIELD comp_2230 side Lnet/minecraft/class_2598; METHOD comp_2230 side ()Lnet/minecraft/class_2598; diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping index 4d2348168d..13fcf905a8 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8707 net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload FIELD field_48650 CODEC Lnet/minecraft/class_9139; - FIELD field_48651 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48651 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53028 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping index c2dbb64572..869d64c5bb 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8708 net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload FIELD field_48652 CODEC Lnet/minecraft/class_9139; - FIELD field_48653 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48653 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56480 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping index f2b6d3c6f8..aa536d26bf 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_9004 net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload FIELD field_48656 CODEC Lnet/minecraft/class_9139; - FIELD field_48657 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48657 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56482 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping index 63fb7397f1..e7135187fb 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8712 net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload FIELD field_48660 CODEC Lnet/minecraft/class_9139; - FIELD field_48661 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48661 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56494 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping index 9e4539838c..8b6cbf9188 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_8713 net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload FIELD field_48662 PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_48663 PAYLOAD_TYPE Lnet/minecraft/class_8710$class_9154; + FIELD field_48663 ID Lnet/minecraft/class_8710$class_9154; diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping index 8cef57108d..9eadaf16f1 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8714 net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload FIELD field_48664 CODEC Lnet/minecraft/class_9139; - FIELD field_48665 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48665 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56495 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping index 14231f7854..8bdd0f8c80 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8715 net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload FIELD field_48666 CODEC Lnet/minecraft/class_9139; - FIELD field_48667 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48667 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56496 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping index 43225bbf3a..b29dcfac47 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8716 net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload FIELD field_48668 CODEC Lnet/minecraft/class_9139; - FIELD field_48669 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48669 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53034 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8716$class_8717;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping index efe9d9b04e..714727624f 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8718 net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload FIELD field_48670 CODEC Lnet/minecraft/class_9139; - FIELD field_48671 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48671 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56498 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping index 9dc52f3855..85e3b5d0e1 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8720 net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload FIELD field_48672 CODEC Lnet/minecraft/class_9139; - FIELD field_48673 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48673 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56499 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping index cc7401178e..45343caf2d 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8721 net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload FIELD field_48674 CODEC Lnet/minecraft/class_9139; - FIELD field_48675 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48675 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56500 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping index 29a392b9e0..bb4645e8a7 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8722 net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload FIELD field_48676 CODEC Lnet/minecraft/class_9139; - FIELD field_48677 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48677 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56501 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping index 89ca11583c..f9ccb839fd 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8723 net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload FIELD field_48678 CODEC Lnet/minecraft/class_9139; - FIELD field_48679 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48679 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56502 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping index e7f02c239b..3619b2c41b 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8724 net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload FIELD field_48680 CODEC Lnet/minecraft/class_9139; - FIELD field_48681 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48681 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56503 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping index 4be4dffd68..25edad1172 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8725 net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload FIELD field_48682 CODEC Lnet/minecraft/class_9139; - FIELD field_48683 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48683 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56504 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping index 832ff6e837..f61eca79a4 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8726 net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload FIELD field_48684 CODEC Lnet/minecraft/class_9139; - FIELD field_48685 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48685 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53037 writeBox (Lnet/minecraft/class_2540;Lnet/minecraft/class_3341;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping index c760350fd4..9b8f0e4398 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8728 net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload FIELD field_48686 CODEC Lnet/minecraft/class_9139; - FIELD field_48687 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48687 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56506 write (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping index cb70ae837a..0d9856e28e 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8729 net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload FIELD field_48688 CODEC Lnet/minecraft/class_9139; - FIELD field_48689 KEY Lnet/minecraft/class_8710$class_9154; + FIELD field_48689 ID Lnet/minecraft/class_8710$class_9154; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_56507 write (Lnet/minecraft/class_2540;)V From de02eefbb04374a3da134255664d665911dabf22 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 21 Jan 2024 01:51:49 +1100 Subject: [PATCH 17/47] 24w03b wind charge (#3770) --- .../client/render/entity/model/WindChargeEntityModel.mapping | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mappings/net/minecraft/client/render/entity/model/WindChargeEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WindChargeEntityModel.mapping index 5a178d2bb5..9a5c53a564 100644 --- a/mappings/net/minecraft/client/render/entity/model/WindChargeEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WindChargeEntityModel.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_8974 net/minecraft/client/render/entity/model/WindChargeEntityModel FIELD field_47441 bone Lnet/minecraft/class_630; + FIELD field_48705 windCharge Lnet/minecraft/class_630; + FIELD field_48706 wind Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_55240 getTexturedModelData ()Lnet/minecraft/class_5607; From a4fa08c227d6e887b96f70f672b8a4ac592220b8 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Mon, 22 Jan 2024 02:11:40 +0900 Subject: [PATCH 18/47] Some more renames (#3771) * Some more renames * Fix one yarn bug --- .../net/minecraft/network/NetworkPhase.mapping | 5 +++++ .../minecraft/network/NetworkStateType.mapping | 5 ----- .../minecraft/network/codec/PacketCodec.mapping | 15 +++++++++++---- .../minecraft/network/codec/PacketCodecs.mapping | 4 ++-- .../network/listener/PacketListener.mapping | 2 +- .../recipe/SpecialRecipeSerializer.mapping | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 mappings/net/minecraft/network/NetworkPhase.mapping delete mode 100644 mappings/net/minecraft/network/NetworkStateType.mapping diff --git a/mappings/net/minecraft/network/NetworkPhase.mapping b/mappings/net/minecraft/network/NetworkPhase.mapping new file mode 100644 index 0000000000..42eb2ac5b2 --- /dev/null +++ b/mappings/net/minecraft/network/NetworkPhase.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_2539 net/minecraft/network/NetworkPhase + FIELD field_20594 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id + METHOD method_10785 getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/NetworkStateType.mapping b/mappings/net/minecraft/network/NetworkStateType.mapping deleted file mode 100644 index 35389f36e2..0000000000 --- a/mappings/net/minecraft/network/NetworkStateType.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2539 net/minecraft/network/NetworkStateType - FIELD field_20594 stateId Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 stateId - METHOD method_10785 getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index 435cf4b9ba..6cbc3a5104 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec COMMENT code, use {@link #of(ValueFirstEncoder, PacketDecoder)} COMMENT like this: COMMENT - COMMENT 

    {@code
+	COMMENT 
    {@code
 	COMMENT public static final PacketCodec CODEC = PacketCodec.of(MyPacket::write, MyPacket::new);
 	COMMENT
 	COMMENT private MyPacket(PacketByteBuf buf) {
@@ -30,6 +30,13 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec
 	COMMENT phases (like configuration)
 	COMMENT @param  the type of the value to be encoded/decoded
 	METHOD method_56430 cast ()Lnet/minecraft/class_9139;
+		COMMENT {@return the same codec, casted to work with buffers of type {@code S}}
+		COMMENT
+		COMMENT @apiNote For example, {@link net.minecraft.util.math.BlockPos#PACKET_CODEC}
+		COMMENT is defined as {@code PacketCodec}. To use this codec
+		COMMENT where {@link net.minecraft.network.PacketByteBuf} is expected, you can call
+		COMMENT this method for easy casting, like: {@code PACKET_CODEC.cast()}.
+		COMMENT Doing this is generally safe and will not result in exceptions.
 	METHOD method_56431 unit (Ljava/lang/Object;)Lnet/minecraft/class_9139;
 		COMMENT {@return a codec that always returns {@code value}}
 		COMMENT
@@ -45,7 +52,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec
 		COMMENT 
    This can be used to transform a codec for a simple value (like a string)
 		COMMENT into a corresponding, more complex value (like an identifier). An example:
 		COMMENT
-		COMMENT 
    {@code
+		COMMENT 
    {@code
 		COMMENT public static final PacketCodec PACKET_CODEC = PacketCodecs.STRING.xmap(Identifier::new, Identifier::toString);
 		COMMENT }
    
 		ARG 1 to
@@ -83,7 +90,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec
 		ARG 4 codec3
 		ARG 5 from3
 		ARG 6 to
-	METHOD method_56437 of (Lnet/minecraft/class_9142;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139;
+	METHOD method_56437 ofStatic (Lnet/minecraft/class_9142;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139;
 		COMMENT {@return a packet codec from the {@code encoder} and {@code decoder}}
 		COMMENT
 		COMMENT @apiNote This is useful for integrating with code that uses static methods for
@@ -99,7 +106,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec
 		COMMENT @apiNote This is useful for integrating with code that uses instance methods for
 		COMMENT packet writing, like {@code void write(PacketByteBuf buf)}.
 		COMMENT For code that uses static methods like {@code static void write(PacketByteBuf buf, Data data)},
-		COMMENT where the buffer is the first argument, use {@link #of(PacketEncoder, PacketDecoder)}.
+		COMMENT where the buffer is the first argument, use {@link #ofStatic(PacketEncoder, PacketDecoder)}.
 		ARG 0 encoder
 		ARG 1 decoder
 	METHOD method_56439 mapBuf (Ljava/util/function/Function;)Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
index 244e502595..c14bec5679 100644
--- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping
+++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
@@ -38,7 +38,7 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		COMMENT @see io.netty.buffer.ByteBuf#readDouble
 		COMMENT @see io.netty.buffer.ByteBuf#writeDouble
 	FIELD field_48554 STRING Lnet/minecraft/class_9139;
-		COMMENT A codec for a string value with maximum length {@value Short.MAX_VALUE}.
+		COMMENT A codec for a string value with maximum length {@value Short#MAX_VALUE}.
 		COMMENT
 		COMMENT @see #string
 		COMMENT @see net.minecraft.network.PacketByteBuf#readString()
@@ -61,7 +61,7 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		COMMENT
 		COMMENT @see #nbt
 		COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(PacketByteBuf)
-		COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(PacketByteBuf, NbtCompound)
+		COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(io.netty.buffer.ByteBuf, NbtElement)
 	FIELD field_48558 VECTOR3F Lnet/minecraft/class_9139;
 		COMMENT A codec for a {@link org.joml.Vector3f}.
 		COMMENT
diff --git a/mappings/net/minecraft/network/listener/PacketListener.mapping b/mappings/net/minecraft/network/listener/PacketListener.mapping
index e386d5cccc..fcc34bf816 100644
--- a/mappings/net/minecraft/network/listener/PacketListener.mapping
+++ b/mappings/net/minecraft/network/listener/PacketListener.mapping
@@ -22,7 +22,7 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener
 		COMMENT
 		COMMENT @see ServerPacketListener
 	METHOD method_48106 isConnectionOpen ()Z
-	METHOD method_52280 getState ()Lnet/minecraft/class_2539;
+	METHOD method_52280 getPhase ()Lnet/minecraft/class_2539;
 	METHOD method_52413 accepts (Lnet/minecraft/class_2596;)Z
 		ARG 1 packet
 	METHOD method_52895 getSide ()Lnet/minecraft/class_2598;
diff --git a/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping b/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping
index ea7f1c00fb..e7e14a75b6 100644
--- a/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping
+++ b/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping
@@ -7,7 +7,7 @@ CLASS net/minecraft/class_1866 net/minecraft/recipe/SpecialRecipeSerializer
 	COMMENT serializer have IDs starting with {@code crafting_special_}. All of their logic and ingredients
 	COMMENT are also defined in code, which distinguishes them from "non-special" recipes.
 	FIELD field_46106 codec Lcom/mojang/serialization/Codec;
-	FIELD field_48362 PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_48362 packetCodec Lnet/minecraft/class_9139;
 	FIELD field_9046 factory Lnet/minecraft/class_1866$class_7711;
 	METHOD  (Lnet/minecraft/class_1866$class_7711;)V
 		ARG 1 factory

From 717cdeca7accb81d01f4d29f9af3b041e443b537 Mon Sep 17 00:00:00 2001
From: modmuss50 
Date: Wed, 24 Jan 2024 16:09:45 +0000
Subject: [PATCH 19/47] 24w04a

---
 build.gradle                                  |  2 +-
 .../client/gui/ParentElement.mapping          |  2 --
 .../minecraft/client/gui/hud/DebugHud.mapping |  2 --
 .../client/gui/hud/debug/DebugChart.mapping   |  2 --
 .../ClientCommonNetworkHandler.mapping        |  4 ---
 .../ClientConfigurationNetworkHandler.mapping |  2 --
 .../network/ClientPlayNetworkHandler.mapping  |  1 +
 .../minecraft/entity/SpawnRestriction.mapping | 19 ++++++-------
 .../entity/passive/ArmadilloEntity.mapping    |  1 -
 .../network/NetworkStateBuilder.mapping       |  2 ++
 .../network/message/MessageType.mapping       | 26 ++---------------
 .../config/DynamicRegistriesS2CPacket.mapping |  7 -----
 .../s2c/play/ChatMessageS2CPacket.mapping     |  9 ++----
 .../s2c/play/CommonPlayerSpawnInfo.mapping    |  5 +---
 .../s2c/play/EntityDamageS2CPacket.mapping    |  6 +---
 .../packet/s2c/play/GameJoinS2CPacket.mapping |  5 +---
 .../s2c/play/PlayerRespawnS2CPacket.mapping   |  5 +---
 .../ProfilelessChatMessageS2CPacket.mapping   |  4 ---
 .../minecraft/registry/RegistryCodecs.mapping | 24 ----------------
 .../minecraft/registry/RegistryLoader.mapping | 28 +++----------------
 .../registry/SerializableRegistries.mapping   | 28 -------------------
 .../minecraft/registry/SimpleRegistry.mapping | 10 -------
 .../registry/tag/TagPacketSerializer.mapping  |  1 -
 mappings/net/minecraft/server/Main.mapping    |  2 +-
 .../minecraft/server/MinecraftServer.mapping  |  2 --
 .../util/collection/PriorityIterator.mapping  |  3 --
 .../util/profiler/PerformanceLog.mapping      |  2 +-
 .../net/minecraft/world/SpawnHelper.mapping   |  5 ----
 .../minecraft/world/StructureLocator.mapping  |  5 +---
 mappings/net/minecraft/world/World.mapping    |  2 --
 .../world/gen/StructureAccessor.mapping       |  3 +-
 .../world/storage/ChunkStreamVersion.mapping  |  4 +--
 .../storage/EntityChunkDataAccess.mapping     | 10 -------
 .../world/storage/RegionFile.mapping          |  1 -
 .../SerializingRegionBasedStorage.mapping     | 16 +----------
 .../storage/VersionedChunkStorage.mapping     |  2 +-
 .../world/updater/WorldUpdater.mapping        |  7 +----
 37 files changed, 35 insertions(+), 224 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8b7033cc5a..880261474a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w03b"
+def minecraft_version = "24w04a"
 
 filament {
 	minecraftVersion = minecraft_version
diff --git a/mappings/net/minecraft/client/gui/ParentElement.mapping b/mappings/net/minecraft/client/gui/ParentElement.mapping
index 95ff0d49a9..dd438490fa 100644
--- a/mappings/net/minecraft/client/gui/ParentElement.mapping
+++ b/mappings/net/minecraft/client/gui/ParentElement.mapping
@@ -8,8 +8,6 @@ CLASS net/minecraft/class_4069 net/minecraft/client/gui/ParentElement
 		ARG 8 element
 	METHOD method_20083 (DDILnet/minecraft/class_364;)Z
 		ARG 5 element
-	METHOD method_20086 focusOn (Lnet/minecraft/class_364;)V
-		ARG 1 element
 	METHOD method_25395 setFocused (Lnet/minecraft/class_364;)V
 		ARG 1 focused
 	METHOD method_25396 children ()Ljava/util/List;
diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
index 788c33b68c..e0543b0374 100644
--- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
+++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
@@ -69,8 +69,6 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
 		ARG 3 left
 	METHOD method_53534 pushToFrameLog (J)V
 		ARG 1 value
-	METHOD method_53535 pushToTickLog (J)V
-		ARG 1 value
 	METHOD method_53536 shouldShowDebugHud ()Z
 	METHOD method_53537 shouldShowRenderingChart ()Z
 	METHOD method_53538 shouldShowPacketSizeAndPingCharts ()Z
diff --git a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping
index c7a95b22aa..3fb038b0c4 100644
--- a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping
+++ b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping
@@ -9,9 +9,7 @@ CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart
 		ARG 1 value
 	METHOD method_53469 getColor (DDIDIDI)I
 		ARG 1 value
-		ARG 3 min
 		ARG 5 minColor
-		ARG 6 median
 		ARG 8 medianColor
 		ARG 9 max
 		ARG 11 maxColor
diff --git a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping
index 38214623d7..3c00307dbc 100644
--- a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping
@@ -16,10 +16,6 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH
 		ARG 3 connectionState
 	METHOD method_11152 onCustomPayload (Lnet/minecraft/class_8710;)V
 		ARG 1 payload
-	METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455$class_6890;
-	METHOD method_52771 handleSynchronizedTagGroup (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
-		ARG 1 registryRef
-		ARG 2 tags
 	METHOD method_52773 getParsedResourcePackUrl (Ljava/lang/String;)Ljava/net/URL;
 		ARG 0 url
 	METHOD method_52778 getPrompt (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping
index 9d4428fa32..77cd1a161e 100644
--- a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping
@@ -3,7 +3,5 @@ CLASS net/minecraft/class_8674 net/minecraft/client/network/ClientConfigurationN
 	FIELD field_45597 profile Lcom/mojang/authlib/GameProfile;
 	FIELD field_45598 registryManager Lnet/minecraft/class_5455$class_6890;
 	FIELD field_45599 enabledFeatures Lnet/minecraft/class_7699;
-	METHOD method_52793 (Lnet/minecraft/class_5455$class_6892;)V
-		ARG 0 entry
 	METHOD method_52797 handleCustomPayload (Lnet/minecraft/class_8710;)V
 		ARG 1 payload
diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index f807a20bb2..ccebfc71ed 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -59,6 +59,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	METHOD method_2880 getPlayerList ()Ljava/util/Collection;
 	METHOD method_2886 getCommandDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
 	METHOD method_2890 getWorld ()Lnet/minecraft/class_638;
+	METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455$class_6890;
 	METHOD method_29356 getWorldKeys ()Ljava/util/Set;
 	METHOD method_31363 getPlayerUuids ()Ljava/util/Collection;
 	METHOD method_34007 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
diff --git a/mappings/net/minecraft/entity/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping
index 3f2cb9368e..37197a551b 100644
--- a/mappings/net/minecraft/entity/SpawnRestriction.mapping
+++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction
 	FIELD field_6313 RESTRICTIONS Ljava/util/Map;
-	METHOD method_20637 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_4306;)V
+	METHOD method_20637 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_9168;Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_4306;)V
 		ARG 0 type
 		ARG 1 location
 		ARG 2 heightmapType
@@ -11,22 +11,21 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction
 		ARG 2 spawnReason
 		ARG 3 pos
 		ARG 4 random
-	METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1317$class_1319;
+	METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_9168;
 		ARG 0 type
 	METHOD method_6160 getHeightmapType (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2902$class_2903;
 		ARG 0 type
 	CLASS class_1318 Entry
-		FIELD field_19349 predicate Lnet/minecraft/class_1317$class_4306;
-		FIELD field_6314 heightmapType Lnet/minecraft/class_2902$class_2903;
-		FIELD field_6315 location Lnet/minecraft/class_1317$class_1319;
-		METHOD  (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_1317$class_4306;)V
+		FIELD comp_2253 heightmapType Lnet/minecraft/class_2902$class_2903;
+		FIELD comp_2254 location Lnet/minecraft/class_9168;
+		FIELD comp_2255 predicate Lnet/minecraft/class_1317$class_4306;
+		METHOD  (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_9168;Lnet/minecraft/class_1317$class_4306;)V
 			ARG 1 heightmapType
 			ARG 2 location
 			ARG 3 predicate
-	CLASS class_1319 Location
-		METHOD  (Ljava/lang/String;I)V
-			ARG 1 name
-			ARG 2 id
+		METHOD comp_2253 heightmapType ()Lnet/minecraft/class_2902$class_2903;
+		METHOD comp_2254 location ()Lnet/minecraft/class_9168;
+		METHOD comp_2255 predicate ()Lnet/minecraft/class_1317$class_4306;
 	CLASS class_4306 SpawnPredicate
 		METHOD test (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 			ARG 1 type
diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
index 934f9f8334..97a776f562 100644
--- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
@@ -15,7 +15,6 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
 	METHOD method_55719 getNextScuteShedCooldown ()I
 	METHOD method_55720 updateAnimationStates ()V
 	METHOD method_55721 isEntityThreatening (Lnet/minecraft/class_1309;)Z
-		ARG 1 entity
 	METHOD method_55722 createArmadilloAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_55723 isNotIdle ()Z
 	METHOD method_55724 unroll ()V
diff --git a/mappings/net/minecraft/network/NetworkStateBuilder.mapping b/mappings/net/minecraft/network/NetworkStateBuilder.mapping
index a9dbe02f34..5609d4eabf 100644
--- a/mappings/net/minecraft/network/NetworkStateBuilder.mapping
+++ b/mappings/net/minecraft/network/NetworkStateBuilder.mapping
@@ -50,3 +50,5 @@ CLASS net/minecraft/class_9147 net/minecraft/network/NetworkStateBuilder
 			ARG 1 builder
 			ARG 2 bufUpgrader
 	CLASS class_9149 NetworkStateImpl
+		FIELD comp_2235 side Lnet/minecraft/class_2598;
+		FIELD comp_2237 bundleHandler Lnet/minecraft/class_8039;
diff --git a/mappings/net/minecraft/network/message/MessageType.mapping b/mappings/net/minecraft/network/message/MessageType.mapping
index c512ee47b6..e456d18910 100644
--- a/mappings/net/minecraft/network/message/MessageType.mapping
+++ b/mappings/net/minecraft/network/message/MessageType.mapping
@@ -79,18 +79,12 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType
 		ARG 0 typeKey
 		ARG 1 registryManager
 		ARG 2 name
-	METHOD method_44835 params (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2556$class_7602;
-		ARG 1 name
 	CLASS class_7602 Parameters
 		COMMENT A record holding the message type and the decoration parameters.
-		FIELD comp_919 type Lnet/minecraft/class_2556;
-		METHOD  (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;)V
-			ARG 1 type
+		FIELD comp_919 type Lnet/minecraft/class_6880;
+		METHOD  (Lnet/minecraft/class_6880;Lnet/minecraft/class_2561;)V
 			ARG 2 name
-		METHOD comp_919 type ()Lnet/minecraft/class_2556;
-		METHOD method_44836 toSerialized (Lnet/minecraft/class_5455;)Lnet/minecraft/class_2556$class_7603;
-			COMMENT {@return a serialized version of this instance used in packets}
-			ARG 1 registryManager
+		METHOD comp_919 type ()Lnet/minecraft/class_6880;
 		METHOD method_44837 applyChatDecoration (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
 			ARG 1 content
 		METHOD method_44838 applyNarrationDecoration (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
@@ -102,17 +96,3 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType
 			COMMENT net.minecraft.server.command.TeamMsgCommand} and as the recipient name in {@link
 			COMMENT net.minecraft.server.command.MessageCommand}.
 			ARG 1 targetName
-	CLASS class_7603 Serialized
-		COMMENT The serialized version of {@link MessageType.Parameters} that is used in packets.
-		FIELD comp_922 typeId I
-		METHOD  (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
-		METHOD comp_922 typeId ()I
-		METHOD method_44840 toParameters (Lnet/minecraft/class_5455;)Ljava/util/Optional;
-			COMMENT {@return a deserialized version of this instance, or {@link Optional#empty} if
-			COMMENT {@link #typeId} is unknown to the client}
-			ARG 1 registryManager
-		METHOD method_44841 write (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
-		METHOD method_45038 (Lnet/minecraft/class_2556;)Lnet/minecraft/class_2556$class_7602;
-			ARG 1 type
diff --git a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping
index fb57a118c6..4fdaf7ded4 100644
--- a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping
@@ -1,9 +1,2 @@
 CLASS net/minecraft/class_8734 net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket
-	FIELD comp_1724 registryManager Lnet/minecraft/class_5455$class_6890;
-	FIELD field_45713 VANILLA_REGISTRY_OPS Lnet/minecraft/class_6903;
 	FIELD field_48692 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD comp_1724 registryManager ()Lnet/minecraft/class_5455$class_6890;
-	METHOD method_56508 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping
index 0d68b0234d..4e2bf779da 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping
@@ -19,10 +19,7 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage
 	COMMENT
 	COMMENT @see net.minecraft.server.network.ServerPlayerEntity#sendChatMessage
 	COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onChatMessage
-	FIELD comp_943 serializedParameters Lnet/minecraft/class_2556$class_7603;
+	FIELD comp_943 serializedParameters Lnet/minecraft/class_2556$class_7602;
 	FIELD field_47949 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7603;
-	METHOD method_55898 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7602;
+	METHOD method_55898 write (Lnet/minecraft/class_9129;)V
diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping
index 4e10504a59..a2ca21a81f 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping
@@ -1,9 +1,6 @@
 CLASS net/minecraft/class_8589 net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo
 	FIELD comp_1556 gameMode Lnet/minecraft/class_1934;
 	FIELD comp_1557 prevGameMode Lnet/minecraft/class_1934;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD comp_1556 gameMode ()Lnet/minecraft/class_1934;
 	METHOD comp_1557 prevGameMode ()Lnet/minecraft/class_1934;
-	METHOD method_52274 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD method_52274 write (Lnet/minecraft/class_9129;)V
diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping
index 4289118255..76f2fb2a62 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping
@@ -3,10 +3,7 @@ CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamag
 	METHOD  (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V
 		ARG 1 entity
 		ARG 2 damageSource
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD method_49071 createDamageSource (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1282;
-		ARG 1 world
 	METHOD method_49072 writeOffsetVarInt (Lnet/minecraft/class_2540;I)V
 		ARG 0 buf
 		ARG 1 value
@@ -17,5 +14,4 @@ CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamag
 		ARG 0 buf
 	METHOD method_49076 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_243;
 		ARG 0 pos
-	METHOD method_55873 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD method_55873 write (Lnet/minecraft/class_9129;)V
diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
index 35d62c1849..4092d0ef45 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
@@ -9,8 +9,6 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	FIELD field_47937 CODEC Lnet/minecraft/class_9139;
 	METHOD  (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;Z)V
 		ARG 1 playerEntityId
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD comp_100 showDeathScreen ()Z
 	METHOD comp_88 playerEntityId ()I
 	METHOD comp_89 hardcore ()Z
@@ -20,5 +18,4 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	METHOD comp_99 reducedDebugInfo ()Z
 	METHOD method_34135 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5321;
 		ARG 0 b
-	METHOD method_55887 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD method_55887 write (Lnet/minecraft/class_9129;)V
diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping
index 1850a80235..48a7c709ec 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping
@@ -4,10 +4,7 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa
 	FIELD field_41731 KEEP_TRACKED_DATA B
 	FIELD field_41732 KEEP_ALL B
 	FIELD field_47962 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD comp_1729 flag ()B
 	METHOD method_48016 hasFlag (B)Z
 		ARG 1 flag
-	METHOD method_55909 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD method_55909 write (Lnet/minecraft/class_9129;)V
diff --git a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping
index a4fa429ac9..3908c96088 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping
@@ -1,6 +1,2 @@
 CLASS net/minecraft/class_7827 net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket
 	FIELD field_47923 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_55875 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
diff --git a/mappings/net/minecraft/registry/RegistryCodecs.mapping b/mappings/net/minecraft/registry/RegistryCodecs.mapping
index 0fd59d682f..44018e98b7 100644
--- a/mappings/net/minecraft/registry/RegistryCodecs.mapping
+++ b/mappings/net/minecraft/registry/RegistryCodecs.mapping
@@ -11,24 +11,11 @@ CLASS net/minecraft/class_6895 net/minecraft/registry/RegistryCodecs
 		ARG 2 alwaysSerializeAsList
 			COMMENT whether to always serialize the list as a list
 			COMMENT instead of serializing as one entry if the length is {@code 0}
-	METHOD method_40344 createRegistryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
-		ARG 0 registryRef
-		ARG 1 lifecycle
-		ARG 2 elementCodec
-	METHOD method_40345 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/List;)Lnet/minecraft/class_2378;
-		ARG 2 entries
-	METHOD method_40347 managerEntry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec;
-		ARG 0 registryRef
-		ARG 1 elementCodec
-	METHOD method_40348 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 2 instance
 	METHOD method_40349 entryList (Lnet/minecraft/class_5321;Z)Lcom/mojang/serialization/Codec;
 		ARG 0 registryRef
 		ARG 1 alwaysSerializeAsList
 			COMMENT whether to always serialize the list as a list
 			COMMENT instead of serializing as one entry if the length is {@code 0}
-	METHOD method_40350 (Lnet/minecraft/class_2378;)Ljava/util/List;
-		ARG 0 registry
 	METHOD method_45944 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_2378;
 		ARG 2 entries
 	METHOD method_45945 (Lnet/minecraft/class_2378;)Ljava/util/Map;
@@ -40,14 +27,3 @@ CLASS net/minecraft/class_6895 net/minecraft/registry/RegistryCodecs
 		ARG 0 registryRef
 		ARG 1 lifecycle
 		ARG 2 elementCodec
-	CLASS class_5501 RegistryManagerEntry
-		FIELD comp_290 key Lnet/minecraft/class_5321;
-		FIELD comp_291 rawId I
-		FIELD comp_292 value Ljava/lang/Object;
-		METHOD  (Lnet/minecraft/class_5321;ILjava/lang/Object;)V
-			ARG 1 key
-			ARG 2 rawId
-			ARG 3 value
-		METHOD comp_290 key ()Lnet/minecraft/class_5321;
-		METHOD comp_291 rawId ()I
-		METHOD comp_292 value ()Ljava/lang/Object;
diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping
index 49e45ef7b4..7e0142637e 100644
--- a/mappings/net/minecraft/registry/RegistryLoader.mapping
+++ b/mappings/net/minecraft/registry/RegistryLoader.mapping
@@ -4,19 +4,10 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 	FIELD field_39970 LOGGER Lorg/slf4j/Logger;
 	METHOD method_45119 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String;
 		ARG 0 id
-	METHOD method_45120 (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;Lcom/mojang/datafixers/util/Pair;)V
-		ARG 2 loader
-	METHOD method_45121 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
-		ARG 0 resourceManager
+	METHOD method_45121 load (Lnet/minecraft/class_7655$class_7656;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
 		ARG 1 baseRegistryManager
 		ARG 2 entries
-	METHOD method_45122 load (Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_3300;Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
-		ARG 0 registryInfoGetter
-		ARG 1 resourceManager
-		ARG 2 registryRef
-		ARG 3 newRegistry
-		ARG 4 decoder
-		ARG 5 exceptions
+	METHOD method_45122 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
 	METHOD method_45123 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V
 		ARG 1 entry
 	METHOD method_45124 (Ljava/lang/String;)V
@@ -25,10 +16,8 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		ARG 0 entry
 	METHOD method_45126 writeLoadingError (Ljava/util/Map;)V
 		ARG 0 exceptions
-	METHOD method_45127 (Ljava/util/Map;Lnet/minecraft/class_7655$class_7657;)Lcom/mojang/datafixers/util/Pair;
+	METHOD method_45127 (Ljava/util/Map;Lnet/minecraft/class_7655$class_7657;)Lnet/minecraft/class_7655$class_9158;
 		ARG 1 entry
-	METHOD method_45128 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V
-		ARG 1 loader
 	METHOD method_45129 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V
 		ARG 1 elementEntry
 	METHOD method_45130 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960;
@@ -40,20 +29,11 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		ARG 1 additionalRegistries
 	METHOD method_46620 createInfo (Lnet/minecraft/class_2385;)Lnet/minecraft/class_6903$class_7862;
 		ARG 0 registry
-	METHOD method_46621 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V
-		ARG 1 pair
 	METHOD method_46622 (Ljava/util/Map;Lnet/minecraft/class_5455$class_6892;)V
 		ARG 1 entry
 	CLASS class_7656 RegistryLoadable
-		METHOD load (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V
-			ARG 1 resourceManager
-			ARG 2 registryInfoGetter
 	CLASS class_7657 Entry
-		METHOD method_45131 getLoader (Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lcom/mojang/datafixers/util/Pair;
+		METHOD method_45131 getLoader (Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_7655$class_9158;
 			ARG 1 lifecycle
-			ARG 2 exceptions
-		METHOD method_45132 (Lnet/minecraft/class_2385;Ljava/util/Map;Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V
-			ARG 3 resourceManager
-			ARG 4 registryInfoGetter
 		METHOD method_54920 addToCloner (Ljava/util/function/BiConsumer;)V
 			ARG 1 callback
diff --git a/mappings/net/minecraft/registry/SerializableRegistries.mapping b/mappings/net/minecraft/registry/SerializableRegistries.mapping
index 16b9345041..cf196d5a57 100644
--- a/mappings/net/minecraft/registry/SerializableRegistries.mapping
+++ b/mappings/net/minecraft/registry/SerializableRegistries.mapping
@@ -1,35 +1,7 @@
 CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries
-	FIELD field_40587 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_40588 REGISTRIES Ljava/util/Map;
-	METHOD method_45948 createCodec ()Lcom/mojang/serialization/Codec;
-	METHOD method_45949 getNetworkCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult;
-		ARG 0 registryRef
-	METHOD method_45950 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
-		ARG 1 codec
-	METHOD method_45951 add (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V
-		ARG 0 builder
-		ARG 1 key
-		ARG 2 networkCodec
-	METHOD method_45952 createDynamicRegistryManagerCodec (Lcom/mojang/serialization/codecs/UnboundedMapCodec;)Lcom/mojang/serialization/Codec;
-		ARG 0 networkCodec
 	METHOD method_45953 streamRegistryManagerEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream;
 		ARG 0 combinedRegistries
-	METHOD method_45954 (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/DataResult;
-		ARG 0 registry
-	METHOD method_45955 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_2378;
-		ARG 0 entry
 	METHOD method_45956 stream (Lnet/minecraft/class_5455;)Ljava/util/stream/Stream;
 		ARG 0 dynamicRegistryManager
-	METHOD method_45957 (Lnet/minecraft/class_7782$class_7783;)Lcom/mojang/serialization/Codec;
-		ARG 0 info
-	METHOD method_45959 (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult;
-		ARG 0 registryRef
-	METHOD method_45960 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_5321;
-		ARG 0 entry
-	METHOD method_45961 (Lnet/minecraft/class_5455;)Ljava/util/Map;
-		ARG 0 registryManager
-	METHOD method_45963 (Lnet/minecraft/class_5455$class_6892;)Z
-		ARG 0 entry
 	METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream;
 		ARG 0 combinedRegistries
-	CLASS class_7783 Info
diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping
index 5b3beee8fe..99cd184cf1 100644
--- a/mappings/net/minecraft/registry/SimpleRegistry.mapping
+++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping
@@ -4,7 +4,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry
 	COMMENT
 	COMMENT @see Registry
 	FIELD field_11107 idToEntry Ljava/util/Map;
-	FIELD field_11109 nextId I
 	FIELD field_25067 keyToEntry Ljava/util/Map;
 	FIELD field_26682 rawIdToEntry Lit/unimi/dsi/fastutil/objects/ObjectList;
 	FIELD field_26683 entryToRawId Lit/unimi/dsi/fastutil/objects/Reference2IntMap;
@@ -13,7 +12,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry
 	FIELD field_36461 valueToEntry Ljava/util/Map;
 	FIELD field_36462 tagToEntryList Ljava/util/Map;
 	FIELD field_36463 frozen Z
-	FIELD field_36634 cachedEntries Ljava/util/List;
 	FIELD field_36635 LOGGER Lorg/slf4j/Logger;
 	FIELD field_40584 intrusiveValueToEntry Ljava/util/Map;
 	FIELD field_41126 key Lnet/minecraft/class_5321;
@@ -49,9 +47,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry
 		ARG 1 valuex
 	METHOD method_40274 assertNotFrozen (Lnet/minecraft/class_5321;)V
 		ARG 1 key
-	METHOD method_40277 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883;
-		ARG 1 key
-	METHOD method_40561 getEntries ()Ljava/util/List;
 	METHOD method_40562 createNamedEntryList (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888;
 		ARG 1 tag
 	METHOD method_40563 (Lnet/minecraft/class_6862;)Ljava/lang/String;
@@ -64,9 +59,4 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry
 		ARG 0 value
 		ARG 1 entry
 	METHOD method_45939 assertNotFrozen ()V
-	METHOD method_46744 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883;
-		ARG 1 rawId
-		ARG 2 key
-		ARG 3 value
-		ARG 4 lifecycle
 	CLASS 1
diff --git a/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
index e69730835d..2c622bf89e 100644
--- a/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
+++ b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
@@ -31,7 +31,6 @@ CLASS net/minecraft/class_6864 net/minecraft/registry/tag/TagPacketSerializer
 			ARG 1 buf
 		METHOD method_33160 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6864$class_5748;
 			ARG 0 buf
-		METHOD method_40108 isEmpty ()Z
 	CLASS class_6865 Loader
 		METHOD accept (Lnet/minecraft/class_6862;Ljava/util/List;)V
 			ARG 1 tag
diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping
index 962def5a8c..381128cb46 100644
--- a/mappings/net/minecraft/server/Main.mapping
+++ b/mappings/net/minecraft/server/Main.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/server/Main
 	FIELD field_24625 LOGGER Lorg/slf4j/Logger;
 	METHOD main ([Ljava/lang/String;)V
 		ARG 0 args
-	METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_2378;)V
+	METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_2378;Z)V
 		ARG 0 session
 		ARG 1 dataFixer
 		ARG 2 eraseCache
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index c1ca9732ff..363e4ddb92 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -440,8 +440,6 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_52344 shouldLogIps ()Z
 	METHOD method_53501 (Lnet/minecraft/class_3222;)V
 		ARG 0 player
-	METHOD method_53620 tickTickLog (J)V
-		ARG 1 nanos
 	METHOD method_5387 isMainThread ()Z
 	METHOD method_54809 isPaused ()Z
 	METHOD method_54831 updateAutosaveTicks ()V
diff --git a/mappings/net/minecraft/util/collection/PriorityIterator.mapping b/mappings/net/minecraft/util/collection/PriorityIterator.mapping
index 3038509df5..bcc4af8b13 100644
--- a/mappings/net/minecraft/util/collection/PriorityIterator.mapping
+++ b/mappings/net/minecraft/util/collection/PriorityIterator.mapping
@@ -1,9 +1,6 @@
 CLASS net/minecraft/class_8917 net/minecraft/util/collection/PriorityIterator
-	FIELD field_46956 entries Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	METHOD method_54723 (I)Ljava/util/Deque;
 		ARG 0 p
-	METHOD method_54725 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap$Entry;)Z
-		ARG 0 entry
 	METHOD method_54726 enqueue (Ljava/lang/Object;I)V
 		ARG 1 value
 		ARG 2 priority
diff --git a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
index 6f202db271..7d4decd7fa 100644
--- a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
+++ b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog
 	FIELD field_45719 SIZE I
-	FIELD field_45720 data [J
+	FIELD field_45720 data [[J
 	FIELD field_45721 currentIndex I
 	FIELD field_45722 maxIndex I
 	METHOD method_53064 size ()I
diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping
index ea7eb6f107..6240adabe7 100644
--- a/mappings/net/minecraft/world/SpawnHelper.mapping
+++ b/mappings/net/minecraft/world/SpawnHelper.mapping
@@ -87,11 +87,6 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper
 		ARG 3 spawnGroup
 		ARG 4 spawnEntry
 		ARG 5 pos
-	METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z
-		ARG 0 location
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 entityType
 	METHOD method_8661 populateEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_6880;Lnet/minecraft/class_1923;Lnet/minecraft/class_5819;)V
 		ARG 0 world
 		ARG 1 biomeEntry
diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping
index ec9aabc161..75faffbdc9 100644
--- a/mappings/net/minecraft/world/StructureLocator.mapping
+++ b/mappings/net/minecraft/world/StructureLocator.mapping
@@ -3,7 +3,6 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator
 	FIELD field_36226 START_NOT_PRESENT_REFERENCE I
 	FIELD field_36227 chunkIoWorker Lnet/minecraft/class_6830;
 	FIELD field_36228 registryManager Lnet/minecraft/class_5455;
-	FIELD field_36229 biomeRegistry Lnet/minecraft/class_2378;
 	FIELD field_36230 structureTemplateManager Lnet/minecraft/class_3485;
 	FIELD field_36231 worldKey Lnet/minecraft/class_5321;
 	FIELD field_36232 chunkGenerator Lnet/minecraft/class_2794;
@@ -13,7 +12,6 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator
 	FIELD field_36236 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_36237 cachedStructuresByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
 	FIELD field_36238 generationPossibilityByStructure Ljava/util/Map;
-	FIELD field_36418 structureRegistry Lnet/minecraft/class_2378;
 	FIELD field_37750 noiseConfig Lnet/minecraft/class_7138;
 	METHOD  (Lnet/minecraft/class_6830;Lnet/minecraft/class_5455;Lnet/minecraft/class_3485;Lnet/minecraft/class_5321;Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;Lnet/minecraft/class_5539;Lnet/minecraft/class_1966;JLcom/mojang/datafixers/DataFixer;)V
 		ARG 1 chunkIoWorker
@@ -40,10 +38,9 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator
 	METHOD method_39830 incrementReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;)V
 		ARG 1 pos
 		ARG 2 structure
-	METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833;
+	METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Lnet/minecraft/class_6874;Z)Lnet/minecraft/class_6833;
 		ARG 1 pos
 		ARG 2 type
-		ARG 3 skipReferencedStructures
 	METHOD method_39832 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;ZJ)Lnet/minecraft/class_6833;
 		ARG 1 pos
 		ARG 2 structure
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index dedc396945..308f9f6c55 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -28,7 +28,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	FIELD field_9235 rainGradient F
 	FIELD field_9236 isClient Z
 	FIELD field_9238 lcgBlockSeedIncrement I
-	FIELD field_9247 dimension Lnet/minecraft/class_5321;
 	FIELD field_9249 iteratingTickingBlockEntities Z
 	FIELD field_9251 thunderGradientPrev F
 	FIELD field_9253 rainGradientPrev F
@@ -167,7 +166,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 		ARG 4 category
 		ARG 5 volume
 		ARG 6 pitch
-	METHOD method_44013 getDimensionKey ()Lnet/minecraft/class_5321;
 	METHOD method_45445 playSound (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V
 		ARG 1 source
 		ARG 2 pos
diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping
index 874c17b252..9fff8bc5a5 100644
--- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping
+++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping
@@ -40,10 +40,9 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor
 		COMMENT child piece of it.
 		ARG 1 pos
 		ARG 2 structure
-	METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833;
+	METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Lnet/minecraft/class_6874;Z)Lnet/minecraft/class_6833;
 		ARG 1 chunkPos
 		ARG 2 structure
-		ARG 3 skipExistingChunk
 	METHOD method_39784 incrementReferences (Lnet/minecraft/class_3449;)V
 		ARG 1 structureStart
 	METHOD method_41032 acceptStructureStarts (Lnet/minecraft/class_3195;Lit/unimi/dsi/fastutil/longs/LongSet;Ljava/util/function/Consumer;)V
diff --git a/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping b/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping
index 62c3ad5d6b..cda10fa13c 100644
--- a/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping
+++ b/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping
@@ -6,10 +6,8 @@ CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkStreamVersion
 	FIELD field_20446 id I
 	FIELD field_20447 inputStreamWrapper Lnet/minecraft/class_4486$class_4487;
 	FIELD field_20448 outputStreamWrapper Lnet/minecraft/class_4486$class_4487;
-	METHOD  (ILnet/minecraft/class_4486$class_4487;Lnet/minecraft/class_4486$class_4487;)V
+	METHOD  (ILjava/lang/String;Lnet/minecraft/class_4486$class_4487;Lnet/minecraft/class_4486$class_4487;)V
 		ARG 1 id
-		ARG 2 inputStreamWrapper
-		ARG 3 outputStreamWrapper
 	METHOD method_21882 getId ()I
 	METHOD method_21883 get (I)Lnet/minecraft/class_4486;
 		ARG 0 id
diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
index 62f6f65e3f..fad2699158 100644
--- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
+++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
@@ -1,18 +1,10 @@
 CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess
-	FIELD field_27231 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_27232 LOGGER Lorg/slf4j/Logger;
 	FIELD field_27233 world Lnet/minecraft/class_3218;
-	FIELD field_27234 dataLoadWorker Lnet/minecraft/class_4698;
 	FIELD field_27235 emptyChunks Lit/unimi/dsi/fastutil/longs/LongSet;
 	FIELD field_31414 ENTITIES_KEY Ljava/lang/String;
 	FIELD field_31415 POSITION_KEY Ljava/lang/String;
 	FIELD field_34056 taskExecutor Lnet/minecraft/class_3846;
-	METHOD  (Lnet/minecraft/class_3218;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/util/concurrent/Executor;)V
-		ARG 1 world
-		ARG 2 path
-		ARG 3 dataFixer
-		ARG 4 dsync
-		ARG 5 executor
 	METHOD method_31730 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Void;
 		ARG 1 ex
 	METHOD method_31731 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lnet/minecraft/class_5566;
@@ -26,5 +18,3 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess
 		ARG 0 pos
 	METHOD method_31736 getChunkPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1923;
 		ARG 0 chunkNbt
-	METHOD method_31737 fixChunkData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
-		ARG 1 chunkNbt
diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping
index 6213b68631..c572dbb7ae 100644
--- a/mappings/net/minecraft/world/storage/RegionFile.mapping
+++ b/mappings/net/minecraft/world/storage/RegionFile.mapping
@@ -13,7 +13,6 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V
 		ARG 1 file
 		ARG 2 directory
-		ARG 3 outputChunkStreamVersion
 		ARG 4 dsync
 	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V
 		ARG 1 file
diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
index c5dc160e4f..910935218a 100644
--- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
+++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
@@ -3,22 +3,10 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 	FIELD field_18692 loadedElements Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
 	FIELD field_18693 unsavedElements Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet;
 	FIELD field_18695 factory Ljava/util/function/Function;
-	FIELD field_19228 dataFixer Lcom/mojang/datafixers/DataFixer;
-	FIELD field_19229 dataFixTypes Lnet/minecraft/class_4284;
-	FIELD field_21505 worker Lnet/minecraft/class_4698;
 	FIELD field_24750 codecFactory Ljava/util/function/Function;
 	FIELD field_27240 world Lnet/minecraft/class_5539;
 	FIELD field_31427 SECTIONS_KEY Ljava/lang/String;
 	FIELD field_39315 dynamicRegistryManager Lnet/minecraft/class_5455;
-	METHOD  (Ljava/nio/file/Path;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V
-		ARG 1 path
-		ARG 2 codecFactory
-		ARG 3 factory
-		ARG 4 dataFixer
-		ARG 5 dataFixTypes
-		ARG 6 dsync
-		ARG 7 dynamicRegistryManager
-		ARG 8 world
 	METHOD method_19288 onUpdate (J)V
 		ARG 1 pos
 	METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V
@@ -40,10 +28,8 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 	METHOD method_20367 serialize (Lnet/minecraft/class_1923;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic;
 		ARG 1 chunkPos
 		ARG 2 ops
-	METHOD method_20368 update (Lnet/minecraft/class_1923;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)V
+	METHOD method_20368 update (Lnet/minecraft/class_1923;Lnet/minecraft/class_6903;Lnet/minecraft/class_2487;)V
 		ARG 1 pos
-		ARG 2 ops
-		ARG 3 data
 	METHOD method_20369 getDataVersion (Lcom/mojang/serialization/Dynamic;)I
 		ARG 0 dynamic
 	METHOD method_20370 save (Lnet/minecraft/class_1923;)V
diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
index b4399b0010..ae8e6373f2 100644
--- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
+++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
@@ -14,7 +14,7 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage
 		ARG 4 generatorCodecKey
 	METHOD method_17908 getDataVersion (Lnet/minecraft/class_2487;)I
 		ARG 0 nbt
-	METHOD method_17910 setNbt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V
+	METHOD method_17910 setNbt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 chunkPos
 		ARG 2 nbt
 	METHOD method_23696 getNbt (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;
diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
index 141db53088..11179311d1 100644
--- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping
+++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
@@ -17,16 +17,11 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	FIELD field_5766 upgradedChunkCount I
 	FIELD field_5767 updateThread Ljava/lang/Thread;
 	FIELD field_5768 totalChunkCount I
-	METHOD  (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2378;Z)V
+	METHOD  (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2378;ZZ)V
 		ARG 1 session
 		ARG 2 dataFixer
 		ARG 3 dimensionOptionsRegistry
 		ARG 4 eraseCache
-	METHOD method_17829 (Ljava/io/File;Ljava/lang/String;)Z
-		ARG 0 directory
-		ARG 1 name
-	METHOD method_17830 getChunkPositions (Lnet/minecraft/class_5321;)Ljava/util/List;
-		ARG 1 world
 	METHOD method_28304 getWorlds ()Ljava/util/Set;
 	METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F
 		ARG 1 world

From c73080b5755949a5ad0ca8a033290b82e464d4bb Mon Sep 17 00:00:00 2001
From: Shnupbups 
Date: Thu, 25 Jan 2024 14:18:13 +1100
Subject: [PATCH 20/47] some 24w04a stuff (#3772)

plenty more to do, i'm going to bed :)
---
 .../minecraft/entity/SpawnLocation.mapping    |  8 +++++++
 .../entity/SpawnLocationTypes.mapping         | 22 +++++++++++++++++++
 .../minecraft/entity/mob/BreezeEntity.mapping |  6 +++++
 .../entity/passive/ArmadilloEntity.mapping    |  1 +
 .../network/message/MessageType.mapping       |  2 ++
 .../dedicated/command/TransferCommand.mapping | 17 ++++++++++++++
 .../net/minecraft/test/TestContext.mapping    |  4 ++++
 .../minecraft/world/StructureLocator.mapping  |  2 ++
 .../placement/StructurePlacement.mapping      |  8 +++++++
 9 files changed, 70 insertions(+)
 create mode 100644 mappings/net/minecraft/entity/SpawnLocation.mapping
 create mode 100644 mappings/net/minecraft/entity/SpawnLocationTypes.mapping
 create mode 100644 mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping

diff --git a/mappings/net/minecraft/entity/SpawnLocation.mapping b/mappings/net/minecraft/entity/SpawnLocation.mapping
new file mode 100644
index 0000000000..a8827ed8a4
--- /dev/null
+++ b/mappings/net/minecraft/entity/SpawnLocation.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_9168 net/minecraft/entity/SpawnLocation
+	METHOD isSpawnPositionOk (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 entityType
+	METHOD method_56553 adjustPosition (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
+		ARG 1 world
+		ARG 2 pos
diff --git a/mappings/net/minecraft/entity/SpawnLocationTypes.mapping b/mappings/net/minecraft/entity/SpawnLocationTypes.mapping
new file mode 100644
index 0000000000..efbd23aa54
--- /dev/null
+++ b/mappings/net/minecraft/entity/SpawnLocationTypes.mapping
@@ -0,0 +1,22 @@
+CLASS net/minecraft/class_9169 net/minecraft/entity/SpawnLocationTypes
+	FIELD field_48742 UNRESTRICTED Lnet/minecraft/class_9168;
+	FIELD field_48743 IN_WATER Lnet/minecraft/class_9168;
+	FIELD field_48744 IN_LAVA Lnet/minecraft/class_9168;
+	FIELD field_48745 ON_GROUND Lnet/minecraft/class_9168;
+	METHOD method_56554 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 entityType
+	METHOD method_56555 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 entityType
+	METHOD method_56556 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 entityType
+	CLASS 1
+		METHOD method_56557 isClearForSpawn (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z
+			ARG 1 world
+			ARG 2 pos
+			ARG 3 entityType
diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping
index 7b57ed1a0d..4d63607626 100644
--- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity
 	FIELD field_47279 longJumpingParticleAddCount I
 	FIELD field_47280 inhalingAnimationState Lnet/minecraft/class_7094;
 	FIELD field_47281 shootingAnimationState Lnet/minecraft/class_7094;
+	FIELD field_47815 ticksUntilWhirlSound I
 	FIELD field_48344 PROJECTILE_DEFLECTOR Lnet/minecraft/class_9109;
 	METHOD method_55007 addBlockParticles (I)V
 		ARG 1 count
@@ -20,3 +21,8 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity
 		ARG 2 random
 	METHOD method_56088 (Lnet/minecraft/class_1299;)Ljava/lang/Boolean;
 		ARG 0 projectileOwnerType
+	METHOD method_56560 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309;
+		ARG 0 livingAttacker
+	METHOD method_56561 (Lnet/minecraft/class_1297;)Z
+		ARG 0 attacker
+	METHOD method_56562 getHurtBy ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
index 97a776f562..934f9f8334 100644
--- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
@@ -15,6 +15,7 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
 	METHOD method_55719 getNextScuteShedCooldown ()I
 	METHOD method_55720 updateAnimationStates ()V
 	METHOD method_55721 isEntityThreatening (Lnet/minecraft/class_1309;)Z
+		ARG 1 entity
 	METHOD method_55722 createArmadilloAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_55723 isNotIdle ()Z
 	METHOD method_55724 unroll ()V
diff --git a/mappings/net/minecraft/network/message/MessageType.mapping b/mappings/net/minecraft/network/message/MessageType.mapping
index e456d18910..7488e7cb21 100644
--- a/mappings/net/minecraft/network/message/MessageType.mapping
+++ b/mappings/net/minecraft/network/message/MessageType.mapping
@@ -82,7 +82,9 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType
 	CLASS class_7602 Parameters
 		COMMENT A record holding the message type and the decoration parameters.
 		FIELD comp_919 type Lnet/minecraft/class_6880;
+		FIELD field_48776 CODEC Lnet/minecraft/class_9139;
 		METHOD  (Lnet/minecraft/class_6880;Lnet/minecraft/class_2561;)V
+			ARG 1 type
 			ARG 2 name
 		METHOD comp_919 type ()Lnet/minecraft/class_6880;
 		METHOD method_44837 applyChatDecoration (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping b/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping
new file mode 100644
index 0000000000..ef4820419b
--- /dev/null
+++ b/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping
@@ -0,0 +1,17 @@
+CLASS net/minecraft/class_9159 net/minecraft/server/dedicated/command/TransferCommand
+	FIELD field_48710 NO_PLAYERS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
+	METHOD method_56522 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+		ARG 0 dispatcher
+	METHOD method_56523 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
+	METHOD method_56524 (Lnet/minecraft/class_2168;)Z
+		ARG 0 source
+	METHOD method_56525 transfer (Lnet/minecraft/class_2168;Ljava/lang/String;ILjava/util/Collection;)I
+		ARG 0 source
+		ARG 1 host
+		ARG 2 port
+		ARG 3 players
+	METHOD method_56527 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
+	METHOD method_56529 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping
index cb03e115eb..323a8a3ae3 100644
--- a/mappings/net/minecraft/test/TestContext.mapping
+++ b/mappings/net/minecraft/test/TestContext.mapping
@@ -415,3 +415,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 		ARG 5 margin
 	METHOD method_56208 getEntities (Lnet/minecraft/class_1299;)Ljava/util/List;
 		ARG 1 type
+	METHOD method_56606 assertEquals (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;)V
+		ARG 1 value
+		ARG 2 expected
+		ARG 3 name
diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping
index 75faffbdc9..f5932b420c 100644
--- a/mappings/net/minecraft/world/StructureLocator.mapping
+++ b/mappings/net/minecraft/world/StructureLocator.mapping
@@ -41,6 +41,8 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator
 	METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Lnet/minecraft/class_6874;Z)Lnet/minecraft/class_6833;
 		ARG 1 pos
 		ARG 2 type
+		ARG 3 placement
+		ARG 4 skipReferencedStructures
 	METHOD method_39832 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;ZJ)Lnet/minecraft/class_6833;
 		ARG 1 pos
 		ARG 2 structure
diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping
index f36c41788e..e398c03441 100644
--- a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping
+++ b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping
@@ -54,6 +54,14 @@ CLASS net/minecraft/class_6874 net/minecraft/world/gen/chunk/placement/Structure
 	METHOD method_41644 getFrequency ()F
 	METHOD method_41645 getSalt ()I
 	METHOD method_41646 getExclusionZone ()Ljava/util/Optional;
+	METHOD method_56575 applyFrequencyReduction (IIJ)Z
+		ARG 1 chunkX
+		ARG 2 chunkZ
+		ARG 3 seed
+	METHOD method_56576 applyExclusionZone (Lnet/minecraft/class_7869;II)Z
+		ARG 1 calculator
+		ARG 2 centerChunkX
+		ARG 3 centerChunkZ
 	CLASS class_7152 ExclusionZone
 		FIELD field_37781 CODEC Lcom/mojang/serialization/Codec;
 		METHOD method_41647 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;

From a8ff75718a20bf316c45ce14cd3e560b7d191b5b Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Fri, 26 Jan 2024 16:29:45 +0900
Subject: [PATCH 21/47] 24w04a stuff (#3774)

* 24w04a stuff

* Update mappings/net/minecraft/world/updater/WorldUpdater.mapping

Co-authored-by: Shnupbups 

---------

Co-authored-by: Shnupbups 
---
 .../block/spawner/MobSpawnerEntry.mapping     |  3 +
 .../minecraft/client/gui/hud/DebugHud.mapping |  1 +
 .../client/gui/hud/debug/DebugChart.mapping   | 19 ++++++
 .../ClientConfigurationNetworkHandler.mapping |  1 +
 .../network/ClientPlayNetworkHandler.mapping  |  3 +
 .../client/network/ClientRegistries.mapping   | 32 ++++++++++
 .../RealmsSelectFileToUploadScreen.mapping    |  2 +-
 .../minecraft/entity/SpawnRestriction.mapping |  4 ++
 .../entity/passive/ArmadilloBrain.mapping     |  2 +
 .../projectile/ProjectileEntity.mapping       |  1 +
 .../minecraft/network/RegistryByteBuf.mapping |  2 +-
 .../network/codec/PacketCodec.mapping         |  2 +-
 .../s2c/play/ChatMessageS2CPacket.mapping     |  3 +
 .../s2c/play/ChunkDataS2CPacket.mapping       |  2 +-
 .../s2c/play/CommonPlayerSpawnInfo.mapping    |  4 ++
 .../play/EntityAttributesS2CPacket.mapping    |  4 ++
 .../s2c/play/EntityDamageS2CPacket.mapping    |  5 ++
 .../packet/s2c/play/GameJoinS2CPacket.mapping |  3 +
 .../RemoveEntityStatusEffectS2CPacket.mapping |  2 +
 .../registry/MutableRegistry.mapping          |  2 +-
 .../minecraft/registry/RegistryLoader.mapping | 48 ++++++++++++++-
 .../registry/SerializableRegistries.mapping   | 22 +++++++
 .../registry/tag/TagPacketSerializer.mapping  |  3 +
 mappings/net/minecraft/server/Main.mapping    |  1 +
 .../minecraft/server/MinecraftServer.mapping  |  9 +++
 .../dedicated/ServerPropertiesHandler.mapping |  1 +
 .../dedicated/command/TransferCommand.mapping |  2 +-
 .../ServerConfigurationNetworkHandler.mapping |  3 +
 .../util/collection/PriorityIterator.mapping  |  8 +++
 .../util/profiler/PerformanceLog.mapping      |  8 +++
 .../util/profiler/ServerTickType.mapping      |  1 +
 .../world/gen/StructureAccessor.mapping       |  2 +
 ...mapping => ChunkCompressionFormat.mapping} | 20 ++++++-
 .../storage/ChunkPosKeyedStorage.mapping      | 23 ++++++++
 .../storage/EntityChunkDataAccess.mapping     |  5 ++
 .../storage/RecreatedChunkStorage.mapping     |  8 +++
 .../world/storage/RecreationStorage.mapping   | 10 ++++
 .../world/storage/RegionFile.mapping          |  7 ++-
 .../SerializingRegionBasedStorage.mapping     | 11 +++-
 .../world/storage/StorageIoWorker.mapping     |  2 +
 .../storage/VersionedChunkStorage.mapping     |  2 +
 .../world/updater/WorldUpdater.mapping        | 58 +++++++++++++++++++
 42 files changed, 339 insertions(+), 12 deletions(-)
 create mode 100644 mappings/net/minecraft/client/network/ClientRegistries.mapping
 create mode 100644 mappings/net/minecraft/util/profiler/ServerTickType.mapping
 rename mappings/net/minecraft/world/storage/{ChunkStreamVersion.mapping => ChunkCompressionFormat.mapping} (65%)
 create mode 100644 mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
 create mode 100644 mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
 create mode 100644 mappings/net/minecraft/world/storage/RecreationStorage.mapping

diff --git a/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping b/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping
index 7fabf5dab4..0e993ec413 100644
--- a/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping
+++ b/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping
@@ -35,3 +35,6 @@ CLASS net/minecraft/class_1952 net/minecraft/block/spawner/MobSpawnerEntry
 			ARG 0 rules
 		METHOD method_51719 createLightLimitCodec (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec;
 			ARG 0 name
+		METHOD method_56563 canSpawn (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)Z
+			ARG 1 pos
+			ARG 2 world
diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
index e0543b0374..acf56bb19c 100644
--- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
+++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
@@ -79,6 +79,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
 	METHOD method_53543 getPingLog ()Lnet/minecraft/class_8743;
 	METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_8743;
 	METHOD method_53545 clear ()V
+	METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_8743;
 	CLASS class_7412 AllocationRateCalculator
 		FIELD field_38986 INTERVAL I
 		FIELD field_38987 GARBAGE_COLLECTORS Ljava/util/List;
diff --git a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping
index 3fb038b0c4..da5855da96 100644
--- a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping
+++ b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping
@@ -9,7 +9,9 @@ CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart
 		ARG 1 value
 	METHOD method_53469 getColor (DDIDIDI)I
 		ARG 1 value
+		ARG 3 min
 		ARG 5 minColor
+		ARG 6 median
 		ARG 8 medianColor
 		ARG 9 max
 		ARG 11 maxColor
@@ -33,3 +35,20 @@ CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart
 		ARG 4 y
 	METHOD method_53475 getHeight (D)I
 		ARG 1 value
+	METHOD method_56578 drawBar (Lnet/minecraft/class_332;III)V
+		ARG 1 context
+		ARG 2 y
+		ARG 3 x
+		ARG 4 index
+	METHOD method_56579 get (I)J
+		ARG 1 index
+	METHOD method_56580 drawTotalBar (Lnet/minecraft/class_332;III)V
+		ARG 1 context
+		ARG 2 y
+		ARG 3 x
+		ARG 4 index
+	METHOD method_56581 drawOverlayBar (Lnet/minecraft/class_332;III)V
+		ARG 1 context
+		ARG 2 y
+		ARG 3 x
+		ARG 4 index
diff --git a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping
index 77cd1a161e..430579abbd 100644
--- a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping
@@ -3,5 +3,6 @@ CLASS net/minecraft/class_8674 net/minecraft/client/network/ClientConfigurationN
 	FIELD field_45597 profile Lcom/mojang/authlib/GameProfile;
 	FIELD field_45598 registryManager Lnet/minecraft/class_5455$class_6890;
 	FIELD field_45599 enabledFeatures Lnet/minecraft/class_7699;
+	FIELD field_48766 clientRegistries Lnet/minecraft/class_9173;
 	METHOD method_52797 handleCustomPayload (Lnet/minecraft/class_8710;)V
 		ARG 1 payload
diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index ccebfc71ed..0f8345a2dd 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -140,3 +140,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 		ARG 2 world
 	METHOD method_54134 clearWorld ()V
 	METHOD method_55823 getScoreboard ()Lnet/minecraft/class_269;
+	METHOD method_56582 handleSynchronizedTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
+		ARG 1 registryRef
+		ARG 2 tags
diff --git a/mappings/net/minecraft/client/network/ClientRegistries.mapping b/mappings/net/minecraft/client/network/ClientRegistries.mapping
new file mode 100644
index 0000000000..9a6b7917e9
--- /dev/null
+++ b/mappings/net/minecraft/client/network/ClientRegistries.mapping
@@ -0,0 +1,32 @@
+CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries
+	FIELD field_48767 dynamicRegistries Lnet/minecraft/class_9173$class_9174;
+	FIELD field_48768 tags Lnet/minecraft/class_9173$class_9175;
+	METHOD method_56583 putDynamicRegistry (Lnet/minecraft/class_5321;Ljava/util/List;)V
+		ARG 1 registryRef
+		ARG 2 entries
+	METHOD method_56584 (Lnet/minecraft/class_5455$class_6892;)V
+		ARG 0 entry
+	METHOD method_56585 createRegistryManager (Lnet/minecraft/class_5455;Z)Lnet/minecraft/class_5455$class_6890;
+		ARG 1 precedingRegistryManager
+		ARG 2 local
+	METHOD method_56586 putTags (Ljava/util/Map;)V
+		ARG 1 tags
+	CLASS class_9174 DynamicRegistries
+		FIELD field_48769 dynamicRegistries Ljava/util/Map;
+		METHOD method_56587 (Lnet/minecraft/class_5321;)Ljava/util/List;
+			ARG 0 registries
+		METHOD method_56588 put (Lnet/minecraft/class_5321;Ljava/util/List;)V
+			ARG 1 registryRef
+			ARG 2 entries
+		METHOD method_56589 load (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455;
+			ARG 1 precedingRegistryManager
+	CLASS class_9175 Tags
+		FIELD field_48770 tagsByRegistry Ljava/util/Map;
+		METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
+			ARG 1 registryRef
+			ARG 2 serialized
+		METHOD method_56591 load (Lnet/minecraft/class_5455;)V
+			ARG 1 registryManager
+		METHOD method_56592 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
+			ARG 1 registryRef
+			ARG 2 serialized
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping
index 614fc42582..5ff4d13ed6 100644
--- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping
+++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping
@@ -10,7 +10,7 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele
 	FIELD field_20057 worldSelectionList Lnet/minecraft/class_4416$class_4418;
 	FIELD field_20058 WORLD_LANG Lnet/minecraft/class_2561;
 	FIELD field_26507 HARDCORE_TEXT Lnet/minecraft/class_2561;
-	FIELD field_26508 CHEATS_TEXT Lnet/minecraft/class_2561;
+	FIELD field_26508 COMMANDS_TEXT Lnet/minecraft/class_2561;
 	FIELD field_44909 LOADING_ERROR_TEXT Lnet/minecraft/class_2561;
 	FIELD field_46131 TITLE Lnet/minecraft/class_2561;
 	FIELD field_48387 creationTask Lnet/minecraft/class_4445;
diff --git a/mappings/net/minecraft/entity/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping
index 37197a551b..ad80feca79 100644
--- a/mappings/net/minecraft/entity/SpawnRestriction.mapping
+++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping
@@ -11,6 +11,10 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction
 		ARG 2 spawnReason
 		ARG 3 pos
 		ARG 4 random
+	METHOD method_56558 isSpawnPosAllowed (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z
+		ARG 0 type
+		ARG 1 world
+		ARG 2 pos
 	METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_9168;
 		ARG 0 type
 	METHOD method_6160 getHeightmapType (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2902$class_2903;
diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
index 9bbbb77ab1..1d50d2dad3 100644
--- a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
+++ b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
@@ -26,3 +26,5 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain
 		ARG 0 brain
 	CLASS class_9072 RollUpTask
 	CLASS class_9073 UnrollAndFleeTask
+		METHOD method_56559 (Lnet/minecraft/class_1314;)Z
+			ARG 0 entity
diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping
index 2cacd1b28f..4f5041548c 100644
--- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity
 	FIELD field_23740 leftOwner Z
 	FIELD field_28646 shot Z
 	FIELD field_33399 owner Lnet/minecraft/class_1297;
+	FIELD field_48746 deflected Z
 	METHOD method_24919 setVelocity (Lnet/minecraft/class_1297;FFFFF)V
 		COMMENT Sets velocity and updates rotation accordingly.
 		ARG 1 shooter
diff --git a/mappings/net/minecraft/network/RegistryByteBuf.mapping b/mappings/net/minecraft/network/RegistryByteBuf.mapping
index 46fb88b7e0..1afd0d648c 100644
--- a/mappings/net/minecraft/network/RegistryByteBuf.mapping
+++ b/mappings/net/minecraft/network/RegistryByteBuf.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_9129 net/minecraft/network/RegistryByteBuf
 	COMMENT A packet byte buffer bound to a particular {@link DynamicRegistryManager} instance.
 	COMMENT
-	COMMENT 
    This is used during the {@link NetworkStateType#PLAY} phase only.
+	COMMENT 
    This is used during the {@link NetworkPhase#PLAY} phase only.
 	FIELD field_48538 registryManager Lnet/minecraft/class_5455;
 	METHOD  (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_5455;)V
 		ARG 1 buf
diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping
index 6cbc3a5104..d227d0ed66 100644
--- a/mappings/net/minecraft/network/codec/PacketCodec.mapping
+++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping
@@ -119,7 +119,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec
 		COMMENT This method should be called on the codec for the "type" - like {@link
 		COMMENT net.minecraft.stat.StatType}. An example:
 		COMMENT
-		COMMENT 
    {@code
+		COMMENT 
    {@code
 		COMMENT public static final PacketCodec> PACKET_CODEC = PacketCodecs.registryValue(RegistryKeys.THING_TYPE).dispatch(Thing::getType, ThingType::getPacketCodec);
 		COMMENT }
    
 		ARG 1 type
diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping
index 4e2bf779da..044d542aa3 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping
@@ -21,5 +21,8 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage
 	COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onChatMessage
 	FIELD comp_943 serializedParameters Lnet/minecraft/class_2556$class_7602;
 	FIELD field_47949 CODEC Lnet/minecraft/class_9139;
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7602;
 	METHOD method_55898 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping
index ad25ae7ecb..f8610f5986 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping
@@ -15,5 +15,5 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2
 	METHOD method_11524 getChunkZ ()I
 	METHOD method_38598 getChunkData ()Lnet/minecraft/class_6603;
 	METHOD method_38599 getLightData ()Lnet/minecraft/class_6606;
-	METHOD method_55883 (Lnet/minecraft/class_9129;)V
+	METHOD method_55883 write (Lnet/minecraft/class_9129;)V
 		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping
index a2ca21a81f..d1402580bb 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping
@@ -1,6 +1,10 @@
 CLASS net/minecraft/class_8589 net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo
 	FIELD comp_1556 gameMode Lnet/minecraft/class_1934;
 	FIELD comp_1557 prevGameMode Lnet/minecraft/class_1934;
+	FIELD field_48708 DIMENSION_TYPE_PACKET_CODEC Lnet/minecraft/class_9139;
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD comp_1556 gameMode ()Lnet/minecraft/class_1934;
 	METHOD comp_1557 prevGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_52274 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping
index 6aabd59a7f..48f2046bdf 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping
@@ -16,3 +16,7 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri
 		METHOD  (Lnet/minecraft/class_6880;DLjava/util/Collection;)V
 			ARG 2 baseValue
 			ARG 4 modifiers
+		METHOD method_55953 (Ljava/util/UUID;Ljava/lang/Double;Lnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1322;
+			ARG 0 attribute
+			ARG 1 base
+			ARG 2 modifiers
diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping
index 76f2fb2a62..ad58c9c7f9 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping
@@ -1,9 +1,13 @@
 CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket
 	FIELD field_47921 CODEC Lnet/minecraft/class_9139;
+	FIELD field_48707 DAMAGE_TYPE_PACKET_CODEC Lnet/minecraft/class_9139;
 	METHOD  (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V
 		ARG 1 entity
 		ARG 2 damageSource
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD method_49071 createDamageSource (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1282;
+		ARG 1 world
 	METHOD method_49072 writeOffsetVarInt (Lnet/minecraft/class_2540;I)V
 		ARG 0 buf
 		ARG 1 value
@@ -15,3 +19,4 @@ CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamag
 	METHOD method_49076 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_243;
 		ARG 0 pos
 	METHOD method_55873 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
index 4092d0ef45..2f36db6b16 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
@@ -9,6 +9,8 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	FIELD field_47937 CODEC Lnet/minecraft/class_9139;
 	METHOD  (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;Z)V
 		ARG 1 playerEntityId
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD comp_100 showDeathScreen ()Z
 	METHOD comp_88 playerEntityId ()I
 	METHOD comp_89 hardcore ()Z
@@ -19,3 +21,4 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	METHOD method_34135 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5321;
 		ARG 0 b
 	METHOD method_55887 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping
index 330937a992..664a854e24 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping
@@ -4,3 +4,5 @@ CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntit
 		ARG 1 entityId
 	METHOD method_11767 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297;
 		ARG 1 world
+	METHOD method_55907 (Lnet/minecraft/class_2718;)Ljava/lang/Integer;
+		ARG 0 packet
diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping
index 061fae5b57..904aee6ece 100644
--- a/mappings/net/minecraft/registry/MutableRegistry.mapping
+++ b/mappings/net/minecraft/registry/MutableRegistry.mapping
@@ -5,7 +5,7 @@ CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry
 	COMMENT @see Registry
 	METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883;
 		ARG 1 key
-		ARG 2 entry
+		ARG 2 value
 		ARG 3 lifecycle
 	METHOD method_35863 isEmpty ()Z
 		COMMENT {@return whether the registry is empty}
diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping
index 7e0142637e..2111871f06 100644
--- a/mappings/net/minecraft/registry/RegistryLoader.mapping
+++ b/mappings/net/minecraft/registry/RegistryLoader.mapping
@@ -2,12 +2,21 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 	FIELD field_39968 DYNAMIC_REGISTRIES Ljava/util/List;
 	FIELD field_39969 DIMENSION_REGISTRIES Ljava/util/List;
 	FIELD field_39970 LOGGER Lorg/slf4j/Logger;
+	FIELD field_48709 SYNCED_REGISTRIES Ljava/util/List;
 	METHOD method_45119 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String;
 		ARG 0 id
+	METHOD method_45120 (Lnet/minecraft/class_7655$class_7656;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_7655$class_9158;)V
+		ARG 2 loader
 	METHOD method_45121 load (Lnet/minecraft/class_7655$class_7656;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
+		ARG 0 loadable
 		ARG 1 baseRegistryManager
 		ARG 2 entries
-	METHOD method_45122 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
+	METHOD method_45122 loadFromResource (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
+		ARG 0 resourceManager
+		ARG 1 infoGetter
+		ARG 2 registry
+		ARG 3 elementDecoder
+		ARG 4 errors
 	METHOD method_45123 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V
 		ARG 1 entry
 	METHOD method_45124 (Ljava/lang/String;)V
@@ -18,6 +27,8 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		ARG 0 exceptions
 	METHOD method_45127 (Ljava/util/Map;Lnet/minecraft/class_7655$class_7657;)Lnet/minecraft/class_7655$class_9158;
 		ARG 1 entry
+	METHOD method_45128 (Ljava/util/Map;Lnet/minecraft/class_7655$class_9158;)V
+		ARG 1 loader
 	METHOD method_45129 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V
 		ARG 1 elementEntry
 	METHOD method_45130 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960;
@@ -29,11 +40,46 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		ARG 1 additionalRegistries
 	METHOD method_46620 createInfo (Lnet/minecraft/class_2385;)Lnet/minecraft/class_6903$class_7862;
 		ARG 0 registry
+	METHOD method_46621 (Ljava/util/Map;Lnet/minecraft/class_7655$class_9158;)V
+		ARG 1 loader
 	METHOD method_46622 (Ljava/util/Map;Lnet/minecraft/class_5455$class_6892;)V
 		ARG 1 entry
+	METHOD method_56514 (Lnet/minecraft/class_3300;Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
+		ARG 1 loader
+		ARG 2 infoGetter
+	METHOD method_56515 loadFromResource (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
+		ARG 0 resourceManager
+		ARG 1 registryManager
+		ARG 2 entries
+	METHOD method_56516 (Ljava/lang/String;)V
+		ARG 0 error
+	METHOD method_56517 (Ljava/util/Map;Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
+		ARG 1 loader
+		ARG 2 infoGetter
+	METHOD method_56518 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
+		ARG 0 data
+		ARG 1 infoGetter
+		ARG 2 registry
+		ARG 3 elementDecoder
+		ARG 4 errors
+	METHOD method_56519 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
+		ARG 0 data
+		ARG 1 registryManager
+		ARG 2 entries
 	CLASS class_7656 RegistryLoadable
+		METHOD apply (Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
+			ARG 1 loader
+			ARG 2 infoGetter
 	CLASS class_7657 Entry
 		METHOD method_45131 getLoader (Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_7655$class_9158;
 			ARG 1 lifecycle
+			ARG 2 errors
 		METHOD method_54920 addToCloner (Ljava/util/function/BiConsumer;)V
 			ARG 1 callback
+	CLASS class_9158 Loader
+		METHOD method_56520 loadFromResource (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V
+			ARG 1 resourceManager
+			ARG 2 infoGetter
+		METHOD method_56521 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_6903$class_7863;)V
+			ARG 1 data
+			ARG 2 infoGetter
diff --git a/mappings/net/minecraft/registry/SerializableRegistries.mapping b/mappings/net/minecraft/registry/SerializableRegistries.mapping
index cf196d5a57..844649b391 100644
--- a/mappings/net/minecraft/registry/SerializableRegistries.mapping
+++ b/mappings/net/minecraft/registry/SerializableRegistries.mapping
@@ -1,7 +1,29 @@
 CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries
+	FIELD field_48771 SYNCED_REGISTRIES Ljava/util/Set;
 	METHOD method_45953 streamRegistryManagerEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream;
 		ARG 0 combinedRegistries
 	METHOD method_45956 stream (Lnet/minecraft/class_5455;)Ljava/util/stream/Stream;
 		ARG 0 dynamicRegistryManager
 	METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream;
 		ARG 0 combinedRegistries
+	METHOD method_56595 (Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/List;Lnet/minecraft/class_6880$class_6883;)V
+		ARG 3 registryEntry
+	METHOD method_56596 (Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2378;)V
+		ARG 3 registry
+	METHOD method_56597 serialize (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;)V
+		ARG 0 nbtOps
+		ARG 1 entry
+		ARG 2 registryManager
+		ARG 3 callback
+	METHOD method_56598 forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;)V
+		ARG 0 nbtOps
+		ARG 1 registryManager
+		ARG 2 callback
+	METHOD method_56599 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;Lnet/minecraft/class_7655$class_7657;)V
+		ARG 3 entry
+	METHOD method_56600 (Lnet/minecraft/class_6880$class_6883;Ljava/lang/String;)Ljava/lang/IllegalArgumentException;
+		ARG 1 error
+	METHOD method_56601 (Lnet/minecraft/class_5455$class_6892;)Z
+		ARG 0 registry
+	CLASS class_9176 SerializedRegistryEntry
+		FIELD field_48772 PACKET_CODEC Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
index 2c622bf89e..72ae960d22 100644
--- a/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
+++ b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
@@ -31,6 +31,9 @@ CLASS net/minecraft/class_6864 net/minecraft/registry/tag/TagPacketSerializer
 			ARG 1 buf
 		METHOD method_33160 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6864$class_5748;
 			ARG 0 buf
+		METHOD method_56531 size ()I
+		METHOD method_56532 loadTo (Lnet/minecraft/class_2378;)V
+			ARG 1 registry
 	CLASS class_6865 Loader
 		METHOD accept (Lnet/minecraft/class_6862;Ljava/util/List;)V
 			ARG 1 tag
diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping
index 381128cb46..490bdd20e9 100644
--- a/mappings/net/minecraft/server/Main.mapping
+++ b/mappings/net/minecraft/server/Main.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/server/Main
 		ARG 2 eraseCache
 		ARG 3 continueCheck
 		ARG 4 dimensionOptionsRegistry
+		ARG 5 recreateRegionFiles
 	METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lnet/minecraft/class_7497;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176;
 		ARG 11 thread
 	METHOD method_43612 (Lnet/minecraft/class_7237$class_6906;Lcom/mojang/serialization/Dynamic;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index 363e4ddb92..eadbc30998 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -83,6 +83,9 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_47145 OVERLOAD_WARNING_INTERVAL_NANOS J
 	FIELD field_47147 PLAYER_SAMPLE_UPDATE_INTERVAL_NANOS J
 	FIELD field_47148 PREPARE_START_REGION_TICK_DELAY_NANOS J
+	FIELD field_48773 prevFullTickLogTime J
+	FIELD field_48774 tasksStartTime J
+	FIELD field_48775 waitTime J
 	METHOD  (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/net/Proxy;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7497;Lnet/minecraft/class_3950;)V
 		ARG 1 serverThread
 		ARG 2 session
@@ -449,6 +452,12 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_54835 getTickTimes ()[J
 	METHOD method_54837 getAutosaveInterval ()I
 	METHOD method_56040 acceptsTransfers ()Z
+	METHOD method_56593 getPerformanceLog ()Lnet/minecraft/class_8743;
+	METHOD method_56602 pushTickLog (J)V
+		ARG 1 tickStartTime
+	METHOD method_56603 pushFullTickLog ()V
+	METHOD method_56604 startTaskPerformanceLog ()V
+	METHOD method_56605 pushPerformanceLogs ()V
 	CLASS class_6414 DebugStart
 		FIELD field_33980 time J
 		FIELD field_33981 tick I
diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
index 8396a31dda..562fedf9ac 100644
--- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
+++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
@@ -55,6 +55,7 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
 	FIELD field_39983 worldGenProperties Lnet/minecraft/class_3806$class_7044;
 	FIELD field_44985 logIps Z
 	FIELD field_48270 acceptsTransfers Z
+	FIELD field_48711 regionFileCompression Ljava/lang/String;
 	METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806;
 		ARG 0 path
 	METHOD method_16715 (Ljava/lang/Integer;)Ljava/lang/Integer;
diff --git a/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping b/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping
index ef4820419b..ab5bd75cd1 100644
--- a/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping
+++ b/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping
@@ -6,7 +6,7 @@ CLASS net/minecraft/class_9159 net/minecraft/server/dedicated/command/TransferCo
 		ARG 0 context
 	METHOD method_56524 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
-	METHOD method_56525 transfer (Lnet/minecraft/class_2168;Ljava/lang/String;ILjava/util/Collection;)I
+	METHOD method_56525 executeTransfer (Lnet/minecraft/class_2168;Ljava/lang/String;ILjava/util/Collection;)I
 		ARG 0 source
 		ARG 1 host
 		ARG 2 port
diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
index 22743d8862..e2e1f4515f 100644
--- a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
+++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
@@ -13,3 +13,6 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN
 	METHOD method_52410 endConfiguration ()V
 	METHOD method_52411 queueSendResourcePackTask ()V
 	METHOD method_52412 pollTask ()V
+	METHOD method_56530 (Lnet/minecraft/class_5321;Ljava/util/List;)V
+		ARG 1 registryRef
+		ARG 2 entries
diff --git a/mappings/net/minecraft/util/collection/PriorityIterator.mapping b/mappings/net/minecraft/util/collection/PriorityIterator.mapping
index bcc4af8b13..9fea0bf3e8 100644
--- a/mappings/net/minecraft/util/collection/PriorityIterator.mapping
+++ b/mappings/net/minecraft/util/collection/PriorityIterator.mapping
@@ -1,6 +1,14 @@
 CLASS net/minecraft/class_8917 net/minecraft/util/collection/PriorityIterator
+	COMMENT A queue-like iterator that orders its values by the priority, or the insertion order
+	COMMENT if the priorities equal.
+	FIELD field_48714 LOWEST_PRIORITY I
+	FIELD field_48715 maxPriorityQueue Ljava/util/Deque;
+	FIELD field_48716 maxPriority I
+	FIELD field_48717 queuesByPriority Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	METHOD method_54723 (I)Ljava/util/Deque;
 		ARG 0 p
 	METHOD method_54726 enqueue (Ljava/lang/Object;I)V
+		COMMENT Adds {@code value} with the priority {@code priority}.
 		ARG 1 value
 		ARG 2 priority
+	METHOD method_56533 refreshMaxPriority ()V
diff --git a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
index 7d4decd7fa..74c20a6bfa 100644
--- a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
+++ b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog
 	FIELD field_45720 data [[J
 	FIELD field_45721 currentIndex I
 	FIELD field_45722 maxIndex I
+	METHOD  (I)V
+		ARG 1 columns
 	METHOD method_53064 size ()I
 	METHOD method_53065 get (I)J
 		ARG 1 index
@@ -12,3 +14,9 @@ CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog
 	METHOD method_53068 wrap (I)I
 		ARG 1 index
 	METHOD method_53069 reset ()V
+	METHOD method_56534 get (II)J
+		ARG 1 index
+		ARG 2 column
+	METHOD method_56535 push (JI)V
+		ARG 1 value
+		ARG 3 column
diff --git a/mappings/net/minecraft/util/profiler/ServerTickType.mapping b/mappings/net/minecraft/util/profiler/ServerTickType.mapping
new file mode 100644
index 0000000000..dd2203c870
--- /dev/null
+++ b/mappings/net/minecraft/util/profiler/ServerTickType.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9160 net/minecraft/util/profiler/ServerTickType
diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping
index 9fff8bc5a5..a590b41e91 100644
--- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping
+++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping
@@ -43,6 +43,8 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor
 	METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Lnet/minecraft/class_6874;Z)Lnet/minecraft/class_6833;
 		ARG 1 chunkPos
 		ARG 2 structure
+		ARG 3 placement
+		ARG 4 skipReferencedStructures
 	METHOD method_39784 incrementReferences (Lnet/minecraft/class_3449;)V
 		ARG 1 structureStart
 	METHOD method_41032 acceptStructureStarts (Lnet/minecraft/class_3195;Lit/unimi/dsi/fastutil/longs/LongSet;Ljava/util/function/Consumer;)V
diff --git a/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping b/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping
similarity index 65%
rename from mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping
rename to mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping
index cda10fa13c..e1348c7e02 100644
--- a/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping
+++ b/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping
@@ -1,13 +1,22 @@
-CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkStreamVersion
+CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkCompressionFormat
 	FIELD field_20442 GZIP Lnet/minecraft/class_4486;
 	FIELD field_20443 DEFLATE Lnet/minecraft/class_4486;
 	FIELD field_20444 UNCOMPRESSED Lnet/minecraft/class_4486;
-	FIELD field_20445 VERSIONS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	FIELD field_20445 FORMATS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD field_20446 id I
 	FIELD field_20447 inputStreamWrapper Lnet/minecraft/class_4486$class_4487;
 	FIELD field_20448 outputStreamWrapper Lnet/minecraft/class_4486$class_4487;
+	FIELD field_48753 LZ4 Lnet/minecraft/class_4486;
+	FIELD field_48754 DEFAULT_FORMAT Lnet/minecraft/class_4486;
+	FIELD field_48755 LOGGER Lorg/slf4j/Logger;
+	FIELD field_48756 FORMAT_BY_NAME Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	FIELD field_48757 currentFormat Lnet/minecraft/class_4486;
+	FIELD field_48758 name Ljava/lang/String;
 	METHOD  (ILjava/lang/String;Lnet/minecraft/class_4486$class_4487;Lnet/minecraft/class_4486$class_4487;)V
 		ARG 1 id
+		ARG 2 name
+		ARG 3 inputStreamWrapper
+		ARG 4 outputStreamWrapper
 	METHOD method_21882 getId ()I
 	METHOD method_21883 get (I)Lnet/minecraft/class_4486;
 		ARG 0 id
@@ -31,6 +40,13 @@ CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkStreamVersion
 		ARG 0 stream
 	METHOD method_39806 (Ljava/io/OutputStream;)Ljava/io/OutputStream;
 		ARG 0 stream
+	METHOD method_56567 getCurrentFormat ()Lnet/minecraft/class_4486;
+	METHOD method_56568 setCurrentFormat (Ljava/lang/String;)V
+		ARG 0 name
+	METHOD method_56569 (Ljava/io/InputStream;)Ljava/io/InputStream;
+		ARG 0 stream
+	METHOD method_56570 (Ljava/io/OutputStream;)Ljava/io/OutputStream;
+		ARG 0 stream
 	CLASS class_4487 Wrapper
 		METHOD wrap (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 object
diff --git a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
new file mode 100644
index 0000000000..e2ec92f403
--- /dev/null
+++ b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
@@ -0,0 +1,23 @@
+CLASS net/minecraft/class_9172 net/minecraft/world/storage/ChunkPosKeyedStorage
+	FIELD field_48760 worker Lnet/minecraft/class_4698;
+	FIELD field_48761 dataFixer Lcom/mojang/datafixers/DataFixer;
+	FIELD field_48762 dataFixTypes Lnet/minecraft/class_4284;
+	METHOD  (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/lang/String;Lnet/minecraft/class_4284;)V
+		ARG 1 directory
+		ARG 2 dataFixer
+		ARG 3 dsync
+		ARG 4 name
+		ARG 5 dataFixTypes
+	METHOD method_56565 set (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 pos
+		ARG 2 nbt
+	METHOD method_56571 update (Lcom/mojang/serialization/Dynamic;I)Lcom/mojang/serialization/Dynamic;
+		ARG 1 nbt
+		ARG 2 oldVersion
+	METHOD method_56572 read (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 pos
+	METHOD method_56573 update (Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487;
+		ARG 1 nbt
+		ARG 2 oldVersion
+	METHOD method_56574 completeAll (Z)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 sync
diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
index fad2699158..059d4486b5 100644
--- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
+++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
@@ -5,6 +5,11 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess
 	FIELD field_31414 ENTITIES_KEY Ljava/lang/String;
 	FIELD field_31415 POSITION_KEY Ljava/lang/String;
 	FIELD field_34056 taskExecutor Lnet/minecraft/class_3846;
+	FIELD field_48747 storage Lnet/minecraft/class_9172;
+	METHOD  (Lnet/minecraft/class_9172;Lnet/minecraft/class_3218;Ljava/util/concurrent/Executor;)V
+		ARG 1 storage
+		ARG 2 world
+		ARG 3 executor
 	METHOD method_31730 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Void;
 		ARG 1 ex
 	METHOD method_31731 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lnet/minecraft/class_5566;
diff --git a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
new file mode 100644
index 0000000000..a679f9da05
--- /dev/null
+++ b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_9170 net/minecraft/world/storage/RecreatedChunkStorage
+	FIELD field_48748 recreationWorker Lnet/minecraft/class_4698;
+	FIELD field_48749 outputDirectory Ljava/nio/file/Path;
+	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V
+		ARG 1 directory
+		ARG 2 outputDirectory
+		ARG 3 dataFixer
+		ARG 4 dsync
diff --git a/mappings/net/minecraft/world/storage/RecreationStorage.mapping b/mappings/net/minecraft/world/storage/RecreationStorage.mapping
new file mode 100644
index 0000000000..7e8689b8ea
--- /dev/null
+++ b/mappings/net/minecraft/world/storage/RecreationStorage.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9171 net/minecraft/world/storage/RecreationStorage
+	FIELD field_48750 recreationWorker Lnet/minecraft/class_4698;
+	FIELD field_48751 outputDirectory Ljava/nio/file/Path;
+	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/lang/String;Lnet/minecraft/class_4284;)V
+		ARG 1 directory
+		ARG 2 outputDirectory
+		ARG 3 dataFixer
+		ARG 4 dsync
+		ARG 5 name
+		ARG 6 dataFixTypes
diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping
index c572dbb7ae..c1442faa6e 100644
--- a/mappings/net/minecraft/world/storage/RegionFile.mapping
+++ b/mappings/net/minecraft/world/storage/RegionFile.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	FIELD field_20434 LOGGER Lorg/slf4j/Logger;
 	FIELD field_20435 ZERO Ljava/nio/ByteBuffer;
 	FIELD field_20436 channel Ljava/nio/channels/FileChannel;
-	FIELD field_20437 outputChunkStreamVersion Lnet/minecraft/class_4486;
+	FIELD field_20437 compressionFormat Lnet/minecraft/class_4486;
 	FIELD field_20438 header Ljava/nio/ByteBuffer;
 	FIELD field_20439 sectorData Ljava/nio/IntBuffer;
 	FIELD field_20440 saveTimes Ljava/nio/IntBuffer;
@@ -10,9 +10,11 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	FIELD field_20657 directory Ljava/nio/file/Path;
 	FIELD field_31417 SECTOR_DATA_LIMIT I
 	FIELD field_31421 FILE_EXTENSION Ljava/lang/String;
+	FIELD field_48752 path Ljava/nio/file/Path;
 	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V
-		ARG 1 file
+		ARG 1 path
 		ARG 2 directory
+		ARG 3 compressionFormat
 		ARG 4 dsync
 	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V
 		ARG 1 file
@@ -68,6 +70,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	METHOD method_31739 getEpochTimeSeconds ()I
 	METHOD method_31740 delete (Lnet/minecraft/class_1923;)V
 		ARG 1 pos
+	METHOD method_56566 getPath ()Ljava/nio/file/Path;
 	CLASS class_2862 ChunkBuffer
 		FIELD field_17656 pos Lnet/minecraft/class_1923;
 		METHOD  (Lnet/minecraft/class_2861;Lnet/minecraft/class_1923;)V
diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
index 910935218a..8a7126cfd8 100644
--- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
+++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
@@ -6,7 +6,14 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 	FIELD field_24750 codecFactory Ljava/util/function/Function;
 	FIELD field_27240 world Lnet/minecraft/class_5539;
 	FIELD field_31427 SECTIONS_KEY Ljava/lang/String;
-	FIELD field_39315 dynamicRegistryManager Lnet/minecraft/class_5455;
+	FIELD field_39315 registryManager Lnet/minecraft/class_5455;
+	FIELD field_48759 storageAccess Lnet/minecraft/class_9172;
+	METHOD  (Lnet/minecraft/class_9172;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V
+		ARG 1 storageAccess
+		ARG 2 codecFactory
+		ARG 3 factory
+		ARG 4 registryManager
+		ARG 5 world
 	METHOD method_19288 onUpdate (J)V
 		ARG 1 pos
 	METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V
@@ -30,6 +37,8 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 		ARG 2 ops
 	METHOD method_20368 update (Lnet/minecraft/class_1923;Lnet/minecraft/class_6903;Lnet/minecraft/class_2487;)V
 		ARG 1 pos
+		ARG 2 ops
+		ARG 3 nbt
 	METHOD method_20369 getDataVersion (Lcom/mojang/serialization/Dynamic;)I
 		ARG 0 dynamic
 	METHOD method_20370 save (Lnet/minecraft/class_1923;)V
diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
index 398694b8c8..db979f08d0 100644
--- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
+++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
@@ -18,6 +18,8 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker
 	METHOD method_23703 setResult (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 pos
 		ARG 2 nbt
+	METHOD method_23705 (Lnet/minecraft/class_4698$class_4699;)Ljava/util/concurrent/CompletableFuture;
+		ARG 0 result
 	METHOD method_23709 run (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 task
 	METHOD method_23711 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)Lnet/minecraft/class_4698$class_4699;
diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
index ae8e6373f2..5ddd3e1c0d 100644
--- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
+++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
@@ -33,3 +33,5 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage
 	METHOD method_43411 getFeatureUpdater (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_3360;
 		ARG 1 worldKey
 		ARG 2 stateManagerGetter
+	METHOD method_56564 markFeatureUpdateResolved (Lnet/minecraft/class_1923;)V
+		ARG 1 chunkPos
diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
index 11179311d1..7a80de090f 100644
--- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping
+++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
@@ -5,6 +5,15 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	FIELD field_24084 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_40113 dimensionOptionsRegistry Lnet/minecraft/class_2378;
 	FIELD field_40114 worldKeys Ljava/util/Set;
+	FIELD field_48723 NEW_PREFIX Ljava/lang/String;
+	FIELD field_48724 UPGRADING_POI_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48725 FINISHED_POI_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48726 UPGRADING_ENTITIES_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48727 FINISHED_ENTITIES_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48728 UPGRADING_CHUNKS_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48729 FINISHED_CHUNKS_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48730 recreateRegionFiles Z
+	FIELD field_48731 totalRegionCount I
 	FIELD field_5755 persistentStateManager Lnet/minecraft/class_26;
 	FIELD field_5756 LOGGER Lorg/slf4j/Logger;
 	FIELD field_5757 UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory;
@@ -22,6 +31,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 		ARG 2 dataFixer
 		ARG 3 dimensionOptionsRegistry
 		ARG 4 eraseCache
+		ARG 5 recreateRegionFiles
 	METHOD method_28304 getWorlds ()Ljava/util/Set;
 	METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F
 		ARG 1 world
@@ -36,3 +46,51 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	METHOD method_5402 cancel ()V
 	METHOD method_5403 isDone ()Z
 	METHOD method_5404 updateWorld ()V
+	CLASS class_9161 Update
+		FIELD field_48732 pendingUpdateFuture Ljava/util/concurrent/CompletableFuture;
+		FIELD field_48733 dataFixTypes Lnet/minecraft/class_4284;
+		FIELD field_48735 upgradingText Lnet/minecraft/class_5250;
+		FIELD field_48736 finishedText Lnet/minecraft/class_5250;
+		FIELD field_48737 targetName Ljava/lang/String;
+		METHOD  (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V
+			ARG 2 dataFixTypes
+			ARG 3 targetName
+			ARG 4 upgradingText
+			ARG 5 finishedText
+		METHOD method_56537 update ()V
+		METHOD method_56538 update (Lnet/minecraft/class_5321;Ljava/lang/AutoCloseable;Lnet/minecraft/class_1923;)Z
+			ARG 1 worldKey
+			ARG 2 storage
+			ARG 3 chunkPos
+		METHOD method_56539 listRegions (Lnet/minecraft/class_5321;Ljava/lang/String;)Ljava/util/List;
+			ARG 1 worldKey
+			ARG 2 targetName
+		METHOD method_56540 (Lnet/minecraft/class_1257$class_9165;)I
+			ARG 0 region
+		METHOD method_56541 recreate (Lnet/minecraft/class_2861;)V
+			ARG 1 regionFile
+		METHOD method_56542 (Ljava/io/File;Ljava/lang/String;)Z
+			ARG 0 file
+			ARG 1 name
+		METHOD method_56543 update (Ljava/lang/AutoCloseable;Lnet/minecraft/class_1923;Lnet/minecraft/class_5321;)Z
+			ARG 1 storage
+			ARG 2 chunkPos
+			ARG 3 worldKey
+		METHOD method_56544 listWoldData (Ljava/lang/String;)Ljava/util/List;
+			ARG 1 targetName
+		METHOD method_56545 enumerateRegions (Ljava/lang/String;Lnet/minecraft/class_5321;)Ljava/util/ListIterator;
+			ARG 1 targetName
+			ARG 2 worldKey
+		METHOD method_56546 openStorage (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable;
+			ARG 1 targetName
+			ARG 2 worldDirectory
+			ARG 3 targetDirectory
+	CLASS class_9162 RegionUpdate
+	CLASS class_9163 WorldData
+	CLASS class_9164 EntitiesUpdate
+	CLASS class_9165 Region
+	CLASS class_9166 PoiUpdate
+	CLASS class_9167 ChunkPosKeyedStorageUpdate
+		METHOD method_56550 updateNbt (Lnet/minecraft/class_9172;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
+			ARG 1 storage
+			ARG 2 nbt

From 0babaa8c33f598b4ceb6b3baf67e4d6ba19e6831 Mon Sep 17 00:00:00 2001
From: modmuss50 
Date: Wed, 31 Jan 2024 17:12:25 +0000
Subject: [PATCH 22/47] 24w05a

---
 build.gradle                                  |  2 +-
 .../blaze3d/systems/RenderSystem.mapping      |  2 -
 mappings/net/minecraft/block/Block.mapping    |  2 +-
 .../minecraft/block/ShulkerBoxBlock.mapping   |  2 -
 .../block/entity/BlockEntity.mapping          | 18 ++--
 .../block/spawner/EntityDetector.mapping      | 15 +---
 .../block/spawner/TrialSpawnerData.mapping    |  4 +-
 .../block/spawner/TrialSpawnerLogic.mapping   |  4 +-
 mappings/net/minecraft/class_8181.mapping     |  3 +
 .../minecraft/client/MinecraftClient.mapping  |  2 +-
 .../minecraft/client/gl/ShaderProgram.mapping |  3 -
 .../minecraft/client/gui/hud/DebugHud.mapping | 16 ++--
 .../client/gui/hud/debug/DebugChart.mapping   |  4 +-
 .../client/gui/hud/debug/TickChart.mapping    |  2 +-
 .../ingame/CartographyTableScreen.mapping     |  6 +-
 .../screen/world/OptimizeWorldScreen.mapping  |  3 +-
 .../network/ClientPlayNetworkHandler.mapping  |  2 +-
 .../client/network/PingMeasurer.mapping       |  4 +-
 .../client/option/HotbarStorageEntry.mapping  |  4 -
 .../client/particle/ParticleManager.mapping   |  7 +-
 .../client/render/DiffuseLighting.mapping     |  6 +-
 .../client/render/GameRenderer.mapping        | 16 +---
 .../client/render/MapRenderer.mapping         |  9 +-
 .../render/OverlayVertexConsumer.mapping      |  5 +-
 .../client/render/VertexConsumer.mapping      |  6 +-
 .../client/render/WorldRenderer.mapping       | 33 ++-----
 .../entity/BeaconBlockEntityRenderer.mapping  | 35 +-------
 .../DragonFireballEntityRenderer.mapping      |  9 +-
 .../ExperienceOrbEntityRenderer.mapping       | 12 +--
 .../FishingBobberEntityRenderer.mapping       |  9 +-
 .../entity/GuardianEntityRenderer.mapping     | 12 +--
 .../render/entity/ItemEntityRenderer.mapping  |  6 --
 .../entity/PaintingEntityRenderer.mapping     | 14 +--
 .../entity/ProjectileEntityRenderer.mapping   | 14 +--
 .../feature/ArmorFeatureRenderer.mapping      | 16 +---
 .../StuckStingersFeatureRenderer.mapping      |  9 +-
 .../client/util/math/MatrixStack.mapping      |  1 -
 .../client/world/ClientWorld.mapping          |  3 +-
 .../command/CommandRegistryAccess.mapping     | 20 -----
 .../command/DataCommandStorage.mapping        |  2 +-
 .../ItemPredicateArgumentType.mapping         | 16 +---
 .../argument/ItemStackArgumentType.mapping    |  1 -
 .../command/argument/ItemStringReader.mapping | 49 +----------
 .../ParticleEffectArgumentType.mapping        |  6 +-
 .../argument/StyleArgumentType.mapping        |  2 +-
 .../command/argument/TextArgumentType.mapping |  2 +-
 .../net/minecraft/data/DataProvider.mapping   |  5 +-
 .../data/client/ItemModelGenerator.mapping    |  6 +-
 .../advancement/AdvancementProvider.mapping   |  2 -
 .../loottable/LootTableProvider.mapping       |  4 +-
 .../OneTwentyOneLootTableProviders.mapping    |  2 +-
 .../TradeRebalanceLootTableProviders.mapping  |  2 +-
 .../vanilla/VanillaLootTableProviders.mapping |  2 +-
 .../data/server/recipe/RecipeProvider.mapping |  5 +-
 .../data/server/tag/TagProvider.mapping       |  2 -
 .../BlockEntitySignTextStrictJsonFix.mapping  |  6 --
 mappings/net/minecraft/entity/Entity.mapping  | 22 -----
 .../net/minecraft/entity/EntityType.mapping   | 16 +---
 .../minecraft/entity/EyeOfEnderEntity.mapping |  2 -
 .../net/minecraft/entity/ItemEntity.mapping   |  2 -
 .../net/minecraft/entity/LivingEntity.mapping |  3 +
 .../entity/decoration/ItemFrameEntity.mapping |  2 +-
 .../effect/StatusEffectInstance.mapping       | 17 +---
 .../minecraft/entity/mob/MobEntity.mapping    |  5 +-
 .../entity/mob/ZombieVillagerEntity.mapping   |  5 +-
 .../passive/AbstractHorseEntity.mapping       | 27 ------
 .../entity/passive/HorseEntity.mapping        |  6 --
 .../entity/passive/LlamaEntity.mapping        |  3 -
 .../entity/passive/WolfEntity.mapping         |  4 -
 .../entity/player/PlayerInventory.mapping     |  1 -
 .../projectile/AbstractFireballEntity.mapping |  2 -
 .../thrown/ThrownItemEntity.mapping           |  2 -
 .../inventory/SingleStackInventory.mapping    |  1 -
 .../minecraft/item/AnimalArmorItem.mapping    | 11 +--
 mappings/net/minecraft/item/ArmorItem.mapping | 13 +--
 .../net/minecraft/item/ArmorMaterial.mapping  | 88 +++++++------------
 .../net/minecraft/item/ArmorMaterials.mapping | 21 +----
 .../item/DyeableAnimalArmorItem.mapping       |  1 -
 .../minecraft/item/DyeableArmorItem.mapping   |  1 -
 .../net/minecraft/item/DyeableItem.mapping    |  5 --
 mappings/net/minecraft/item/Equipment.mapping |  2 +-
 .../net/minecraft/item/FilledMapItem.mapping  | 15 ++--
 .../item/map/MapBannerMarker.mapping          | 18 ++--
 .../net/minecraft/item/map/MapIcon.mapping    | 17 +---
 .../net/minecraft/item/map/MapState.mapping   | 25 +++---
 .../net/minecraft/item/trim/ArmorTrim.mapping | 13 +--
 .../net/minecraft/loot/LootDataType.mapping   |  3 +-
 .../net/minecraft/loot/LootManager.mapping    | 10 +--
 .../loot/condition/LootConditionTypes.mapping | 16 ----
 .../SetEnchantmentsLootFunction.mapping       |  3 -
 .../network/ClientConnection.mapping          |  4 +-
 .../minecraft/network/PacketByteBuf.mapping   | 26 ------
 .../network/codec/PacketCodecs.mapping        |  6 +-
 .../network/handler/PacketSizeLogger.mapping  |  4 +-
 .../common/CookieResponseC2SPacket.mapping    |  2 -
 .../c2s/play/BookUpdateC2SPacket.mapping      | 30 ++-----
 .../s2c/common/DisconnectS2CPacket.mapping    | 10 +--
 .../common/ResourcePackSendS2CPacket.mapping  |  4 -
 .../play/BlockEntityUpdateS2CPacket.mapping   |  3 +-
 .../packet/s2c/play/BossBarS2CPacket.mapping  | 30 ++-----
 .../play/CommandSuggestionsS2CPacket.mapping  | 19 +---
 .../s2c/play/DeathMessageS2CPacket.mapping    | 15 +---
 .../s2c/play/GameMessageS2CPacket.mapping     |  4 -
 .../network/packet/s2c/play/LightData.mapping |  4 -
 .../s2c/play/MapUpdateS2CPacket.mapping       | 35 +++-----
 .../s2c/play/OverlayMessageS2CPacket.mapping  | 10 +--
 .../play/PlayerListHeaderS2CPacket.mapping    | 15 +---
 .../s2c/play/PlayerListS2CPacket.mapping      | 47 ++++------
 .../ScoreboardScoreUpdateS2CPacket.mapping    |  4 -
 .../s2c/play/ServerMetadataS2CPacket.mapping  | 15 +---
 .../packet/s2c/play/SubtitleS2CPacket.mapping | 10 +--
 .../packet/s2c/play/TeamS2CPacket.mapping     | 10 +--
 .../packet/s2c/play/TitleS2CPacket.mapping    | 10 +--
 .../minecraft/particle/ParticleEffect.mapping |  4 +-
 .../minecraft/recipe/RecipeManager.mapping    |  4 +-
 .../minecraft/recipe/RepairItemRecipe.mapping |  2 +-
 .../registry/RegistryWrapper.mapping          | 18 ++--
 .../scoreboard/ServerScoreboard.mapping       |  2 +-
 .../minecraft/server/DataPackContents.mapping | 15 +++-
 mappings/net/minecraft/server/Main.mapping    |  3 +-
 .../server/ServerAdvancementLoader.mapping    |  5 --
 .../server/command/BossBarCommand.mapping     |  2 +-
 .../server/command/RaidCommand.mapping        |  2 +-
 .../server/command/ScoreboardCommand.mapping  |  6 +-
 .../server/command/TeamCommand.mapping        |  2 +-
 .../server/command/TellRawCommand.mapping     |  2 +-
 .../server/command/TitleCommand.mapping       |  2 +-
 .../structure/StructureTemplate.mapping       |  2 -
 .../net/minecraft/test/TestContext.mapping    |  7 +-
 .../packageinfo/PackageInfo9208.mapping       |  1 +
 .../minecraft/util/JsonReaderUtils.mapping    |  4 +-
 .../math/random/RandomSequencesState.mapping  |  2 +-
 .../util/profiler/PerformanceLog.mapping      | 16 ----
 .../net/minecraft/village/TradeOffer.mapping  | 13 +--
 .../minecraft/village/TradeOfferList.mapping  |  3 -
 .../village/raid/RaidManager.mapping          |  2 +-
 .../minecraft/world/ChunkUpdateState.mapping  |  2 +-
 .../minecraft/world/ForcedChunkState.mapping  |  2 +-
 .../net/minecraft/world/IdCountsState.mapping |  4 +-
 .../minecraft/world/PersistentState.mapping   |  4 +-
 .../world/PersistentStateManager.mapping      |  5 +-
 mappings/net/minecraft/world/World.mapping    |  8 +-
 .../net/minecraft/world/chunk/Chunk.mapping   |  2 +-
 .../world/level/storage/LevelStorage.mapping  |  3 -
 .../world/updater/WorldUpdater.mapping        |  3 +-
 145 files changed, 288 insertions(+), 1017 deletions(-)
 create mode 100644 mappings/net/minecraft/class_8181.mapping
 delete mode 100644 mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping
 delete mode 100644 mappings/net/minecraft/item/DyeableArmorItem.mapping
 create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9208.mapping

diff --git a/build.gradle b/build.gradle
index 880261474a..dd4dcdbb75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w04a"
+def minecraft_version = "24w05a"
 
 filament {
 	minecraftVersion = minecraft_version
diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
index f918bdf8e5..91c35469b9 100644
--- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
+++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
@@ -184,8 +184,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 0 runnable
 	METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V
 		ARG 0 callback
-	METHOD setInverseViewRotationMatrix (Lorg/joml/Matrix3f;)V
-		ARG 0 inverseViewRotationMatrix
 	METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lnet/minecraft/class_8251;)V
 		ARG 0 projectionMatrix
 		ARG 1 vertexSorting
diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
index c12a3f9dcb..f3e2bb9cb5 100644
--- a/mappings/net/minecraft/block/Block.mapping
+++ b/mappings/net/minecraft/block/Block.mapping
@@ -265,7 +265,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
 		ARG 3 state
 		ARG 4 placer
 		ARG 5 itemStack
-	METHOD method_9568 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1922;Ljava/util/List;Lnet/minecraft/class_1836;)V
+	METHOD method_9568 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1922;Ljava/util/List;Lnet/minecraft/class_1836;Lnet/minecraft/class_5455;)V
 		COMMENT Appends tooltips to a stack of this block's corresponding {@linkplain
 		COMMENT net.minecraft.item.BlockItem block item}. Used by shulker boxes.
 		COMMENT
diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping
index 6a62a53a98..d29257b39a 100644
--- a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping
+++ b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping
@@ -29,8 +29,6 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 entity
-	METHOD method_38234 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2627;)V
-		ARG 1 blockEntity
 	METHOD method_47378 (Ljava/util/EnumMap;)V
 		ARG 0 map
 	METHOD method_54040 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping
index 51a9053b86..2e1281b55f 100644
--- a/mappings/net/minecraft/block/entity/BlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@@ -67,7 +67,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT @see net.minecraft.block.AbstractBlock#onSyncedBlockEvent
 		ARG 1 type
 		ARG 2 data
-	METHOD method_11005 createFromNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586;
+	METHOD method_11005 createFromNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2586;
 		COMMENT {@return the new block entity loaded from {@code nbt}, or {@code null} if it fails}
 		COMMENT
 		COMMENT 
    This is used during chunk loading. This can fail if {@code nbt} has an improper or
@@ -76,7 +76,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		ARG 0 pos
 		ARG 1 state
 		ARG 2 nbt
-	METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
 		COMMENT Writes data to {@code nbt}. Subclasses should override this if they
 		COMMENT store a persistent data.
 		COMMENT
@@ -99,7 +99,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see net.minecraft.entity.player.PlayerEntity#isCreativeLevelTwoOp
 	METHOD method_11012 markRemoved ()V
-	METHOD method_11014 readNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_11014 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
 		COMMENT Reads data from {@code nbt}. Subclasses should override this if they
 		COMMENT store a persistent data.
 		COMMENT
@@ -118,7 +118,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 	METHOD method_11016 getPos ()Lnet/minecraft/class_2338;
 		COMMENT {@return the block entity's position}
 	METHOD method_11017 getType ()Lnet/minecraft/class_2591;
-	METHOD method_16887 toInitialChunkDataNbt ()Lnet/minecraft/class_2487;
+	METHOD method_16887 toInitialChunkDataNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the serialized state of this block entity that is observable by clients}
 		COMMENT
 		COMMENT 
    This is sent alongside the initial chunk data, as well as when the block
@@ -133,8 +133,6 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT 
    To send all NBT data of this block entity saved to disk, return {@link #createNbt}.
 		COMMENT
 		COMMENT @see #toUpdatePacket
-	METHOD method_17897 (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_2586;)Lnet/minecraft/class_2586;
-		ARG 2 blockEntity
 	METHOD method_17899 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/lang/String;Lnet/minecraft/class_2591;)Lnet/minecraft/class_2586;
 		ARG 3 type
 	METHOD method_31662 setWorld (Lnet/minecraft/class_1937;)V
@@ -178,7 +176,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT keys to store the position. This is incompatible with {@link
 		COMMENT net.minecraft.nbt.NbtHelper#fromBlockPos} that use uppercase keys.
 		ARG 0 nbt
-	METHOD method_38240 setStackNbt (Lnet/minecraft/class_1799;)V
+	METHOD method_38240 setStackNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_7225$class_7874;)V
 		COMMENT Sets {@code stack}'s {@code net.minecraft.item.BlockItem#BLOCK_ENTITY_TAG_KEY}
 		COMMENT NBT value to {@linkplain #createNbt the block entity's NBT data}.
 		ARG 1 stack
@@ -188,7 +186,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT @throws RuntimeException if the block entity type is not registered in
 		COMMENT the registry
 		ARG 1 nbt
-	METHOD method_38242 createNbtWithIdentifyingData ()Lnet/minecraft/class_2487;
+	METHOD method_38242 createNbtWithIdentifyingData (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the block entity's NBT data with identifying data}
 		COMMENT
 		COMMENT 
    In addition to data written at {@link #writeNbt}, this also
@@ -197,7 +195,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #createNbt
 		COMMENT @see #createNbtWithId
-	METHOD method_38243 createNbtWithId ()Lnet/minecraft/class_2487;
+	METHOD method_38243 createNbtWithId (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the block entity's NBT data with block entity type ID}
 		COMMENT
 		COMMENT 
    In addition to data written at {@link #writeNbt}, this also
@@ -205,7 +203,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #createNbt
 		COMMENT @see #createNbtWithIdentifyingData
-	METHOD method_38244 createNbt ()Lnet/minecraft/class_2487;
+	METHOD method_38244 createNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the block entity's NBT data}
 		COMMENT
 		COMMENT 
    Internally, this calls {@link #writeNbt} with a new {@link NbtCompound}
diff --git a/mappings/net/minecraft/block/spawner/EntityDetector.mapping b/mappings/net/minecraft/block/spawner/EntityDetector.mapping
index 90a14f20d6..7817d62b01 100644
--- a/mappings/net/minecraft/block/spawner/EntityDetector.mapping
+++ b/mappings/net/minecraft/block/spawner/EntityDetector.mapping
@@ -1,17 +1,4 @@
 CLASS net/minecraft/class_8962 net/minecraft/block/spawner/EntityDetector
-	FIELD field_47356 SURVIVAL_PLAYER Lnet/minecraft/class_8962;
 	FIELD field_47357 SHEEP Lnet/minecraft/class_8962;
-	METHOD detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Ljava/util/List;
+	METHOD detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List;
 		ARG 1 world
-		ARG 2 center
-		ARG 3 radius
-	METHOD method_55153 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Ljava/util/List;
-		ARG 0 world
-		ARG 1 center
-		ARG 2 radius
-	METHOD method_55154 (Lnet/minecraft/class_2338;ILnet/minecraft/class_3222;)Z
-		ARG 2 player
-	METHOD method_55155 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Ljava/util/List;
-		ARG 0 world
-		ARG 1 center
-		ARG 2 radius
diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping
index 2c1d6b22e9..0517c2d532 100644
--- a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping
+++ b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping
@@ -32,11 +32,9 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData
 		ARG 1 world
 		ARG 2 config
 		ARG 3 additionalPlayers
-	METHOD method_55186 updatePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8962;I)V
+	METHOD method_55186 updatePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;I)V
 		ARG 1 world
-		ARG 2 pos
 		ARG 3 entityDetector
-		ARG 4 range
 	METHOD method_55187 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_55188 getSpawnData (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1952;
diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping
index 0617f6a322..90afc7e638 100644
--- a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping
+++ b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping
@@ -6,10 +6,10 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 	FIELD field_47364 trialSpawner Lnet/minecraft/class_8963$class_8964;
 	FIELD field_47365 entityDetector Lnet/minecraft/class_8962;
 	FIELD field_47366 forceActivate Z
-	METHOD  (Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;)V
+	METHOD  (Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V
 		ARG 1 trialSpawner
 		ARG 2 entityDetector
-	METHOD  (Lnet/minecraft/class_8965;Lnet/minecraft/class_8966;Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;)V
+	METHOD  (Lnet/minecraft/class_8965;Lnet/minecraft/class_8966;Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V
 		ARG 1 config
 		ARG 2 data
 		ARG 3 trialSpawner
diff --git a/mappings/net/minecraft/class_8181.mapping b/mappings/net/minecraft/class_8181.mapping
new file mode 100644
index 0000000000..16ba0e32ef
--- /dev/null
+++ b/mappings/net/minecraft/class_8181.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_8181
+	CLASS class_9210
+		METHOD method_54080 asBlockEntity ()Lnet/minecraft/class_2586;
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
index 71dc3cca4f..6a57987799 100644
--- a/mappings/net/minecraft/client/MinecraftClient.mapping
+++ b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -212,7 +212,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_1495 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService;
 	METHOD method_1496 isIntegratedServerRunning ()Z
 	METHOD method_1498 isHudEnabled ()Z
-	METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;)V
+	METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;Lnet/minecraft/class_5455;)V
 		ARG 1 stack
 		ARG 2 blockEntity
 	METHOD method_1502 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream;
diff --git a/mappings/net/minecraft/client/gl/ShaderProgram.mapping b/mappings/net/minecraft/client/gl/ShaderProgram.mapping
index 735f6c8f5a..0bd6dbc9c4 100644
--- a/mappings/net/minecraft/client/gl/ShaderProgram.mapping
+++ b/mappings/net/minecraft/client/gl/ShaderProgram.mapping
@@ -10,8 +10,6 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
 	COMMENT @see 
 	COMMENT GLSL Object - OpenGL Wiki (Program objects)
 	FIELD field_29464 blendState Lnet/minecraft/class_277;
-	FIELD field_29465 loadedAttributeIds Ljava/util/List;
-	FIELD field_29466 attributeNames Ljava/util/List;
 	FIELD field_29467 vertexShader Lnet/minecraft/class_281;
 	FIELD field_29468 fragmentShader Lnet/minecraft/class_281;
 	FIELD field_29469 format Lnet/minecraft/class_293;
@@ -43,7 +41,6 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram
 	FIELD field_29495 dirty Z
 	FIELD field_32778 SHADERS_DIRECTORY Ljava/lang/String;
 	FIELD field_32779 INCLUDE_DIRECTORY Ljava/lang/String;
-	FIELD field_36323 viewRotationMat Lnet/minecraft/class_284;
 	FIELD field_36373 fogShape Lnet/minecraft/class_284;
 	FIELD field_40512 CORE_DIRECTORY Ljava/lang/String;
 	FIELD field_42231 glintAlpha Lnet/minecraft/class_284;
diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
index acf56bb19c..95accffe48 100644
--- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
+++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
@@ -17,12 +17,10 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
 	FIELD field_45989 renderingChartVisible Z
 	FIELD field_45990 renderingAndTickChartsVisible Z
 	FIELD field_45991 packetSizeAndPingChartsVisible Z
-	FIELD field_45992 frameNanosLog Lnet/minecraft/class_8743;
-	FIELD field_45993 tickNanosLog Lnet/minecraft/class_8743;
-	FIELD field_45994 pingLog Lnet/minecraft/class_8743;
-	FIELD field_45995 packetSizeLog Lnet/minecraft/class_8743;
-	METHOD  (Lnet/minecraft/class_310;)V
-		ARG 1 client
+	FIELD field_45992 frameNanosLog Lnet/minecraft/class_9191;
+	FIELD field_45993 tickNanosLog Lnet/minecraft/class_9191;
+	FIELD field_45994 pingLog Lnet/minecraft/class_9191;
+	FIELD field_45995 packetSizeLog Lnet/minecraft/class_9191;
 	METHOD method_1834 getChunk ()Lnet/minecraft/class_2818;
 	METHOD method_1835 getLeftText ()Ljava/util/List;
 	METHOD method_1836 getClientChunk ()Lnet/minecraft/class_2818;
@@ -76,10 +74,10 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
 	METHOD method_53540 togglePacketSizeAndPingCharts ()V
 	METHOD method_53541 toggleRenderingAndTickCharts ()V
 	METHOD method_53542 toggleRenderingChart ()V
-	METHOD method_53543 getPingLog ()Lnet/minecraft/class_8743;
-	METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_8743;
+	METHOD method_53543 getPingLog ()Lnet/minecraft/class_9191;
+	METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_9191;
 	METHOD method_53545 clear ()V
-	METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_8743;
+	METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_9191;
 	CLASS class_7412 AllocationRateCalculator
 		FIELD field_38986 INTERVAL I
 		FIELD field_38987 GARBAGE_COLLECTORS Ljava/util/List;
diff --git a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping
index da5855da96..f866c73f69 100644
--- a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping
+++ b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping
@@ -1,8 +1,8 @@
 CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart
 	FIELD field_45915 TEXT_COLOR I
 	FIELD field_45918 textRenderer Lnet/minecraft/class_327;
-	FIELD field_45919 log Lnet/minecraft/class_8743;
-	METHOD  (Lnet/minecraft/class_327;Lnet/minecraft/class_8743;)V
+	FIELD field_45919 log Lnet/minecraft/class_9194;
+	METHOD  (Lnet/minecraft/class_327;Lnet/minecraft/class_9194;)V
 		ARG 1 textRenderer
 		ARG 2 log
 	METHOD method_53468 format (D)Ljava/lang/String;
diff --git a/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping
index cc58c42122..a231b7f5cd 100644
--- a/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping
+++ b/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_8759 net/minecraft/client/gui/hud/debug/TickChart
 	FIELD field_47117 millisPerTickSupplier Ljava/util/function/Supplier;
-	METHOD  (Lnet/minecraft/class_327;Lnet/minecraft/class_8743;Ljava/util/function/Supplier;)V
+	METHOD  (Lnet/minecraft/class_327;Lnet/minecraft/class_9194;Ljava/util/function/Supplier;)V
 		ARG 1 textRenderer
 		ARG 2 log
 		ARG 3 millisPerTickSupplier
diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping
index 0268931ce7..fee57d27db 100644
--- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping
@@ -9,16 +9,14 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph
 		ARG 1 handler
 		ARG 2 inventory
 		ARG 3 title
-	METHOD method_17566 drawMap (Lnet/minecraft/class_332;Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V
+	METHOD method_17566 drawMap (Lnet/minecraft/class_332;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;IIF)V
 		ARG 1 context
-		ARG 2 mapId
 		ARG 3 mapState
 		ARG 4 x
 		ARG 5 y
 		ARG 6 scale
-	METHOD method_17567 drawMap (Lnet/minecraft/class_332;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V
+	METHOD method_17567 drawMap (Lnet/minecraft/class_332;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;ZZZZ)V
 		ARG 1 context
-		ARG 2 mapId
 		ARG 3 mapState
 		ARG 4 cloneMode
 		ARG 5 expandMode
diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping
index b55f9159ab..6d389b98a0 100644
--- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping
@@ -3,13 +3,12 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl
 	FIELD field_3232 DIMENSION_COLORS Ljava/util/function/ToIntFunction;
 	FIELD field_3233 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;
 	FIELD field_3234 updater Lnet/minecraft/class_1257;
-	METHOD  (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_2378;)V
+	METHOD  (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_5455;)V
 		ARG 1 callback
 		ARG 2 dataFixer
 		ARG 3 storageSession
 		ARG 4 levelInfo
 		ARG 5 eraseCache
-		ARG 6 dimensionOptionsRegistry
 	METHOD method_19938 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_27031 create (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_527;
diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index 0f8345a2dd..e4f35894f2 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -65,7 +65,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	METHOD method_34007 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_34008 (Lnet/minecraft/class_1297;Lcom/mojang/datafixers/util/Pair;)V
+	METHOD method_34008 (Lnet/minecraft/class_1309;Lcom/mojang/datafixers/util/Pair;)V
 		ARG 1 pair
 	METHOD method_34009 (Lnet/minecraft/class_1703;Lnet/minecraft/class_8786;)V
 		ARG 2 recipe
diff --git a/mappings/net/minecraft/client/network/PingMeasurer.mapping b/mappings/net/minecraft/client/network/PingMeasurer.mapping
index 676d51f5f3..26610d45fa 100644
--- a/mappings/net/minecraft/client/network/PingMeasurer.mapping
+++ b/mappings/net/minecraft/client/network/PingMeasurer.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_8761 net/minecraft/client/network/PingMeasurer
 	FIELD field_45948 handler Lnet/minecraft/class_634;
-	FIELD field_45949 log Lnet/minecraft/class_8743;
-	METHOD  (Lnet/minecraft/class_634;Lnet/minecraft/class_8743;)V
+	FIELD field_45949 log Lnet/minecraft/class_9191;
+	METHOD  (Lnet/minecraft/class_634;Lnet/minecraft/class_9191;)V
 		ARG 1 handler
 		ARG 2 log
 	METHOD method_53486 ping ()V
diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
index c5b3aaf75f..880134a8e3 100644
--- a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
+++ b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
@@ -1,5 +1 @@
 CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry
-	FIELD field_3948 delegate Lnet/minecraft/class_2371;
-	METHOD method_3152 readNbtList (Lnet/minecraft/class_2499;)V
-		ARG 1 list
-	METHOD method_3153 toNbtList ()Lnet/minecraft/class_2499;
diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping
index 2a10708b27..49b88bbbb9 100644
--- a/mappings/net/minecraft/client/particle/ParticleManager.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping
@@ -41,12 +41,7 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager
 		COMMENT Ticks all particles belonging to the same texture sheet.
 		ARG 1 particles
 			COMMENT a collection of particles from the same sheet
-	METHOD method_3049 renderParticles (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_765;Lnet/minecraft/class_4184;F)V
-		ARG 1 matrices
-		ARG 2 vertexConsumers
-		ARG 3 lightmapTextureManager
-		ARG 4 camera
-		ARG 5 tickDelta
+	METHOD method_3049 renderParticles (Lnet/minecraft/class_765;Lnet/minecraft/class_4184;F)V
 	METHOD method_3051 addEmitter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2394;I)V
 		ARG 1 entity
 		ARG 2 parameters
diff --git a/mappings/net/minecraft/client/render/DiffuseLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping
index 03f8f5a375..ade47cc874 100644
--- a/mappings/net/minecraft/client/render/DiffuseLighting.mapping
+++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping
@@ -1,7 +1,5 @@
 CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting
-	METHOD method_1452 enableForLevel (Lorg/joml/Matrix4f;)V
-		ARG 0 positionMatrix
+	METHOD method_1452 enableForLevel ()V
 	METHOD method_24210 disableGuiDepthLighting ()V
 	METHOD method_24211 enableGuiDepthLighting ()V
-	METHOD method_27869 disableForLevel (Lorg/joml/Matrix4f;)V
-		ARG 0 positionMatrix
+	METHOD method_27869 disableForLevel ()V
diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping
index c5f78e4f2c..a49fd71184 100644
--- a/mappings/net/minecraft/client/render/GameRenderer.mapping
+++ b/mappings/net/minecraft/client/render/GameRenderer.mapping
@@ -12,8 +12,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 	FIELD field_29358 particleProgram Lnet/minecraft/class_5944;
 	FIELD field_29359 positionColorLightmapProgram Lnet/minecraft/class_5944;
 	FIELD field_29360 positionColorTexLightmapProgram Lnet/minecraft/class_5944;
-	FIELD field_29361 positionTexColorNormalProgram Lnet/minecraft/class_5944;
-	FIELD field_29362 positionTexLightmapColorProgram Lnet/minecraft/class_5944;
 	FIELD field_29363 renderTypeSolidProgram Lnet/minecraft/class_5944;
 	FIELD field_29364 renderTypeCutoutMippedProgram Lnet/minecraft/class_5944;
 	FIELD field_29365 renderTypeCutoutProgram Lnet/minecraft/class_5944;
@@ -128,10 +126,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 		ARG 1 scaledWidth
 		ARG 2 scaledHeight
 		ARG 3 tickDelta
-	METHOD method_3172 renderHand (Lnet/minecraft/class_4587;Lnet/minecraft/class_4184;F)V
-		ARG 1 matrices
-		ARG 2 camera
-		ARG 3 tickDelta
+	METHOD method_3172 renderHand (Lnet/minecraft/class_4184;F)V
 	METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F
 		ARG 0 entity
 		ARG 1 tickDelta
@@ -143,10 +138,9 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 	METHOD method_3186 bobView (Lnet/minecraft/class_4587;F)V
 		ARG 1 matrices
 		ARG 2 tickDelta
-	METHOD method_3188 renderWorld (FJLnet/minecraft/class_4587;)V
+	METHOD method_3188 renderWorld (FJ)V
 		ARG 1 tickDelta
 		ARG 2 limitTime
-		ARG 4 matrices
 	METHOD method_3189 showFloatingItem (Lnet/minecraft/class_1799;)V
 		ARG 1 floatingItem
 	METHOD method_3190 updateCrosshairTarget (F)V
@@ -245,8 +239,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 	METHOD method_34546 getParticleProgram ()Lnet/minecraft/class_5944;
 	METHOD method_34547 getPositionColorLightmapProgram ()Lnet/minecraft/class_5944;
 	METHOD method_34548 getPositionColorTexLightmapProgram ()Lnet/minecraft/class_5944;
-	METHOD method_34549 getPositionTexColorNormalProgram ()Lnet/minecraft/class_5944;
-	METHOD method_35764 getPositionTexLightmapColorProgram ()Lnet/minecraft/class_5944;
 	METHOD method_35765 isRenderingPanorama ()Z
 	METHOD method_35766 renderWithZoom (FFF)V
 		ARG 1 zoom
@@ -290,12 +282,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 		ARG 0 program
 	METHOD method_36500 (Lnet/minecraft/class_5944;)V
 		ARG 0 program
-	METHOD method_36501 (Lnet/minecraft/class_5944;)V
-		ARG 0 program
 	METHOD method_36502 (Lnet/minecraft/class_5944;)V
 		ARG 0 program
-	METHOD method_36503 (Lnet/minecraft/class_5944;)V
-		ARG 0 program
 	METHOD method_36504 (Lnet/minecraft/class_5944;)V
 		ARG 0 program
 	METHOD method_36505 (Lnet/minecraft/class_5944;)V
diff --git a/mappings/net/minecraft/client/render/MapRenderer.mapping b/mappings/net/minecraft/client/render/MapRenderer.mapping
index 0a7df24f26..f688d3752c 100644
--- a/mappings/net/minecraft/client/render/MapRenderer.mapping
+++ b/mappings/net/minecraft/client/render/MapRenderer.mapping
@@ -7,22 +7,19 @@ CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer
 	FIELD field_32174 DEFAULT_IMAGE_HEIGHT I
 	METHOD  (Lnet/minecraft/class_1060;)V
 		ARG 1 textureManager
-	METHOD method_1769 updateTexture (ILnet/minecraft/class_22;)V
-		ARG 1 id
+	METHOD method_1769 updateTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V
 		ARG 2 state
 	METHOD method_1771 clearStateTextures ()V
-	METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_22;ZI)V
+	METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;ZI)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
-		ARG 3 id
 		ARG 4 state
 		ARG 5 hidePlayerIcons
 		ARG 6 light
 	METHOD method_32600 (Lnet/minecraft/class_22;Ljava/lang/Integer;Lnet/minecraft/class_330$class_331;)Lnet/minecraft/class_330$class_331;
 		ARG 2 id2
 		ARG 3 texture
-	METHOD method_32601 getMapTexture (ILnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331;
-		ARG 1 id
+	METHOD method_32601 getMapTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331;
 		ARG 2 state
 	CLASS class_331 MapTexture
 		FIELD field_2046 state Lnet/minecraft/class_22;
diff --git a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping
index 94cdc72f60..1d842d08cd 100644
--- a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping
+++ b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping
@@ -12,9 +12,6 @@ CLASS net/minecraft/class_4583 net/minecraft/client/render/OverlayVertexConsumer
 	FIELD field_21053 inverseTextureMatrix Lorg/joml/Matrix4f;
 	FIELD field_21054 inverseNormalMatrix Lorg/joml/Matrix3f;
 	FIELD field_41091 textureScale F
-	METHOD  (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;F)V
+	METHOD  (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;F)V
 		ARG 1 delegate
-		ARG 2 textureMatrix
-		ARG 3 normalMatrix
-		ARG 4 textureScale
 	METHOD method_22891 init ()V
diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping
index 5102d0dbf9..3a148ac11b 100644
--- a/mappings/net/minecraft/client/render/VertexConsumer.mapping
+++ b/mappings/net/minecraft/client/render/VertexConsumer.mapping
@@ -160,7 +160,7 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer
 		COMMENT
 		COMMENT @return this consumer, for chaining
 		ARG 1 uv
-	METHOD method_23763 normal (Lorg/joml/Matrix3f;FFF)Lnet/minecraft/class_4588;
+	METHOD method_23763 normal (Lnet/minecraft/class_4587$class_4665;FFF)Lnet/minecraft/class_4588;
 		COMMENT Specifies the {@linkplain VertexFormats#NORMAL_ELEMENT
 		COMMENT normal element} of the current vertex.
 		COMMENT
@@ -168,10 +168,6 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer
 		COMMENT accepting a normal element.
 		COMMENT
 		COMMENT @return this consumer, for chaining
-		ARG 1 matrix
-			COMMENT the matrix that will be applied to the normal vector, typically {@link
-			COMMENT net.minecraft.client.util.math.MatrixStack.Entry#getNormalMatrix
-			COMMENT MatrixStack.Entry#getNormalMatrix}
 		ARG 2 x
 		ARG 3 y
 		ARG 4 z
diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping
index 3cd347e178..ce33bd8419 100644
--- a/mappings/net/minecraft/client/render/WorldRenderer.mapping
+++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping
@@ -88,15 +88,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 1 pos
 		ARG 2 old
 		ARG 3 updated
-	METHOD method_22710 render (Lnet/minecraft/class_4587;FJZLnet/minecraft/class_4184;Lnet/minecraft/class_757;Lnet/minecraft/class_765;Lorg/joml/Matrix4f;)V
-		ARG 1 matrices
-		ARG 2 tickDelta
-		ARG 3 limitTime
-		ARG 5 renderBlockOutline
-		ARG 6 camera
-		ARG 7 gameRenderer
-		ARG 8 lightmapTextureManager
-		ARG 9 projectionMatrix
+	METHOD method_22710 render (FJZLnet/minecraft/class_4184;Lnet/minecraft/class_757;Lnet/minecraft/class_765;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V
 	METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumer
@@ -218,10 +210,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 	METHOD method_29364 getCloudsFramebuffer ()Lnet/minecraft/class_276;
 	METHOD method_29365 loadTransparencyPostProcessor ()V
 	METHOD method_29701 resetTransparencyPostProcessor ()V
-	METHOD method_32133 setupFrustum (Lnet/minecraft/class_4587;Lnet/minecraft/class_243;Lorg/joml/Matrix4f;)V
-		ARG 1 matrices
-		ARG 2 pos
-		ARG 3 projectionMatrix
+	METHOD method_32133 setupFrustum (Lnet/minecraft/class_243;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V
 	METHOD method_3239 renderClouds (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)Lnet/minecraft/class_287$class_7433;
 		ARG 1 builder
 		ARG 2 x
@@ -245,19 +234,14 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 3 playing
 	METHOD method_3250 renderEndSky (Lnet/minecraft/class_4587;)V
 		ARG 1 matrices
-	METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4587;DDDLorg/joml/Matrix4f;)V
+	METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V
 		ARG 1 renderLayer
-		ARG 2 matrices
-		ARG 3 cameraX
-		ARG 5 cameraY
-		ARG 7 cameraZ
 		ARG 9 positionMatrix
 	METHOD method_3252 tick ()V
 	METHOD method_3254 drawEntityOutlinesFramebuffer ()V
 	METHOD method_3255 renderStars (Lnet/minecraft/class_287;)Lnet/minecraft/class_287$class_7433;
 		ARG 1 buffer
-	METHOD method_3257 renderSky (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;FLnet/minecraft/class_4184;ZLjava/lang/Runnable;)V
-		ARG 1 matrices
+	METHOD method_3257 renderSky (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/class_4184;ZLjava/lang/Runnable;)V
 		ARG 2 projectionMatrix
 		ARG 3 tickDelta
 		ARG 4 camera
@@ -276,13 +260,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 15 green
 		ARG 16 blue
 		ARG 17 alpha
-	METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;FDDD)V
-		ARG 1 matrices
-		ARG 2 projectionMatrix
-		ARG 3 tickDelta
-		ARG 4 cameraX
-		ARG 6 cameraY
-		ARG 8 cameraZ
+	METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FDDD)V
 	METHOD method_3265 renderDarkSky ()V
 	METHOD method_3267 cleanUp ()V
 	METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066;
@@ -418,7 +396,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 1 song
 		ARG 2 songPosition
 	METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V
-		ARG 1 parameters
 		ARG 2 shouldAlwaysSpawn
 		ARG 3 important
 		ARG 4 x
diff --git a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping
index 19f42be3f2..65e6941250 100644
--- a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping
@@ -3,24 +3,7 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo
 	FIELD field_4338 BEAM_TEXTURE Lnet/minecraft/class_2960;
 	METHOD  (Lnet/minecraft/class_5614$class_5615;)V
 		ARG 1 ctx
-	METHOD method_22740 renderBeamFace (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V
-		ARG 0 positionMatrix
-		ARG 1 normalMatrix
-		ARG 2 vertices
-		ARG 3 red
-		ARG 4 green
-		ARG 5 blue
-		ARG 6 alpha
-		ARG 7 yOffset
-		ARG 8 height
-		ARG 9 x1
-		ARG 10 z1
-		ARG 11 x2
-		ARG 12 z2
-		ARG 13 u1
-		ARG 14 u2
-		ARG 15 v1
-		ARG 16 v2
+	METHOD method_22740 renderBeamFace (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V
 	METHOD method_22741 renderBeamLayer (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;FFFFIIFFFFFFFFFFFF)V
 		ARG 0 matrices
 		ARG 1 vertices
@@ -42,21 +25,7 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo
 		ARG 17 u2
 		ARG 18 v1
 		ARG 19 v2
-	METHOD method_23076 renderBeamVertex (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;FFFFIFFFF)V
-		ARG 0 positionMatrix
-		ARG 1 normalMatrix
-		ARG 2 vertices
-		ARG 3 red
-		ARG 4 green
-		ARG 5 blue
-		ARG 6 alpha
-		ARG 7 y
-		ARG 8 x
-		ARG 9 z
-		ARG 10 u
-			COMMENT the left-most coordinate of the texture region
-		ARG 11 v
-			COMMENT the top-most coordinate of the texture region
+	METHOD method_23076 renderBeamVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFIFFFF)V
 	METHOD method_3543 renderBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FJII[F)V
 		ARG 0 matrices
 		ARG 1 vertexConsumers
diff --git a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping
index bb226a828a..790defba6d 100644
--- a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping
@@ -1,12 +1,5 @@
 CLASS net/minecraft/class_891 net/minecraft/client/render/entity/DragonFireballEntityRenderer
 	FIELD field_21735 LAYER Lnet/minecraft/class_1921;
 	FIELD field_4661 TEXTURE Lnet/minecraft/class_2960;
-	METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;IFIII)V
+	METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFIII)V
 		ARG 0 vertexConsumer
-		ARG 1 positionMatrix
-		ARG 2 normalMatrix
-		ARG 3 light
-		ARG 4 x
-		ARG 5 y
-		ARG 6 textureU
-		ARG 7 textureV
diff --git a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping
index ec58ba269d..d12a7cff4c 100644
--- a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping
@@ -1,15 +1,5 @@
 CLASS net/minecraft/class_902 net/minecraft/client/render/entity/ExperienceOrbEntityRenderer
 	FIELD field_21741 LAYER Lnet/minecraft/class_1921;
 	FIELD field_4701 TEXTURE Lnet/minecraft/class_2960;
-	METHOD method_23171 vertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;FFIIIFFI)V
+	METHOD method_23171 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FFIIIFFI)V
 		ARG 0 vertexConsumer
-		ARG 1 positionMatrix
-		ARG 2 normalMatrix
-		ARG 3 x
-		ARG 4 y
-		ARG 5 red
-		ARG 6 green
-		ARG 7 blue
-		ARG 8 u
-		ARG 9 v
-		ARG 10 light
diff --git a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping
index 85381d8c41..62ebbd16e3 100644
--- a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping
@@ -9,15 +9,8 @@ CLASS net/minecraft/class_906 net/minecraft/client/render/entity/FishingBobberEn
 		ARG 4 matrices
 		ARG 5 segmentStart
 		ARG 6 segmentEnd
-	METHOD method_23840 vertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;IFIII)V
+	METHOD method_23840 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFIII)V
 		ARG 0 buffer
-		ARG 1 matrix
-		ARG 2 normalMatrix
-		ARG 3 light
-		ARG 4 x
-		ARG 5 y
-		ARG 6 u
-		ARG 7 v
 	METHOD method_23954 percentage (II)F
 		ARG 0 value
 		ARG 1 max
diff --git a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping
index 1a8ad96706..99d112477b 100644
--- a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping
@@ -6,18 +6,8 @@ CLASS net/minecraft/class_907 net/minecraft/client/render/entity/GuardianEntityR
 		ARG 1 ctx
 		ARG 2 shadowRadius
 		ARG 3 layer
-	METHOD method_23173 vertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;FFFIIIFF)V
+	METHOD method_23173 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FFFIIIFF)V
 		ARG 0 vertexConsumer
-		ARG 1 positionMatrix
-		ARG 2 normalMatrix
-		ARG 3 x
-		ARG 4 y
-		ARG 5 z
-		ARG 6 red
-		ARG 7 green
-		ARG 8 blue
-		ARG 9 u
-		ARG 10 v
 	METHOD method_3979 fromLerpedPosition (Lnet/minecraft/class_1309;DF)Lnet/minecraft/class_243;
 		ARG 1 entity
 		ARG 2 yOffset
diff --git a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping
index e8de96a571..af0a2ab5b1 100644
--- a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping
@@ -1,9 +1,3 @@
 CLASS net/minecraft/class_916 net/minecraft/client/render/entity/ItemEntityRenderer
-	FIELD field_32925 MAX_COUNT_FOR_4_ITEMS_RENDERED I
-	FIELD field_32926 MAX_COUNT_FOR_3_ITEMS_RENDERED I
-	FIELD field_32927 MAX_COUNT_FOR_2_ITEMS_RENDERED I
-	FIELD field_32928 MAX_COUNT_FOR_1_ITEM_RENDERED I
 	FIELD field_4725 random Lnet/minecraft/class_5819;
 	FIELD field_4726 itemRenderer Lnet/minecraft/class_918;
-	METHOD method_3998 getRenderedAmount (Lnet/minecraft/class_1799;)I
-		ARG 1 stack
diff --git a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping
index f93b186df9..f5869a3ace 100644
--- a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping
@@ -1,17 +1,5 @@
 CLASS net/minecraft/class_928 net/minecraft/client/render/entity/PaintingEntityRenderer
-	METHOD method_23188 vertex (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;FFFFFIIII)V
-		ARG 1 positionMatrix
-		ARG 2 normalMatrix
-		ARG 3 vertexConsumer
-		ARG 4 x
-		ARG 5 y
-		ARG 6 u
-		ARG 7 v
-		ARG 8 z
-		ARG 9 normalX
-		ARG 10 normalY
-		ARG 11 normalZ
-		ARG 12 light
+	METHOD method_23188 vertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFFIIII)V
 	METHOD method_4074 renderPainting (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1534;IILnet/minecraft/class_1058;Lnet/minecraft/class_1058;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumer
diff --git a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping
index 2a0610b70e..e220f0a4c2 100644
--- a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping
@@ -1,14 +1,2 @@
 CLASS net/minecraft/class_876 net/minecraft/client/render/entity/ProjectileEntityRenderer
-	METHOD method_23153 vertex (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;IIIFFIIII)V
-		ARG 1 positionMatrix
-		ARG 2 normalMatrix
-		ARG 3 vertexConsumer
-		ARG 4 x
-		ARG 5 y
-		ARG 6 z
-		ARG 7 u
-		ARG 8 v
-		ARG 9 normalX
-		ARG 10 normalZ
-		ARG 11 normalY
-		ARG 12 light
+	METHOD method_23153 vertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;IIIFFIIII)V
diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping
index afbad9b3b9..66f2820c27 100644
--- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping
@@ -8,17 +8,10 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
 		ARG 2 innerModel
 		ARG 3 outerModel
 		ARG 4 bakery
-	METHOD method_23192 renderArmorParts (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1738;Lnet/minecraft/class_572;ZFFFLjava/lang/String;)V
+	METHOD method_23192 renderArmorParts (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_572;FFFLnet/minecraft/class_2960;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
 		ARG 3 light
-		ARG 4 item
-		ARG 5 model
-		ARG 6 secondTextureLayer
-		ARG 7 red
-		ARG 8 green
-		ARG 9 blue
-		ARG 10 overlay
 	METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1309;Lnet/minecraft/class_1304;ILnet/minecraft/class_572;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
@@ -33,12 +26,7 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
 		ARG 1 slot
 	METHOD method_4173 usesInnerModel (Lnet/minecraft/class_1304;)Z
 		ARG 1 slot
-	METHOD method_4174 getArmorTexture (Lnet/minecraft/class_1738;ZLjava/lang/String;)Lnet/minecraft/class_2960;
-		ARG 1 item
-		ARG 2 secondLayer
-		ARG 3 overlay
-	METHOD method_48482 renderTrim (Lnet/minecraft/class_1741;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;Lnet/minecraft/class_572;Z)V
-		ARG 1 material
+	METHOD method_48482 renderTrim (Lnet/minecraft/class_6880;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;Lnet/minecraft/class_572;Z)V
 		ARG 2 matrices
 		ARG 3 vertexConsumers
 		ARG 4 light
diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping
index ae2da9dfd8..9b68dd3a04 100644
--- a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping
@@ -1,11 +1,4 @@
 CLASS net/minecraft/class_4506 net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer
 	FIELD field_20529 TEXTURE Lnet/minecraft/class_2960;
-	METHOD method_23295 produceVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;FIFFI)V
+	METHOD method_23295 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FIFFI)V
 		ARG 0 vertexConsumer
-		ARG 1 vertexTransform
-		ARG 2 normalTransform
-		ARG 3 x
-		ARG 4 y
-		ARG 5 u
-		ARG 6 v
-		ARG 7 light
diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping
index f70a4b987d..ab5608e83f 100644
--- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping
+++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping
@@ -61,7 +61,6 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack
 		FIELD field_21327 positionMatrix Lorg/joml/Matrix4f;
 		FIELD field_21328 normalMatrix Lorg/joml/Matrix3f;
 		METHOD  (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)V
-			ARG 1 positionMatrix
 			ARG 2 normalMatrix
 		METHOD method_23761 getPositionMatrix ()Lorg/joml/Matrix4f;
 			COMMENT {@return the matrix used to transform positions}
diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping
index 1d8264b013..eda21d4775 100644
--- a/mappings/net/minecraft/client/world/ClientWorld.mapping
+++ b/mappings/net/minecraft/client/world/ClientWorld.mapping
@@ -151,8 +151,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 		ARG 10 pitch
 		ARG 11 useDistance
 		ARG 12 seed
-	METHOD method_47437 putClientsideMapState (Ljava/lang/String;Lnet/minecraft/class_22;)V
-		ARG 1 id
+	METHOD method_47437 putClientsideMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V
 		ARG 2 state
 	METHOD method_53875 addEntity (Lnet/minecraft/class_1297;)V
 		ARG 1 entity
diff --git a/mappings/net/minecraft/command/CommandRegistryAccess.mapping b/mappings/net/minecraft/command/CommandRegistryAccess.mapping
index 9582724362..26757a456b 100644
--- a/mappings/net/minecraft/command/CommandRegistryAccess.mapping
+++ b/mappings/net/minecraft/command/CommandRegistryAccess.mapping
@@ -5,26 +5,6 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess
 	COMMENT @apiNote You usually do not need to create your own instance; the command registration
 	COMMENT callbacks (such as {@link net.minecraft.server.command.CommandManager} constructor)
 	COMMENT provides an instance with proper configurations.
-	METHOD method_41699 createWrapper (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225;
-		COMMENT Creates a registry wrapper that follows the entry list creation policy.
-		ARG 1 registryRef
-			COMMENT the registry key of the registry to wrap
 	METHOD method_46722 of (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157;
 		ARG 0 wrapperLookup
 		ARG 1 enabledFeatures
-	METHOD method_46723 of (Lnet/minecraft/class_5455;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157$class_7870;
-		ARG 0 registryManager
-		ARG 1 enabledFeatures
-	CLASS 2
-		FIELD field_40912 entryListCreationPolicy Lnet/minecraft/class_7157$class_7158;
-	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
-		COMMENT net.minecraft.registry.RegistryWrapper#getOptional(net.minecraft.registry.tag.TagKey)}.
-		FIELD field_37824 Lnet/minecraft/class_7157$class_7158;
-			COMMENT Creates a new {@link net.minecraft.registry.entry.RegistryEntryList}, stores it and returns it.
-		FIELD field_37826 Lnet/minecraft/class_7157$class_7158;
-			COMMENT Throws an exception.
-	CLASS class_7870 EntryListCreationPolicySettable
-		METHOD method_46724 setEntryListCreationPolicy (Lnet/minecraft/class_7157$class_7158;)V
-			ARG 1 entryListCreationPolicy
diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping
index f49f6cdcab..4d170c6a35 100644
--- a/mappings/net/minecraft/command/DataCommandStorage.mapping
+++ b/mappings/net/minecraft/command/DataCommandStorage.mapping
@@ -16,7 +16,7 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage
 	METHOD method_22547 set (Lnet/minecraft/class_2960;Lnet/minecraft/class_2487;)V
 		ARG 1 id
 		ARG 2 nbt
-	METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_4565$class_4566;
+	METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_4565$class_4566;
 		ARG 2 nbt
 	METHOD method_52614 getPersistentStateType (Ljava/lang/String;)Lnet/minecraft/class_18$class_8645;
 		ARG 1 namespace
diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping
index 4ac0f89410..69fd10f438 100644
--- a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping
@@ -1,27 +1,13 @@
 CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgumentType
 	FIELD field_10812 EXAMPLES Ljava/util/Collection;
-	FIELD field_37974 registryWrapper Lnet/minecraft/class_7225;
 	METHOD  (Lnet/minecraft/class_7157;)V
 		ARG 1 commandRegistryAccess
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
 		ARG 2 builder
-	METHOD method_41977 (Lnet/minecraft/class_2291$class_7215;)Lnet/minecraft/class_2293$class_2295;
-		ARG 0 item
-	METHOD method_41978 (Lnet/minecraft/class_2291$class_7215;Lnet/minecraft/class_6880;)Z
-		ARG 1 item2
-	METHOD method_41979 (Lnet/minecraft/class_2291$class_7216;)Lnet/minecraft/class_2293$class_2295;
-		ARG 0 tag
-	METHOD method_41980 (Ljava/util/function/Predicate;Lnet/minecraft/class_1799;)Z
-		ARG 1 stack
-	METHOD method_41981 getItemStackPredicate (Ljava/util/function/Predicate;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2293$class_2295;
-		ARG 0 predicate
-		ARG 1 nbt
-	METHOD method_41982 (Ljava/util/function/Predicate;Lnet/minecraft/class_2487;Lnet/minecraft/class_1799;)Z
-		ARG 2 stack
 	METHOD method_9801 itemPredicate (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2293;
 		ARG 0 commandRegistryAccess
-	METHOD method_9804 getItemStackPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/function/Predicate;
+	METHOD method_9804 getItemStackPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2293$class_2295;
 		ARG 0 context
 		ARG 1 name
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
diff --git a/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping
index 1143a2b000..d77f7a9e94 100644
--- a/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping
@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_2287 net/minecraft/command/argument/ItemStackArgumentType
 	FIELD field_10790 EXAMPLES Ljava/util/Collection;
-	FIELD field_37970 registryWrapper Lnet/minecraft/class_7225;
 	METHOD  (Lnet/minecraft/class_7157;)V
 		ARG 1 commandRegistryAccess
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping
index da73ca988b..fe677f619a 100644
--- a/mappings/net/minecraft/command/argument/ItemStringReader.mapping
+++ b/mappings/net/minecraft/command/argument/ItemStringReader.mapping
@@ -1,49 +1,4 @@
 CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
-	FIELD field_10799 ID_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_10800 TAG_DISALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
-	FIELD field_10802 reader Lcom/mojang/brigadier/StringReader;
-	FIELD field_10804 allowTag Z
-	FIELD field_10805 suggestions Ljava/util/function/Function;
-	FIELD field_10806 NBT_SUGGESTION_PROVIDER Ljava/util/function/Function;
-	FIELD field_10807 nbt Lnet/minecraft/class_2487;
-	FIELD field_33066 LEFT_CURLY_BRACKET C
-	FIELD field_33067 HASH_SIGN C
-	FIELD field_37971 UNKNOWN_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_37972 registryWrapper Lnet/minecraft/class_7225;
-	FIELD field_37973 result Lcom/mojang/datafixers/util/Either;
-	METHOD  (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/StringReader;Z)V
-		ARG 1 registryWrapper
-		ARG 2 reader
-		ARG 3 allowTag
-	METHOD method_41970 (Lnet/minecraft/class_2291;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2291$class_7215;
-		ARG 1 item
-	METHOD method_41971 (Lnet/minecraft/class_2291;Lnet/minecraft/class_6885;)Lnet/minecraft/class_2291$class_7216;
-		ARG 1 tag
-	METHOD method_41972 item (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2291$class_7215;
-		ARG 0 registryWrapper
-		ARG 1 reader
-	METHOD method_41973 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 tag
-	METHOD method_41974 itemOrTag (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/StringReader;)Lcom/mojang/datafixers/util/Either;
-		ARG 0 registryWrapper
-		ARG 1 reader
-	METHOD method_41975 suggestItemId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 builder
-	METHOD method_9787 readTag ()V
-	METHOD method_9788 readNbt ()V
-	METHOD method_9789 consume ()V
-	METHOD method_9791 suggestItemOrTagId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 builder
-	METHOD method_9792 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
-	METHOD method_9793 getSuggestions (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Z)Ljava/util/concurrent/CompletableFuture;
-		ARG 0 registryWrapper
-		ARG 1 builder
-		ARG 2 allowTag
-	METHOD method_9794 suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 builder
-	METHOD method_9795 readItem ()V
-	METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 builder
+	METHOD method_9789 consume (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2291$class_7215;
+	METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 	CLASS class_7215 ItemResult
-	CLASS class_7216 TagResult
diff --git a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
index c1f7e860a3..7eb7de6ab6 100644
--- a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType
-	FIELD field_40383 registryWrapper Lnet/minecraft/class_7225;
 	FIELD field_9935 EXAMPLES Ljava/util/Collection;
 	FIELD field_9936 UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	METHOD  (Lnet/minecraft/class_7157;)V
@@ -12,12 +11,11 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgu
 		ARG 1 registryWrapper
 	METHOD method_9417 particleEffect (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2223;
 		ARG 0 registryAccess
-	METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225;)Lnet/minecraft/class_2394;
+	METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 		ARG 0 reader
-		ARG 1 registryWrapper
 	METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
-	METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394;
+	METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 		ARG 0 reader
 		ARG 1 type
 	METHOD method_9421 getParticle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2394;
diff --git a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping
index 74f47f8b58..da68dcdbf7 100644
--- a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_9019 net/minecraft/command/argument/StyleArgumentType
 	FIELD field_47553 INVALID_STYLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_47554 EXAMPLES Ljava/util/Collection;
-	METHOD method_55446 style ()Lnet/minecraft/class_9019;
+	METHOD method_55446 style (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9019;
 	METHOD method_55448 getStyle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2583;
 		ARG 0 context
 		ARG 1 style
diff --git a/mappings/net/minecraft/command/argument/TextArgumentType.mapping b/mappings/net/minecraft/command/argument/TextArgumentType.mapping
index 7d6e3e9853..8873354a7b 100644
--- a/mappings/net/minecraft/command/argument/TextArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/TextArgumentType.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_2178 net/minecraft/command/argument/TextArgumentType
 	METHOD method_9280 getTextArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 0 context
 		ARG 1 name
-	METHOD method_9281 text ()Lnet/minecraft/class_2178;
+	METHOD method_9281 text (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2178;
 	METHOD method_9282 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 text
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping
index 4bfb438dd4..91ad0cb909 100644
--- a/mappings/net/minecraft/data/DataProvider.mapping
+++ b/mappings/net/minecraft/data/DataProvider.mapping
@@ -13,11 +13,8 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider
 		ARG 0 map
 	METHOD method_43809 (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 key
-	METHOD method_53496 writeCodecToPath (Lnet/minecraft/class_7403;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_53496 writeCodecToPath (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 writer
-		ARG 1 codec
-		ARG 2 value
-		ARG 3 path
 	CLASS class_7857 Factory
 		METHOD create (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2405;
 			ARG 1 output
diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping
index 9a6f3938f1..72dbe3480e 100644
--- a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping
+++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping
@@ -27,10 +27,9 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator
 	METHOD method_48518 suffixTrim (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_2960;
 		ARG 1 id
 		ARG 2 trimMaterialName
-	METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_1741;)Lcom/google/gson/JsonObject;
+	METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_6880;)Lcom/google/gson/JsonObject;
 		ARG 1 id
 		ARG 2 textures
-		ARG 3 armorMaterial
 	METHOD method_48522 (Lnet/minecraft/class_1738;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject;
 		ARG 2 id
 		ARG 3 textures
@@ -45,5 +44,4 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator
 		ARG 2 id
 		ARG 3 textures
 	CLASS class_8072 TrimMaterial
-		METHOD method_48744 getAppliedName (Lnet/minecraft/class_1741;)Ljava/lang/String;
-			ARG 1 armorMaterial
+		METHOD method_48744 getAppliedName (Lnet/minecraft/class_6880;)Ljava/lang/String;
diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping
index 89bf3fd0a3..9d46f24aa4 100644
--- a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping
+++ b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping
@@ -6,7 +6,5 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/advancement/Advancement
 		ARG 1 output
 		ARG 2 registryLookupFuture
 		ARG 3 tabGenerators
-	METHOD method_10333 (Ljava/util/Set;Ljava/util/List;Lnet/minecraft/class_7403;Lnet/minecraft/class_8779;)V
-		ARG 4 advancement
 	METHOD method_46809 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage;
 		ARG 2 lookup
diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping
index 6f3822115c..bf752d50a2 100644
--- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping
+++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping
@@ -3,15 +3,13 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv
 	FIELD field_11355 LOGGER Lorg/slf4j/Logger;
 	FIELD field_39374 pathResolver Lnet/minecraft/class_7784$class_7489;
 	FIELD field_40617 lootTableIds Ljava/util/Set;
-	METHOD  (Lnet/minecraft/class_7784;Ljava/util/Set;Ljava/util/List;)V
+	METHOD  (Lnet/minecraft/class_7784;Ljava/util/Set;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V
 		ARG 1 output
 		ARG 2 lootTableIds
 		ARG 3 lootTypeGenerators
 	METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 0 name
 		ARG 1 message
-	METHOD method_10408 (Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture;
-		ARG 2 entry
 	METHOD method_10410 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;)V
 		ARG 2 generator
 	METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V
diff --git a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping
index 147da0934c..9ea2245edc 100644
--- a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping
+++ b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping
@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_8903 net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders
-	METHOD method_54653 createOneTwentyOneProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438;
+	METHOD method_54653 createOneTwentyOneProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438;
 		ARG 0 output
diff --git a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping
index 57094bc8a8..05e2a647c8 100644
--- a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping
+++ b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping
@@ -1,3 +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;
+	METHOD method_53853 createTradeRebalanceProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438;
 		ARG 0 output
diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping
index 251fb1c5bf..e4fa640edb 100644
--- a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping
+++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping
@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7794 net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders
-	METHOD method_46184 createVanillaProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438;
+	METHOD method_46184 createVanillaProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438;
 		ARG 0 output
diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping
index 748dcb7ab0..b30d728673 100644
--- a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping
+++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider
 	FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map;
 	FIELD field_39378 recipesPathResolver Lnet/minecraft/class_7784$class_7489;
 	FIELD field_39379 advancementsPathResolver Lnet/minecraft/class_7784$class_7489;
-	METHOD  (Lnet/minecraft/class_7784;)V
+	METHOD  (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
 		ARG 1 output
 	METHOD method_10419 generate (Lnet/minecraft/class_8790;)V
 		ARG 1 exporter
@@ -335,9 +335,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider
 		ARG 0 exporter
 		ARG 1 output
 		ARG 2 input
-	METHOD method_46206 saveRecipeAdvancement (Lnet/minecraft/class_7403;Lnet/minecraft/class_8779;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_46206 saveRecipeAdvancement (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8779;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 cache
-		ARG 2 advancement
 	METHOD method_46207 generateFamilies (Lnet/minecraft/class_8790;Lnet/minecraft/class_7699;)V
 		ARG 0 exporter
 		ARG 1 enabledFeatures
diff --git a/mappings/net/minecraft/data/server/tag/TagProvider.mapping b/mappings/net/minecraft/data/server/tag/TagProvider.mapping
index daaf448999..afd493d8d1 100644
--- a/mappings/net/minecraft/data/server/tag/TagProvider.mapping
+++ b/mappings/net/minecraft/data/server/tag/TagProvider.mapping
@@ -19,8 +19,6 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/TagProvider
 		ARG 1 tag
 	METHOD method_10514 configure (Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 lookup
-	METHOD method_27046 (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture;
-		ARG 4 entry
 	METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3495;
 		ARG 1 tag
 	METHOD method_27170 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495;
diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping
index 41b1245dd0..aca85403b0 100644
--- a/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping
@@ -1,12 +1,6 @@
 CLASS net/minecraft/class_3577 net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix
-	FIELD field_15827 GSON Lcom/google/gson/Gson;
 	METHOD  (Lcom/mojang/datafixers/schemas/Schema;Z)V
 		ARG 1 outputSchema
 		ARG 2 changesType
 	METHOD method_15582 fix (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
 		ARG 2 lineName
-	CLASS 1
-		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
-			ARG 1 functionJson
-			ARG 2 unused
-			ARG 3 context
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index c452567813..0c771c83de 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -209,7 +209,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	FIELD field_6025 NULL_BOX Lnet/minecraft/class_238;
 	FIELD field_6027 CUSTOM_NAME Lnet/minecraft/class_2940;
 	FIELD field_6029 commandTags Ljava/util/Set;
-	FIELD field_6030 EMPTY_STACK_LIST Ljava/util/List;
 	FIELD field_6031 yaw F
 	FIELD field_6032 AIR Lnet/minecraft/class_2940;
 	FIELD field_6034 vehicle Lnet/minecraft/class_1297;
@@ -1224,11 +1223,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #isSneaking
 		COMMENT @see #isInSneakingPose
 		ARG 1 sneaking
-	METHOD method_5661 getArmorItems ()Ljava/lang/Iterable;
-		COMMENT {@return an iterable of item stacks equipped as armor}
-		COMMENT
-		COMMENT @see #getHandItems
-		COMMENT @see #getItemsEquipped
 	METHOD method_5662 saveNbt (Lnet/minecraft/class_2487;)Z
 		ARG 1 nbt
 	METHOD method_5663 getRotationVecClient ()Lnet/minecraft/class_243;
@@ -1269,12 +1263,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_5671 getCommandSource ()Lnet/minecraft/class_2168;
 		COMMENT {@return a command source which represents this entity}
 	METHOD method_5672 getHighSpeedSplashSound ()Lnet/minecraft/class_3414;
-	METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
-		COMMENT Equips {@code stack} at {@code slot}.This is also used to set an entity's
-		COMMENT mainhand or offhand stack. This overwrites any stacks present in that slot
-		COMMENT without dropping them.
-		ARG 1 slot
-		ARG 2 stack
 	METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V
 		COMMENT Called on the client when the tracked data is set.
 		COMMENT
@@ -1621,11 +1609,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT 
    Entities with boss bars like {@link net.minecraft.entity.boss.WitherEntity}
 		COMMENT should override this to remove the player from the boss bar.
 		ARG 1 player
-	METHOD method_5743 getItemsEquipped ()Ljava/lang/Iterable;
-		COMMENT {@return an iterable of item stacks held in the hands or equipped as armor}
-		COMMENT
-		COMMENT @see #getHandItems
-		COMMENT @see #getArmorItems
 	METHOD method_5745 raycast (DFZ)Lnet/minecraft/class_239;
 		ARG 1 maxDistance
 		ARG 3 tickDelta
@@ -2279,11 +2262,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT no gravity. This is saved under the {@code NoGravity} NBT key.
 		ARG 1 noGravity
 	METHOD method_5876 updateWaterState ()Z
-	METHOD method_5877 getHandItems ()Ljava/lang/Iterable;
-		COMMENT {@return an iterable of item stacks held in the hands}
-		COMMENT
-		COMMENT @see #getArmorItems
-		COMMENT @see #getItemsEquipped
 	METHOD method_5878 copyFrom (Lnet/minecraft/class_1297;)V
 		COMMENT Copies serializable data and nether portal data from {@code original}.
 		COMMENT
diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping
index fc069ec9b8..469e601773 100644
--- a/mappings/net/minecraft/entity/EntityType.mapping
+++ b/mappings/net/minecraft/entity/EntityType.mapping
@@ -118,14 +118,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		ARG 1 pos
 		ARG 2 invertY
 		ARG 3 boundingBox
-	METHOD method_5888 create (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297;
+	METHOD method_5888 create (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297;
 		ARG 1 world
-		ARG 2 itemNbt
-		ARG 3 afterConsumer
-		ARG 4 pos
-		ARG 5 reason
-		ARG 6 alignPosition
-		ARG 7 invertY
 	METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960;
 		ARG 0 type
 	METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311;
@@ -148,14 +142,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 	METHOD method_5897 getName ()Lnet/minecraft/class_2561;
 	METHOD method_5898 get (Ljava/lang/String;)Ljava/util/Optional;
 		ARG 0 id
-	METHOD method_5899 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297;
+	METHOD method_5899 spawn (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297;
 		ARG 1 world
-		ARG 2 itemNbt
-		ARG 3 afterConsumer
-		ARG 4 pos
-		ARG 5 reason
-		ARG 6 alignPosition
-		ARG 7 invertY
 	CLASS 1
 		METHOD method_31490 (Lnet/minecraft/class_1937;Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V
 			ARG 2 nbt
diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping
index f8b2220379..e051af3a08 100644
--- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping
+++ b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping
@@ -11,8 +11,6 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity
 		ARG 4 y
 		ARG 6 z
 	METHOD method_16933 setItem (Lnet/minecraft/class_1799;)V
-		ARG 1 stack
-	METHOD method_16935 getTrackedItem ()Lnet/minecraft/class_1799;
 	METHOD method_7478 initTargetPos (Lnet/minecraft/class_2338;)V
 		COMMENT Sets where the eye will fly towards.
 		COMMENT If close enough, it will fly directly towards it, otherwise, it will fly upwards, in the direction of the BlockPos.
diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping
index 536de073bb..f92bc766f7 100644
--- a/mappings/net/minecraft/entity/ItemEntity.mapping
+++ b/mappings/net/minecraft/entity/ItemEntity.mapping
@@ -44,8 +44,6 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity
 		ARG 1 stack1
 		ARG 2 stack2
 	METHOD method_24017 canMerge (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
-		ARG 0 stack1
-		ARG 1 stack2
 	METHOD method_24018 merge (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1799;
 		ARG 0 stack1
 		ARG 1 stack2
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index 598f1f4cdd..a8e0e03b81 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -368,6 +368,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 sound
 	METHOD method_56079 getSlotForHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1304;
 		ARG 0 hand
+	METHOD method_5661 getArmorItems ()Ljava/lang/Iterable;
+	METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
+	METHOD method_5877 getHandItems ()Ljava/lang/Iterable;
 	METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z
 		ARG 1 type
 	METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping
index 7c13dacb2e..1628ede296 100644
--- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping
+++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping
@@ -21,7 +21,7 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity
 	METHOD method_34244 getRotateItemSound ()Lnet/minecraft/class_3414;
 	METHOD method_43271 setAsStackHolder (Lnet/minecraft/class_1799;)V
 		ARG 1 stack
-	METHOD method_43272 getMapId ()Ljava/util/OptionalInt;
+	METHOD method_43272 getMapId ()Lnet/minecraft/class_9209;
 	METHOD method_43273 containsMap ()Z
 	METHOD method_6933 setHeldItemStack (Lnet/minecraft/class_1799;Z)V
 		ARG 1 value
diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
index f2c3e7470b..01d1be6124 100644
--- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
+++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
@@ -6,13 +6,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		COMMENT 
    This exists so that long-duration low-amplifier effects reappears
 		COMMENT after short-duration high-amplifier effects run out.
 	FIELD field_42106 INFINITE I
-	FIELD field_45730 ID_NBT_KEY Ljava/lang/String;
-	FIELD field_45731 AMBIENT_NBT_KEY Ljava/lang/String;
-	FIELD field_45732 HIDDEN_EFFECT_NBT_KEY Ljava/lang/String;
-	FIELD field_45733 AMPLIFIER_NBT_KEY Ljava/lang/String;
-	FIELD field_45734 DURATION_NBT_KEY Ljava/lang/String;
-	FIELD field_45735 SHOW_PARTICLES_NBT_KEY Ljava/lang/String;
-	FIELD field_45736 SHOW_ICON_NBT_KEY Ljava/lang/String;
 	FIELD field_47739 fading Lnet/minecraft/class_1293$class_9063;
 	FIELD field_5889 showIcon Z
 	FIELD field_5890 showParticles Z
@@ -57,13 +50,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		ARG 1 that
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD method_24275 fromNbt (Lnet/minecraft/class_6880;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293;
-		ARG 0 effect
-		ARG 1 nbt
 	METHOD method_24276 copyFrom (Lnet/minecraft/class_1293;)V
 		ARG 1 that
-	METHOD method_24277 writeTypelessNbt (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_48557 isDurationBelow (I)Z
 		ARG 1 duration
 	METHOD method_48558 mapDuration (Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)I
@@ -87,8 +75,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		ARG 2 tickDelta
 	METHOD method_55654 equals (Lnet/minecraft/class_6880;)Z
 		ARG 1 effect
-	METHOD method_55655 (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_1293;
-		ARG 1 effect
 	METHOD method_55656 copyFadingFrom (Lnet/minecraft/class_1293;)V
 		ARG 1 effect
 	METHOD method_55657 skipFading ()V
@@ -98,8 +84,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 	METHOD method_5578 getAmplifier ()I
 	METHOD method_5579 getEffectType ()Lnet/minecraft/class_6880;
 	METHOD method_5581 shouldShowParticles ()Z
-	METHOD method_5582 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
-		ARG 1 nbt
+	METHOD method_5582 writeNbt ()Lnet/minecraft/class_2520;
 	METHOD method_5583 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293;
 		ARG 0 nbt
 	METHOD method_5584 getDuration ()I
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index 01bf1f438f..6c18a6cd7d 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -173,12 +173,11 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 		ARG 1 nodeType
 		ARG 2 penalty
 	METHOD method_5942 getNavigation ()Lnet/minecraft/class_1408;
-	METHOD method_5943 initialize (Lnet/minecraft/class_5425;Lnet/minecraft/class_1266;Lnet/minecraft/class_3730;Lnet/minecraft/class_1315;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1315;
+	METHOD method_5943 initialize (Lnet/minecraft/class_5425;Lnet/minecraft/class_1266;Lnet/minecraft/class_3730;Lnet/minecraft/class_1315;)Lnet/minecraft/class_1315;
 		ARG 1 world
 		ARG 2 difficulty
 		ARG 3 spawnReason
 		ARG 4 entityData
-		ARG 5 entityNbt
 	METHOD method_5944 getPathfindingPenalty (Lnet/minecraft/class_7;)F
 		ARG 1 nodeType
 	METHOD method_5945 getLimitPerChunk ()I
@@ -273,5 +272,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	METHOD method_5994 getAmbientSound ()Lnet/minecraft/class_3414;
 	METHOD method_5995 updateLeash ()V
 	METHOD method_6510 isAttacking ()Z
+	METHOD method_6735 hasArmorSlot ()Z
+	METHOD method_6773 isHorseArmor (Lnet/minecraft/class_1799;)Z
 	METHOD method_7217 setBaby (Z)V
 		ARG 1 baby
diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
index 3957e219a0..d65c27a96c 100644
--- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
-	FIELD field_17047 offerData Lnet/minecraft/class_2487;
+	FIELD field_17047 offerData Lnet/minecraft/class_1916;
 	FIELD field_18877 xp I
 	FIELD field_20299 gossipData Lnet/minecraft/class_2520;
 	FIELD field_30523 BASE_CONVERSION_DELAY I
@@ -8,8 +8,7 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
 	FIELD field_7421 converter Ljava/util/UUID;
 	FIELD field_7422 conversionTimer I
 	FIELD field_7423 CONVERTING Lnet/minecraft/class_2940;
-	METHOD method_16916 setOfferData (Lnet/minecraft/class_2487;)V
-		ARG 1 offerData
+	METHOD method_16916 setOfferData (Lnet/minecraft/class_1916;)V
 	METHOD method_19622 setXp (I)V
 		ARG 1 xp
 	METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V
diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
index d5e3c0ac99..7e5ea42b8b 100644
--- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
@@ -41,13 +41,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 	METHOD method_30009 interactHorse (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269;
 		ARG 1 player
 		ARG 2 stack
-	METHOD method_32335 createInventoryStackReference (ILjava/util/function/Predicate;)Lnet/minecraft/class_5630;
-		ARG 1 slot
-		ARG 2 predicate
-	METHOD method_32336 (Lnet/minecraft/class_1799;)Z
-		ARG 1 stack
-	METHOD method_32337 (Lnet/minecraft/class_1799;)Z
-		ARG 0 stack
 	METHOD method_33338 areInventoriesDifferent (Lnet/minecraft/class_1263;)Z
 		ARG 1 inventory
 	METHOD method_45343 jump (FLnet/minecraft/class_243;)V
@@ -94,21 +87,10 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 	METHOD method_6729 getTemper ()I
 	METHOD method_6730 getHorseFlag (I)Z
 		ARG 1 bitmask
-	METHOD method_6731 updateSaddle ()V
 	METHOD method_6732 setOwnerUuid (Ljava/util/UUID;)V
 		ARG 1 ownerUuid
 	METHOD method_6733 playEatingAnimation ()V
 	METHOD method_6734 canBreed ()Z
-	METHOD method_6735 hasArmorSlot ()Z
-		COMMENT Whether this horse has a slot for custom equipment besides a saddle.
-		COMMENT
-		COMMENT 
    In the item slot argument type, the slot is referred to as 
-		COMMENT horse.armor. In this horse's screen, it appears in the middle of
-		COMMENT the left side, and right below the saddle slot if this horse has a saddle
-		COMMENT slot.
-		COMMENT
-		COMMENT 
    This is used by horse armors and llama carpets, but can be
-		COMMENT refitted to any purpose.
 	METHOD method_6736 isAngry ()Z
 	METHOD method_6737 setAngry (Z)V
 		ARG 1 angry
@@ -138,10 +120,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 		ARG 1 bred
 	METHOD method_6752 bondWithPlayer (Lnet/minecraft/class_1657;)Z
 		ARG 1 player
-	METHOD method_6753 hasArmorInSlot ()Z
-		COMMENT Whether this horse already has an item stack in its horse armor slot.
-		COMMENT
-		COMMENT @see #hasArmorSlot()
 	METHOD method_6754 getChildHealthBonus (Ljava/util/function/IntUnaryOperator;)F
 		ARG 0 randomIntGetter
 	METHOD method_6755 getMaxTemper ()I
@@ -166,10 +144,5 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 	METHOD method_6771 getJumpStrength ()D
 	METHOD method_6772 getEatingAnimationProgress (F)F
 		ARG 1 tickDelta
-	METHOD method_6773 isHorseArmor (Lnet/minecraft/class_1799;)Z
-		COMMENT Whether the given item stack is valid for this horse's armor slot.
-		COMMENT
-		COMMENT @see #hasArmorSlot()
-		ARG 1 item
 	METHOD method_6774 getChildJumpStrengthBonus (Ljava/util/function/DoubleSupplier;)D
 		ARG 0 randomDoubleGetter
diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping
index 852e3c51cb..5c49548330 100644
--- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping
@@ -1,19 +1,13 @@
 CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity
 	FIELD field_47807 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048;
-	FIELD field_6985 HORSE_ARMOR_BONUS_ID Ljava/util/UUID;
 	FIELD field_6990 VARIANT Lnet/minecraft/class_2940;
-	METHOD method_18445 equipArmor (Lnet/minecraft/class_1799;)V
-		ARG 1 stack
 	METHOD method_27076 setHorseVariant (Lnet/minecraft/class_5149;Lnet/minecraft/class_5148;)V
 		ARG 1 color
 		ARG 2 marking
 	METHOD method_27078 getMarking ()Lnet/minecraft/class_5148;
 	METHOD method_6783 setHorseVariant (I)V
 		ARG 1 variant
-	METHOD method_6786 getArmorType ()Lnet/minecraft/class_1799;
 	METHOD method_6788 getHorseVariant ()I
-	METHOD method_6790 setArmorTypeFromStack (Lnet/minecraft/class_1799;)V
-		ARG 1 stack
 	CLASS class_1499 HorseData
 		FIELD field_6994 color Lnet/minecraft/class_5149;
 		METHOD  (Lnet/minecraft/class_5149;)V
diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping
index 006daf1416..9e6dc37a69 100644
--- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping
@@ -2,7 +2,6 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity
 	FIELD field_25375 TAMING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_30425 MAX_STRENGTH I
 	FIELD field_47808 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048;
-	FIELD field_6995 CARPET_COLOR Lnet/minecraft/class_2940;
 	FIELD field_6996 VARIANT Lnet/minecraft/class_2940;
 	FIELD field_6997 follower Lnet/minecraft/class_1501;
 	FIELD field_6998 STRENGTH Lnet/minecraft/class_2940;
@@ -20,8 +19,6 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity
 	METHOD method_6796 initializeStrength (Lnet/minecraft/class_5819;)V
 		ARG 1 random
 	METHOD method_6797 stopFollowing ()V
-	METHOD method_6799 setCarpetColor (Lnet/minecraft/class_1767;)V
-		ARG 1 color
 	METHOD method_6800 getCarpetColor ()Lnet/minecraft/class_1767;
 	METHOD method_6802 setStrength (I)V
 		ARG 1 strength
diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping
index 83e9088941..0bb1667bf8 100644
--- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping
@@ -5,8 +5,6 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity
 	FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940;
 	FIELD field_30386 WILD_MAX_HEALTH F
 	FIELD field_30387 TAMED_MAX_HEALTH F
-	FIELD field_47776 WOLF_ARMOR_BONUS_MODIFIER_UUID Ljava/util/UUID;
-	FIELD field_47777 ARMORED Lnet/minecraft/class_2940;
 	FIELD field_6944 furWet Z
 	FIELD field_6945 lastShakeProgress F
 	FIELD field_6946 BEGGING Lnet/minecraft/class_2940;
@@ -25,8 +23,6 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity
 		ARG 2 spawnReason
 		ARG 3 pos
 		ARG 4 random
-	METHOD method_55708 setArmored (Z)V
-		ARG 1 armored
 	METHOD method_55710 hasArmor ()Z
 	METHOD method_6707 getFurWetBrightnessMultiplier (F)F
 		COMMENT Returns this wolf's brightness multiplier based on the fur wetness.
diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping
index e52f1be203..5a6bd97025 100644
--- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping
+++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping
@@ -80,7 +80,6 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory
 		ARG 1 nbtList
 	METHOD method_7385 addStack (ILnet/minecraft/class_1799;)I
 		ARG 1 slot
-		ARG 2 stack
 	METHOD method_7386 getSwappableHotbarSlot ()I
 	METHOD method_7387 populateRecipeFinder (Lnet/minecraft/class_1662;)V
 		ARG 1 finder
diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping
index 3ff3173a9a..9280417934 100644
--- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping
@@ -1,5 +1,3 @@
 CLASS net/minecraft/class_3855 net/minecraft/entity/projectile/AbstractFireballEntity
 	FIELD field_17081 ITEM Lnet/minecraft/class_2940;
 	METHOD method_16936 setItem (Lnet/minecraft/class_1799;)V
-		ARG 1 stack
-	METHOD method_16938 getItem ()Lnet/minecraft/class_1799;
diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping
index d06ec04772..d9ffd0451f 100644
--- a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping
@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_3857 net/minecraft/entity/projectile/thrown/ThrownItemEntity
 	FIELD field_17082 ITEM Lnet/minecraft/class_2940;
 	METHOD method_16940 setItem (Lnet/minecraft/class_1799;)V
-		ARG 1 item
 	METHOD method_16942 getDefaultItem ()Lnet/minecraft/class_1792;
-	METHOD method_16943 getItem ()Lnet/minecraft/class_1799;
diff --git a/mappings/net/minecraft/inventory/SingleStackInventory.mapping b/mappings/net/minecraft/inventory/SingleStackInventory.mapping
index 3d15dfbc59..02203de652 100644
--- a/mappings/net/minecraft/inventory/SingleStackInventory.mapping
+++ b/mappings/net/minecraft/inventory/SingleStackInventory.mapping
@@ -5,5 +5,4 @@ CLASS net/minecraft/class_8181 net/minecraft/inventory/SingleStackInventory
 	METHOD method_54078 decreaseStack (I)Lnet/minecraft/class_1799;
 		ARG 1 count
 	METHOD method_54079 getStack ()Lnet/minecraft/class_1799;
-	METHOD method_54080 asBlockEntity ()Lnet/minecraft/class_2586;
 	METHOD method_54099 emptyStack ()Lnet/minecraft/class_1799;
diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping
index aa17f543c4..3213737071 100644
--- a/mappings/net/minecraft/item/AnimalArmorItem.mapping
+++ b/mappings/net/minecraft/item/AnimalArmorItem.mapping
@@ -1,20 +1,11 @@
 CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem
-	FIELD field_18136 bonus I
 	FIELD field_47823 entityTexture Lnet/minecraft/class_2960;
 	FIELD field_47824 type Lnet/minecraft/class_4059$class_9076;
-	METHOD  (ILnet/minecraft/class_4059$class_9076;Ljava/lang/String;Lnet/minecraft/class_1792$class_1793;)V
-		ARG 1 bonus
+	METHOD  (Lnet/minecraft/class_6880;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_1792$class_1793;)V
 		ARG 2 type
-		ARG 3 name
-		ARG 4 settings
 	METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960;
-	METHOD method_18455 getBonus ()I
 	METHOD method_55756 getType ()Lnet/minecraft/class_4059$class_9076;
 	CLASS class_9076 Type
 		FIELD field_47827 textureIdFunction Ljava/util/function/Function;
 		METHOD  (Ljava/lang/String;ILjava/util/function/Function;)V
 			ARG 3 textureIdFunction
-		METHOD method_55758 (Ljava/lang/String;)Lnet/minecraft/class_2960;
-			ARG 0 name
-		METHOD method_55759 (Ljava/lang/String;)Lnet/minecraft/class_2960;
-			ARG 0 name
diff --git a/mappings/net/minecraft/item/ArmorItem.mapping b/mappings/net/minecraft/item/ArmorItem.mapping
index 7fddbcc0a1..6b1bd37c79 100644
--- a/mappings/net/minecraft/item/ArmorItem.mapping
+++ b/mappings/net/minecraft/item/ArmorItem.mapping
@@ -1,15 +1,10 @@
 CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem
-	FIELD field_21976 knockbackResistance F
-	FIELD field_23741 attributeModifiers Lcom/google/common/collect/Multimap;
+	FIELD field_23741 attributeModifiers Ljava/util/function/Supplier;
 	FIELD field_41933 type Lnet/minecraft/class_1738$class_8051;
 	FIELD field_7876 MODIFIERS Ljava/util/EnumMap;
-	FIELD field_7877 toughness F
-	FIELD field_7878 protection I
 	FIELD field_7879 DISPENSER_BEHAVIOR Lnet/minecraft/class_2357;
-	FIELD field_7881 material Lnet/minecraft/class_1741;
-	METHOD  (Lnet/minecraft/class_1741;Lnet/minecraft/class_1738$class_8051;Lnet/minecraft/class_1792$class_1793;)V
-		ARG 1 material
-		ARG 2 type
+	FIELD field_7881 material Lnet/minecraft/class_6880;
+	METHOD  (Lnet/minecraft/class_6880;Lnet/minecraft/class_1738$class_8051;Lnet/minecraft/class_1792$class_1793;)V
 		ARG 3 settings
 	METHOD method_26353 getToughness ()F
 	METHOD method_48397 (Ljava/util/EnumMap;)V
@@ -18,7 +13,7 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem
 	METHOD method_7684 dispenseArmor (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Z
 		ARG 0 pointer
 		ARG 1 armor
-	METHOD method_7686 getMaterial ()Lnet/minecraft/class_1741;
+	METHOD method_7686 getMaterial ()Lnet/minecraft/class_6880;
 	METHOD method_7687 getProtection ()I
 	CLASS class_8051 Type
 		FIELD field_41938 equipmentSlot Lnet/minecraft/class_1304;
diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping
index 540d44921e..138de11d73 100644
--- a/mappings/net/minecraft/item/ArmorMaterial.mapping
+++ b/mappings/net/minecraft/item/ArmorMaterial.mapping
@@ -3,59 +3,12 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial
 	COMMENT
 	COMMENT 
    
 	COMMENT To view available vanilla armor materials, visit {@link ArmorMaterials}.
-	METHOD method_24355 getKnockbackResistance ()F
-		COMMENT {@return the knockback resistance value of an {@link ArmorItem} piece using this {@link ArmorMaterial}}
-		COMMENT
-		COMMENT 
    
-		COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE}
-		COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type.
-	METHOD method_48402 getDurability (Lnet/minecraft/class_1738$class_8051;)I
-		COMMENT Returns the total amount of durability points an {@link ArmorItem} using this {@link ArmorMaterial} has.
-		COMMENT
-		COMMENT 
    
-		COMMENT The value returned here will set the {@link Item.Settings} max durability option when passed
-		COMMENT into {@link ArmorItem#ArmorItem(net.minecraft.item.ArmorMaterial, ArmorItem.Type, Item.Settings)}
-		COMMENT if the value was not already specified.
-		COMMENT
-		COMMENT @return the total durability an {@link ArmorItem} with this {@link ArmorMaterial} has
-		ARG 1 type
-			COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial}
-	METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I
-		COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem}
-		COMMENT using this {@link ArmorMaterial} while it is worn by a player.
-		COMMENT
-		COMMENT 
    
-		COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier}
-		COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier.
-		COMMENT
-		COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial}
-		ARG 1 type
-			COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial}
-	METHOD method_7694 getName ()Ljava/lang/String;
-		COMMENT Returns the {@code name} of this {@link ArmorMaterial}, which is used for locating armor texture files.
-		COMMENT
-		COMMENT 
    
-		COMMENT The return value of this method should be in {@code snake_case}.
-		COMMENT {@link net.minecraft.client.render.entity.feature.ArmorFeatureRenderer} will expect to find an armor
-		COMMENT texture file matching {@code minecraft:textures/models/armor/{material_name}_layer_[1/2].png}
-		COMMENT based off the return result of this method.
-		COMMENT
-		COMMENT 
    
-		COMMENT Example: given a return value of {@code cool_material}, {@code ArmorFeatureRenderer} will require a file
-		COMMENT at {@code minecraft:textures/models/armor/cool_material_layer_1.png} and {@code minecraft:textures/models/armor/cool_material_layer_2.png}.
-		COMMENT
-		COMMENT @return the {@code name} of this armor material in snake_case, used for finding armor textures
-	METHOD method_7695 getRepairIngredient ()Lnet/minecraft/class_1856;
-		COMMENT Returns the {@link Ingredient} used to repair items using this {@link ArmorMaterial}.
-		COMMENT
-		COMMENT 
    
-		COMMENT By default, {@link ArmorItem} will delegate {@link Item#canRepair(ItemStack, ItemStack)}
-		COMMENT back to this method.
-		COMMENT
-		COMMENT @return the {@link Ingredient} required to repair items with this {@link ArmorMaterial}
-	METHOD method_7698 getEquipSound ()Lnet/minecraft/class_3414;
-		COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link ArmorItem} using this {@link ArmorMaterial}
-	METHOD method_7699 getEnchantability ()I
+	FIELD comp_2299 getEnchantability I
+	FIELD comp_2300 getEquipSound Lnet/minecraft/class_6880;
+	FIELD comp_2301 getRepairIngredient Ljava/util/function/Supplier;
+	FIELD comp_2303 getToughness F
+	FIELD comp_2304 getKnockbackResistance F
+	METHOD comp_2299 getEnchantability ()I
 		COMMENT Returns the base enchantment value used by {@link ArmorItem} with this material.
 		COMMENT
 		COMMENT 
    
@@ -67,7 +20,17 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial
 		COMMENT The highest enchantability value in vanilla is Netherite, at {@code 37}.
 		COMMENT
 		COMMENT @return the enchantment value sent back to {@link Item#getEnchantability()} for armor using this material
-	METHOD method_7700 getToughness ()F
+	METHOD comp_2300 getEquipSound ()Lnet/minecraft/class_6880;
+		COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link ArmorItem} using this {@link ArmorMaterial}
+	METHOD comp_2301 getRepairIngredient ()Ljava/util/function/Supplier;
+		COMMENT Returns the {@link Ingredient} used to repair items using this {@link ArmorMaterial}.
+		COMMENT
+		COMMENT 
    
+		COMMENT By default, {@link ArmorItem} will delegate {@link Item#canRepair(ItemStack, ItemStack)}
+		COMMENT back to this method.
+		COMMENT
+		COMMENT @return the {@link Ingredient} required to repair items with this {@link ArmorMaterial}
+	METHOD comp_2303 getToughness ()F
 		COMMENT Returns the toughness value of an {@link ArmorItem} piece using this {@link ArmorMaterial}.
 		COMMENT
 		COMMENT 
    
@@ -75,3 +38,20 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial
 		COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type.
 		COMMENT
 		COMMENT @return the toughness value of any {@link ArmorItem} using this {@link ArmorMaterial}
+	METHOD comp_2304 getKnockbackResistance ()F
+		COMMENT {@return the knockback resistance value of an {@link ArmorItem} piece using this {@link ArmorMaterial}}
+		COMMENT
+		COMMENT 
    
+		COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE}
+		COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type.
+	METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I
+		COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem}
+		COMMENT using this {@link ArmorMaterial} while it is worn by a player.
+		COMMENT
+		COMMENT 
    
+		COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier}
+		COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier.
+		COMMENT
+		COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial}
+		ARG 1 type
+			COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial}
diff --git a/mappings/net/minecraft/item/ArmorMaterials.mapping b/mappings/net/minecraft/item/ArmorMaterials.mapping
index 5c4738947f..e8ff472ab3 100644
--- a/mappings/net/minecraft/item/ArmorMaterials.mapping
+++ b/mappings/net/minecraft/item/ArmorMaterials.mapping
@@ -1,24 +1,5 @@
 CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials
-	FIELD field_21978 knockbackResistance F
-	FIELD field_41941 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_41942 BASE_DURABILITY Ljava/util/EnumMap;
-	FIELD field_41943 protectionAmounts Ljava/util/EnumMap;
-	FIELD field_7883 durabilityMultiplier I
-	FIELD field_7884 name Ljava/lang/String;
-	FIELD field_7885 repairIngredientSupplier Lnet/minecraft/class_3528;
-	FIELD field_7886 equipSound Lnet/minecraft/class_3414;
-	FIELD field_7887 CHAIN Lnet/minecraft/class_1740;
-	FIELD field_7894 toughness F
-	FIELD field_7896 enchantability I
-	METHOD  (Ljava/lang/String;ILjava/lang/String;ILjava/util/EnumMap;ILnet/minecraft/class_3414;FFLjava/util/function/Supplier;)V
-		ARG 3 name
-		ARG 4 durabilityMultiplier
-		ARG 5 protectionAmounts
-		ARG 6 enchantability
-		ARG 7 equipSound
-		ARG 8 toughness
-		ARG 9 knockbackResistance
-		ARG 10 repairIngredientSupplier
+	FIELD field_7887 CHAIN Lnet/minecraft/class_6880;
 	METHOD method_48405 (Ljava/util/EnumMap;)V
 		ARG 0 map
 	METHOD method_48406 (Ljava/util/EnumMap;)V
diff --git a/mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping b/mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping
deleted file mode 100644
index 06488ee9e8..0000000000
--- a/mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_4058 net/minecraft/item/DyeableAnimalArmorItem
diff --git a/mappings/net/minecraft/item/DyeableArmorItem.mapping b/mappings/net/minecraft/item/DyeableArmorItem.mapping
deleted file mode 100644
index 0785abd352..0000000000
--- a/mappings/net/minecraft/item/DyeableArmorItem.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_4057 net/minecraft/item/DyeableArmorItem
diff --git a/mappings/net/minecraft/item/DyeableItem.mapping b/mappings/net/minecraft/item/DyeableItem.mapping
index 7d10954294..28e4f43ad0 100644
--- a/mappings/net/minecraft/item/DyeableItem.mapping
+++ b/mappings/net/minecraft/item/DyeableItem.mapping
@@ -6,11 +6,6 @@ CLASS net/minecraft/class_1768 net/minecraft/item/DyeableItem
 		ARG 0 stack
 		ARG 1 colors
 	METHOD method_7798 removeColor (Lnet/minecraft/class_1799;)V
-		ARG 1 stack
 	METHOD method_7799 setColor (Lnet/minecraft/class_1799;I)V
-		ARG 1 stack
-		ARG 2 color
 	METHOD method_7800 getColor (Lnet/minecraft/class_1799;)I
-		ARG 1 stack
 	METHOD method_7801 hasColor (Lnet/minecraft/class_1799;)Z
-		ARG 1 stack
diff --git a/mappings/net/minecraft/item/Equipment.mapping b/mappings/net/minecraft/item/Equipment.mapping
index 0f4fc4d6b4..01719b4d7d 100644
--- a/mappings/net/minecraft/item/Equipment.mapping
+++ b/mappings/net/minecraft/item/Equipment.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_5151 net/minecraft/item/Equipment
 	COMMENT Represents a type of item that is wearable in an armor equipment slot, or a shield.
 	COMMENT
 	COMMENT 
    This type of item can be targeted by the {@code minecraft:binding_curse} enchantment.
-	METHOD method_31570 getEquipSound ()Lnet/minecraft/class_3414;
+	METHOD method_31570 getEquipSound ()Lnet/minecraft/class_6880;
 	METHOD method_48576 equipAndSwap (Lnet/minecraft/class_1792;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271;
 		ARG 1 item
 		ARG 2 world
diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping
index f3a2e476c0..3500515c03 100644
--- a/mappings/net/minecraft/item/FilledMapItem.mapping
+++ b/mappings/net/minecraft/item/FilledMapItem.mapping
@@ -3,15 +3,12 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
 	FIELD field_30910 MAP_KEY Ljava/lang/String;
 	FIELD field_41067 MAP_SCALE_DIRECTION_KEY Ljava/lang/String;
 	FIELD field_41068 MAP_TO_LOCK_KEY Ljava/lang/String;
-	METHOD method_17440 getMapName (I)Ljava/lang/String;
-		ARG 0 mapId
 	METHOD method_17442 copyMap (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)V
 		ARG 0 world
 		ARG 1 stack
-	METHOD method_32348 setMapId (Lnet/minecraft/class_1799;I)V
+	METHOD method_32348 setMapId (Lnet/minecraft/class_1799;Lnet/minecraft/class_9209;)V
 		ARG 0 stack
-		ARG 1 id
-	METHOD method_32349 allocateMapId (Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)I
+	METHOD method_32349 allocateMapId (Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)Lnet/minecraft/class_9209;
 		ARG 0 world
 		ARG 1 x
 		ARG 2 z
@@ -23,8 +20,7 @@ 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_53836 getIdText (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2561;
 	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;
@@ -35,8 +31,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
 		ARG 0 map
 		ARG 1 world
 		ARG 2 amount
-	METHOD method_7997 getMapState (Ljava/lang/Integer;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22;
-		ARG 0 id
+	METHOD method_7997 getMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22;
 		ARG 1 world
 	METHOD method_7998 updateColors (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_22;)V
 		ARG 1 world
@@ -59,7 +54,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
 	METHOD method_8002 fillExplorationMap (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V
 		ARG 0 world
 		ARG 1 map
-	METHOD method_8003 getMapId (Lnet/minecraft/class_1799;)Ljava/lang/Integer;
+	METHOD method_8003 getMapId (Lnet/minecraft/class_1799;)Lnet/minecraft/class_9209;
 		ARG 0 stack
 	METHOD method_8005 createMap (Lnet/minecraft/class_1937;IIBZZ)Lnet/minecraft/class_1799;
 		ARG 0 world
diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping
index 04ec2a794c..7bfbb1cb43 100644
--- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping
+++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping
@@ -2,23 +2,19 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker
 	COMMENT Represents a banner marker in world.
 	COMMENT 
    
 	COMMENT Used to track banners in a map state.
-	FIELD field_67 name Lnet/minecraft/class_2561;
-	FIELD field_68 color Lnet/minecraft/class_1767;
-	FIELD field_69 pos Lnet/minecraft/class_2338;
-	METHOD  (Lnet/minecraft/class_2338;Lnet/minecraft/class_1767;Lnet/minecraft/class_2561;)V
+	FIELD comp_2312 pos Lnet/minecraft/class_2338;
+	FIELD comp_2313 color Lnet/minecraft/class_1767;
+	FIELD comp_2314 name Ljava/util/Optional;
+	METHOD  (Lnet/minecraft/class_2338;Lnet/minecraft/class_1767;Ljava/util/Optional;)V
 		ARG 1 pos
 		ARG 2 dyeColor
-		ARG 3 name
+	METHOD comp_2312 pos ()Lnet/minecraft/class_2338;
+	METHOD comp_2313 color ()Lnet/minecraft/class_1767;
+	METHOD comp_2314 name ()Ljava/util/Optional;
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD method_35502 getColor ()Lnet/minecraft/class_1767;
-	METHOD method_67 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_17;
-		ARG 0 nbt
-	METHOD method_68 getName ()Lnet/minecraft/class_2561;
-	METHOD method_70 getPos ()Lnet/minecraft/class_2338;
 	METHOD method_71 getKey ()Ljava/lang/String;
 	METHOD method_72 getIconType ()Lnet/minecraft/class_20$class_21;
 	METHOD method_73 fromWorldBlock (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_17;
 		ARG 0 blockView
 		ARG 1 blockPos
-	METHOD method_74 getNbt ()Lnet/minecraft/class_2487;
diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping
index 7654f30eac..5bab715fd3 100644
--- a/mappings/net/minecraft/item/map/MapIcon.mapping
+++ b/mappings/net/minecraft/item/map/MapIcon.mapping
@@ -3,18 +3,17 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon
 	FIELD comp_1843 x B
 	FIELD comp_1844 z B
 	FIELD comp_1845 rotation B
-	FIELD comp_1846 text Lnet/minecraft/class_2561;
-	METHOD  (Lnet/minecraft/class_20$class_21;BBBLnet/minecraft/class_2561;)V
+	FIELD comp_1846 text Ljava/util/Optional;
+	METHOD  (Lnet/minecraft/class_20$class_21;BBBLjava/util/Optional;)V
 		ARG 1 type
 		ARG 2 x
 		ARG 3 z
 		ARG 4 rotation
-		ARG 5 text
 	METHOD comp_1842 type ()Lnet/minecraft/class_20$class_21;
 	METHOD comp_1843 x ()B
 	METHOD comp_1844 z ()B
 	METHOD comp_1845 rotation ()B
-	METHOD comp_1846 text ()Lnet/minecraft/class_2561;
+	METHOD comp_1846 text ()Ljava/util/Optional;
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_92 getTypeId ()B
@@ -27,16 +26,6 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon
 		FIELD field_46184 structure Z
 		FIELD field_81 id B
 		FIELD field_82 tintColor I
-		METHOD  (Ljava/lang/String;ILjava/lang/String;ZIZZ)V
-			ARG 3 name
-			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
diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping
index 2bafa8cec3..8baa80bc33 100644
--- a/mappings/net/minecraft/item/map/MapState.mapping
+++ b/mappings/net/minecraft/item/map/MapState.mapping
@@ -33,8 +33,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 		ARG 5 unlimitedTracking
 		ARG 6 locked
 		ARG 7 dimension
-	METHOD method_100 getPlayerMarkerPacket (ILnet/minecraft/class_1657;)Lnet/minecraft/class_2596;
-		ARG 1 id
+	METHOD method_100 getPlayerMarkerPacket (Lnet/minecraft/class_9209;Lnet/minecraft/class_1657;)Lnet/minecraft/class_2596;
 		ARG 2 player
 	METHOD method_101 getPlayerSyncData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_22$class_23;
 		ARG 1 player
@@ -108,7 +107,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 		ARG 1 x
 		ARG 2 z
 		ARG 3 color
-	METHOD method_32371 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_22;
+	METHOD method_32371 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_22;
 		ARG 0 nbt
 	METHOD method_32372 hasMonumentIcon ()Z
 	METHOD method_32373 getIcons ()Ljava/lang/Iterable;
@@ -119,7 +118,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 	METHOD method_52611 getPersistentStateType ()Lnet/minecraft/class_18$class_8645;
 	METHOD method_55784 getEqualPredicate (Lnet/minecraft/class_1799;)Ljava/util/function/Predicate;
 		ARG 0 stack
-	METHOD method_55785 (Lnet/minecraft/class_1799;Ljava/lang/Integer;Lnet/minecraft/class_1799;)Z
+	METHOD method_55785 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9209;Lnet/minecraft/class_1799;)Z
 		ARG 2 other
 	CLASS class_23 PlayerUpdateTracker
 		FIELD field_124 emptyPacketsRequested I
@@ -135,21 +134,25 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 		METHOD method_111 markDirty (II)V
 			ARG 1 startX
 			ARG 2 startZ
-		METHOD method_112 getPacket (I)Lnet/minecraft/class_2596;
-			ARG 1 mapId
+		METHOD method_112 getPacket (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2596;
 		METHOD method_32375 getMapUpdateData ()Lnet/minecraft/class_22$class_5637;
 		METHOD method_32379 markIconsDirty ()V
 	CLASS class_5637 UpdateData
-		FIELD field_27892 startX I
-		FIELD field_27893 startZ I
-		FIELD field_27894 width I
-		FIELD field_27895 height I
-		FIELD field_27896 colors [B
+		FIELD comp_2316 startX I
+		FIELD comp_2317 startZ I
+		FIELD comp_2318 width I
+		FIELD comp_2319 height I
+		FIELD comp_2320 colors [B
 		METHOD  (IIII[B)V
 			ARG 1 startX
 			ARG 2 startZ
 			ARG 3 width
 			ARG 4 height
 			ARG 5 colors
+		METHOD comp_2316 startX ()I
+		METHOD comp_2317 startZ ()I
+		METHOD comp_2318 width ()I
+		METHOD comp_2319 height ()I
+		METHOD comp_2320 colors ()[B
 		METHOD method_32380 setColorsTo (Lnet/minecraft/class_22;)V
 			ARG 1 mapState
diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping
index d27a58bcbd..c584a82b7e 100644
--- a/mappings/net/minecraft/item/trim/ArmorTrim.mapping
+++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping
@@ -33,17 +33,10 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim
 	METHOD method_48430 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 		ARG 1 path
 	METHOD method_48431 getMaterial ()Lnet/minecraft/class_6880;
-	METHOD method_48432 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960;
-		ARG 2 armorMaterial
 	METHOD method_48433 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 		ARG 1 path
-	METHOD method_48434 getLeggingsModelId (Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960;
-		ARG 1 armorMaterial
-	METHOD method_48435 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960;
-		ARG 2 armorMaterial
-	METHOD method_48436 getGenericModelId (Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960;
-		ARG 1 armorMaterial
-	METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_1741;)Ljava/lang/String;
-		ARG 1 armorMaterial
+	METHOD method_48434 getLeggingsModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
+	METHOD method_48436 getGenericModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
+	METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;)Ljava/lang/String;
 	METHOD method_52565 (ZLjava/lang/String;)V
 		ARG 1 error
diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping
index bf7a07a123..a286aa3aab 100644
--- a/mappings/net/minecraft/loot/LootDataType.mapping
+++ b/mappings/net/minecraft/loot/LootDataType.mapping
@@ -7,9 +7,8 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType
 		ARG 1 codec
 		ARG 2 id
 		ARG 3 validator
-	METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)Ljava/util/Optional;
+	METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/util/Optional;
 		ARG 1 id
-		ARG 2 json
 	METHOD method_51207 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_46;)V
 		ARG 0 reporter
 		ARG 1 key
diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping
index 26bdb39ddf..99167bf6d6 100644
--- a/mappings/net/minecraft/loot/LootManager.mapping
+++ b/mappings/net/minecraft/loot/LootManager.mapping
@@ -6,8 +6,6 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager
 	FIELD field_975 LOGGER Lorg/slf4j/Logger;
 	METHOD method_20712 validate (Ljava/util/Map;)V
 		ARG 1 lootData
-	METHOD method_51190 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;Lnet/minecraft/class_8490;)Ljava/util/concurrent/CompletableFuture;
-		ARG 3 type
 	METHOD method_51191 (Lcom/google/common/collect/ImmutableMap$Builder;Lcom/google/common/collect/ImmutableMultimap$Builder;Lnet/minecraft/class_8490;Ljava/util/Map;)V
 		ARG 2 type
 		ARG 3 idToValue
@@ -16,14 +14,8 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager
 		ARG 4 value
 	METHOD method_51193 getIds (Lnet/minecraft/class_8490;)Ljava/util/Collection;
 		ARG 1 type
-	METHOD method_51194 load (Lnet/minecraft/class_8490;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_51194 load (Lnet/minecraft/class_8490;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 type
-		ARG 1 resourceManager
-		ARG 2 executor
-		ARG 3 results
-	METHOD method_51195 (Lnet/minecraft/class_8490;Ljava/util/Map;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V
-		ARG 2 id
-		ARG 3 json
 	METHOD method_51196 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V
 		ARG 0 reporter
 		ARG 1 key
diff --git a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping
index e589af981e..371be3bf68 100644
--- a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping
+++ b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping
@@ -4,19 +4,3 @@ CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditionTypes
 	METHOD method_29327 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5342;
 		ARG 0 id
 		ARG 1 codec
-	METHOD method_921 (Ljava/lang/Object;)Z
-		ARG 0 predicatesx
-	METHOD method_924 matchingAll (Ljava/util/List;)Ljava/util/function/Predicate;
-		COMMENT Returns a predicate that returns true only if all its element predicates
-		COMMENT return true, as if applied by logical and.
-		ARG 0 predicates
-	METHOD method_925 matchingAny (Ljava/util/List;)Ljava/util/function/Predicate;
-		COMMENT Returns a predicate that returns true if any its element predicates
-		COMMENT return true, as if applied by logical or.
-		ARG 0 predicates
-	METHOD method_927 (Ljava/util/List;Ljava/lang/Object;)Z
-		ARG 1 operand
-	METHOD method_928 (Ljava/lang/Object;)Z
-		ARG 0 predicatesx
-	METHOD method_929 (Ljava/util/List;Ljava/lang/Object;)Z
-		ARG 1 operand
diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping
index b0ed41e5ce..11ddde2235 100644
--- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping
+++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping
@@ -6,9 +6,6 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu
 		ARG 1 conditions
 		ARG 2 enchantments
 		ARG 3 add
-	METHOD method_32407 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V
-		ARG 1 enchantment
-		ARG 2 level
 	METHOD method_32409 (Lnet/minecraft/class_5658;)Ljava/util/stream/Stream;
 		ARG 0 numberProvider
 	METHOD method_32410 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_47;Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)V
diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping
index d818468fde..1529dc25cc 100644
--- a/mappings/net/minecraft/network/ClientConnection.mapping
+++ b/mappings/net/minecraft/network/ClientConnection.mapping
@@ -62,7 +62,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
 	METHOD method_10752 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V
 		ARG 1 packet
 		ARG 2 callbacks
-	METHOD method_10753 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_8743;)Lnet/minecraft/class_2535;
+	METHOD method_10753 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_9191;)Lnet/minecraft/class_2535;
 		ARG 0 address
 		ARG 1 useEpoll
 		ARG 2 packetSizeLog
@@ -163,7 +163,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
 		ARG 1 packetListener
 	METHOD method_52915 flush ()V
 	METHOD method_52918 flushInternal ()V
-	METHOD method_53505 resetPacketSizeLog (Lnet/minecraft/class_8743;)V
+	METHOD method_53505 resetPacketSizeLog (Lnet/minecraft/class_9191;)V
 		ARG 1 log
 	METHOD method_53859 addFlowControlHandler (Lio/netty/channel/ChannelPipeline;)V
 		ARG 1 pipeline
diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping
index b2f2e462a7..5679482972 100644
--- a/mappings/net/minecraft/network/PacketByteBuf.mapping
+++ b/mappings/net/minecraft/network/PacketByteBuf.mapping
@@ -449,14 +449,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT @see net.minecraft.network.encoding.VarInts
 		ARG 1 value
 			COMMENT the value to write
-	METHOD method_10805 writeText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2540;
-		COMMENT Writes a text to this buf. A text is represented as an NBT-encoded data.
-		COMMENT
-		COMMENT @return this buf, for chaining
-		COMMENT @see #readText()
-		COMMENT @see #readUnlimitedText()
-		ARG 1 text
-			COMMENT the text to write
 	METHOD method_10806 writeIntArray ([I)Lnet/minecraft/class_2540;
 		COMMENT Writes an array of primitive ints to this buf. The array first has a
 		COMMENT var int indicating its length, followed by the var int entries.
@@ -477,16 +469,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT @see #readBlockPos()
 		ARG 1 pos
 			COMMENT the pos to write
-	METHOD method_10808 readText ()Lnet/minecraft/class_2561;
-		COMMENT Reads a text from this buf. A text is represented as an NBT-encoded data
-		COMMENT with {@linkplain NbtSizeTracker the maximum size} as {@value #MAX_READ_NBT_SIZE}.
-		COMMENT
-		COMMENT @return the read text
-		COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read
-		COMMENT @throws net.minecraft.nbt.NbtSizeValidationException if the serialized text is too big
-		COMMENT @see #readUnlimitedText()
-		COMMENT @see #writeText(Text)
-		COMMENT @see #MAX_READ_NBT_SIZE
 	METHOD method_10809 readLongArray ([JI)[J
 		COMMENT Reads an array of primitive longs from this buf. The array first has a
 		COMMENT var int indicating its length, followed by the regular long (not var
@@ -864,7 +846,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT the value is not null.
 		COMMENT
 		COMMENT @see #readNullable(PacketByteBuf.PacketReader)
-		ARG 1 value
 		ARG 2 writer
 	METHOD method_43827 readNullable (Lnet/minecraft/class_9141;)Ljava/lang/Object;
 		COMMENT Reads a nullable value from this buf. A nullable value is represented by
@@ -1064,13 +1045,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT @return the read registry key
 		COMMENT @see #readRegistryKey(RegistryKey)
 		COMMENT @see #writeRegistryKey(RegistryKey)
-	METHOD method_54148 readUnlimitedText ()Lnet/minecraft/class_2561;
-		COMMENT Reads a text from this buf. A text is represented as an NBT-encoded data.
-		COMMENT Unlike {@link #readText()}, this method can read an unlimited amount of text.
-		COMMENT
-		COMMENT @return the read text
-		COMMENT @see #readText()
-		COMMENT @see #writeText(Text)
 	METHOD method_56335 readBlockPos (Lio/netty/buffer/ByteBuf;)Lnet/minecraft/class_2338;
 		ARG 0 buf
 	METHOD method_56336 writeBlockPos (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_2338;)V
diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
index c14bec5679..eb167eb5e2 100644
--- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping
+++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
@@ -215,14 +215,14 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		ARG 1 codec
 	METHOD method_56385 (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139;
 		ARG 0 codec
-	CLASS 7
+	CLASS 10
 		METHOD method_56419 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V
 			ARG 3 k
 			ARG 4 v
-	CLASS 9
+	CLASS 13
 		METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359;
 			ARG 1 buf
-	CLASS 10
+	CLASS 14
 		FIELD field_48562 DIRECT_ENTRY_MARKER I
 		METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359;
 			ARG 1 buf
diff --git a/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping b/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping
index 54b4b18f82..098bb2e361 100644
--- a/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping
+++ b/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_8762 net/minecraft/network/handler/PacketSizeLogger
 	FIELD field_45953 packetSizeInBytes Ljava/util/concurrent/atomic/AtomicInteger;
-	FIELD field_45954 log Lnet/minecraft/class_8743;
-	METHOD  (Lnet/minecraft/class_8743;)V
+	FIELD field_45954 log Lnet/minecraft/class_9191;
+	METHOD  (Lnet/minecraft/class_9191;)V
 		ARG 1 log
 	METHOD method_53503 push ()V
 	METHOD method_53504 increment (I)V
diff --git a/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping
index f3c13f3d3e..bf7f581950 100644
--- a/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping
+++ b/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping
@@ -4,5 +4,3 @@ CLASS net/minecraft/class_9091 net/minecraft/network/packet/c2s/common/CookieRes
 		ARG 1 buf
 	METHOD method_55853 write (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD method_55854 (Lnet/minecraft/class_2540;)[B
-		ARG 0 bufx
diff --git a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping
index 214a38ac42..e6fda73720 100644
--- a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping
+++ b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping
@@ -1,29 +1,11 @@
 CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket
-	FIELD field_26897 slot I
+	FIELD comp_2285 slot I
+	FIELD comp_2286 pages Ljava/util/List;
+	FIELD comp_2287 title Ljava/util/Optional;
 	FIELD field_34039 MAX_TITLE_LENGTH I
 	FIELD field_34040 MAX_PAGE_LENGTH I
-	FIELD field_34041 pages Ljava/util/List;
-	FIELD field_34042 title Ljava/util/Optional;
 	FIELD field_34046 MAX_PAGES I
 	FIELD field_48193 CODEC Lnet/minecraft/class_9139;
-	METHOD  (ILjava/util/List;Ljava/util/Optional;)V
-		ARG 1 slot
-		ARG 2 pages
-		ARG 3 title
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_12235 getSlot ()I
-	METHOD method_37441 (Lnet/minecraft/class_2540;Ljava/lang/String;)V
-		ARG 0 buf2
-		ARG 1 title
-	METHOD method_37442 getPages ()Ljava/util/List;
-	METHOD method_37443 (Lnet/minecraft/class_2540;)Ljava/lang/String;
-		ARG 0 buf2
-	METHOD method_37444 (Lnet/minecraft/class_2540;Ljava/lang/String;)V
-		ARG 0 buf2
-		ARG 1 page
-	METHOD method_37445 getTitle ()Ljava/util/Optional;
-	METHOD method_37446 (Lnet/minecraft/class_2540;)Ljava/lang/String;
-		ARG 0 buf2
-	METHOD method_55974 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2285 slot ()I
+	METHOD comp_2286 pages ()Ljava/util/List;
+	METHOD comp_2287 title ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping
index aabcbae2c7..8f2f0a84a8 100644
--- a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping
@@ -1,10 +1,4 @@
 CLASS net/minecraft/class_2661 net/minecraft/network/packet/s2c/common/DisconnectS2CPacket
-	FIELD field_12173 reason Lnet/minecraft/class_2561;
+	FIELD comp_2325 reason Lnet/minecraft/class_2561;
 	FIELD field_48622 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD  (Lnet/minecraft/class_2561;)V
-		ARG 1 reason
-	METHOD method_11468 getReason ()Lnet/minecraft/class_2561;
-	METHOD method_56462 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2325 reason ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping
index 36472b972f..900b9ffb98 100644
--- a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping
@@ -1,7 +1,3 @@
 CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket
 	FIELD field_33340 MAX_HASH_LENGTH I
 	FIELD field_48626 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_56466 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping
index 8f077197c2..fc34c4d1f3 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping
@@ -12,6 +12,5 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntity
 	METHOD method_11293 getPos ()Lnet/minecraft/class_2338;
 	METHOD method_38585 create (Lnet/minecraft/class_2586;)Lnet/minecraft/class_2622;
 		ARG 0 blockEntity
-	METHOD method_39026 create (Lnet/minecraft/class_2586;Ljava/util/function/Function;)Lnet/minecraft/class_2622;
+	METHOD method_39026 create (Lnet/minecraft/class_2586;Ljava/util/function/BiFunction;)Lnet/minecraft/class_2622;
 		ARG 0 blockEntity
-		ARG 1 nbtGetter
diff --git a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping
index 5e2460a570..2c8ec63794 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping
@@ -9,8 +9,6 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 	METHOD  (Ljava/util/UUID;Lnet/minecraft/class_2629$class_5882;)V
 		ARG 1 uuid
 		ARG 2 action
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD method_34089 add (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629;
 		ARG 0 bar
 	METHOD method_34090 remove (Ljava/util/UUID;)Lnet/minecraft/class_2629;
@@ -29,8 +27,7 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 		ARG 0 bar
 	METHOD method_34098 updateProperties (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629;
 		ARG 0 bar
-	METHOD method_55861 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD method_55861 write (Lnet/minecraft/class_9129;)V
 	CLASS class_5880 AddAction
 		FIELD field_29100 name Lnet/minecraft/class_2561;
 		FIELD field_29101 percent F
@@ -41,8 +38,6 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 		FIELD field_29106 thickenFog Z
 		METHOD  (Lnet/minecraft/class_1259;)V
 			ARG 1 bar
-		METHOD  (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
 	CLASS class_5881 Consumer
 		METHOD method_34099 remove (Ljava/util/UUID;)V
 			ARG 1 uuid
@@ -75,32 +70,23 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 		METHOD method_34106 accept (Ljava/util/UUID;Lnet/minecraft/class_2629$class_5881;)V
 			ARG 1 uuid
 			ARG 2 consumer
-		METHOD method_34107 toPacket (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
+		METHOD method_34107 toPacket (Lnet/minecraft/class_9129;)V
 	CLASS class_5883 Type
-		FIELD field_29113 parser Ljava/util/function/Function;
-		METHOD  (Ljava/lang/String;ILjava/util/function/Function;)V
-			ARG 3 parser
-		METHOD method_34113 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2629$class_5882;
-			ARG 0 buf
+		FIELD field_29113 parser Lnet/minecraft/class_9141;
 	CLASS class_5884 UpdateNameAction
-		FIELD field_29115 name Lnet/minecraft/class_2561;
-		METHOD  (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
+		FIELD comp_2260 name Lnet/minecraft/class_2561;
 		METHOD  (Lnet/minecraft/class_2561;)V
 			ARG 1 name
+		METHOD comp_2260 name ()Lnet/minecraft/class_2561;
 	CLASS class_5885 UpdateProgressAction
-		FIELD field_29116 percent F
+		FIELD comp_2261 percent F
 		METHOD  (F)V
 			ARG 1 percent
-		METHOD  (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
+		METHOD comp_2261 percent ()F
 	CLASS class_5886 UpdatePropertiesAction
 		FIELD field_29117 darkenSky Z
 		FIELD field_29118 dragonMusic Z
 		FIELD field_29119 thickenFog Z
-		METHOD  (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
 		METHOD  (ZZZ)V
 			ARG 1 darkenSky
 			ARG 2 dragonMusic
@@ -111,5 +97,3 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 		METHOD  (Lnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;)V
 			ARG 1 color
 			ARG 2 style
-		METHOD  (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping
index 2815398a35..4a0f077724 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping
@@ -1,21 +1,10 @@
 CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket
-	FIELD field_12121 suggestions Lcom/mojang/brigadier/suggestion/Suggestions;
-	FIELD field_12122 completionId I
+	FIELD comp_2262 completionId I
+	FIELD comp_2265 suggestions Ljava/util/List;
 	FIELD field_47913 CODEC Lnet/minecraft/class_9139;
 	METHOD  (ILcom/mojang/brigadier/suggestion/Suggestions;)V
 		ARG 1 completionId
 		ARG 2 suggestions
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2262 completionId ()I
+	METHOD comp_2265 suggestions ()Ljava/util/List;
 	METHOD method_11397 getSuggestions ()Lcom/mojang/brigadier/suggestion/Suggestions;
-	METHOD method_11399 getCompletionId ()I
-	METHOD method_34117 (Lcom/mojang/brigadier/context/StringRange;Lnet/minecraft/class_2540;)Lcom/mojang/brigadier/suggestion/Suggestion;
-		ARG 1 buf2
-	METHOD method_34118 (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/suggestion/Suggestion;)V
-		ARG 0 buf2
-		ARG 1 suggestion
-	METHOD method_43880 (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/Message;)V
-		ARG 0 buf3
-		ARG 1 tooltip
-	METHOD method_55866 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping
index a56051d8ab..137bafd85c 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping
@@ -1,13 +1,6 @@
 CLASS net/minecraft/class_5892 net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket
-	FIELD field_29133 entityId I
-	FIELD field_29135 message Lnet/minecraft/class_2561;
+	FIELD comp_2275 entityId I
+	FIELD comp_2276 message Lnet/minecraft/class_2561;
 	FIELD field_47953 CODEC Lnet/minecraft/class_9139;
-	METHOD  (ILnet/minecraft/class_2561;)V
-		ARG 1 entityId
-		ARG 2 message
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_34144 getEntityId ()I
-	METHOD method_34145 getMessage ()Lnet/minecraft/class_2561;
-	METHOD method_55900 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2275 entityId ()I
+	METHOD comp_2276 message ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping
index 7fcaa68860..aa40cfc51d 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping
@@ -1,6 +1,2 @@
 CLASS net/minecraft/class_7439 net/minecraft/network/packet/s2c/play/GameMessageS2CPacket
 	FIELD field_48000 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_55945 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping
index d7d73f33b6..3290bfc457 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping
@@ -26,11 +26,7 @@ CLASS net/minecraft/class_6606 net/minecraft/network/packet/s2c/play/LightData
 	METHOD method_38603 write (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD method_38604 getUninitedSky ()Ljava/util/BitSet;
-	METHOD method_38605 (Lnet/minecraft/class_2540;)[B
-		ARG 0 b
 	METHOD method_38606 getSkyNibbles ()Ljava/util/List;
-	METHOD method_38607 (Lnet/minecraft/class_2540;)[B
-		ARG 0 b
 	METHOD method_38608 getInitedBlock ()Ljava/util/BitSet;
 	METHOD method_38609 getUninitedBlock ()Ljava/util/BitSet;
 	METHOD method_38610 getBlockNibbles ()Ljava/util/List;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
index 15ce437426..8310d25f07 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
@@ -1,32 +1,19 @@
 CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket
-	FIELD field_12296 scale B
-	FIELD field_12303 id I
-	FIELD field_12304 icons Ljava/util/List;
-	FIELD field_17433 locked Z
-	FIELD field_28016 updateData Lnet/minecraft/class_22$class_5637;
+	FIELD comp_2270 id Lnet/minecraft/class_9209;
+	FIELD comp_2271 scale B
+	FIELD comp_2272 locked Z
+	FIELD comp_2273 icons Ljava/util/Optional;
+	FIELD comp_2274 updateData Ljava/util/Optional;
 	FIELD field_47938 CODEC Lnet/minecraft/class_9139;
-	METHOD  (IBZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V
-		ARG 1 id
+	METHOD  (Lnet/minecraft/class_9209;BZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V
 		ARG 2 scale
 		ARG 3 locked
 		ARG 4 icons
 		ARG 5 updateData
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2270 id ()Lnet/minecraft/class_9209;
+	METHOD comp_2271 scale ()B
+	METHOD comp_2272 locked ()Z
+	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
-	METHOD method_11644 getId ()I
-	METHOD method_32701 getScale ()B
-	METHOD method_32702 isLocked ()Z
-	METHOD method_34136 (Lnet/minecraft/class_2540;Lnet/minecraft/class_20;)V
-		ARG 0 b
-		ARG 1 icon
-	METHOD method_43881 (Lnet/minecraft/class_2540;Ljava/util/List;)V
-		ARG 0 buf2
-		ARG 1 icons
-	METHOD method_43882 (Lnet/minecraft/class_2540;)Ljava/util/List;
-		ARG 0 buf2
-	METHOD method_43883 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_20;
-		ARG 0 buf3
-	METHOD method_55888 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping
index 66cf0a1eba..1a2ce21607 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping
@@ -1,10 +1,4 @@
 CLASS net/minecraft/class_5894 net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket
-	FIELD field_29142 message Lnet/minecraft/class_2561;
+	FIELD comp_2279 message Lnet/minecraft/class_2561;
 	FIELD field_47967 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD  (Lnet/minecraft/class_2561;)V
-		ARG 1 message
-	METHOD method_34155 getMessage ()Lnet/minecraft/class_2561;
-	METHOD method_55914 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2279 message ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping
index d020f9b391..62bab7a779 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping
@@ -1,13 +1,6 @@
 CLASS net/minecraft/class_2772 net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket
-	FIELD field_12683 header Lnet/minecraft/class_2561;
-	FIELD field_12684 footer Lnet/minecraft/class_2561;
+	FIELD comp_2282 header Lnet/minecraft/class_2561;
+	FIELD comp_2283 footer Lnet/minecraft/class_2561;
 	FIELD field_48001 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD  (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
-		ARG 1 header
-		ARG 2 footer
-	METHOD method_11906 getFooter ()Lnet/minecraft/class_2561;
-	METHOD method_11908 getHeader ()Lnet/minecraft/class_2561;
-	METHOD method_55946 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2282 header ()Lnet/minecraft/class_2561;
+	METHOD comp_2283 footer ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping
index 0b6f227198..f697fc387a 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping
@@ -5,8 +5,6 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS
 	METHOD  (Ljava/util/EnumSet;Ljava/util/Collection;)V
 		ARG 1 actions
 		ARG 2 players
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD  (Lnet/minecraft/class_2703$class_5893;Lnet/minecraft/class_3222;)V
 		ARG 1 action
 		ARG 2 player
@@ -20,8 +18,7 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS
 		ARG 1 buf2
 	METHOD method_46329 getEntries ()Ljava/util/List;
 	METHOD method_46330 getPlayerAdditionEntries ()Ljava/util/List;
-	METHOD method_55902 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD method_55902 write (Lnet/minecraft/class_9129;)V
 	CLASS class_2705 Entry
 		FIELD comp_1107 profile Lcom/mojang/authlib/GameProfile;
 		FIELD comp_1109 latency I
@@ -39,49 +36,35 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS
 		METHOD  (Ljava/lang/String;ILnet/minecraft/class_2703$class_5893$class_7829;Lnet/minecraft/class_2703$class_5893$class_7830;)V
 			ARG 3 reader
 			ARG 4 writer
-		METHOD method_46331 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V
-			ARG 0 buf
+		METHOD method_46331 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
 			ARG 1 entry
-		METHOD method_46332 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V
+		METHOD method_46332 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
-			ARG 1 buf
-		METHOD method_46333 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V
-			ARG 0 buf
+		METHOD method_46333 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
 			ARG 1 entry
-		METHOD method_46334 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V
+		METHOD method_46334 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
-			ARG 1 buf
-		METHOD method_46335 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V
-			ARG 0 buf
+		METHOD method_46335 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
 			ARG 1 entry
-		METHOD method_46336 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V
+		METHOD method_46336 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
-			ARG 1 buf
-		METHOD method_46337 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V
-			ARG 0 buf
+		METHOD method_46337 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
 			ARG 1 entry
-		METHOD method_46338 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V
+		METHOD method_46338 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
-			ARG 1 buf
-		METHOD method_46339 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V
-			ARG 0 buf
+		METHOD method_46339 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
 			ARG 1 entry
-		METHOD method_46340 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V
+		METHOD method_46340 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
-			ARG 1 buf
-		METHOD method_46341 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V
-			ARG 0 buf
+		METHOD method_46341 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
 			ARG 1 entry
-		METHOD method_46342 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V
+		METHOD method_46342 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
-			ARG 1 buf
 		CLASS class_7829 Reader
-			METHOD read (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V
+			METHOD read (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 				ARG 1 serialized
-				ARG 2 buf
 		CLASS class_7830 Writer
-			METHOD write (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V
-				ARG 1 buf
+			METHOD write (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
 				ARG 2 entry
 	CLASS class_7831 Serialized
 		FIELD field_40703 profileId Ljava/util/UUID;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping
index c033244df7..a0fe9ce0ed 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping
@@ -1,8 +1,4 @@
 CLASS net/minecraft/class_2757 net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket
 	FIELD comp_2122 scoreHolderName Ljava/lang/String;
 	FIELD field_47988 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_9129;)V
-		ARG 1 buf
 	METHOD comp_2122 scoreHolderName ()Ljava/lang/String;
-	METHOD method_55935 write (Lnet/minecraft/class_9129;)V
-		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping
index e14f3c3258..798fda7022 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping
@@ -1,13 +1,6 @@
 CLASS net/minecraft/class_7495 net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket
-	FIELD field_39387 description Lnet/minecraft/class_2561;
-	FIELD field_42967 favicon Ljava/util/Optional;
+	FIELD comp_2277 description Lnet/minecraft/class_2561;
+	FIELD comp_2278 favicon Ljava/util/Optional;
 	FIELD field_47966 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD  (Lnet/minecraft/class_2561;Ljava/util/Optional;)V
-		ARG 1 description
-		ARG 2 favicon
-	METHOD method_44132 getDescription ()Lnet/minecraft/class_2561;
-	METHOD method_49398 getFavicon ()Ljava/util/Optional;
-	METHOD method_55913 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2277 description ()Lnet/minecraft/class_2561;
+	METHOD comp_2278 favicon ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping
index eaa8680db3..9b14cc70c5 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping
@@ -1,10 +1,4 @@
 CLASS net/minecraft/class_5903 net/minecraft/network/packet/s2c/play/SubtitleS2CPacket
-	FIELD field_29165 subtitle Lnet/minecraft/class_2561;
+	FIELD comp_2280 subtitle Lnet/minecraft/class_2561;
 	FIELD field_47990 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD  (Lnet/minecraft/class_2561;)V
-		ARG 1 subtitle
-	METHOD method_34190 getSubtitle ()Lnet/minecraft/class_2561;
-	METHOD method_55937 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2280 subtitle ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping
index 4828e3b2a7..9eca517f43 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping
@@ -28,8 +28,6 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack
 		ARG 2 packetType
 		ARG 3 team
 		ARG 4 playerNames
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD method_34169 containsPlayers (I)Z
 		ARG 0 packetType
 	METHOD method_34170 updateRemovedTeam (Lnet/minecraft/class_268;)Lnet/minecraft/class_5900;
@@ -48,8 +46,7 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack
 	METHOD method_34177 getTeamName ()Ljava/lang/String;
 	METHOD method_34178 getPlayerNames ()Ljava/util/Collection;
 	METHOD method_34179 getTeam ()Ljava/util/Optional;
-	METHOD method_55934 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD method_55934 write (Lnet/minecraft/class_9129;)V
 	CLASS class_5901 Operation
 	CLASS class_5902 SerializableTeam
 		FIELD field_29158 displayName Lnet/minecraft/class_2561;
@@ -59,13 +56,10 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack
 		FIELD field_29162 collisionRule Ljava/lang/String;
 		FIELD field_29163 color Lnet/minecraft/class_124;
 		FIELD field_29164 friendlyFlags I
-		METHOD  (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
 		METHOD  (Lnet/minecraft/class_268;)V
 			ARG 1 team
 		METHOD method_34181 getDisplayName ()Lnet/minecraft/class_2561;
-		METHOD method_34182 write (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
+		METHOD method_34182 write (Lnet/minecraft/class_9129;)V
 		METHOD method_34183 getFriendlyFlagsBitwise ()I
 		METHOD method_34184 getColor ()Lnet/minecraft/class_124;
 		METHOD method_34185 getNameTagVisibilityRule ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping
index 49358e77d1..d9660ec517 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping
@@ -1,10 +1,4 @@
 CLASS net/minecraft/class_5904 net/minecraft/network/packet/s2c/play/TitleS2CPacket
-	FIELD field_29166 title Lnet/minecraft/class_2561;
+	FIELD comp_2281 title Lnet/minecraft/class_2561;
 	FIELD field_47992 CODEC Lnet/minecraft/class_9139;
-	METHOD  (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD  (Lnet/minecraft/class_2561;)V
-		ARG 1 title
-	METHOD method_34192 getTitle ()Lnet/minecraft/class_2561;
-	METHOD method_55939 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
+	METHOD comp_2281 title ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/particle/ParticleEffect.mapping b/mappings/net/minecraft/particle/ParticleEffect.mapping
index d467f12ca1..55c4c09142 100644
--- a/mappings/net/minecraft/particle/ParticleEffect.mapping
+++ b/mappings/net/minecraft/particle/ParticleEffect.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_2394 net/minecraft/particle/ParticleEffect
-	METHOD method_10293 asString ()Ljava/lang/String;
+	METHOD method_10293 asString (Lnet/minecraft/class_7225$class_7874;)Ljava/lang/String;
 	METHOD method_10295 getType ()Lnet/minecraft/class_2396;
 	CLASS class_2395 Factory
-		METHOD method_10296 read (Lnet/minecraft/class_2396;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2394;
+		METHOD method_10296 read (Lnet/minecraft/class_2396;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 			ARG 1 type
 			ARG 2 reader
diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping
index ad219798c2..7a8b349cdd 100644
--- a/mappings/net/minecraft/recipe/RecipeManager.mapping
+++ b/mappings/net/minecraft/recipe/RecipeManager.mapping
@@ -11,7 +11,7 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 	FIELD field_9027 LOGGER Lorg/slf4j/Logger;
 	METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map;
 		ARG 1 type
-	METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8786;
+	METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_8786;
 		COMMENT Reads a recipe from a JSON object.
 		COMMENT
 		COMMENT @implNote Even though a recipe's {@linkplain Recipe#getSerializer() serializer}
@@ -23,8 +23,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 		COMMENT @return the read recipe
 		ARG 0 id
 			COMMENT the recipe's ID
-		ARG 1 json
-			COMMENT the recipe JSON
 	METHOD method_17722 (Ljava/util/Map;)Ljava/util/stream/Stream;
 		ARG 0 map
 	METHOD method_17723 (Ljava/util/Map;)Ljava/util/stream/Stream;
diff --git a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping
index a172e9a607..0c034e3d3f 100644
--- a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping
+++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping
@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_4317 net/minecraft/recipe/RepairItemRecipe
-	METHOD method_24364 (Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_1887;)V
+	METHOD method_24364 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;)V
 		ARG 3 enchantment
diff --git a/mappings/net/minecraft/registry/RegistryWrapper.mapping b/mappings/net/minecraft/registry/RegistryWrapper.mapping
index aa55a21f17..1adf602245 100644
--- a/mappings/net/minecraft/registry/RegistryWrapper.mapping
+++ b/mappings/net/minecraft/registry/RegistryWrapper.mapping
@@ -6,28 +6,22 @@ CLASS net/minecraft/class_7225 net/minecraft/registry/RegistryWrapper
 		COMMENT @see Registry#getKeys
 	METHOD method_42020 streamTags ()Ljava/util/stream/Stream;
 		COMMENT @see Registry#streamTags
-	METHOD method_46753 filter (Ljava/util/function/Predicate;)Lnet/minecraft/class_7225;
-		ARG 1 filter
 	METHOD method_46754 streamKeys ()Ljava/util/stream/Stream;
 	METHOD method_46755 streamTagKeys ()Ljava/util/stream/Stream;
-	CLASS 1
-		METHOD method_46756 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z
-			ARG 1 entry
-		METHOD method_46757 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z
-			ARG 1 entry
 	CLASS class_7226 Impl
-		METHOD method_45919 withFeatureFilter (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7225;
+		METHOD method_45919 withFeatureFilter (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7225$class_7226;
 			ARG 1 enabledFeatures
 		METHOD method_45920 (Lnet/minecraft/class_7699;Ljava/lang/Object;)Z
 			ARG 1 feature
 		METHOD method_46765 getRegistryKey ()Lnet/minecraft/class_5321;
 		METHOD method_46766 getLifecycle ()Lcom/mojang/serialization/Lifecycle;
+		CLASS 1
+			METHOD method_46756 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z
+				ARG 1 entry
+			METHOD method_46757 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z
+				ARG 1 entry
 		CLASS class_7875 Delegating
 			METHOD method_46725 getBase ()Lnet/minecraft/class_7225$class_7226;
-	CLASS class_7873 Delegating
-		FIELD field_40933 baseWrapper Lnet/minecraft/class_7225;
-		METHOD  (Lnet/minecraft/class_7225;)V
-			ARG 1 baseWrapper
 	CLASS class_7874 WrapperLookup
 		METHOD method_46758 createRegistryLookup ()Lnet/minecraft/class_7871$class_7872;
 		METHOD method_46759 getOptionalWrapper (Lnet/minecraft/class_5321;)Ljava/util/Optional;
diff --git a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping
index eebd98ab9a..7702df308a 100644
--- a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping
+++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping
@@ -17,7 +17,7 @@ CLASS net/minecraft/class_2995 net/minecraft/scoreboard/ServerScoreboard
 	METHOD method_12940 createRemovePackets (Lnet/minecraft/class_266;)Ljava/util/List;
 		ARG 1 objective
 	METHOD method_12941 runUpdateListeners ()V
-	METHOD method_32704 stateFromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_273;
+	METHOD method_32704 stateFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_273;
 		ARG 1 nbt
 	METHOD method_32705 createState ()Lnet/minecraft/class_273;
 	METHOD method_52297 getPersistentStateType ()Lnet/minecraft/class_18$class_8645;
diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping
index 3b69cb2331..4952b56339 100644
--- a/mappings/net/minecraft/server/DataPackContents.mapping
+++ b/mappings/net/minecraft/server/DataPackContents.mapping
@@ -12,11 +12,7 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
 	FIELD field_25341 serverAdvancementLoader Lnet/minecraft/class_2989;
 	FIELD field_25342 functionLoader Lnet/minecraft/class_5349;
 	FIELD field_36491 LOGGER Lorg/slf4j/Logger;
-	FIELD field_38051 commandRegistryAccess Lnet/minecraft/class_7157$class_7870;
 	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
-		ARG 3 environment
 		ARG 4 functionPermissionLevel
 	METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349;
 		COMMENT {@return the function loader}
@@ -59,3 +55,14 @@ 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
+	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
+		COMMENT net.minecraft.registry.RegistryWrapper#getOptional(net.minecraft.registry.tag.TagKey)}.
+		FIELD field_37824 Lnet/minecraft/class_5350$class_7158;
+			COMMENT Creates a new {@link net.minecraft.registry.entry.RegistryEntryList}, stores it and returns it.
+		FIELD field_37826 Lnet/minecraft/class_5350$class_7158;
+			COMMENT Throws an exception.
+	CLASS class_9180 2
+		FIELD field_40912 entryListCreationPolicy Lnet/minecraft/class_5350$class_7158;
+		METHOD method_46724 setEntryListCreationPolicy (Lnet/minecraft/class_5350$class_7158;)V
diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping
index 490bdd20e9..e8173f6173 100644
--- a/mappings/net/minecraft/server/Main.mapping
+++ b/mappings/net/minecraft/server/Main.mapping
@@ -2,12 +2,11 @@ CLASS net/minecraft/server/Main
 	FIELD field_24625 LOGGER Lorg/slf4j/Logger;
 	METHOD main ([Ljava/lang/String;)V
 		ARG 0 args
-	METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_2378;Z)V
+	METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_5455;Z)V
 		ARG 0 session
 		ARG 1 dataFixer
 		ARG 2 eraseCache
 		ARG 3 continueCheck
-		ARG 4 dimensionOptionsRegistry
 		ARG 5 recreateRegionFiles
 	METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lnet/minecraft/class_7497;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176;
 		ARG 11 thread
diff --git a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping
index 3103954e52..32b90f3456 100644
--- a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping
+++ b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping
@@ -4,14 +4,9 @@ CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader
 	FIELD field_13406 LOGGER Lorg/slf4j/Logger;
 	FIELD field_44468 conditionManager Lnet/minecraft/class_60;
 	FIELD field_46076 manager Lnet/minecraft/class_163;
-	METHOD  (Lnet/minecraft/class_60;)V
-		ARG 1 conditionManager
 	METHOD method_12893 getAdvancements ()Ljava/util/Collection;
 	METHOD method_12896 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8779;
 		ARG 1 id
-	METHOD method_20723 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V
-		ARG 2 id
-		ARG 3 json
 	METHOD method_53646 getManager ()Lnet/minecraft/class_163;
 	METHOD method_54921 validate (Lnet/minecraft/class_2960;Lnet/minecraft/class_161;)V
 		ARG 1 id
diff --git a/mappings/net/minecraft/server/command/BossBarCommand.mapping b/mappings/net/minecraft/server/command/BossBarCommand.mapping
index 0ca7dcd624..86eadc8935 100644
--- a/mappings/net/minecraft/server/command/BossBarCommand.mapping
+++ b/mappings/net/minecraft/server/command/BossBarCommand.mapping
@@ -73,7 +73,7 @@ CLASS net/minecraft/class_3019 net/minecraft/server/command/BossBarCommand
 		ARG 0 context
 	METHOD method_13052 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13053 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13053 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13054 getBossBar (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3002;
 		ARG 0 context
diff --git a/mappings/net/minecraft/server/command/RaidCommand.mapping b/mappings/net/minecraft/server/command/RaidCommand.mapping
index f3f73f9fec..cb903aa1de 100644
--- a/mappings/net/minecraft/server/command/RaidCommand.mapping
+++ b/mappings/net/minecraft/server/command/RaidCommand.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_6329 net/minecraft/server/command/RaidCommand
 	METHOD method_36191 getRaid (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3765;
 		ARG 0 player
-	METHOD method_36192 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_36192 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_36193 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
diff --git a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping
index ef4a7c0ec7..b78a4dcdab 100644
--- a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping
+++ b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping
@@ -64,7 +64,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand
 		ARG 0 context
 	METHOD method_13594 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13595 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13595 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13596 executeSetDisplay (Lnet/minecraft/class_2168;Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)I
 		ARG 0 source
@@ -123,9 +123,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand
 	METHOD method_13614 executeListScores (Lnet/minecraft/class_2168;Lnet/minecraft/class_9015;)I
 		ARG 0 source
 		ARG 1 scoreHolder
-	METHOD method_55345 makeNumberFormatArguments (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3115$class_9008;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
-		ARG 0 argumentBuilder
-		ARG 1 executor
+	METHOD method_55345 makeNumberFormatArguments (Lnet/minecraft/class_7157;Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3115$class_9008;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
 	METHOD method_55347 executeModifyObjectiveFormat (Lnet/minecraft/class_2168;Lnet/minecraft/class_266;Lnet/minecraft/class_9022;)I
 		ARG 0 source
 		ARG 1 objective
diff --git a/mappings/net/minecraft/server/command/TeamCommand.mapping b/mappings/net/minecraft/server/command/TeamCommand.mapping
index 6df77cd82e..1e2740ee3d 100644
--- a/mappings/net/minecraft/server/command/TeamCommand.mapping
+++ b/mappings/net/minecraft/server/command/TeamCommand.mapping
@@ -74,7 +74,7 @@ CLASS net/minecraft/class_3142 net/minecraft/server/command/TeamCommand
 		ARG 0 source
 		ARG 1 team
 		ARG 2 visibility
-	METHOD method_13736 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13736 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13737 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
diff --git a/mappings/net/minecraft/server/command/TellRawCommand.mapping b/mappings/net/minecraft/server/command/TellRawCommand.mapping
index af5d0d866d..c77111ccea 100644
--- a/mappings/net/minecraft/server/command/TellRawCommand.mapping
+++ b/mappings/net/minecraft/server/command/TellRawCommand.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_3146 net/minecraft/server/command/TellRawCommand
-	METHOD method_13776 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13776 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13777 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
diff --git a/mappings/net/minecraft/server/command/TitleCommand.mapping b/mappings/net/minecraft/server/command/TitleCommand.mapping
index fb3b8433de..af7ad4a013 100644
--- a/mappings/net/minecraft/server/command/TitleCommand.mapping
+++ b/mappings/net/minecraft/server/command/TitleCommand.mapping
@@ -14,7 +14,7 @@ CLASS net/minecraft/class_3151 net/minecraft/server/command/TitleCommand
 		ARG 4 constructor
 	METHOD method_13803 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13804 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13804 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13805 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;)I
 		ARG 0 source
diff --git a/mappings/net/minecraft/structure/StructureTemplate.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping
index 74501f0459..d0130cbfe3 100644
--- a/mappings/net/minecraft/structure/StructureTemplate.mapping
+++ b/mappings/net/minecraft/structure/StructureTemplate.mapping
@@ -116,8 +116,6 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate
 	METHOD method_17916 getEntity (Lnet/minecraft/class_5425;Lnet/minecraft/class_2487;)Ljava/util/Optional;
 		ARG 0 world
 		ARG 1 nbt
-	METHOD method_17917 (Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_243;ZLnet/minecraft/class_5425;Lnet/minecraft/class_2487;Lnet/minecraft/class_1297;)V
-		ARG 6 entity
 	METHOD method_20532 updateCorner (Lnet/minecraft/class_1936;ILnet/minecraft/class_251;III)V
 		ARG 0 world
 		ARG 1 flags
diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping
index 323a8a3ae3..14e4a8e1c7 100644
--- a/mappings/net/minecraft/test/TestContext.mapping
+++ b/mappings/net/minecraft/test/TestContext.mapping
@@ -235,7 +235,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 		ARG 1 runnable
 	METHOD method_36019 (Ljava/lang/Runnable;J)V
 		ARG 2 tick
-	METHOD method_36021 createMockCreativePlayer ()Lnet/minecraft/class_1657;
+	METHOD method_36021 createMockCreativePlayer (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1657;
 	METHOD method_36022 expectEntityAt (Lnet/minecraft/class_1299;III)V
 		ARG 1 type
 		ARG 2 x
@@ -335,7 +335,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 		ARG 2 message
 	METHOD method_46227 getRelative (Lnet/minecraft/class_243;)Lnet/minecraft/class_243;
 		ARG 1 pos
-	METHOD method_46228 createMockSurvivalPlayer ()Lnet/minecraft/class_1657;
 	METHOD method_46229 useBlock (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
 	METHOD method_47816 useStackOnBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V
@@ -415,7 +414,5 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 		ARG 5 margin
 	METHOD method_56208 getEntities (Lnet/minecraft/class_1299;)Ljava/util/List;
 		ARG 1 type
-	METHOD method_56606 assertEquals (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;)V
-		ARG 1 value
-		ARG 2 expected
+	METHOD method_56606 assertEquals (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V
 		ARG 3 name
diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9208.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9208.mapping
new file mode 100644
index 0000000000..e44e489a3e
--- /dev/null
+++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9208.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9208 net/minecraft/unused/packageinfo/PackageInfo9208
diff --git a/mappings/net/minecraft/util/JsonReaderUtils.mapping b/mappings/net/minecraft/util/JsonReaderUtils.mapping
index ec65ddb31e..1779d2a9d8 100644
--- a/mappings/net/minecraft/util/JsonReaderUtils.mapping
+++ b/mappings/net/minecraft/util/JsonReaderUtils.mapping
@@ -3,6 +3,4 @@ CLASS net/minecraft/class_9010 net/minecraft/util/JsonReaderUtils
 	FIELD field_47526 LINE_START Ljava/lang/reflect/Field;
 	METHOD method_55376 getPos (Lcom/google/gson/stream/JsonReader;)I
 		ARG 0 jsonReader
-	METHOD method_55377 parse (Lcom/mojang/brigadier/StringReader;Lcom/mojang/serialization/Codec;)Ljava/lang/Object;
-		ARG 0 stringReader
-		ARG 1 codec
+	METHOD method_55377 parse (Lnet/minecraft/class_7225$class_7874;Lcom/mojang/brigadier/StringReader;Lcom/mojang/serialization/Codec;)Ljava/lang/Object;
diff --git a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping
index 16782e1faa..f34e237006 100644
--- a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping
+++ b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping
@@ -33,7 +33,7 @@ CLASS net/minecraft/class_8565 net/minecraft/util/math/random/RandomSequencesSta
 		ARG 0 nbt
 		ARG 1 key
 		ARG 2 fallback
-	METHOD method_52516 (JLnet/minecraft/class_2487;)Lnet/minecraft/class_8565;
+	METHOD method_52516 (JLnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_8565;
 		ARG 2 nbt
 	METHOD method_52517 reset (Lnet/minecraft/class_2960;)V
 		ARG 1 id
diff --git a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
index 74c20a6bfa..de02339e49 100644
--- a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
+++ b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
@@ -1,22 +1,6 @@
 CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog
-	FIELD field_45719 SIZE I
-	FIELD field_45720 data [[J
-	FIELD field_45721 currentIndex I
-	FIELD field_45722 maxIndex I
-	METHOD  (I)V
-		ARG 1 columns
-	METHOD method_53064 size ()I
-	METHOD method_53065 get (I)J
-		ARG 1 index
 	METHOD method_53066 push (J)V
 		ARG 1 value
-	METHOD method_53067 getMaxIndex ()I
-	METHOD method_53068 wrap (I)I
-		ARG 1 index
-	METHOD method_53069 reset ()V
-	METHOD method_56534 get (II)J
-		ARG 1 index
-		ARG 2 column
 	METHOD method_56535 push (JI)V
 		ARG 1 value
 		ARG 3 column
diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping
index bd83edd3de..557aa1ca70 100644
--- a/mappings/net/minecraft/village/TradeOffer.mapping
+++ b/mappings/net/minecraft/village/TradeOffer.mapping
@@ -38,23 +38,13 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer
 		ARG 3 sellItem
 		ARG 4 uses
 		ARG 5 maxUses
-		ARG 6 merchantExperience
 		ARG 7 priceMultiplier
-		ARG 8 demandBonus
-	METHOD  (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFIZ)V
+	METHOD  (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIZIIFIZ)V
 		ARG 1 firstBuyItem
 		ARG 2 secondBuyItem
 		ARG 3 sellItem
-		ARG 4 uses
-		ARG 5 maxUses
-		ARG 6 merchantExperience
-		ARG 7 priceMultiplier
-		ARG 8 demandBonus
-		ARG 9 ignoreNbt
 	METHOD  (Lnet/minecraft/class_1914;)V
 		ARG 1 offer
-	METHOD  (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
 		ARG 1 offered
 		ARG 2 buyItem
@@ -134,7 +124,6 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer
 		COMMENT Returns the number of times this trade offer has been used.
 	METHOD method_8250 getSellItem ()Lnet/minecraft/class_1799;
 		COMMENT Returns the sell item of this trade offer.
-	METHOD method_8251 toNbt ()Lnet/minecraft/class_2487;
 	METHOD method_8254 disable ()V
 		COMMENT Sets the number of times this trade offer has been used to
 		COMMENT its maximum uses, making it disabled.
diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping
index 3df4de5e40..c505eeaa14 100644
--- a/mappings/net/minecraft/village/TradeOfferList.mapping
+++ b/mappings/net/minecraft/village/TradeOfferList.mapping
@@ -2,11 +2,8 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList
 	FIELD field_48373 PACKET_CODEC Lnet/minecraft/class_9139;
 	METHOD  (I)V
 		ARG 1 size
-	METHOD  (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_53882 copy ()Lnet/minecraft/class_1916;
 	METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914;
 		ARG 1 firstBuyItem
 		ARG 2 secondBuyItem
 		ARG 3 index
-	METHOD method_8268 toNbt ()Lnet/minecraft/class_2487;
diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping
index b95887d696..9516739566 100644
--- a/mappings/net/minecraft/village/raid/RaidManager.mapping
+++ b/mappings/net/minecraft/village/raid/RaidManager.mapping
@@ -27,7 +27,7 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager
 		ARG 0 poiType
 	METHOD method_52559 getPersistentStateType (Lnet/minecraft/class_3218;)Lnet/minecraft/class_18$class_8645;
 		ARG 0 world
-	METHOD method_52561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767;
+	METHOD method_52561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3767;
 		ARG 1 nbt
 	METHOD method_77 fromNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767;
 		ARG 0 world
diff --git a/mappings/net/minecraft/world/ChunkUpdateState.mapping b/mappings/net/minecraft/world/ChunkUpdateState.mapping
index 627ab0222c..cedbed649c 100644
--- a/mappings/net/minecraft/world/ChunkUpdateState.mapping
+++ b/mappings/net/minecraft/world/ChunkUpdateState.mapping
@@ -15,6 +15,6 @@ CLASS net/minecraft/class_3440 net/minecraft/world/ChunkUpdateState
 	METHOD method_14897 contains (J)Z
 		ARG 1 pos
 	METHOD method_14898 getAll ()Lit/unimi/dsi/fastutil/longs/LongSet;
-	METHOD method_32358 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3440;
+	METHOD method_32358 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3440;
 		ARG 0 nbt
 	METHOD method_52601 getPersistentStateType ()Lnet/minecraft/class_18$class_8645;
diff --git a/mappings/net/minecraft/world/ForcedChunkState.mapping b/mappings/net/minecraft/world/ForcedChunkState.mapping
index 629d859b73..96e28a06b2 100644
--- a/mappings/net/minecraft/world/ForcedChunkState.mapping
+++ b/mappings/net/minecraft/world/ForcedChunkState.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_1932 net/minecraft/world/ForcedChunkState
 	FIELD field_9213 chunks Lit/unimi/dsi/fastutil/longs/LongSet;
 	METHOD  (Lit/unimi/dsi/fastutil/longs/LongSet;)V
 		ARG 1 chunks
-	METHOD method_32350 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1932;
+	METHOD method_32350 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_1932;
 		ARG 0 nbt
 	METHOD method_52570 getPersistentStateType ()Lnet/minecraft/class_18$class_8645;
 	METHOD method_8375 getChunks ()Lit/unimi/dsi/fastutil/longs/LongSet;
diff --git a/mappings/net/minecraft/world/IdCountsState.mapping b/mappings/net/minecraft/world/IdCountsState.mapping
index 37f06b5e4b..80b3732789 100644
--- a/mappings/net/minecraft/world/IdCountsState.mapping
+++ b/mappings/net/minecraft/world/IdCountsState.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_3978 net/minecraft/world/IdCountsState
 	FIELD field_17662 idCounts Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 	FIELD field_31830 IDCOUNTS_KEY Ljava/lang/String;
-	METHOD method_17920 getNextMapId ()I
-	METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3978;
+	METHOD method_17920 getNextMapId ()Lnet/minecraft/class_9209;
+	METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3978;
 		ARG 0 nbt
 	METHOD method_52610 getPersistentStateType ()Lnet/minecraft/class_18$class_8645;
diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping
index 6816fe182c..c7a6171554 100644
--- a/mappings/net/minecraft/world/PersistentState.mapping
+++ b/mappings/net/minecraft/world/PersistentState.mapping
@@ -1,9 +1,9 @@
 CLASS net/minecraft/class_18 net/minecraft/world/PersistentState
 	FIELD field_17661 LOGGER Lorg/slf4j/Logger;
 	FIELD field_72 dirty Z
-	METHOD method_17919 save (Ljava/io/File;)V
+	METHOD method_17919 save (Ljava/io/File;Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 file
-	METHOD method_75 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
+	METHOD method_75 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		ARG 1 nbt
 	METHOD method_78 setDirty (Z)V
 		ARG 1 dirty
diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping
index 9568170c0d..18976f6f5d 100644
--- a/mappings/net/minecraft/world/PersistentStateManager.mapping
+++ b/mappings/net/minecraft/world/PersistentStateManager.mapping
@@ -3,11 +3,10 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager
 	FIELD field_136 LOGGER Lorg/slf4j/Logger;
 	FIELD field_17663 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_17664 directory Ljava/io/File;
-	METHOD  (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V
+	METHOD  (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 directory
 		ARG 2 dataFixer
-	METHOD method_120 readFromFile (Ljava/util/function/Function;Lnet/minecraft/class_4284;Ljava/lang/String;)Lnet/minecraft/class_18;
-		ARG 1 readFunction
+	METHOD method_120 readFromFile (Ljava/util/function/BiFunction;Lnet/minecraft/class_4284;Ljava/lang/String;)Lnet/minecraft/class_18;
 		ARG 2 dataFixTypes
 		ARG 3 id
 	METHOD method_123 set (Ljava/lang/String;Lnet/minecraft/class_18;)V
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index 308f9f6c55..d2a846af18 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -56,12 +56,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 		ARG 9 velocityX
 		ARG 11 velocityY
 		ARG 13 velocityZ
-	METHOD method_17889 getNextMapId ()I
-	METHOD method_17890 putMapState (Ljava/lang/String;Lnet/minecraft/class_22;)V
-		ARG 1 id
+	METHOD method_17889 getNextMapId ()Lnet/minecraft/class_9209;
+	METHOD method_17890 putMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V
 		ARG 2 state
-	METHOD method_17891 getMapState (Ljava/lang/String;)Lnet/minecraft/class_22;
-		ARG 1 id
+	METHOD method_17891 getMapState (Lnet/minecraft/class_9209;)Lnet/minecraft/class_22;
 	METHOD method_18471 tickBlockEntities ()V
 	METHOD method_18472 tickEntity (Ljava/util/function/Consumer;Lnet/minecraft/class_1297;)V
 		ARG 1 tickConsumer
diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping
index 9a67945691..0cadd49264 100644
--- a/mappings/net/minecraft/world/chunk/Chunk.mapping
+++ b/mappings/net/minecraft/world/chunk/Chunk.mapping
@@ -85,7 +85,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk
 	METHOD method_12228 areSectionsEmptyBetween (II)Z
 		ARG 1 lowerHeight
 		ARG 2 upperHeight
-	METHOD method_20598 getPackedBlockEntityNbt (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487;
+	METHOD method_20598 getPackedBlockEntityNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		ARG 1 pos
 	METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713;
 		ARG 1 ySectionCoord
diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping
index 3854667f61..64c7390e04 100644
--- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping
+++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping
@@ -70,9 +70,6 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
 		ARG 1 dynamic
 		ARG 2 save
 		ARG 3 locked
-	METHOD method_54525 wrap (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_5455$class_6890;)Lcom/mojang/serialization/Dynamic;
-		ARG 0 dynamic
-		ARG 1 registryManager
 	METHOD method_54526 getLastModifiedTime (Lnet/minecraft/class_32$class_7411;)J
 		ARG 0 save
 	METHOD method_54527 readSummary (Lnet/minecraft/class_32$class_7411;Z)Lnet/minecraft/class_34;
diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
index 7a80de090f..8ca01a050a 100644
--- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping
+++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
@@ -26,10 +26,9 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	FIELD field_5766 upgradedChunkCount I
 	FIELD field_5767 updateThread Ljava/lang/Thread;
 	FIELD field_5768 totalChunkCount I
-	METHOD  (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2378;ZZ)V
+	METHOD  (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5455;ZZ)V
 		ARG 1 session
 		ARG 2 dataFixer
-		ARG 3 dimensionOptionsRegistry
 		ARG 4 eraseCache
 		ARG 5 recreateRegionFiles
 	METHOD method_28304 getWorlds ()Ljava/util/Set;

From 543c1bfe7203c230e0253f1a0bedb873b0cb8103 Mon Sep 17 00:00:00 2001
From: modmuss50 
Date: Wed, 31 Jan 2024 19:51:45 +0000
Subject: [PATCH 23/47] Fix broken classname

---
 mappings/net/minecraft/server/DataPackContents.mapping | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping
index 4952b56339..ae5fdd7c7d 100644
--- a/mappings/net/minecraft/server/DataPackContents.mapping
+++ b/mappings/net/minecraft/server/DataPackContents.mapping
@@ -63,6 +63,6 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
 			COMMENT Creates a new {@link net.minecraft.registry.entry.RegistryEntryList}, stores it and returns it.
 		FIELD field_37826 Lnet/minecraft/class_5350$class_7158;
 			COMMENT Throws an exception.
-	CLASS class_9180 2
+	CLASS class_9180
 		FIELD field_40912 entryListCreationPolicy Lnet/minecraft/class_5350$class_7158;
 		METHOD method_46724 setEntryListCreationPolicy (Lnet/minecraft/class_5350$class_7158;)V

From d1266701ef6b1a39560ffaf47cd533e0c2da4b93 Mon Sep 17 00:00:00 2001
From: Benonardo <75318636+Benonardo@users.noreply.github.com>
Date: Wed, 31 Jan 2024 21:12:49 +0100
Subject: [PATCH 24/47] createMockCreativePlayer -> createMockPlayer (#3777)

---
 mappings/net/minecraft/test/TestContext.mapping | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping
index 14e4a8e1c7..2f4c5b5b5e 100644
--- a/mappings/net/minecraft/test/TestContext.mapping
+++ b/mappings/net/minecraft/test/TestContext.mapping
@@ -235,7 +235,8 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 		ARG 1 runnable
 	METHOD method_36019 (Ljava/lang/Runnable;J)V
 		ARG 2 tick
-	METHOD method_36021 createMockCreativePlayer (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1657;
+	METHOD method_36021 createMockPlayer (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1657;
+		ARG 1 gameMode
 	METHOD method_36022 expectEntityAt (Lnet/minecraft/class_1299;III)V
 		ARG 1 type
 		ARG 2 x

From 80ddaa2e64011eda65e71b407b4f8a3c1735d9df Mon Sep 17 00:00:00 2001
From: Shnupbups 
Date: Thu, 1 Feb 2024 14:10:35 +1100
Subject: [PATCH 25/47] 24w05a stuff (#3779)

* 24w05a stuff

* Update world_events.unpick

* whoops
---
 mappings/net/minecraft/block/Block.mapping    |   1 +
 mappings/net/minecraft/block/Blocks.mapping   |   2 +
 .../minecraft/block/ShulkerBoxBlock.mapping   |   2 +
 .../net/minecraft/block/VaultBlock.mapping    |  14 ++
 .../block/entity/BlockEntity.mapping          |  10 ++
 .../entity/TrialSpawnerBlockEntity.mapping    |   4 +
 .../block/entity/VaultBlockEntity.mapping     | 132 ++++++++++++++++++
 .../minecraft/block/enums/VaultState.mapping  |  45 ++++++
 .../block/spawner/EntityDetector.mapping      |  38 +++++
 .../block/spawner/TrialSpawnerData.mapping    |   3 +
 .../block/spawner/TrialSpawnerLogic.mapping   |   4 +
 .../block/vault/VaultClientData.mapping       |   7 +
 .../minecraft/block/vault/VaultConfig.mapping |  11 ++
 .../block/vault/VaultServerData.mapping       |  46 ++++++
 .../block/vault/VaultSharedData.mapping       |  37 +++++
 .../minecraft/client/MinecraftClient.mapping  |   1 +
 .../ingame/CartographyTableScreen.mapping     |   2 +
 .../screen/world/OptimizeWorldScreen.mapping  |   1 +
 .../client/option/HotbarStorageEntry.mapping  |   8 ++
 .../particle/ConnectionParticle.mapping       |  28 ++++
 .../particle/EnchantGlyphParticle.mapping     |  12 --
 .../client/particle/Particle.mapping          |   7 +
 .../client/particle/ParticleManager.mapping   |   3 +
 .../client/render/GameRenderer.mapping        |   4 +
 .../client/render/MapRenderer.mapping         |   3 +
 .../render/OverlayVertexConsumer.mapping      |   2 +
 .../client/render/RenderLayer.mapping         |   6 +
 .../client/render/RenderPhase.mapping         |   1 +
 .../client/render/VertexConsumer.mapping      |   6 +
 .../client/render/WorldRenderer.mapping       |  17 +++
 .../entity/BeaconBlockEntityRenderer.mapping  |  27 ++++
 .../entity/VaultBlockEntityRenderer.mapping   |  16 +++
 .../DragonFireballEntityRenderer.mapping      |   6 +
 .../ExperienceOrbEntityRenderer.mapping       |   9 ++
 .../FishingBobberEntityRenderer.mapping       |   6 +
 .../entity/GuardianEntityRenderer.mapping     |   9 ++
 .../render/entity/ItemEntityRenderer.mapping  |  21 +++
 .../entity/PaintingEntityRenderer.mapping     |  11 ++
 .../entity/ProjectileEntityRenderer.mapping   |  11 ++
 .../feature/ArmorFeatureRenderer.mapping      |   6 +
 .../StuckStingersFeatureRenderer.mapping      |   6 +
 .../client/util/math/MatrixStack.mapping      |   4 +
 .../client/world/ClientWorld.mapping          |   1 +
 .../net/minecraft/data/DataProvider.mapping   |   4 +
 .../client/BlockStateModelGenerator.mapping   |   1 +
 .../data/client/ItemModelGenerator.mapping    |   2 +
 .../minecraft/data/client/TextureMap.mapping  |   6 +
 .../advancement/AdvancementProvider.mapping   |   2 +
 .../loottable/LootTableProvider.mapping       |   7 +
 .../OneTwentyOneLootTableProviders.mapping    |   1 +
 .../TradeRebalanceLootTableProviders.mapping  |   1 +
 .../vanilla/VanillaLootTableProviders.mapping |   1 +
 .../data/server/recipe/RecipeProvider.mapping |   9 ++
 .../datafixer/fix/HorseArmorFix.mapping       |   6 +
 .../fix/HorseChestIndexingFix.mapping         |   5 +
 .../datafixer/schema/Schema3807.mapping       |   1 +
 .../datafixer/schema/Schema3808.mapping       |   1 +
 .../datafixer/schema/Schema3808_1.mapping     |   1 +
 mappings/net/minecraft/entity/Entity.mapping  |   1 +
 .../net/minecraft/entity/EntityType.mapping   |  10 ++
 .../minecraft/entity/EyeOfEnderEntity.mapping |   2 +
 .../net/minecraft/entity/ItemEntity.mapping   |   2 +
 .../net/minecraft/entity/LivingEntity.mapping |   4 +
 .../entity/decoration/ItemFrameEntity.mapping |   1 +
 .../effect/StatusEffectInstance.mapping       |  23 +++
 .../minecraft/entity/mob/MobEntity.mapping    |   7 +
 .../entity/mob/ZombieVillagerEntity.mapping   |   1 +
 .../passive/AbstractHorseEntity.mapping       |   3 +
 .../entity/player/PlayerInventory.mapping     |   1 +
 .../projectile/AbstractFireballEntity.mapping |   2 +
 .../thrown/ThrownItemEntity.mapping           |   1 +
 .../inventory/SingleStackInventory.mapping    |   2 +
 .../net/minecraft/item/DyeableItem.mapping    |   5 +
 .../net/minecraft/item/FilledMapItem.mapping  |   3 +
 mappings/net/minecraft/item/ItemStack.mapping |  45 +++++-
 .../item/map/MapBannerMarker.mapping          |   4 +
 .../net/minecraft/item/map/MapIcon.mapping    |  17 +++
 mappings/net/minecraft/item/map/MapId.mapping |   3 +
 .../net/minecraft/item/map/MapState.mapping   |   9 ++
 .../net/minecraft/item/trim/ArmorTrim.mapping |   7 +
 .../net/minecraft/loot/LootDataType.mapping   |   2 +
 .../net/minecraft/loot/LootManager.mapping    |  11 ++
 .../minecraft/network/PacketByteBuf.mapping   |  16 +++
 .../network/codec/PacketCodec.mapping         |  24 ++++
 .../network/codec/PacketCodecs.mapping        |  10 ++
 .../listener/ClientPlayPacketListener.mapping |   2 +
 .../listener/ServerPlayPacketListener.mapping |   2 +
 .../c2s/play/BookUpdateC2SPacket.mapping      |   6 -
 .../DebugSampleSubscriptionC2SPacket.mapping  |   6 +
 .../s2c/common/DisconnectS2CPacket.mapping    |   2 -
 .../play/BlockEntityUpdateS2CPacket.mapping   |   1 +
 .../packet/s2c/play/BossBarS2CPacket.mapping  |  22 ++-
 .../play/CommandSuggestionsS2CPacket.mapping  |   8 +-
 .../s2c/play/DeathMessageS2CPacket.mapping    |   4 -
 .../s2c/play/DebugSampleS2CPacket.mapping     |   6 +
 .../network/packet/s2c/play/LightData.mapping |   1 +
 .../s2c/play/MapUpdateS2CPacket.mapping       |   7 +-
 .../s2c/play/OverlayMessageS2CPacket.mapping  |   2 -
 .../play/PlayerListHeaderS2CPacket.mapping    |   4 -
 .../s2c/play/PlayerListS2CPacket.mapping      |  17 +++
 .../packet/s2c/play/SubtitleS2CPacket.mapping |   2 -
 .../packet/s2c/play/TeamS2CPacket.mapping     |   6 +
 .../packet/s2c/play/TitleS2CPacket.mapping    |   2 -
 .../minecraft/particle/ParticleEffect.mapping |   2 +
 .../minecraft/recipe/RecipeManager.mapping    |   5 +
 .../registry/RegistryWrapper.mapping          |   2 +
 .../scoreboard/ServerScoreboard.mapping       |   1 +
 .../minecraft/server/DataPackContents.mapping |  14 +-
 mappings/net/minecraft/server/Main.mapping    |   1 +
 .../server/ServerAdvancementLoader.mapping    |   7 +
 .../server/command/BossBarCommand.mapping     |   1 +
 .../server/command/RaidCommand.mapping        |   1 +
 .../server/command/ScoreboardCommand.mapping  |  12 ++
 .../server/command/TeamCommand.mapping        |   1 +
 .../server/command/TellRawCommand.mapping     |   1 +
 .../server/command/TitleCommand.mapping       |   1 +
 .../minecraft/sound/BlockSoundGroup.mapping   |   1 +
 .../state/property/Properties.mapping         |   2 +
 .../structure/StructureTemplate.mapping       |   2 +
 .../net/minecraft/test/TestContext.mapping    |   2 +
 .../net/minecraft/text/TextCodecs.mapping     |   4 +-
 .../minecraft/util/DebugSampleType.mapping    |   1 +
 .../minecraft/util/JsonReaderUtils.mapping    |   3 +
 mappings/net/minecraft/util/Util.mapping      |   4 +
 mappings/net/minecraft/util/Uuids.mapping     |   1 +
 .../net/minecraft/util/dynamic/Codecs.mapping |  14 ++
 .../math/random/RandomSequencesState.mapping  |   1 +
 .../net/minecraft/village/TradeOffer.mapping  |  45 ++++++
 .../minecraft/village/TradeOfferList.mapping  |   3 +
 .../village/raid/RaidManager.mapping          |   1 +
 .../minecraft/world/ChunkUpdateState.mapping  |   1 +
 .../minecraft/world/ForcedChunkState.mapping  |   1 +
 .../net/minecraft/world/IdCountsState.mapping |   1 +
 .../minecraft/world/PersistentState.mapping   |   2 +
 .../world/PersistentStateManager.mapping      |   3 +
 mappings/net/minecraft/world/World.mapping    |   2 +
 .../net/minecraft/world/WorldEvents.mapping   |  12 ++
 .../net/minecraft/world/chunk/Chunk.mapping   |   1 +
 .../world/updater/WorldUpdater.mapping        |   1 +
 unpick-definitions/world_events.unpick        |   3 +
 140 files changed, 1062 insertions(+), 52 deletions(-)
 create mode 100644 mappings/net/minecraft/block/VaultBlock.mapping
 create mode 100644 mappings/net/minecraft/block/entity/VaultBlockEntity.mapping
 create mode 100644 mappings/net/minecraft/block/enums/VaultState.mapping
 create mode 100644 mappings/net/minecraft/block/vault/VaultClientData.mapping
 create mode 100644 mappings/net/minecraft/block/vault/VaultConfig.mapping
 create mode 100644 mappings/net/minecraft/block/vault/VaultServerData.mapping
 create mode 100644 mappings/net/minecraft/block/vault/VaultSharedData.mapping
 create mode 100644 mappings/net/minecraft/client/particle/ConnectionParticle.mapping
 delete mode 100644 mappings/net/minecraft/client/particle/EnchantGlyphParticle.mapping
 create mode 100644 mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping
 create mode 100644 mappings/net/minecraft/datafixer/fix/HorseArmorFix.mapping
 create mode 100644 mappings/net/minecraft/datafixer/fix/HorseChestIndexingFix.mapping
 create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3807.mapping
 create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3808.mapping
 create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3808_1.mapping
 create mode 100644 mappings/net/minecraft/item/map/MapId.mapping
 create mode 100644 mappings/net/minecraft/network/packet/c2s/play/DebugSampleSubscriptionC2SPacket.mapping
 create mode 100644 mappings/net/minecraft/network/packet/s2c/play/DebugSampleS2CPacket.mapping
 create mode 100644 mappings/net/minecraft/util/DebugSampleType.mapping

diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
index f3e2bb9cb5..fd854ded20 100644
--- a/mappings/net/minecraft/block/Block.mapping
+++ b/mappings/net/minecraft/block/Block.mapping
@@ -274,6 +274,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
 		ARG 2 world
 		ARG 3 tooltip
 		ARG 4 options
+		ARG 5 registryManager
 	METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799;
 		COMMENT {@return the new item stack when using pick block functionality}
 		COMMENT
diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping
index 94668f620c..269d1bcede 100644
--- a/mappings/net/minecraft/block/Blocks.mapping
+++ b/mappings/net/minecraft/block/Blocks.mapping
@@ -196,6 +196,8 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks
 		ARG 0 state
 	METHOD method_55133 createOldStairsBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248;
 		ARG 0 block
+	METHOD method_56717 (Lnet/minecraft/class_2680;)I
+		ARG 0 state
 	METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248;
 		ARG 0 id
 		ARG 1 block
diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping
index d29257b39a..ff112ae904 100644
--- a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping
+++ b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping
@@ -29,6 +29,8 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 entity
+	METHOD method_38234 (Lnet/minecraft/class_1799;Lnet/minecraft/class_4538;Lnet/minecraft/class_2627;)V
+		ARG 2 blockEntity
 	METHOD method_47378 (Ljava/util/EnumMap;)V
 		ARG 0 map
 	METHOD method_54040 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
diff --git a/mappings/net/minecraft/block/VaultBlock.mapping b/mappings/net/minecraft/block/VaultBlock.mapping
new file mode 100644
index 0000000000..61b1f21cb7
--- /dev/null
+++ b/mappings/net/minecraft/block/VaultBlock.mapping
@@ -0,0 +1,14 @@
+CLASS net/minecraft/class_9197 net/minecraft/block/VaultBlock
+	FIELD field_48856 CODEC Lcom/mojang/serialization/MapCodec;
+	FIELD field_48857 VAULT_STATE Lnet/minecraft/class_2769;
+	FIELD field_48858 FACING Lnet/minecraft/class_2753;
+	METHOD method_56718 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9199;)V
+		ARG 1 worldx
+		ARG 2 pos
+		ARG 3 statex
+		ARG 4 blockEntity
+	METHOD method_56719 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9199;)V
+		ARG 0 worldx
+		ARG 1 pos
+		ARG 2 statex
+		ARG 3 blockEntity
diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping
index 2e1281b55f..2d99f61fce 100644
--- a/mappings/net/minecraft/block/entity/BlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@@ -76,6 +76,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		ARG 0 pos
 		ARG 1 state
 		ARG 2 nbt
+		ARG 3 registryLookup
 	METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
 		COMMENT Writes data to {@code nbt}. Subclasses should override this if they
 		COMMENT store a persistent data.
@@ -86,6 +87,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #readNbt
 		ARG 1 nbt
+		ARG 2 registryLookup
 	METHOD method_11010 getCachedState ()Lnet/minecraft/class_2680;
 		COMMENT {@return the cached block state at the block entity's position}
 		COMMENT
@@ -114,6 +116,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #writeNbt
 		ARG 1 nbt
+		ARG 2 registryLookup
 	METHOD method_11015 isRemoved ()Z
 	METHOD method_11016 getPos ()Lnet/minecraft/class_2338;
 		COMMENT {@return the block entity's position}
@@ -133,6 +136,9 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT 
    To send all NBT data of this block entity saved to disk, return {@link #createNbt}.
 		COMMENT
 		COMMENT @see #toUpdatePacket
+		ARG 1 registryLookup
+	METHOD method_17897 (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;Ljava/lang/String;Lnet/minecraft/class_2586;)Lnet/minecraft/class_2586;
+		ARG 3 blockEntity
 	METHOD method_17899 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/lang/String;Lnet/minecraft/class_2591;)Lnet/minecraft/class_2586;
 		ARG 3 type
 	METHOD method_31662 setWorld (Lnet/minecraft/class_1937;)V
@@ -180,6 +186,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT Sets {@code stack}'s {@code net.minecraft.item.BlockItem#BLOCK_ENTITY_TAG_KEY}
 		COMMENT NBT value to {@linkplain #createNbt the block entity's NBT data}.
 		ARG 1 stack
+		ARG 2 registryLookup
 	METHOD method_38241 writeIdToNbt (Lnet/minecraft/class_2487;)V
 		COMMENT Writes the block entity type ID to {@code nbt} under the {@code id} key.
 		COMMENT
@@ -195,6 +202,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #createNbt
 		COMMENT @see #createNbtWithId
+		ARG 1 registryLookup
 	METHOD method_38243 createNbtWithId (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the block entity's NBT data with block entity type ID}
 		COMMENT
@@ -203,6 +211,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #createNbt
 		COMMENT @see #createNbtWithIdentifyingData
+		ARG 1 registryLookup
 	METHOD method_38244 createNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the block entity's NBT data}
 		COMMENT
@@ -212,6 +221,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT @see #writeNbt
 		COMMENT @see #createNbtWithIdentifyingData
 		COMMENT @see #createNbtWithId
+		ARG 1 registryLookup
 	METHOD method_5431 markDirty ()V
 		COMMENT Marks this block entity as dirty and that it needs to be saved.
 		COMMENT This also triggers {@linkplain World#updateComparators comparator update}.
diff --git a/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping b/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping
index 846759018d..561b840da1 100644
--- a/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping
@@ -4,4 +4,8 @@ CLASS net/minecraft/class_8961 net/minecraft/block/entity/TrialSpawnerBlockEntit
 	METHOD  (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
+	METHOD method_55147 (Lnet/minecraft/class_8963;)V
+		ARG 1 spawner
+	METHOD method_55148 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
+		ARG 1 nbtx
 	METHOD method_55150 getSpawner ()Lnet/minecraft/class_8963;
diff --git a/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping b/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping
new file mode 100644
index 0000000000..31084ead4e
--- /dev/null
+++ b/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping
@@ -0,0 +1,132 @@
+CLASS net/minecraft/class_9199 net/minecraft/block/entity/VaultBlockEntity
+	FIELD field_48865 LOGGER Lorg/slf4j/Logger;
+	FIELD field_48866 serverData Lnet/minecraft/class_9204;
+	FIELD field_48867 sharedData Lnet/minecraft/class_9205;
+	FIELD field_48868 clientData Lnet/minecraft/class_9202;
+	FIELD field_48869 config Lnet/minecraft/class_9203;
+	METHOD  (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		ARG 1 pos
+		ARG 2 state
+	METHOD method_56729 encodeValue (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)Lnet/minecraft/class_2520;
+		ARG 0 codec
+		ARG 1 value
+	METHOD method_56730 setConfig (Lnet/minecraft/class_9203;)V
+		ARG 1 config
+	METHOD method_56731 getServerData ()Lnet/minecraft/class_9204;
+	METHOD method_56733 (Lnet/minecraft/class_9203;)V
+		ARG 1 config
+	METHOD method_56734 (Lnet/minecraft/class_2487;)V
+		ARG 1 nbt
+	METHOD method_56735 getSharedData ()Lnet/minecraft/class_9205;
+	METHOD method_56736 getClientData ()Lnet/minecraft/class_9202;
+	METHOD method_56737 getConfig ()Lnet/minecraft/class_9203;
+	CLASS class_9200 Client
+		METHOD method_56738 spawnConnectedParticlesFor (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_1657;)V
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 player
+		METHOD method_56739 spawnDeactivateParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
+			ARG 0 world
+			ARG 1 pos
+		METHOD method_56740 spawnAmbientParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_9205;)V
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 sharedData
+		METHOD method_56741 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9202;Lnet/minecraft/class_9205;)V
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 state
+			ARG 3 clientData
+			ARG 4 sharedData
+		METHOD method_56742 spawnActivateParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9205;)V
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 state
+			ARG 3 sharedData
+		METHOD method_56743 hasDisplayItem (Lnet/minecraft/class_9205;)Z
+			ARG 0 sharedData
+		METHOD method_56744 getDeactivateParticlesPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Lnet/minecraft/class_243;
+			ARG 0 pos
+			ARG 1 random
+		METHOD method_56745 isPlayerWithinConnectedParticlesRange (Lnet/minecraft/class_2338;Lnet/minecraft/class_9205;Lnet/minecraft/class_1657;)Z
+			ARG 0 pos
+			ARG 1 sharedData
+			ARG 2 player
+		METHOD method_56746 getConnectedParticlesOrigin (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_243;
+			ARG 0 pos
+			ARG 1 direction
+		METHOD method_56747 playAmbientSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_9205;)V
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 sharedData
+		METHOD method_56748 spawnConnectedParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9205;)V
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 state
+			ARG 3 sharedData
+		METHOD method_56749 getRegularParticlesPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Lnet/minecraft/class_243;
+			ARG 0 pos
+			ARG 1 random
+	CLASS class_9201 Server
+		FIELD field_48875 UNLOCK_TIME I
+		FIELD field_48876 DISPLAY_UPDATE_INTERVAL I
+		FIELD field_48877 FAILED_UNLOCK_COOLDOWN I
+		METHOD method_56750 shouldUpdateDisplayItem (JLnet/minecraft/class_9206;)Z
+			ARG 0 time
+			ARG 2 state
+		METHOD method_56751 generateLoot (Lnet/minecraft/class_3218;Lnet/minecraft/class_9203;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)Ljava/util/List;
+			ARG 0 world
+			ARG 1 config
+			ARG 2 pos
+			ARG 3 player
+		METHOD method_56752 playFailedUnlockSound (Lnet/minecraft/class_3218;Lnet/minecraft/class_9204;Lnet/minecraft/class_2338;)V
+			ARG 0 world
+			ARG 1 serverData
+			ARG 2 pos
+		METHOD method_56753 updateDisplayItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_9206;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;Lnet/minecraft/class_2338;)V
+			ARG 0 world
+			ARG 1 state
+			ARG 2 config
+			ARG 3 sharedData
+			ARG 4 pos
+		METHOD method_56754 unlock (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;Ljava/util/List;)V
+			ARG 0 world
+			ARG 1 state
+			ARG 2 pos
+			ARG 3 config
+			ARG 4 serverData
+			ARG 5 sharedData
+			ARG 6 itemsToEject
+		METHOD method_56755 generateDisplayItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1799;
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 lootTable
+		METHOD method_56756 tick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;)V
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 state
+			ARG 3 config
+			ARG 4 serverData
+			ARG 5 sharedData
+		METHOD method_56757 tryUnlock (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 state
+			ARG 3 config
+			ARG 4 serverData
+			ARG 5 sharedData
+			ARG 6 player
+			ARG 7 stack
+		METHOD method_56758 changeVaultState (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;)V
+			ARG 0 world
+			ARG 1 pos
+			ARG 2 oldState
+			ARG 3 newState
+			ARG 4 config
+			ARG 5 sharedData
+		METHOD method_56759 isValidKey (Lnet/minecraft/class_9203;Lnet/minecraft/class_1799;)Z
+			ARG 0 config
+			ARG 1 stack
+		METHOD method_56760 canBeUnlocked (Lnet/minecraft/class_9203;Lnet/minecraft/class_9206;)Z
+			ARG 0 config
+			ARG 1 state
diff --git a/mappings/net/minecraft/block/enums/VaultState.mapping b/mappings/net/minecraft/block/enums/VaultState.mapping
new file mode 100644
index 0000000000..e54da2d3d3
--- /dev/null
+++ b/mappings/net/minecraft/block/enums/VaultState.mapping
@@ -0,0 +1,45 @@
+CLASS net/minecraft/class_9206 net/minecraft/block/enums/VaultState
+	FIELD field_48907 id Ljava/lang/String;
+	FIELD field_48908 light Lnet/minecraft/class_9206$class_9207;
+	METHOD  (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_9206$class_9207;)V
+		ARG 3 id
+		ARG 4 light
+	METHOD method_56801 getLuminance ()I
+	METHOD method_56802 ejectItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;F)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 stack
+		ARG 4 pitchModifier
+	METHOD method_56803 update (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;)Lnet/minecraft/class_9206;
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 config
+		ARG 4 serverData
+		ARG 5 sharedData
+	METHOD method_56804 updateActiveState (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;D)Lnet/minecraft/class_9206;
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 config
+		ARG 3 serverData
+		ARG 4 sharedData
+		ARG 5 radius
+	METHOD method_56805 onChangedTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 config
+		ARG 4 sharedData
+	METHOD method_56806 onStateChange (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9206;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 newState
+		ARG 4 config
+		ARG 5 sharedData
+	METHOD method_56808 onChangedFrom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 config
+		ARG 4 sharedData
+	CLASS class_9207 Light
+		FIELD field_48913 luminance I
+		METHOD  (Ljava/lang/String;II)V
+			ARG 3 luminance
diff --git a/mappings/net/minecraft/block/spawner/EntityDetector.mapping b/mappings/net/minecraft/block/spawner/EntityDetector.mapping
index 7817d62b01..83589d9f7b 100644
--- a/mappings/net/minecraft/block/spawner/EntityDetector.mapping
+++ b/mappings/net/minecraft/block/spawner/EntityDetector.mapping
@@ -1,4 +1,42 @@
 CLASS net/minecraft/class_8962 net/minecraft/block/spawner/EntityDetector
 	FIELD field_47357 SHEEP Lnet/minecraft/class_8962;
+	FIELD field_48860 SURVIVAL_PLAYERS Lnet/minecraft/class_8962;
+	FIELD field_48861 NON_SPECTATOR_PLAYERS Lnet/minecraft/class_8962;
 	METHOD detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List;
 		ARG 1 world
+		ARG 2 selector
+		ARG 3 center
+		ARG 4 radius
+	METHOD method_55155 (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List;
+		ARG 0 world
+		ARG 1 selector
+		ARG 2 center
+		ARG 3 radius
+	METHOD method_56720 (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List;
+		ARG 0 world
+		ARG 1 selector
+		ARG 2 center
+		ARG 3 radius
+	METHOD method_56721 (Lnet/minecraft/class_2338;DLnet/minecraft/class_1657;)Z
+		ARG 3 player
+	METHOD method_56722 (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List;
+		ARG 0 world
+		ARG 1 selector
+		ARG 2 center
+		ARG 3 radius
+	METHOD method_56723 (Lnet/minecraft/class_2338;DLnet/minecraft/class_1657;)Z
+		ARG 3 player
+	CLASS class_9198 Selector
+		FIELD field_48862 IN_WORLD Lnet/minecraft/class_8962$class_9198;
+		METHOD method_56724 getEntities (Lnet/minecraft/class_3218;Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List;
+			ARG 1 world
+			ARG 2 typeFilter
+			ARG 3 box
+			ARG 4 predicate
+		METHOD method_56725 getPlayers (Lnet/minecraft/class_3218;Ljava/util/function/Predicate;)Ljava/util/List;
+			ARG 1 world
+			ARG 2 predicate
+		METHOD method_56726 ofPlayer (Lnet/minecraft/class_1657;)Lnet/minecraft/class_8962$class_9198;
+			ARG 0 player
+		METHOD method_56727 ofPlayers (Ljava/util/List;)Lnet/minecraft/class_8962$class_9198;
+			ARG 0 players
diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping
index 0517c2d532..e654665cd4 100644
--- a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping
+++ b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping
@@ -34,7 +34,10 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData
 		ARG 3 additionalPlayers
 	METHOD method_55186 updatePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;I)V
 		ARG 1 world
+		ARG 2 pos
 		ARG 3 entityDetector
+		ARG 4 entitySelector
+		ARG 5 range
 	METHOD method_55187 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_55188 getSpawnData (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1952;
diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping
index 90afc7e638..46e5efd1ff 100644
--- a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping
+++ b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping
@@ -6,14 +6,17 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 	FIELD field_47364 trialSpawner Lnet/minecraft/class_8963$class_8964;
 	FIELD field_47365 entityDetector Lnet/minecraft/class_8962;
 	FIELD field_47366 forceActivate Z
+	FIELD field_48864 entitySelector Lnet/minecraft/class_8962$class_9198;
 	METHOD  (Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V
 		ARG 1 trialSpawner
 		ARG 2 entityDetector
+		ARG 3 entitySelector
 	METHOD  (Lnet/minecraft/class_8965;Lnet/minecraft/class_8966;Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V
 		ARG 1 config
 		ARG 2 data
 		ARG 3 trialSpawner
 		ARG 4 entityDetector
+		ARG 5 entitySelector
 	METHOD method_55156 codec ()Lcom/mojang/serialization/Codec;
 	METHOD method_55157 (DDDLnet/minecraft/class_5819;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 7 entity
@@ -68,6 +71,7 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 	METHOD method_55176 updateListeners ()V
 	METHOD method_55177 getEntityDetector ()Lnet/minecraft/class_8962;
 	METHOD method_55178 forceActivate ()V
+	METHOD method_56728 getEntitySelector ()Lnet/minecraft/class_8962$class_9198;
 	CLASS class_8964 TrialSpawner
 		METHOD method_55146 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V
 			ARG 1 world
diff --git a/mappings/net/minecraft/block/vault/VaultClientData.mapping b/mappings/net/minecraft/block/vault/VaultClientData.mapping
new file mode 100644
index 0000000000..298389718c
--- /dev/null
+++ b/mappings/net/minecraft/block/vault/VaultClientData.mapping
@@ -0,0 +1,7 @@
+CLASS net/minecraft/class_9202 net/minecraft/block/vault/VaultClientData
+	FIELD field_48878 DISPLAY_ROTATION_SPEED F
+	FIELD field_48879 displayRotation F
+	FIELD field_48880 prevDisplayRotation F
+	METHOD method_56761 getDisplayRotation ()F
+	METHOD method_56762 getPreviousDisplayRotation ()F
+	METHOD method_56763 rotateDisplay ()V
diff --git a/mappings/net/minecraft/block/vault/VaultConfig.mapping b/mappings/net/minecraft/block/vault/VaultConfig.mapping
new file mode 100644
index 0000000000..319fdd50fb
--- /dev/null
+++ b/mappings/net/minecraft/block/vault/VaultConfig.mapping
@@ -0,0 +1,11 @@
+CLASS net/minecraft/class_9203 net/minecraft/block/vault/VaultConfig
+	FIELD field_48881 CONFIG_KEY Ljava/lang/String;
+	FIELD field_48882 DEFAULT Lnet/minecraft/class_9203;
+	FIELD field_48883 codec Lcom/mojang/serialization/Codec;
+	METHOD  (Lnet/minecraft/class_2960;DDLnet/minecraft/class_1799;Ljava/util/Optional;)V
+		ARG 1 lootTable
+		ARG 2 activationRange
+		ARG 4 deactivationRange
+		ARG 6 keyItem
+		ARG 7 overrideLootTableToDisplay
+	METHOD method_56765 validate ()Lcom/mojang/serialization/DataResult;
diff --git a/mappings/net/minecraft/block/vault/VaultServerData.mapping b/mappings/net/minecraft/block/vault/VaultServerData.mapping
new file mode 100644
index 0000000000..d7ae29ab00
--- /dev/null
+++ b/mappings/net/minecraft/block/vault/VaultServerData.mapping
@@ -0,0 +1,46 @@
+CLASS net/minecraft/class_9204 net/minecraft/block/vault/VaultServerData
+	FIELD field_48884 SERVER_DATA_KEY Ljava/lang/String;
+	FIELD field_48885 codec Lcom/mojang/serialization/Codec;
+	FIELD field_48886 dirty Z
+	FIELD field_48887 MAX_STORED_REWARDED_PLAYERS I
+	FIELD field_48888 rewardedPlayers Ljava/util/Set;
+	FIELD field_48889 stateUpdatingResumesAt J
+	FIELD field_48890 itemsToEject Ljava/util/List;
+	FIELD field_48891 lastFailedUnlockTime J
+	FIELD field_48892 totalEjectionsNeeded I
+	METHOD  (Ljava/util/Set;JLjava/util/List;I)V
+		ARG 1 rewardedPlayers
+		ARG 2 stateUpdatingResumesAt
+		ARG 4 itemsToEject
+		ARG 5 totalEjectionsNeeded
+	METHOD method_56767 getLastFailedUnlockTime ()J
+	METHOD method_56768 setLastFailedUnlockTime (J)V
+		ARG 1 lastFailedUnlockTime
+	METHOD method_56769 hasRewardedPlayer (Lnet/minecraft/class_1657;)Z
+		ARG 1 player
+	METHOD method_56770 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD method_56771 copyFrom (Lnet/minecraft/class_9204;)V
+		ARG 1 data
+	METHOD method_56772 setItemsToEject (Ljava/util/List;)V
+		ARG 1 itemsToEject
+	METHOD method_56773 getRewardedPlayers ()Ljava/util/Set;
+	METHOD method_56774 setStateUpdatingResumeTime (J)V
+		ARG 1 stateUpdatingResumesAt
+	METHOD method_56775 markPlayerAsRewarded (Lnet/minecraft/class_1657;)V
+		ARG 1 player
+	METHOD method_56776 (Lnet/minecraft/class_9204;)Ljava/lang/Integer;
+		ARG 0 data
+	METHOD method_56777 getStateUpdatingResumeTime ()J
+	METHOD method_56778 (Lnet/minecraft/class_9204;)Ljava/util/List;
+		ARG 0 data
+	METHOD method_56779 getItemsToEject ()Ljava/util/List;
+	METHOD method_56780 (Lnet/minecraft/class_9204;)Ljava/lang/Long;
+		ARG 0 data
+	METHOD method_56781 finishEjecting ()V
+	METHOD method_56782 (Lnet/minecraft/class_9204;)Ljava/util/Set;
+		ARG 0 data
+	METHOD method_56783 getItemToDisplay ()Lnet/minecraft/class_1799;
+	METHOD method_56784 getItemToEject ()Lnet/minecraft/class_1799;
+	METHOD method_56785 getEjectSoundPitchModifier ()F
+	METHOD method_56786 markDirty ()V
diff --git a/mappings/net/minecraft/block/vault/VaultSharedData.mapping b/mappings/net/minecraft/block/vault/VaultSharedData.mapping
new file mode 100644
index 0000000000..8350911be9
--- /dev/null
+++ b/mappings/net/minecraft/block/vault/VaultSharedData.mapping
@@ -0,0 +1,37 @@
+CLASS net/minecraft/class_9205 net/minecraft/block/vault/VaultSharedData
+	FIELD field_48893 SHARED_DATA_KEY Ljava/lang/String;
+	FIELD field_48894 codec Lcom/mojang/serialization/Codec;
+	FIELD field_48895 dirty Z
+	FIELD field_48896 displayItem Lnet/minecraft/class_1799;
+	FIELD field_48897 connectedPlayers Ljava/util/Set;
+	FIELD field_48898 connectedParticlesRange D
+	METHOD  (Lnet/minecraft/class_1799;Ljava/util/Set;D)V
+		ARG 1 displayItem
+		ARG 2 connectedPlayers
+		ARG 3 connectedParticlesRange
+	METHOD method_56787 getDisplayItem ()Lnet/minecraft/class_1799;
+	METHOD method_56788 updateConnectedPlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9204;Lnet/minecraft/class_9203;D)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 serverData
+		ARG 4 config
+		ARG 5 radius
+	METHOD method_56789 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD method_56790 setDisplayItem (Lnet/minecraft/class_1799;)V
+		ARG 1 stack
+	METHOD method_56791 (Lnet/minecraft/class_9204;Ljava/util/UUID;)Z
+		ARG 1 uuid
+	METHOD method_56792 copyFrom (Lnet/minecraft/class_9205;)V
+		ARG 1 data
+	METHOD method_56793 hasDisplayItem ()Z
+	METHOD method_56794 (Lnet/minecraft/class_9205;)Ljava/lang/Double;
+		ARG 0 data
+	METHOD method_56795 hasConnectedPlayers ()Z
+	METHOD method_56796 (Lnet/minecraft/class_9205;)Ljava/util/Set;
+		ARG 0 data
+	METHOD method_56797 getConnectedPlayers ()Ljava/util/Set;
+	METHOD method_56798 (Lnet/minecraft/class_9205;)Lnet/minecraft/class_1799;
+		ARG 0 data
+	METHOD method_56799 getConnectedParticlesRange ()D
+	METHOD method_56800 markDirty ()V
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
index 6a57987799..2e47d3f728 100644
--- a/mappings/net/minecraft/client/MinecraftClient.mapping
+++ b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -215,6 +215,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;Lnet/minecraft/class_5455;)V
 		ARG 1 stack
 		ARG 2 blockEntity
+		ARG 3 registryManager
 	METHOD method_1502 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream;
 		ARG 0 stack
 	METHOD method_1504 setCameraEntity (Lnet/minecraft/class_1297;)V
diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping
index fee57d27db..0b93248ab9 100644
--- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping
@@ -11,12 +11,14 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph
 		ARG 3 title
 	METHOD method_17566 drawMap (Lnet/minecraft/class_332;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;IIF)V
 		ARG 1 context
+		ARG 2 mapId
 		ARG 3 mapState
 		ARG 4 x
 		ARG 5 y
 		ARG 6 scale
 	METHOD method_17567 drawMap (Lnet/minecraft/class_332;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;ZZZZ)V
 		ARG 1 context
+		ARG 2 mapId
 		ARG 3 mapState
 		ARG 4 cloneMode
 		ARG 5 expandMode
diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping
index 6d389b98a0..45fce21e31 100644
--- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping
@@ -9,6 +9,7 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl
 		ARG 3 storageSession
 		ARG 4 levelInfo
 		ARG 5 eraseCache
+		ARG 6 registryManager
 	METHOD method_19938 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_27031 create (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_527;
diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
index 880134a8e3..7bdf956982 100644
--- a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
+++ b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
@@ -1 +1,9 @@
 CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry
+	FIELD field_48942 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_48943 LOGGER Lorg/slf4j/Logger;
+	FIELD field_48944 HOTBAR_SIZE I
+	METHOD method_56836 (Lnet/minecraft/class_1661;Lnet/minecraft/class_5455;)V
+		ARG 1 playerInventory
+		ARG 2 registryManager
+	METHOD method_56839 (Lnet/minecraft/class_7225$class_7874;)Ljava/util/List;
+		ARG 1 registryLookup
diff --git a/mappings/net/minecraft/client/particle/ConnectionParticle.mapping b/mappings/net/minecraft/client/particle/ConnectionParticle.mapping
new file mode 100644
index 0000000000..887a75ee36
--- /dev/null
+++ b/mappings/net/minecraft/client/particle/ConnectionParticle.mapping
@@ -0,0 +1,28 @@
+CLASS net/minecraft/class_668 net/minecraft/client/particle/ConnectionParticle
+	FIELD field_3793 startZ D
+	FIELD field_3794 startY D
+	FIELD field_3795 startX D
+	FIELD field_48938 fullBrightness Z
+	FIELD field_48939 dynamicAlpha Lnet/minecraft/class_703$class_9213;
+	METHOD  (Lnet/minecraft/class_638;DDDDDDZLnet/minecraft/class_703$class_9213;)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+		ARG 14 fullBrightness
+		ARG 15 dynamicAlpha
+	CLASS class_669 NautilusFactory
+		FIELD field_17804 spriteProvider Lnet/minecraft/class_4002;
+		METHOD  (Lnet/minecraft/class_4002;)V
+			ARG 1 spriteProvider
+	CLASS class_670 EnchantFactory
+		FIELD field_17803 spriteProvider Lnet/minecraft/class_4002;
+		METHOD  (Lnet/minecraft/class_4002;)V
+			ARG 1 spriteProvider
+	CLASS class_9212 VaultConnectionFactory
+		FIELD field_48940 spriteProvider Lnet/minecraft/class_4002;
+		METHOD  (Lnet/minecraft/class_4002;)V
+			ARG 1 spriteProvider
diff --git a/mappings/net/minecraft/client/particle/EnchantGlyphParticle.mapping b/mappings/net/minecraft/client/particle/EnchantGlyphParticle.mapping
deleted file mode 100644
index ea6bc59694..0000000000
--- a/mappings/net/minecraft/client/particle/EnchantGlyphParticle.mapping
+++ /dev/null
@@ -1,12 +0,0 @@
-CLASS net/minecraft/class_668 net/minecraft/client/particle/EnchantGlyphParticle
-	FIELD field_3793 startZ D
-	FIELD field_3794 startY D
-	FIELD field_3795 startX D
-	CLASS class_669 NautilusFactory
-		FIELD field_17804 spriteProvider Lnet/minecraft/class_4002;
-		METHOD  (Lnet/minecraft/class_4002;)V
-			ARG 1 spriteProvider
-	CLASS class_670 EnchantFactory
-		FIELD field_17803 spriteProvider Lnet/minecraft/class_4002;
-		METHOD  (Lnet/minecraft/class_4002;)V
-			ARG 1 spriteProvider
diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping
index 9528f8575a..c2fbd8b6ab 100644
--- a/mappings/net/minecraft/client/particle/Particle.mapping
+++ b/mappings/net/minecraft/client/particle/Particle.mapping
@@ -155,3 +155,10 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle
 			COMMENT the new y-velocity of this particle
 		ARG 5 velocityZ
 			COMMENT the new z-velocity of this particle
+	CLASS class_9213 DynamicAlpha
+		FIELD field_48941 OPAQUE Lnet/minecraft/class_703$class_9213;
+		METHOD method_56833 isOpaque ()Z
+		METHOD method_56834 getAlpha (IIF)F
+			ARG 1 age
+			ARG 2 maxAge
+			ARG 3 tickDelta
diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping
index 49b88bbbb9..152cc7780c 100644
--- a/mappings/net/minecraft/client/particle/ParticleManager.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping
@@ -42,6 +42,9 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager
 		ARG 1 particles
 			COMMENT a collection of particles from the same sheet
 	METHOD method_3049 renderParticles (Lnet/minecraft/class_765;Lnet/minecraft/class_4184;F)V
+		ARG 1 lightmapTextureManager
+		ARG 2 camera
+		ARG 3 tickDelta
 	METHOD method_3051 addEmitter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2394;I)V
 		ARG 1 entity
 		ARG 2 parameters
diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping
index a49fd71184..d111bd4ba7 100644
--- a/mappings/net/minecraft/client/render/GameRenderer.mapping
+++ b/mappings/net/minecraft/client/render/GameRenderer.mapping
@@ -98,6 +98,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 	FIELD field_44813 renderTypeGuiGhostRecipeOverlayProgram Lnet/minecraft/class_5944;
 	FIELD field_47130 ticks I
 	FIELD field_47462 renderTypeBreezeWindProgram Lnet/minecraft/class_5944;
+	FIELD field_48948 renderTypeCloudsProgram Lnet/minecraft/class_5944;
 	METHOD  (Lnet/minecraft/class_310;Lnet/minecraft/class_759;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V
 		ARG 1 client
 		ARG 2 heldItemRenderer
@@ -127,6 +128,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 		ARG 2 scaledHeight
 		ARG 3 tickDelta
 	METHOD method_3172 renderHand (Lnet/minecraft/class_4184;F)V
+		ARG 1 camera
+		ARG 2 tickDelta
 	METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F
 		ARG 0 entity
 		ARG 1 tickDelta
@@ -393,6 +396,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 		ARG 0 hitResult
 		ARG 1 cameraPos
 		ARG 2 interactionRange
+	METHOD method_56846 getRenderTypeCloudsProgram ()Lnet/minecraft/class_5944;
 	CLASS 1
 		METHOD method_45775 (Lnet/minecraft/class_2960;)Z
 			ARG 0 id
diff --git a/mappings/net/minecraft/client/render/MapRenderer.mapping b/mappings/net/minecraft/client/render/MapRenderer.mapping
index f688d3752c..6fcedc44bc 100644
--- a/mappings/net/minecraft/client/render/MapRenderer.mapping
+++ b/mappings/net/minecraft/client/render/MapRenderer.mapping
@@ -8,11 +8,13 @@ CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer
 	METHOD  (Lnet/minecraft/class_1060;)V
 		ARG 1 textureManager
 	METHOD method_1769 updateTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V
+		ARG 1 id
 		ARG 2 state
 	METHOD method_1771 clearStateTextures ()V
 	METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;ZI)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
+		ARG 3 id
 		ARG 4 state
 		ARG 5 hidePlayerIcons
 		ARG 6 light
@@ -20,6 +22,7 @@ CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer
 		ARG 2 id2
 		ARG 3 texture
 	METHOD method_32601 getMapTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331;
+		ARG 1 id
 		ARG 2 state
 	CLASS class_331 MapTexture
 		FIELD field_2046 state Lnet/minecraft/class_22;
diff --git a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping
index 1d842d08cd..42a584fa4d 100644
--- a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping
+++ b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping
@@ -14,4 +14,6 @@ CLASS net/minecraft/class_4583 net/minecraft/client/render/OverlayVertexConsumer
 	FIELD field_41091 textureScale F
 	METHOD  (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;F)V
 		ARG 1 delegate
+		ARG 2 matrix
+		ARG 3 textureScale
 	METHOD method_22891 init ()V
diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping
index 20e35b0d52..dd741eb13a 100644
--- a/mappings/net/minecraft/client/render/RenderLayer.mapping
+++ b/mappings/net/minecraft/client/render/RenderLayer.mapping
@@ -47,6 +47,8 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 	FIELD field_38345 ENTITY_TRANSLUCENT_EMISSIVE Ljava/util/function/BiFunction;
 	FIELD field_39002 BLOCK_LAYERS Lcom/google/common/collect/ImmutableList;
 	FIELD field_42521 DEBUG_LINE_STRIP Ljava/util/function/Function;
+	FIELD field_48950 FAST_CLOUDS Lnet/minecraft/class_1921;
+	FIELD field_48951 FANCY_CLOUDS Lnet/minecraft/class_1921;
 	METHOD  (Ljava/lang/String;Lnet/minecraft/class_293;Lnet/minecraft/class_293$class_5596;IZZLjava/lang/Runnable;Ljava/lang/Runnable;)V
 		ARG 1 name
 		ARG 2 vertexFormat
@@ -248,6 +250,10 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 		ARG 2 y
 	METHOD method_55252 getEntityTranslucentEmissiveNoOutline (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
 		ARG 0 texture
+	METHOD method_56848 getClouds (Z)Lnet/minecraft/class_1921$class_4687;
+		ARG 0 fancy
+	METHOD method_56849 getFastClouds ()Lnet/minecraft/class_1921;
+	METHOD method_56850 getFancyClouds ()Lnet/minecraft/class_1921;
 	CLASS class_4687 MultiPhase
 		FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688;
 		FIELD field_21697 affectedOutline Ljava/util/Optional;
diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping
index 60f4f4691d..93ee656e4d 100644
--- a/mappings/net/minecraft/client/render/RenderPhase.mapping
+++ b/mappings/net/minecraft/client/render/RenderPhase.mapping
@@ -97,6 +97,7 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase
 	FIELD field_44819 GUI_TEXT_HIGHLIGHT_PROGRAM Lnet/minecraft/class_4668$class_5942;
 	FIELD field_44820 GUI_GHOST_RECIPE_OVERLAY_PROGRAM Lnet/minecraft/class_4668$class_5942;
 	FIELD field_47463 BREEZE_WIND_PROGRAM Lnet/minecraft/class_4668$class_5942;
+	FIELD field_48949 CLOUDS_PROGRAM Lnet/minecraft/class_4668$class_5942;
 	METHOD  (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;)V
 		ARG 1 name
 		ARG 2 beginAction
diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping
index 3a148ac11b..f2db1147d9 100644
--- a/mappings/net/minecraft/client/render/VertexConsumer.mapping
+++ b/mappings/net/minecraft/client/render/VertexConsumer.mapping
@@ -168,6 +168,7 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer
 		COMMENT accepting a normal element.
 		COMMENT
 		COMMENT @return this consumer, for chaining
+		ARG 1 matrix
 		ARG 2 x
 		ARG 3 y
 		ARG 4 z
@@ -209,3 +210,8 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer
 		COMMENT
 		COMMENT @return this consumer, for chaining
 		ARG 1 argb
+	METHOD method_56824 vertex (Lnet/minecraft/class_4587$class_4665;FFF)Lnet/minecraft/class_4588;
+		ARG 1 matrix
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping
index ce33bd8419..3e06c8f2b9 100644
--- a/mappings/net/minecraft/client/render/WorldRenderer.mapping
+++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping
@@ -65,6 +65,9 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 	FIELD field_4118 lastTranslucentSortZ D
 	FIELD field_4119 playingSongs Ljava/util/Map;
 	FIELD field_4121 cameraChunkZ I
+	FIELD field_45614 chunkBuilder Lnet/minecraft/class_846;
+	FIELD field_45615 chunkRenderingDataPreparer Lnet/minecraft/class_8679;
+	FIELD field_45616 builtChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
 	METHOD  (Lnet/minecraft/class_310;Lnet/minecraft/class_898;Lnet/minecraft/class_824;Lnet/minecraft/class_4599;)V
 		ARG 1 client
 		ARG 2 entityRenderDispatcher
@@ -89,6 +92,12 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 2 old
 		ARG 3 updated
 	METHOD method_22710 render (FJZLnet/minecraft/class_4184;Lnet/minecraft/class_757;Lnet/minecraft/class_765;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V
+		ARG 1 tickDelta
+		ARG 2 limitTime
+		ARG 4 renderBlockOutline
+		ARG 5 camera
+		ARG 6 gameRenderer
+		ARG 7 lightmapTextureManager
 	METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumer
@@ -236,6 +245,9 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 1 matrices
 	METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V
 		ARG 1 renderLayer
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
 		ARG 9 positionMatrix
 	METHOD method_3252 tick ()V
 	METHOD method_3254 drawEntityOutlinesFramebuffer ()V
@@ -261,6 +273,11 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 16 blue
 		ARG 17 alpha
 	METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FDDD)V
+		ARG 1 matrices
+		ARG 4 tickDelta
+		ARG 5 cameraX
+		ARG 7 cameraY
+		ARG 9 cameraZ
 	METHOD method_3265 renderDarkSky ()V
 	METHOD method_3267 cleanUp ()V
 	METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066;
diff --git a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping
index 65e6941250..62bfcba39f 100644
--- a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping
@@ -4,6 +4,22 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo
 	METHOD  (Lnet/minecraft/class_5614$class_5615;)V
 		ARG 1 ctx
 	METHOD method_22740 renderBeamFace (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V
+		ARG 0 matrix
+		ARG 1 vertices
+		ARG 2 red
+		ARG 3 green
+		ARG 4 blue
+		ARG 5 alpha
+		ARG 6 yOffset
+		ARG 7 height
+		ARG 8 x1
+		ARG 9 z1
+		ARG 10 x2
+		ARG 11 z2
+		ARG 12 u1
+		ARG 13 u2
+		ARG 14 v1
+		ARG 15 v2
 	METHOD method_22741 renderBeamLayer (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;FFFFIIFFFFFFFFFFFF)V
 		ARG 0 matrices
 		ARG 1 vertices
@@ -26,6 +42,17 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo
 		ARG 18 v1
 		ARG 19 v2
 	METHOD method_23076 renderBeamVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFIFFFF)V
+		ARG 0 matrix
+		ARG 1 vertices
+		ARG 2 red
+		ARG 3 green
+		ARG 4 blue
+		ARG 5 alpha
+		ARG 6 y
+		ARG 7 x
+		ARG 8 z
+		ARG 9 u
+		ARG 10 v
 	METHOD method_3543 renderBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FJII[F)V
 		ARG 0 matrices
 		ARG 1 vertexConsumers
diff --git a/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping
new file mode 100644
index 0000000000..9ea51f55ff
--- /dev/null
+++ b/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping
@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_9214 net/minecraft/client/render/block/entity/VaultBlockEntityRenderer
+	FIELD field_48952 itemRenderer Lnet/minecraft/class_918;
+	FIELD field_48953 random Lnet/minecraft/class_5819;
+	METHOD  (Lnet/minecraft/class_5614$class_5615;)V
+		ARG 1 context
+	METHOD method_56851 renderDisplayItem (FLnet/minecraft/class_1937;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_918;FFLnet/minecraft/class_5819;)V
+		ARG 0 tickDelta
+		ARG 1 world
+		ARG 2 matrices
+		ARG 3 vertexConsumers
+		ARG 4 light
+		ARG 5 stack
+		ARG 6 itemRenderer
+		ARG 7 prevRotation
+		ARG 8 rotation
+		ARG 9 random
diff --git a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping
index 790defba6d..a2dd1150c9 100644
--- a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping
@@ -3,3 +3,9 @@ CLASS net/minecraft/class_891 net/minecraft/client/render/entity/DragonFireballE
 	FIELD field_4661 TEXTURE Lnet/minecraft/class_2960;
 	METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFIII)V
 		ARG 0 vertexConsumer
+		ARG 1 matrix
+		ARG 2 light
+		ARG 3 x
+		ARG 4 z
+		ARG 5 textureU
+		ARG 6 textureV
diff --git a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping
index d12a7cff4c..f5864b1117 100644
--- a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping
@@ -3,3 +3,12 @@ CLASS net/minecraft/class_902 net/minecraft/client/render/entity/ExperienceOrbEn
 	FIELD field_4701 TEXTURE Lnet/minecraft/class_2960;
 	METHOD method_23171 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FFIIIFFI)V
 		ARG 0 vertexConsumer
+		ARG 1 matrix
+		ARG 2 x
+		ARG 3 y
+		ARG 4 red
+		ARG 5 green
+		ARG 6 blue
+		ARG 7 u
+		ARG 8 v
+		ARG 9 light
diff --git a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping
index 62ebbd16e3..f156cd98f1 100644
--- a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping
@@ -11,6 +11,12 @@ CLASS net/minecraft/class_906 net/minecraft/client/render/entity/FishingBobberEn
 		ARG 6 segmentEnd
 	METHOD method_23840 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFIII)V
 		ARG 0 buffer
+		ARG 1 matrix
+		ARG 2 light
+		ARG 3 x
+		ARG 4 y
+		ARG 5 u
+		ARG 6 v
 	METHOD method_23954 percentage (II)F
 		ARG 0 value
 		ARG 1 max
diff --git a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping
index 99d112477b..e92420a31e 100644
--- a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping
@@ -8,6 +8,15 @@ CLASS net/minecraft/class_907 net/minecraft/client/render/entity/GuardianEntityR
 		ARG 3 layer
 	METHOD method_23173 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FFFIIIFF)V
 		ARG 0 vertexConsumer
+		ARG 1 matrix
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
+		ARG 5 red
+		ARG 6 green
+		ARG 7 blue
+		ARG 8 u
+		ARG 9 v
 	METHOD method_3979 fromLerpedPosition (Lnet/minecraft/class_1309;DF)Lnet/minecraft/class_243;
 		ARG 1 entity
 		ARG 2 yOffset
diff --git a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping
index af0a2ab5b1..e2532f3deb 100644
--- a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping
@@ -1,3 +1,24 @@
 CLASS net/minecraft/class_916 net/minecraft/client/render/entity/ItemEntityRenderer
 	FIELD field_4725 random Lnet/minecraft/class_5819;
 	FIELD field_4726 itemRenderer Lnet/minecraft/class_918;
+	METHOD method_56855 getRenderedAmount (I)I
+		ARG 0 stackSize
+	METHOD method_56856 getSeed (Lnet/minecraft/class_1799;)I
+		ARG 0 stack
+	METHOD method_56857 renderStack (Lnet/minecraft/class_918;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_5819;Lnet/minecraft/class_1937;)V
+		ARG 0 itemRenderer
+		ARG 1 matrices
+		ARG 2 vertexConsumers
+		ARG 3 light
+		ARG 4 stack
+		ARG 5 random
+		ARG 6 world
+	METHOD method_56858 renderStack (Lnet/minecraft/class_918;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_1087;ZLnet/minecraft/class_5819;)V
+		ARG 0 itemRenderer
+		ARG 1 matrices
+		ARG 2 vertexConsumers
+		ARG 3 light
+		ARG 4 stack
+		ARG 5 model
+		ARG 6 depth
+		ARG 7 random
diff --git a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping
index f5869a3ace..c44905d4b3 100644
--- a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping
@@ -1,5 +1,16 @@
 CLASS net/minecraft/class_928 net/minecraft/client/render/entity/PaintingEntityRenderer
 	METHOD method_23188 vertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFFIIII)V
+		ARG 1 matrix
+		ARG 2 vertexConsumer
+		ARG 3 x
+		ARG 4 y
+		ARG 5 u
+		ARG 6 v
+		ARG 7 z
+		ARG 8 normalX
+		ARG 9 normalY
+		ARG 10 normalZ
+		ARG 11 light
 	METHOD method_4074 renderPainting (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1534;IILnet/minecraft/class_1058;Lnet/minecraft/class_1058;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumer
diff --git a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping
index e220f0a4c2..f7dcbc48f3 100644
--- a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping
@@ -1,2 +1,13 @@
 CLASS net/minecraft/class_876 net/minecraft/client/render/entity/ProjectileEntityRenderer
 	METHOD method_23153 vertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;IIIFFIIII)V
+		ARG 1 matrix
+		ARG 2 vertexConsumer
+		ARG 3 x
+		ARG 4 y
+		ARG 5 z
+		ARG 6 u
+		ARG 7 v
+		ARG 8 normalX
+		ARG 9 normalZ
+		ARG 10 normalY
+		ARG 11 light
diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping
index 66f2820c27..06015ad50d 100644
--- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping
@@ -12,6 +12,11 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
 		ARG 1 matrices
 		ARG 2 vertexConsumers
 		ARG 3 light
+		ARG 4 model
+		ARG 5 red
+		ARG 6 green
+		ARG 7 blue
+		ARG 8 overlay
 	METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1309;Lnet/minecraft/class_1304;ILnet/minecraft/class_572;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
@@ -27,6 +32,7 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
 	METHOD method_4173 usesInnerModel (Lnet/minecraft/class_1304;)Z
 		ARG 1 slot
 	METHOD method_48482 renderTrim (Lnet/minecraft/class_6880;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;Lnet/minecraft/class_572;Z)V
+		ARG 1 armorMaterial
 		ARG 2 matrices
 		ARG 3 vertexConsumers
 		ARG 4 light
diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping
index 9b68dd3a04..f0a61db7c5 100644
--- a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping
@@ -2,3 +2,9 @@ CLASS net/minecraft/class_4506 net/minecraft/client/render/entity/feature/StuckS
 	FIELD field_20529 TEXTURE Lnet/minecraft/class_2960;
 	METHOD method_23295 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FIFFI)V
 		ARG 0 vertexConsumer
+		ARG 1 matrix
+		ARG 2 x
+		ARG 3 y
+		ARG 4 u
+		ARG 5 v
+		ARG 6 light
diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping
index ab5608e83f..7aeba81bfe 100644
--- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping
+++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping
@@ -60,9 +60,13 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack
 	CLASS class_4665 Entry
 		FIELD field_21327 positionMatrix Lorg/joml/Matrix4f;
 		FIELD field_21328 normalMatrix Lorg/joml/Matrix3f;
+		METHOD  (Lnet/minecraft/class_4587$class_4665;)V
+			ARG 1 matrix
 		METHOD  (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)V
+			ARG 1 positionMatrix
 			ARG 2 normalMatrix
 		METHOD method_23761 getPositionMatrix ()Lorg/joml/Matrix4f;
 			COMMENT {@return the matrix used to transform positions}
 		METHOD method_23762 getNormalMatrix ()Lorg/joml/Matrix3f;
 			COMMENT {@return the matrix used to transform normal vectors}
+		METHOD method_56822 copy ()Lnet/minecraft/class_4587$class_4665;
diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping
index eda21d4775..6c9ee91223 100644
--- a/mappings/net/minecraft/client/world/ClientWorld.mapping
+++ b/mappings/net/minecraft/client/world/ClientWorld.mapping
@@ -152,6 +152,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 		ARG 11 useDistance
 		ARG 12 seed
 	METHOD method_47437 putClientsideMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V
+		ARG 1 id
 		ARG 2 state
 	METHOD method_53875 addEntity (Lnet/minecraft/class_1297;)V
 		ARG 1 entity
diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping
index 91ad0cb909..a72ee1dea1 100644
--- a/mappings/net/minecraft/data/DataProvider.mapping
+++ b/mappings/net/minecraft/data/DataProvider.mapping
@@ -15,6 +15,10 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider
 		ARG 0 key
 	METHOD method_53496 writeCodecToPath (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 writer
+		ARG 1 registryLookup
+		ARG 2 codec
+		ARG 3 value
+		ARG 4 path
 	CLASS class_7857 Factory
 		METHOD create (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2405;
 			ARG 1 output
diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping
index bf0cf9412c..16d5d6f6b8 100644
--- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping
+++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping
@@ -572,6 +572,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 	METHOD method_55305 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_8967;)Lnet/minecraft/class_4935;
 		ARG 3 state
 	METHOD method_55306 registerTrialSpawner ()V
+	METHOD method_56886 registerVault ()V
 	CLASS class_4911 BuiltinModelPool
 		FIELD field_22835 modelId Lnet/minecraft/class_2960;
 		METHOD  (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V
diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping
index 72dbe3480e..5935695d01 100644
--- a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping
+++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping
@@ -30,6 +30,7 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator
 	METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_6880;)Lcom/google/gson/JsonObject;
 		ARG 1 id
 		ARG 2 textures
+		ARG 3 armorMaterial
 	METHOD method_48522 (Lnet/minecraft/class_1738;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject;
 		ARG 2 id
 		ARG 3 textures
@@ -45,3 +46,4 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator
 		ARG 3 textures
 	CLASS class_8072 TrimMaterial
 		METHOD method_48744 getAppliedName (Lnet/minecraft/class_6880;)Ljava/lang/String;
+			ARG 1 armorMaterial
diff --git a/mappings/net/minecraft/data/client/TextureMap.mapping b/mappings/net/minecraft/data/client/TextureMap.mapping
index 082ea880ae..46d1f8e4ee 100644
--- a/mappings/net/minecraft/data/client/TextureMap.mapping
+++ b/mappings/net/minecraft/data/client/TextureMap.mapping
@@ -162,3 +162,9 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/TextureMap
 		ARG 0 block
 		ARG 1 side
 		ARG 2 top
+	METHOD method_56887 vault (Lnet/minecraft/class_2248;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_4944;
+		ARG 0 block
+		ARG 1 front
+		ARG 2 side
+		ARG 3 top
+		ARG 4 bottom
diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping
index 9d46f24aa4..b274b202e4 100644
--- a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping
+++ b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping
@@ -6,5 +6,7 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/advancement/Advancement
 		ARG 1 output
 		ARG 2 registryLookupFuture
 		ARG 3 tabGenerators
+	METHOD method_10333 (Ljava/util/Set;Ljava/util/List;Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8779;)V
+		ARG 5 advancement
 	METHOD method_46809 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage;
 		ARG 2 lookup
diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping
index bf752d50a2..1793e7aedd 100644
--- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping
+++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping
@@ -3,10 +3,12 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv
 	FIELD field_11355 LOGGER Lorg/slf4j/Logger;
 	FIELD field_39374 pathResolver Lnet/minecraft/class_7784$class_7489;
 	FIELD field_40617 lootTableIds Ljava/util/Set;
+	FIELD field_48978 registryLookupFuture Ljava/util/concurrent/CompletableFuture;
 	METHOD  (Lnet/minecraft/class_7784;Ljava/util/Set;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V
 		ARG 1 output
 		ARG 2 lootTableIds
 		ARG 3 lootTypeGenerators
+		ARG 4 registryLookupFuture
 	METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 0 name
 		ARG 1 message
@@ -18,4 +20,9 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv
 	METHOD method_10412 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V
 		ARG 3 id
 		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
 	CLASS class_7790 LootTypeGenerator
diff --git a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping
index 9ea2245edc..e9009bf89f 100644
--- a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping
+++ b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping
@@ -1,3 +1,4 @@
 CLASS net/minecraft/class_8903 net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders
 	METHOD method_54653 createOneTwentyOneProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438;
 		ARG 0 output
+		ARG 1 registryLookupFuture
diff --git a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping
index 05e2a647c8..0945a47d81 100644
--- a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping
+++ b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping
@@ -1,3 +1,4 @@
 CLASS net/minecraft/class_8795 net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders
 	METHOD method_53853 createTradeRebalanceProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438;
 		ARG 0 output
+		ARG 1 registryLookupFuture
diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping
index e4fa640edb..476c378229 100644
--- a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping
+++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping
@@ -1,3 +1,4 @@
 CLASS net/minecraft/class_7794 net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders
 	METHOD method_46184 createVanillaProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438;
 		ARG 0 output
+		ARG 1 registryLookupFuture
diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping
index b30d728673..f48ac49a14 100644
--- a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping
+++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping
@@ -2,8 +2,10 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider
 	FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map;
 	FIELD field_39378 recipesPathResolver Lnet/minecraft/class_7784$class_7489;
 	FIELD field_39379 advancementsPathResolver Lnet/minecraft/class_7784$class_7489;
+	FIELD field_48981 registryLookupFuture Ljava/util/concurrent/CompletableFuture;
 	METHOD  (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
 		ARG 1 output
+		ARG 2 registryLookupFuture
 	METHOD method_10419 generate (Lnet/minecraft/class_8790;)V
 		ARG 1 exporter
 	METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_175;
@@ -337,6 +339,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider
 		ARG 2 input
 	METHOD method_46206 saveRecipeAdvancement (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8779;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 cache
+		ARG 2 registryLookup
+		ARG 3 advancement
 	METHOD method_46207 generateFamilies (Lnet/minecraft/class_8790;Lnet/minecraft/class_7699;)V
 		ARG 0 exporter
 		ARG 1 enabledFeatures
@@ -402,3 +406,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider
 		ARG 0 exporter
 		ARG 1 output
 		ARG 2 input
+	METHOD method_56888 run (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 writer
+		ARG 2 registryLookup
+	METHOD method_56889 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage;
+		ARG 2 registryLookup
diff --git a/mappings/net/minecraft/datafixer/fix/HorseArmorFix.mapping b/mappings/net/minecraft/datafixer/fix/HorseArmorFix.mapping
new file mode 100644
index 0000000000..4c92fda64b
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/fix/HorseArmorFix.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9183 net/minecraft/datafixer/fix/HorseArmorFix
+	FIELD field_48805 oldNbtKey Ljava/lang/String;
+	METHOD  (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V
+		ARG 1 outputSchema
+		ARG 2 entityId
+		ARG 3 oldNbtKey
diff --git a/mappings/net/minecraft/datafixer/fix/HorseChestIndexingFix.mapping b/mappings/net/minecraft/datafixer/fix/HorseChestIndexingFix.mapping
new file mode 100644
index 0000000000..d768965c34
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/fix/HorseChestIndexingFix.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_9182 net/minecraft/datafixer/fix/HorseChestIndexingFix
+	METHOD  (Lcom/mojang/datafixers/schemas/Schema;)V
+		ARG 1 outputSchema
+	METHOD method_56633 fixIndexing (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Ljava/lang/String;)Lcom/mojang/datafixers/TypeRewriteRule;
+		ARG 3 entityId
diff --git a/mappings/net/minecraft/datafixer/schema/Schema3807.mapping b/mappings/net/minecraft/datafixer/schema/Schema3807.mapping
new file mode 100644
index 0000000000..7295bb923b
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/schema/Schema3807.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9184 net/minecraft/datafixer/schema/Schema3807
diff --git a/mappings/net/minecraft/datafixer/schema/Schema3808.mapping b/mappings/net/minecraft/datafixer/schema/Schema3808.mapping
new file mode 100644
index 0000000000..67a6542b5d
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/schema/Schema3808.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9185 net/minecraft/datafixer/schema/Schema3808
diff --git a/mappings/net/minecraft/datafixer/schema/Schema3808_1.mapping b/mappings/net/minecraft/datafixer/schema/Schema3808_1.mapping
new file mode 100644
index 0000000000..44ebcd4d7d
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/schema/Schema3808_1.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9186 net/minecraft/datafixer/schema/Schema3808_1
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 0c771c83de..1f14f4edf5 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -1240,6 +1240,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT Sets the custom name of the entity to {@code name} (or {@code null} to
 		COMMENT remove the custom name).
 		ARG 1 name
+	METHOD method_56673 getRegistryManager ()Lnet/minecraft/class_5455;
 	METHOD method_5668 getRootVehicle ()Lnet/minecraft/class_1297;
 		COMMENT {@return the lowest entity this entity is riding}
 		COMMENT
diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping
index 469e601773..400b4de5fc 100644
--- a/mappings/net/minecraft/entity/EntityType.mapping
+++ b/mappings/net/minecraft/entity/EntityType.mapping
@@ -120,6 +120,11 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		ARG 3 boundingBox
 	METHOD method_5888 create (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297;
 		ARG 1 world
+		ARG 2 afterConsumer
+		ARG 3 pos
+		ARG 4 reason
+		ARG 5 alignPosition
+		ARG 6 invertY
 	METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960;
 		ARG 0 type
 	METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311;
@@ -144,6 +149,11 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		ARG 0 id
 	METHOD method_5899 spawn (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297;
 		ARG 1 world
+		ARG 2 afterConsumer
+		ARG 3 pos
+		ARG 4 reason
+		ARG 5 alignPosition
+		ARG 6 invertY
 	CLASS 1
 		METHOD method_31490 (Lnet/minecraft/class_1937;Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V
 			ARG 2 nbt
diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping
index e051af3a08..e591a3a21c 100644
--- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping
+++ b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping
@@ -11,6 +11,8 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity
 		ARG 4 y
 		ARG 6 z
 	METHOD method_16933 setItem (Lnet/minecraft/class_1799;)V
+		ARG 1 stack
+	METHOD method_56684 getItem ()Lnet/minecraft/class_1799;
 	METHOD method_7478 initTargetPos (Lnet/minecraft/class_2338;)V
 		COMMENT Sets where the eye will fly towards.
 		COMMENT If close enough, it will fly directly towards it, otherwise, it will fly upwards, in the direction of the BlockPos.
diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping
index f92bc766f7..536de073bb 100644
--- a/mappings/net/minecraft/entity/ItemEntity.mapping
+++ b/mappings/net/minecraft/entity/ItemEntity.mapping
@@ -44,6 +44,8 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity
 		ARG 1 stack1
 		ARG 2 stack2
 	METHOD method_24017 canMerge (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
+		ARG 0 stack1
+		ARG 1 stack2
 	METHOD method_24018 merge (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1799;
 		ARG 0 stack1
 		ARG 1 stack2
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index a8e0e03b81..fe1389fa08 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -369,7 +369,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_56079 getSlotForHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1304;
 		ARG 0 hand
 	METHOD method_5661 getArmorItems ()Ljava/lang/Iterable;
+	METHOD method_56674 getAllArmorItems ()Ljava/lang/Iterable;
+	METHOD method_56675 getEquippedItems ()Ljava/lang/Iterable;
 	METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
+		ARG 1 slot
+		ARG 2 stack
 	METHOD method_5877 getHandItems ()Ljava/lang/Iterable;
 	METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z
 		ARG 1 type
diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping
index 1628ede296..ef15fb12e9 100644
--- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping
+++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping
@@ -33,6 +33,7 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity
 		ARG 1 entity
 		ARG 2 alwaysDrop
 	METHOD method_6937 removeFromFrame (Lnet/minecraft/class_1799;)V
+		ARG 1 stack
 	METHOD method_6938 getComparatorPower ()I
 	METHOD method_6939 setRotation (I)V
 		ARG 1 value
diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
index 01d1be6124..f3d9260c3d 100644
--- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
+++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
@@ -7,6 +7,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		COMMENT after short-duration high-amplifier effects run out.
 	FIELD field_42106 INFINITE I
 	FIELD field_47739 fading Lnet/minecraft/class_1293$class_9063;
+	FIELD field_48821 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_5889 showIcon Z
 	FIELD field_5890 showParticles Z
 	FIELD field_5892 ambient Z
@@ -46,6 +47,9 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		ARG 5 showParticles
 		ARG 6 showIcon
 		ARG 7 hiddenEffect
+	METHOD  (Lnet/minecraft/class_6880;Lnet/minecraft/class_1293$class_9195;)V
+		ARG 1 effect
+		ARG 2 parameters
 	METHOD compareTo (Ljava/lang/Object;)I
 		ARG 1 that
 	METHOD equals (Ljava/lang/Object;)Z
@@ -97,6 +101,11 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		ARG 1 that
 	METHOD method_5591 isAmbient ()Z
 	METHOD method_5592 shouldShowIcon ()Z
+	METHOD method_56666 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD method_56667 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1293$class_9195;)Lnet/minecraft/class_1293;
+		ARG 1 parametersx
+	METHOD method_56668 asParameters ()Lnet/minecraft/class_1293$class_9195;
 	CLASS class_9063 Fading
 		COMMENT Computes the factor (multiplier) for effect fade-in and fade-out.
 		COMMENT
@@ -122,3 +131,17 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 			ARG 0 effect
 		METHOD method_55663 getFadeTicks (Lnet/minecraft/class_1293;)I
 			ARG 0 effect
+	CLASS class_9195 Parameters
+		FIELD field_48822 CODEC Lcom/mojang/serialization/MapCodec;
+		FIELD field_48823 AMPLIFIER_CODEC Lcom/mojang/serialization/Codec;
+		METHOD method_56669 create (IIZZLjava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_1293$class_9195;
+			ARG 0 amplifier
+			ARG 1 duration
+			ARG 2 ambient
+			ARG 3 showParticles
+			ARG 4 showIcon
+			ARG 5 hiddenEffect
+		METHOD method_56670 (Lnet/minecraft/class_1293$class_9195;)Ljava/util/Optional;
+			ARG 0 parameters
+		METHOD method_56672 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+			ARG 1 instance
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index 6c18a6cd7d..922ca8eb84 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -29,6 +29,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	FIELD field_34043 DEFAULT_DROP_CHANCE F
 	FIELD field_38386 ITEM_PICK_UP_RANGE_EXPANDER Lnet/minecraft/class_2382;
 	FIELD field_45969 ATTACK_RANGE D
+	FIELD field_48828 bodyArmorDropChance F
+	FIELD field_48829 bodyArmor Lnet/minecraft/class_1799;
 	FIELD field_6184 lootTableSeed J
 	FIELD field_6185 targetSelector Lnet/minecraft/class_1355;
 		COMMENT Contains goals used to select this entity's target.
@@ -150,6 +152,10 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 		COMMENT @see LivingEntity#getHitbox
 	METHOD method_55695 stopMovement ()V
 	METHOD method_56080 clampHeadYaw ()V
+	METHOD method_56676 getBodyArmor ()Lnet/minecraft/class_1799;
+	METHOD method_56677 isWearingBodyArmor ()Z
+	METHOD method_56678 equipBodyArmor (Lnet/minecraft/class_1799;)V
+		ARG 1 stack
 	METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
 		ARG 1 slot
 	METHOD method_5930 setForwardSpeed (F)V
@@ -274,5 +280,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	METHOD method_6510 isAttacking ()Z
 	METHOD method_6735 hasArmorSlot ()Z
 	METHOD method_6773 isHorseArmor (Lnet/minecraft/class_1799;)Z
+		ARG 1 stack
 	METHOD method_7217 setBaby (Z)V
 		ARG 1 baby
diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
index d65c27a96c..715f426659 100644
--- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
@@ -9,6 +9,7 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
 	FIELD field_7422 conversionTimer I
 	FIELD field_7423 CONVERTING Lnet/minecraft/class_2940;
 	METHOD method_16916 setOfferData (Lnet/minecraft/class_1916;)V
+		ARG 1 offerData
 	METHOD method_19622 setXp (I)V
 		ARG 1 xp
 	METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V
diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
index 7e5ea42b8b..af724be1d3 100644
--- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
@@ -14,6 +14,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 	FIELD field_42644 MAX_JUMP_STRENGTH_BONUS F
 	FIELD field_42645 MIN_HEALTH_BONUS F
 	FIELD field_42646 MAX_HEALTH_BONUS F
+	FIELD field_48830 inventory Lnet/minecraft/class_1263;
 	FIELD field_6955 temper I
 	FIELD field_6956 IS_BRED_HORSE Ljava/util/function/Predicate;
 	FIELD field_6957 tailWagTicks I
@@ -72,6 +73,8 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 		ARG 1 controllingPassenger
 	METHOD method_49996 isWooden (Lnet/minecraft/class_2498;)Z
 		ARG 1 soundGroup
+	METHOD method_56679 updateSaddledFlag ()V
+	METHOD method_56680 getInventory ()Lnet/minecraft/class_1263;
 	METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V
 		ARG 1 random
 	METHOD method_6721 onChestedStatusChanged ()V
diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping
index 5a6bd97025..e52f1be203 100644
--- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping
+++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping
@@ -80,6 +80,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory
 		ARG 1 nbtList
 	METHOD method_7385 addStack (ILnet/minecraft/class_1799;)I
 		ARG 1 slot
+		ARG 2 stack
 	METHOD method_7386 getSwappableHotbarSlot ()I
 	METHOD method_7387 populateRecipeFinder (Lnet/minecraft/class_1662;)V
 		ARG 1 finder
diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping
index 9280417934..737373f090 100644
--- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping
@@ -1,3 +1,5 @@
 CLASS net/minecraft/class_3855 net/minecraft/entity/projectile/AbstractFireballEntity
 	FIELD field_17081 ITEM Lnet/minecraft/class_2940;
 	METHOD method_16936 setItem (Lnet/minecraft/class_1799;)V
+		ARG 1 stack
+	METHOD method_56685 getItem ()Lnet/minecraft/class_1799;
diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping
index d9ffd0451f..96c3854977 100644
--- a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_3857 net/minecraft/entity/projectile/thrown/ThrownItemEntity
 	FIELD field_17082 ITEM Lnet/minecraft/class_2940;
 	METHOD method_16940 setItem (Lnet/minecraft/class_1799;)V
+		ARG 1 stack
 	METHOD method_16942 getDefaultItem ()Lnet/minecraft/class_1792;
diff --git a/mappings/net/minecraft/inventory/SingleStackInventory.mapping b/mappings/net/minecraft/inventory/SingleStackInventory.mapping
index 02203de652..346c1d899b 100644
--- a/mappings/net/minecraft/inventory/SingleStackInventory.mapping
+++ b/mappings/net/minecraft/inventory/SingleStackInventory.mapping
@@ -6,3 +6,5 @@ CLASS net/minecraft/class_8181 net/minecraft/inventory/SingleStackInventory
 		ARG 1 count
 	METHOD method_54079 getStack ()Lnet/minecraft/class_1799;
 	METHOD method_54099 emptyStack ()Lnet/minecraft/class_1799;
+	CLASS class_9210 SingleStackBlockEntityInventory
+		METHOD method_54080 asBlockEntity ()Lnet/minecraft/class_2586;
diff --git a/mappings/net/minecraft/item/DyeableItem.mapping b/mappings/net/minecraft/item/DyeableItem.mapping
index 28e4f43ad0..7136144b63 100644
--- a/mappings/net/minecraft/item/DyeableItem.mapping
+++ b/mappings/net/minecraft/item/DyeableItem.mapping
@@ -6,6 +6,11 @@ CLASS net/minecraft/class_1768 net/minecraft/item/DyeableItem
 		ARG 0 stack
 		ARG 1 colors
 	METHOD method_7798 removeColor (Lnet/minecraft/class_1799;)V
+		ARG 0 stack
 	METHOD method_7799 setColor (Lnet/minecraft/class_1799;I)V
+		ARG 0 stack
+		ARG 1 color
 	METHOD method_7800 getColor (Lnet/minecraft/class_1799;)I
+		ARG 0 stack
 	METHOD method_7801 hasColor (Lnet/minecraft/class_1799;)Z
+		ARG 0 stack
diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping
index 3500515c03..6cc7322de0 100644
--- a/mappings/net/minecraft/item/FilledMapItem.mapping
+++ b/mappings/net/minecraft/item/FilledMapItem.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
 		ARG 1 stack
 	METHOD method_32348 setMapId (Lnet/minecraft/class_1799;Lnet/minecraft/class_9209;)V
 		ARG 0 stack
+		ARG 1 id
 	METHOD method_32349 allocateMapId (Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)Lnet/minecraft/class_9209;
 		ARG 0 world
 		ARG 1 x
@@ -21,6 +22,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
 		ARG 1 x
 		ARG 2 z
 	METHOD method_53836 getIdText (Lnet/minecraft/class_9209;)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;
@@ -32,6 +34,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem
 		ARG 1 world
 		ARG 2 amount
 	METHOD method_7997 getMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22;
+		ARG 0 id
 		ARG 1 world
 	METHOD method_7998 updateColors (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_22;)V
 		ARG 1 world
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
index 2051c4935a..66f615ad87 100644
--- a/mappings/net/minecraft/item/ItemStack.mapping
+++ b/mappings/net/minecraft/item/ItemStack.mapping
@@ -200,7 +200,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 3 clickType
 		ARG 4 player
 		ARG 5 cursorStackReference
-	METHOD method_31577 canCombine (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
+	METHOD method_31577 areItemsAndNbtEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
 		COMMENT {@return whether the given item stacks' items and NBT are equal}
 		COMMENT
 		COMMENT 
    If this returns {@code true}, the two item stacks can be combined into one,
@@ -239,7 +239,14 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 	METHOD method_45435 isItemEnabled (Lnet/minecraft/class_7699;)Z
 		ARG 1 enabledFeatures
 	METHOD method_46651 copyWithCount (I)Lnet/minecraft/class_1799;
+		COMMENT {@return a copy of this item stack, including the NBT, and {@linkplain #getBobbingAnimationTime bobbing animation time}},
+		COMMENT with the item count set to {@code count}
+		COMMENT
+		COMMENT @see #copy
+		COMMENT @see #copyNbtToNewStack
+		COMMENT @see #copyNbtToNewStackIgnoreEmpty
 		ARG 1 count
+			COMMENT the item count of the resultant stack
 	METHOD method_51164 copyAndEmpty ()Lnet/minecraft/class_1799;
 	METHOD method_53187 itemMatches (Lnet/minecraft/class_6885;)Z
 		ARG 1 registryEntryList
@@ -267,6 +274,32 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		COMMENT @see #isDamaged
 		COMMENT @see #getDamage
 		COMMENT @see #isDamageable
+	METHOD method_56700 (Lnet/minecraft/class_1799;)Ljava/util/Optional;
+		ARG 0 stack
+	METHOD method_56701 copyNbtToNewStack (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_1799;
+		COMMENT {@return a new item stack with the NBT copied from this item stack}
+		COMMENT
+		COMMENT @see #copy
+		COMMENT @see #copyWithCount
+		COMMENT @see #copyNbtToNewStackIgnoreEmpty
+		ARG 1 item
+			COMMENT the item of the resultant stack
+		ARG 2 count
+			COMMENT the item count of the resultant stack
+	METHOD method_56702 createOptionalCodec (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec;
+		ARG 0 fieldName
+	METHOD method_56703 (Ljava/util/Optional;)Lnet/minecraft/class_1799;
+		ARG 0 optional
+	METHOD method_56704 copyNbtToNewStackIgnoreEmpty (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_1799;
+		COMMENT {@return a new item stack with the NBT copied from this item stack, even if this stack is empty}
+		COMMENT
+		COMMENT @see #copy
+		COMMENT @see #copyWithCount
+		COMMENT @see #copyNbtToNewStack
+		ARG 1 item
+			COMMENT the item of the resultant stack
+		ARG 2 count
+			COMMENT the item count of the resultant stack
 	METHOD method_7909 getItem ()Lnet/minecraft/class_1792;
 		COMMENT {@return the item of this stack}
 		COMMENT
@@ -557,11 +590,15 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 	METHOD method_7972 copy ()Lnet/minecraft/class_1799;
 		COMMENT {@return a copy of this item stack, including the item count, NBT, and
 		COMMENT {@linkplain #getBobbingAnimationTime bobbing animation time}}
+		COMMENT
+		COMMENT @see #copyWithCount
+		COMMENT @see #copyNbtToNewStack
+		COMMENT @see #copyNbtToNewStackIgnoreEmpty
 	METHOD method_7973 areEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
 		COMMENT {@return whether the given item stacks are equal, including the item count and NBT}
 		COMMENT
 		COMMENT @see #areItemsEqual
-		COMMENT @see #canCombine
+		COMMENT @see #areItemsAndNbtEqual
 		ARG 0 left
 		ARG 1 right
 	METHOD method_7974 setDamage (I)V
@@ -615,6 +652,10 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		COMMENT @see Item Stack NBT Operations
 		ARG 1 key
 	METHOD method_7984 areItemsEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
+		COMMENT {@return whether the given item stacks contain the same item, regardless of item count or NBT}
+		COMMENT
+		COMMENT @see #areEqual
+		COMMENT @see #areItemsAndNbtEqual
 		ARG 0 left
 		ARG 1 right
 	METHOD method_7985 hasNbt ()Z
diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping
index 7bfbb1cb43..d3def763a6 100644
--- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping
+++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping
@@ -5,6 +5,8 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker
 	FIELD comp_2312 pos Lnet/minecraft/class_2338;
 	FIELD comp_2313 color Lnet/minecraft/class_1767;
 	FIELD comp_2314 name Ljava/util/Optional;
+	FIELD field_48918 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_48919 LIST_CODEC Lcom/mojang/serialization/Codec;
 	METHOD  (Lnet/minecraft/class_2338;Lnet/minecraft/class_1767;Ljava/util/Optional;)V
 		ARG 1 pos
 		ARG 2 dyeColor
@@ -13,6 +15,8 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker
 	METHOD comp_2314 name ()Ljava/util/Optional;
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
+	METHOD method_56812 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
 	METHOD method_71 getKey ()Ljava/lang/String;
 	METHOD method_72 getIconType ()Lnet/minecraft/class_20$class_21;
 	METHOD method_73 fromWorldBlock (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_17;
diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping
index 5bab715fd3..27bd7cc5b8 100644
--- a/mappings/net/minecraft/item/map/MapIcon.mapping
+++ b/mappings/net/minecraft/item/map/MapIcon.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon
 	FIELD comp_1844 z B
 	FIELD comp_1845 rotation B
 	FIELD comp_1846 text Ljava/util/Optional;
+	FIELD field_48920 CODEC Lnet/minecraft/class_9139;
 	METHOD  (Lnet/minecraft/class_20$class_21;BBBLjava/util/Optional;)V
 		ARG 1 type
 		ARG 2 x
@@ -24,10 +25,26 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon
 		FIELD field_45788 CODEC Lcom/mojang/serialization/Codec;
 		FIELD field_45789 name Ljava/lang/String;
 		FIELD field_46184 structure Z
+		FIELD field_48921 INDEX_TO_TYPE Ljava/util/function/IntFunction;
+		FIELD field_48922 PACKET_CODEC Lnet/minecraft/class_9139;
+		FIELD field_48923 index I
 		FIELD field_81 id B
 		FIELD field_82 tintColor I
+		METHOD  (Ljava/lang/String;IILjava/lang/String;ZIZZ)V
+			ARG 3 index
+			ARG 4 name
+			ARG 5 alwaysRender
+			ARG 6 tintColor
+			ARG 7 useIconCountLimit
+			ARG 8 structure
+		METHOD  (Ljava/lang/String;IILjava/lang/String;ZZ)V
+			ARG 3 index
+			ARG 4 name
+			ARG 5 alwaysRender
+			ARG 6 useIconCountLimit
 		METHOD method_37342 shouldUseIconCountLimit ()Z
 		METHOD method_53841 isStructure ()Z
+		METHOD method_56813 getIndex ()I
 		METHOD method_95 isAlwaysRendered ()Z
 		METHOD method_96 getTintColor ()I
 		METHOD method_97 hasTintColor ()Z
diff --git a/mappings/net/minecraft/item/map/MapId.mapping b/mappings/net/minecraft/item/map/MapId.mapping
new file mode 100644
index 0000000000..18f73977c5
--- /dev/null
+++ b/mappings/net/minecraft/item/map/MapId.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_9209 net/minecraft/item/map/MapId
+	FIELD field_48924 CODEC Lnet/minecraft/class_9139;
+	METHOD method_56814 asString ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping
index 8baa80bc33..4b700adc0a 100644
--- a/mappings/net/minecraft/item/map/MapState.mapping
+++ b/mappings/net/minecraft/item/map/MapState.mapping
@@ -34,6 +34,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 		ARG 6 locked
 		ARG 7 dimension
 	METHOD method_100 getPlayerMarkerPacket (Lnet/minecraft/class_9209;Lnet/minecraft/class_1657;)Lnet/minecraft/class_2596;
+		ARG 1 mapId
 		ARG 2 player
 	METHOD method_101 getPlayerSyncData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_22$class_23;
 		ARG 1 player
@@ -109,6 +110,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 		ARG 3 color
 	METHOD method_32371 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_22;
 		ARG 0 nbt
+		ARG 1 registryLookup
 	METHOD method_32372 hasMonumentIcon ()Z
 	METHOD method_32373 getIcons ()Ljava/lang/Iterable;
 	METHOD method_32374 markIconsDirty ()V
@@ -135,6 +137,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 			ARG 1 startX
 			ARG 2 startZ
 		METHOD method_112 getPacket (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2596;
+			ARG 1 mapId
 		METHOD method_32375 getMapUpdateData ()Lnet/minecraft/class_22$class_5637;
 		METHOD method_32379 markIconsDirty ()V
 	CLASS class_5637 UpdateData
@@ -143,6 +146,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 		FIELD comp_2318 width I
 		FIELD comp_2319 height I
 		FIELD comp_2320 colors [B
+		FIELD field_48925 CODEC Lnet/minecraft/class_9139;
 		METHOD  (IIII[B)V
 			ARG 1 startX
 			ARG 2 startZ
@@ -156,3 +160,8 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 		METHOD comp_2320 colors ()[B
 		METHOD method_32380 setColorsTo (Lnet/minecraft/class_22;)V
 			ARG 1 mapState
+		METHOD method_56816 decode (Lio/netty/buffer/ByteBuf;)Ljava/util/Optional;
+			ARG 0 buf
+		METHOD method_56817 encode (Lio/netty/buffer/ByteBuf;Ljava/util/Optional;)V
+			ARG 0 buf
+			ARG 1 updateData
diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping
index c584a82b7e..42fd967746 100644
--- a/mappings/net/minecraft/item/trim/ArmorTrim.mapping
+++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping
@@ -33,10 +33,17 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim
 	METHOD method_48430 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 		ARG 1 path
 	METHOD method_48431 getMaterial ()Lnet/minecraft/class_6880;
+	METHOD method_48432 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
+		ARG 2 armorMaterial
 	METHOD method_48433 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 		ARG 1 path
 	METHOD method_48434 getLeggingsModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
+		ARG 1 armorMaterial
+	METHOD method_48435 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
+		ARG 2 armorMaterial
 	METHOD method_48436 getGenericModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
+		ARG 1 armorMaterial
 	METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;)Ljava/lang/String;
+		ARG 1 armorMaterial
 	METHOD method_52565 (ZLjava/lang/String;)V
 		ARG 1 error
diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping
index a286aa3aab..4da37efee6 100644
--- a/mappings/net/minecraft/loot/LootDataType.mapping
+++ b/mappings/net/minecraft/loot/LootDataType.mapping
@@ -9,6 +9,8 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType
 		ARG 3 validator
 	METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/util/Optional;
 		ARG 1 id
+		ARG 2 ops
+		ARG 3 json
 	METHOD method_51207 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_46;)V
 		ARG 0 reporter
 		ARG 1 key
diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping
index 99167bf6d6..2d9133f763 100644
--- a/mappings/net/minecraft/loot/LootManager.mapping
+++ b/mappings/net/minecraft/loot/LootManager.mapping
@@ -3,9 +3,14 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager
 	FIELD field_44492 keyToValue Ljava/util/Map;
 	FIELD field_44493 typeToIds Lcom/google/common/collect/Multimap;
 	FIELD field_45793 GSON Lcom/google/gson/Gson;
+	FIELD field_48927 registryLookup Lnet/minecraft/class_7225$class_7874;
 	FIELD field_975 LOGGER Lorg/slf4j/Logger;
+	METHOD  (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
 	METHOD method_20712 validate (Ljava/util/Map;)V
 		ARG 1 lootData
+	METHOD method_51190 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;Lnet/minecraft/class_8490;)Ljava/util/concurrent/CompletableFuture;
+		ARG 4 type
 	METHOD method_51191 (Lcom/google/common/collect/ImmutableMap$Builder;Lcom/google/common/collect/ImmutableMultimap$Builder;Lnet/minecraft/class_8490;Ljava/util/Map;)V
 		ARG 2 type
 		ARG 3 idToValue
@@ -16,6 +21,12 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager
 		ARG 1 type
 	METHOD method_51194 load (Lnet/minecraft/class_8490;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 type
+		ARG 1 registryLookup
+		ARG 2 resourceManager
+		ARG 3 executor
+	METHOD method_51195 (Lnet/minecraft/class_8490;Lnet/minecraft/class_6903;Ljava/util/Map;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V
+		ARG 3 id
+		ARG 4 json
 	METHOD method_51196 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V
 		ARG 0 reporter
 		ARG 1 key
diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping
index 5679482972..3f405476de 100644
--- a/mappings/net/minecraft/network/PacketByteBuf.mapping
+++ b/mappings/net/minecraft/network/PacketByteBuf.mapping
@@ -846,6 +846,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT the value is not null.
 		COMMENT
 		COMMENT @see #readNullable(PacketByteBuf.PacketReader)
+		ARG 1 value
 		ARG 2 writer
 	METHOD method_43827 readNullable (Lnet/minecraft/class_9141;)Ljava/lang/Object;
 		COMMENT Reads a nullable value from this buf. A nullable value is represented by
@@ -1073,6 +1074,21 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		ARG 0 buf
 	METHOD method_56345 readNbt (Lio/netty/buffer/ByteBuf;)Lnet/minecraft/class_2487;
 		ARG 0 buf
+	METHOD method_56890 readByteArray (Lio/netty/buffer/ByteBuf;)[B
+		ARG 0 buf
+	METHOD method_56891 readByteArray (Lio/netty/buffer/ByteBuf;I)[B
+		ARG 0 buf
+		ARG 1 maxSize
+	METHOD method_56892 writeNullable (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;Lnet/minecraft/class_9142;)V
+		ARG 0 buf
+		ARG 1 value
+		ARG 2 writer
+	METHOD method_56893 readNullable (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9141;)Ljava/lang/Object;
+		ARG 0 buf
+		ARG 1 reader
+	METHOD method_56894 writeByteArray (Lio/netty/buffer/ByteBuf;[B)V
+		ARG 0 buf
+		ARG 1 array
 	METHOD nioBuffer (II)Ljava/nio/ByteBuffer;
 		ARG 1 index
 		ARG 2 length
diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping
index d227d0ed66..23e28f635a 100644
--- a/mappings/net/minecraft/network/codec/PacketCodec.mapping
+++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping
@@ -126,6 +126,30 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec
 			COMMENT a function that, given a value, returns its "type"
 		ARG 2 codec
 			COMMENT a function that, given a "type", returns the codec for encoding/decoding the value
+	METHOD method_56905 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;)Lnet/minecraft/class_9139;
+		COMMENT {@return a codec for encoding four values}
+		ARG 0 codec1
+		ARG 1 from1
+		ARG 2 codec2
+		ARG 3 from2
+		ARG 4 codec3
+		ARG 5 from3
+		ARG 6 codec4
+		ARG 7 from4
+		ARG 8 to
+	METHOD method_56906 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function5;)Lnet/minecraft/class_9139;
+		COMMENT {@return a codec for encoding five values}
+		ARG 0 codec1
+		ARG 1 from1
+		ARG 2 codec2
+		ARG 3 from2
+		ARG 4 codec3
+		ARG 5 from3
+		ARG 6 codec4
+		ARG 7 from4
+		ARG 8 codec5
+		ARG 9 from5
+		ARG 10 to
 	CLASS class_9140 ResultFunction
 		METHOD apply (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139;
 			ARG 1 codec
diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
index eb167eb5e2..51db7a421c 100644
--- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping
+++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
@@ -215,6 +215,10 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		ARG 1 codec
 	METHOD method_56385 (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139;
 		ARG 0 codec
+	METHOD method_56895 byteArray (I)Lnet/minecraft/class_9139;
+		ARG 0 maxLength
+	METHOD method_56896 registryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139;
+		ARG 0 codec
 	CLASS 10
 		METHOD method_56419 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V
 			ARG 3 k
@@ -226,3 +230,9 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		FIELD field_48562 DIRECT_ENTRY_MARKER I
 		METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359;
 			ARG 1 buf
+	CLASS 21
+		METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B
+			ARG 1 buf
+		METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V
+			ARG 1 buf
+			ARG 2 value
diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
index 6117196c2c..1c9e64df34 100644
--- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
+++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
@@ -215,3 +215,5 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi
 		ARG 1 packet
 	METHOD method_55450 onScoreboardScoreReset (Lnet/minecraft/class_9006;)V
 		ARG 1 packet
+	METHOD method_56607 onDebugSample (Lnet/minecraft/class_9178;)V
+		ARG 1 packet
diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping
index ba36318e4f..8e0452e812 100644
--- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping
+++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping
@@ -92,3 +92,5 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi
 		ARG 1 packet
 	METHOD method_54436 onSlotChangedState (Lnet/minecraft/class_8875;)V
 		ARG 1 packet
+	METHOD method_56619 onDebugSampleSubcription (Lnet/minecraft/class_9179;)V
+		ARG 1 packet
diff --git a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping
index e6fda73720..396c6a9959 100644
--- a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping
+++ b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping
@@ -1,11 +1,5 @@
 CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket
-	FIELD comp_2285 slot I
-	FIELD comp_2286 pages Ljava/util/List;
-	FIELD comp_2287 title Ljava/util/Optional;
 	FIELD field_34039 MAX_TITLE_LENGTH I
 	FIELD field_34040 MAX_PAGE_LENGTH I
 	FIELD field_34046 MAX_PAGES I
 	FIELD field_48193 CODEC Lnet/minecraft/class_9139;
-	METHOD comp_2285 slot ()I
-	METHOD comp_2286 pages ()Ljava/util/List;
-	METHOD comp_2287 title ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/network/packet/c2s/play/DebugSampleSubscriptionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/DebugSampleSubscriptionC2SPacket.mapping
new file mode 100644
index 0000000000..214ed689a1
--- /dev/null
+++ b/mappings/net/minecraft/network/packet/c2s/play/DebugSampleSubscriptionC2SPacket.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9179 net/minecraft/network/packet/c2s/play/DebugSampleSubscriptionC2SPacket
+	FIELD field_48784 CODEC Lnet/minecraft/class_9139;
+	METHOD  (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
+	METHOD method_56621 write (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping
index 8f2f0a84a8..703a6cf9b0 100644
--- a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping
@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_2661 net/minecraft/network/packet/s2c/common/DisconnectS2CPacket
-	FIELD comp_2325 reason Lnet/minecraft/class_2561;
 	FIELD field_48622 CODEC Lnet/minecraft/class_9139;
-	METHOD comp_2325 reason ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping
index fc34c4d1f3..e70a5c5ff8 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping
@@ -14,3 +14,4 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntity
 		ARG 0 blockEntity
 	METHOD method_39026 create (Lnet/minecraft/class_2586;Ljava/util/function/BiFunction;)Lnet/minecraft/class_2622;
 		ARG 0 blockEntity
+		ARG 1 nbtGetter
diff --git a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping
index 2c8ec63794..294229efec 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping
@@ -9,6 +9,8 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 	METHOD  (Ljava/util/UUID;Lnet/minecraft/class_2629$class_5882;)V
 		ARG 1 uuid
 		ARG 2 action
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD method_34089 add (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629;
 		ARG 0 bar
 	METHOD method_34090 remove (Ljava/util/UUID;)Lnet/minecraft/class_2629;
@@ -28,6 +30,7 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 	METHOD method_34098 updateProperties (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629;
 		ARG 0 bar
 	METHOD method_55861 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	CLASS class_5880 AddAction
 		FIELD field_29100 name Lnet/minecraft/class_2561;
 		FIELD field_29101 percent F
@@ -38,6 +41,8 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 		FIELD field_29106 thickenFog Z
 		METHOD  (Lnet/minecraft/class_1259;)V
 			ARG 1 bar
+		METHOD  (Lnet/minecraft/class_9129;)V
+			ARG 1 buf
 	CLASS class_5881 Consumer
 		METHOD method_34099 remove (Ljava/util/UUID;)V
 			ARG 1 uuid
@@ -71,22 +76,29 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 			ARG 1 uuid
 			ARG 2 consumer
 		METHOD method_34107 toPacket (Lnet/minecraft/class_9129;)V
+			ARG 1 buf
 	CLASS class_5883 Type
 		FIELD field_29113 parser Lnet/minecraft/class_9141;
+		METHOD  (Ljava/lang/String;ILnet/minecraft/class_9141;)V
+			ARG 3 parser
+		METHOD method_34113 (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2629$class_5882;
+			ARG 0 buf
 	CLASS class_5884 UpdateNameAction
-		FIELD comp_2260 name Lnet/minecraft/class_2561;
 		METHOD  (Lnet/minecraft/class_2561;)V
 			ARG 1 name
-		METHOD comp_2260 name ()Lnet/minecraft/class_2561;
+		METHOD  (Lnet/minecraft/class_9129;)V
+			ARG 1 buf
 	CLASS class_5885 UpdateProgressAction
-		FIELD comp_2261 percent F
 		METHOD  (F)V
 			ARG 1 percent
-		METHOD comp_2261 percent ()F
+		METHOD  (Lnet/minecraft/class_9129;)V
+			ARG 1 buf
 	CLASS class_5886 UpdatePropertiesAction
 		FIELD field_29117 darkenSky Z
 		FIELD field_29118 dragonMusic Z
 		FIELD field_29119 thickenFog Z
+		METHOD  (Lnet/minecraft/class_9129;)V
+			ARG 1 buf
 		METHOD  (ZZZ)V
 			ARG 1 darkenSky
 			ARG 2 dragonMusic
@@ -97,3 +109,5 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP
 		METHOD  (Lnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;)V
 			ARG 1 color
 			ARG 2 style
+		METHOD  (Lnet/minecraft/class_9129;)V
+			ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping
index 4a0f077724..12080463b0 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping
@@ -1,10 +1,10 @@
 CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket
-	FIELD comp_2262 completionId I
-	FIELD comp_2265 suggestions Ljava/util/List;
 	FIELD field_47913 CODEC Lnet/minecraft/class_9139;
 	METHOD  (ILcom/mojang/brigadier/suggestion/Suggestions;)V
 		ARG 1 completionId
 		ARG 2 suggestions
-	METHOD comp_2262 completionId ()I
-	METHOD comp_2265 suggestions ()Ljava/util/List;
 	METHOD method_11397 getSuggestions ()Lcom/mojang/brigadier/suggestion/Suggestions;
+	METHOD method_56609 (Lcom/mojang/brigadier/suggestion/Suggestion;)Lnet/minecraft/class_2639$class_9177;
+		ARG 0 suggestion
+	CLASS class_9177 Suggestion
+		FIELD field_48779 CODEC Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping
index 137bafd85c..7803da8b58 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping
@@ -1,6 +1,2 @@
 CLASS net/minecraft/class_5892 net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket
-	FIELD comp_2275 entityId I
-	FIELD comp_2276 message Lnet/minecraft/class_2561;
 	FIELD field_47953 CODEC Lnet/minecraft/class_9139;
-	METHOD comp_2275 entityId ()I
-	METHOD comp_2276 message ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/DebugSampleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DebugSampleS2CPacket.mapping
new file mode 100644
index 0000000000..42bb3dcd2c
--- /dev/null
+++ b/mappings/net/minecraft/network/packet/s2c/play/DebugSampleS2CPacket.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9178 net/minecraft/network/packet/s2c/play/DebugSampleS2CPacket
+	FIELD field_48780 CODEC Lnet/minecraft/class_9139;
+	METHOD  (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
+	METHOD method_56611 write (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping
index 3290bfc457..df5675b05f 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping
@@ -5,6 +5,7 @@ CLASS net/minecraft/class_6606 net/minecraft/network/packet/s2c/play/LightData
 	FIELD field_34876 uninitedBlock Ljava/util/BitSet;
 	FIELD field_34877 skyNibbles Ljava/util/List;
 	FIELD field_34878 blockNibbles Ljava/util/List;
+	FIELD field_48781 CODEC Lnet/minecraft/class_9139;
 	METHOD  (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;)V
 		ARG 1 pos
 		ARG 2 lightProvider
diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
index 8310d25f07..6b9b80b365 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
@@ -1,18 +1,13 @@
 CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket
-	FIELD comp_2270 id Lnet/minecraft/class_9209;
-	FIELD comp_2271 scale B
-	FIELD comp_2272 locked Z
 	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 5 updateData
-	METHOD comp_2270 id ()Lnet/minecraft/class_9209;
-	METHOD comp_2271 scale ()B
-	METHOD comp_2272 locked ()Z
 	METHOD comp_2273 icons ()Ljava/util/Optional;
 	METHOD comp_2274 updateData ()Ljava/util/Optional;
 	METHOD method_11642 apply (Lnet/minecraft/class_22;)V
diff --git a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping
index 1a2ce21607..6b8ee0b79b 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping
@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_5894 net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket
-	FIELD comp_2279 message Lnet/minecraft/class_2561;
 	FIELD field_47967 CODEC Lnet/minecraft/class_9139;
-	METHOD comp_2279 message ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping
index 62bab7a779..d85246331a 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping
@@ -1,6 +1,2 @@
 CLASS net/minecraft/class_2772 net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket
-	FIELD comp_2282 header Lnet/minecraft/class_2561;
-	FIELD comp_2283 footer Lnet/minecraft/class_2561;
 	FIELD field_48001 CODEC Lnet/minecraft/class_9139;
-	METHOD comp_2282 header ()Lnet/minecraft/class_2561;
-	METHOD comp_2283 footer ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping
index f697fc387a..3bd36772d5 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping
@@ -8,6 +8,8 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS
 	METHOD  (Lnet/minecraft/class_2703$class_5893;Lnet/minecraft/class_3222;)V
 		ARG 1 action
 		ARG 2 player
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD method_43886 entryFromPlayer (Ljava/util/Collection;)Lnet/minecraft/class_2703;
 		ARG 0 players
 	METHOD method_46326 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V
@@ -19,6 +21,7 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS
 	METHOD method_46329 getEntries ()Ljava/util/List;
 	METHOD method_46330 getPlayerAdditionEntries ()Ljava/util/List;
 	METHOD method_55902 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	CLASS class_2705 Entry
 		FIELD comp_1107 profile Lcom/mojang/authlib/GameProfile;
 		FIELD comp_1109 latency I
@@ -37,34 +40,48 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS
 			ARG 3 reader
 			ARG 4 writer
 		METHOD method_46331 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
+			ARG 0 buf
 			ARG 1 entry
 		METHOD method_46332 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
+			ARG 1 buf
 		METHOD method_46333 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
+			ARG 0 buf
 			ARG 1 entry
 		METHOD method_46334 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
+			ARG 1 buf
 		METHOD method_46335 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
+			ARG 0 buf
 			ARG 1 entry
 		METHOD method_46336 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
+			ARG 1 buf
 		METHOD method_46337 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
+			ARG 0 buf
 			ARG 1 entry
 		METHOD method_46338 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
+			ARG 1 buf
 		METHOD method_46339 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
+			ARG 0 buf
 			ARG 1 entry
 		METHOD method_46340 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
+			ARG 1 buf
 		METHOD method_46341 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
+			ARG 0 buf
 			ARG 1 entry
 		METHOD method_46342 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 			ARG 0 serialized
+			ARG 1 buf
 		CLASS class_7829 Reader
 			METHOD read (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V
 				ARG 1 serialized
+				ARG 2 buf
 		CLASS class_7830 Writer
 			METHOD write (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V
+				ARG 1 buf
 				ARG 2 entry
 	CLASS class_7831 Serialized
 		FIELD field_40703 profileId Ljava/util/UUID;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping
index 9b14cc70c5..e3a9169ec5 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping
@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_5903 net/minecraft/network/packet/s2c/play/SubtitleS2CPacket
-	FIELD comp_2280 subtitle Lnet/minecraft/class_2561;
 	FIELD field_47990 CODEC Lnet/minecraft/class_9139;
-	METHOD comp_2280 subtitle ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping
index 9eca517f43..21914bc06a 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping
@@ -28,6 +28,8 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack
 		ARG 2 packetType
 		ARG 3 team
 		ARG 4 playerNames
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD method_34169 containsPlayers (I)Z
 		ARG 0 packetType
 	METHOD method_34170 updateRemovedTeam (Lnet/minecraft/class_268;)Lnet/minecraft/class_5900;
@@ -47,6 +49,7 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack
 	METHOD method_34178 getPlayerNames ()Ljava/util/Collection;
 	METHOD method_34179 getTeam ()Ljava/util/Optional;
 	METHOD method_55934 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	CLASS class_5901 Operation
 	CLASS class_5902 SerializableTeam
 		FIELD field_29158 displayName Lnet/minecraft/class_2561;
@@ -58,8 +61,11 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack
 		FIELD field_29164 friendlyFlags I
 		METHOD  (Lnet/minecraft/class_268;)V
 			ARG 1 team
+		METHOD  (Lnet/minecraft/class_9129;)V
+			ARG 1 buf
 		METHOD method_34181 getDisplayName ()Lnet/minecraft/class_2561;
 		METHOD method_34182 write (Lnet/minecraft/class_9129;)V
+			ARG 1 buf
 		METHOD method_34183 getFriendlyFlagsBitwise ()I
 		METHOD method_34184 getColor ()Lnet/minecraft/class_124;
 		METHOD method_34185 getNameTagVisibilityRule ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping
index d9660ec517..fc6b3d5bc0 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping
@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_5904 net/minecraft/network/packet/s2c/play/TitleS2CPacket
-	FIELD comp_2281 title Lnet/minecraft/class_2561;
 	FIELD field_47992 CODEC Lnet/minecraft/class_9139;
-	METHOD comp_2281 title ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/particle/ParticleEffect.mapping b/mappings/net/minecraft/particle/ParticleEffect.mapping
index 55c4c09142..ebb067be9d 100644
--- a/mappings/net/minecraft/particle/ParticleEffect.mapping
+++ b/mappings/net/minecraft/particle/ParticleEffect.mapping
@@ -1,7 +1,9 @@
 CLASS net/minecraft/class_2394 net/minecraft/particle/ParticleEffect
 	METHOD method_10293 asString (Lnet/minecraft/class_7225$class_7874;)Ljava/lang/String;
+		ARG 1 registryLookup
 	METHOD method_10295 getType ()Lnet/minecraft/class_2396;
 	CLASS class_2395 Factory
 		METHOD method_10296 read (Lnet/minecraft/class_2396;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 			ARG 1 type
 			ARG 2 reader
+			ARG 3 registryLookup
diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping
index 7a8b349cdd..8d10a6ed1a 100644
--- a/mappings/net/minecraft/recipe/RecipeManager.mapping
+++ b/mappings/net/minecraft/recipe/RecipeManager.mapping
@@ -4,11 +4,14 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 	COMMENT from data packs' JSON files.
 	FIELD field_19359 GSON Lcom/google/gson/Gson;
 	FIELD field_36308 recipesById Ljava/util/Map;
+	FIELD field_48848 registryLookup Lnet/minecraft/class_7225$class_7874;
 	FIELD field_9023 recipes Ljava/util/Map;
 	FIELD field_9024 errored Z
 		COMMENT This isn't quite indicating an errored state; its value is only set to
 		COMMENT {@code false} and is never {@code true}, and isn't used anywhere.
 	FIELD field_9027 LOGGER Lorg/slf4j/Logger;
+	METHOD  (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
 	METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map;
 		ARG 1 type
 	METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_8786;
@@ -23,6 +26,8 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 		COMMENT @return the read recipe
 		ARG 0 id
 			COMMENT the recipe's ID
+		ARG 1 json
+		ARG 2 registryLookup
 	METHOD method_17722 (Ljava/util/Map;)Ljava/util/stream/Stream;
 		ARG 0 map
 	METHOD method_17723 (Ljava/util/Map;)Ljava/util/stream/Stream;
diff --git a/mappings/net/minecraft/registry/RegistryWrapper.mapping b/mappings/net/minecraft/registry/RegistryWrapper.mapping
index 1adf602245..080bc6b477 100644
--- a/mappings/net/minecraft/registry/RegistryWrapper.mapping
+++ b/mappings/net/minecraft/registry/RegistryWrapper.mapping
@@ -15,6 +15,8 @@ CLASS net/minecraft/class_7225 net/minecraft/registry/RegistryWrapper
 			ARG 1 feature
 		METHOD method_46765 getRegistryKey ()Lnet/minecraft/class_5321;
 		METHOD method_46766 getLifecycle ()Lcom/mojang/serialization/Lifecycle;
+		METHOD method_56882 withPredicateFilter (Ljava/util/function/Predicate;)Lnet/minecraft/class_7225$class_7226;
+			ARG 1 predicate
 		CLASS 1
 			METHOD method_46756 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z
 				ARG 1 entry
diff --git a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping
index 7702df308a..159aafa81e 100644
--- a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping
+++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping
@@ -19,6 +19,7 @@ CLASS net/minecraft/class_2995 net/minecraft/scoreboard/ServerScoreboard
 	METHOD method_12941 runUpdateListeners ()V
 	METHOD method_32704 stateFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_273;
 		ARG 1 nbt
+		ARG 2 registryLookup
 	METHOD method_32705 createState ()Lnet/minecraft/class_273;
 	METHOD method_52297 getPersistentStateType ()Lnet/minecraft/class_18$class_8645;
 	CLASS class_2996 UpdateMode
diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping
index ae5fdd7c7d..1a8d2fc862 100644
--- a/mappings/net/minecraft/server/DataPackContents.mapping
+++ b/mappings/net/minecraft/server/DataPackContents.mapping
@@ -13,6 +13,9 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
 	FIELD field_25342 functionLoader Lnet/minecraft/class_5349;
 	FIELD field_36491 LOGGER Lorg/slf4j/Logger;
 	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
+		ARG 3 environment
 		ARG 4 functionPermissionLevel
 	METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349;
 		COMMENT {@return the function loader}
@@ -63,6 +66,15 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
 			COMMENT Creates a new {@link net.minecraft.registry.entry.RegistryEntryList}, stores it and returns it.
 		FIELD field_37826 Lnet/minecraft/class_5350$class_7158;
 			COMMENT Throws an exception.
-	CLASS class_9180
+	CLASS class_9180 ConfigurableWrapperLookup
 		FIELD field_40912 entryListCreationPolicy Lnet/minecraft/class_5350$class_7158;
+		FIELD field_48786 dynamicRegistryManager Lnet/minecraft/class_5455;
+		METHOD  (Lnet/minecraft/class_5455;)V
+			ARG 1 dynamicRegistryManager
 		METHOD method_46724 setEntryListCreationPolicy (Lnet/minecraft/class_5350$class_7158;)V
+			ARG 1 entryListCreationPolicy
+		METHOD method_56623 getWrapper (Lnet/minecraft/class_7225$class_7226;Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226;
+			ARG 1 readOnlyWrapper
+			ARG 2 tagCreatingWrapper
+		METHOD method_56624 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7225$class_7226;
+			ARG 1 registry
diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping
index e8173f6173..a112db9c0f 100644
--- a/mappings/net/minecraft/server/Main.mapping
+++ b/mappings/net/minecraft/server/Main.mapping
@@ -7,6 +7,7 @@ CLASS net/minecraft/server/Main
 		ARG 1 dataFixer
 		ARG 2 eraseCache
 		ARG 3 continueCheck
+		ARG 4 dynamicRegistryManager
 		ARG 5 recreateRegionFiles
 	METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lnet/minecraft/class_7497;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176;
 		ARG 11 thread
diff --git a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping
index 32b90f3456..3b9966c2a7 100644
--- a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping
+++ b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping
@@ -4,9 +4,16 @@ CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader
 	FIELD field_13406 LOGGER Lorg/slf4j/Logger;
 	FIELD field_44468 conditionManager Lnet/minecraft/class_60;
 	FIELD field_46076 manager Lnet/minecraft/class_163;
+	FIELD field_48787 registryLookup Lnet/minecraft/class_7225$class_7874;
+	METHOD  (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_60;)V
+		ARG 1 registryLookup
+		ARG 2 conditionManager
 	METHOD method_12893 getAdvancements ()Ljava/util/Collection;
 	METHOD method_12896 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8779;
 		ARG 1 id
+	METHOD method_20723 (Lnet/minecraft/class_6903;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V
+		ARG 3 id
+		ARG 4 json
 	METHOD method_53646 getManager ()Lnet/minecraft/class_163;
 	METHOD method_54921 validate (Lnet/minecraft/class_2960;Lnet/minecraft/class_161;)V
 		ARG 1 id
diff --git a/mappings/net/minecraft/server/command/BossBarCommand.mapping b/mappings/net/minecraft/server/command/BossBarCommand.mapping
index 86eadc8935..5e729bf43c 100644
--- a/mappings/net/minecraft/server/command/BossBarCommand.mapping
+++ b/mappings/net/minecraft/server/command/BossBarCommand.mapping
@@ -75,6 +75,7 @@ CLASS net/minecraft/class_3019 net/minecraft/server/command/BossBarCommand
 		ARG 0 context
 	METHOD method_13053 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
+		ARG 1 registryAccess
 	METHOD method_13054 getBossBar (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3002;
 		ARG 0 context
 	METHOD method_13055 (Lcom/mojang/brigadier/context/CommandContext;)I
diff --git a/mappings/net/minecraft/server/command/RaidCommand.mapping b/mappings/net/minecraft/server/command/RaidCommand.mapping
index cb903aa1de..6a09dc59a9 100644
--- a/mappings/net/minecraft/server/command/RaidCommand.mapping
+++ b/mappings/net/minecraft/server/command/RaidCommand.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_6329 net/minecraft/server/command/RaidCommand
 		ARG 0 player
 	METHOD method_36192 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
+		ARG 1 registryAccess
 	METHOD method_36193 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
 	METHOD method_36194 executeGlow (Lnet/minecraft/class_2168;)I
diff --git a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping
index b78a4dcdab..5262dbdd51 100644
--- a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping
+++ b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping
@@ -66,6 +66,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand
 		ARG 0 context
 	METHOD method_13595 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
+		ARG 1 registryAccess
 	METHOD method_13596 executeSetDisplay (Lnet/minecraft/class_2168;Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)I
 		ARG 0 source
 		ARG 1 slot
@@ -123,7 +124,12 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand
 	METHOD method_13614 executeListScores (Lnet/minecraft/class_2168;Lnet/minecraft/class_9015;)I
 		ARG 0 source
 		ARG 1 scoreHolder
+	METHOD method_55344 (Lnet/minecraft/class_3115$class_9008;Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 1 context
 	METHOD method_55345 makeNumberFormatArguments (Lnet/minecraft/class_7157;Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3115$class_9008;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
+		ARG 0 registryAccess
+		ARG 1 argumentBuilder
+		ARG 2 executor
 	METHOD method_55347 executeModifyObjectiveFormat (Lnet/minecraft/class_2168;Lnet/minecraft/class_266;Lnet/minecraft/class_9022;)I
 		ARG 0 source
 		ARG 1 objective
@@ -144,6 +150,12 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand
 		ARG 3 numberFormat
 	METHOD method_55352 getNextDisplayName (Ljava/util/Collection;)Lnet/minecraft/class_2561;
 		ARG 0 targets
+	METHOD method_55355 (Lnet/minecraft/class_3115$class_9008;Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 1 context
+	METHOD method_55360 (Lnet/minecraft/class_3115$class_9008;Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 1 context
+	METHOD method_55363 (Lnet/minecraft/class_3115$class_9008;Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 1 context
 	CLASS class_9008 NumberFormatCommandExecutor
 		METHOD run (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_9022;)I
 			ARG 1 context
diff --git a/mappings/net/minecraft/server/command/TeamCommand.mapping b/mappings/net/minecraft/server/command/TeamCommand.mapping
index 1e2740ee3d..379f27188c 100644
--- a/mappings/net/minecraft/server/command/TeamCommand.mapping
+++ b/mappings/net/minecraft/server/command/TeamCommand.mapping
@@ -76,6 +76,7 @@ CLASS net/minecraft/class_3142 net/minecraft/server/command/TeamCommand
 		ARG 2 visibility
 	METHOD method_13736 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
+		ARG 1 registryAccess
 	METHOD method_13737 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
 	METHOD method_13738 (Lcom/mojang/brigadier/context/CommandContext;)I
diff --git a/mappings/net/minecraft/server/command/TellRawCommand.mapping b/mappings/net/minecraft/server/command/TellRawCommand.mapping
index c77111ccea..e7df7f9a1d 100644
--- a/mappings/net/minecraft/server/command/TellRawCommand.mapping
+++ b/mappings/net/minecraft/server/command/TellRawCommand.mapping
@@ -1,6 +1,7 @@
 CLASS net/minecraft/class_3146 net/minecraft/server/command/TellRawCommand
 	METHOD method_13776 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
+		ARG 1 registryAccess
 	METHOD method_13777 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
 	METHOD method_13778 (Lnet/minecraft/class_2168;)Z
diff --git a/mappings/net/minecraft/server/command/TitleCommand.mapping b/mappings/net/minecraft/server/command/TitleCommand.mapping
index af7ad4a013..a2b5f68f6f 100644
--- a/mappings/net/minecraft/server/command/TitleCommand.mapping
+++ b/mappings/net/minecraft/server/command/TitleCommand.mapping
@@ -16,6 +16,7 @@ CLASS net/minecraft/class_3151 net/minecraft/server/command/TitleCommand
 		ARG 0 context
 	METHOD method_13804 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
+		ARG 1 registryAccess
 	METHOD method_13805 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;)I
 		ARG 0 source
 		ARG 1 targets
diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping
index 1314f89397..9bb2515789 100644
--- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping
+++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping
@@ -116,6 +116,7 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup
 	FIELD field_47085 COPPER_BULB Lnet/minecraft/class_2498;
 	FIELD field_47086 COPPER_GRATE Lnet/minecraft/class_2498;
 	FIELD field_47346 TRIAL_SPAWNER Lnet/minecraft/class_2498;
+	FIELD field_48855 VAULT Lnet/minecraft/class_2498;
 	METHOD  (FFLnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
 		ARG 1 volume
 		ARG 2 pitch
diff --git a/mappings/net/minecraft/state/property/Properties.mapping b/mappings/net/minecraft/state/property/Properties.mapping
index aa8424f4bb..ca9ab72dd8 100644
--- a/mappings/net/minecraft/state/property/Properties.mapping
+++ b/mappings/net/minecraft/state/property/Properties.mapping
@@ -263,6 +263,8 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties
 		COMMENT A property that specifies if a crafter is crafting.
 	FIELD field_47408 TRIAL_SPAWNER_STATE Lnet/minecraft/class_2754;
 		COMMENT A property that specifies the state of a trial spawner.
+	FIELD field_48915 VAULT_STATE Lnet/minecraft/class_2754;
+		COMMENT A property that specifies the state of a vault.
 	METHOD method_11813 (Lnet/minecraft/class_2768;)Z
 		ARG 0 shape
 	METHOD method_11814 (Lnet/minecraft/class_2350;)Z
diff --git a/mappings/net/minecraft/structure/StructureTemplate.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping
index d0130cbfe3..2332cd1bc2 100644
--- a/mappings/net/minecraft/structure/StructureTemplate.mapping
+++ b/mappings/net/minecraft/structure/StructureTemplate.mapping
@@ -116,6 +116,8 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate
 	METHOD method_17916 getEntity (Lnet/minecraft/class_5425;Lnet/minecraft/class_2487;)Ljava/util/Optional;
 		ARG 0 world
 		ARG 1 nbt
+	METHOD method_17917 (Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_243;ZLnet/minecraft/class_5425;Lnet/minecraft/class_1297;)V
+		ARG 5 entity
 	METHOD method_20532 updateCorner (Lnet/minecraft/class_1936;ILnet/minecraft/class_251;III)V
 		ARG 0 world
 		ARG 1 flags
diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping
index 2f4c5b5b5e..f830636292 100644
--- a/mappings/net/minecraft/test/TestContext.mapping
+++ b/mappings/net/minecraft/test/TestContext.mapping
@@ -416,4 +416,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 	METHOD method_56208 getEntities (Lnet/minecraft/class_1299;)Ljava/util/List;
 		ARG 1 type
 	METHOD method_56606 assertEquals (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V
+		ARG 1 value
+		ARG 2 expected
 		ARG 3 name
diff --git a/mappings/net/minecraft/text/TextCodecs.mapping b/mappings/net/minecraft/text/TextCodecs.mapping
index b2999f2686..eeac4f9873 100644
--- a/mappings/net/minecraft/text/TextCodecs.mapping
+++ b/mappings/net/minecraft/text/TextCodecs.mapping
@@ -1,7 +1,9 @@
 CLASS net/minecraft/class_8824 net/minecraft/text/TextCodecs
 	FIELD field_46597 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_46598 STRINGIFIED_CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_48540 PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_48540 REGISTRY_PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_48985 OPTIONAL_PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_48986 PACKET_CODEC Lnet/minecraft/class_9139;
 	METHOD method_54164 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult;
 		ARG 0 json
 	METHOD method_54165 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/util/DebugSampleType.mapping b/mappings/net/minecraft/util/DebugSampleType.mapping
new file mode 100644
index 0000000000..6d5c8857da
--- /dev/null
+++ b/mappings/net/minecraft/util/DebugSampleType.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9192 net/minecraft/util/DebugSampleType
diff --git a/mappings/net/minecraft/util/JsonReaderUtils.mapping b/mappings/net/minecraft/util/JsonReaderUtils.mapping
index 1779d2a9d8..6d172fdbf5 100644
--- a/mappings/net/minecraft/util/JsonReaderUtils.mapping
+++ b/mappings/net/minecraft/util/JsonReaderUtils.mapping
@@ -4,3 +4,6 @@ CLASS net/minecraft/class_9010 net/minecraft/util/JsonReaderUtils
 	METHOD method_55376 getPos (Lcom/google/gson/stream/JsonReader;)I
 		ARG 0 jsonReader
 	METHOD method_55377 parse (Lnet/minecraft/class_7225$class_7874;Lcom/mojang/brigadier/StringReader;Lcom/mojang/serialization/Codec;)Ljava/lang/Object;
+		ARG 0 registryLookup
+		ARG 1 stringReader
+		ARG 2 codec
diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping
index 77e4c3be50..affefeabfa 100644
--- a/mappings/net/minecraft/util/Util.mapping
+++ b/mappings/net/minecraft/util/Util.mapping
@@ -316,6 +316,10 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 		ARG 1 exceptionGetter
 	METHOD method_55473 getDownloadWorkerExecutor ()Ljava/util/concurrent/ExecutorService;
 		COMMENT {@return the executor for download tasks}
+	METHOD method_56613 allOf (Ljava/util/List;)Ljava/util/function/Predicate;
+		ARG 0 predicates
+	METHOD method_56616 anyOf (Ljava/util/List;)Ljava/util/function/Predicate;
+		ARG 0 predicates
 	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/Uuids.mapping b/mappings/net/minecraft/util/Uuids.mapping
index 9d9ff55299..d347324009 100644
--- a/mappings/net/minecraft/util/Uuids.mapping
+++ b/mappings/net/minecraft/util/Uuids.mapping
@@ -7,6 +7,7 @@ CLASS net/minecraft/class_4844 net/minecraft/util/Uuids
 	FIELD field_46588 STRICT_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_47491 SET_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_48453 PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_48974 LINKED_SET_CODEC Lcom/mojang/serialization/Codec;
 	METHOD method_26274 toIntArray (JJ)[I
 		ARG 0 uuidMost
 		ARG 2 uuidLeast
diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping
index 2656f3f666..83aaa766c1 100644
--- a/mappings/net/minecraft/util/dynamic/Codecs.mapping
+++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping
@@ -300,6 +300,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 		ARG 2 typeCodec
 		ARG 3 typeGetter
 		ARG 4 parametersCodecGetter
+	METHOD method_56627 createRecursiveMap (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
+		ARG 0 codecFunction
 	CLASS 1
 		METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult;
 			ARG 1 ops
@@ -484,3 +486,15 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 			ARG 2 map
 		METHOD method_53707 (Ljava/lang/Object;Ljava/util/Map;)Lcom/mojang/datafixers/util/Pair;
 			ARG 1 map
+	CLASS class_9181 RecursiveMap
+		FIELD field_48804 supplier Ljava/util/function/Supplier;
+		METHOD  (Ljava/util/function/Function;)V
+			ARG 1 codecFunction
+		METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult;
+			ARG 1 ops
+			ARG 2 input
+		METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder;
+			ARG 1 input
+			ARG 2 ops
+		METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream;
+			ARG 1 ops
diff --git a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping
index f34e237006..c9bc58a152 100644
--- a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping
+++ b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping
@@ -35,6 +35,7 @@ CLASS net/minecraft/class_8565 net/minecraft/util/math/random/RandomSequencesSta
 		ARG 2 fallback
 	METHOD method_52516 (JLnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_8565;
 		ARG 2 nbt
+		ARG 3 registryLookup
 	METHOD method_52517 reset (Lnet/minecraft/class_2960;)V
 		ARG 1 id
 	METHOD method_52518 createSequence (Lnet/minecraft/class_2960;IZZ)Lnet/minecraft/class_8564;
diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping
index 557aa1ca70..088338327f 100644
--- a/mappings/net/minecraft/village/TradeOffer.mapping
+++ b/mappings/net/minecraft/village/TradeOffer.mapping
@@ -5,6 +5,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer
 	FIELD field_18679 merchantExperience I
 	FIELD field_48371 PACKET_CODEC Lnet/minecraft/class_9139;
 	FIELD field_48372 ignoreNbt Z
+	FIELD field_48849 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_9143 secondBuyItem Lnet/minecraft/class_1799;
 	FIELD field_9144 maxUses I
 	FIELD field_9145 rewardingPlayerExperience Z
@@ -38,11 +39,31 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer
 		ARG 3 sellItem
 		ARG 4 uses
 		ARG 5 maxUses
+		ARG 6 merchantExperience
 		ARG 7 priceMultiplier
+		ARG 8 demandBonus
+	METHOD  (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFIZ)V
+		ARG 1 firstBuyItem
+		ARG 2 secondBuyItem
+		ARG 3 sellItem
+		ARG 4 uses
+		ARG 5 maxUses
+		ARG 6 merchantExperience
+		ARG 7 priceMultiplier
+		ARG 8 demandBonus
+		ARG 9 ignoreNbt
 	METHOD  (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIZIIFIZ)V
 		ARG 1 firstBuyItem
 		ARG 2 secondBuyItem
 		ARG 3 sellItem
+		ARG 4 uses
+		ARG 5 maxUses
+		ARG 6 rewardingPlayerExperience
+		ARG 7 specialPrice
+		ARG 8 demandBonus
+		ARG 9 priceMultiplier
+		ARG 10 merchantExperience
+		ARG 11 ignoreNbt
 	METHOD  (Lnet/minecraft/class_1914;)V
 		ARG 1 offer
 	METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
@@ -104,6 +125,30 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer
 		ARG 0 buf
 		ARG 1 offer
 	METHOD method_56112 shouldIgnoreNbt ()Z
+	METHOD method_56705 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD method_56706 (Lnet/minecraft/class_1914;)Ljava/lang/Boolean;
+		ARG 0 tradeOffer
+	METHOD method_56707 (Lnet/minecraft/class_1914;)Ljava/lang/Integer;
+		ARG 0 tradeOffer
+	METHOD method_56708 (Lnet/minecraft/class_1914;)Ljava/lang/Float;
+		ARG 0 tradeOffer
+	METHOD method_56709 (Lnet/minecraft/class_1914;)Ljava/lang/Integer;
+		ARG 0 tradeOffer
+	METHOD method_56710 (Lnet/minecraft/class_1914;)Ljava/lang/Integer;
+		ARG 0 tradeOffer
+	METHOD method_56711 (Lnet/minecraft/class_1914;)Ljava/lang/Boolean;
+		ARG 0 tradeOffer
+	METHOD method_56712 (Lnet/minecraft/class_1914;)Ljava/lang/Integer;
+		ARG 0 tradeOffer
+	METHOD method_56713 (Lnet/minecraft/class_1914;)Ljava/lang/Integer;
+		ARG 0 tradeOffer
+	METHOD method_56714 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_1799;
+		ARG 0 tradeOffer
+	METHOD method_56715 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_1799;
+		ARG 0 tradeOffer
+	METHOD method_56716 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_1799;
+		ARG 0 tradeOffer
 	METHOD method_8244 use ()V
 		COMMENT Increments the number of times this trade offer has been used.
 	METHOD method_8245 increaseSpecialPrice (I)V
diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping
index c505eeaa14..057e708d60 100644
--- a/mappings/net/minecraft/village/TradeOfferList.mapping
+++ b/mappings/net/minecraft/village/TradeOfferList.mapping
@@ -1,7 +1,10 @@
 CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList
 	FIELD field_48373 PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_48850 CODEC Lcom/mojang/serialization/Codec;
 	METHOD  (I)V
 		ARG 1 size
+	METHOD  (Ljava/util/Collection;)V
+		ARG 1 tradeOffers
 	METHOD method_53882 copy ()Lnet/minecraft/class_1916;
 	METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914;
 		ARG 1 firstBuyItem
diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping
index 9516739566..e525e92c17 100644
--- a/mappings/net/minecraft/village/raid/RaidManager.mapping
+++ b/mappings/net/minecraft/village/raid/RaidManager.mapping
@@ -29,6 +29,7 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager
 		ARG 0 world
 	METHOD method_52561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3767;
 		ARG 1 nbt
+		ARG 2 registryLookup
 	METHOD method_77 fromNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767;
 		ARG 0 world
 		ARG 1 nbt
diff --git a/mappings/net/minecraft/world/ChunkUpdateState.mapping b/mappings/net/minecraft/world/ChunkUpdateState.mapping
index cedbed649c..2ad9fa10e5 100644
--- a/mappings/net/minecraft/world/ChunkUpdateState.mapping
+++ b/mappings/net/minecraft/world/ChunkUpdateState.mapping
@@ -17,4 +17,5 @@ CLASS net/minecraft/class_3440 net/minecraft/world/ChunkUpdateState
 	METHOD method_14898 getAll ()Lit/unimi/dsi/fastutil/longs/LongSet;
 	METHOD method_32358 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3440;
 		ARG 0 nbt
+		ARG 1 registryLookup
 	METHOD method_52601 getPersistentStateType ()Lnet/minecraft/class_18$class_8645;
diff --git a/mappings/net/minecraft/world/ForcedChunkState.mapping b/mappings/net/minecraft/world/ForcedChunkState.mapping
index 96e28a06b2..b51c3358d0 100644
--- a/mappings/net/minecraft/world/ForcedChunkState.mapping
+++ b/mappings/net/minecraft/world/ForcedChunkState.mapping
@@ -6,5 +6,6 @@ CLASS net/minecraft/class_1932 net/minecraft/world/ForcedChunkState
 		ARG 1 chunks
 	METHOD method_32350 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_1932;
 		ARG 0 nbt
+		ARG 1 registryLookup
 	METHOD method_52570 getPersistentStateType ()Lnet/minecraft/class_18$class_8645;
 	METHOD method_8375 getChunks ()Lit/unimi/dsi/fastutil/longs/LongSet;
diff --git a/mappings/net/minecraft/world/IdCountsState.mapping b/mappings/net/minecraft/world/IdCountsState.mapping
index 80b3732789..bd965258da 100644
--- a/mappings/net/minecraft/world/IdCountsState.mapping
+++ b/mappings/net/minecraft/world/IdCountsState.mapping
@@ -4,4 +4,5 @@ CLASS net/minecraft/class_3978 net/minecraft/world/IdCountsState
 	METHOD method_17920 getNextMapId ()Lnet/minecraft/class_9209;
 	METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3978;
 		ARG 0 nbt
+		ARG 1 registryLookup
 	METHOD method_52610 getPersistentStateType ()Lnet/minecraft/class_18$class_8645;
diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping
index c7a6171554..eb042d1eab 100644
--- a/mappings/net/minecraft/world/PersistentState.mapping
+++ b/mappings/net/minecraft/world/PersistentState.mapping
@@ -3,8 +3,10 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState
 	FIELD field_72 dirty Z
 	METHOD method_17919 save (Ljava/io/File;Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 file
+		ARG 2 registryLookup
 	METHOD method_75 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		ARG 1 nbt
+		ARG 2 registryLookup
 	METHOD method_78 setDirty (Z)V
 		ARG 1 dirty
 	METHOD method_79 isDirty ()Z
diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping
index 18976f6f5d..f12d0271e6 100644
--- a/mappings/net/minecraft/world/PersistentStateManager.mapping
+++ b/mappings/net/minecraft/world/PersistentStateManager.mapping
@@ -3,10 +3,13 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager
 	FIELD field_136 LOGGER Lorg/slf4j/Logger;
 	FIELD field_17663 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_17664 directory Ljava/io/File;
+	FIELD field_48926 registryLookup Lnet/minecraft/class_7225$class_7874;
 	METHOD  (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 directory
 		ARG 2 dataFixer
+		ARG 3 registryLookup
 	METHOD method_120 readFromFile (Ljava/util/function/BiFunction;Lnet/minecraft/class_4284;Ljava/lang/String;)Lnet/minecraft/class_18;
+		ARG 1 readFunction
 		ARG 2 dataFixTypes
 		ARG 3 id
 	METHOD method_123 set (Ljava/lang/String;Lnet/minecraft/class_18;)V
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index d2a846af18..aaf5aa03ab 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -58,8 +58,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 		ARG 13 velocityZ
 	METHOD method_17889 getNextMapId ()Lnet/minecraft/class_9209;
 	METHOD method_17890 putMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V
+		ARG 1 id
 		ARG 2 state
 	METHOD method_17891 getMapState (Lnet/minecraft/class_9209;)Lnet/minecraft/class_22;
+		ARG 1 id
 	METHOD method_18471 tickBlockEntities ()V
 	METHOD method_18472 tickEntity (Ljava/util/function/Consumer;Lnet/minecraft/class_1297;)V
 		ARG 1 tickConsumer
diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping
index 99d70cbe29..28d85524b0 100644
--- a/mappings/net/minecraft/world/WorldEvents.mapping
+++ b/mappings/net/minecraft/world/WorldEvents.mapping
@@ -357,3 +357,15 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
 		COMMENT 
    Spawns happy villager particles.
 		COMMENT 
    The amount of particles to spawn must be supplied as extra data.
 		COMMENT 
    Called by {@link net.minecraft.block.TurtleEggBlock#onBlockAdded(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, boolean) TurtleEggBlock#onBlockAdded}
+	FIELD field_48852 VAULT_ACTIVATES I
+		COMMENT A vault is activated.
+		COMMENT 
    Plays the activate sound and spawns smoke and small flame particles.
+		COMMENT 
    Called by {@link net.minecraft.block.vault.VaultState#ACTIVE}.
+	FIELD field_48853 VAULT_DEACTIVATES I
+		COMMENT A vault is deactivated.
+		COMMENT 
    Plays the deactivate sound and spawns small flame particles.
+		COMMENT 
    Called by {@link net.minecraft.block.vault.VaultState#INACTIVE}.
+	FIELD field_48854 VAULT_EJECTS_ITEM I
+		COMMENT A vault ejects loot.
+		COMMENT 
    Spawns ejection particles.
+		COMMENT 
    Called by {@link net.minecraft.block.vault.VaultState#ejectItem}.
diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping
index 0cadd49264..2c76142062 100644
--- a/mappings/net/minecraft/world/chunk/Chunk.mapping
+++ b/mappings/net/minecraft/world/chunk/Chunk.mapping
@@ -87,6 +87,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk
 		ARG 2 upperHeight
 	METHOD method_20598 getPackedBlockEntityNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		ARG 1 pos
+		ARG 2 registryLookup
 	METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713;
 		ARG 1 ySectionCoord
 	METHOD method_38255 getOrCreateChunkNoiseSampler (Ljava/util/function/Function;)Lnet/minecraft/class_6568;
diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
index 8ca01a050a..cfd5ebae25 100644
--- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping
+++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
@@ -29,6 +29,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	METHOD  (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5455;ZZ)V
 		ARG 1 session
 		ARG 2 dataFixer
+		ARG 3 dynamicRegistryManager
 		ARG 4 eraseCache
 		ARG 5 recreateRegionFiles
 	METHOD method_28304 getWorlds ()Ljava/util/Set;
diff --git a/unpick-definitions/world_events.unpick b/unpick-definitions/world_events.unpick
index 98c7df2ca6..744a4980ff 100644
--- a/unpick-definitions/world_events.unpick
+++ b/unpick-definitions/world_events.unpick
@@ -74,6 +74,9 @@ constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_DETECTS_PLAY
 constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_EJECTS_ITEM
 constant world_events net/minecraft/world/WorldEvents BEE_FERTILIZES_PLANT
 constant world_events net/minecraft/world/WorldEvents TURTLE_EGG_PLACED
+constant world_events net/minecraft/world/WorldEvents VAULT_ACTIVATES
+constant world_events net/minecraft/world/WorldEvents VAULT_DEACTIVATES
+constant world_events net/minecraft/world/WorldEvents VAULT_EJECTS_ITEM
 
 target_method net/minecraft/world/WorldAccess syncWorldEvent (Lnet/minecraft/entity/player/PlayerEntity;ILnet/minecraft/util/math/BlockPos;I)V
 	param 1 world_events

From edb69e924e5b55f8717f489ecf93a32631d69d42 Mon Sep 17 00:00:00 2001
From: huanmeng_qwq <49704373+huanmeng-qwq@users.noreply.github.com>
Date: Thu, 1 Feb 2024 23:39:20 +0800
Subject: [PATCH 26/47] more 24w05a (#3778)

* more 24w05a

* MapId package

* update

* SampleSubscriptionTracker, TagKeyArgumentType
---
 mappings/net/minecraft/class_9187.mapping     |  6 +++++
 mappings/net/minecraft/class_9211.mapping     | 10 ++++++++
 .../minecraft/client/gui/hud/DebugHud.mapping |  1 +
 .../argument/TagKeyArgumentType.mapping       | 10 ++++++++
 .../server/SampleSubscriptionTracker.mapping  | 25 +++++++++++++++++++
 5 files changed, 52 insertions(+)
 create mode 100644 mappings/net/minecraft/class_9187.mapping
 create mode 100644 mappings/net/minecraft/class_9211.mapping
 create mode 100644 mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping
 create mode 100644 mappings/net/minecraft/server/SampleSubscriptionTracker.mapping

diff --git a/mappings/net/minecraft/class_9187.mapping b/mappings/net/minecraft/class_9187.mapping
new file mode 100644
index 0000000000..4c99866023
--- /dev/null
+++ b/mappings/net/minecraft/class_9187.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9187
+	FIELD field_48806 defaultArray [J
+	FIELD field_48807 array [J
+	METHOD  (I[J)V
+		ARG 1 size
+		ARG 2 def
diff --git a/mappings/net/minecraft/class_9211.mapping b/mappings/net/minecraft/class_9211.mapping
new file mode 100644
index 0000000000..16cfca4492
--- /dev/null
+++ b/mappings/net/minecraft/class_9211.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9211
+	FIELD field_48934 TIMEOUT I
+	FIELD field_48935 networkHandler Lnet/minecraft/class_634;
+	FIELD field_48936 debugHud Lnet/minecraft/class_340;
+	FIELD field_48937 lastTime Ljava/util/EnumMap;
+	METHOD  (Lnet/minecraft/class_634;Lnet/minecraft/class_340;)V
+		ARG 1 handler
+		ARG 2 hud
+	METHOD method_56831 update (Lnet/minecraft/class_9192;)V
+		ARG 1 type
diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
index 95accffe48..5219ac5c58 100644
--- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
+++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
@@ -78,6 +78,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
 	METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_9191;
 	METHOD method_53545 clear ()V
 	METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_9191;
+	METHOD method_56829 shouldRenderTickCharts ()Z
 	CLASS class_7412 AllocationRateCalculator
 		FIELD field_38986 INTERVAL I
 		FIELD field_38987 GARBAGE_COLLECTORS Ljava/util/List;
diff --git a/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping b/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping
new file mode 100644
index 0000000000..1d609510b4
--- /dev/null
+++ b/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9216 net/minecraft/command/argument/TagKeyArgumentType
+	FIELD field_48963 ERROR_INVALID Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_48964 ERROR_UNKNOWN Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_48965 TAG_PREFIX C
+	FIELD field_48966 NBT_OPENING C
+	FIELD field_48968 registryWrapper Lnet/minecraft/class_7225$class_7226;
+	METHOD method_56867 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 data
+	METHOD method_56868 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 data
diff --git a/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping b/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping
new file mode 100644
index 0000000000..b5332b856c
--- /dev/null
+++ b/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping
@@ -0,0 +1,25 @@
+CLASS net/minecraft/class_9188 net/minecraft/server/SampleSubscriptionTracker
+	FIELD field_48808 STOP_TRACK_TICK I
+	FIELD field_48809 STOP_TRACK_MS I
+	FIELD field_48810 playerManager Lnet/minecraft/class_3324;
+	FIELD field_48811 subscriptionMap Ljava/util/EnumMap;
+	FIELD field_48812 pendingQueue Ljava/util/Queue;
+	METHOD  (Lnet/minecraft/class_3324;)V
+		ARG 1 playermanager
+	METHOD method_56652 tick (I)V
+		ARG 1 tick
+	METHOD method_56654 onSubscription (JI)V
+		ARG 1 time
+		ARG 3 tick
+	METHOD method_56655 sendPacket (Lnet/minecraft/class_9178;)V
+		ARG 1 packet
+	METHOD method_56656 addPlayer (Lnet/minecraft/class_3222;Lnet/minecraft/class_9192;)V
+		ARG 1 player
+		ARG 2 type
+	METHOD method_56657 shouldPush (Lnet/minecraft/class_9192;)Z
+		ARG 1 type
+	METHOD method_56658 onUnsubscription (JI)V
+		ARG 1 measuringTimeMs
+		ARG 3 tick
+	CLASS class_9189 PlayerSubscriptionData
+	CLASS class_9190 MeasureTimeTick

From 2d6311e10a460269909cbf8638e5b0c65740f35f Mon Sep 17 00:00:00 2001
From: Matias Koivikko 
Date: Thu, 1 Feb 2024 17:40:11 +0200
Subject: [PATCH 27/47] Map armor changes (#3776)

* Map armor changes

* Fix spelling

* Delete accidently created html file

---------

Co-authored-by: YanisBft 
---
 .../minecraft/item/AnimalArmorItem.mapping    |  8 ++++++++
 mappings/net/minecraft/item/ArmorItem.mapping |  6 ++++++
 .../net/minecraft/item/ArmorMaterial.mapping  | 20 +++++++++++++++++++
 .../net/minecraft/item/ArmorMaterials.mapping | 19 ++++++++++++++++++
 .../net/minecraft/registry/Registries.mapping |  1 +
 5 files changed, 54 insertions(+)

diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping
index 3213737071..f9d35e8061 100644
--- a/mappings/net/minecraft/item/AnimalArmorItem.mapping
+++ b/mappings/net/minecraft/item/AnimalArmorItem.mapping
@@ -2,10 +2,18 @@ CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem
 	FIELD field_47823 entityTexture Lnet/minecraft/class_2960;
 	FIELD field_47824 type Lnet/minecraft/class_4059$class_9076;
 	METHOD  (Lnet/minecraft/class_6880;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_1792$class_1793;)V
+		ARG 1 material
 		ARG 2 type
+		ARG 3 settings
 	METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960;
 	METHOD method_55756 getType ()Lnet/minecraft/class_4059$class_9076;
 	CLASS class_9076 Type
 		FIELD field_47827 textureIdFunction Ljava/util/function/Function;
 		METHOD  (Ljava/lang/String;ILjava/util/function/Function;)V
 			ARG 3 textureIdFunction
+		METHOD method_56686 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
+			ARG 0 id
+		METHOD method_56687 (Ljava/lang/String;)Ljava/lang/String;
+			ARG 0 path
+		METHOD method_56688 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
+			ARG 0 id
diff --git a/mappings/net/minecraft/item/ArmorItem.mapping b/mappings/net/minecraft/item/ArmorItem.mapping
index 6b1bd37c79..c40e188427 100644
--- a/mappings/net/minecraft/item/ArmorItem.mapping
+++ b/mappings/net/minecraft/item/ArmorItem.mapping
@@ -5,6 +5,8 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem
 	FIELD field_7879 DISPENSER_BEHAVIOR Lnet/minecraft/class_2357;
 	FIELD field_7881 material Lnet/minecraft/class_6880;
 	METHOD  (Lnet/minecraft/class_6880;Lnet/minecraft/class_1738$class_8051;Lnet/minecraft/class_1792$class_1793;)V
+		ARG 1 material
+		ARG 2 type
 		ARG 3 settings
 	METHOD method_26353 getToughness ()F
 	METHOD method_48397 (Ljava/util/EnumMap;)V
@@ -18,8 +20,12 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem
 	CLASS class_8051 Type
 		FIELD field_41938 equipmentSlot Lnet/minecraft/class_1304;
 		FIELD field_41939 name Ljava/lang/String;
+		FIELD field_48839 CODEC Lcom/mojang/serialization/Codec;
 		METHOD  (Ljava/lang/String;ILnet/minecraft/class_1304;Ljava/lang/String;)V
 			ARG 3 equipmentSlot
 			ARG 4 name
 		METHOD method_48399 getEquipmentSlot ()Lnet/minecraft/class_1304;
 		METHOD method_48400 getName ()Ljava/lang/String;
+		METHOD method_56690 getMaxDamage (I)I
+			ARG 1 multiplier
+		METHOD method_56691 isTrimmable ()Z
diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping
index 138de11d73..66beb487a8 100644
--- a/mappings/net/minecraft/item/ArmorMaterial.mapping
+++ b/mappings/net/minecraft/item/ArmorMaterial.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial
 	FIELD comp_2301 getRepairIngredient Ljava/util/function/Supplier;
 	FIELD comp_2303 getToughness F
 	FIELD comp_2304 getKnockbackResistance F
+	FIELD field_48840 CODEC Lcom/mojang/serialization/Codec;
 	METHOD comp_2299 getEnchantability ()I
 		COMMENT Returns the base enchantment value used by {@link ArmorItem} with this material.
 		COMMENT
@@ -55,3 +56,22 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial
 		COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial}
 		ARG 1 type
 			COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial}
+	CLASS class_9196 Layer
+		FIELD field_48841 id Lnet/minecraft/class_2960;
+		FIELD field_48842 suffix Ljava/lang/String;
+		FIELD field_48843 dyeable Z
+		FIELD field_48844 layer2Texture Lnet/minecraft/class_2960;
+		FIELD field_48845 layer1Texture Lnet/minecraft/class_2960;
+		METHOD  (Lnet/minecraft/class_2960;)V
+			ARG 1 id
+		METHOD  (Lnet/minecraft/class_2960;Ljava/lang/String;Z)V
+			ARG 1 id
+			ARG 2 suffix
+			ARG 3 dyeable
+		METHOD method_56692 isDyeable ()Z
+		METHOD method_56693 getTexture (Z)Lnet/minecraft/class_2960;
+			ARG 1 secondLayer
+		METHOD method_56694 (ZLjava/lang/String;)Ljava/lang/String;
+			ARG 2 path
+		METHOD method_56695 getTextureId (Z)Lnet/minecraft/class_2960;
+			ARG 1 secondLayer
diff --git a/mappings/net/minecraft/item/ArmorMaterials.mapping b/mappings/net/minecraft/item/ArmorMaterials.mapping
index e8ff472ab3..3b130ae802 100644
--- a/mappings/net/minecraft/item/ArmorMaterials.mapping
+++ b/mappings/net/minecraft/item/ArmorMaterials.mapping
@@ -16,3 +16,22 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials
 		ARG 0 map
 	METHOD method_48412 (Ljava/util/EnumMap;)V
 		ARG 0 map
+	METHOD method_56697 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
+		ARG 0 registry
+	METHOD method_56698 register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/class_6880;FFLjava/util/function/Supplier;)Lnet/minecraft/class_6880;
+		ARG 0 id
+		ARG 1 defense
+		ARG 2 enchantability
+		ARG 3 equipSound
+		ARG 4 toughness
+		ARG 5 knockbackResistance
+		ARG 6 repairIngredient
+	METHOD method_56699 register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/class_6880;FFLjava/util/function/Supplier;Ljava/util/List;)Lnet/minecraft/class_6880;
+		ARG 0 id
+		ARG 1 defense
+		ARG 2 enchantability
+		ARG 3 equipSound
+		ARG 4 toughness
+		ARG 5 knockbackResistance
+		ARG 6 repairIngredient
+		ARG 7 layers
diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping
index cf8b292472..8a8e6404d4 100644
--- a/mappings/net/minecraft/registry/Registries.mapping
+++ b/mappings/net/minecraft/registry/Registries.mapping
@@ -73,6 +73,7 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries
 	FIELD field_46912 POOL_ALIAS_BINDING Lnet/minecraft/class_2378;
 	FIELD field_47496 CRITERION Lnet/minecraft/class_2378;
 	FIELD field_47555 NUMBER_FORMAT_TYPE Lnet/minecraft/class_2378;
+	FIELD field_48976 ARMOR_MATERIAL Lnet/minecraft/class_2378;
 	METHOD method_47450 (Lnet/minecraft/class_2378;)Ljava/lang/Object;
 		ARG 0 registry
 	METHOD method_47451 (Lnet/minecraft/class_2378;)Ljava/lang/Object;

From 4bf445e095d4e2026cf43174843f147b1dfaf544 Mon Sep 17 00:00:00 2001
From: KikuGie 
Date: Thu, 1 Feb 2024 16:41:23 +0100
Subject: [PATCH 28/47] rename extra `Sprite` classes (#3775)

---
 .../minecraft/client/gui/tooltip/BundleTooltipComponent.mapping | 2 +-
 .../texture/atlas/{Sprite.mapping => AtlasSprite.mapping}       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename mappings/net/minecraft/client/texture/atlas/{Sprite.mapping => AtlasSprite.mapping} (97%)

diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping
index 48a6e60488..be20ad9f50 100644
--- a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping
+++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping
@@ -22,7 +22,7 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipCom
 	METHOD method_33290 getRows ()I
 	METHOD method_52755 getColumnsWidth ()I
 	METHOD method_52756 getRowsHeight ()I
-	CLASS class_5771 Sprite
+	CLASS class_5771 SlotSprite
 		FIELD field_28370 width I
 		FIELD field_28371 height I
 		FIELD field_45507 texture Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/client/texture/atlas/Sprite.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasSprite.mapping
similarity index 97%
rename from mappings/net/minecraft/client/texture/atlas/Sprite.mapping
rename to mappings/net/minecraft/client/texture/atlas/AtlasSprite.mapping
index d50ad34d1f..77773da14d 100644
--- a/mappings/net/minecraft/client/texture/atlas/Sprite.mapping
+++ b/mappings/net/minecraft/client/texture/atlas/AtlasSprite.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_7958 net/minecraft/client/texture/atlas/Sprite
+CLASS net/minecraft/class_7958 net/minecraft/client/texture/atlas/AtlasSprite
 	FIELD field_41416 id Lnet/minecraft/class_2960;
 	FIELD field_41417 resource Lnet/minecraft/class_3298;
 	FIELD field_41418 image Ljava/util/concurrent/atomic/AtomicReference;

From 3b275d27070aa2df9a979bd4e824cf7bc3a1ab32 Mon Sep 17 00:00:00 2001
From: modmuss50 
Date: Thu, 1 Feb 2024 16:28:20 +0000
Subject: [PATCH 29/47] 24w05b

---
 build.gradle                                                 | 2 +-
 mappings/net/minecraft/class_8181.mapping                    | 3 ---
 .../net/minecraft/entity/effect/StatusEffectInstance.mapping | 1 -
 .../packet/s2c/play/EntityStatusEffectS2CPacket.mapping      | 4 ++--
 mappings/net/minecraft/util/dynamic/Codecs.mapping           | 5 +----
 5 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 mappings/net/minecraft/class_8181.mapping

diff --git a/build.gradle b/build.gradle
index dd4dcdbb75..1fd1588843 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w05a"
+def minecraft_version = "24w05b"
 
 filament {
 	minecraftVersion = minecraft_version
diff --git a/mappings/net/minecraft/class_8181.mapping b/mappings/net/minecraft/class_8181.mapping
deleted file mode 100644
index 16ba0e32ef..0000000000
--- a/mappings/net/minecraft/class_8181.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_8181
-	CLASS class_9210
-		METHOD method_54080 asBlockEntity ()Lnet/minecraft/class_2586;
diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
index f3d9260c3d..a530a0cbbb 100644
--- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
+++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
@@ -133,7 +133,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 			ARG 0 effect
 	CLASS class_9195 Parameters
 		FIELD field_48822 CODEC Lcom/mojang/serialization/MapCodec;
-		FIELD field_48823 AMPLIFIER_CODEC Lcom/mojang/serialization/Codec;
 		METHOD method_56669 create (IIZZLjava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_1293$class_9195;
 			ARG 0 amplifier
 			ARG 1 duration
diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping
index 3fd9d1dbc0..b39886878c 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping
@@ -3,7 +3,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu
 	FIELD field_12726 duration I
 	FIELD field_12727 entityId I
 	FIELD field_12728 flags B
-	FIELD field_12729 amplifier B
+	FIELD field_12729 amplifier I
 	FIELD field_33356 AMBIENT_MASK I
 	FIELD field_33357 SHOW_PARTICLES_MASK I
 	FIELD field_33358 SHOW_ICON_MASK I
@@ -18,7 +18,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu
 	METHOD method_11942 shouldShowIcon ()Z
 	METHOD method_11943 getEntityId ()I
 	METHOD method_11944 getDuration ()I
-	METHOD method_11945 getAmplifier ()B
+	METHOD method_11945 getAmplifier ()I
 	METHOD method_11946 getEffectId ()Lnet/minecraft/class_6880;
 	METHOD method_11949 shouldShowParticles ()Z
 	METHOD method_11950 isAmbient ()Z
diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping
index 83aaa766c1..3160af4da8 100644
--- a/mappings/net/minecraft/util/dynamic/Codecs.mapping
+++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping
@@ -300,8 +300,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 		ARG 2 typeCodec
 		ARG 3 typeGetter
 		ARG 4 parametersCodecGetter
-	METHOD method_56627 createRecursiveMap (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
-		ARG 0 codecFunction
+	METHOD method_56627 createRecursiveMap (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
 	CLASS 1
 		METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult;
 			ARG 1 ops
@@ -488,8 +487,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 			ARG 1 map
 	CLASS class_9181 RecursiveMap
 		FIELD field_48804 supplier Ljava/util/function/Supplier;
-		METHOD  (Ljava/util/function/Function;)V
-			ARG 1 codecFunction
 		METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult;
 			ARG 1 ops
 			ARG 2 input

From 08f2d8fcdf6e1ae2baad918ef730a1d4006b89ea Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:02:58 +0900
Subject: [PATCH 30/47] 24w05a stuff (#3780)

* 24w05a stuff

* More stuff

* Fix capitalization

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../block/spawner/TrialSpawnerConfig.mapping  |  2 +
 .../minecraft/block/vault/VaultConfig.mapping |  2 +
 mappings/net/minecraft/class_9187.mapping     |  6 ---
 .../minecraft/client/gui/hud/DebugHud.mapping |  6 +++
 .../network/ClientPlayNetworkHandler.mapping  |  1 +
 .../network/DebugSampleSubscriber.mapping}    |  5 +-
 .../client/option/HotbarStorage.mapping       |  2 +
 .../client/option/HotbarStorageEntry.mapping  | 24 ++++++++-
 .../client/render/WorldRenderer.mapping       |  1 +
 .../client/util/math/MatrixStack.mapping      | 10 ++++
 .../command/CommandRegistryAccess.mapping     |  3 ++
 .../command/DataCommandStorage.mapping        |  1 +
 .../ItemPredicateArgumentType.mapping         |  1 +
 .../argument/ItemPredicateReader.mapping      | 52 +++++++++++++++++++
 .../ItemPredicateStringReader.mapping         | 15 ++++++
 .../argument/ItemStackArgumentType.mapping    |  1 +
 .../command/argument/ItemStringReader.mapping |  5 ++
 .../ParticleEffectArgumentType.mapping        |  3 ++
 .../argument/StyleArgumentType.mapping        |  4 ++
 .../argument/TagKeyArgumentType.mapping       | 10 ----
 .../command/argument/TextArgumentType.mapping |  4 ++
 mappings/net/minecraft/entity/Entity.mapping  |  2 +-
 .../net/minecraft/entity/LivingEntity.mapping |  1 +
 .../effect/StatusEffectInstance.mapping       |  4 ++
 .../entity/mob/ZombieVillagerEntity.mapping   |  2 +
 .../entity/passive/MerchantEntity.mapping     |  3 ++
 .../entity/passive/VillagerEntity.mapping     |  2 +
 mappings/net/minecraft/item/Items.mapping     |  1 +
 .../item/map/MapBannerMarker.mapping          |  6 ---
 .../net/minecraft/item/map/MapIcon.mapping    |  6 ---
 .../loot/context/LootContextTypes.mapping     |  2 +
 .../minecraft/network/PacketByteBuf.mapping   |  3 --
 .../network/codec/PacketCodecs.mapping        | 21 ++++++++
 .../s2c/common/StoreCookieS2CPacket.mapping   |  1 +
 .../play/CommandSuggestionsS2CPacket.mapping  |  2 +
 .../s2c/play/MapUpdateS2CPacket.mapping       |  2 +
 .../net/minecraft/registry/Registry.mapping   |  4 --
 .../minecraft/registry/RegistryOps.mapping    |  3 ++
 .../screen/HorseScreenHandler.mapping         |  1 +
 .../minecraft/server/DataPackContents.mapping |  1 +
 .../minecraft/server/MinecraftServer.mapping  |  6 ++-
 .../server/SampleSubscriptionTracker.mapping  |  4 +-
 .../server/command/CommandManager.mapping     |  3 ++
 .../MinecraftDedicatedServer.mapping          |  2 +
 .../net/minecraft/test/TestServer.mapping     |  1 +
 .../minecraft/util/DebugSampleType.mapping    |  1 -
 .../net/minecraft/util/dynamic/Codecs.mapping |  8 +++
 .../minecraft/util/math/MatrixUtil.mapping    |  4 ++
 .../MultiValueDebugSampleLogImpl.mapping      |  9 ++++
 .../util/profiler/PerformanceLog.mapping      |  6 ---
 .../profiler/log/ArrayDebugSampleLog.mapping  |  8 +++
 .../util/profiler/log/DebugSampleLog.mapping  |  8 +++
 .../util/profiler/log/DebugSampleType.mapping |  1 +
 .../log/MultiValueDebugSampleLog.mapping      |  9 ++++
 .../log/SubscribableDebugSampleLog.mapping    | 12 +++++
 .../net/minecraft/world/WorldEvents.mapping   |  6 +--
 .../storage/ChunkCompressionFormat.mapping    |  1 +
 57 files changed, 262 insertions(+), 52 deletions(-)
 delete mode 100644 mappings/net/minecraft/class_9187.mapping
 rename mappings/net/minecraft/{class_9211.mapping => client/network/DebugSampleSubscriber.mapping} (63%)
 create mode 100644 mappings/net/minecraft/command/argument/ItemPredicateReader.mapping
 create mode 100644 mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping
 delete mode 100644 mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping
 delete mode 100644 mappings/net/minecraft/util/DebugSampleType.mapping
 create mode 100644 mappings/net/minecraft/util/profiler/MultiValueDebugSampleLogImpl.mapping
 delete mode 100644 mappings/net/minecraft/util/profiler/PerformanceLog.mapping
 create mode 100644 mappings/net/minecraft/util/profiler/log/ArrayDebugSampleLog.mapping
 create mode 100644 mappings/net/minecraft/util/profiler/log/DebugSampleLog.mapping
 create mode 100644 mappings/net/minecraft/util/profiler/log/DebugSampleType.mapping
 create mode 100644 mappings/net/minecraft/util/profiler/log/MultiValueDebugSampleLog.mapping
 create mode 100644 mappings/net/minecraft/util/profiler/log/SubscribableDebugSampleLog.mapping

diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping
index 84b608814b..6437c6a9f5 100644
--- a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping
+++ b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping
@@ -3,5 +3,7 @@ CLASS net/minecraft/class_8965 net/minecraft/block/spawner/TrialSpawnerConfig
 	FIELD field_47368 codec Lcom/mojang/serialization/MapCodec;
 	METHOD method_55179 getTotalMobs (I)I
 		ARG 1 additionalPlayers
+	METHOD method_55180 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
 	METHOD method_55181 getSimultaneousMobs (I)I
 		ARG 1 additionalPlayers
diff --git a/mappings/net/minecraft/block/vault/VaultConfig.mapping b/mappings/net/minecraft/block/vault/VaultConfig.mapping
index 319fdd50fb..c390182e74 100644
--- a/mappings/net/minecraft/block/vault/VaultConfig.mapping
+++ b/mappings/net/minecraft/block/vault/VaultConfig.mapping
@@ -8,4 +8,6 @@ CLASS net/minecraft/class_9203 net/minecraft/block/vault/VaultConfig
 		ARG 4 deactivationRange
 		ARG 6 keyItem
 		ARG 7 overrideLootTableToDisplay
+	METHOD method_56764 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
 	METHOD method_56765 validate ()Lcom/mojang/serialization/DataResult;
diff --git a/mappings/net/minecraft/class_9187.mapping b/mappings/net/minecraft/class_9187.mapping
deleted file mode 100644
index 4c99866023..0000000000
--- a/mappings/net/minecraft/class_9187.mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-CLASS net/minecraft/class_9187
-	FIELD field_48806 defaultArray [J
-	FIELD field_48807 array [J
-	METHOD  (I[J)V
-		ARG 1 size
-		ARG 2 def
diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
index 5219ac5c58..04babc2b55 100644
--- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
+++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
@@ -21,6 +21,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
 	FIELD field_45993 tickNanosLog Lnet/minecraft/class_9191;
 	FIELD field_45994 pingLog Lnet/minecraft/class_9191;
 	FIELD field_45995 packetSizeLog Lnet/minecraft/class_9191;
+	FIELD field_48931 receivedDebugSamples Ljava/util/Map;
+	METHOD  (Lnet/minecraft/class_310;)V
+		ARG 1 client
 	METHOD method_1834 getChunk ()Lnet/minecraft/class_2818;
 	METHOD method_1835 getLeftText ()Ljava/util/List;
 	METHOD method_1836 getClientChunk ()Lnet/minecraft/class_2818;
@@ -78,6 +81,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
 	METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_9191;
 	METHOD method_53545 clear ()V
 	METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_9191;
+	METHOD method_56828 set ([JLnet/minecraft/class_9192;)V
+		ARG 1 values
+		ARG 2 type
 	METHOD method_56829 shouldRenderTickCharts ()Z
 	CLASS class_7412 AllocationRateCalculator
 		FIELD field_38986 INTERVAL I
diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index e4f35894f2..807f0a2e17 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -34,6 +34,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	FIELD field_46578 worldLoadingState Lnet/minecraft/class_8819;
 	FIELD field_47878 scoreboard Lnet/minecraft/class_269;
 	FIELD field_48403 secureChatEnforced Z
+	FIELD field_48933 debugSampleSubscriber Lnet/minecraft/class_9211;
 	METHOD  (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
 		ARG 1 client
 	METHOD method_16690 getSessionId ()Ljava/util/UUID;
diff --git a/mappings/net/minecraft/class_9211.mapping b/mappings/net/minecraft/client/network/DebugSampleSubscriber.mapping
similarity index 63%
rename from mappings/net/minecraft/class_9211.mapping
rename to mappings/net/minecraft/client/network/DebugSampleSubscriber.mapping
index 16cfca4492..8e4529069a 100644
--- a/mappings/net/minecraft/class_9211.mapping
+++ b/mappings/net/minecraft/client/network/DebugSampleSubscriber.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_9211
+CLASS net/minecraft/class_9211 net/minecraft/client/network/DebugSampleSubscriber
 	FIELD field_48934 TIMEOUT I
 	FIELD field_48935 networkHandler Lnet/minecraft/class_634;
 	FIELD field_48936 debugHud Lnet/minecraft/class_340;
@@ -6,5 +6,6 @@ CLASS net/minecraft/class_9211
 	METHOD  (Lnet/minecraft/class_634;Lnet/minecraft/class_340;)V
 		ARG 1 handler
 		ARG 2 hud
-	METHOD method_56831 update (Lnet/minecraft/class_9192;)V
+	METHOD method_56830 tick ()V
+	METHOD method_56831 subscribe (Lnet/minecraft/class_9192;)V
 		ARG 1 type
diff --git a/mappings/net/minecraft/client/option/HotbarStorage.mapping b/mappings/net/minecraft/client/option/HotbarStorage.mapping
index 52e85f71fa..d35f199995 100644
--- a/mappings/net/minecraft/client/option/HotbarStorage.mapping
+++ b/mappings/net/minecraft/client/option/HotbarStorage.mapping
@@ -12,3 +12,5 @@ CLASS net/minecraft/class_302 net/minecraft/client/option/HotbarStorage
 	METHOD method_1410 getSavedHotbar (I)Lnet/minecraft/class_748;
 		ARG 1 i
 	METHOD method_1411 load ()V
+	METHOD method_56825 (Ljava/lang/String;)V
+		ARG 0 error
diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
index 7bdf956982..87b50bb075 100644
--- a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
+++ b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
@@ -2,8 +2,28 @@ CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry
 	FIELD field_48942 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_48943 LOGGER Lorg/slf4j/Logger;
 	FIELD field_48944 HOTBAR_SIZE I
-	METHOD method_56836 (Lnet/minecraft/class_1661;Lnet/minecraft/class_5455;)V
+	FIELD field_48945 NBT_OPS Lcom/mojang/serialization/DynamicOps;
+	FIELD field_48946 EMPTY_STACK Lcom/mojang/serialization/Dynamic;
+	FIELD field_48947 stacks Ljava/util/List;
+	METHOD  (Ljava/util/List;)V
+		ARG 1 stacks
+	METHOD method_56835 isEmpty ()Z
+	METHOD method_56836 serialize (Lnet/minecraft/class_1661;Lnet/minecraft/class_5455;)V
 		ARG 1 playerInventory
 		ARG 2 registryManager
-	METHOD method_56839 (Lnet/minecraft/class_7225$class_7874;)Ljava/util/List;
+	METHOD method_56837 isEmpty (Lcom/mojang/serialization/Dynamic;)Z
+		ARG 0 stack
+	METHOD method_56838 (Lnet/minecraft/class_748;)Ljava/util/List;
+		ARG 0 entry
+	METHOD method_56839 deserialize (Lnet/minecraft/class_7225$class_7874;)Ljava/util/List;
 		ARG 1 registryLookup
+	METHOD method_56840 (Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_1799;
+		ARG 1 stack
+	METHOD method_56841 (Ljava/lang/String;)V
+		ARG 0 error
+	METHOD method_56842 (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 0 stacks
+	METHOD method_56843 (Lnet/minecraft/class_2520;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 nbt
+	METHOD method_56844 (Ljava/lang/String;)V
+		ARG 0 error
diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping
index 3e06c8f2b9..4fcd68c6a9 100644
--- a/mappings/net/minecraft/client/render/WorldRenderer.mapping
+++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping
@@ -413,6 +413,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 1 song
 		ARG 2 songPosition
 	METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V
+		ARG 1 parameters
 		ARG 2 shouldAlwaysSpawn
 		ARG 3 important
 		ARG 4 x
diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping
index 7aeba81bfe..3524880539 100644
--- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping
+++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping
@@ -60,6 +60,7 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack
 	CLASS class_4665 Entry
 		FIELD field_21327 positionMatrix Lorg/joml/Matrix4f;
 		FIELD field_21328 normalMatrix Lorg/joml/Matrix3f;
+		FIELD field_48930 canSkipNormalization Z
 		METHOD  (Lnet/minecraft/class_4587$class_4665;)V
 			ARG 1 matrix
 		METHOD  (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)V
@@ -69,4 +70,13 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack
 			COMMENT {@return the matrix used to transform positions}
 		METHOD method_23762 getNormalMatrix ()Lorg/joml/Matrix3f;
 			COMMENT {@return the matrix used to transform normal vectors}
+		METHOD method_56820 transformNormal (FFFLorg/joml/Vector3f;)Lorg/joml/Vector3f;
+			ARG 1 x
+			ARG 2 y
+			ARG 3 z
+			ARG 4 dest
+		METHOD method_56821 transformNormal (Lorg/joml/Vector3f;Lorg/joml/Vector3f;)Lorg/joml/Vector3f;
+			ARG 1 vec
+			ARG 2 dest
 		METHOD method_56822 copy ()Lnet/minecraft/class_4587$class_4665;
+		METHOD method_56823 computeNormal ()V
diff --git a/mappings/net/minecraft/command/CommandRegistryAccess.mapping b/mappings/net/minecraft/command/CommandRegistryAccess.mapping
index 26757a456b..449aa9a03b 100644
--- a/mappings/net/minecraft/command/CommandRegistryAccess.mapping
+++ b/mappings/net/minecraft/command/CommandRegistryAccess.mapping
@@ -8,3 +8,6 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess
 	METHOD method_46722 of (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157;
 		ARG 0 wrapperLookup
 		ARG 1 enabledFeatures
+	CLASS 1
+		METHOD method_56810 (Lnet/minecraft/class_7699;Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226;
+			ARG 1 wrapper
diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping
index 4d170c6a35..15b8cfcf0b 100644
--- a/mappings/net/minecraft/command/DataCommandStorage.mapping
+++ b/mappings/net/minecraft/command/DataCommandStorage.mapping
@@ -18,6 +18,7 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage
 		ARG 2 nbt
 	METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_4565$class_4566;
 		ARG 2 nbt
+		ARG 3 registryLookup
 	METHOD method_52614 getPersistentStateType (Ljava/lang/String;)Lnet/minecraft/class_18$class_8645;
 		ARG 1 namespace
 	CLASS class_4566 PersistentState
diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping
index 69fd10f438..e8182e1f3a 100644
--- a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgumentType
 	FIELD field_10812 EXAMPLES Ljava/util/Collection;
+	FIELD field_48959 reader Lnet/minecraft/class_9215;
 	METHOD  (Lnet/minecraft/class_7157;)V
 		ARG 1 commandRegistryAccess
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
diff --git a/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping b/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping
new file mode 100644
index 0000000000..8bc4d2a30e
--- /dev/null
+++ b/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping
@@ -0,0 +1,52 @@
+CLASS net/minecraft/class_9216 net/minecraft/command/argument/ItemPredicateReader
+	FIELD field_48963 INVALID_ID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_48964 INVALID_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_48965 HASH C
+	FIELD field_48966 CURLY_OPEN_BRACKET C
+	FIELD field_48967 DEFAULT_SUGGESTOR Ljava/util/function/Function;
+	FIELD field_48968 itemRegistry Lnet/minecraft/class_7225$class_7226;
+	FIELD field_48969 allowTags Z
+	METHOD  (Lnet/minecraft/class_7225$class_7874;Z)V
+		ARG 1 registryLookup
+		ARG 2 allowTags
+	METHOD method_56865 read (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_9216$class_9219;)V
+		ARG 1 reader
+		ARG 2 callbacks
+	METHOD method_56866 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 builder
+	METHOD method_56867 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 tag
+	METHOD method_56868 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 id
+	CLASS class_9217 Reader
+		FIELD field_48971 reader Lcom/mojang/brigadier/StringReader;
+		FIELD field_48972 callbacks Lnet/minecraft/class_9216$class_9219;
+		METHOD  (Lnet/minecraft/class_9216;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_9216$class_9219;)V
+			ARG 2 reader
+			ARG 3 callbacks
+		METHOD method_56869 suggest ()V
+		METHOD method_56871 suggestCurlyBraceIfPossible (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_56872 readItem ()V
+		METHOD method_56874 suggestItems (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_56875 readTag ()V
+		METHOD method_56876 suggestTags (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_56877 readNbt ()V
+		METHOD method_56878 suggestAll (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+	CLASS class_9218 SuggestionCallbacks
+		FIELD field_48973 suggestor Ljava/util/function/Function;
+		METHOD method_56879 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lcom/mojang/brigadier/StringReader;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+			ARG 2 reader
+	CLASS class_9219 Callbacks
+		METHOD method_56853 onItem (Lnet/minecraft/class_6880;)V
+			ARG 1 item
+		METHOD method_56854 setNbt (Lnet/minecraft/class_2487;)V
+			ARG 1 nbt
+		METHOD method_56862 onTag (Lnet/minecraft/class_6885;)V
+			ARG 1 tag
+		METHOD method_56880 setSuggestor (Ljava/util/function/Function;)V
+			ARG 1 suggestor
diff --git a/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping b/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping
new file mode 100644
index 0000000000..6aa8685f75
--- /dev/null
+++ b/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping
@@ -0,0 +1,15 @@
+CLASS net/minecraft/class_9215 net/minecraft/command/argument/ItemPredicateStringReader
+	FIELD field_48960 predicateReader Lnet/minecraft/class_9216;
+	METHOD  (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
+	METHOD method_56859 read (Lcom/mojang/brigadier/StringReader;)Ljava/util/function/Predicate;
+		ARG 1 reader
+	METHOD method_56860 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 builder
+	CLASS 1
+		METHOD method_56861 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1799;)Z
+			ARG 1 stack
+		METHOD method_56863 (Lnet/minecraft/class_6885;Lnet/minecraft/class_1799;)Z
+			ARG 1 stack
+		METHOD method_56864 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1799;)Z
+			ARG 1 stack
diff --git a/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping
index d77f7a9e94..a82561f142 100644
--- a/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_2287 net/minecraft/command/argument/ItemStackArgumentType
 	FIELD field_10790 EXAMPLES Ljava/util/Collection;
+	FIELD field_48954 reader Lnet/minecraft/class_2291;
 	METHOD  (Lnet/minecraft/class_7157;)V
 		ARG 1 commandRegistryAccess
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping
index fe677f619a..19677e83e2 100644
--- a/mappings/net/minecraft/command/argument/ItemStringReader.mapping
+++ b/mappings/net/minecraft/command/argument/ItemStringReader.mapping
@@ -1,4 +1,9 @@
 CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
+	FIELD field_48955 predicateReader Lnet/minecraft/class_9216;
+	METHOD  (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
 	METHOD method_9789 consume (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2291$class_7215;
+		ARG 1 reader
 	METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 builder
 	CLASS class_7215 ItemResult
diff --git a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
index 7eb7de6ab6..4c192b59ee 100644
--- a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType
+	FIELD field_48929 registryLookup Lnet/minecraft/class_7225$class_7874;
 	FIELD field_9935 EXAMPLES Ljava/util/Collection;
 	FIELD field_9936 UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	METHOD  (Lnet/minecraft/class_7157;)V
@@ -13,11 +14,13 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgu
 		ARG 0 registryAccess
 	METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 		ARG 0 reader
+		ARG 1 registryLookup
 	METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
 	METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 		ARG 0 reader
 		ARG 1 type
+		ARG 2 registryLookup
 	METHOD method_9421 getParticle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2394;
 		ARG 0 context
 		ARG 1 name
diff --git a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping
index da68dcdbf7..f2e6333a1f 100644
--- a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping
@@ -1,7 +1,11 @@
 CLASS net/minecraft/class_9019 net/minecraft/command/argument/StyleArgumentType
 	FIELD field_47553 INVALID_STYLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_47554 EXAMPLES Ljava/util/Collection;
+	FIELD field_48932 registryLookup Lnet/minecraft/class_7225$class_7874;
+	METHOD  (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
 	METHOD method_55446 style (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9019;
+		ARG 0 registryAccess
 	METHOD method_55448 getStyle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2583;
 		ARG 0 context
 		ARG 1 style
diff --git a/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping b/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping
deleted file mode 100644
index 1d609510b4..0000000000
--- a/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping
+++ /dev/null
@@ -1,10 +0,0 @@
-CLASS net/minecraft/class_9216 net/minecraft/command/argument/TagKeyArgumentType
-	FIELD field_48963 ERROR_INVALID Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_48964 ERROR_UNKNOWN Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_48965 TAG_PREFIX C
-	FIELD field_48966 NBT_OPENING C
-	FIELD field_48968 registryWrapper Lnet/minecraft/class_7225$class_7226;
-	METHOD method_56867 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 data
-	METHOD method_56868 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 data
diff --git a/mappings/net/minecraft/command/argument/TextArgumentType.mapping b/mappings/net/minecraft/command/argument/TextArgumentType.mapping
index 8873354a7b..9a96f80f73 100644
--- a/mappings/net/minecraft/command/argument/TextArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/TextArgumentType.mapping
@@ -1,10 +1,14 @@
 CLASS net/minecraft/class_2178 net/minecraft/command/argument/TextArgumentType
+	FIELD field_48917 registryLookup Lnet/minecraft/class_7225$class_7874;
 	FIELD field_9841 EXAMPLES Ljava/util/Collection;
 	FIELD field_9842 INVALID_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	METHOD  (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
 	METHOD method_9280 getTextArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 0 context
 		ARG 1 name
 	METHOD method_9281 text (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2178;
+		ARG 0 registryAccess
 	METHOD method_9282 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 text
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 1f14f4edf5..b6efda6d99 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -484,7 +484,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT Removes this entity from the current dimension.
 		COMMENT
 		COMMENT 
    This calls {@link #setRemoved} by default. Subclasses can add other logics,
-		COMMENT such as setting the stack count of {@linkplain #getItemsEquipped equipped stacks}
+		COMMENT such as setting the stack count of {@linkplain LivingEntity#getEquippedItems equipped stacks}
 		COMMENT to zero.
 		COMMENT
 		COMMENT @see #moveToWorld
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index fe1389fa08..5aca2ba5bd 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -24,6 +24,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	FIELD field_42108 limbAnimator Lnet/minecraft/class_8080;
 	FIELD field_45123 serverHeadYaw D
 	FIELD field_45740 ACTIVE_EFFECTS_NBT_KEY Ljava/lang/String;
+	FIELD field_48826 syncedBodyArmorStack Lnet/minecraft/class_1799;
 	FIELD field_6210 bodyTrackingIncrements I
 	FIELD field_6212 sidewaysSpeed F
 	FIELD field_6213 deathTime I
diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
index a530a0cbbb..c7690c7d31 100644
--- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
+++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
@@ -8,6 +8,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 	FIELD field_42106 INFINITE I
 	FIELD field_47739 fading Lnet/minecraft/class_1293$class_9063;
 	FIELD field_48821 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_49014 MIN_AMPLIFIER I
+	FIELD field_49015 MAX_AMPLIFIER I
 	FIELD field_5889 showIcon Z
 	FIELD field_5890 showParticles Z
 	FIELD field_5892 ambient Z
@@ -142,5 +144,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 			ARG 5 hiddenEffect
 		METHOD method_56670 (Lnet/minecraft/class_1293$class_9195;)Ljava/util/Optional;
 			ARG 0 parameters
+		METHOD method_56671 (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/MapCodec;
+			ARG 0 codec
 		METHOD method_56672 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 1 instance
diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
index 715f426659..31ac264e8e 100644
--- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
@@ -17,6 +17,8 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
 	METHOD method_35194 getXp ()I
 	METHOD method_40125 (Lnet/minecraft/class_6880$class_6883;)V
 		ARG 1 profession
+	METHOD method_56681 (Lnet/minecraft/class_1916;)V
+		ARG 1 offerData
 	METHOD method_7194 getConversionRate ()I
 	METHOD method_7197 finishConversion (Lnet/minecraft/class_3218;)V
 		ARG 1 world
diff --git a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping
index 3095eacde3..754ccbb84f 100644
--- a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity
 	FIELD field_17723 inventory Lnet/minecraft/class_1277;
 	FIELD field_19295 HEAD_ROLLING_TIME_LEFT Lnet/minecraft/class_2940;
 	FIELD field_30600 INVENTORY_SIZE I
+	FIELD field_48833 LOGGER Lorg/slf4j/Logger;
 	METHOD method_18007 produceParticles (Lnet/minecraft/class_2394;)V
 		ARG 1 parameters
 	METHOD method_18008 afterUsing (Lnet/minecraft/class_1914;)V
@@ -20,4 +21,6 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity
 	METHOD method_20506 getHeadRollingTimeLeft ()I
 	METHOD method_20507 setHeadRollingTimeLeft (I)V
 		ARG 1 ticks
+	METHOD method_56682 (Lnet/minecraft/class_1916;)V
+		ARG 1 offers
 	METHOD method_7237 fillRecipes ()V
diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
index 943ab7cd1d..fde2b2d9b9 100644
--- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
@@ -104,5 +104,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
 	METHOD method_49695 sendOffersToCustomer ()V
 	METHOD method_51304 (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
+	METHOD method_56683 (Lnet/minecraft/class_3850;)V
+		ARG 1 villagerData
 	METHOD method_7234 wantsToStartBreeding ()Z
 	METHOD method_7239 canBreed ()Z
diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping
index 54689cd593..2e814c5d9e 100644
--- a/mappings/net/minecraft/item/Items.mapping
+++ b/mappings/net/minecraft/item/Items.mapping
@@ -418,6 +418,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items
 	FIELD field_47025 WAXED_OXIDIZED_COPPER_BULB Lnet/minecraft/class_1792;
 	FIELD field_47026 CHISELED_TUFF_BRICKS Lnet/minecraft/class_1792;
 	FIELD field_47314 TRIAL_SPAWNER Lnet/minecraft/class_1792;
+	FIELD field_48847 VAULT Lnet/minecraft/class_1792;
 	FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792;
 	FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792;
 	FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792;
diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping
index d3def763a6..f5ac83e9aa 100644
--- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping
+++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping
@@ -2,17 +2,11 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker
 	COMMENT Represents a banner marker in world.
 	COMMENT 
    
 	COMMENT Used to track banners in a map state.
-	FIELD comp_2312 pos Lnet/minecraft/class_2338;
-	FIELD comp_2313 color Lnet/minecraft/class_1767;
-	FIELD comp_2314 name Ljava/util/Optional;
 	FIELD field_48918 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_48919 LIST_CODEC Lcom/mojang/serialization/Codec;
 	METHOD  (Lnet/minecraft/class_2338;Lnet/minecraft/class_1767;Ljava/util/Optional;)V
 		ARG 1 pos
 		ARG 2 dyeColor
-	METHOD comp_2312 pos ()Lnet/minecraft/class_2338;
-	METHOD comp_2313 color ()Lnet/minecraft/class_1767;
-	METHOD comp_2314 name ()Ljava/util/Optional;
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_56812 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping
index 27bd7cc5b8..5c5437bb30 100644
--- a/mappings/net/minecraft/item/map/MapIcon.mapping
+++ b/mappings/net/minecraft/item/map/MapIcon.mapping
@@ -1,20 +1,14 @@
 CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon
-	FIELD comp_1842 type Lnet/minecraft/class_20$class_21;
-	FIELD comp_1843 x B
 	FIELD comp_1844 z B
 	FIELD comp_1845 rotation B
-	FIELD comp_1846 text Ljava/util/Optional;
 	FIELD field_48920 CODEC Lnet/minecraft/class_9139;
 	METHOD  (Lnet/minecraft/class_20$class_21;BBBLjava/util/Optional;)V
 		ARG 1 type
 		ARG 2 x
 		ARG 3 z
 		ARG 4 rotation
-	METHOD comp_1842 type ()Lnet/minecraft/class_20$class_21;
-	METHOD comp_1843 x ()B
 	METHOD comp_1844 z ()B
 	METHOD comp_1845 rotation ()B
-	METHOD comp_1846 text ()Ljava/util/Optional;
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_92 getTypeId ()B
diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping
index e41a345930..7a19a3b8fc 100644
--- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping
+++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping
@@ -21,6 +21,8 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes
 		ARG 0 id
 	METHOD method_56128 (Lnet/minecraft/class_176$class_177;)V
 		ARG 0 builder
+	METHOD method_56818 (Lnet/minecraft/class_176$class_177;)V
+		ARG 0 builder
 	METHOD method_755 (Lnet/minecraft/class_176$class_177;)V
 		ARG 0 builder
 	METHOD method_756 (Lnet/minecraft/class_176$class_177;)V
diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping
index 3f405476de..54edb1610b 100644
--- a/mappings/net/minecraft/network/PacketByteBuf.mapping
+++ b/mappings/net/minecraft/network/PacketByteBuf.mapping
@@ -60,9 +60,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 	COMMENT  {@link Quaternionf}{@link #readQuaternionf()}{@link #writeQuaternionf(Quaternionf)}
 	COMMENT 
 	COMMENT 
-	COMMENT  {@link Text}{@link #readText()}{@link #writeText(Text)}
-	COMMENT 
-	COMMENT 
 	COMMENT  {@link Enum}{@link #readEnumConstant(Class)}{@link #writeEnumConstant(Enum)}
 	COMMENT 
 	COMMENT 
diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
index 51db7a421c..203e8dd95a 100644
--- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping
+++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
@@ -72,6 +72,11 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		COMMENT
 		COMMENT @see net.minecraft.network.PacketByteBuf#readQuaternionf()
 		COMMENT @see net.minecraft.network.PacketByteBuf#writeQuaternionf(Quaternionf)
+	FIELD field_48987 BYTE_ARRAY Lnet/minecraft/class_9139;
+		COMMENT A codec for a byte array.
+		COMMENT
+		COMMENT @see net.minecraft.network.PacketByteBuf#readByteArray()
+		COMMENT @see net.minecraft.network.PacketByteBuf#writeByteArray(byte[])
 	METHOD method_56363 toList ()Lnet/minecraft/class_9139$class_9140;
 		COMMENT Used to make a codec for a list of values using {@link PacketCodec#collect}.
 		COMMENT This creates an {@link java.util.ArrayList}, so the decoded result can be modified.
@@ -216,9 +221,19 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 	METHOD method_56385 (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139;
 		ARG 0 codec
 	METHOD method_56895 byteArray (I)Lnet/minecraft/class_9139;
+		COMMENT {@return a codec for a byte array with maximum length {@code maxLength}}
+		COMMENT
+		COMMENT @see #BYTE_ARRAY
+		COMMENT @see net.minecraft.network.PacketByteBuf#readByteArray(ByteBuf, int)
+		COMMENT @see net.minecraft.network.PacketByteBuf#writeByteArray(ByteBuf, byte[])
 		ARG 0 maxLength
 	METHOD method_56896 registryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139;
 		ARG 0 codec
+	CLASS 4
+		METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException;
+			ARG 1 error
+		METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException;
+			ARG 1 error
 	CLASS 10
 		METHOD method_56419 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V
 			ARG 3 k
@@ -236,3 +251,9 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V
 			ARG 1 buf
 			ARG 2 value
+	CLASS 22
+		METHOD method_56407 read (Lio/netty/buffer/ByteBuf;)[B
+			ARG 1 buf
+		METHOD method_56408 write (Lio/netty/buffer/ByteBuf;[B)V
+			ARG 1 buf
+			ARG 2 value
diff --git a/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping
index 7879633c2d..ff5a6ad1b1 100644
--- a/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket.mapping
@@ -1,6 +1,7 @@
 CLASS net/minecraft/class_9150 net/minecraft/network/packet/s2c/common/StoreCookieS2CPacket
 	FIELD field_48627 CODEC Lnet/minecraft/class_9139;
 	FIELD field_48628 MAX_COOKIE_LENGTH I
+	FIELD field_49011 COOKIE_PACKET_CODEC Lnet/minecraft/class_9139;
 	METHOD  (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD method_56467 write (Lnet/minecraft/class_2540;)V
diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping
index 12080463b0..674c216ba3 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping
@@ -4,6 +4,8 @@ CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSugg
 		ARG 1 completionId
 		ARG 2 suggestions
 	METHOD method_11397 getSuggestions ()Lcom/mojang/brigadier/suggestion/Suggestions;
+	METHOD method_56608 (Lcom/mojang/brigadier/context/StringRange;Lnet/minecraft/class_2639$class_9177;)Lcom/mojang/brigadier/suggestion/Suggestion;
+		ARG 1 suggestion
 	METHOD method_56609 (Lcom/mojang/brigadier/suggestion/Suggestion;)Lnet/minecraft/class_2639$class_9177;
 		ARG 0 suggestion
 	CLASS class_9177 Suggestion
diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
index 6b9b80b365..7804e4914c 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping
@@ -12,3 +12,5 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2
 	METHOD comp_2274 updateData ()Ljava/util/Optional;
 	METHOD method_11642 apply (Lnet/minecraft/class_22;)V
 		ARG 1 mapState
+	METHOD method_56618 (Lnet/minecraft/class_22;Lnet/minecraft/class_22$class_5637;)V
+		ARG 1 updateData
diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping
index ffec291a6b..f9b1ec74d1 100644
--- a/mappings/net/minecraft/registry/Registry.mapping
+++ b/mappings/net/minecraft/registry/Registry.mapping
@@ -259,13 +259,9 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
 	METHOD method_46771 getReadOnlyWrapper ()Lnet/minecraft/class_7225$class_7226;
 		COMMENT {@return a registry wrapper that does not mutate the backing registry under
 		COMMENT any circumstances}
-		COMMENT
-		COMMENT @see net.minecraft.command.CommandRegistryAccess.EntryListCreationPolicy#FAIL
 	METHOD method_46772 getTagCreatingWrapper ()Lnet/minecraft/class_7225$class_7226;
 		COMMENT {@return a registry wrapper that creates and stores a new registry entry list
 		COMMENT when handling an unknown tag key}
-		COMMENT
-		COMMENT @see net.minecraft.command.CommandRegistryAccess.EntryListCreationPolicy#CREATE_NEW
 	METHOD method_47441 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle;
 		ARG 1 entry
 	METHOD method_47442 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle;
diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping
index d658178f8d..cacc844015 100644
--- a/mappings/net/minecraft/registry/RegistryOps.mapping
+++ b/mappings/net/minecraft/registry/RegistryOps.mapping
@@ -31,6 +31,9 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps
 		ARG 0 registryRef
 	METHOD method_46637 getEntryCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
 		ARG 0 key
+	METHOD method_56622 withRegistry (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_7225$class_7874;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+		ARG 1 registryLookup
 	CLASS 1
 		FIELD field_40854 registryRefToInfo Ljava/util/Map;
 	CLASS 2
diff --git a/mappings/net/minecraft/screen/HorseScreenHandler.mapping b/mappings/net/minecraft/screen/HorseScreenHandler.mapping
index 016ab5d2b3..7bb375e49f 100644
--- a/mappings/net/minecraft/screen/HorseScreenHandler.mapping
+++ b/mappings/net/minecraft/screen/HorseScreenHandler.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_1724 net/minecraft/screen/HorseScreenHandler
+	FIELD field_48834 horseArmorInventory Lnet/minecraft/class_1263;
 	FIELD field_7836 inventory Lnet/minecraft/class_1263;
 	FIELD field_7837 entity Lnet/minecraft/class_1496;
 	METHOD  (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_1496;)V
diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping
index 1a8d2fc862..f1da2af91e 100644
--- a/mappings/net/minecraft/server/DataPackContents.mapping
+++ b/mappings/net/minecraft/server/DataPackContents.mapping
@@ -12,6 +12,7 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
 	FIELD field_25341 serverAdvancementLoader Lnet/minecraft/class_2989;
 	FIELD field_25342 functionLoader Lnet/minecraft/class_5349;
 	FIELD field_36491 LOGGER Lorg/slf4j/Logger;
+	FIELD field_48785 registryLookup Lnet/minecraft/class_5350$class_9180;
 	METHOD  (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;I)V
 		ARG 1 dynamicRegistryManager
 		ARG 2 enabledFeatures
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index eadbc30998..db033a7f7a 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -452,12 +452,16 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_54835 getTickTimes ()[J
 	METHOD method_54837 getAutosaveInterval ()I
 	METHOD method_56040 acceptsTransfers ()Z
-	METHOD method_56593 getPerformanceLog ()Lnet/minecraft/class_8743;
+	METHOD method_56593 getDebugSampleLog ()Lnet/minecraft/class_8743;
 	METHOD method_56602 pushTickLog (J)V
 		ARG 1 tickStartTime
 	METHOD method_56603 pushFullTickLog ()V
 	METHOD method_56604 startTaskPerformanceLog ()V
 	METHOD method_56605 pushPerformanceLogs ()V
+	METHOD method_56625 subscribeToDebugSample (Lnet/minecraft/class_3222;Lnet/minecraft/class_9192;)V
+		ARG 1 player
+		ARG 2 type
+	METHOD method_56626 shouldPushTickTimeLog ()Z
 	CLASS class_6414 DebugStart
 		FIELD field_33980 time J
 		FIELD field_33981 tick I
diff --git a/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping b/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping
index b5332b856c..f45c3db6c1 100644
--- a/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping
+++ b/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping
@@ -5,9 +5,11 @@ CLASS net/minecraft/class_9188 net/minecraft/server/SampleSubscriptionTracker
 	FIELD field_48811 subscriptionMap Ljava/util/EnumMap;
 	FIELD field_48812 pendingQueue Ljava/util/Queue;
 	METHOD  (Lnet/minecraft/class_3324;)V
-		ARG 1 playermanager
+		ARG 1 playerManager
 	METHOD method_56652 tick (I)V
 		ARG 1 tick
+	METHOD method_56653 (IJLjava/util/Map$Entry;)Z
+		ARG 4 entry
 	METHOD method_56654 onSubscription (JI)V
 		ARG 1 time
 		ARG 3 tick
diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping
index c60234003e..2f8c615e70 100644
--- a/mappings/net/minecraft/server/command/CommandManager.mapping
+++ b/mappings/net/minecraft/server/command/CommandManager.mapping
@@ -71,6 +71,9 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager
 		COMMENT @see #executeWithPrefix(ServerCommandSource, String)
 		ARG 1 parseResults
 		ARG 2 command
+	CLASS 1
+		METHOD method_56811 createTagCreatingLookup (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226$class_7875;
+			ARG 1 original
 	CLASS class_2171 CommandParser
 		METHOD parse (Lcom/mojang/brigadier/StringReader;)V
 			ARG 1 reader
diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping
index d80d394939..3b40772db1 100644
--- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping
+++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping
@@ -7,6 +7,8 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated
 	FIELD field_16799 propertiesLoader Lnet/minecraft/class_3807;
 	FIELD field_16800 gui Lnet/minecraft/class_3182;
 	FIELD field_26898 filterer Lnet/minecraft/class_5514;
+	FIELD field_48788 debugSampleLog Lnet/minecraft/class_9193;
+	FIELD field_48789 subscriptionTracker Lnet/minecraft/class_9188;
 	METHOD  (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7497;Lnet/minecraft/class_3950;)V
 		ARG 1 serverThread
 		ARG 2 session
diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping
index b2ebf184be..f83899bb74 100644
--- a/mappings/net/minecraft/test/TestServer.mapping
+++ b/mappings/net/minecraft/test/TestServer.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer
 	FIELD field_47175 TEST_POS_XZ_RANGE I
 	FIELD field_48493 testFunctions Ljava/util/List;
 	FIELD field_48494 stopwatch Lcom/google/common/base/Stopwatch;
+	FIELD field_48984 debugSampleLog Lnet/minecraft/class_9191;
 	METHOD  (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/util/Collection;Lnet/minecraft/class_2338;)V
 		ARG 1 serverThread
 		ARG 2 session
diff --git a/mappings/net/minecraft/util/DebugSampleType.mapping b/mappings/net/minecraft/util/DebugSampleType.mapping
deleted file mode 100644
index 6d5c8857da..0000000000
--- a/mappings/net/minecraft/util/DebugSampleType.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_9192 net/minecraft/util/DebugSampleType
diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping
index 3160af4da8..8e413c95ce 100644
--- a/mappings/net/minecraft/util/dynamic/Codecs.mapping
+++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping
@@ -34,6 +34,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 		COMMENT types of objects this can "serialize".
 		COMMENT
 		COMMENT @see RuntimeOps
+	FIELD field_49012 UNSIGNED_BYTE Lcom/mojang/serialization/Codec;
 	METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		COMMENT Returns an exclusive-or codec for {@link Either} instances.
 		COMMENT
@@ -301,6 +302,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 		ARG 3 typeGetter
 		ARG 4 parametersCodecGetter
 	METHOD method_56627 createRecursiveMap (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
+	METHOD method_56907 (Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult;
+		ARG 0 value
 	CLASS 1
 		METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult;
 			ARG 1 ops
@@ -487,11 +490,16 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 			ARG 1 map
 	CLASS class_9181 RecursiveMap
 		FIELD field_48804 supplier Ljava/util/function/Supplier;
+		FIELD field_49013 name Ljava/lang/String;
+		METHOD  (Ljava/lang/String;Ljava/util/function/Function;)V
+			ARG 1 name
+			ARG 2 codecFunction
 		METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult;
 			ARG 1 ops
 			ARG 2 input
 		METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder;
 			ARG 1 input
 			ARG 2 ops
+			ARG 3 builder
 		METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream;
 			ARG 1 ops
diff --git a/mappings/net/minecraft/util/math/MatrixUtil.mapping b/mappings/net/minecraft/util/math/MatrixUtil.mapping
index e7a8d852b7..60bb8f3a21 100644
--- a/mappings/net/minecraft/util/math/MatrixUtil.mapping
+++ b/mappings/net/minecraft/util/math/MatrixUtil.mapping
@@ -34,3 +34,7 @@ CLASS net/minecraft/class_7837 net/minecraft/util/math/MatrixUtil
 		COMMENT Stores A′XA into X, clobbering A.
 		ARG 0 X
 		ARG 1 A
+	METHOD method_56826 isTranslation (Lorg/joml/Matrix4f;)Z
+		ARG 0 matrix
+	METHOD method_56827 isOrthonormal (Lorg/joml/Matrix4f;)Z
+		ARG 0 matrix
diff --git a/mappings/net/minecraft/util/profiler/MultiValueDebugSampleLogImpl.mapping b/mappings/net/minecraft/util/profiler/MultiValueDebugSampleLogImpl.mapping
new file mode 100644
index 0000000000..7ac44f35a5
--- /dev/null
+++ b/mappings/net/minecraft/util/profiler/MultiValueDebugSampleLogImpl.mapping
@@ -0,0 +1,9 @@
+CLASS net/minecraft/class_9191 net/minecraft/util/profiler/MultiValueDebugSampleLogImpl
+	FIELD field_48813 LOG_SIZE I
+	FIELD field_48814 multiValues [[J
+	FIELD field_48815 start I
+	FIELD field_48816 length I
+	METHOD  (I)V
+		ARG 1 dimensions
+	METHOD method_56661 wrap (I)I
+		ARG 1 index
diff --git a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
deleted file mode 100644
index de02339e49..0000000000
--- a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog
-	METHOD method_53066 push (J)V
-		ARG 1 value
-	METHOD method_56535 push (JI)V
-		ARG 1 value
-		ARG 3 column
diff --git a/mappings/net/minecraft/util/profiler/log/ArrayDebugSampleLog.mapping b/mappings/net/minecraft/util/profiler/log/ArrayDebugSampleLog.mapping
new file mode 100644
index 0000000000..74cd09fdf3
--- /dev/null
+++ b/mappings/net/minecraft/util/profiler/log/ArrayDebugSampleLog.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_9187 net/minecraft/util/profiler/log/ArrayDebugSampleLog
+	FIELD field_48806 defaults [J
+	FIELD field_48807 values [J
+	METHOD  (I[J)V
+		ARG 1 size
+		ARG 2 defaults
+	METHOD method_56649 onPush ()V
+	METHOD method_56651 clearValues ()V
diff --git a/mappings/net/minecraft/util/profiler/log/DebugSampleLog.mapping b/mappings/net/minecraft/util/profiler/log/DebugSampleLog.mapping
new file mode 100644
index 0000000000..35f9060429
--- /dev/null
+++ b/mappings/net/minecraft/util/profiler/log/DebugSampleLog.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_8743 net/minecraft/util/profiler/log/DebugSampleLog
+	METHOD method_53066 push (J)V
+		ARG 1 value
+	METHOD method_56535 push (JI)V
+		ARG 1 value
+		ARG 3 column
+	METHOD method_56650 set ([J)V
+		ARG 1 values
diff --git a/mappings/net/minecraft/util/profiler/log/DebugSampleType.mapping b/mappings/net/minecraft/util/profiler/log/DebugSampleType.mapping
new file mode 100644
index 0000000000..3cecd118ad
--- /dev/null
+++ b/mappings/net/minecraft/util/profiler/log/DebugSampleType.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9192 net/minecraft/util/profiler/log/DebugSampleType
diff --git a/mappings/net/minecraft/util/profiler/log/MultiValueDebugSampleLog.mapping b/mappings/net/minecraft/util/profiler/log/MultiValueDebugSampleLog.mapping
new file mode 100644
index 0000000000..5f1f9d2ca3
--- /dev/null
+++ b/mappings/net/minecraft/util/profiler/log/MultiValueDebugSampleLog.mapping
@@ -0,0 +1,9 @@
+CLASS net/minecraft/class_9194 net/minecraft/util/profiler/log/MultiValueDebugSampleLog
+	METHOD method_56659 get (I)J
+		ARG 1 index
+	METHOD method_56660 get (II)J
+		ARG 1 index
+		ARG 2 dimension
+	METHOD method_56662 getDimension ()I
+	METHOD method_56663 getLength ()I
+	METHOD method_56664 clear ()V
diff --git a/mappings/net/minecraft/util/profiler/log/SubscribableDebugSampleLog.mapping b/mappings/net/minecraft/util/profiler/log/SubscribableDebugSampleLog.mapping
new file mode 100644
index 0000000000..1b12b216a3
--- /dev/null
+++ b/mappings/net/minecraft/util/profiler/log/SubscribableDebugSampleLog.mapping
@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_9193 net/minecraft/util/profiler/log/SubscribableDebugSampleLog
+	FIELD field_48819 tracker Lnet/minecraft/class_9188;
+	FIELD field_48820 type Lnet/minecraft/class_9192;
+	METHOD  (ILnet/minecraft/class_9188;Lnet/minecraft/class_9192;)V
+		ARG 1 size
+		ARG 2 tracker
+		ARG 3 type
+	METHOD  (ILnet/minecraft/class_9188;Lnet/minecraft/class_9192;[J)V
+		ARG 1 size
+		ARG 2 tracker
+		ARG 3 type
+		ARG 4 defaults
diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping
index 28d85524b0..b6bee2d37d 100644
--- a/mappings/net/minecraft/world/WorldEvents.mapping
+++ b/mappings/net/minecraft/world/WorldEvents.mapping
@@ -360,12 +360,12 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
 	FIELD field_48852 VAULT_ACTIVATES I
 		COMMENT A vault is activated.
 		COMMENT 
    Plays the activate sound and spawns smoke and small flame particles.
-		COMMENT 
    Called by {@link net.minecraft.block.vault.VaultState#ACTIVE}.
+		COMMENT 
    Called by {@link net.minecraft.block.enums.VaultState#ACTIVE}.
 	FIELD field_48853 VAULT_DEACTIVATES I
 		COMMENT A vault is deactivated.
 		COMMENT 
    Plays the deactivate sound and spawns small flame particles.
-		COMMENT 
    Called by {@link net.minecraft.block.vault.VaultState#INACTIVE}.
+		COMMENT 
    Called by {@link net.minecraft.block.enums.VaultState#INACTIVE}.
 	FIELD field_48854 VAULT_EJECTS_ITEM I
 		COMMENT A vault ejects loot.
 		COMMENT 
    Spawns ejection particles.
-		COMMENT 
    Called by {@link net.minecraft.block.vault.VaultState#ejectItem}.
+		COMMENT 
    Called by {@link net.minecraft.block.enums.VaultState#ejectItem}.
diff --git a/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping b/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping
index e1348c7e02..3319e58a6e 100644
--- a/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping
+++ b/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping
@@ -12,6 +12,7 @@ CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkCompressionForma
 	FIELD field_48756 FORMAT_BY_NAME Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
 	FIELD field_48757 currentFormat Lnet/minecraft/class_4486;
 	FIELD field_48758 name Ljava/lang/String;
+	FIELD field_48916 CUSTOM Lnet/minecraft/class_4486;
 	METHOD  (ILjava/lang/String;Lnet/minecraft/class_4486$class_4487;Lnet/minecraft/class_4486$class_4487;)V
 		ARG 1 id
 		ARG 2 name

From eafbb88a090f623b4bae881225f3df99d136aa23 Mon Sep 17 00:00:00 2001
From: modmuss50 
Date: Wed, 7 Feb 2024 16:22:55 +0000
Subject: [PATCH 31/47] 24w06a

---
 build.gradle                                  |  2 +-
 .../net/minecraft/block/AbstractBlock.mapping |  3 +-
 .../block/dispenser/DispenserBehavior.mapping | 21 +++-----
 .../net/minecraft/block/entity/Hopper.mapping |  5 +-
 .../block/entity/HopperBlockEntity.mapping    | 33 ++----------
 mappings/net/minecraft/class_315.mapping      |  3 ++
 mappings/net/minecraft/class_9221.mapping     |  3 ++
 mappings/net/minecraft/class_9236.mapping     |  2 +
 .../minecraft/client/MinecraftClient.mapping  |  2 -
 .../minecraft/client/font/FontLoader.mapping  |  2 +-
 .../minecraft/client/font/FontManager.mapping | 31 ++---------
 .../minecraft/client/font/FontStorage.mapping |  8 +--
 .../network/ClientPlayNetworkHandler.mapping  |  4 --
 .../client/network/ClientRegistries.mapping   | 21 ++------
 .../net/minecraft/client/network/Tags.mapping |  6 +++
 .../client/option/GameOptions.mapping         |  3 --
 .../client/particle/Particle.mapping          |  5 --
 .../client/realms/FileUpload.mapping          |  3 +-
 .../animation/ArmadilloAnimations.mapping     |  2 -
 .../DefaultClientResourcePackProvider.mapping |  1 -
 ...ntityBrushableBlockFieldsRenameFix.mapping |  4 --
 .../fix/EntityPaintingFieldsRenameFix.mapping |  6 ---
 .../datafixer/fix/ItemNbtFix.mapping          |  4 --
 .../fix/RenameItemStackAttributesFix.mapping  |  6 +--
 .../datafixer/fix/StatusEffectFix.mapping     | 10 ----
 mappings/net/minecraft/entity/Entity.mapping  |  7 +--
 .../minecraft/entity/data/DataTracker.mapping | 17 +-----
 .../minecraft/entity/data/TrackedData.mapping |  8 +--
 .../minecraft/entity/mob/BreezeEntity.mapping |  2 -
 .../minecraft/entity/mob/MobEntity.mapping    |  2 +-
 .../passive/AbstractHorseEntity.mapping       |  1 -
 .../entity/passive/ArmadilloBrain.mapping     |  2 -
 .../entity/passive/ArmadilloEntity.mapping    |  7 +--
 .../entity/passive/CatEntity.mapping          |  1 +
 .../entity/passive/GoatBrain.mapping          |  1 -
 .../entity/passive/TameableEntity.mapping     |  3 +-
 .../projectile/WindChargeEntity.mapping       |  5 --
 .../projectile/thrown/ThrownEntity.mapping    |  1 -
 .../net/minecraft/fluid/FluidState.mapping    |  3 +-
 mappings/net/minecraft/nbt/NbtHelper.mapping  |  4 +-
 .../registry/MutableRegistry.mapping          |  3 +-
 .../net/minecraft/registry/Registries.mapping | 17 +-----
 .../net/minecraft/registry/Registry.mapping   | 17 ------
 .../minecraft/registry/RegistryCodecs.mapping | 11 ----
 .../minecraft/registry/RegistryLoader.mapping | 18 ++-----
 .../registry/SerializableRegistries.mapping   | 13 +----
 .../minecraft/registry/SimpleRegistry.mapping |  1 -
 .../resource/AbstractFileResourcePack.mapping |  5 --
 .../resource/DefaultResourcePack.mapping      |  5 --
 .../DefaultResourcePackBuilder.mapping        |  2 +-
 .../resource/DirectoryResourcePack.mapping    |  8 +--
 .../resource/FileResourcePackProvider.mapping |  9 +---
 .../net/minecraft/resource/Resource.mapping   |  1 -
 .../minecraft/resource/ResourcePack.mapping   |  3 --
 .../resource/ResourcePackProfile.mapping      | 53 ++-----------------
 .../resource/VanillaDataPackProvider.mapping  |  1 -
 .../resource/ZipResourcePack.mapping          | 12 ++---
 .../server/command/DatapackCommand.mapping    |  2 -
 .../ServerConfigurationNetworkHandler.mapping |  3 --
 mappings/net/minecraft/state/State.mapping    |  7 ++-
 .../net/minecraft/state/StateManager.mapping  |  3 +-
 mappings/net/minecraft/test/Batches.mapping   |  7 +--
 .../packageinfo/PackageInfo9235.mapping       |  1 +
 .../util/profiling/jfr/JfrJsonReport.mapping  |  4 +-
 .../profiling/jfr/JfrProfileRecorder.mapping  |  2 +-
 .../jfr/sample/NetworkIoStatistics.mapping    |  5 --
 .../util/profiling/jfr/sample/Packet.mapping  |  5 ++
 .../DimensionOptionsRegistryHolder.mapping    |  8 +--
 .../minecraft/world/gen/WorldPreset.mapping   |  3 --
 .../minecraft/world/gen/WorldPresets.mapping  |  3 +-
 .../world/poi/PointOfInterestStorage.mapping  |  6 ---
 .../storage/ChunkPosKeyedStorage.mapping      |  6 +--
 .../storage/RecreatedChunkStorage.mapping     |  5 --
 .../world/storage/RecreationStorage.mapping   |  7 ---
 .../world/storage/RegionBasedStorage.mapping  |  3 --
 .../world/storage/RegionFile.mapping          |  9 +---
 .../world/storage/StorageIoWorker.mapping     |  4 --
 .../storage/VersionedChunkStorage.mapping     |  4 --
 .../world/updater/WorldUpdater.mapping        | 20 ++-----
 79 files changed, 99 insertions(+), 451 deletions(-)
 create mode 100644 mappings/net/minecraft/class_315.mapping
 create mode 100644 mappings/net/minecraft/class_9221.mapping
 create mode 100644 mappings/net/minecraft/class_9236.mapping
 create mode 100644 mappings/net/minecraft/client/network/Tags.mapping
 create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9235.mapping
 create mode 100644 mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping

diff --git a/build.gradle b/build.gradle
index 1fd1588843..7fbabcaba7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w05b"
+def minecraft_version = "24w06a"
 
 filament {
 	minecraftVersion = minecraft_version
diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
index d8cfc4edc4..5c645ca4a0 100644
--- a/mappings/net/minecraft/block/AbstractBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -1022,9 +1022,8 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		FIELD field_44624 solid Z
 		FIELD field_44625 instrument Lnet/minecraft/class_2766;
 		FIELD field_44626 replaceable Z
-		METHOD  (Lnet/minecraft/class_2248;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V
+		METHOD  (Lnet/minecraft/class_2248;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V
 			ARG 1 block
-			ARG 2 propertyMap
 			ARG 3 codec
 		METHOD method_26164 isIn (Lnet/minecraft/class_6862;)Z
 			ARG 1 tag
diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
index 46fce801ba..861f68a84e 100644
--- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
+++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
@@ -27,34 +27,25 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
 	CLASS 7
 		METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V
 			ARG 1 entity
-	CLASS 8
-		FIELD field_13367 fallbackBehavior Lnet/minecraft/class_2347;
 	CLASS 9
 		FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347;
 	CLASS 17
-		FIELD field_20533 fallbackBehavior Lnet/minecraft/class_2347;
-		METHOD method_22141 tryPutFilledBottle (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
-			ARG 1 pointer
-			ARG 2 emptyBottleStack
-			ARG 3 filledBottleStack
-		METHOD method_27900 (Lnet/minecraft/class_4970$class_4971;)Z
-			ARG 0 state
-	CLASS 21
+	CLASS 22
 		FIELD field_38001 fallback Lnet/minecraft/class_2347;
-	CLASS 23
+	CLASS 24
 		METHOD method_17199 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1681;)V
 			ARG 1 entity
-	CLASS 24
+	CLASS 25
 		METHOD method_17200 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1680;)V
 			ARG 1 entity
-	CLASS 25
+	CLASS 26
 		METHOD method_17201 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1683;)V
 			ARG 1 entity
-	CLASS 26
+	CLASS 27
 		CLASS 1
 			METHOD method_17203 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V
 				ARG 1 entity
-	CLASS 27
+	CLASS 28
 		CLASS 1
 			METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V
 				ARG 1 entity
diff --git a/mappings/net/minecraft/block/entity/Hopper.mapping b/mappings/net/minecraft/block/entity/Hopper.mapping
index 7e08de54ee..eac4534168 100644
--- a/mappings/net/minecraft/block/entity/Hopper.mapping
+++ b/mappings/net/minecraft/block/entity/Hopper.mapping
@@ -1,8 +1,7 @@
 CLASS net/minecraft/class_2615 net/minecraft/block/entity/Hopper
 	FIELD field_12025 INSIDE_SHAPE Lnet/minecraft/class_265;
-	FIELD field_12026 INPUT_AREA_SHAPE Lnet/minecraft/class_265;
-	FIELD field_12027 ABOVE_SHAPE Lnet/minecraft/class_265;
-	METHOD method_11262 getInputAreaShape ()Lnet/minecraft/class_265;
+	FIELD field_12026 INPUT_AREA_SHAPE Lnet/minecraft/class_238;
+	METHOD method_11262 getInputAreaShape ()Lnet/minecraft/class_238;
 	METHOD method_11264 getHopperY ()D
 	METHOD method_11265 getHopperZ ()D
 	METHOD method_11266 getHopperX ()D
diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
index 565a7036b8..0d7e413827 100644
--- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
@@ -20,8 +20,6 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 1 transferCooldown
 	METHOD method_11239 needsCooldown ()Z
 	METHOD method_11241 extract (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;)Z
-		ARG 0 world
-		ARG 1 hopper
 	METHOD method_11242 isDisabled ()Z
 	METHOD method_11243 insertAndExtract (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2614;Ljava/util/function/BooleanSupplier;)Z
 		ARG 0 world
@@ -33,27 +31,19 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 1 stack
 		ARG 2 slot
 		ARG 3 side
-	METHOD method_11245 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;Lnet/minecraft/class_238;)Ljava/util/stream/Stream;
-		ARG 2 box
-	METHOD method_11246 insert (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1263;)Z
+	METHOD method_11246 insert (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2614;)Z
 		ARG 0 world
 		ARG 1 pos
-		ARG 2 state
-		ARG 3 inventory
 	METHOD method_11247 extract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1542;)Z
 		ARG 0 inventory
 		ARG 1 itemEntity
-	METHOD method_11248 getInputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;)Lnet/minecraft/class_1263;
+	METHOD method_11248 getInputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1263;
 		ARG 0 world
-		ARG 1 hopper
 	METHOD method_11250 getInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1263;
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_11251 getInventoryAt (Lnet/minecraft/class_1937;DDD)Lnet/minecraft/class_1263;
+	METHOD method_11251 getInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;DDD)Lnet/minecraft/class_1263;
 		ARG 0 world
-		ARG 1 x
-		ARG 3 y
-		ARG 5 z
 	METHOD method_11252 canExtract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;ILnet/minecraft/class_2350;)Z
 		ARG 0 hopperInventory
 		ARG 1 fromInventory
@@ -69,16 +59,9 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 	METHOD method_11254 canMergeItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
 		ARG 0 first
 		ARG 1 second
-	METHOD method_11255 getOutputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1263;
-		ARG 0 world
-		ARG 1 pos
-		ARG 2 state
+	METHOD method_11255 getOutputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2614;)Lnet/minecraft/class_1263;
 	METHOD method_11256 isFull ()Z
-	METHOD method_11257 isInventoryEmpty (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Z
-		ARG 0 inv
-		ARG 1 facing
 	METHOD method_11258 isInventoryFull (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Z
-		ARG 0 inventory
 		ARG 1 direction
 	METHOD method_11260 transfer (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;Lnet/minecraft/class_2350;)Lnet/minecraft/class_1799;
 		ARG 0 from
@@ -90,15 +73,9 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 1 inventory
 		ARG 2 slot
 		ARG 3 side
-	METHOD method_17766 (Lnet/minecraft/class_1263;I)Z
-		ARG 1 slot
-	METHOD method_17767 getAvailableSlots (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Ljava/util/stream/IntStream;
+	METHOD method_17767 getAvailableSlots (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)[I
 		ARG 0 inventory
 		ARG 1 side
-	METHOD method_17768 (Lnet/minecraft/class_2615;Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;I)Z
-		ARG 3 slot
-	METHOD method_17769 (Lnet/minecraft/class_1263;I)Z
-		ARG 1 slot
 	METHOD method_31692 serverTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2614;)V
 		ARG 0 world
 		ARG 1 pos
diff --git a/mappings/net/minecraft/class_315.mapping b/mappings/net/minecraft/class_315.mapping
new file mode 100644
index 0000000000..9c59be4b69
--- /dev/null
+++ b/mappings/net/minecraft/class_315.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_315
+	CLASS class_9242
+		METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V
diff --git a/mappings/net/minecraft/class_9221.mapping b/mappings/net/minecraft/class_9221.mapping
new file mode 100644
index 0000000000..df6de9549b
--- /dev/null
+++ b/mappings/net/minecraft/class_9221.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_9221
+	METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V
+	METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V
diff --git a/mappings/net/minecraft/class_9236.mapping b/mappings/net/minecraft/class_9236.mapping
new file mode 100644
index 0000000000..be0fa2b9ef
--- /dev/null
+++ b/mappings/net/minecraft/class_9236.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_9236
+	METHOD method_55055 createExplosion ()V
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
index 2e47d3f728..52a9ce28cf 100644
--- a/mappings/net/minecraft/client/MinecraftClient.mapping
+++ b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -366,8 +366,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_27022 hasOutline (Lnet/minecraft/class_1297;)Z
 		COMMENT Checks if the provided {@code entity} should display an outline around its model.
 		ARG 1 entity
-	METHOD method_27466 initFont (Z)V
-		ARG 1 forcesUnicode
 	METHOD method_29041 openChatScreen (Ljava/lang/String;)V
 		ARG 1 text
 	METHOD method_29042 shouldBlockMessages (Ljava/util/UUID;)Z
diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping
index 4970c9f5ec..692c709e0e 100644
--- a/mappings/net/minecraft/client/font/FontLoader.mapping
+++ b/mappings/net/minecraft/client/font/FontLoader.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader
-	FIELD field_44801 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_44801 CODEC Lcom/mojang/serialization/MapCodec;
 	METHOD method_51731 getType ()Lnet/minecraft/class_394;
 	METHOD method_51734 build ()Lcom/mojang/datafixers/util/Either;
 	METHOD method_51757 (Lnet/minecraft/class_394;)Lcom/mojang/serialization/Codec;
diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping
index 1b26125c39..99712cd1e7 100644
--- a/mappings/net/minecraft/client/font/FontManager.mapping
+++ b/mappings/net/minecraft/client/font/FontManager.mapping
@@ -4,7 +4,6 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 	FIELD field_2261 LOGGER Lorg/slf4j/Logger;
 	FIELD field_24254 MISSING_STORAGE_ID Lnet/minecraft/class_2960;
 	FIELD field_24255 missingStorage Lnet/minecraft/class_377;
-	FIELD field_24256 idOverrides Ljava/util/Map;
 	FIELD field_32226 FONTS_JSON Ljava/lang/String;
 	FIELD field_40409 FINDER Lnet/minecraft/class_7654;
 	FIELD field_44757 GSON Lcom/google/gson/Gson;
@@ -14,18 +13,7 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 	METHOD method_27539 createTextRenderer ()Lnet/minecraft/class_327;
 	METHOD method_27540 (Lnet/minecraft/class_377;)V
 		ARG 0 fontStorage
-	METHOD method_27541 setIdOverrides (Ljava/util/Map;)V
-		ARG 1 idOverrides
-	METHOD method_27542 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377;
-		ARG 1 id
-	METHOD method_45077 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377;
-		ARG 1 id
 	METHOD method_45078 createAdvanceValidatingTextRenderer ()Lnet/minecraft/class_327;
-	METHOD method_51606 getEffectiveId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
-		ARG 1 id
-	METHOD method_51607 (Lnet/minecraft/class_2960;Ljava/util/List;)V
-		ARG 1 fontId
-		ARG 2 providers
 	METHOD method_51608 loadIndex (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 resourceManager
 		ARG 2 executor
@@ -33,10 +21,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 		ARG 1 entry
 	METHOD method_51610 (Lnet/minecraft/class_3695;Lnet/minecraft/class_378$class_8536;)V
 		ARG 2 index
-	METHOD method_51611 (Lnet/minecraft/class_390;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_51611 (Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture;
 		ARG 3 dest
-	METHOD method_51612 (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_389$class_8539;)V
-		ARG 5 loadable
 	METHOD method_51613 load (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8539;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 key
 		ARG 2 loadable
@@ -45,8 +31,6 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 	METHOD method_51614 reload (Lnet/minecraft/class_378$class_8536;Lnet/minecraft/class_3695;)V
 		ARG 1 index
 		ARG 2 profiler
-	METHOD method_51615 (Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8540;)V
-		ARG 2 reference
 	METHOD method_51617 getRequiredFontProviders (Ljava/util/List;)Ljava/util/Map;
 		ARG 1 entries
 	METHOD method_51618 (Ljava/util/List;I)V
@@ -54,10 +38,9 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 	METHOD method_51619 loadFontProviders (Ljava/util/List;Lnet/minecraft/class_2960;)Ljava/util/List;
 		ARG 0 fontResources
 		ARG 1 id
-	METHOD method_51620 insertFont (Ljava/util/List;Lnet/minecraft/class_390;)V
+	METHOD method_51620 insertFont (Ljava/util/List;Lnet/minecraft/class_390$class_9241;)V
 		ARG 1 fonts
-		ARG 2 font
-	METHOD method_51621 (Ljava/util/List;Lnet/minecraft/class_390;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage;
+	METHOD method_51621 (Ljava/util/List;Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage;
 		ARG 4 providers
 	METHOD method_51622 (Ljava/util/List;Ljava/util/Map;Ljava/lang/Void;)Lnet/minecraft/class_378$class_8536;
 		ARG 2 ignored
@@ -70,8 +53,6 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 		ARG 2 entries
 	CLASS class_8534 FontKey
 	CLASS class_8535 Builder
-		METHOD method_51628 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/Optional;
-			ARG 0 future
 		METHOD method_51629 build (Ljava/util/function/Function;)Ljava/util/Optional;
 			ARG 1 fontRetriever
 		METHOD method_51630 (Ljava/util/function/Function;Lnet/minecraft/class_2960;)Ljava/util/Optional;
@@ -80,12 +61,10 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 	CLASS class_8537 FontEntry
 		METHOD  (Lnet/minecraft/class_2960;)V
 			ARG 1 fontId
-		METHOD method_51631 addReferenceBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8540;)V
+		METHOD method_51631 addReferenceBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8540;)V
 			ARG 1 key
-			ARG 2 reference
-		METHOD method_51632 addBuilder (Lnet/minecraft/class_378$class_8534;Ljava/util/concurrent/CompletableFuture;)V
+		METHOD method_51632 addBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Ljava/util/concurrent/CompletableFuture;)V
 			ARG 1 key
-			ARG 2 provider
 		METHOD method_51633 (Lnet/minecraft/class_378$class_8535;)Ljava/util/stream/Stream;
 			ARG 0 builder
 		METHOD method_51634 getRequiredFontProviders (Ljava/util/function/Function;)Ljava/util/Optional;
diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping
index f4f520ad12..c60a90cb68 100644
--- a/mappings/net/minecraft/client/font/FontStorage.mapping
+++ b/mappings/net/minecraft/client/font/FontStorage.mapping
@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
 	FIELD field_20910 whiteRectangleGlyphRenderer Lnet/minecraft/class_382;
 	FIELD field_2246 id Lnet/minecraft/class_2960;
-	FIELD field_2247 fonts Ljava/util/List;
 	FIELD field_2248 textureManager Lnet/minecraft/class_1060;
 	FIELD field_2249 charactersByWidth Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD field_2252 RANDOM Lnet/minecraft/class_5819;
@@ -13,7 +12,7 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
 	METHOD  (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V
 		ARG 1 textureManager
 		ARG 2 id
-	METHOD method_2004 setFonts (Ljava/util/List;)V
+	METHOD method_2004 setFonts (Ljava/util/List;Ljava/util/Set;)V
 		ARG 1 fonts
 	METHOD method_2010 closeGlyphAtlases ()V
 	METHOD method_2011 getGlyph (IZ)Lnet/minecraft/class_379;
@@ -29,11 +28,6 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
 	METHOD method_2014 getGlyphRenderer (I)Lnet/minecraft/class_382;
 		ARG 1 codePoint
 	METHOD method_22943 getRectangleRenderer ()Lnet/minecraft/class_382;
-	METHOD method_24290 closeFonts ()V
-	METHOD method_27545 (Ljava/util/List;Ljava/util/Set;I)V
-		ARG 3 codePoint
-	METHOD method_27546 (I)Lit/unimi/dsi/fastutil/ints/IntList;
-		ARG 0 advance
 	METHOD method_40038 findGlyph (I)Lnet/minecraft/class_377$class_7647;
 		COMMENT {@return the glyph of {@code codePoint}}
 		COMMENT
diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index 807f0a2e17..213d07f344 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -133,7 +133,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 		ARG 1 packet
 	METHOD method_52801 warnOnUnknownPayload (Lnet/minecraft/class_8710;)V
 		ARG 1 payload
-	METHOD method_52802 refreshTagBasedData ()V
 	METHOD method_53876 createEntity (Lnet/minecraft/class_2604;)Lnet/minecraft/class_1297;
 		ARG 1 packet
 	METHOD method_54133 startWorldLoading (Lnet/minecraft/class_746;Lnet/minecraft/class_638;)V
@@ -141,6 +140,3 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 		ARG 2 world
 	METHOD method_54134 clearWorld ()V
 	METHOD method_55823 getScoreboard ()Lnet/minecraft/class_269;
-	METHOD method_56582 handleSynchronizedTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
-		ARG 1 registryRef
-		ARG 2 tags
diff --git a/mappings/net/minecraft/client/network/ClientRegistries.mapping b/mappings/net/minecraft/client/network/ClientRegistries.mapping
index 9a6b7917e9..8bf55839f3 100644
--- a/mappings/net/minecraft/client/network/ClientRegistries.mapping
+++ b/mappings/net/minecraft/client/network/ClientRegistries.mapping
@@ -1,14 +1,10 @@
 CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries
 	FIELD field_48767 dynamicRegistries Lnet/minecraft/class_9173$class_9174;
-	FIELD field_48768 tags Lnet/minecraft/class_9173$class_9175;
+	FIELD field_48768 tags Lnet/minecraft/class_9175;
 	METHOD method_56583 putDynamicRegistry (Lnet/minecraft/class_5321;Ljava/util/List;)V
 		ARG 1 registryRef
 		ARG 2 entries
-	METHOD method_56584 (Lnet/minecraft/class_5455$class_6892;)V
-		ARG 0 entry
-	METHOD method_56585 createRegistryManager (Lnet/minecraft/class_5455;Z)Lnet/minecraft/class_5455$class_6890;
-		ARG 1 precedingRegistryManager
-		ARG 2 local
+	METHOD method_56585 createRegistryManager (Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;Z)Lnet/minecraft/class_5455$class_6890;
 	METHOD method_56586 putTags (Ljava/util/Map;)V
 		ARG 1 tags
 	CLASS class_9174 DynamicRegistries
@@ -18,15 +14,4 @@ CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries
 		METHOD method_56588 put (Lnet/minecraft/class_5321;Ljava/util/List;)V
 			ARG 1 registryRef
 			ARG 2 entries
-		METHOD method_56589 load (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455;
-			ARG 1 precedingRegistryManager
-	CLASS class_9175 Tags
-		FIELD field_48770 tagsByRegistry Ljava/util/Map;
-		METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
-			ARG 1 registryRef
-			ARG 2 serialized
-		METHOD method_56591 load (Lnet/minecraft/class_5455;)V
-			ARG 1 registryManager
-		METHOD method_56592 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
-			ARG 1 registryRef
-			ARG 2 serialized
+		METHOD method_56589 load (Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455;
diff --git a/mappings/net/minecraft/client/network/Tags.mapping b/mappings/net/minecraft/client/network/Tags.mapping
new file mode 100644
index 0000000000..5faf20770c
--- /dev/null
+++ b/mappings/net/minecraft/client/network/Tags.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9175 net/minecraft/client/network/Tags
+	FIELD field_48770 tagsByRegistry Ljava/util/Map;
+	METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
+		ARG 1 registryRef
+		ARG 2 serialized
+	METHOD method_56591 load (Lnet/minecraft/class_5455;Ljava/util/function/Predicate;)V
diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping
index 50d669412f..b73e4fe9dd 100644
--- a/mappings/net/minecraft/client/option/GameOptions.mapping
+++ b/mappings/net/minecraft/client/option/GameOptions.mapping
@@ -627,6 +627,3 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		METHOD method_33684 visitBoolean (Ljava/lang/String;Z)Z
 			ARG 1 key
 			ARG 2 current
-		METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V
-			ARG 1 key
-			ARG 2 option
diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping
index c2fbd8b6ab..ecdae0ab78 100644
--- a/mappings/net/minecraft/client/particle/Particle.mapping
+++ b/mappings/net/minecraft/client/particle/Particle.mapping
@@ -38,11 +38,6 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle
 	FIELD field_3871 z D
 	FIELD field_3872 boundingBox Lnet/minecraft/class_238;
 	FIELD field_3874 x D
-	METHOD  (Lnet/minecraft/class_638;DDD)V
-		ARG 1 world
-		ARG 2 x
-		ARG 4 y
-		ARG 6 z
 	METHOD  (Lnet/minecraft/class_638;DDDDDD)V
 		ARG 1 world
 		ARG 2 x
diff --git a/mappings/net/minecraft/client/realms/FileUpload.mapping b/mappings/net/minecraft/client/realms/FileUpload.mapping
index f0bbd049aa..47a08985ea 100644
--- a/mappings/net/minecraft/client/realms/FileUpload.mapping
+++ b/mappings/net/minecraft/client/realms/FileUpload.mapping
@@ -13,14 +13,13 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload
 	FIELD field_19561 requestConfig Lorg/apache/http/client/config/RequestConfig;
 	FIELD field_32056 MAX_ATTEMPTS I
 	FIELD field_32057 UPLOAD_ENDPOINT Ljava/lang/String;
-	METHOD  (Ljava/io/File;JILnet/minecraft/class_4888;Lnet/minecraft/class_320;Ljava/lang/String;Lnet/minecraft/class_4351;)V
+	METHOD  (Ljava/io/File;JILnet/minecraft/class_4888;Lnet/minecraft/class_320;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_4351;)V
 		ARG 1 file
 		ARG 2 worldId
 		ARG 4 slotId
 		ARG 5 uploadInfo
 		ARG 6 session
 		ARG 7 clientVersion
-		ARG 8 uploadStatus
 	METHOD method_20970 cancel ()V
 	METHOD method_20971 requestUpload (I)Lnet/minecraft/class_4429;
 		ARG 1 currentAttempt
diff --git a/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping
index c2f21afe0e..f562fa1a63 100644
--- a/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping
+++ b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping
@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_9079 net/minecraft/client/render/entity/animation/ArmadilloAnimations
-	FIELD field_47843 ROLLING Lnet/minecraft/class_7184;
 	FIELD field_47844 IDLE Lnet/minecraft/class_7184;
-	FIELD field_47845 SCARED Lnet/minecraft/class_7184;
diff --git a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping
index 535d6ac7eb..6d6e67fcd1 100644
--- a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping
+++ b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping
@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResourcePackProvider
 	FIELD field_40556 METADATA Lnet/minecraft/class_3272;
 	FIELD field_40557 METADATA_MAP Lnet/minecraft/class_7662;
-	FIELD field_40558 VANILLA_NAME_TEXT Lnet/minecraft/class_2561;
 	FIELD field_40559 PROFILE_NAME_TEXTS Ljava/util/Map;
 	FIELD field_40560 ID Lnet/minecraft/class_2960;
 	FIELD field_40561 resourcePacksPath Ljava/nio/file/Path;
diff --git a/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping
index c191cd605e..768454b839 100644
--- a/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping
@@ -3,7 +3,3 @@ CLASS net/minecraft/class_8222 net/minecraft/datafixer/fix/EntityBrushableBlockF
 		ARG 1 outputSchema
 	METHOD method_49763 renameFields (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 		ARG 1 dynamic
-	METHOD method_49764 renameField (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
-		ARG 1 dynamic
-		ARG 2 oldName
-		ARG 3 newName
diff --git a/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping
index aedcf97b54..a552604534 100644
--- a/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping
@@ -3,9 +3,3 @@ CLASS net/minecraft/class_7407 net/minecraft/datafixer/fix/EntityPaintingFieldsR
 		ARG 1 outputSchema
 	METHOD method_43386 rename (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 		ARG 1 dynamic
-	METHOD method_43387 rename (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
-		ARG 1 dynamic
-		ARG 2 oldKey
-		ARG 3 newKey
-	METHOD method_43388 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
-		ARG 3 value
diff --git a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping
index d791b7d53d..21d19108db 100644
--- a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping
@@ -7,7 +7,3 @@ CLASS net/minecraft/class_7505 net/minecraft/datafixer/fix/ItemNbtFix
 		ARG 3 itemIdPredicate
 	METHOD method_20445 fixNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 		ARG 1 dynamic
-	METHOD method_44192 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
-		ARG 3 typed
-	METHOD method_44193 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
-		ARG 1 nbt
diff --git a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping
index b4674b598f..681d6aad37 100644
--- a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping
@@ -1,9 +1,7 @@
 CLASS net/minecraft/class_5129 net/minecraft/datafixer/fix/RenameItemStackAttributesFix
-	FIELD field_23695 RENAMES Ljava/util/Map;
-	METHOD  (Lcom/mojang/datafixers/schemas/Schema;)V
+	FIELD field_23695 RENAMES Ljava/util/function/UnaryOperator;
+	METHOD  (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V
 		ARG 1 outputSchema
 	METHOD method_26808 updateAttributeName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 	METHOD method_26810 updateAttributeModifiers (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
-		ARG 0 typed
 	METHOD method_26814 updatePlayerAttributes (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
-		ARG 0 typed
diff --git a/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping b/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping
index 01c5cc35f4..4df3cfa7e9 100644
--- a/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping
@@ -11,16 +11,6 @@ CLASS net/minecraft/class_8744 net/minecraft/datafixer/fix/StatusEffectFix
 	METHOD method_53085 renameKeyAndUpdateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
 		ARG 1 oldKey
 		ARG 3 newKey
-	METHOD method_53086 renameKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
-		ARG 1 oldKey
-		ARG 2 newKey
-	METHOD method_53087 renameKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic;
-		ARG 1 oldKey
-		ARG 2 newKey
-		ARG 3 value
-	METHOD method_53088 setOptionalValue (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic;
-		ARG 1 key
-		ARG 2 value
 	METHOD method_53090 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V
 		ARG 0 idMap
 	METHOD method_53091 (Ljava/lang/Number;)Ljava/lang/String;
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index b6efda6d99..9473525a93 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -915,7 +915,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 9 yaw
 		ARG 10 pitch
 	METHOD method_48155 canSprintAsVehicle ()Z
-	METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V
+	METHOD method_48850 (Ljava/util/List;)V
 		ARG 1 dataEntries
 	METHOD method_48921 couldAcceptPassenger ()Z
 		COMMENT {@return {@code true} if this entity supports passengers in general}
@@ -1264,7 +1264,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_5671 getCommandSource ()Lnet/minecraft/class_2168;
 		COMMENT {@return a command source which represents this entity}
 	METHOD method_5672 getHighSpeedSplashSound ()Lnet/minecraft/class_3414;
-	METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V
+	METHOD method_5674 (Lnet/minecraft/class_2940;)V
 		COMMENT Called on the client when the tracked data is set.
 		COMMENT
 		COMMENT 
    This can be overridden to refresh other fields when the tracked data
@@ -1355,7 +1355,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_5692 updateMovementInFluid (Lnet/minecraft/class_6862;D)Z
 		ARG 1 tag
 		ARG 2 speed
-	METHOD method_5693 initDataTracker ()V
+	METHOD method_5693 initDataTracker (Lnet/minecraft/class_2945$class_9222;)V
 		COMMENT Initializes data tracker.
 		COMMENT
 		COMMENT @apiNote Subclasses should override this and call {@link DataTracker#startTracking}
@@ -2290,6 +2290,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT {@return whether the entity is a spectator}
 		COMMENT
 		COMMENT 
    This returns {@code false} unless the entity is a player in spectator game mode.
+	METHOD method_7490 getGravity ()D
 	CLASS class_4738 PositionUpdater
 		METHOD accept (Lnet/minecraft/class_1297;DDD)V
 			ARG 1 entity
diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping
index 3a6f1b5fbf..c0f3cf9588 100644
--- a/mappings/net/minecraft/entity/data/DataTracker.mapping
+++ b/mappings/net/minecraft/entity/data/DataTracker.mapping
@@ -1,16 +1,9 @@
 CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker
 	FIELD field_13329 dirty Z
-	FIELD field_13331 entries Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-	FIELD field_13332 TRACKED_ENTITIES Lit/unimi/dsi/fastutil/objects/Object2IntMap;
-	FIELD field_13333 trackedEntity Lnet/minecraft/class_1297;
+	FIELD field_13331 entries [Lnet/minecraft/class_2945$class_2946;
+	FIELD field_13333 trackedEntity Lnet/minecraft/class_9221;
 	FIELD field_13334 LOGGER Lorg/slf4j/Logger;
-	FIELD field_13335 lock Ljava/util/concurrent/locks/ReadWriteLock;
 	FIELD field_33378 MAX_DATA_VALUE_ID I
-	METHOD  (Lnet/minecraft/class_1297;)V
-		ARG 1 trackedEntity
-	METHOD method_12776 addTrackedData (Lnet/minecraft/class_2940;Ljava/lang/Object;)V
-		ARG 1 key
-		ARG 2 value
 	METHOD method_12778 set (Lnet/minecraft/class_2940;Ljava/lang/Object;)V
 		ARG 1 key
 		ARG 2 value
@@ -19,16 +12,12 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker
 	METHOD method_12781 getDirtyEntries ()Ljava/util/List;
 	METHOD method_12783 getEntry (Lnet/minecraft/class_2940;)Lnet/minecraft/class_2945$class_2946;
 		ARG 1 key
-	METHOD method_12784 startTracking (Lnet/minecraft/class_2940;Ljava/lang/Object;)V
-		ARG 1 key
-		ARG 2 initialValue
 	METHOD method_12785 copyToFrom (Lnet/minecraft/class_2945$class_2946;Lnet/minecraft/class_2945$class_7834;)V
 		ARG 1 to
 		ARG 2 from
 	METHOD method_12786 isDirty ()Z
 	METHOD method_12789 get (Lnet/minecraft/class_2940;)Ljava/lang/Object;
 		ARG 1 data
-	METHOD method_12790 isEmpty ()Z
 	METHOD method_12791 registerData (Ljava/lang/Class;Lnet/minecraft/class_2941;)Lnet/minecraft/class_2940;
 		ARG 0 entityClass
 		ARG 1 dataHandler
@@ -37,8 +26,6 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker
 		ARG 1 key
 		ARG 2 value
 		ARG 3 force
-	METHOD method_51696 containsKey (Lnet/minecraft/class_2940;)Z
-		ARG 1 key
 	CLASS class_2946 Entry
 		FIELD field_13336 dirty Z
 		FIELD field_13337 data Lnet/minecraft/class_2940;
diff --git a/mappings/net/minecraft/entity/data/TrackedData.mapping b/mappings/net/minecraft/entity/data/TrackedData.mapping
index 2506b12da7..515f9dc4fc 100644
--- a/mappings/net/minecraft/entity/data/TrackedData.mapping
+++ b/mappings/net/minecraft/entity/data/TrackedData.mapping
@@ -1,10 +1,10 @@
 CLASS net/minecraft/class_2940 net/minecraft/entity/data/TrackedData
-	FIELD field_13306 id I
-	FIELD field_13307 dataType Lnet/minecraft/class_2941;
+	FIELD comp_2327 id I
+	FIELD comp_2328 dataType Lnet/minecraft/class_2941;
 	METHOD  (ILnet/minecraft/class_2941;)V
 		ARG 1 id
 		ARG 2 dataType
+	METHOD comp_2327 id ()I
+	METHOD comp_2328 dataType ()Lnet/minecraft/class_2941;
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD method_12712 getType ()Lnet/minecraft/class_2941;
-	METHOD method_12713 getId ()I
diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping
index 4d63607626..492cb30ad7 100644
--- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping
@@ -19,8 +19,6 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity
 		ARG 0 projectile
 		ARG 1 hitEntity
 		ARG 2 random
-	METHOD method_56088 (Lnet/minecraft/class_1299;)Ljava/lang/Boolean;
-		ARG 0 projectileOwnerType
 	METHOD method_56560 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309;
 		ARG 0 livingAttacker
 	METHOD method_56561 (Lnet/minecraft/class_1297;)Z
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index 922ca8eb84..7ce5b9bea3 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -42,7 +42,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	FIELD field_6189 navigation Lnet/minecraft/class_1408;
 	FIELD field_6190 visibilityCache Lnet/minecraft/class_1413;
 	FIELD field_6191 ambientSoundChance I
-	FIELD field_6192 leashNbt Lnet/minecraft/class_2487;
+	FIELD field_6192 leashNbt Lcom/mojang/datafixers/util/Either;
 	FIELD field_6193 MOB_FLAGS Lnet/minecraft/class_2940;
 	FIELD field_6194 experiencePoints I
 	FIELD field_6195 handItems Lnet/minecraft/class_2371;
diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
index af724be1d3..a43af437c8 100644
--- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping
@@ -144,7 +144,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 	METHOD method_6769 setHorseFlag (IZ)V
 		ARG 1 bitmask
 		ARG 2 flag
-	METHOD method_6771 getJumpStrength ()D
 	METHOD method_6772 getEatingAnimationProgress (F)F
 		ARG 1 tickDelta
 	METHOD method_6774 getChildJumpStrengthBonus (Ljava/util/function/DoubleSupplier;)D
diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
index 1d50d2dad3..9bbbb77ab1 100644
--- a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
+++ b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
@@ -26,5 +26,3 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain
 		ARG 0 brain
 	CLASS class_9072 RollUpTask
 	CLASS class_9073 UnrollAndFleeTask
-		METHOD method_56559 (Lnet/minecraft/class_1314;)Z
-			ARG 0 entity
diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
index 934f9f8334..d5cd445285 100644
--- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
-	FIELD field_47780 scaredAnimationState Lnet/minecraft/class_7094;
-	FIELD field_47781 rollingAnimationState Lnet/minecraft/class_7094;
 	FIELD field_47785 STATE Lnet/minecraft/class_2940;
 	FIELD field_47786 currentStateTicks J
 	FIELD field_47787 nextScuteShedCooldown I
@@ -19,8 +17,6 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
 	METHOD method_55722 createArmadilloAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_55723 isNotIdle ()Z
 	METHOD method_55724 unroll ()V
-	METHOD method_55725 setRolling (Z)V
-		ARG 1 rolling
 	METHOD method_56083 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 entityType
 		ARG 1 world
@@ -33,9 +29,8 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
 		FIELD field_48335 PACKET_CODEC Lnet/minecraft/class_9139;
 		FIELD field_48336 INDEX_TO_VALUE Ljava/util/function/IntFunction;
 		FIELD field_48337 index I
-		METHOD  (Ljava/lang/String;ILjava/lang/String;I)V
+		METHOD  (Ljava/lang/String;ILjava/lang/String;ZII)V
 			ARG 3 name
-			ARG 4 index
 		METHOD method_55727 fromName (Ljava/lang/String;)Lnet/minecraft/class_9069$class_9070;
 			ARG 0 name
 		METHOD method_56084 getIndex ()I
diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping
index 5bec5e1d43..964f5d09db 100644
--- a/mappings/net/minecraft/entity/passive/CatEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping
@@ -43,6 +43,7 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity
 	METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_43088 (Lnet/minecraft/class_6880;)V
 		ARG 1 variant
+	METHOD method_6175 onTamedChanged ()V
 	CLASS class_3698 CatFleeGoal
 		FIELD field_16293 cat Lnet/minecraft/class_1451;
 		METHOD  (Lnet/minecraft/class_1451;Ljava/lang/Class;FDD)V
diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping
index b3fedc1445..e8cc6bce4f 100644
--- a/mappings/net/minecraft/entity/passive/GoatBrain.mapping
+++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping
@@ -9,7 +9,6 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain
 	FIELD field_33491 MAX_RAM_TARGET_DISTANCE I
 	FIELD field_33492 LONG_JUMP_VERTICAL_RANGE I
 	FIELD field_33493 LONG_JUMP_HORIZONTAL_RANGE I
-	FIELD field_33494 LONG_JUMP_MAX_RANGE F
 	FIELD field_33495 MIN_RAM_TARGET_DISTANCE I
 	FIELD field_33496 ADULT_RAM_STRENGTH_MULTIPLIER F
 	FIELD field_33497 BABY_RAM_STRENGTH_MULTIPLIER F
diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping
index 3024ee7775..0503874ce7 100644
--- a/mappings/net/minecraft/entity/passive/TameableEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TameableEntity.mapping
@@ -13,11 +13,10 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity
 	METHOD method_6171 isOwner (Lnet/minecraft/class_1309;)Z
 		ARG 1 entity
 	METHOD method_6172 isInSittingPose ()Z
-	METHOD method_6173 setTamed (Z)V
+	METHOD method_6173 setTamed (ZZ)V
 		ARG 1 tamed
 	METHOD method_6174 setOwnerUuid (Ljava/util/UUID;)V
 		ARG 1 uuid
-	METHOD method_6175 onTamedChanged ()V
 	METHOD method_6178 canAttackWithOwner (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
 		ARG 1 target
 		ARG 2 owner
diff --git a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping
index a8a377a1a0..d58ed1dda6 100644
--- a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping
@@ -1,8 +1,3 @@
 CLASS net/minecraft/class_8956 net/minecraft/entity/projectile/WindChargeEntity
 	FIELD field_47579 EXPLOSION_BEHAVIOR Lnet/minecraft/class_8956$class_9036;
-	METHOD  (Lnet/minecraft/class_1299;Lnet/minecraft/class_8949;Lnet/minecraft/class_1937;)V
-		ARG 1 type
-		ARG 2 breeze
-		ARG 3 world
-	METHOD method_55055 createExplosion ()V
 	CLASS class_9036 WindChargeExplosionBehavior
diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping
index 9d483cf2f1..35c93a68e6 100644
--- a/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownEntity.mapping
@@ -9,4 +9,3 @@ CLASS net/minecraft/class_1682 net/minecraft/entity/projectile/thrown/ThrownEnti
 		ARG 1 type
 		ARG 2 owner
 		ARG 3 world
-	METHOD method_7490 getGravity ()F
diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping
index dadc674625..bcfeb31137 100644
--- a/mappings/net/minecraft/fluid/FluidState.mapping
+++ b/mappings/net/minecraft/fluid/FluidState.mapping
@@ -1,8 +1,7 @@
 CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState
 	FIELD field_25018 CODEC Lcom/mojang/serialization/Codec;
-	METHOD  (Lnet/minecraft/class_3611;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V
+	METHOD  (Lnet/minecraft/class_3611;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V
 		ARG 1 fluid
-		ARG 2 propertiesMap
 		ARG 3 codec
 	METHOD method_15756 canFlowTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping
index eadbe59b1d..b350de1054 100644
--- a/mappings/net/minecraft/nbt/NbtHelper.mapping
+++ b/mappings/net/minecraft/nbt/NbtHelper.mapping
@@ -71,12 +71,12 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper
 			COMMENT the element to test
 		ARG 2 ignoreListOrder
 			COMMENT whether to ignore ordering for {@link NbtList}
-	METHOD method_10691 toBlockPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338;
+	METHOD method_10691 toBlockPos (Lnet/minecraft/class_2487;Ljava/lang/String;)Ljava/util/Optional;
 		COMMENT {@return the block position from the {@code nbt}}
 		COMMENT
 		COMMENT @see #fromBlockPos(BlockPos)
 		ARG 0 nbt
-	METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487;
+	METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2520;
 		COMMENT {@return the serialized block position}
 		COMMENT
 		COMMENT @see #toBlockPos(NbtCompound)
diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping
index 904aee6ece..0de8dafd00 100644
--- a/mappings/net/minecraft/registry/MutableRegistry.mapping
+++ b/mappings/net/minecraft/registry/MutableRegistry.mapping
@@ -3,10 +3,9 @@ CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry
 	COMMENT Note that in vanilla, all registries are instances of this.
 	COMMENT
 	COMMENT @see Registry
-	METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883;
+	METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lnet/minecraft/class_9248;)Lnet/minecraft/class_6880$class_6883;
 		ARG 1 key
 		ARG 2 value
-		ARG 3 lifecycle
 	METHOD method_35863 isEmpty ()Z
 		COMMENT {@return whether the registry is empty}
 	METHOD method_46769 createMutableEntryLookup ()Lnet/minecraft/class_7871;
diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping
index 8a8e6404d4..52a879ac3e 100644
--- a/mappings/net/minecraft/registry/Registries.mapping
+++ b/mappings/net/minecraft/registry/Registries.mapping
@@ -121,23 +121,13 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries
 	METHOD method_47475 (Lnet/minecraft/class_2378;)Ljava/lang/Object;
 		ARG 0 registry
 	METHOD method_47476 bootstrap ()V
-	METHOD method_47477 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378;
-		ARG 0 key
-		ARG 1 lifecycle
-		ARG 2 initializer
-	METHOD method_47478 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_7923$class_6889;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385;
+	METHOD method_47478 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2385;
 		ARG 0 key
 		ARG 1 registry
 		ARG 2 initializer
-		ARG 3 lifecycle
 	METHOD method_47479 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378;
 		ARG 0 key
 		ARG 1 initializer
-	METHOD method_47480 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922;
-		ARG 0 key
-		ARG 1 defaultId
-		ARG 2 lifecycle
-		ARG 3 initializer
 	METHOD method_47481 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922;
 		ARG 0 key
 		ARG 1 defaultId
@@ -150,11 +140,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries
 	METHOD method_47484 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V
 		ARG 1 registry
 	METHOD method_47487 init ()V
-	METHOD method_47488 createIntrusive (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922;
-		ARG 0 key
-		ARG 1 defaultId
-		ARG 2 lifecycle
-		ARG 3 initializer
 	METHOD method_47489 createIntrusive (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922;
 		ARG 0 key
 		ARG 1 defaultId
diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping
index f9b1ec74d1..a2b6e347a8 100644
--- a/mappings/net/minecraft/registry/Registry.mapping
+++ b/mappings/net/minecraft/registry/Registry.mapping
@@ -175,9 +175,6 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
 	METHOD method_30517 getKey ()Lnet/minecraft/class_5321;
 		COMMENT {@return the registry key that identifies this registry}
 	METHOD method_31138 getLifecycle ()Lcom/mojang/serialization/Lifecycle;
-	METHOD method_31139 getEntryLifecycle (Ljava/lang/Object;)Lcom/mojang/serialization/Lifecycle;
-		COMMENT Gets the lifecycle of a registry entry.
-		ARG 1 entry
 	METHOD method_31140 getOrThrow (Lnet/minecraft/class_5321;)Ljava/lang/Object;
 		COMMENT {@return the value that is assigned {@code key}}
 		COMMENT
@@ -198,12 +195,6 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
 		ARG 0 registry
 		ARG 1 key
 		ARG 2 entry
-	METHOD method_39667 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult;
-		ARG 1 id
-	METHOD method_39670 (Ljava/lang/Object;)I
-		ARG 1 value
-	METHOD method_39671 (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
-		ARG 1 value
 	METHOD method_39673 getCodec ()Lcom/mojang/serialization/Codec;
 		COMMENT {@return the codec for serializing {@code T}}
 		COMMENT
@@ -235,8 +226,6 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
 		COMMENT {@return a stream of all tag keys known to this registry}
 	METHOD method_40276 freeze ()Lnet/minecraft/class_2378;
 	METHOD method_40278 clearTags ()V
-	METHOD method_40285 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult;
-		ARG 1 entry
 	METHOD method_40286 iterateEntries (Lnet/minecraft/class_6862;)Ljava/lang/Iterable;
 		COMMENT {@return an iterable of values that are assigned {@code tag}, or an empty iterable
 		COMMENT if the tag is not known to the registry}
@@ -262,12 +251,6 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
 	METHOD method_46772 getTagCreatingWrapper ()Lnet/minecraft/class_7225$class_7226;
 		COMMENT {@return a registry wrapper that creates and stores a new registry entry list
 		COMMENT when handling an unknown tag key}
-	METHOD method_47441 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle;
-		ARG 1 entry
-	METHOD method_47442 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle;
-		ARG 1 entry
-	METHOD method_47443 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult;
-		ARG 1 id
 	METHOD method_47983 getEntry (Ljava/lang/Object;)Lnet/minecraft/class_6880;
 		ARG 1 value
 	METHOD method_47984 registerReference (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883;
diff --git a/mappings/net/minecraft/registry/RegistryCodecs.mapping b/mappings/net/minecraft/registry/RegistryCodecs.mapping
index 44018e98b7..d447d72965 100644
--- a/mappings/net/minecraft/registry/RegistryCodecs.mapping
+++ b/mappings/net/minecraft/registry/RegistryCodecs.mapping
@@ -16,14 +16,3 @@ CLASS net/minecraft/class_6895 net/minecraft/registry/RegistryCodecs
 		ARG 1 alwaysSerializeAsList
 			COMMENT whether to always serialize the list as a list
 			COMMENT instead of serializing as one entry if the length is {@code 0}
-	METHOD method_45944 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_2378;
-		ARG 2 entries
-	METHOD method_45945 (Lnet/minecraft/class_2378;)Ljava/util/Map;
-		ARG 0 registry
-	METHOD method_45946 (Lnet/minecraft/class_2385;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5321;Ljava/lang/Object;)V
-		ARG 2 key
-		ARG 3 value
-	METHOD method_45947 createKeyedRegistryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
-		ARG 0 registryRef
-		ARG 1 lifecycle
-		ARG 2 elementCodec
diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping
index 2111871f06..8418aa4ee8 100644
--- a/mappings/net/minecraft/registry/RegistryLoader.mapping
+++ b/mappings/net/minecraft/registry/RegistryLoader.mapping
@@ -19,8 +19,6 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		ARG 4 errors
 	METHOD method_45123 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V
 		ARG 1 entry
-	METHOD method_45124 (Ljava/lang/String;)V
-		ARG 0 error
 	METHOD method_45125 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960;
 		ARG 0 entry
 	METHOD method_45126 writeLoadingError (Ljava/util/Map;)V
@@ -53,19 +51,10 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		ARG 2 entries
 	METHOD method_56516 (Ljava/lang/String;)V
 		ARG 0 error
-	METHOD method_56517 (Ljava/util/Map;Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
-		ARG 1 loader
-		ARG 2 infoGetter
-	METHOD method_56518 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
+	METHOD method_56518 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
 		ARG 0 data
-		ARG 1 infoGetter
-		ARG 2 registry
-		ARG 3 elementDecoder
-		ARG 4 errors
-	METHOD method_56519 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
+	METHOD method_56519 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
 		ARG 0 data
-		ARG 1 registryManager
-		ARG 2 entries
 	CLASS class_7656 RegistryLoadable
 		METHOD apply (Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
 			ARG 1 loader
@@ -80,6 +69,5 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		METHOD method_56520 loadFromResource (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V
 			ARG 1 resourceManager
 			ARG 2 infoGetter
-		METHOD method_56521 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_6903$class_7863;)V
+		METHOD method_56521 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_6903$class_7863;)V
 			ARG 1 data
-			ARG 2 infoGetter
diff --git a/mappings/net/minecraft/registry/SerializableRegistries.mapping b/mappings/net/minecraft/registry/SerializableRegistries.mapping
index 844649b391..7f96137e9e 100644
--- a/mappings/net/minecraft/registry/SerializableRegistries.mapping
+++ b/mappings/net/minecraft/registry/SerializableRegistries.mapping
@@ -6,21 +6,12 @@ CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries
 		ARG 0 dynamicRegistryManager
 	METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream;
 		ARG 0 combinedRegistries
-	METHOD method_56595 (Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/List;Lnet/minecraft/class_6880$class_6883;)V
-		ARG 3 registryEntry
-	METHOD method_56596 (Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2378;)V
-		ARG 3 registry
-	METHOD method_56597 serialize (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;)V
+	METHOD method_56597 serialize (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;)V
 		ARG 0 nbtOps
-		ARG 1 entry
 		ARG 2 registryManager
-		ARG 3 callback
-	METHOD method_56598 forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;)V
+	METHOD method_56598 forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;)V
 		ARG 0 nbtOps
 		ARG 1 registryManager
-		ARG 2 callback
-	METHOD method_56599 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;Lnet/minecraft/class_7655$class_7657;)V
-		ARG 3 entry
 	METHOD method_56600 (Lnet/minecraft/class_6880$class_6883;Ljava/lang/String;)Ljava/lang/IllegalArgumentException;
 		ARG 1 error
 	METHOD method_56601 (Lnet/minecraft/class_5455$class_6892;)Z
diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping
index 99cd184cf1..f89348be85 100644
--- a/mappings/net/minecraft/registry/SimpleRegistry.mapping
+++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping
@@ -7,7 +7,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry
 	FIELD field_25067 keyToEntry Ljava/util/Map;
 	FIELD field_26682 rawIdToEntry Lit/unimi/dsi/fastutil/objects/ObjectList;
 	FIELD field_26683 entryToRawId Lit/unimi/dsi/fastutil/objects/Reference2IntMap;
-	FIELD field_26731 entryToLifecycle Ljava/util/Map;
 	FIELD field_26732 lifecycle Lcom/mojang/serialization/Lifecycle;
 	FIELD field_36461 valueToEntry Ljava/util/Map;
 	FIELD field_36462 tagToEntryList Ljava/util/Map;
diff --git a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping
index 45d85bf747..01a700c9f5 100644
--- a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping
+++ b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping
@@ -1,10 +1,5 @@
 CLASS net/minecraft/class_3255 net/minecraft/resource/AbstractFileResourcePack
 	FIELD field_14182 LOGGER Lorg/slf4j/Logger;
-	FIELD field_39993 name Ljava/lang/String;
-	FIELD field_40857 alwaysStable Z
-	METHOD  (Ljava/lang/String;Z)V
-		ARG 1 name
-		ARG 2 alwaysStable
 	METHOD method_14392 parseMetadata (Lnet/minecraft/class_3270;Ljava/io/InputStream;)Ljava/lang/Object;
 		ARG 0 metaReader
 		ARG 1 inputStream
diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping
index 991f397ce1..f44c39ff60 100644
--- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping
+++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping
@@ -4,11 +4,6 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
 	FIELD field_26938 metadata Lnet/minecraft/class_7662;
 	FIELD field_40002 rootPaths Ljava/util/List;
 	FIELD field_40003 namespacePaths Ljava/util/Map;
-	METHOD  (Lnet/minecraft/class_7662;Ljava/util/Set;Ljava/util/List;Ljava/util/Map;)V
-		ARG 1 metadata
-		ARG 2 namespaces
-		ARG 3 rootPaths
-		ARG 4 namespacePaths
 	METHOD method_14418 collectIdentifiers (Lnet/minecraft/class_3262$class_7664;Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/List;)V
 		ARG 0 consumer
 		ARG 1 namespace
diff --git a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping
index 4c157c6e44..79ae7a54c5 100644
--- a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping
+++ b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping
@@ -33,7 +33,7 @@ CLASS net/minecraft/class_7665 net/minecraft/resource/DefaultResourcePackBuilder
 		ARG 2 path
 	METHOD method_45209 exists (Ljava/nio/file/Path;)Z
 		ARG 1 path
-	METHOD method_45210 build ()Lnet/minecraft/class_3268;
+	METHOD method_45210 build (Lnet/minecraft/class_9224;)Lnet/minecraft/class_3268;
 	METHOD method_45211 (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)V
 		ARG 1 type
 		ARG 2 path
diff --git a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping
index a1a8e8f857..6c8e9bb5ef 100644
--- a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping
+++ b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping
@@ -2,10 +2,8 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack
 	FIELD field_14187 LOGGER Lorg/slf4j/Logger;
 	FIELD field_40000 SEPARATOR_JOINER Lcom/google/common/base/Joiner;
 	FIELD field_40001 root Ljava/nio/file/Path;
-	METHOD  (Ljava/lang/String;Ljava/nio/file/Path;Z)V
-		ARG 1 name
+	METHOD  (Lnet/minecraft/class_9224;Ljava/nio/file/Path;)V
 		ARG 2 root
-		ARG 3 alwaysStable
 	METHOD method_14402 isValidPath (Ljava/nio/file/Path;)Z
 		ARG 0 path
 	METHOD method_45179 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)Lnet/minecraft/class_7367;
@@ -33,7 +31,5 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack
 		ARG 0 path
 	CLASS class_8619 DirectoryBackedFactory
 		FIELD field_45049 path Ljava/nio/file/Path;
-		FIELD field_45050 alwaysStable Z
-		METHOD  (Ljava/nio/file/Path;Z)V
+		METHOD  (Ljava/nio/file/Path;)V
 			ARG 1 path
-			ARG 2 alwaysStable
diff --git a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping
index c3050244fc..baf797b343 100644
--- a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping
+++ b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping
@@ -9,18 +9,11 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider
 		ARG 2 type
 		ARG 3 source
 		ARG 4 symlinkFinder
-	METHOD method_45271 forEachProfile (Ljava/nio/file/Path;Lnet/minecraft/class_8580;ZLjava/util/function/BiConsumer;)V
+	METHOD method_45271 forEachProfile (Ljava/nio/file/Path;Lnet/minecraft/class_8580;Ljava/util/function/BiConsumer;)V
 		ARG 0 path
 		ARG 1 symlinkFinder
-		ARG 2 alwaysStable
-		ARG 3 consumer
 	METHOD method_45272 (Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_3288$class_7680;)V
-		ARG 2 path
 		ARG 3 packFactory
 	METHOD method_45273 getFileName (Ljava/nio/file/Path;)Ljava/lang/String;
 		ARG 0 path
 	CLASS class_8620 PackOpenerImpl
-		FIELD field_45055 alwaysStable Z
-		METHOD  (Lnet/minecraft/class_8580;Z)V
-			ARG 1 symlinkFinder
-			ARG 2 alwaysStable
diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping
index 38d380f637..6ebcf30728 100644
--- a/mappings/net/minecraft/resource/Resource.mapping
+++ b/mappings/net/minecraft/resource/Resource.mapping
@@ -29,4 +29,3 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource
 		COMMENT 
    This input stream is closed when this resource is closed.
 	METHOD method_43039 getReader ()Ljava/io/BufferedReader;
 	METHOD method_45304 getPack ()Lnet/minecraft/class_3262;
-	METHOD method_45305 isAlwaysStable ()Z
diff --git a/mappings/net/minecraft/resource/ResourcePack.mapping b/mappings/net/minecraft/resource/ResourcePack.mapping
index a46ecbcee5..51f0c0d38b 100644
--- a/mappings/net/minecraft/resource/ResourcePack.mapping
+++ b/mappings/net/minecraft/resource/ResourcePack.mapping
@@ -22,7 +22,4 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack
 	METHOD method_14409 getName ()Ljava/lang/String;
 	METHOD method_14410 openRoot ([Ljava/lang/String;)Lnet/minecraft/class_7367;
 		ARG 1 segments
-	METHOD method_45178 isAlwaysStable ()Z
-		COMMENT {@return whether the dynamic registry entries from this pack are always
-		COMMENT "stable"/not experimental}
 	CLASS class_7664 ResultConsumer
diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping
index 7afff65760..2ff9f9d5eb 100644
--- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping
+++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping
@@ -8,68 +8,25 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
 	COMMENT 
    The profiles are registered by {@link ResourcePackProvider}s.
 	COMMENT
 	COMMENT 
    Closing the profile doesn't have any effect.
-	FIELD field_14270 pinned Z
-	FIELD field_14271 alwaysEnabled Z
-	FIELD field_14272 name Ljava/lang/String;
 	FIELD field_14273 packFactory Lnet/minecraft/class_3288$class_7680;
-	FIELD field_14274 displayName Lnet/minecraft/class_2561;
-	FIELD field_14277 position Lnet/minecraft/class_3288$class_3289;
 	FIELD field_14279 LOGGER Lorg/slf4j/Logger;
-	FIELD field_25346 source Lnet/minecraft/class_5352;
-	FIELD field_45056 metadata Lnet/minecraft/class_3288$class_7679;
-	METHOD  (Ljava/lang/String;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_2561;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)V
-		ARG 1 name
-		ARG 2 alwaysEnabled
-		ARG 3 packFactory
-		ARG 4 displayName
-		ARG 5 metadata
-		ARG 6 position
-		ARG 7 pinned
-		ARG 8 source
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD method_14456 of (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)Lnet/minecraft/class_3288;
-		COMMENT Creates a resource pack profile from the given parameters.
-		COMMENT
-		COMMENT 
    Compared to calling the factory directly, this utility method obtains the
-		COMMENT pack's metadata information from the pack created by the {@code packFactory}.
-		COMMENT If the created pack doesn't have metadata information, this method returns
-		COMMENT {@code null}.
-		COMMENT
-		COMMENT @return the created profile, or {@code null} if missing metadata
-		ARG 0 name
-		ARG 1 displayName
-		ARG 2 alwaysEnabled
-		ARG 3 packFactory
-		ARG 4 metadata
-		ARG 5 position
-		ARG 6 pinned
-		ARG 7 source
 	METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561;
 	METHOD method_14458 createResourcePack ()Lnet/minecraft/class_3262;
 	METHOD method_14459 getDescription ()Lnet/minecraft/class_2561;
 	METHOD method_14460 getCompatibility ()Lnet/minecraft/class_3281;
 	METHOD method_14461 getInformationText (Z)Lnet/minecraft/class_2561;
 		ARG 1 enabled
-	METHOD method_14462 (ZLnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
-		ARG 2 style
 	METHOD method_14463 getName ()Ljava/lang/String;
 	METHOD method_14464 isAlwaysEnabled ()Z
 	METHOD method_14465 isPinned ()Z
 	METHOD method_14466 getInitialPosition ()Lnet/minecraft/class_3288$class_3289;
 	METHOD method_29483 getSource ()Lnet/minecraft/class_5352;
-	METHOD method_45274 loadMetadata (Ljava/lang/String;Lnet/minecraft/class_3288$class_7680;I)Lnet/minecraft/class_3288$class_7679;
-		ARG 0 name
+	METHOD method_45274 loadMetadata (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;I)Lnet/minecraft/class_3288$class_7679;
 		ARG 1 packFactory
 		ARG 2 currentPackFormat
-	METHOD method_45275 create (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3264;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288;
-		ARG 0 name
-		ARG 1 displayName
-		ARG 2 alwaysEnabled
-		ARG 3 packFactory
-		ARG 4 type
-		ARG 5 position
-		ARG 6 source
+	METHOD method_45275 create (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3264;Lnet/minecraft/class_9225;)Lnet/minecraft/class_3288;
 	METHOD method_45276 getRequestedFeatures ()Lnet/minecraft/class_7699;
 	METHOD method_52440 getSupportedFormats (Ljava/lang/String;Lnet/minecraft/class_3272;)Lnet/minecraft/class_6497;
 		ARG 0 packName
@@ -83,8 +40,6 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
 			ARG 4 listInverted
 	CLASS class_7679 Metadata
 	CLASS class_7680 PackFactory
-		METHOD method_52424 open (Ljava/lang/String;)Lnet/minecraft/class_3262;
-			ARG 1 name
-		METHOD method_52425 openWithOverlays (Ljava/lang/String;Lnet/minecraft/class_3288$class_7679;)Lnet/minecraft/class_3262;
-			ARG 1 name
+		METHOD method_52424 open (Lnet/minecraft/class_9224;)Lnet/minecraft/class_3262;
+		METHOD method_52425 openWithOverlays (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7679;)Lnet/minecraft/class_3262;
 			ARG 2 metadata
diff --git a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping
index 7a709b1d4d..0c95c1ebe0 100644
--- a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping
+++ b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping
@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider
 	FIELD field_26939 METADATA_MAP Lnet/minecraft/class_7662;
-	FIELD field_29782 NAME Lnet/minecraft/class_2561;
 	FIELD field_40051 METADATA Lnet/minecraft/class_3272;
 	FIELD field_40052 FEATURE_FLAGS Lnet/minecraft/class_7663;
 	FIELD field_40053 ID Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/resource/ZipResourcePack.mapping b/mappings/net/minecraft/resource/ZipResourcePack.mapping
index 555368f94f..549a6e2f6f 100644
--- a/mappings/net/minecraft/resource/ZipResourcePack.mapping
+++ b/mappings/net/minecraft/resource/ZipResourcePack.mapping
@@ -2,11 +2,8 @@ CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack
 	FIELD field_39096 LOGGER Lorg/slf4j/Logger;
 	FIELD field_45038 zipFile Lnet/minecraft/class_3258$class_8616;
 	FIELD field_45039 overlay Ljava/lang/String;
-	METHOD  (Ljava/lang/String;Lnet/minecraft/class_3258$class_8616;ZLjava/lang/String;)V
-		ARG 1 name
+	METHOD  (Lnet/minecraft/class_9224;Lnet/minecraft/class_3258$class_8616;Ljava/lang/String;)V
 		ARG 2 zipFile
-		ARG 3 alwaysStable
-		ARG 4 overlay
 	METHOD method_14391 openFile (Ljava/lang/String;)Lnet/minecraft/class_7367;
 		ARG 1 path
 	METHOD method_45177 toPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String;
@@ -19,13 +16,10 @@ CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack
 		ARG 1 entryName
 	CLASS class_8615 ZipBackedFactory
 		FIELD field_45040 file Ljava/io/File;
-		FIELD field_45041 alwaysStable Z
-		METHOD  (Ljava/io/File;Z)V
+		METHOD  (Ljava/io/File;)V
 			ARG 1 file
-			ARG 2 alwaysStable
-		METHOD  (Ljava/nio/file/Path;Z)V
+		METHOD  (Ljava/nio/file/Path;)V
 			ARG 1 path
-			ARG 2 alwaysStable
 	CLASS class_8616 ZipFileWrapper
 		FIELD field_45042 file Ljava/io/File;
 		FIELD field_45043 zip Ljava/util/zip/ZipFile;
diff --git a/mappings/net/minecraft/server/command/DatapackCommand.mapping b/mappings/net/minecraft/server/command/DatapackCommand.mapping
index 625e037e5a..b206e06eb6 100644
--- a/mappings/net/minecraft/server/command/DatapackCommand.mapping
+++ b/mappings/net/minecraft/server/command/DatapackCommand.mapping
@@ -10,8 +10,6 @@ CLASS net/minecraft/class_3027 net/minecraft/server/command/DatapackCommand
 	METHOD method_13112 (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/List;Lnet/minecraft/class_3288;)V
 		ARG 1 profiles
 		ARG 2 profile
-	METHOD method_13113 (Lnet/minecraft/class_3288;)Lnet/minecraft/class_3288;
-		ARG 0 profilex
 	METHOD method_13114 executeEnable (Lnet/minecraft/class_2168;Lnet/minecraft/class_3288;Lnet/minecraft/class_3027$class_3028;)I
 		ARG 0 source
 		ARG 1 container
diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
index e2e1f4515f..22743d8862 100644
--- a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
+++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
@@ -13,6 +13,3 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN
 	METHOD method_52410 endConfiguration ()V
 	METHOD method_52411 queueSendResourcePackTask ()V
 	METHOD method_52412 pollTask ()V
-	METHOD method_56530 (Lnet/minecraft/class_5321;Ljava/util/List;)V
-		ARG 1 registryRef
-		ARG 2 entries
diff --git a/mappings/net/minecraft/state/State.mapping b/mappings/net/minecraft/state/State.mapping
index 5fe72d06bc..0174e76988 100644
--- a/mappings/net/minecraft/state/State.mapping
+++ b/mappings/net/minecraft/state/State.mapping
@@ -1,18 +1,17 @@
 CLASS net/minecraft/class_2688 net/minecraft/state/State
 	FIELD field_24737 PROPERTY_MAP_PRINTER Ljava/util/function/Function;
-	FIELD field_24738 entries Lcom/google/common/collect/ImmutableMap;
+	FIELD field_24738 entries Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;
 	FIELD field_24739 owner Ljava/lang/Object;
 	FIELD field_24740 codec Lcom/mojang/serialization/MapCodec;
 	FIELD field_24741 withTable Lcom/google/common/collect/Table;
 	FIELD field_31385 NAME Ljava/lang/String;
 	FIELD field_31386 PROPERTIES Ljava/lang/String;
-	METHOD  (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V
+	METHOD  (Ljava/lang/Object;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V
 		ARG 1 owner
-		ARG 2 entries
 		ARG 3 codec
 	METHOD method_11654 get (Lnet/minecraft/class_2769;)Ljava/lang/Comparable;
 		ARG 1 property
-	METHOD method_11656 getEntries ()Lcom/google/common/collect/ImmutableMap;
+	METHOD method_11656 getEntries ()Ljava/util/Map;
 	METHOD method_11657 with (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/Object;
 		ARG 1 property
 		ARG 2 value
diff --git a/mappings/net/minecraft/state/StateManager.mapping b/mappings/net/minecraft/state/StateManager.mapping
index d7401571e1..defef5c161 100644
--- a/mappings/net/minecraft/state/StateManager.mapping
+++ b/mappings/net/minecraft/state/StateManager.mapping
@@ -32,7 +32,6 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager
 		METHOD method_11669 validate (Lnet/minecraft/class_2769;)V
 			ARG 1 property
 	CLASS class_2691 Factory
-		METHOD create (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)Ljava/lang/Object;
+		METHOD create (Ljava/lang/Object;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)Ljava/lang/Object;
 			ARG 1 owner
-			ARG 2 entries
 			ARG 3 codec
diff --git a/mappings/net/minecraft/test/Batches.mapping b/mappings/net/minecraft/test/Batches.mapping
index da92a05bec..aaeb48ea6e 100644
--- a/mappings/net/minecraft/test/Batches.mapping
+++ b/mappings/net/minecraft/test/Batches.mapping
@@ -1,23 +1,18 @@
 CLASS net/minecraft/class_9113 net/minecraft/test/Batches
 	FIELD field_48467 BATCH_SIZE I
 	METHOD method_56188 defaultBatcher ()Lnet/minecraft/class_4520$class_9116;
-	METHOD method_56189 (Lnet/minecraft/class_3218;Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/List;)Lnet/minecraft/class_4514;
-		ARG 3 batchedFunctions
 	METHOD method_56190 (Lnet/minecraft/class_3218;Ljava/util/Map$Entry;)Ljava/util/stream/Stream;
 		ARG 1 entry
 	METHOD method_56191 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517;
 		ARG 1 testFunction
-	METHOD method_56192 (Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/List;)Lnet/minecraft/class_4514;
-		ARG 2 batchStates
 	METHOD method_56193 (Ljava/util/Collection;)Ljava/util/Collection;
 		ARG 0 states
 	METHOD method_56194 createBatches (Ljava/util/Collection;Lnet/minecraft/class_3218;)Ljava/util/Collection;
 		ARG 0 testFunctions
 		ARG 1 world
-	METHOD method_56195 create (Ljava/util/List;Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;)Lnet/minecraft/class_4514;
+	METHOD method_56195 create (Ljava/util/List;Ljava/lang/String;J)Lnet/minecraft/class_4514;
 		ARG 0 states
 		ARG 1 batchId
-		ARG 2 index
 	METHOD method_56196 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream;
 		ARG 0 entry
 	METHOD method_56197 (Lnet/minecraft/class_4517;)Ljava/lang/String;
diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9235.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9235.mapping
new file mode 100644
index 0000000000..9ae234b625
--- /dev/null
+++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9235.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9235 net/minecraft/unused/packageinfo/PackageInfo9235
diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
index 8ea132987f..6b8d86213c 100644
--- a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
@@ -13,12 +13,10 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport
 		ARG 1 statistics
 	METHOD method_38013 collectHeapSection (Lnet/minecraft/class_6525$class_6526;)Lcom/google/gson/JsonElement;
 		ARG 1 statistics
-	METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6767;)Lcom/google/gson/JsonElement;
+	METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6767;Ljava/util/function/BiConsumer;)Lcom/google/gson/JsonElement;
 		ARG 1 statistics
 	METHOD method_38015 collectThreadAllocationSection (Lnet/minecraft/class_6530$class_6531;)Lcom/google/gson/JsonElement;
 		ARG 1 statistics
-	METHOD method_38016 (Lcom/google/gson/JsonArray;Lcom/mojang/datafixers/util/Pair;)V
-		ARG 1 pair
 	METHOD method_38017 (Lcom/google/gson/JsonArray;Ljava/lang/String;Ljava/lang/Double;)V
 		ARG 1 threadName
 		ARG 2 allocation
diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
index ae4f893419..2b22b64fb6 100644
--- a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
@@ -26,7 +26,7 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord
 		ARG 1 event
 		ARG 2 samples
 		ARG 3 bytesKey
-	METHOD method_39432 (Lnet/minecraft/class_6767$class_6769;)Lnet/minecraft/class_6516$class_6766;
+	METHOD method_39432 (Lnet/minecraft/class_6769;)Lnet/minecraft/class_6516$class_6766;
 		ARG 0 packet
 	METHOD method_39433 createNetworkIoStatistics (Ljava/time/Duration;Ljava/util/Map;)Lnet/minecraft/class_6767;
 		ARG 0 duration
diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping
index 03575183b4..e1ac280700 100644
--- a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping
@@ -14,8 +14,3 @@ CLASS net/minecraft/class_6767 net/minecraft/util/profiling/jfr/sample/NetworkIo
 		FIELD field_35586 COMPARATOR Ljava/util/Comparator;
 		METHOD method_39444 add (Lnet/minecraft/class_6767$class_6768;)Lnet/minecraft/class_6767$class_6768;
 			ARG 1 statistics
-	CLASS class_6769 Packet
-		FIELD comp_259 side Ljava/lang/String;
-		METHOD comp_259 side ()Ljava/lang/String;
-		METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6767$class_6769;
-			ARG 0 event
diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping
new file mode 100644
index 0000000000..cc4e3508cb
--- /dev/null
+++ b/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_6769 net/minecraft/util/profiling/jfr/sample/Packet
+	FIELD comp_259 side Ljava/lang/String;
+	METHOD comp_259 side ()Ljava/lang/String;
+	METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6769;
+		ARG 0 event
diff --git a/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping b/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping
index 8ded369e15..c5dc3d86b5 100644
--- a/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping
+++ b/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping
@@ -14,13 +14,10 @@ CLASS net/minecraft/class_7723 net/minecraft/world/dimension/DimensionOptionsReg
 		ARG 0 dimensionOptions
 	METHOD method_45518 toConfig (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7723$class_7725;
 		ARG 1 existingRegistry
-	METHOD method_45519 createRegistry (Lnet/minecraft/class_2378;Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378;
-		ARG 0 currentRegistry
-		ARG 1 overworldEntry
+	METHOD method_45519 createRegistry (Ljava/util/Map;Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)Ljava/util/Map;
 		ARG 2 chunkGenerator
-	METHOD method_45520 createRegistry (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378;
+	METHOD method_45520 createRegistry (Lnet/minecraft/class_2378;Ljava/util/Map;Lnet/minecraft/class_2794;)Ljava/util/Map;
 		ARG 0 dynamicRegistry
-		ARG 1 currentRegistry
 		ARG 2 chunkGenerator
 	METHOD method_45521 (Lnet/minecraft/class_2378;Ljava/util/List;Lnet/minecraft/class_5321;)V
 		ARG 3 key
@@ -49,7 +46,6 @@ CLASS net/minecraft/class_7723 net/minecraft/world/dimension/DimensionOptionsReg
 	METHOD method_45534 (Lnet/minecraft/class_5363;)Lnet/minecraft/class_31$class_7729;
 		ARG 0 overworldEntry
 	CLASS class_7724 Entry
-		METHOD method_45535 getLifecycle ()Lcom/mojang/serialization/Lifecycle;
 	CLASS class_7725 DimensionsConfig
 		METHOD method_45536 getLifecycle ()Lcom/mojang/serialization/Lifecycle;
 		METHOD method_45537 toDynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890;
diff --git a/mappings/net/minecraft/world/gen/WorldPreset.mapping b/mappings/net/minecraft/world/gen/WorldPreset.mapping
index 6d69ab511b..a6a0bd9353 100644
--- a/mappings/net/minecraft/world/gen/WorldPreset.mapping
+++ b/mappings/net/minecraft/world/gen/WorldPreset.mapping
@@ -9,9 +9,6 @@ CLASS net/minecraft/class_7145 net/minecraft/world/gen/WorldPreset
 		ARG 0 instance
 	METHOD method_41588 (Lnet/minecraft/class_7145;)Ljava/util/Map;
 		ARG 0 preset
-	METHOD method_41589 (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;)V
-		ARG 2 registryKey
-	METHOD method_41591 createDimensionOptionsRegistry ()Lnet/minecraft/class_2378;
 	METHOD method_44351 validate (Lnet/minecraft/class_7145;)Lcom/mojang/serialization/DataResult;
 		ARG 0 preset
 	METHOD method_45546 createDimensionsRegistryHolder ()Lnet/minecraft/class_7723;
diff --git a/mappings/net/minecraft/world/gen/WorldPresets.mapping b/mappings/net/minecraft/world/gen/WorldPresets.mapping
index 0a199ef695..dbea58e7cc 100644
--- a/mappings/net/minecraft/world/gen/WorldPresets.mapping
+++ b/mappings/net/minecraft/world/gen/WorldPresets.mapping
@@ -7,8 +7,7 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets
 	FIELD field_35757 AMPLIFIED Lnet/minecraft/class_5321;
 	METHOD method_41593 bootstrap (Lnet/minecraft/class_7891;)V
 		ARG 0 presetRegisterable
-	METHOD method_41594 getWorldPreset (Lnet/minecraft/class_2378;)Ljava/util/Optional;
-		ARG 0 registry
+	METHOD method_41594 getWorldPreset (Lnet/minecraft/class_7723;)Ljava/util/Optional;
 	METHOD method_41597 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
 	METHOD method_41598 createDemoOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723;
diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping
index 2d27abc887..d5a57f3b28 100644
--- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping
+++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping
@@ -1,12 +1,6 @@
 CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
 	FIELD field_18484 pointOfInterestDistanceTracker Lnet/minecraft/class_4153$class_4154;
 	FIELD field_20688 preloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet;
-	METHOD  (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V
-		ARG 1 path
-		ARG 2 dataFixer
-		ARG 3 dsync
-		ARG 4 registryManager
-		ARG 5 world
 	METHOD method_19112 remove (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
 	METHOD method_19113 (Lnet/minecraft/class_2338;ILnet/minecraft/class_4156;)Z
diff --git a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
index e2ec92f403..a7beb15489 100644
--- a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
+++ b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
@@ -2,11 +2,7 @@ CLASS net/minecraft/class_9172 net/minecraft/world/storage/ChunkPosKeyedStorage
 	FIELD field_48760 worker Lnet/minecraft/class_4698;
 	FIELD field_48761 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_48762 dataFixTypes Lnet/minecraft/class_4284;
-	METHOD  (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/lang/String;Lnet/minecraft/class_4284;)V
-		ARG 1 directory
-		ARG 2 dataFixer
-		ARG 3 dsync
-		ARG 4 name
+	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_4284;)V
 		ARG 5 dataFixTypes
 	METHOD method_56565 set (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 pos
diff --git a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
index a679f9da05..3096ef698a 100644
--- a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
+++ b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
@@ -1,8 +1,3 @@
 CLASS net/minecraft/class_9170 net/minecraft/world/storage/RecreatedChunkStorage
 	FIELD field_48748 recreationWorker Lnet/minecraft/class_4698;
 	FIELD field_48749 outputDirectory Ljava/nio/file/Path;
-	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V
-		ARG 1 directory
-		ARG 2 outputDirectory
-		ARG 3 dataFixer
-		ARG 4 dsync
diff --git a/mappings/net/minecraft/world/storage/RecreationStorage.mapping b/mappings/net/minecraft/world/storage/RecreationStorage.mapping
index 7e8689b8ea..cef5cd7b30 100644
--- a/mappings/net/minecraft/world/storage/RecreationStorage.mapping
+++ b/mappings/net/minecraft/world/storage/RecreationStorage.mapping
@@ -1,10 +1,3 @@
 CLASS net/minecraft/class_9171 net/minecraft/world/storage/RecreationStorage
 	FIELD field_48750 recreationWorker Lnet/minecraft/class_4698;
 	FIELD field_48751 outputDirectory Ljava/nio/file/Path;
-	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/lang/String;Lnet/minecraft/class_4284;)V
-		ARG 1 directory
-		ARG 2 outputDirectory
-		ARG 3 dataFixer
-		ARG 4 dsync
-		ARG 5 name
-		ARG 6 dataFixTypes
diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping
index 44fbc1af2d..a42ff95720 100644
--- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping
+++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping
@@ -4,9 +4,6 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage
 	FIELD field_23748 dsync Z
 	FIELD field_31425 MCA_EXTENSION Ljava/lang/String;
 	FIELD field_31426 MAX_CACHE_SIZE I
-	METHOD  (Ljava/nio/file/Path;Z)V
-		ARG 1 directory
-		ARG 2 dsync
 	METHOD method_12440 getRegionFile (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2861;
 		ARG 1 pos
 	METHOD method_17911 getTagAt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487;
diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping
index c1442faa6e..442064177f 100644
--- a/mappings/net/minecraft/world/storage/RegionFile.mapping
+++ b/mappings/net/minecraft/world/storage/RegionFile.mapping
@@ -11,15 +11,8 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	FIELD field_31417 SECTOR_DATA_LIMIT I
 	FIELD field_31421 FILE_EXTENSION Ljava/lang/String;
 	FIELD field_48752 path Ljava/nio/file/Path;
-	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V
-		ARG 1 path
+	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V
 		ARG 2 directory
-		ARG 3 compressionFormat
-		ARG 4 dsync
-	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V
-		ARG 1 file
-		ARG 2 directory
-		ARG 3 dsync
 	METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I
 		ARG 1 pos
 	METHOD method_12423 hasChunk (Lnet/minecraft/class_1923;)Z
diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
index db979f08d0..1f78a2716e 100644
--- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
+++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
@@ -6,10 +6,6 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker
 	FIELD field_24468 executor Lnet/minecraft/class_3846;
 	FIELD field_38240 blendingStatusCaches Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
 	FIELD field_38241 MAX_CACHE_SIZE I
-	METHOD  (Ljava/nio/file/Path;ZLjava/lang/String;)V
-		ARG 1 directory
-		ARG 2 dsync
-		ARG 3 name
 	METHOD method_23698 completeAll (Z)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 sync
 	METHOD method_23701 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_4698$class_4699;)V
diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
index 5ddd3e1c0d..2cbf14c1df 100644
--- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
+++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
@@ -3,10 +3,6 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage
 	FIELD field_17655 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_21494 worker Lnet/minecraft/class_4698;
 	FIELD field_36219 FEATURE_UPDATING_VERSION I
-	METHOD  (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V
-		ARG 1 directory
-		ARG 2 dataFixer
-		ARG 3 dsync
 	METHOD method_17907 updateChunkNbt (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;Ljava/util/Optional;)Lnet/minecraft/class_2487;
 		ARG 1 worldKey
 		ARG 2 persistentStateManagerFactory
diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
index cfd5ebae25..9eebe666c2 100644
--- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping
+++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
@@ -52,19 +52,12 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 		FIELD field_48735 upgradingText Lnet/minecraft/class_5250;
 		FIELD field_48736 finishedText Lnet/minecraft/class_5250;
 		FIELD field_48737 targetName Ljava/lang/String;
-		METHOD  (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V
-			ARG 2 dataFixTypes
-			ARG 3 targetName
-			ARG 4 upgradingText
-			ARG 5 finishedText
 		METHOD method_56537 update ()V
 		METHOD method_56538 update (Lnet/minecraft/class_5321;Ljava/lang/AutoCloseable;Lnet/minecraft/class_1923;)Z
 			ARG 1 worldKey
 			ARG 2 storage
 			ARG 3 chunkPos
-		METHOD method_56539 listRegions (Lnet/minecraft/class_5321;Ljava/lang/String;)Ljava/util/List;
-			ARG 1 worldKey
-			ARG 2 targetName
+		METHOD method_56539 listRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/List;
 		METHOD method_56540 (Lnet/minecraft/class_1257$class_9165;)I
 			ARG 0 region
 		METHOD method_56541 recreate (Lnet/minecraft/class_2861;)V
@@ -76,15 +69,10 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 			ARG 1 storage
 			ARG 2 chunkPos
 			ARG 3 worldKey
-		METHOD method_56544 listWoldData (Ljava/lang/String;)Ljava/util/List;
-			ARG 1 targetName
-		METHOD method_56545 enumerateRegions (Ljava/lang/String;Lnet/minecraft/class_5321;)Ljava/util/ListIterator;
-			ARG 1 targetName
-			ARG 2 worldKey
-		METHOD method_56546 openStorage (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable;
-			ARG 1 targetName
+		METHOD method_56544 listWoldData ()Ljava/util/List;
+		METHOD method_56545 enumerateRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/ListIterator;
+		METHOD method_56546 openStorage (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable;
 			ARG 2 worldDirectory
-			ARG 3 targetDirectory
 	CLASS class_9162 RegionUpdate
 	CLASS class_9163 WorldData
 	CLASS class_9164 EntitiesUpdate

From fe8f8d971175a85c4971b9afe24be8c1810b0edb Mon Sep 17 00:00:00 2001
From: Louis <82884007+Dev0Louis@users.noreply.github.com>
Date: Thu, 8 Feb 2024 04:27:48 +0100
Subject: [PATCH 32/47] A little more 24w06 stuff (#3784)

* Some more stuff :)

* More stuff :D

---------

Co-authored-by: D1p4k <82884007+D1p4k@users.noreply.github.com>
---
 mappings/net/minecraft/class_9224.mapping        |  3 +++
 mappings/net/minecraft/class_9243.mapping        |  2 ++
 mappings/net/minecraft/class_9247.mapping        |  5 +++++
 .../network/packet/VersionedIdentifier.mapping   |  6 ++++++
 .../resource/ResourcePackProfile.mapping         |  4 ++++
 .../profiling/jfr/event/ChunkRegionEvent.mapping | 16 ++++++++++++++++
 6 files changed, 36 insertions(+)
 create mode 100644 mappings/net/minecraft/class_9224.mapping
 create mode 100644 mappings/net/minecraft/class_9243.mapping
 create mode 100644 mappings/net/minecraft/class_9247.mapping
 create mode 100644 mappings/net/minecraft/network/packet/VersionedIdentifier.mapping
 create mode 100644 mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping

diff --git a/mappings/net/minecraft/class_9224.mapping b/mappings/net/minecraft/class_9224.mapping
new file mode 100644
index 0000000000..e056a42363
--- /dev/null
+++ b/mappings/net/minecraft/class_9224.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_9224
+	METHOD method_56927 (ZLnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
+		ARG 1 enabled
diff --git a/mappings/net/minecraft/class_9243.mapping b/mappings/net/minecraft/class_9243.mapping
new file mode 100644
index 0000000000..b383c0f366
--- /dev/null
+++ b/mappings/net/minecraft/class_9243.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_9243
+	FIELD field_49114 CODEC Lcom/mojang/serialization/Codec;
diff --git a/mappings/net/minecraft/class_9247.mapping b/mappings/net/minecraft/class_9247.mapping
new file mode 100644
index 0000000000..d91db78ef7
--- /dev/null
+++ b/mappings/net/minecraft/class_9247.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_9247
+	FIELD field_49124 realmsManager Lnet/minecraft/class_3283;
+	METHOD method_57046 createLifecycledResourceManager ()Lnet/minecraft/class_6860;
+	METHOD method_57048 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_3288;)V
+		ARG 1 resourcePackProfile
diff --git a/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping b/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping
new file mode 100644
index 0000000000..ef40d34b73
--- /dev/null
+++ b/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9226 net/minecraft/network/packet/VersionedIdentifier
+	FIELD field_49035 PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_49036 DEFAULT_NAMESPACE Ljava/lang/String;
+	METHOD method_56931 isVanilla ()Z
+	METHOD method_56932 createVanilla (Ljava/lang/String;)Lnet/minecraft/class_9226;
+		ARG 0 path
diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping
index 2ff9f9d5eb..8cae08c26e 100644
--- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping
+++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping
@@ -10,6 +10,10 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
 	COMMENT 
    Closing the profile doesn't have any effect.
 	FIELD field_14273 packFactory Lnet/minecraft/class_3288$class_7680;
 	FIELD field_14279 LOGGER Lorg/slf4j/Logger;
+	FIELD field_49038 metaData Lnet/minecraft/class_3288$class_7679;
+	METHOD  (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_9225;)V
+		ARG 2 packFactory
+		ARG 3 metaData
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping
new file mode 100644
index 0000000000..0d477585c1
--- /dev/null
+++ b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping
@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_9232 net/minecraft/util/profiling/jfr/event/ChunkRegionEvent
+	FIELD levelId worldId Ljava/lang/String;
+	METHOD  (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V
+		ARG 4 bytes
+	CLASS class_9233 Constants
+		FIELD field_49059 regionPosX Ljava/lang/String;
+		FIELD field_49060 regionPosZ Ljava/lang/String;
+		FIELD field_49061 localPosX Ljava/lang/String;
+		FIELD field_49062 localPosZ Ljava/lang/String;
+		FIELD field_49063 chunkPosX Ljava/lang/String;
+		FIELD field_49064 chunkPosZ Ljava/lang/String;
+		FIELD field_49065 world Ljava/lang/String;
+		FIELD field_49066 dimension Ljava/lang/String;
+		FIELD field_49067 type Ljava/lang/String;
+		FIELD field_49068 compression Ljava/lang/String;
+		FIELD field_49069 bytes Ljava/lang/String;

From eabf859a027081c8d02807013fa1d4d6e3d07c61 Mon Sep 17 00:00:00 2001
From: Shnupbups 
Date: Thu, 8 Feb 2024 14:28:06 +1100
Subject: [PATCH 33/47] 24w06a stuff (#3783)

Plenty more to do, will leave it for others for now
---
 .../net/minecraft/block/AbstractBlock.mapping |  1 +
 .../block/dispenser/DispenserBehavior.mapping | 10 ++++++++
 .../block/entity/HopperBlockEntity.mapping    | 25 +++++++++++++++++++
 mappings/net/minecraft/class_9236.mapping     |  2 --
 .../screen/option/FontOptionsScreen.mapping   |  6 +++++
 .../client/option/GameOptions.mapping         |  8 ++++++
 .../animation/ArmadilloAnimations.mapping     |  3 +++
 ...eTwentyOneEntityLootTableGenerator.mapping |  1 +
 .../net/minecraft/datafixer/FixUtil.mapping   | 21 ++++++++++++++++
 .../datafixer/fix/BlockPosFormatFix.mapping   | 16 ++++++++++++
 .../fix/LegacyDragonFightFix.mapping          |  2 ++
 .../fix/MapBannerBlockPosFormatFix.mapping    |  4 +++
 .../datafixer/fix/StatusEffectFix.mapping     | 12 +++++++++
 .../datafixer/fix/WolfHealthFix.mapping       |  5 ++++
 .../minecraft/entity/AnimationState.mapping   |  3 +++
 .../DataTracked.mapping}                      |  4 ++-
 mappings/net/minecraft/entity/Entity.mapping  |  5 ++++
 .../minecraft/entity/EntityStatuses.mapping   |  1 +
 .../net/minecraft/entity/LivingEntity.mapping |  2 ++
 .../minecraft/entity/data/DataTracker.mapping | 12 +++++++++
 .../entity/passive/ArmadilloBrain.mapping     |  5 ++++
 .../entity/passive/ArmadilloEntity.mapping    | 14 +++++++++++
 .../entity/passive/TameableEntity.mapping     |  2 ++
 .../AbstractWindChargeEntity.mapping          | 10 ++++++++
 .../projectile/BreezeWindChargeEntity.mapping |  6 +++++
 .../projectile/WindChargeEntity.mapping       | 15 +++++++++++
 .../net/minecraft/fluid/FluidState.mapping    |  1 +
 .../net/minecraft/item/WindChargeItem.mapping |  2 ++
 mappings/net/minecraft/nbt/NbtHelper.mapping  |  1 +
 .../ClientConfigurationPacketListener.mapping |  2 ++
 .../ServerConfigurationPacketListener.mapping |  2 ++
 .../network/packet/ConfigPackets.mapping      |  2 ++
 .../config/SelectKnownPacksC2SPacket.mapping  |  2 ++
 .../config/SelectKnownPacksS2CPacket.mapping  |  2 ++
 .../network/SynchronizeRegistriesTask.mapping |  2 ++
 mappings/net/minecraft/state/State.mapping    |  8 +++++-
 .../net/minecraft/state/StateManager.mapping  |  1 +
 .../world/explosion/ExplosionBehavior.mapping |  1 +
 unpick-definitions/entity_status.unpick       |  1 +
 39 files changed, 218 insertions(+), 4 deletions(-)
 delete mode 100644 mappings/net/minecraft/class_9236.mapping
 create mode 100644 mappings/net/minecraft/client/gui/screen/option/FontOptionsScreen.mapping
 create mode 100644 mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator.mapping
 create mode 100644 mappings/net/minecraft/datafixer/FixUtil.mapping
 create mode 100644 mappings/net/minecraft/datafixer/fix/BlockPosFormatFix.mapping
 create mode 100644 mappings/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.mapping
 create mode 100644 mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping
 rename mappings/net/minecraft/{class_9221.mapping => entity/DataTracked.mapping} (57%)
 create mode 100644 mappings/net/minecraft/entity/projectile/AbstractWindChargeEntity.mapping
 create mode 100644 mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping
 create mode 100644 mappings/net/minecraft/item/WindChargeItem.mapping
 create mode 100644 mappings/net/minecraft/network/packet/c2s/config/SelectKnownPacksC2SPacket.mapping
 create mode 100644 mappings/net/minecraft/network/packet/s2c/config/SelectKnownPacksS2CPacket.mapping
 create mode 100644 mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping

diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
index 5c645ca4a0..aa179285f9 100644
--- a/mappings/net/minecraft/block/AbstractBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -1024,6 +1024,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		FIELD field_44626 replaceable Z
 		METHOD  (Lnet/minecraft/class_2248;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V
 			ARG 1 block
+			ARG 2 propertyMap
 			ARG 3 codec
 		METHOD method_26164 isIn (Lnet/minecraft/class_6862;)Z
 			ARG 1 tag
diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
index 861f68a84e..d12cc6cf96 100644
--- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
+++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
@@ -29,7 +29,17 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
 			ARG 1 entity
 	CLASS 9
 		FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347;
+	CLASS 10
+		FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347;
 	CLASS 17
+	CLASS 18
+		FIELD field_49138 fallbackBehavior Lnet/minecraft/class_2347;
+		METHOD method_57069 (Lnet/minecraft/class_4970$class_4971;)Z
+			ARG 0 state
+		METHOD method_57070 tryPutFilledBottle (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
+			ARG 1 pointer
+			ARG 2 emptyBottleStack
+			ARG 3 filledBottleStack
 	CLASS 22
 		FIELD field_38001 fallback Lnet/minecraft/class_2347;
 	CLASS 24
diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
index 0d7e413827..aac85173a9 100644
--- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 	FIELD field_12024 inventory Lnet/minecraft/class_2371;
 	FIELD field_31341 TRANSFER_COOLDOWN I
 	FIELD field_31342 INVENTORY_SIZE I
+	FIELD field_49101 facing Lnet/minecraft/class_2350;
 	METHOD  (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
@@ -20,6 +21,8 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 1 transferCooldown
 	METHOD method_11239 needsCooldown ()Z
 	METHOD method_11241 extract (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;)Z
+		ARG 0 world
+		ARG 1 hopper
 	METHOD method_11242 isDisabled ()Z
 	METHOD method_11243 insertAndExtract (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2614;Ljava/util/function/BooleanSupplier;)Z
 		ARG 0 world
@@ -34,16 +37,25 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 	METHOD method_11246 insert (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2614;)Z
 		ARG 0 world
 		ARG 1 pos
+		ARG 2 blockEntity
 	METHOD method_11247 extract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1542;)Z
 		ARG 0 inventory
 		ARG 1 itemEntity
 	METHOD method_11248 getInputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1263;
 		ARG 0 world
+		ARG 1 hopper
+		ARG 2 pos
+		ARG 3 state
 	METHOD method_11250 getInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1263;
 		ARG 0 world
 		ARG 1 pos
 	METHOD method_11251 getInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;DDD)Lnet/minecraft/class_1263;
 		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
+		ARG 3 x
+		ARG 5 y
+		ARG 7 z
 	METHOD method_11252 canExtract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;ILnet/minecraft/class_2350;)Z
 		ARG 0 hopperInventory
 		ARG 1 fromInventory
@@ -60,8 +72,12 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 0 first
 		ARG 1 second
 	METHOD method_11255 getOutputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2614;)Lnet/minecraft/class_1263;
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 blockEntity
 	METHOD method_11256 isFull ()Z
 	METHOD method_11258 isInventoryFull (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Z
+		ARG 0 inventory
 		ARG 1 direction
 	METHOD method_11260 transfer (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;Lnet/minecraft/class_2350;)Lnet/minecraft/class_1799;
 		ARG 0 from
@@ -81,3 +97,12 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 blockEntity
+	METHOD method_57009 getEntityInventoryAt (Lnet/minecraft/class_1937;DDD)Lnet/minecraft/class_1263;
+		ARG 0 world
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
+	METHOD method_57010 getBlockInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1263;
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
diff --git a/mappings/net/minecraft/class_9236.mapping b/mappings/net/minecraft/class_9236.mapping
deleted file mode 100644
index be0fa2b9ef..0000000000
--- a/mappings/net/minecraft/class_9236.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS net/minecraft/class_9236
-	METHOD method_55055 createExplosion ()V
diff --git a/mappings/net/minecraft/client/gui/screen/option/FontOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/FontOptionsScreen.mapping
new file mode 100644
index 0000000000..3b417aa2b0
--- /dev/null
+++ b/mappings/net/minecraft/client/gui/screen/option/FontOptionsScreen.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9246 net/minecraft/client/gui/screen/option/FontOptionsScreen
+	METHOD  (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
+		ARG 1 parent
+		ARG 2 gameOptions
+	METHOD method_57041 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172;
+		ARG 0 gameOptions
diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping
index b73e4fe9dd..20ab1a5494 100644
--- a/mappings/net/minecraft/client/option/GameOptions.mapping
+++ b/mappings/net/minecraft/client/option/GameOptions.mapping
@@ -222,6 +222,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_45987 narratorHotkey Lnet/minecraft/class_7172;
 	FIELD field_46854 HIDE_SPLASH_TEXTS_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_46855 hideSplashTexts Lnet/minecraft/class_7172;
+	FIELD field_49105 japaneseGlyphVariants Lnet/minecraft/class_7172;
 	METHOD  (Lnet/minecraft/class_310;Ljava/io/File;)V
 		ARG 1 client
 		ARG 2 optionsFile
@@ -597,6 +598,11 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	METHOD method_53530 getNarratorHotkey ()Lnet/minecraft/class_7172;
 	METHOD method_53842 getSyncedOptions ()Lnet/minecraft/class_8791;
 	METHOD method_54581 getHideSplashTexts ()Lnet/minecraft/class_7172;
+	METHOD method_57018 getJapaneseGlyphVariants ()Lnet/minecraft/class_7172;
+	METHOD method_57020 onFontOptionsChanged ()V
+	METHOD method_57021 shouldUseJapaneseGlyphsByDefault ()Z
+	METHOD method_57022 (Ljava/lang/Boolean;)V
+		ARG 0 value
 	CLASS 2
 		METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String;
 			ARG 1 key
@@ -627,3 +633,5 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		METHOD method_33684 visitBoolean (Ljava/lang/String;Z)Z
 			ARG 1 key
 			ARG 2 current
+	CLASS class_9242
+		METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V
diff --git a/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping
index f562fa1a63..bccfe3a4f5 100644
--- a/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping
+++ b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping
@@ -1,2 +1,5 @@
 CLASS net/minecraft/class_9079 net/minecraft/client/render/entity/animation/ArmadilloAnimations
 	FIELD field_47844 IDLE Lnet/minecraft/class_7184;
+	FIELD field_49108 ROLLING Lnet/minecraft/class_7184;
+	FIELD field_49109 SCARED Lnet/minecraft/class_7184;
+	FIELD field_49110 UNROLLING Lnet/minecraft/class_7184;
diff --git a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator.mapping
new file mode 100644
index 0000000000..133c605e8b
--- /dev/null
+++ b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9249 net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator
diff --git a/mappings/net/minecraft/datafixer/FixUtil.mapping b/mappings/net/minecraft/datafixer/FixUtil.mapping
new file mode 100644
index 0000000000..8d940608b9
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/FixUtil.mapping
@@ -0,0 +1,21 @@
+CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil
+	METHOD method_56943 fixBlockPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+	METHOD method_56944 renameKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+		ARG 1 oldKey
+		ARG 2 newKey
+	METHOD method_56945 replaceKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+		ARG 1 oldKey
+		ARG 2 newKey
+		ARG 3 newValue
+	METHOD method_56946 replaceKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/UnaryOperator;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+		ARG 1 oldKey
+		ARG 2 newKey
+		ARG 3 valueTransformer
+	METHOD method_56947 setOptional (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+		ARG 1 key
+		ARG 2 value
diff --git a/mappings/net/minecraft/datafixer/fix/BlockPosFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockPosFormatFix.mapping
new file mode 100644
index 0000000000..da001b6629
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/fix/BlockPosFormatFix.mapping
@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_9230 net/minecraft/datafixer/fix/BlockPosFormatFix
+	FIELD field_49057 PATROL_TARGET_ENTITY_IDS Ljava/util/List;
+	METHOD  (Lcom/mojang/datafixers/schemas/Schema;)V
+		ARG 1 outputSchema
+	METHOD method_56953 createFixRule (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/util/Map;)Lcom/mojang/datafixers/TypeRewriteRule;
+		ARG 1 typeReference
+		ARG 2 id
+		ARG 3 oldToNewKey
+	METHOD method_56956 fixOldBlockPosFormat (Lcom/mojang/datafixers/Typed;Ljava/util/Map;)Lcom/mojang/datafixers/Typed;
+		ARG 2 oldToNewKey
+	METHOD method_56957 fixMapItemFrames (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 1 dynamic
+	METHOD method_56958 addEntityFixes (Ljava/util/List;)V
+		ARG 1 rules
+	METHOD method_56963 addBlockEntityFixes (Ljava/util/List;)V
+		ARG 1 rules
diff --git a/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping b/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping
index bb72bab30b..f8ec26bd41 100644
--- a/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping
@@ -5,3 +5,5 @@ CLASS net/minecraft/class_8575 net/minecraft/datafixer/fix/LegacyDragonFightFix
 		ARG 0 typed
 	METHOD method_52228 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 		ARG 0 levelData
+	METHOD method_56973 updateExitPortalLocation (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
diff --git a/mappings/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.mapping
new file mode 100644
index 0000000000..0d45b47d56
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9231 net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix
+	METHOD  (Lcom/mojang/datafixers/schemas/Schema;)V
+		ARG 1 outputSchema
+	METHOD method_56975 update (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
diff --git a/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping b/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping
index 4df3cfa7e9..967ecd59f6 100644
--- a/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping
@@ -6,9 +6,13 @@ CLASS net/minecraft/class_8744 net/minecraft/datafixer/fix/StatusEffectFix
 	METHOD method_53078 makeBlockEntitiesRule ()Lcom/mojang/datafixers/TypeRewriteRule;
 	METHOD method_53082 fixEffect (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 		ARG 0 effectDynamic
+	METHOD method_53083 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53084 updateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/util/Optional;
+		ARG 0 dynamic
 		ARG 1 idKey
 	METHOD method_53085 renameKeyAndUpdateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 		ARG 1 oldKey
 		ARG 3 newKey
 	METHOD method_53090 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V
@@ -17,14 +21,22 @@ CLASS net/minecraft/class_8744 net/minecraft/datafixer/fix/StatusEffectFix
 		ARG 0 oldId
 	METHOD method_53093 makeEntitiesRule ()Lcom/mojang/datafixers/TypeRewriteRule;
 	METHOD method_53096 renameKeyAndUpdateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 		ARG 1 oldKey
 		ARG 2 newKey
 	METHOD method_53098 makeItemStacksRule ()Lcom/mojang/datafixers/TypeRewriteRule;
 	METHOD method_53100 fixStewEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53101 fixEffectList (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 		ARG 1 oldEffectListKey
 		ARG 2 newEffectListKey
 	METHOD method_53103 fixCustomPotionEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53104 fixEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53105 fixActiveEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+	METHOD method_53108 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53713 makePlayersRule ()Lcom/mojang/datafixers/TypeRewriteRule;
diff --git a/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping b/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping
new file mode 100644
index 0000000000..a75342ffe9
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_9229 net/minecraft/datafixer/fix/WolfHealthFix
+	FIELD field_49054 WOLF_ENTITY_ID Ljava/lang/String;
+	FIELD field_49055 MAX_HEALTH_ATTRIBUTE_ID Lnet/minecraft/class_2960;
+	METHOD  (Lcom/mojang/datafixers/schemas/Schema;)V
+		ARG 1 outputSchema
diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping
index fea335f42d..4b961850b4 100644
--- a/mappings/net/minecraft/entity/AnimationState.mapping
+++ b/mappings/net/minecraft/entity/AnimationState.mapping
@@ -17,3 +17,6 @@ CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState
 	METHOD method_45317 setRunning (ZI)V
 		ARG 1 running
 		ARG 2 age
+	METHOD method_56988 skip (IF)V
+		ARG 1 seconds
+		ARG 2 speedMultiplier
diff --git a/mappings/net/minecraft/class_9221.mapping b/mappings/net/minecraft/entity/DataTracked.mapping
similarity index 57%
rename from mappings/net/minecraft/class_9221.mapping
rename to mappings/net/minecraft/entity/DataTracked.mapping
index df6de9549b..ed0cc28a4f 100644
--- a/mappings/net/minecraft/class_9221.mapping
+++ b/mappings/net/minecraft/entity/DataTracked.mapping
@@ -1,3 +1,5 @@
-CLASS net/minecraft/class_9221
+CLASS net/minecraft/class_9221 net/minecraft/entity/DataTracked
 	METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V
+		ARG 1 entries
 	METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V
+		ARG 1 data
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 9473525a93..ffb3214e57 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -1352,6 +1352,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT 
    This is {@code 0} for non-players.
 		COMMENT
 		COMMENT @see #hasPermissionLevel
+	METHOD method_56918 onExplodedBy (Lnet/minecraft/class_1297;)V
+		ARG 1 entity
 	METHOD method_5692 updateMovementInFluid (Lnet/minecraft/class_6862;D)Z
 		ARG 1 tag
 		ARG 2 speed
@@ -1360,6 +1362,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT @apiNote Subclasses should override this and call {@link DataTracker#startTracking}
 		COMMENT for any data that needs to be tracked.
+		ARG 1 builder
 	METHOD method_5694 onPlayerCollision (Lnet/minecraft/class_1657;)V
 		COMMENT Called when a player collides with the entity. Does nothing by default.
 		COMMENT
@@ -1387,6 +1390,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT @see World#canPlayerModifyAt
 		ARG 1 attacker
+	METHOD method_56989 getFinalGravity ()D
 	METHOD method_5699 dropStack (Lnet/minecraft/class_1799;F)Lnet/minecraft/class_1542;
 		COMMENT Drops {@code stack} at the entity's position with the given Y offset.
 		COMMENT
@@ -1398,6 +1402,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #dropStack(ItemStack)
 		ARG 1 stack
 		ARG 2 yOffset
+	METHOD method_56990 applyGravity ()V
 	METHOD method_5700 onBubbleColumnSurfaceCollision (Z)V
 		COMMENT Called when the entity collides with a bubble column with an air above.
 		COMMENT
diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping
index 51ccc47f90..5895a4bcfb 100644
--- a/mappings/net/minecraft/entity/EntityStatuses.mapping
+++ b/mappings/net/minecraft/entity/EntityStatuses.mapping
@@ -55,3 +55,4 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses
 	FIELD field_38094 EARS_TWITCH B
 	FIELD field_38847 SONIC_BOOM B
 	FIELD field_42621 START_DIGGING B
+	FIELD field_49074 PEEKING B
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index 5aca2ba5bd..9553200965 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -375,6 +375,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
 		ARG 1 slot
 		ARG 2 stack
+	METHOD method_56994 getJumpVelocity (F)F
+		ARG 1 strength
 	METHOD method_5877 getHandItems ()Ljava/lang/Iterable;
 	METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z
 		ARG 1 type
diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping
index c0f3cf9588..6f2cd256b5 100644
--- a/mappings/net/minecraft/entity/data/DataTracker.mapping
+++ b/mappings/net/minecraft/entity/data/DataTracker.mapping
@@ -4,6 +4,9 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker
 	FIELD field_13333 trackedEntity Lnet/minecraft/class_9221;
 	FIELD field_13334 LOGGER Lorg/slf4j/Logger;
 	FIELD field_33378 MAX_DATA_VALUE_ID I
+	METHOD  (Lnet/minecraft/class_9221;[Lnet/minecraft/class_2945$class_2946;)V
+		ARG 1 trackedEntity
+		ARG 2 entries
 	METHOD method_12778 set (Lnet/minecraft/class_2940;Ljava/lang/Object;)V
 		ARG 1 key
 		ARG 2 value
@@ -58,3 +61,12 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker
 			ARG 0 buf
 			ARG 1 id
 			ARG 2 handler
+	CLASS class_9222 Builder
+		FIELD field_49022 entity Lnet/minecraft/class_9221;
+		FIELD field_49023 entries [Lnet/minecraft/class_2945$class_2946;
+		METHOD  (Lnet/minecraft/class_9221;)V
+			ARG 1 entity
+		METHOD method_56911 build ()Lnet/minecraft/class_2945;
+		METHOD method_56912 add (Lnet/minecraft/class_2940;Ljava/lang/Object;)Lnet/minecraft/class_2945$class_9222;
+			ARG 1 data
+			ARG 2 value
diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
index 9bbbb77ab1..8d46953eb7 100644
--- a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
+++ b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
@@ -25,4 +25,9 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain
 	METHOD method_55739 addPanicActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 brain
 	CLASS class_9072 RollUpTask
+		FIELD field_49087 RUN_TIME_IN_TICKS I
+		FIELD field_49090 ticksUntilPeek I
+		FIELD field_49091 considerPeeking Z
+		METHOD method_57001 calculateTicksUntilPeek (Lnet/minecraft/class_9069;)I
+			ARG 1 entity
 	CLASS class_9073 UnrollAndFleeTask
diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
index d5cd445285..9cce001864 100644
--- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
@@ -2,6 +2,10 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
 	FIELD field_47785 STATE Lnet/minecraft/class_2940;
 	FIELD field_47786 currentStateTicks J
 	FIELD field_47787 nextScuteShedCooldown I
+	FIELD field_49080 unrollingAnimationState Lnet/minecraft/class_7094;
+	FIELD field_49081 rollingAnimationState Lnet/minecraft/class_7094;
+	FIELD field_49082 scaredAnimationState Lnet/minecraft/class_7094;
+	FIELD field_49083 peeking Z
 	METHOD method_55711 isRolledUp ()Z
 	METHOD method_55713 setState (Lnet/minecraft/class_9069$class_9070;)V
 		ARG 1 state
@@ -23,14 +27,24 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
 		ARG 2 spawnReason
 		ARG 3 pos
 		ARG 4 random
+	METHOD method_56997 shouldUnrollAndFlee ()Z
 	CLASS class_9070 State
 		FIELD field_47793 name Ljava/lang/String;
 		FIELD field_47794 CODEC Lnet/minecraft/class_3542$class_7292;
 		FIELD field_48335 PACKET_CODEC Lnet/minecraft/class_9139;
 		FIELD field_48336 INDEX_TO_VALUE Ljava/util/function/IntFunction;
 		FIELD field_48337 index I
+		FIELD field_49085 runRollUpTask Z
+		FIELD field_49086 lengthInTicks I
 		METHOD  (Ljava/lang/String;ILjava/lang/String;ZII)V
 			ARG 3 name
+			ARG 4 runRollUpTask
+			ARG 5 lengthInTicks
+			ARG 6 index
 		METHOD method_55727 fromName (Ljava/lang/String;)Lnet/minecraft/class_9069$class_9070;
 			ARG 0 name
 		METHOD method_56084 getIndex ()I
+		METHOD method_56998 shouldRunRollUpTask ()Z
+		METHOD method_56999 isRolledUp (J)Z
+			ARG 1 currentStateTicks
+		METHOD method_57000 getLengthInTicks ()I
diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping
index 0503874ce7..4f56fb604e 100644
--- a/mappings/net/minecraft/entity/passive/TameableEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TameableEntity.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity
 	METHOD method_24345 isSitting ()Z
 	METHOD method_24346 setSitting (Z)V
 		ARG 1 sitting
+	METHOD method_56996 updateAttributesForTamed ()V
 	METHOD method_6170 setOwner (Lnet/minecraft/class_1657;)V
 		ARG 1 player
 	METHOD method_6171 isOwner (Lnet/minecraft/class_1309;)Z
@@ -15,6 +16,7 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity
 	METHOD method_6172 isInSittingPose ()Z
 	METHOD method_6173 setTamed (ZZ)V
 		ARG 1 tamed
+		ARG 2 updateAttributes
 	METHOD method_6174 setOwnerUuid (Ljava/util/UUID;)V
 		ARG 1 uuid
 	METHOD method_6178 canAttackWithOwner (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
diff --git a/mappings/net/minecraft/entity/projectile/AbstractWindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractWindChargeEntity.mapping
new file mode 100644
index 0000000000..5ec26db86a
--- /dev/null
+++ b/mappings/net/minecraft/entity/projectile/AbstractWindChargeEntity.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9236 net/minecraft/entity/projectile/AbstractWindChargeEntity
+	METHOD  (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDD)V
+		ARG 1 type
+		ARG 2 world
+		ARG 3 owner
+		ARG 4 x
+		ARG 6 y
+		ARG 8 z
+	METHOD method_55055 createExplosion ()V
+	CLASS class_9237 WindChargeExplosionBehavior
diff --git a/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping
new file mode 100644
index 0000000000..29849a58f1
--- /dev/null
+++ b/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9238 net/minecraft/entity/projectile/BreezeWindChargeEntity
+	FIELD field_49095 EXPLOSION_BEHAVIOR Lnet/minecraft/class_9236$class_9237;
+	FIELD field_49096 BASE_EXPLOSION_POWER F
+	METHOD  (Lnet/minecraft/class_8949;Lnet/minecraft/class_1937;)V
+		ARG 1 breeze
+		ARG 2 world
diff --git a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping
index d58ed1dda6..fedce701e7 100644
--- a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping
@@ -1,3 +1,18 @@
 CLASS net/minecraft/class_8956 net/minecraft/entity/projectile/WindChargeEntity
 	FIELD field_47579 EXPLOSION_BEHAVIOR Lnet/minecraft/class_8956$class_9036;
+	FIELD field_49097 BASE_EXPLOSION_POWER F
+	METHOD  (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;DDD)V
+		ARG 1 player
+		ARG 2 world
+		ARG 3 x
+		ARG 5 y
+		ARG 7 z
+	METHOD  (Lnet/minecraft/class_1937;DDDDDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 directionX
+		ARG 10 directionY
+		ARG 12 directionZ
 	CLASS class_9036 WindChargeExplosionBehavior
diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping
index bcfeb31137..553547e57d 100644
--- a/mappings/net/minecraft/fluid/FluidState.mapping
+++ b/mappings/net/minecraft/fluid/FluidState.mapping
@@ -2,6 +2,7 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState
 	FIELD field_25018 CODEC Lcom/mojang/serialization/Codec;
 	METHOD  (Lnet/minecraft/class_3611;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V
 		ARG 1 fluid
+		ARG 2 propertyMap
 		ARG 3 codec
 	METHOD method_15756 canFlowTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
diff --git a/mappings/net/minecraft/item/WindChargeItem.mapping b/mappings/net/minecraft/item/WindChargeItem.mapping
new file mode 100644
index 0000000000..854112bee5
--- /dev/null
+++ b/mappings/net/minecraft/item/WindChargeItem.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_9239 net/minecraft/item/WindChargeItem
+	FIELD field_49099 COOLDOWN I
diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping
index b350de1054..81b37f1e25 100644
--- a/mappings/net/minecraft/nbt/NbtHelper.mapping
+++ b/mappings/net/minecraft/nbt/NbtHelper.mapping
@@ -76,6 +76,7 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper
 		COMMENT
 		COMMENT @see #fromBlockPos(BlockPos)
 		ARG 0 nbt
+		ARG 1 key
 	METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2520;
 		COMMENT {@return the serialized block position}
 		COMMENT
diff --git a/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping
index 0af1dcb3f7..30d17b87aa 100644
--- a/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping
+++ b/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping
@@ -5,3 +5,5 @@ CLASS net/minecraft/class_8732 net/minecraft/network/listener/ClientConfiguratio
 		ARG 1 packet
 	METHOD method_52796 onFeatures (Lnet/minecraft/class_7832;)V
 		ARG 1 packet
+	METHOD method_57045 onSelectKnownPacks (Lnet/minecraft/class_9250;)V
+		ARG 1 packet
diff --git a/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping
index 155c956103..a082ea6357 100644
--- a/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping
+++ b/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping
@@ -1,3 +1,5 @@
 CLASS net/minecraft/class_8735 net/minecraft/network/listener/ServerConfigurationPacketListener
 	METHOD method_52408 onReady (Lnet/minecraft/class_8736;)V
 		ARG 1 packet
+	METHOD method_56909 onSelectKnownPacks (Lnet/minecraft/class_9220;)V
+		ARG 1 packet
diff --git a/mappings/net/minecraft/network/packet/ConfigPackets.mapping b/mappings/net/minecraft/network/packet/ConfigPackets.mapping
index fde35a3e6f..bc3c99355a 100644
--- a/mappings/net/minecraft/network/packet/ConfigPackets.mapping
+++ b/mappings/net/minecraft/network/packet/ConfigPackets.mapping
@@ -1,6 +1,8 @@
 CLASS net/minecraft/class_9156 net/minecraft/network/packet/ConfigPackets
 	FIELD field_48694 FINISH_CONFIGURATION_S2C Lnet/minecraft/class_9145;
 	FIELD field_48697 FINISH_CONFIGURATION_C2S Lnet/minecraft/class_9145;
+	FIELD field_49018 SELECT_KNOWN_PACKS_S2C Lnet/minecraft/class_9145;
+	FIELD field_49019 SELECT_KNOWN_PACKS_C2S Lnet/minecraft/class_9145;
 	METHOD method_56510 s2c (Ljava/lang/String;)Lnet/minecraft/class_9145;
 		ARG 0 id
 	METHOD method_56511 c2s (Ljava/lang/String;)Lnet/minecraft/class_9145;
diff --git a/mappings/net/minecraft/network/packet/c2s/config/SelectKnownPacksC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/config/SelectKnownPacksC2SPacket.mapping
new file mode 100644
index 0000000000..2c6451c846
--- /dev/null
+++ b/mappings/net/minecraft/network/packet/c2s/config/SelectKnownPacksC2SPacket.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_9220 net/minecraft/network/packet/c2s/config/SelectKnownPacksC2SPacket
+	FIELD field_49020 CODEC Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/network/packet/s2c/config/SelectKnownPacksS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/SelectKnownPacksS2CPacket.mapping
new file mode 100644
index 0000000000..bb12abc7d7
--- /dev/null
+++ b/mappings/net/minecraft/network/packet/s2c/config/SelectKnownPacksS2CPacket.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_9250 net/minecraft/network/packet/s2c/config/SelectKnownPacksS2CPacket
+	FIELD field_49141 CODEC Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping b/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping
new file mode 100644
index 0000000000..b33004bb01
--- /dev/null
+++ b/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_9223 net/minecraft/server/network/SynchronizeRegistriesTask
+	FIELD field_49028 KEY Lnet/minecraft/class_8605$class_8606;
diff --git a/mappings/net/minecraft/state/State.mapping b/mappings/net/minecraft/state/State.mapping
index 0174e76988..f06b2ade5a 100644
--- a/mappings/net/minecraft/state/State.mapping
+++ b/mappings/net/minecraft/state/State.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_2688 net/minecraft/state/State
 	FIELD field_24737 PROPERTY_MAP_PRINTER Ljava/util/function/Function;
-	FIELD field_24738 entries Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;
+	FIELD field_24738 propertyMap Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;
 	FIELD field_24739 owner Ljava/lang/Object;
 	FIELD field_24740 codec Lcom/mojang/serialization/MapCodec;
 	FIELD field_24741 withTable Lcom/google/common/collect/Table;
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State
 	FIELD field_31386 PROPERTIES Ljava/lang/String;
 	METHOD  (Ljava/lang/Object;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V
 		ARG 1 owner
+		ARG 2 propertyMap
 		ARG 3 codec
 	METHOD method_11654 get (Lnet/minecraft/class_2769;)Ljava/lang/Comparable;
 		ARG 1 property
@@ -15,15 +16,20 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State
 	METHOD method_11657 with (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/Object;
 		ARG 1 property
 		ARG 2 value
+	METHOD method_28492 (Lnet/minecraft/class_2688;)Ljava/lang/Object;
+		ARG 0 state
 	METHOD method_28493 cycle (Lnet/minecraft/class_2769;)Ljava/lang/Object;
 		ARG 1 property
 	METHOD method_28494 createCodec (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
+		ARG 0 codec
 		ARG 1 ownerToStateFunction
 	METHOD method_28495 getNext (Ljava/util/Collection;Ljava/lang/Object;)Ljava/lang/Object;
 		ARG 0 values
 		ARG 1 value
 	METHOD method_28496 createWithTable (Ljava/util/Map;)V
 		ARG 1 states
+	METHOD method_28497 (Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/serialization/Codec;
+		ARG 1 owner
 	METHOD method_28498 contains (Lnet/minecraft/class_2769;)Z
 		ARG 1 property
 	METHOD method_28499 toMapWith (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/util/Map;
diff --git a/mappings/net/minecraft/state/StateManager.mapping b/mappings/net/minecraft/state/StateManager.mapping
index defef5c161..115d3b3573 100644
--- a/mappings/net/minecraft/state/StateManager.mapping
+++ b/mappings/net/minecraft/state/StateManager.mapping
@@ -34,4 +34,5 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager
 	CLASS class_2691 Factory
 		METHOD create (Ljava/lang/Object;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)Ljava/lang/Object;
 			ARG 1 owner
+			ARG 2 propertyMap
 			ARG 3 codec
diff --git a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
index ba80411383..a2dc6966b7 100644
--- a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
+++ b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
@@ -17,3 +17,4 @@ CLASS net/minecraft/class_5362 net/minecraft/world/explosion/ExplosionBehavior
 	METHOD method_55504 shouldDamage (Lnet/minecraft/class_1927;Lnet/minecraft/class_1297;)Z
 		ARG 1 explosion
 		ARG 2 entity
+	METHOD method_57007 getKnockbackModifier ()F
diff --git a/unpick-definitions/entity_status.unpick b/unpick-definitions/entity_status.unpick
index 0c85fc9ed1..7a8cba5fb9 100644
--- a/unpick-definitions/entity_status.unpick
+++ b/unpick-definitions/entity_status.unpick
@@ -56,6 +56,7 @@ constant entity_statuses net/minecraft/entity/EntityStatuses ADD_DEATH_PARTICLES
 constant entity_statuses net/minecraft/entity/EntityStatuses EARS_TWITCH
 constant entity_statuses net/minecraft/entity/EntityStatuses SONIC_BOOM
 constant entity_statuses net/minecraft/entity/EntityStatuses START_DIGGING
+constant entity_statuses net/minecraft/entity/EntityStatuses PEEKING
 
 target_method net/minecraft/entity/Entity handleStatus (B)V
 	param 0 entity_statuses

From cbe955f7b6bb676514e517daeeab9e4131656dde Mon Sep 17 00:00:00 2001
From: modmuss 
Date: Thu, 8 Feb 2024 08:52:35 +0000
Subject: [PATCH 34/47] Update buildscript (#3785)

* Update buildscript

* Fix git attributes

* Workaround a bug

* Update action
---
 .gitattributes                           |   3 ++-
 .github/workflows/build.yml              |  14 +++++++-------
 .github/workflows/publish.yml            |   4 ++--
 .github/workflows/release-filament.yml   |   4 ++--
 build.gradle                             |  16 +++++++++-------
 filament/build.gradle                    |  15 +++++++++++----
 gradle.properties                        |  14 +++++++-------
 gradle/wrapper/gradle-wrapper.jar        | Bin 63721 -> 43462 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |  14 +++++++-------
 gradlew.bat                              |  20 ++++++++++----------
 11 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 07764a78d9..0f09d3260f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
-* text eol=lf
\ No newline at end of file
+* text=auto eol=lf
+*.bat text eol=crlf
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e6774b1759..aed02fc074 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,18 +4,18 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [17-jdk, 20-jdk]
+        java: [17-jdk, 21-jdk]
     runs-on: ubuntu-22.04
     container:
       image: eclipse-temurin:${{ matrix.java }}
       options: --user root
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: ./gradlew build javadocJar checkMappings --stacktrace --warning-mode fail
       - name: Build artifacts
-        if: ${{ matrix.java == '20-jdk' }}
+        if: ${{ matrix.java == '21-jdk' }}
         continue-on-error: true
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/
@@ -23,9 +23,9 @@ jobs:
   test-build-logic:
     runs-on: ubuntu-22.04
     container:
-      image: eclipse-temurin:20-jdk
+      image: eclipse-temurin:21-jdk
       options: --user root
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2
       - run: ./gradlew :filament:build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6c114d697f..d8a92393ec 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -6,10 +6,10 @@ jobs:
     if: ${{ github.repository_owner == 'FabricMC' }}
     runs-on: ubuntu-22.04
     container:
-      image: eclipse-temurin:20-jdk
+      image: eclipse-temurin:21-jdk
       options: --user root
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       # Generate the build number based on tags to allow per branch build numbers, not something github provides by default.
       - name: Generate build number
         id: buildnumber
diff --git a/.github/workflows/release-filament.yml b/.github/workflows/release-filament.yml
index 7396c3e780..3d60b327d6 100644
--- a/.github/workflows/release-filament.yml
+++ b/.github/workflows/release-filament.yml
@@ -4,10 +4,10 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     container:
-      image: eclipse-temurin:20-jdk
+      image: eclipse-temurin:21-jdk
       options: --user root
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: ./gradlew :filament:build :filament:publish --stacktrace --no-configuration-cache
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
diff --git a/build.gradle b/build.gradle
index 7fbabcaba7..d1522ecf8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -109,6 +109,8 @@ import net.fabricmc.filament.task.mappingio.MergeMappingsTask
 import net.fabricmc.mappingio.format.MappingFormat
 import net.fabricmc.nameproposal.MappingNameCompleter
 import org.gradle.work.DisableCachingByDefault
+import com.diffplug.spotless.LineEnding
+import groovy.xml.XmlSlurper
 
 import java.util.zip.GZIPOutputStream
 
@@ -186,7 +188,7 @@ tasks.register('mapSpecializedMethods', MapSpecializedMethodsTask) {
 tasks.register('convertToV1', ConvertMappingsTask) {
 	input = mapSpecializedMethods.output
 	output = new File(tempDir, "yarn-mappings.tiny")
-	outputFormat = MappingFormat.TINY
+	outputFormat = MappingFormat.TINY_FILE
 }
 
 tasks.register('mergeTiny', MergeMappingsTask) {
@@ -194,7 +196,7 @@ tasks.register('mergeTiny', MergeMappingsTask) {
 	output = new File(tempDir, "mappings.tiny")
 	mappingInputs.from downloadIntermediary.output
 	mappingInputs.from convertToV1.output
-	outputFormat = MappingFormat.TINY
+	outputFormat = MappingFormat.TINY_FILE
 }
 
 // Disable the default jar task
@@ -281,7 +283,7 @@ tasks.withType(AbstractArchiveTask).configureEach {
 }
 
 spotless {
-	lineEndings = com.diffplug.spotless.LineEnding.UNIX
+	lineEndings = LineEnding.UNIX
 
 	java {
 		licenseHeaderFile(rootProject.file("HEADER"))
@@ -347,7 +349,7 @@ tasks.register('mergeV2', MergeMappingsTask) {
 	output = new File(tempDir, "merged-v2.tiny")
 	mappingInputs.from downloadIntermediary.output
 	mappingInputs.from insertAutoGeneratedEnumMappings.output
-	outputFormat = MappingFormat.TINY_2
+	outputFormat = MappingFormat.TINY_2_FILE
 }
 
 tasks.register('v2UnmergedYarnJar', Jar) {
@@ -510,8 +512,8 @@ javadoc {
 	source fileTree(fakeSourceDir) + sourceSets.constants.allJava + sourceSets.packageDocs.allJava
 	classpath = configurations.javadocClasspath.plus minecraftLibraries
 
-	def fs = services.get(FileSystemOperations.class)
-	def outputDir = javadoc.outputDirectory
+	def fs = project.services.get(FileSystemOperations.class)
+	def outputDir = javadoc.destinationDir
 
 	doLast {
 		fs.copy {
@@ -558,7 +560,7 @@ check.dependsOn javadocLint
 
 publishing {
 	publications {
-		maven(MavenPublication) {
+		register("maven", MavenPublication) {
 			groupId 'net.fabricmc'
 			artifactId "yarn"
 			version yarnVersion
diff --git a/filament/build.gradle b/filament/build.gradle
index 0b1840a463..9b4714b455 100644
--- a/filament/build.gradle
+++ b/filament/build.gradle
@@ -38,10 +38,10 @@ dependencies {
 	implementation "net.fabricmc:tiny-remapper:$properties.tiny_remapper_version"
 	implementation "net.fabricmc:mappingpoet:$properties.mappingpoet_version"
 	implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2'
-	implementation 'net.fabricmc:mapping-io:0.4.0'
+	implementation 'net.fabricmc:mapping-io:0.5.1'
 
 	// Contains a number of useful utilities we can re-use.
-	implementation ("net.fabricmc:fabric-loom:1.2.7") {
+	implementation ("net.fabricmc:fabric-loom:1.5.7") {
 		transitive = false
 	}
 
@@ -61,7 +61,14 @@ test {
 
 checkstyle {
 	configFile = file('checkstyle.xml')
-	toolVersion = '10.3.3'
+	toolVersion = '10.13.0'
+}
+
+// Workaround https://github.com/gradle/gradle/issues/27035
+configurations.checkstyle {
+	resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
+		select("com.google.guava:guava:0")
+	}
 }
 
 gradlePlugin {
@@ -91,7 +98,7 @@ publishing {
 /**
  * Run this task to download the gradle sources next to the api jar, you may need to manually attach the sources jar
  */
-task downloadGradleSources() {
+tasks.register('downloadGradleSources') {
 	doLast {
 		// Awful hack to find the gradle api location
 		def gradleApiFile = project.configurations.detachedConfiguration(dependencies.gradleApi()).files.stream()
diff --git a/gradle.properties b/gradle.properties
index 7611bbf38e..358a35e596 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,15 +6,15 @@ org.gradle.configuration-cache=true
 enigma_version=2.3.3
 unpick_version=2.3.0
 cfr_version=0.2.1
-name_proposal_version=0.1.5
-asm_version=9.5
+name_proposal_version=0.2.0
+asm_version=9.6
 
 # Javadoc generation/linking
-fabric_loader_version=0.14.25
-jetbrains_annotations_version=23.0.0
+fabric_loader_version=0.15.6
+jetbrains_annotations_version=24.1.0
 mappingpoet_version=0.3.2
 
 # Build logic
-tiny_remapper_version=0.8.5
-junit_version=5.7.1
-assertj_version=3.19.0
+tiny_remapper_version=0.10.1
+junit_version=5.10.2
+assertj_version=3.25.3
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
GIT binary patch
literal 43462
zcma&NWl&^owk(X(xVyW%ySuwf;qI=D6|RlDJ2cR^yEKh!@I-
zp9QeisK*rlxC>+~7Dk4IxIRsKBHqdR9b3+fyL=ynHmIDe&|>O*VlvO+%z5;9Z$|DJ
zb4dO}-R=MKr^6EKJiOrJdLnCJn>np?~vU-1sSFgPu;pthGwf}bG
z(1db%xwr#x)r+`4AGu$j7~u2MpVs3VpLp|mx&;>`0p0vH6kF+D2CY0fVdQOZ@h;A`
z{infNyvmFUiu*XG}RNMNwXrbec_*a3N=2zJ|Wh5z*
z5rAX$JJR{#zP>KY**>xHTuw?|-Rg|o24V)74HcfVT;WtQHXlE+_4iPE8QE#DUm%x0
zEKr75ur~W%w#-My3Tj`hH6EuEW+8K-^5P62$7Sc5OK+22qj&Pd1;)1#4tKihi=~8C
zHiQSst0cpri6%OeaR`PY>HH_;CPaRNty%WTm4{wDK8V6gCZlG@U3$~JQZ;HPvDJcT1V{
z?>H@13MJcCNe#5z+MecYNi@VT5|&UiN1D4ATT+%M+h4c$t;C#UAs3O_q=GxK0}8%8
z8J(_M9bayxN}69ex4dzM_P3oh@ZGREjVvn%%r7=xjkqxJP4kj}5tlf;QosR=%4L5y
zWhgejO=vao5oX%mOHbhJ8V+SG&K5dABn6!WiKl{|oPkq(9z8l&Mm%(=qGcFzI=eLu
zWc_oCLyf;hVlB@dnwY98?75B20=n$>u3b|NB28H0u-6Rpl((%KWEBOfElVWJx+5yg
z#SGqwza7f}$z;n~g%4HDU{;V{gXIhft*q2=4zSezGK~nBgu9-Q*rZ#2f=Q}i2|qOp
z!!y4p)4o=LVUNhlkp#JL{tfkhXNbB=Ox>M=n6soptJw-IDI|_$is2w}(XY>a=H52d
z3zE$tjPUhWWS+5h=KVH&uqQS=$v3nRs&p$%11b%5qtF}S2#Pc`IiyBIF4%A!;AVoI
zXU8-Rpv!DQNcF~(qQnyyMy=-AN~U>#&X1j5BLDP{?K!%h!;hfJI>$mdLSvktEr*89
zdJHvby^$xEX0^l9g$xW-d?J;L0#(`UT~zpL&*cEh$L|HPAu=P8`OQZV!-}l`noSp_
zQ-1$q$R-gDL)?6YaM!=8H=QGW$NT2SeZlb8PKJdc=F-cT@j7Xags+Pr*jPtlHFnf-
zh?q<6;)27IdPc^Wdy-mX%2s84C1xZq9Xms+==F4);O`VUASmu3(RlgE#0+#giLh-&
zcxm3_e}n4{%|X
zJp{G_j+%`j_q5}k{eW&TlP}J2wtZ2^<^E(O)4OQX8FDp6RJq!F{(6eHWSD3=f~(h}
zJXCf7=r<16X{pHkm%yzYI_=VDP&9bmI1*)YXZeB}F?
z(%QsB5fo*FUZxK$oX~X^69;x~j7ms8xlzpt-T15e9}$4T-pC
z6PFg@;B-j|Ywajpe4~bk#S6(fO^|mm1hKOPfA%8-_iGCfICE|=P_~e;Wz6my&)h_~
zkv&_xSAw7AZ%ThYF(4jADW4vg=oEdJGVOs>FqamoL3Np8>?!W#!R-0%2Bg4h?kz5I
zKV-rKN2n(vUL%D<4oj@|`eJ>0i#TmYBtYmfla;c!ATW%;xGQ0*TW@PTlGG><@dxUI
zg>+3SiGdZ%?5N=8uoLA|$4isK$aJ%i{hECP$bK{J#0W2gQ3YEa
zZQ50Stn6hqdfxJ*9#NuSLwKFCUGk@c=(igyVL;;2^wi4o30YXSIb2g_ud$
zgpCr@H0qWtk2hK8Q|&wx)}4+hTYlf;$a4#oUM=V@Cw#!$(nOFFpZ;0lc!qd=c$S}Z
zGGI-0jg~S~cgVT=4Vo)b)|4phjStD49*EqC)IPwyeKBLcN;Wu@Aeph;emROAwJ-0<
z_#>wVm$)ygH|qyxZaet&(Vf%pVdnvKWJn9`%DAxj3ot;v>S$I}jJ$FLBF*~iZ!ZXE
zkvui&p}fI0Y=IDX)mm0@tAd|fEHl~J&K}ZX(Mm3cm1UAuwJ42+AO5@HwYfDH7ipIc
zmI;1J;J@+aCNG1M`Btf>YT>~c&3j~Qi@Py5JT6;zjx$cvOQW@3oQ>|}GH?TW-E
z1R;q^QFjm5W~7f}c3Ww|awg1BAJ^slEV~Pk`Kd`PS$7;SqJZNj->it4DW2l15}xP6
zoCl$kyEF%yJni0(L!Z&14m!1urXh6Btj_5JYt1{#+H8w?5QI%%
zo-$KYWNMJVH?Hh@1n7OSu~QhSswL8x0=$<8QG_zepi_`y_79=nK=_ZP_`Em2UI*tyQoB+r{1QYZCpb?2OrgUw#oRH$?^Tj!Req>XiE#~B|~
z+%HB;=ic+R@px4Ld8mwpY;W^A%8%l8$@B@1m5n`TlKI6bz2mp*^^^1mK$COW$HOfp
zUGTz-cN9?BGEp}5A!mDFjaiWa2_J2Iq8qj0mXzk;
z66JBKRP{p%wN7XobR0YjhAuW9T1Gw3FDvR5dWJ8ElNYF94eF3ebu+QwKjtvVu4L
zI9ip#mQ@4uqVdkl-TUQMb^XBJVLW(-$s;Nq;@5gr4`UfLgF$adIhd?rHOa%D);whv
z=;krPp~@I+-Z|r#s3yCH+c1US?dnm+C*)r{m+86sTJusLdNu^sqLrfWed^ndHXH`m
zd3#cOe3>w-ga(Dus_^ppG9AC>Iq{y%%CK+Cro_sqLCs{VLuK=dev>OL1dis4(PQ5R
zcz)>DjEkfV+MO;~>VUlYF00SgfUo~@(&9$Iy2|G0T9BSP?&T22>K46D
zL*~j#yJ?)^*%J3!16f)@Y2Z^kS*BzwfAQ7K96rFRIh>#$*$_Io;z>ux@}G98!fWR@
zGTFxv4r~v)Gsd|pF91*-eaZ3Qw1MH$K^7JhWIdX%o$2kCbvGDXy)a?@8T&1dY4`;L
z4Kn+f%SSFWE_rpEpL9bnlmYq`D!6F%di<&Hh=+!VI~j)2mfil03T#jJ_s?}VV0_hp
z7T9bWxc>Jm2Z0WMU?`Z$xE74Gu~%s{mW!d4uvKCx@WD+gPUQ
zV0vQS(Ig++z=EHN)BR44*EDSWIyT~R4$FcF*VEY*8@l=218Q05D2$|fXKFhRgBIEE
zdDFB}1dKkoO^7}{5crKX!p?dZWNz$m>1icsXG2N+((x0OIST9Zo^DW_tytvlwXGpn
zs8?pJXjEG;T@qrZi%#h93?FP$!&P4JA(&H61tqQi=opRzNpm
zkrG}$^t9&XduK*Qa1?355wd8G2CI6QEh@Ua>AsD;7oRUNLPb76m4HG3K?)wF~IyS3`fXuNM>${?wmB
zpVz;?6_(Fiadfd{vUCBM*_kt$+F3J+IojI;9L(gc9n3{sEZyzR9o!_mOwFC#tQ{Q~
zP3-`#uK#tP3Q7~Q;4H|wjZHO8h7e4IuBxl&vz2w~D8)w=Wtg31zpZhz%+kzSzL*dV
zwp@{WU4i;hJ7c2f1O;7Mz6qRKeASoIv0_bV=i@NMG*l<#+;INk-^`5w@}Dj~;k=|}qM1vq_P
z|GpBGe_IKq|LNy9SJhKOQ$c=5L{Dv|Q_lZl=-ky*BFBJLW9&y_C|!vyM~rQx=!vun
z?rZJQB5t}Dctmui5i31C_;_}CEn}_W%>oSXtt>@kE1=JW*4*v4tPp;O6
zmAk{)m!)}34pTWg8{i>($%NQ(Tl;QC@J@FfBoc%Gr&m560^kgSfodAFrIjF}aIw)X
zoXZ`@IsMkc8_=w%-7`D6Y4e*CG8k%Ud=GXhsTR50jUnm+R*0A(O3UKFg0`K;qp1bl
z7``HN=?39ic_kR|^R^~w-*pa?Vj#7|e9F1iRx{GN2?wK!xR1GW!qa=~pjJb-#u1K8
zeR?Y2i-pt}yJq;SCiVHODIvQJX|ZJaT8nO+(?HXbLefulKKgM^B(UIO1r+S=7;kLJ
zcH}1J=Px2jsh3Tec&v8Jcbng8;V-`#*UHt?hB(pmOipKwf3Lz8rG$heEB30Sg*2rx
zV<|KN86$soN(I!BwO`1n^^uF2*x&vJ$2d$>+`(romzHP|)K_KkO6Hc>_dwMW-M(#S
zK(~SiXT1@fvc#U+?|?PniDRm01)f^#55;nhM|wi?oG>yBsa?~?^xTU|fX-R(sTA+5
zaq}-8Tx7zrOy#3*JLIIVsBmHYLdD}!0NP!+ITW+Thn0)8SS!$@)HXwB3tY!fMxc#1
zMp3H?q3eD?u&Njx4;KQ5G>32+GRp1Ee5qMO0lZjaRRu&{W<&~DoJNGkcYF<5(Ab+J
zgO>VhBl{okDPn78<%&e2mR{jwVCz5Og;*Z;;3%VvoGo_;HaGLWYF7q#jDX=Z#Ml`H
z858YVV$%J|e<1n`%6Vsvq7GmnAV0wW4$5qQ3uR@1i>tW{xrl|ExywIc?fNgYlA?C5
zh$ezAFb5{rQu6i7BSS5*J-|9DQ{6^BVQ{b*lq`xS@RyrsJN?-t=MTMPY;WYeKBCNg
z^2|pN!Q^WPJuuO4!|P@jzt&tY1Y8d%FNK5xK(!@`jO2aEA*4
zkO6b|UVBipci?){-Ke=+1;mGlND8)6+P;8sq}UXw2hn;fc7nM>g}GSMWu&v&fqh
    iViYT=fZ(|3Ox^$aWPp4a8h24tD<|8-!aK0lHgL$N7Efw}J
zVIB!7=T$U`ao1?upi5V4Et*-lTG0XvExbf!ya{cua==$WJyVG(CmA6Of*8E@DSE%L
z`V^$qz&RU$7G5mg;8;=#`@rRG`-uS18$0WPN@!v2d{H2sOqP|!(cQ@
zUHo!d>>yFArLPf1q`uBvY32miqShLT1B@gDL4XoVTK&@owOoD)OIHXrYK-a1d$B{v
zF^}8D3Y^g%^cnvScOSJR5QNH+BI%d|;J;wWM3~l>${fb8DNPg)wrf|GBP8p%LNGN#
z3EaIiItgwtGgT&iYCFy9-LG}bMI|4LdmmJt@V@%
zb6B)1kc=T)(|L@0;wr<>=?r04N;E&ef+7C^`wPWtyQe(*pD1pI_&XHy|0gIGHMekd
zF_*M4yi6J&Z4LQj65)S
zXwdM{SwUo%3SbPwFsHgqF@V|6afT|R6?&S;lw=8%
z3}@9B=#JI3@B*#4s!O))~z
zc>2_4Q_#&+5V`GFd?88^;c1i7;Vv_I*qt!_Yx*n=;rj!82rrR2rQ8u5(Ejlo{15P%
zs~!{%XJ>FmJ})H^I9bn^Re&38H{xA!0l3^89k(oU;bZWXM@kn$#aoS&Y4l^-WEn-fH39Jb9lA%s*WsKJQl?n9B7_~P
z-XM&WL7Z!PcoF6_D>V@$CvUIEy=+Z&0kt{szMk=f1|M+r*a43^$$B^MidrT0J;RI`
z(?f!O<8UZkm$_Ny$Hth1J#^4ni+im8M9mr&k|3cIgwvjAgjH
z8`N&h25xV#v*d$qBX5jkI|xOhQn!>IYZK7l5#^P4M&twe9&Ey@@GxYMxBZq2e7?`q
z$~Szs0!g{2fGcp9PZEt|rdQ6bhAgpcLHPz?f-vB?$dc*!9OL?Q8mn7->bFD2Si60*
z!O%y)fCdMSV|lkF9w%x~J*A&srMyYY3{=&$}H
zGQ4VG_?$2X(0|vT0{=;W$~icCI{b6W{B!Q8xdGhF|D{25G_5_+%s(46lhvNLkik~R
z>nr(&C#5wwOzJZQo9m|U<;&Wk!_#q|V>fsmj1g<6%hB{jGoNUPjgJslld>xmODzGjYc?7JSuA?A_QzjDw5AsRgi@Y|Z0{F{!1=!NES-#*f^s4l0Hu
zz468))2IY5dmD9pa*(yT5{EyP^G>@ZWumealS-*WeRcZ}B%gxq{MiJ|RyX-^C1V=0
z@iKdrGi1jTe8Ya^x7yyH$kBNvM4R~`fbPq$BzHum-3Zo8C6=KW@||>zsA8-Y9uV5V
z#oq-f5L5}V<&wF4@X@<3^C%ptp6+Ce)~hGl`kwj)bsAjmo_GU^r940Z-|`<)oGnh7
zFF0Tde3>ui?8Yj{sF-Z@)yQd~CGZ*w-6p2U<8}JO-sRsVI5dBji`01W8A&3$?}lxBaC&vn0E$c5tW*
zX>5(zzZ=qn&!J~KdsPl;P@bmA-Pr8T*)eh_+Dv5=Ma|XSle6t(k8qcgNyar{*ReQ8
zTXwi=8vr>!3Ywr+BhggHDw8ke==NTQVMCK`$69fhzEFB*4+H9LIvdt-#IbhZvpS}}
zO3lz;P?zr0*0$%-Rq_y^k(?I{Mk}h@w}cZpMUp|ucs55bcloL2)($u%mXQw({Wzc~
z;6nu5MkjP)0C(@%6Q_I_vsWrfhl7Zpoxw#WoE~r&GOSCz;_ro6i(^hM>I$8y>`!wW
z*U^@?B!MMmb89I}2(hcE4zN2G^kwyWCZp5JG>$Ez7zP~D=J^LMjSM)27_0B_X^C(M
z`fFT+%DcKlu?^)FCK>QzSnV%IsXVcUFhFdBP!6~se&xxrIxsvySAWu++IrH;FbcY$
z2DWTvSBRfLwdhr0nMx+URA$j3i7_*6BWv#DXfym?ZRDcX9C?cY9sD3q)uBDR3uWg=
z(lUIzB)G$Hr!){>E{s4Dew+tb9kvToZp-1&c?y2wn@Z~(VBhqz`cB;{E4(P3N2*nJ
z_>~g@;UF2iG{Kt(<1PyePTKahF8<)pozZ*xH~U-kfoAayCwJViIrnqwqO}7{0pHw$
zs2Kx?s#vQr7XZ264>5RNKSL8|Ty^=PsIx^}QqOOcfpGUU4tRkUc|kc7-!Ae6!+B{o~7nFpm3|G5^=0#Bnm6`V}oSQlrX(u%OWnC
zoLPy&Q;1Jui&7ST0~#+}I^&?vcE*t47~Xq#YwvA^6^}
z`WkC)$AkNub|t@S!$8CBlwbV~?yp&@9h{D|3z-vJXgzRC5^nYm+PyPcgRzAnEi6Q^gslXYRv4nycsy-SJu?lMps-?
zV`U*#WnFsdPLL)Q$AmD|0`UaC4ND07+&UmOu!eHruzV|OUox<+Jl|Mr@6~C`T@P%s
zW7sgXLF2SSe9Fl^O(I*{9wsFSYb2l%-;&Pi^dpv!{)C3d0AlNY6!4fgmSgj_wQ*7Am7&$z;Jg&wgR-Ih;lUvWS|KTSg!&s_E9_bXBkZvGiC6bFKDWZxsD$*NZ#_8bl
zG1P-#@?OQzED7@jlMJTH@V!6k;W>auvft)}g
zhoV{7$q=*;=l{O>Q4a@
ziMjf_u*o^PsO)#BjC%0^h>Xp@;5$p{JSYDt)zbb}s{Kbt!T*I@Pk@X0zds6wsefuU
zW$XY%yyRGC94=6mf?x+bbA5CDQ2AgW1T-jVAJbm7K(gp+;v6E0WI#kuACgV$r}6L?
zd|Tj?^%^*N&b>Dd{Wr$FS2qI#Ucs1yd4N+RBUQiSZGujH`#I)mG&VKoDh=KKFl4=G
z&MagXl6*<)$6P}*Tiebpz5L=oMaPrN+caUXRJ`D?=K9!e0f{@D&cZLKN?iNP@X0aF
zE(^pl+;*T5qt?1jRC=5PMgV!XNITRLS_=9{CJExaQj;lt!&pdzpK?8p>%Mb+D
z?yO*uSung=-`QQ@yX@Hyd4@CI^r{2oiu`%^bNkz+Nkk!IunjwNC|WcqvX~k=><-I3
zDQdbdb|!v+Iz01$w@aMl!R)koD77Xp;eZwzSl-AT
zr@Vu{=xvgfq9akRrrM)}=!=xcs+U1JO}{t(avgz`6RqiiX<|hGG1pmop8k6Q+G_mv
zJv|RfDheUp2L3=^C=4aCBMBn0aRCU(DQwX-W(RkRwmLeuJYF<0urcaf(=7)JPg<3P
zQs!~G)9CT18o!J4{zX{_e}4eS)U-E)0FAt}wEI(c0%HkxgggW;(1E=>J17_hsH^sP
z%lT0LGgbUXHx-K*CI-MCrP66UP0PvGqM$MkeLyqHdbgP|_Cm!7te~b8p+e6sQ_3k|
zVcwTh6d83ltdnR>D^)BYQpDKlLk3g0Hdcgz2}%qUs9~~Rie)A-BV1mS&naYai#xcZ
z(d{8=-LVpTp}2*y)|gR~;qc7fp26}lPcLZ#=JpYcn3AT9(UIdOyg+d(P5T7D&*P}#
zQCYplZO5|7+r19%9e`v^vfSS1sbX1c%=w1;oyruXB%Kl$ACgKQ6=qNWLsc=28xJjg
zwvsI5-%SGU|3p>&zXVl^vVtQT3o-#$UT9LI@Npz~6=4!>mc431VRNN8od&Ul^+G_kHC`G=6WVWM
z%9eWNyy(FTO|A+@x}Ou3CH)oi;t#7rAxdIXfNFwOj_@Y&TGz6P_sqiB`Q6Lxy|Q{`|fgmRG(k+!#b*M+Z9zFce)f-7;?Km5O=LHV9f9_87;
zF7%R2B+$?@sH&&-$@tzaPYkw0;=i|;vWdI|Wl3q_Zu>l;XdIw2FjV=;Mq5t1Q0|f<
zs08j54Bp`3RzqE=2enlkZxmX6OF+@|2<)A^RNQpBd6o@OXl+i)zO%D4iGiQNuXd+zIR{_lb96{lc~bxsBveIw6umhShTX+3@ZJ=YHh@
zWY3(d0azg;7oHn>H<>?4@*RQbi>SmM=JrHvIG(~BrvI)#W(EAeO6fS+}mxxcc+X~W6&YVl86W9WFSS}Vz-f9vS?XUDBk)3TcF
z8V?$4Q)`uKFq>xT=)Y9mMFVTUk*NIA!0$?RP6Ig0TBmUFrq*Q-Agq~DzxjStQyJ({
zBeZ;o5qUUKg=4Hypm|}>>L=XKsZ!F$yNTDO)jt4H0gdQ5$f|d&bnVCMMXhNh)~mN
z@_UV6D7MVlsWz+zM+inZZp&P4fj=tm6fX)SG5H>OsQf_I8c~uGCig$GzuwViK54bcgL;VN|FnyQl>Ed7(@>=8$a_UKIz|V6CeVSd2(P
z0Uu>A8A+muM%HLFJQ9UZ5c)BSAv_zH#1f02x?h9C}@pN@6{>UiAp>({Fn(T9Q8B
z^`zB;kJ5b`>%dLm+Ol}ty!3;8f1XDSVX0AUe5P#@I+FQ-`$(a;zNgz)4x5hz$Hfbg
z!Q(z26wHLXko(1`;(BAOg_wShpX0ixfWq3ponndY+u%1gyX)_h=v1zR#V}#q{au6;
z!3K=7fQwnRfg6FXtNQmP>`<;!N137paFS%y?;lb1@BEdbvQHYC{976l`cLqn;b8lp
zIDY>~m{gDj(wfnK!lpW6pli)HyLEiUrNc%eXTil|F2s(AY+LW5hkKb>TQ3|Q4S9rr
zpDs4uK_co6XPsn_z$LeS{K4jFF`2>U`tbgKdyDne`xmR<@6AA+_hPNKCOR-Zqv;xk
zu5!HsBUb^!4uJ7v0RuH-7?l?}b=w5lzzXJ~gZcxRKOovSk@|#V+MuX%Y+=;14i*%{)_gSW9(#4%)AV#3__kac1|qUy!uyP{>?U#5wYNq}y$S9pCc
zFc~4mgSC*G~j0u#qqp9
z${>3HV~@->GqEhr_Xwoxq?Hjn#=s2;i~g^&Hn|aDKpA>Oc%HlW(KA1?BXqpxB;Ydx)w;2z^MpjJ(Qi(X!$5RC
z*P{~%JGDQqojV>2JbEeCE*OEu!$XJ>bWA9Oa_Hd;y)F%MhBRi*LPcdqR8X`NQ&1L#
z5#9L*@qxrx8n}LfeB^J{%-?SU{FCwiWyHp682F+|pa+CQa3ZLzBqN1{)h4d6+vBbV
zC#NEbQLC;}me3eeYnOG*nXOJZEU$xLZ1<1Y=7r0(-U0P6-AqwMAM`a(Ed#7vJkn6plb4eI4?2y3yOTGmmDQ!z9`wzbf
z_OY#0@5=bnep;MV0X_;;SJJWEf^E6Bd^tVJ9znWx&Ks8t*B>AM@?;D4oWUGc
z!H*`6d7Cxo6VuyS4Eye&L1ZRhrRmN6Lr`{NL(wDbif|y&z)JN>Fl5#Wi&mMIr5i;x
zBx}3YfF>>8EC(fYnmpu~)CYHuHCyr5*`ECap%t@y=jD>!_%3iiE|LN$mK9>-
zHdtpy8fGZtkZF?%TW~29JIAfi2jZT8>OA7=h;8T{{k?c2`nCEx9$r
zS+*&vt~2o^^J+}RDG@+9&M^K*z4p{5#IEVbz`1%`m5c2};aGt=V?~vIM}ZdPECDI)47|CWBCfDWUbxBCnmYivQ*0Nu_xb*C>~C9(VjHM
zxe<*D<#dQ8TlpMX2c@M<9$w!RP$hpG4cs%AI){jp*Sj|*`m)5(Bw*A0$*i-(CA5#%>a)$+jI2C9r6|(>J8InryENI
z$NohnxDUB;wAYDwrb*!N3noBTKPpPN}~09SEL18tkG
zxgz(RYU_;DPT{l?Q$+eaZaxnsWCA^ds^0PVRkIM%bOd|G2IEBBiz{&^JtNsODs;5z
zICt_Zj8wo^KT$7Bg4H+y!Df#3mbl%%?|EXe!&(Vmac1DJ*y~3+kRKAD=Ovde4^^%~
zw<9av18HLyrf*_>Slp;^i`Uy~`mvBjZ|?Ad63yQa#YK`4+c6;pW4?XIY9G1(Xh9WO8{F-Aju+nS9Vmv=$Ac0ienZ+p9*O%NG
zMZKy5?%Z6TAJTE?o5vEr0r>f>hb#2w2U3DL64*au_@P!J!TL`oH2r*{>ffu6|A7tv
zL4juf$DZ1MW5ZPsG!5)`k8d8c$J$o;%EIL0va9&GzWvkS%ZsGb#S(?{!UFOZ9<$a|
zY|a+5kmD5N&{vRqkgY>aHsBT&`rg|&kezoD)gP0fsNYHsO#TRc_$n6Lf1Z{?+DLziXlHrq4sf(!>O{?Tj;Eh@%)+nRE_2VxbN&&%%caU#JDU%vL3}Cb
zsb4AazPI{>8H&d=jUaZDS$-0^AxE@utGs;-Ez_F(qC9T=UZX=>ok2k2
ziTn{K?y~a5reD2A)P${NoI^>JXn>`IeArow(41c-Wm~)wiryEP(OS{YXWi7;%dG9v
zI?mwu1MxD{yp_rrk!j^cKM)dc4@p4Ezyo%lRN|XyD}}>v=Xoib0gOcdXrQ^*61HNj
z=NP|pd>@yfvr-=m{8$3A8TQGMTE7g=z!%yt`8`Bk-0MMwW~h^++;qyUP!J~ykh1GO
z(FZ59xuFR$(WE;F@UUyE@Sp>`aVNjyj=Ty>_Vo}xf`e7`F;j-IgL5`1~-#70$9_=uBMq!2&1l
zomRgpD58@)YYfvLtPW}{C5B35R;ZVvB<<#)x%srmc_S=A7F@DW8>QOEGwD6suhwCg
z>Pa+YyULhmw%BA*4yjDp|2{!T98~<6Yfd(wo1mQ!KWwq0eg+6)o1>W~f~kL<-S+P@$wx*zeI|1t7z#Sxr5
zt6w+;YblPQNplq4Z#T$GLX#j6yldXAqj>4gAnnWtBICUnA&-dtnlh=t0Ho_vEKwV`
z)DlJi#!@nkYV#$!)@>udAU*hF?V`2$Hf=V&6PP_|r#Iv*J$9)pF@X3`k;5})9^o4y
z&)~?EjX5yX12O(BsFy-l6}nYeuKkiq`u9145&3Ssg^y{5G3Pse
z9w(YVa0)N-fLaBq1`P!_#>SS(8fh_5!f{UrgZ~uEdeMJIz7DzI5!NHHqQtm~#CPij
z?=N|J>nPR6_sL7!f4hD_|KH`vf8(Wpnj-(gPWH+ZvID}%?~68SwhPTC3u1_cB`otq
z)U?6qo!ZLi5b>*KnYHWW=3F!p%h1;h{L&(Q&{qY6)_qxNfbP6E3yYpW!EO+IW3?@J
z);4>g4gnl^8klu7uA>eGF6rIGSynacogr)KUwE_R4E5Xzi*Qir@b-jy55-JPC8c~(
zo!W8y9OGZ&`xmc8;=4-U9=h{vCqfCNzYirONmGbRQlR`WWlgnY+1wCXbMz&NT~9*|
z6@FrzP!LX&{no2!Ln_3|I==_4`@}V?4a;YZKTdw;vT<+K+z=uWbW(&bXEaWJ^W8Td
z-3&1bY^Z*oM<=M}LVt>_j+p=2Iu7pZmbXrhQ_k)ysE9yXKygFNw$5hwDn(M>H+e1&9BM5!|81vd%r%vEm
zqxY3?F@fb6O#5UunwgAHR9jp_W2zZ}NGp2%mTW@(hz7$^+a`A?mb8|_G*GNMJ)
zjqegXQio=i@AINre&%ofexAr95aop5C+0MZ0m-l=MeO8m3epm7U%vZB8+I+C*iNFM
z#T3l`gknX;D$-`2XT^Cg*vrv=RH+P;_dfF++cP?B_msQI4j+lt&rX2)3GaJx%W*Nn
zkML%D{z5tpHH=dksQ*gzc|}gzW;lwAbxoR07VNgS*-c3d&8J|;@3t^
zVUz*J*&r7DFRuFVDCJDK8V9NN5hvpgGjwx+5n)qa;YCKe8TKtdnh{I7NU9BCN!0dq
zczrBk8pE{{@vJa9ywR@mq*J=v+PG;?fwqlJVhijG!3VmIKs>9T6r7MJpC)m!Tc#>g
zMtVsU>wbwFJEfwZ{vB|ZlttNe83)$iz`~#8UJ^r)lJ@HA&G#}W&ZH*;k{=TavpjWE
z7hdyLZPf*X%Gm}i`Y{OGeeu^~nB8=`{r#TUrM-`;1cBvEd#d!kPqIgYySYhN-*1;L
z^byj%Yi}Gx)Wnkosi337BKs}+5H5dth1JA{Ir-JKN$7zC)*}hqeoD(WfaUDPT>0`-
z(6sa0AoIqASwF`>hP}^|)a_j2s^PQn*qVC{Q}htR
z5-)duBFXT_V56-+UohKXlq~^6uf!6sA#ttk1o~*QEy_Y-S$gAvq47J9Vtk$5oA$Ct
zYhYJ@8{hsC^98${!#Ho?4y5MCa7iGnfz}b9jE~h%EAAv~Qxu)_rAV;^cygV~5r_~?l=B`zObj7S=H=~$W
zPtI_m%g$`kL_fVUk9J@>EiBH
zOO&jtn~&`hIFMS5S`g8w94R4H40mdNUH4W@@XQk1sr17b{@y|JB*G9z1|CrQjd+GX
z6+KyURG3;!*BQrentw{B2R&@2&`2}n(z-2&X7#r!{yg@Soy}cRD~j
zj9@UBW+N|4HW4AWapy4wfUI-
zZ`gSL6DUlgj*f1hSOGXG0IVH8HxK?o2|3HZ;KW{K+yPAlxtb)NV_2AwJm|E)FRs&&
z=c^e7bvUsztY|+f^k7NXs$o1EUq>cR7C0$UKi6IooHWlK_#?IWDkvywnzg&ThWo^?
z2O_N{5X39#?eV9l)xI(>@!vSB{DLt*oY!K1R8}_?%+0^C{d9a%N4
zoxHVT1&Lm|uDX%$QrBun5e-F`HJ^T$
zmzv)p@4ZHd_w9!%Hf9UYNvGCw2TTTbrj9pl+T9%-_-}L(tES>Or-}Z4F*{##n3~L~TuxjirGuIY#H7{%$E${?p{Q01
zi6T`n;rbK1yIB9jmQNycD~yZq&mbIsFWHo|ZAChSFPQa<(%d8mGw*V3fh|yFoxOOiWJd(qvVb!Z$b88cg->N=qO*4k~6;R==|9ihg&riu#P~s4Oap9O7f%crSr^rljeIfXDEg>wi)&v*a%7zpz<9w
z*r!3q9J|390x`Zk;g$&OeN&ctp)VKRpDSV@kU2Q>jtok($Y-*x8_$2piTxun81@vt
z!Vj?COa0fg2RPXMSIo26T=~0d`{oGP*eV+$!0I<(4azk&Vj3SiG=Q!6mX0p$z7I};
z9BJUFgT-K9MQQ-0@Z=^7R<{bn2Fm48endsSs`V7_@%8?Bxkqv>BDoVcj?K#dV#uUP
zL1ND~?D-|VGKe3Rw_7-Idpht>H6XRLh*U7epS6byiGvJpr%d}XwfusjH9g;Z98H`x
zyde%%5mhGOiL4wljCaWCk-&uE4_OOccb9c!ZaWt4B(wYl!?vyzl%7n~QepN&eFUrw
zFIOl9c({``6~QD+43*_tzP{f2x41h(?b43^y6=iwyB)2os5hBE!@YUS5?N_tXd=h(
z)WE286Fbd>R4M^P{!G)f;h<3Q>Fipuy+d2q-)!RyTgt;wr$(?9ox3;q+{E*ZQHhOn;lM`cjnu9
zXa48ks-v(~b*;MAI<>YZH(^NV8vjb34beE<_cwKlJoR;k6lJNSP6v}uiyRD?|0w+X@o1ONrH8a$fCxXpf?
z?$DL0)7|X}Oc%h^zrMKWc-NS9I0Utu@>*j}b@tJ=ixQSJ={4@854wzW@E>VSL+Y{i
z#0b=WpbCZS>kUCO_iQz)LoE>P5LIG-hv9E+oG}DtlIDF>$tJ1aw9^LuhLEHt?BCj&
z(O4I8v1s#HUi5A>nIS-JK{v!7dJx)^Yg%XjNmlkWAq2*cv#tHgz`Y(bETc6CuO1VkN^L-L3j_x<4NqYb5rzrLC-7uOv
z!5e`GZt%B782C5-fGnn*GhDF$%(qP<74Z}3xx+{$4cYKy2ikxI7B2N+2r07DN;|-T->nU&!=Cm#rZt%O_5c&1Z%nlWq3TKAW0w
zQqemZw_ue--2uKQsx+niCUou?HjD`xhEjjQd3%rrBi82crq*~#uA4+>vR<_S{~5ce
z-2EIl?~s
z1=GVL{NxP1N3%=AOaC}j_Fv=ur&THz
zyO!d9kHq|c73kpq`$+t+8Bw7MgeR5~`d7ChYyGCBWSteTB>8WAU(NPYt2Dk`@#+}=
zI4SvLlyk#pBgVigEe`?NG*vl7V6m+<}%FwPV=~PvvA)=#ths==DRTDEYh4V5}Cf$z@#;<
zyWfLY_5sP$gc3LLl2x+Ii)#b2nhNXJ{R~vk`s5U7Nyu^3yFg&D%Txwj6QezMX`V(x
z=C`{76*mNb!qHHs)#GgGZ_7|vkt9izl_&PBrsu@}L`X{95-2jf99K)0=*N)VxBX2q
z((vkpP2RneSIiIUEnGb?VqbMb=Zia+rF~+iqslydE34cSLJ&BJW^3knX@M;t*b=EA
zNvGzv41Ld_T+WT#XjDB840vovUU^FtN_)G}7v)1lPetgpEK9YS^OWFkPoE{ovj^=@
zO9N$S=G$1ecndT_=5ehth2Lmd1II-PuT~C9`XVePw$y8J#dpZ?Tss<6wtVglm(Ok7
z3?^oi@pPio6l&!z8JY(pJvG=*pI?GIOu}e^EB6QYk$#FJQ%^AIK$I4epJ+9t?KjqA+bkj&PQ*|vLttme+`9G=L%
ziadyMw_7-M)hS(3E$QGNCu|o23|%O+VN7;Qggp?PB3K-iSeBa2b}V4_wY`G1Jsfz4
z9|SdB^;|I8E8gWqHKx!vj_@SMY^hLEIbSMCuE?WKq=c2mJK
z8LoG-pnY!uhqFv&L?yEuxo{dpMTsmCn)95xanqBrNPTgXP((H$9N${Ow~Is-FBg%h
z53;|Y5$MUN)9W2HBe2TD`ct^LHI<(xWrw}$qSoei?}s)&w$;&!14w6B6>Yr6Y8b)S
z0r71`WmAvJJ`1h&poLftLUS6Ir
zC$bG9!Im_4Zjse)#K=oJM9mHW1{%l8sz$1o?ltdKlLTxWWPB>Vk22czVt|1%^wnN@*!l)}?EgtvhC>vlHm^t+ogpgHI1_$1ox9e;>0!+b(tBrmXRB`PY1vp-R**8N7
zGP|QqI$m(Rdu#=(?!(N}G9QhQ%o!aXE=aN{&wtGP8|_qh+7a_j_sU5|J^)vxq;#
zjvzLn%_QPHZZIWu1&mRAj;Sa_97p_lLq_{~j!M9N^1yp3U_SxRqK&JnR%6VI#^E12
z>CdOVI^_9aPK2eZ4h&^{pQs}xsijXgFYRIxJ~N7&BB9jUR1fm!(xl)mvy|3e6-B3j
zJn#ajL;bFTYJ2+Q)tDjx=3IklO@Q+FFM}6UJr6km7hj7th9n_&JR7fnqC!hTZoM~T
zBeaVFp%)0cbPhejX<8pf5HyRUj2>aXnXBqDJe73~J%P(2C?-RT{c3NjE`)om!
zl$uewSgWkE66$Kb34+QZZvRn`fob~Cl9=cRk@Es}KQm=?E~CE%spXaMO6YmrMl%9Q
zlA3Q$3|L1QJ4?->UjT&CBd!~ru{Ih^in&JXO=|<6J!&qp
zRe*OZ*cj5bHYlz!!~iEKcuE|;U4vN1rk$xq6>bUWD*u(V@8sG^7>kVuo(QL@Ki;yL
zWC!FT(q{E8#on>%1iAS0HMZDJg{Z{^!De(vSIq&;1$+b)oRMwA3nc3mdTSG#3uYO_
z>+x;7p4I;uHz?ZB>dA-BKl+t-3IB!jBRgdvAbW!aJ(Q{aT>+iz?91`C-xbe)IBoND
z9_Xth{6?(y3rddwY$GD65IT#f3<(0o#`di{sh2gm{dw*#-Vnc3r=4==&PU^hCv$qd
zjw;>i&?L*Wq#TxG$mFIUf>eK+170KG;~+o&1;Tom9}}mKo23KwdEM6UonXgc
z!6N(@k8q@HPw{O8O!lAyi{rZv|DpgfU{py+j(X_cwpKqcalcqKIr0kM^%Br3SdeD>
zHSKV94Yxw;pjzDHo!Q?8^0bb%L|wC;4U^9I#pd5O&eexX+Im{
z?jKnCcsE|H?{uGMqVie_C~w7GX)kYGWAg%-?8|N_1#W-|4F)3YTDC+QSq1s!DnOML3@d`mG%o2YbYd#jww|jD$gotpa)kntakp#K;+yo-_ZF9qrNZw<%#C
zuPE@#3RocLgPyiBZ+R_-FJ_$xP!RzWm|aN)S+{$LY9vvN+IW~Kf3TsEIvP+B9Mtm!
zpfNNxObWQpLoaO&cJh5>%slZnHl_Q~(-Tfh!DMz(dTWld@LG1VRF`9`DYKhyNv
z2pU|UZ$#_yUx_B_|MxUq^glT}O5Xt(Vm4Mr02><%C)@v;vPb@pT$*yzJ4aPc_FZ3z
z3}PLoMBIM>q_9U2rl^sGhk1VUJ89=*?7|v`{!Z{6bqFMq(mYiA?%KbsI~JwuqVA9$H5vDE+VocjX+G^%bieqx->s;XWlKcuv(s%y%D5Xbc9+
zc(_2nYS1&^yL*ey664&4`IoOeDIig}y-E~_GS?m;D!xv5-xwz+G`5l6V+}CpeJDi^
z%4ed$qowm88=iYG+(`ld5Uh&>Dgs4uPHSJ^TngXP_V6fPyl~>2bhi20QB%lSd#yYn
zO05?KT1z@?^-bqO8Cg`;ft>ilejsw@2%RR7;`$Vs;FmO(Yr3Fp`pHGr@P2hC%QcA|X&N2Dn
zYf`MqXdHi%cGR@%y7Rg7?d3?an){s$zA{!H;Ie5exE#c~@NhQUFG8V=SQh%UxUeiV
zd7#UcYqD=lk-}sEwlpu&H^T_V0{#G?lZMxL7ih_&{(g)MWBnCZxtXg
znr#}>U^6!jA%e}@Gj49LWG@*&t0V>Cxc3?oO7LSG%~)Y5}f7vqUUnQ;STjdDU}P9IF9d9<$;=QaXc
zL1^X7>fa^jHBu_}9}J~#-oz3Oq^JmGR#?GO7b9a(=R@fw@}Q{{@`Wy1vIQ#Bw?>@X
z-_RGG@wt|%u`XUc%W{J
z>iSeiz8C3H7@St3mOr_mU+&bL#Uif;+Xw-aZdNYUpdf>Rvu0i0t6k*}vwU`XNO2he
z%miH|1tQ8~ZK!zmL&wa3E;l?!!XzgV#%PMVU!0xrDsNNZUWKlbiOjzH-1Uoxm8E#r`#2Sz;-o&qcqB
zC-O_R{QGuynW14@)7&@yw1U}uP(1cov)twxeLus0s|7ayrtT8c#`&2~Fiu2=R;1_4bCaD=*E@cYI>7YSnt)nQc
zohw5CsK%m?8Ack)qNx`W0_v$5S}nO|(V|RZKBD+btO?JXe|~^Qqur%@eO~<8-L^9d
z=GA3-V14ng9L29~XJ>a5k~xT2152zLhM*@zlp2P5Eu}bywkcqR;ISbas&#T#;HZSf
z2m69qTV(V@EkY(1Dk3`}j)JMo%ZVJ*5eB
zYOjIisi+igK0#yW*gBGj?@I{~mUOvRFQR^pJbEbzFxTubnrw(Muk%}jI+vXmJ;{Q6
zrSobKD>T%}jV4Ub?L1+MGOD~0Ir%-`iTnWZN^~YPrcP5y3VMAzQ+&en^VzKEb$K!Q
z<7Dbg&DNXuow*eD5yMr+#08nF!;%4vGrJI++5HdCFcGLfMW!KS*Oi@=7hFwDG!h2<
zPunUEAF+HncQkbfFj&pbzp|MU*~60Z(|Ik%Tn{BXMN!hZOosNIseT?R;A`W?=d?5X
zK(FB=9mZusYahp|K-wyb={rOpdn=@;4YI2W0EcbMKyo~-#^?h`BA9~o285%oY
zfifCh5Lk$SY@|2A@a!T2V+{^!psQkx4?x0HSV`(w9{l75QxMk!)U52Lbhn{8ol?S)
zCKo*7R(z!uk<6*qO=wh!Pul{(qq6g6xW;X68GI_CXp`XwO
zxuSgPRAtM8K7}5E#-GM!*ydOOG_{A{)hkCII<|2=ma*71ci_-}VPARm3crFQjLYV!
z9zbz82$|l01mv`$WahE2$=fAGWkd^X2kY(J7iz}WGS
z@%MyBEO=A?HB9=^?nX`@nh;7;laAjs+fbo!|K^mE!tOB>$2a_O0y-*uaIn8k^6Y
zSbuv;5~##*4Y~+y7Z5O*3w4qgI5V^17u*ZeupVGH^nM&$qmAk|anf*>r
zWc5CV;-JY-Z@Uq1Irpb^O`L_7AGiqd*YpGUShb==os$uN3yYvb`wm6d=?T*it&pDk
zo`vhw)RZX|91^^Wa_ti2zBFyWy4cJu#g)_S6~jT}CC{DJ_kKpT`$oAL%b^!2M;JgT
zM3ZNbUB?}kP(*YYvXDIH8^7LUxz5oE%kMhF!rnPqv!GiY0o}NR$OD=ITDo9r%4E>E0Y^R(rS^~XjWyVI6
zMOR5rPXhTp*G*M&X#NTL`Hu*R+u*QNoiOKg4CtNPrjgH>c?Hi4MUG#I917fx**+pJfOo!zFM&*da&G_x)L(`k&TPI*t3e^{crd
zX<4I$5nBQ8Ax_lmNRa~E*zS-R0sxkz`|>7q_?*e%7bxqNm3_eRG#1ae3gtV9!fQpY
z+!^a38o4ZGy9!J5sylDxZTx$JmG!wg7;>&5H1)>f4dXj;B+@6tMlL=)cLl={jLMxY
zbbf1ax3S4>bwB9-$;SN2?+GULu;UA-35;VY*^9Blx)Jwyb$=U!D>HhB&=jSsd^6yw
zL)?a|>GxU!W}ocTC(?-%z3!IUhw^uzc`Vz_g>-tv)(XA#JK^)ZnC|l1`@CdX1@|!|
z_9gQ)7uOf?cR@KDp97*>6X|;t@Y`k_N@)aH7gY27)COv^P3ya9I{4z~vUjLR9~z1Z
z5=G{mVtKH*&$*t0@}-i_v|3B$AHHYale7>E+jP`ClqG%L{u;*ff_h@)al?RuL7tOO
z->;I}>%WI{;vbLP3VIQ^iA$4wl6@0sDj|~112Y4OFjMs`13!$JGkp%b&E8QzJw_L5
zOnw9joc0^;O%OpF$Qp)W1HI!$4BaXX84`%@#^dk^hFp^pQ@rx4g(8Xjy#!X%+X5Jd@fs3amGT`}mhq#L97R>OwT5-m|h#yT_-v@(k$q7P*9X~T*3)LTdzP!*B}
z+SldbVWrrwQo9wX*%FyK+sRXTa@O?WM^FGWOE?S`R(0P{<6p#f?0NJvnBia?k^fX2
zNQs7K-?EijgHJY}&zsr;qJ<*PCZUd*x|dD=IQPUK_nn)@X4KWtqoJNHkT?ZWL_hF?
zS8lp2(q>;RXR|F;1O}EE#}gCrY~#n^O`_I&?&z5~7N;zL0)3Tup`%)oHMK-^r$NT%
zbFg|o?b9w(q@)6w5V%si<$!U<#}s#x@0aX-hP>zwS#9*75VXA4K*%gUc>+yzupTDBOKH8WR4V0pM(HrfbQ&eJ79>HdCvE=F
z|J>s;;iDLB^3(9}?biKbxf1$lI!*Z%*0&8UUq}wMyPs_hclyQQi4;NUY+x2qy|0J;
zhn8;5)4ED1oHwg+VZF|80<4MrL97tGGXc5Sw$wAI#|2*cvQ=jB5+{AjMiDHmhUC*a
zlmiZ`LAuAn_}hftXh;`Kq0zblDk8?O-`tnilIh|;3lZp@F_osJUV9`*R29M?7H{Fy
z`nfVEIDIWXmU&YW;NjU8)EJpXhxe5t+scf|VXM!^bBlwNh)~7|3?fWwo_~ZFk(22%
zTMesYw+LNx3J-_|DM~`v93yXe=jPD{q;li;5PD?Dyk+b?
zo21|XpT@)$BM$%F=P9J19Vi&1#{jM3!^Y&fr&_`toi`XB1!n>sbL%U9I5<7!@?t)~
z;&H%z>bAaQ4f$wIzkjH70;<8tpUoxzKrPhn#IQfS%9l5=Iu))^XC<58D!-O
z{B+o5R^Z21H0T9JQ5gNJnqh#qH^na|z92=hONIM~@_iuOi|F>jBh-?aA20}Qx~EpDGElELNn~|7WRXRFnw+Wdo`|#
zBpU=Cz3z%cUJ0mx_1($X<40XEIYz(`noWeO+x#yb_pwj6)R(__%@_Cf>txOQ74wSJ
z0#F3(zWWaR-jMEY$7C*3HJrohc79>MCUu26mfYN)f4M~4gD`}EX4e}A!U}QV8!S47
z6y-U-%+h`1n`*pQuKE%Av0@)+wBZr9mH}@vH@i{v(m-6QK7Ncf17x_D=)32`FOjjo
zg|^VPf5c6-!FxN{25dvVh#fog=NNpXz
zfB$o+0jbRkHH{!TKhE709f+jI^$3#v1Nmf80w`@7-5$1Iv_`)W^px8P-({xwb;D0y
z7LKDAHgX<84?l!I*Dvi2#D@oAE^J|g$3!)x1Ua;_;<@#l1fD}lqU2_tS^6Ht$1Wl}
zBESo7o^)9-Tjuz$8YQSGhfs{BQV6zW7dA?0b(Dbt=UnQs&4zHfe_sj{RJ4uS-vQpC
zX;Bbsuju4%!o8?&m4UZU@~ZZjeFF6ex2ss5_60_JS_|iNc+R0GIjH1@Z
z=rLT9%B|WWgOrR7IiIwr2=T;Ne?30M!@{%Qf8o`!>=s<2CBpCK_TWc(DX51>e^xh8
z&@$^b6CgOd7KXQV&Y4%}_#uN*mbanXq(2=Nj`L7H7*k(6F8s6{FOw@(DzU`4-*77{
zF+dxpv}%mFpYK?>N_2*#Y?oB*qEKB}VoQ@bzm>ptmVS_EC(#}Lxxx730trt0G)#$b
zE=wVvtqOct1%*9}U{q<)2?{+0TzZzP0jgf9*)arV)*e!f`|jgT{7_9iS@e)recI#z
zbzolURQ+TOzE!ymqvBY7+5NnAbWxvMLsLTwEbFqW=CPyCsmJ}P1^V30|D5E|p3BC5
z)3|qgw@ra7aXb-wsa|l^in~1_fm{7bS9jhVRkYVO#U{qMp
z)Wce+|DJ}4<2gp8r0_xfZpMo#{Hl2MfjLcZdRB9(B(A(f;+4s*FxV{1F|4d`*sRNd
zp4#@sEY|?^FIJ;tmH{@keZ$P(sLh5IdOk@k^0uB^BWr@pk6mHy$qf&~rI>P*a;h0C{%oA*i!VjWn&D~O#MxN&f@1Po#
zKN+
zrGrkSjcr?^R#nGl<#Q722^wbYcgW@{+6CBS<1@%dPA8HC!~a`jTz<`g_l5N1M@9wn9GOAZ>nqNgq!yOCbZ@1z`U_N`Z>}+1HIZxk*5RDc&rd5{3qjRh8QmT$VyS;jK
z;AF+r6XnnCp=wQYoG|rT2@8&IvKq*IB_WvS%nt%e{MCFm`&W*#LXc|HrD?nVBo=(8*=Aq?u$sDA_sC_RPDUiQ+wnIJET8vx$&fxkW~kP9qXKt
zozR)@xGC!P)CTkjeWvXW5&@2?)qt)jiYWWBU?AUtzAN}{JE1I)dfz~7$;}~BmQF`k
zpn11qmObXwRB8&rnEG*#4Xax3XBkKlw(;tb?Np^i+H8m(Wyz9k{~ogba@laiEk;2!
zV*QV^6g6(QG%vX5Um#^sT&_e`B1pBW5yVth~xUs#0}nv?~C#l?W+9Lsb_5)!71rirGvY
zTIJ$OPOY516Y|_014sNv+Z8cc5t_V=i>lWV=vNu#!58y9Zl&GsMEW#pPYPYGHQ|;vFvd*9eM==$_=vc7xnyz0~
zY}r??$<`wAO?JQk@?RGvkWVJlq2dk9vB(yV^vm{=NVI8dhsX<)O(#nr9YD?I?(VmQ
z^r7VfUBn<~p3()8yOBjm$#KWx!5hRW)5Jl7wY@ky9lNM^jaT##8QGVsYeaVywmpv>X|Xj7gWE1Ezai&wVLt3p)k4w~yrskT-!PR!kiyQlaxl((
zXhF%Q9x}1TMt3~u@|#wWm-Vq?ZerK={8@~&@9r5JW}r#45#rWii};t`{5#&3$W)|@
zbAf2yDNe0q}NEUvq_Quq3cTjcw
z@H_;$hu&xllCI9CFDLuScEMg|x{S7GdV8<&Mq=ezDnRZAyX-8gv97YTm0bg=d)(>N
z+B2FcqvI9>jGtnK%eO%y
zoBPkJTk%y`8TLf4)IXPBn`U|9>O~WL2C~C$z~9|0m*YH<-vg2CD^SX#&)B4ngOSG$
zV^wmy_iQk>dfN@Pv(ckfy&#ak@MLC7&Q6Ro#!ezM*VEh`+b3Jt%m(^T&p&WJ2Oqvj
zs-4nq0TW6cv~(YI$n0UkfwN}kg3_fp?(ijSV#tR9L0}l2qjc7W?i*q01=St0eZ=4h
zyGQbEw`9OEH>NMuIe)hVwYHsGERWOD;JxEiO7cQv%pFCeR+IyhwQ|y@&^24k+|8fD
zLiOWFNJ2&vu2&`Jv96_z-Cd5RLgmeY3*4rDOQo?Jm`;I_(+ejsPM03!ly!*Cu}Cco
zrQSrEDHNyzT(D5s1rZq!8#?f6@v6dB7a-aWs(Qk>N?UGAo{gytlh$%_IhyL7h?DLXDGx
zgxGEBQoCAWo-$LRvM=F5MTle`M})t3vVv;2j0HZY&G
z22^iGhV@uaJh(XyyY%}
zd4iH_UfdV#T=3n}(Lj^|n;O4|$;xhu*8T3hR1mc_A}fK}jfZ7LX~*n5+`8N2q#rI$
z@<_2VANlYF$vIH$
zl<)+*tIWW78IIINA7Rr7i{<;#^yzxoLNkXL)eSs=%|P>$YQIh+ea_3k
z_s7r4%j7%&*NHSl?R4k%1>Z=M9o#zxY!n8sL5>BO-ZP;T3Gut>iLS@U%IBrX6BA3k
z)&@q}V8a{X<5B}K5s(c(LQ=%v1ocr`t$EqqY0EqVjr65usa=0bkf|O#ky{j3)WBR(((L^wmyHRzoWuL2~WTC=`yZ
zn%VX`L=|Ok0v7?s>IHg?yArBcync5rG#^+u)>a%qjES%dRZoIyA8gQ;StH
z1Ao7{<&}6U=5}4v<)1T7t!J_CL%U}CKNs-0xWoTTeqj{5{?Be$L0_tk>M9o8
zo371}S#30rKZFM{`H_(L`EM9DGp+Mifk&IP|C2Zu_)Ghr4Qtpmkm1osCf@%Z$%t+7
zYH$Cr)Ro@3-QDeQJ8m+x6%;?YYT;k6Z0E-?kr>x33`H%*ueBD7Zx~3&HtWn0?2Wt}
zTG}*|v?{$ajzt}xPzV%lL1t-URi8*Zn)YljXNGDb>;!905Td|mpa@mHjIH%VIiGx-
zd@MqhpYFu4_?y5N4xiHn3vX&|e6r~Xt>
zZG`aGq|yTNjv;9E+Txuoa@A(9V7g?1_T5FzRI;!=NP1Kqou1z5?%X~Wwb{trRfd>i
z8&y^H)8YnKyA_Fyx>}RNmQIczT?w2J4SNvI{5J&}Wto|8FR(W;Qw#b1G<1%#tmYzQ
zQ2mZA-PAdi%RQOhkHy9Ea#TPSw?WxwL@H@cbkZwIq0B!@ns}niALidmn&W?!Vd4Gj
zO7FiuV4*6Mr^2xlFSvM;Cp_#r8UaqIzHJQg_z^rEJw&OMm_8NGAY2)rKvki|o1bH~
z$2IbfVeY2L(^*rMRU1lM5Y_sgrDS`Z??nR2lX;zyR=c%UyGb*%TC-Dil?SihkjrQy~TMv6;BMs7P8il`H7DmpVm@rJ;b)hW)BL)GjS154b*xq-NXq2cwE
z^;VP7ua2pxvCmxrnqUYQMH%a%nHmwmI33nJM(>4LznvY*k&C0{8f*%?zggpDgkuz&JBx{9mfb@wegEl2v!=}Sq2Gaty0<)UrOT0{MZtZ~j5y&w
zXlYa_jY)I_+VA-^#mEox#+G>UgvM!Ac8zI<%JRXM_73Q!#i3O|)lOP*qBeJG#BST0
zqohi)O!|$|2SeJQo(w6w7%*92S})XfnhrH_Z8qe!G5>CglP=nI7JAOW?(Z29;pXJ9
zR9`KzQ=WEhy*)WH>$;7Cdz|>*i>=##0bB)oU0OR>>N<21e4rMCHDemNi2LD>Nc$;&
zQRFthpWniC1J6@Zh~iJCoLOxN`oCKD5Q4r%ynwgUKPlIEd#?QViIqovY|czyK8>6B
zSP%{2-<;%;1`#0mG^B(8KbtXF;Nf>K#Di72UWE4gQ%(_26Koiad)q$xRL~?pN71ZZ
zujaaCx~jXjygw;rI!WB=xrOJO6HJ!!w}7eiivtCg5K|F6$EXa)=xUC
za^JXSX98W`7g-tm@uo|BKj39Dl;sg5ta;4qjo^pCh~{-HdLl6qI9Ix6f$+qiZ$}s=
zNguKrU;u+T@ko(Vr1>)Q%h$?UKXCY>3se%&;h2osl2D
zE4A9bd7_|^njDd)6cI*FupHpE3){4NQ*$k*cOWZ_?CZ>Z4_fl@n(mMnYK62Q1d@+I
zr&O))G4hMihgBqRIAJkLdk(p(D~X{-oBUA+If@B}j&
zsHbeJ3RzTq96lB7d($h$xTeZ^gP0c{t!Y0c)aQE;$FY2!mACg!GDEMKXFOPI^)nHZ
z`aSPJpvV0|bbrzhWWkuPURlDeN%VT8tndV8?d)eN*i4I@u
zVKl^6{?}A?P)Fsy?3oi#clf}L18t;TjNI2>eI&(ezDK7RyqFxcv%>?oxUlonv(px)
z$vnPzRH`y5A(x!yOIfL0bmgeMQB$H5wenx~!ujQK*nUBW;@Em&6Xv2%s(~H5WcU2R
z;%Nw<$tI)a`Ve!>x+qegJnQsN2N7HaKzrFqM>`6R*gvh%O*-%THt
zrB$Nk;lE;z{s{r^PPm5qz(&lM{sO*g+W{sK+m3M_z=4=&CC>T`{X}1Vg2PEfSj2x_
zmT*(x;ov%3F?qoEeeM>dUn$a*?SIGyO8m806J1W1o+4HRhc2`9$s6hM#qAm
zChQ87b~GEw{ADfs+5}FJ8+|bIlIv(jT$Ap#hSHoXdd9#w<#cA<1Rkq^*EEkknUd4&
zoIWIY)sAswy6fSERVm&!SO~#iN$OgOX*{9@_BWFyJTvC%S++ilSfCrO(?u=Dc?CXZ
zzCG&0yVR{Z`|ZF0eEApWEo#s9osV>F{uK{QA@BES#&;#KsScf>y
zvs?vIbI>VrT<*!;XmQS=bhq%46-aambZ(8KU-wOO2=en~D}MCToB_u;Yz{)1ySrPZ
z@=$}EvjTdzTWU7c0ZI6L8=yP+YRD_eMMos}b5vY^S*~VZysrkq<`cK3>>v%uy7jgq
z0ilW9KjVDHLv0b<1K_`1IkbTOINs0=m-22c%M~l=^S}%hbli-3?BnNq?b`hx^HX2J
zIe6ECljRL0uBWb`%{EA=%!i^4sMcj+U_TaTZRb+~GOk
z^ZW!nky0n*Wb*r+Q|9H@ml@Z5gU&W`(z4-j!OzC1wOke`TRAYGZVl$PmQ16{3196(
zO*?`--I}Qf(2HIwb2&1FB^!faPA2=sLg(@6P4mN)>Dc3i(B0;@O-y2;lM4akD>@^v
z=u>*|!s&9zem70g7zfw9FXl1bpJW(C#5w#uy5!V?Q(U35A~$dR%LDVnq@}kQm13{}
zd53q3N(s$Eu{R}k2esbftfjfOITCL;jWa$}(mmm}d(&7JZ6d3%IABCapFFYjdEjdK
z&4Edqf$G^MNAtL=uCDRs&Fu@FXRgX{*0<(@c3|PNHa>L%zvxWS={L8%qw`STm+=Rd
zA}FLspESSIpE_^41~#5yI2bJ=9`oc;GIL!JuW&7YetZ?0H}$$%8rW@*J37L-~Rsx!)8($nI4
zZhcZ2^=Y+p4YPl%j!nFJA|*M^gc(0o$i3nlphe+~-_m}jVkRN{spFs(o0ajW@f3K{
zDV!#BwL322CET$}Y}^0ixYj2w>&Xh12|R8&yEw|wLDvF!lZ#dOTHM9pK6@Nm-@9Lnng4ZHBgBSrr7KI8YCC9DX5Kg|`HsiwJHg2(7#nS;A{b3tVO?Z%
za{m5b3rFV6EpX;=;n#wltDv1LE*|g5pQ+OY&*6qCJZc5oDS6Z6JD#6F)bWxZSF@q%
z+1WV;m!lRB!n^PC>RgQCI#D1br_o^#iPk>;K2hB~0^<~)?p}LG%kigm@moD#q3PE+
zA^Qca)(xnqw6x>XFhV6ku9r$E>bWNrVH9fum0?4s?Rn2LG{Vm_+QJHse6xa%nzQ?k
zKug4PW~#Gtb;#5+9!QBgyB@q=sk9=$S{4T>wjFICStOM?__fr+Kei1
z3j~xPqW;W@YkiUM;HngG!;>@AITg}vAE`M2Pj9Irl4w1fo4w<|Bu!%rh%a(Ai^Zhi
zs92>v5;@Y(Zi#RI*ua*h`d_7;byQSa*v9E{2x$<-_=5Z<7{%)}4XExANcz@rK69T0x3%H<@frW>RA8^swA+^a(FxK|
zFl3LD*ImHN=XDUkrRhp6RY5$rQ{bRgSO*(vEHYV)3Mo6Jy3puiLmU&g82p{qr0F?ohmbz)f2r{X2|T2
z$4fdQ=>0BeKbiVM!e-lIIs8wVTuC_m7}y4A_%ikI;Wm5$9j(^Y
z(cD%U%k)X>_>9~t8;pGzL6L-fmQO@K;
zo&vQzMlgY95;1BSkngY)e{`n0!NfVgf}2mB3t}D9@*N;FQ{HZ3Pb%BK6;5#-O|WI(
zb6h@qTLU~AbVW#_6?c!?Dj65Now7*pU{h!1+eCV^KCuPAGs28~3k@ueL5+u|Z-7}t
z9|lskE`4B7W8wMs@xJa{#bsCGDFoRSNSnmNYB&U7
zVGKWe%+kFB6kb)e;TyHfqtU6~fRg)f|>=5(N36)0+C
z`hv65J<$B}WUc!wFAb^QtY31yNleq4dzmG`1wHTj=c*=hay9iD071Hc?oYoUk|M*_
zU1GihAMBsM@5rUJ(qS?9ZYJ6@{bNqJ`2Mr+5#hKf?doa?F|+^IR!8lq9)wS3tF_9n
zW_?hm)G(M+MYb?V9YoX^_mu5h-LP^TL^!Q9Z7|@sO(rg_4+@=PdI)WL(B7`!K^ND-
z-uIuVDCVEdH_C@c71YGYT^_Scf_dhB8Z2Xy6vGtBSlYud9vggOqv^L~F{BraSE_t}
zIkP+Hp2&nH^-MNEs}^`oMLy11`PQW$T|K(`Bu*(f@)mv1-qY(_YG&J2M2<7k;;RK~
zL{Fqj9yCz8(S{}@c)S!65aF<=&eLI{hAMErCx&>i7OeDN>okvegO87OaG{Jmi<|}D
zaT@b|0X{d@OIJ7zvT>r+eTzgLq~|Dpu)Z&db-P4z*`M$UL51lf>FLlq6rfG)%doyp
z)3kk_YIM!03eQ8Vu_2fg{+osaEJPtJ-s36R+5_AEG12`NG)IQ#TF9c@$99%0iye+
zUzZ57=m2)$D(5Nx!n)=5Au&O0BBgwxIBaeI(mro$#&UGCr<;C{UjJVAbVi%|+WP(a
zL$U@TYCxJ=1{Z~}rnW;7UVb7+ZnzgmrogDxhjLGo>c~MiJAWs&&;AGg@%U?Y^0JhL
ze(x6Z74JG6FlOFK(T}SXQfhr}RIFl@QXKnIcXYF)5|V~e-}suHILKT-k|<*~Ij|VF
zC;t@=uj=hot~*!C68G8hTA%8SzOfETOXQ|3FSaIEjvBJp(A)7SWUi5!Eu#yWgY+;n
zlm<$+UDou*V+246_o#V4kMdto8hF%%Lki#zPh}KYXmMf?hrN0;>Mv%`@{0Qn`Ujp)
z=lZe+13>^Q!9zT);H<(#bIeRWz%#*}sgUX9P|9($kexOyKIOc`dLux}c$7It4u|Rl
z6SSkY*V~g_B-hMPo_ak>>z@AVQ(_N)VY2kB3IZ0G(iDUYw+2d7W^~(Jq}KY=JnWS(
z#rzEa&0uNhJ>QE8iiyz;n2H|SV#Og+wEZv=f2%1ELX!SX-(d3tEj$5$1}70Mp<&eI
zCkfbByL7af=qQE@5vDVxx1}FSGt_a1DoE3SDI+G)mBAna)KBG4p8Epxl9QZ4BfdAN
zFnF|Y(umr;gRgG6NLQ$?ZWgllEeeq~z^ZS7L?<(~O&$5|y)Al^iMKy}&W+eMm1W
z7EMU)u^ke(A1#XCV>CZ71}P}0x)4wtHO8#JRG3MA-6g=`ZM!FcICCZ{IEw8Dm2&LQ
z1|r)BUG^0GzI6f946RrBlfB1Vs)~8toZf~7)+G;pv&XiUO(%5bm)pl=p>nV^o*;&T
z;}@oZSibzto$arQgfkp|z4Z($P>dTXE{4O=vY0!)kDO*
zGF8a4wq#VaFpLfK!iELy@?-SeRrdz%F*}hjKcA*y@mj~VD3!it9lhRhX}5YOaR9$}
z3mS%$2Be7{l(+MVx3
z(4?h;P!jnRmX9J9sYN#7i=iyj_5q7n#X(!cdqI2lnr8T$IfOW<_v`eB!d9xY1P=2q&WtOXY=D9QYteP)De?S4}FK6#6Ma
z=E*V+#s8>L;8aVroK^6iKo=MH{4yEZ_>N-N
z`(|;aOATba1^asjxlILk<4}f~`39dBFlxj>Dw(hMYKPO3EEt1@S`1lxFNM+J@uB7T
zZ8WKjz7HF1-5&2=l=fqF-*@>n5J}jIxdDwpT?oKM3s8Nr`x8JnN-kCE?~aM1H!hAE
z%%w(3kHfGwMnMmNj(SU(w42OrC-euI>Dsjk&jz3ts}WHqmMpzQ3vZrsXrZ|}+MHA7
z068obeXZTsO*6RS@o3x80E4ok``rV^Y3hr&C1;|ZZ0|*EKO`$lECUYG2gVFtUTw)R
z4Um<0ZzlON`zTdvVdL#KFoMFQX*a5wM0Czp%wTtfK4Sjs)P**RW&?lP$(<}q%r68Z
zS53Y!d@&~ne9O)A^tNrXHhXBkj~$8j%pT1%%mypa9AW5E&s9)rjF4@O3ytH{0z6riz|@<
zB~UPh*wRFg2^7EbQrHf0y?E~dHlkOxof_a?M{LqQ^C!i2dawHTPYUE=X@2(3<=OOxs8qn_(y>pU>u^}3y&df{JarR0@VJn0f+U%UiF=$Wyq
zQvnVHESil@d|8&R<%}uidGh7@u^(%?$#|&J$pvFC-n8&A>utA=n3#)yMkz+qnG3wd
zP7xCnF|$9Dif@N~L)Vde3hW8W!UY0BgT2v(wzp;tlLmyk2%N|0jfG$%<;A&IVrOI<
z!L)o>j>;dFaqA3pL}b-Je(bB@VJ4%!JeX@3x!i{yIeIso^=n?fDX`3bU=eG7sTc%g%ye8$v8P@yKE^XD=NYxTb
zbf!Mk=h|otpqjFaA-vs5YOF-*GwWPc7VbaOW&stlANnCN8iftFMMrUdYNJ_Bnn5Vt
zxfz@Ah|+4&P;reZxp;MmEI7C|FOv8NKUm8njF7Wb6Gi7DeODLl&G~}G4be&*Hi0Qw
z5}77vL0P+7-B%UL@3n1&JPxW^d@vVwp?u#gVcJqY9#@-3X{ok#UfW3<1fb%FT`|)V~ggq
z(3AUoUS-;7)^hCjdT0Kf{i}h)mBg4qhtHHBti=~h^n^OTH5U*XMgDLIR@sre`AaB$
zg)IGBET_4??m@cx&c~bA80O7B8CHR7(LX7%HThkeC*@vi{-pL%e)yXp!B2InafbDF
zjPXf1mko3h59{lT6EEbxKO1Z5GF71)WwowO6kY|6tjSVSWdQ}NsK2x{>i|MKZK8%Q
zfu&_0D;CO-Jg0#YmyfctyJ!mRJp)e#@O0mYdp|8x;G1%OZQ3Q847YWTyy|%^cpA;m
zze0(5p{tMu^lDkpe?HynyO?a1$_LJl2L&mpeKu%8YvgRNr=%2z${%WThHG=vrWY@4
zsA`OP#O&)TetZ>s%h!=+CE15lOOls&nvC~$Qz0Ph7tHiP;O$i|eDwpT{cp>+)0-|;
zY$|bB+Gbel>5aRN3>c0x)4U=|X+z+{
zn*_p*EQoquRL+=+p;=lm`d71&1NqBz&_ph)MXu(Nv6&XE7(RsS)^MGj5Q?Fwude-(sq
zjJ>aOq!7!EN>@(fK7EE#;i_BGvli`5U;r!YA{JRodLBc6-`n8K+Fjgwb%sX;j=qHQ
z7&Tr!)!{HXoO<2BQrV9Sw?JRaLXV8HrsNevvnf>Y-6|{T!pYLl7jp$-nEE
z#X!4G4L#K0qG_4Z;Cj6=;b|Be$hi4JvMH!-voxqx^@8cXp`B??eFBz2lLD8RRaRGh
zn7kUfy!YV~p(R|p7iC1Rdgt$_24i0cd-S8HpG|`@my70g^y`gu%#Tf_L21-k?sRRZHK&at(*ED0P8iw{7?R$9~OF$Ko;Iu5)ur5<->x!m93Eb
zFYpIx60s=Wxxw=`$aS-O&dCO_9?b1yKiPCQmSQb>T)963`*U+Ydj5kI(B(B?HNP8r
z*bfSBpSu)w(Z3j7HQoRjUG(+d=IaE~tv}y14zHHs|0UcN52fT8V_<@2ep_ee{QgZG
zmgp8iv4V{k;~8@I%M3<#B;2R>Ef(Gg_cQM7%}0s*^)SK6!Ym+~P^58*wnwV1BW@eG
z4sZLqsUvBbFsr#8u7S1r4teQ;t)Y@jnn_m5jS$CsW1um!p&PqAcc8!zyiXHVta9QC
zY~wCwCF0U%xiQPD_INKtTb;A|Zf29(mu9NI;E
zc-e>*1%(LSXB`g}kd`#}O;veb<(sk~RWL|f3ljxCnEZDdNSTDV6#Td({6l&y4IjKF
z^}lIUq*ZUqgTPumD)RrCN{M^jhY>E~1pn|KOZ5((%F)G|*ZQ|r4zIbrEiV%42hJV8
z3xS)=!X1+=olbdGJ=yZil?oXLct8FM{(6ikLL3E%=q#O6(H$p~gQu6T8N!plf!96|
z&Q3=`L~>U0zZh;z(pGR2^S^{#PrPxTRHD1RQOON&f)Siaf`GLj#UOk&(|@0?zm;Sx
ztsGt8=29-MZs5CSf1l1jNFtNt5rFNZxJPvkNu~2}7*9468TWm>nN9TP&^!;J{-h)_
z7WsHH9|F%I`Pb!>KAS3jQWKfGivTVkMJLO-HUGM_a4UQ_%RgL6WZvrW+Z4ujZn;y@
zz9$=oO!7qVTaQAA^BhX&ZxS*|5dj803M=k&2%QrXda`-Q#IoZL6E(g+tN!6CA!CP*
zCpWtCujIea)ENl0liwVfj)Nc<9mV%+e@=d`haoZ*`B7+PNjEbXBkv=B+Pi^~L#EO$D$ZqTiD8f<5$eyb54-(=3
zh)6i8i|jp(@OnRrY5B8t|LFXFQVQ895n*P16cEKTrT*~yLH6Z4e*bZ5otpRDri&+A
zfNbK1D5@O=sm`fN=WzWyse!za5n%^+6dHPGX#8DyIK>?9qyX}2XvBWVqbP%%D)7$=
z=#$WulZlZR<{m#gU7lwqK4WS1Ne$#_P{b17qe$~UOXCl>5b|6WVh;5vVnR<%d+Lnp
z$uEmML38}U4vaW8>shm6CzB(Wei3s#NAWE3)a2)z@i{4jTn;;aQS)O@l{rUM`J@K&
l00vQ5JBs~;vo!vr%%-k{2_Fq1Mn4QF81S)AQ99zk{{c4yR+0b!

literal 63721
zcmb5Wb9gP!wgnp7wrv|bwr$&XvSZt}Z6`anZSUAlc9NHKf9JdJ;NJVr`=eI(_pMp0
zy1VAAG3FfAOI`{X1O)&90s;U4K;XLp008~hCjbEC_fbYfS%6kTR+JtXK>nW$ZR+`W
ze|#J8f4A@M|F5BpfUJb5h>|j$jOe}0oE!`Zf6fM>CR?!y@zU(cL8NsKk`a
z6tx5mAkdjD;J=LcJ;;Aw8p!v#ouk>mUDZF@
zK>yvw%+bKu+T{Nk@LZ;zkYy0HBKw06_IWcMHo*0HKpTsEFZhn5qCHH9j
z)|XpN&{`!0a>Vl+PmdQc)Yg4A(AG-z!+@Q#eHr&g<9D?7E)_aEB?s_rx>UE9TUq|?
z;(ggJt>9l?C|zoO@5)tu?EV0x_7T17q4fF-q3{yZ^ipUbKcRZ4Qftd!xO(#UGhb2y>?*@{xq%`(-`2T^vc=#<
zx!+@4pRdk&*1ht2OWk^Z5IAQ0YTAXLkL{(D*$gENaD)7A%^XXrCchN&z2x+*>o2FwPFjWpeaL=!tzv#JOW#(
z$B)Nel<+$bkH1KZv3&-}=SiG~w2sbDbAWarg%5>YbC|}*d9hBjBkR(@tyM0T)FO$#
zPtRXukGPnOd)~z=?avu+4Co@wF}1T)-uh5jI<1$HLtyDrVak{gw`mcH@Q-@wg{v^c
zRzu}hMKFHV<8w}o*yg6p@Sq%=gkd~;`_VGTS?L@yVu`xuGy+dH6YOwcP6ZE`_0rK%
zAx5!FjDuss`FQ3eF|mhrWkjux(Pny^k$u_)dyCSEbAsecHsq#8B3n3kDU(zW5yE|(
zgc>sFQywFj5}U*qtF9Y(bi*;>B7WJykcAXF86@)z|0-Vm@jt!EPoLA6>r)?@DIobIZ5Sx
zsc@OC{b|3%vaMbyeM|O^UxEYlEMHK4r)V-{r)_yz`w1*xV0|lh-LQOP`OP`Pk1aW(
z8DSlGN>Ts|n*xj+%If~+E_BxK)~5T#w6Q1WEKt{!Xtbd`J;`2a>8boRo;7u2M&iOop4qcy<)z023=oghSFV
zST;?S;ye+dRQe>ygiJ6HCv4;~3DHtJ({fWeE~$H@mKn@Oh6Z(_sO>01JwH5oA4nvK
zr5Sr^g+LC
zLt(i&ecdmqsIJGNOSUyUpglvhhrY8lGkzO=0USEKNL%8zHshS>Qziu|`eyWP^5xL4
zRP122_dCJl>hZc~?58w~>`P_s18VoU|7(|Eit0-lZRgLTZKNq5{k
zE?V=`7=R&ro(X%LTS*f+#H-mGo_j3dm@F_krAYegDLk6UV{`UKE;{YSsn$
z(yz{v1@p|p!0>g04!eRSrSVb>MQYPr8_MA|MpoGzqyd*$@4j|)cD_%^Hrd>SorF>@
zBX+V<@vEB5PRLGR(uP9&U&5=(HVc?6B58NJT_igiAH*q~Wb`dDZpJSKfy5#Aag4IX
zj~uv74EQ_Q_1qaXWI!7Vf@ZrdUhZFE;L&P_Xr8l@GMkhc#=plV0+g(ki>+7fO%?Jb
zl+bTy7q{w^pTb{>(Xf2q1BVdq?#f=!geqssXp
z4pMu*q;iiHmA*IjOj4`4S&|8@gSw*^{|PT}Aw~}ZXU`6=vZB=GGeMm}V6W46|pU&58~P+?LUs%n@J}CSrICkeng6YJ^M?
zS(W?K4nOtoBe4tvBXs@@`i?4G$S2W&;$z8VBSM;Mn9
zxcaEiQ9=vS|bIJ>*tf9AH~m&U%2+Dim<)E=}KORp+cZ^!@wI`h1NVBXu{@%hB2Cq(dXx_aQ9x3mr*fwL5!ZryQqi|KFJuzvP
zK1)nrKZ7U+B{1ZmJub?4)Ln^J6k!i0t~VO#=q1{?T)%OV?MN}k5M{}vjyZu#M0_*u
z8jwZKJ#Df~1jcLXZL7bnCEhB6IzQZ-GcoQJ!16I*39iazoVGugcKA{lhiHg4Ta2fD
zk1Utyc5%QzZ$s3;p0N+N8VX{sd!~l*Ta3|t>lhI&G`sr6L~G5Lul`>m
z{!^INm?J|&7X=;{XveF!(b*=?9NAp4y&r&N3(GKcW4rS(Ejk|Lzs1PrxPI_owB-`H
zg3(Rruh^&)`TKA6+_!n>RdI6pw>Vt1_j&+bKIaMTYLiqhZ#y_=J8`TK{Jd<7l9&sY
z^^`hmi7^14s16B6)1O;vJWOF$=$B5ONW;;2&|pUvJlmeUS&F;DbSHCrEb0QBDR|my
zIs+pE0Y^`qJTyH-_mP=)Y+u^LHcuZhsM3+P||?+W#V!_6E-8boP#R-*na4!o-Q1
zVthtYhK{mDhF(&7Okzo9dTi03X(AE{8cH$JIg%MEQca`S
zy@8{Fjft~~BdzWC(di#X{ny;!yYGK9b@=b|zcKZ{vv4D8i+`ilOPl;PJl{!&5-0!w
z^fOl#|}vVg%=n)@_e1BrP)`A
zKPgs`O0EO}Y2KWLuo`iGaKu1k#YR6BMySxQf2V++Wo{6EHmK>A~Q5o73yM
z-RbxC7Qdh0Cz!nG+7BRZE>~FLI-?&W_rJUl-8FDIaXoNBL)@1hwKa^wOr1($*5h~T
zF;%f^%<$p8Y_yu(JEg=c_O!aZ#)Gjh$n(hfJAp$C2he555W5zdrBqjFmo|VY+el;o
z=*D_w|GXG|p0**hQ7~9-n|y5k%B}TAF0iarDM!q-jYbR^us(>&y;n^2l0C%@2B}KM
zyeRT9)oMt97Agvc4sEKUEy%MpXr2vz*lb
zh*L}}iG>-pqDRw7ud{=FvTD?}xjD)w{`KzjNom-$jS^;iw0+7nXSnt1R@G|VqoRhE%12nm+PH?9`(4rM0kfrZzIK9JU=^$YNyLvAIoxl#Q)xxDz!^0@zZ
zSCs$nfcxK_vRYM34O<1}QHZ|hp4`ioX3x8(UV(FU$J@o%tw3t4k1QPmlEpZa2IujG&(roX_q*%e`Hq|);0;@k
z0z=fZiFckp#JzW0p+2A+D$PC~IsakhJJkG(c;CqAgFfU0Z`u$PzG~-9I1oPHrCw&)@s^Dc~^)#HPW0Ra}J^=|h7Fs*<8|b13ZzG6MP*Q1dkoZ6&A^!}|hbjM{2HpqlSXv_UUg1U4gn
z3Q)2VjU^ti1myodv+tjhSZp%D978m~p&
z43uZUrraHs80Mq&vcetqfQpQP?m!CFj)44t8Z}k`E798wxg&~aCm+DBoI+nKq}&j^
zlPY3W$)K;KtEajks1`G?-@me7C>{PiiBu+41#yU_c(dITaqE?IQ(DBu+c^Ux!>pCj
zLC|HJGU*v+!it1(;3e`6igkH(VA)-S+k(*yqxMgUah3$@C
zz`7hEM47xr>j8^g`%*f=6S5n>z%Bt_Fg{Tvmr+MIsCx=0gsu_sF`q2hlkEmisz#Fy
zj_0;zUWr;Gz}$BS%Y`meb(=$d%@Crs(OoJ|}m#<7=-A~PQbyN$x%2iXP2@e*nO0b7AwfH8cCUa*Wfu@b)D_>I*%uE4O3
z(lfnB`-Xf*LfC)E}e?%X2kK7DItK6Tf<+M^mX0Ijf_!IP>7c8IZX%8_#0060P{QMuV^B9i<^E`_Qf0pv9(P%_s8D`qvDE9LK9u-jB}J2S`(mCO&XHTS04Z5Ez*vl^T%!^$~EH8M-UdwhegL>3IQ*)(MtuH2Xt1p!fS4o~*rR?WLxlA!sjc2(O
znjJn~wQ!Fp9s2e^IWP1C<4%sFF}T4omr}7+4asciyo3DntTgWIzhQpQirM$9{EbQd
z3jz9vS@{aOqTQHI|l#aUV@2Q^Wko4T0T04Me4!2nsdrA8QY1%fnAYb~d2GDz@lAtfcHq(P7
zaMBAGo}+NcE-K*@9y;Vt3*(aCaMKXBB*BJcD_Qnxpt75r?GeAQ}*|>pYJE=uZb73
zC>sv)18)q#EGrTG6io*}JLuB_jP3AU1Uiu$D7r|2_zlIGb9
zjhst#ni)Y`$)!fc#reM*$~iaYoz~_Cy7J3ZTiPm)E?%`fbk`3Tu-F#`{i!l5pNEn5
zO-Tw-=TojYhzT{J=?SZj=Z8#|eoF>434b-DXiUsignxXNaR3
zm_}4iWU$gt2Mw5NvZ5(VpF`?X*f2UZDs1TEa1oZCif?Jdgr{>O~7}-$|BZ7I(IKW`{f;@|IZFX*R8&iT=
zoWstN8&R;}@2Ka%d3vrLtR|O??ben;k8QbS-WB0VgiCz;<$pBmIZdN!aalyCSEm)crpS9dcD^Y@XT1a3+zpi-`D}e#HV<}
z$Y(G&o~PvL-xSVD5D?JqF3?B9rxGWeb=oEGJ3vRp5xfBPlngh1O$yI95EL+T8{GC@
z98i1H9KhZGFl|;`)_=QpM6H?eDPpw~^(aFQWwyXZ8_EEE4#@QeT_URray*mEOGsGc
z6|sdXtq!hVZo=d#+9^@lm&L5|q&-GDCyUx#YQiccq;spOBe3V+VKdjJA=IL=Zn%P}
zNk=_8u}VhzFf{UYZV0`lUwcD&)9AFx0@Fc6LD9A6Rd1=ga>Mi0)_QxM2ddCVRmZ0d
z+J=uXc(?5JLX3=)e)Jm$HS2yF`44IKhwRnm2*669_J=2LlwuF5$1tAo@ROSU@-y+;Foy2IEl2^V1N;fk~YR
z?&EP8#t&m0B=?aJeuz~lHjAzRBX>&x=A;gIvb>MD{XEV
zV%l-+9N-)i;YH%nKP?>f`=?#`>B(`*t`aiPLoQM(a6(qs4p5KFjDBN?8JGrf3z8>=
zi7sD)c)Nm~x{e<^jy4nTx${P~cwz_*a>%0_;ULou3kHCAD7EYkw@l$8TN#LO9jC(
z1BeFW`k+bu5e8Ns^a8dPcjEVHM;r6UX+cN=Uy7HU)j-myRU0wHd$A1fNI~`4;I~`zC)3ul#8#^rXVSO*m}Ag>c%_;nj=Nv$rCZ
z*~L@C@OZg%Q^m)lc-kcX&a*a5`y&DaRxh6O*dfhLfF+fU5wKs(1v*!TkZidw*)YBP
za@r`3+^IHRFeO%!ai%rxy;R;;V^Fr=OJlpBX;(b*3+SIw}7=
zIq$*Thr(Zft-RlY)D3e8V;BmD&HOfX+E$H#Y@B3?UL5L~_fA-@*IB-!gItK7PIgG9
zgWuGZK_nuZjHVT_Fv(XxtU%)58;W39vzTI2n&)&4Dmq7&JX6G>XFaAR{7_3QB6zsT
z?$L8c*WdN~nZGiscY%5KljQARN;`w$gho=p006z;n(qIQ*Zu<``TMO3n0{ARL@gYh
zoRwS*|Niw~cR!?hE{m*y@F`1)vx-JRfqET=dJ5_(076st(=lFfjtKHoYg`k3oNmo_
zNbQEw8&sO5jAYmkD|Zaz_yUb0rC})U!rCHOl}JhbYIDLzLvrZVw0~JO`d*6f;X&?V=#T@ND*cv^I;`sFeq4
z##H5;gpZTb^0Hz@3C*~u0AqqNZ-r%rN3KD~%Gw`0XsIq$(^MEb<~H(2*5G^<2(*aI
z%7}WB+TRlMIrEK#s0
z93xn*Ohb=kWFc)BNHG4I(~RPn-R8#0lqyBBz5OM6o5|>x9LK@%HaM}}Y5goCQRt2C
z{j*2TtT4ne!Z}vh89mjwiSXG=%DURar~=kGNNaO_+Nkb+tRi~Rkf!7a$*QlavziD(
z83s4GmQ^Wf*0Bd04f#0HX@ua_d8
z23~z*53ePD6@xwZ(vdl0DLc=>cPIOPOdca&MyR^jhhKrdQO?_jJh`xV3GKz&2lvP8
zEOwW6L*ufvK;TN{=S&R@pzV^U=QNk^Ec}5H
z+2~JvEVA{`uMAr)?Kf|aW>33`)UL@bnfIUQc~L;TsTQ6>r-<^rB8uoNOJ>HWgqMI8
zSW}pZmp_;z_2O5_RD|fGyTxaxk53Hg_3Khc<8AUzV|ZeK{fp|Ne933=1&_^Dbv5^u
zB9n=*)k*tjHDRJ@$bp9mrh}qFn*s}npMl5BMDC%Hs0M0g-hW~P*3CNG06G!MOPEQ_
zi}Qs-6M8aMt;sL$vlmVBR^+Ry<64jrm1EI1%#j?c?4b*7>)a{aDw#TfTYKq+SjEFA
z(aJ&z_0?0JB83D-i3Vh+o|XV4UP+YJ$9Boid2^M2en@APw&wx7vU~t$r2V`F|7Qfo
z>WKgI@eNBZ-+Og<{u2ZiG%>YvH2L3fNpV9J;WLJoBZda)01Rn;o@){01{7E#ke(7U
zHK>S#qZ(N=aoae*4X!0A{)nu0R_sKpi1{)u>GVjC+b5Jyl6#AoQ-1_3UDovNSo`T>
z?c-@7XX*2GMy?k?{g)7?Sv;SJkmxYPJPs!&QqB12ejq`Lee^-cDveVWL^CTUldb(G
zjDGe(O4P=S{4fF=#~oAu>LG>wrU^z_?3yt24FOx>}{^lCGh8?vtvY$^hbZ)9I0E3r3NOlb9I?F-Yc=r$*~l`4N^xzlV~N
zl~#oc>U)Yjl0BxV>O*Kr@lKT{Z09OXt2GlvE38nfs+DD7exl|&vT;)>VFXJVZp9Np
zDK}aO;R3~ag$X*|hRVY3OPax|PG`@_ESc8E!mHRByJbZQRS38V2F__7MW~sgh!a>98Q2%lUNFO=^xU52|?D=IK#QjwBky-C>zOWlsiiM&1n
z;!&1((Xn1$9K}xabq~222gYvx3hnZPg}VMF_GV~5ocE=-v>V=T&RsLBo&`)DOyIj*
zLV{h)JU_y*7SdRtDajP_Y+rBkNN*1_TXiKwHH2&p51d(#zv~s#HwbNy?<+(=9WBvo
zw2hkk2Dj%kTFhY+$T+W-b7@qD!bkfN#Z2ng@Pd=i3-i?xYfs5Z*1hO?kd7Sp^9`;Y
zM2jeGg<-nJD1er@Pc_cSY7wo5dzQX44=%6rn}P_SRbpzsA{6B+!$3B0#;}qwO37G^
zL(V_5JK`XT?OHVk|{_$vQ|oNEpab*BO4F
zUTNQ7RUhnRsU`TK#~`)$icsvKh~(pl=3p6m98@k3P#~upd=k*u20SNcb{l^1rUa)>qO997)pYRWMncC8A&&MHlbW?7i^7M`+B$hH~Y|J
zd>FYOGQ;j>Zc2e7R{KK7)0>>nn_jYJy&o@sK!4G>-rLKM8Hv)f;hi1D2fAc$+six2
zyVZ@wZ6x|fJ!4KrpCJY=!Mq0;)X)OoS~{Lkh6u8J`eK%u0WtKh6B>GW_)PVc
zl}-k`p09qwGtZ@VbYJC!>29V?Dr>>vk?)o(x?!z*9DJ||9qG-&G~#kXxbw{KKYy}J
zQKa-dPt~M~E}V?PhW0R26xdA%1T*%ra6SguGu50YHngOTIv)@N|YttEXo#OZfgtP7;H?EeZZxo<}3YlYxtBq
znJ!WFR^tmGf0Py}N?kZ(#=VtpC@%xJkDmfcCoBTxq
zr_|5gP?u1@vJZbxPZ|G0AW4=tpb84gM2DpJU||(b8kMOV1S3|(yuwZJ&rIiFW(U;5
zUtAW`O6F6Zy+eZ1EDuP~AAHlSY-+A_eI5Gx)%*uro5tljy}kCZU*_d7)oJ>oQSZ3*
zneTn`{gnNC&uJd)0aMBzAg021?YJ~b(fmkwZAd696a=0NzBAqBN54KuNDwa*no(^O
z6p05bioXUR^uXjpTol*ppHp%1v9e)vkoUAUJyBx3lw0UO39b0?^{}yb!$yca(@DUn
zCquRF?t=Zb9`Ed3AI6|L{eX~ijVH`VzSMheKoP7LSSf4g>md>`yi!TkoG5P>Ofp+n
z(v~rW+(5L96L{vBb^g51B=(o)?%%xhvT*A5btOpw(TKh^g^4c
zw>0%X!_0`{iN%RbVk+A^f{w-4-SSf*fu@FhruNL##F~sF24O~u
zyYF<3el2b$$wZ_|uW#@Ak+VAGk#e|kS8nL1g>2B-SNMjMp^8;-FfeofY2fphFHO!{
z*!o4oTb{4e;S<|JEs<1_hPsmAlVNk?_5-Fp5KKU&d#FiNW~Y+pVFk@Cua1I{T+1|+
zHx6rFMor)7L)krbilqsWwy@T+g3DiH5MyVf8Wy}XbEaoFIDr~y;@r&I>FMW{
z?Q+(IgyebZ)-i4jNoXQhq4Muy9Fv+OxU;9_Jmn+<`mEC#%2Q_2bpcgzcinygNI!&^
z=V$)o2&Yz04~+&pPWWn`rrWxJ&}8khR)6B(--!9Q
zubo}h+1T)>a@c)H^i``@<^j?|r4*{;tQf78(xn0g39IoZw0(CwY1f<%F>kEaJ
zp9u|IeMY5mRdAlw*+gSN^5$Q)ShM<~E=(c8QM+T-Qk)FyKz#Sw0EJ*edYcuOtO#~Cx^(M7w5
z3)rl#L)rF|(Vun2LkFr!rg8Q@=r>9p>(t3Gf_auiJ2Xx9HmxYTa|=MH_SUlYL`mz9
zTTS$`%;D-|Jt}AP1&k7PcnfFNTH0A-*FmxstjBDiZX?}%u%Yq94$fUT&z6od+(Uk>
zuqsld#G(b$G8tus=M!N#oPd|PVFX)?M?tCD0tS%2IGTfh}3YA3f&UM)W$_GNV8
zQo+a(ml2Km4o6O%gKTCSDNq+#zCTIQ1*`TIJh~k6Gp;htHBFnne))rlFdGqwC6dx2+La1&Mnko*352k0y
z+tQcwndQlX`nc6nb$A9?<-o|r*%aWXV#=6PQic0Ok_D;q>wbv&j7cKc!w4~KF#-{6
z(S%6Za)WpGIWf7jZ3svNG5OLs0>vCL9{V7cgO%zevIVMH{WgP*^D9ws&OqA{yr|m|
zKD4*07dGXshJHd#e%x%J+qmS^lS|0Bp?{drv;{@{l9ArPO&?Q5=?OO9=}h$oVe#3b
z3Yofj&Cb}WC$PxmRRS)H%&$1-)z7jELS}!u!zQ?A^Y{Tv4QVt*vd@uj-^t2fYRzQj
zfxGR>-q|o$3sGn^#VzZ!QQx?h9`njeJry}@x?|k0-GTTA4y3t2E`3DZ!A~D?GiJup
z)8%PK2^9OVRlP(24P^4_<|D=H^7}WlWu#LgsdHzB%cPy|f8dD3|A^mh4WXxhLTVu_
z@abE{6Saz|Y{rXYPd4$tfPYo}ef(oQWZ=4Bct-=_9`#Qgp4ma$n$`tOwq#&E18$B;
z@Bp)bn3&rEi0>fWWZ@7k5WazfoX`SCO4jQWwVuo+$PmSZn^Hz?O(-tW@*DGxuf)V1
zO_xm&;NVCaHD4dqt(-MlszI3F-p?0!-e$fbiCeuaw66h^TTDLWuaV<@C-`=Xe5WL)
zwooG7h>4&*)p3pKMS3O!4>-4jQUN}iAMQ)2*70?hP~)TzzR?-f@?Aqy$$1Iy8VGG$
zMM?8;j!pUX7QQD$gRc_#+=raAS577ga-w?jd`vCiN5lu)dEUkkUPl9!?{$IJNxQys
z*E4e$eF&n&+AMRQR2gcaFEjAy*r)G!s(P6D&TfoApMFC_*Ftx0|D0@E-=B7tezU@d
zZ{hGiN;YLIoSeRS;9o%dEua4b%4R3;$SugDjP$x;Z!M!@QibuSBb)HY!3zJ7M;^jw
zlx6AD50FD&p3JyP*>o+t9YWW8(7P2t!VQQ21pHJOcG_SXQD;(5aX#M6x##5H_Re>6lPyDCjxr*R(+HE%c&QN+b^tbT
zXBJk?p)zhJj#I?&Y2n&~XiytG9!1ox;bw5Rbj~)7c(MFBb4>IiRATdhg
zmiEFlj@S_hwYYI(ki{}&<;_7(Z0Qkfq>am
z&LtL=2qc7rWguk3BtE4zL41@#S;NN*-jWw|7Kx7H7~_%7fPt;TIX}Ubo>;Rmj94V>
zNB1=;-9AR7s`Pxn}t_6^3ahlq53e&!Lh85uG
zec0vJY_6e`tg7LgfrJ3k!DjR)Bi#L@DHIrZ`sK=<5O0Ip!fxGf*OgGSpP@Hbbe&$9
z;ZI}8lEoC2_7;%L2=w?tb%1oL0V+=Z`7b=P&lNGY;yVBazXRYu;+cQDKvm*7NCxu&i;zub
zAJh#11%?w>E2rf2e~C4+rAb-&$^vsdACs7
z@|Ra!OfVM(ke{vyiqh7puf&Yp6cd6{DptUteYfIRWG3pI+5<
zBVBI_xkBAc<(pcb$!Y%dTW(b;B;2pOI-(QCsLv@U-D1XJ
z(Gk8Q3l7Ws46Aktuj>|s{$6zA&xCPuXL-kB`CgYMs}4IeyG*P51IDwW?8UNQd+$i~
zlxOPtSi5L|gJcF@DwmJA5Ju8HEJ>o{{upwIpb!f{2(vLNBw`7xMbvcw<^{Fj@E~1(
z?w`iIMieunS#>nXlmUcSMU+D3rX28f?s7z;X=se6bo8;5vM|O^(D6{A9*ChnGH!RG
zP##3>LDC3jZPE4PH32AxrqPk|yIIrq~`aL-=}`okhNu9aT%q
z1b)7iJ)CN=V#Ly84N_r7U^SH2FGdE5FpTO2
z630TF$P>GNMu8`rOytb(lB2};`;P4YNwW1<5d3Q~AX#P0aX}R2b2)`rgkp#zTxcGj
zAV^cvFbhP|JgWrq_e`~exr~sIR$6p5V?o4Wym3kQ3HA+;Pr$bQ0(PmADVO%MKL!^q
z?zAM8j1l4jrq|5X+V!8S*2Wl@=7*pPgciTVK6kS1Ge
zMsd_u6DFK$jTnvVtE;qa+8(1sGBu~n&F%dh(&c(Zs4Fc#A=gG^^%^AyH}1^?|8quj
zl@Z47h$){PlELJgYZCIHHL=
z{U8O>Tw4x3<1{?$8>k-P<}1y9DmAZP_;(3Y*{Sk^H^A=_iSJ@+s5ktgwTXz_2$~W9>VVZsfwCm@s0sQ
zeB50_yu@uS+e7QoPvdCwDz{prjo(AFwR%C?z`EL{1`|coJHQTk^nX=tvs1<0arUOJ
z!^`*x&&BvTYmemyZ)2p~{%eYX=JVR?DYr(rNgqRMA5E1PR1Iw=prk=L2ldy3r3Vg@27IZx43+ywyzr-X*p*d@tZV+!U#~$-q=8c
zgdSuh#r?b4GhEGNai)ayHQpk>5(%j5c@C1K3(W1pb~HeHpaqijJZa-e6vq_8t-^M^
zBJxq|MqZc?pjXPIH}70a5vt!IUh;l}<>VX<-Qcv^u@5(@@M2CHSe_hD$VG-eiV^V(
zj7*9T0?di?P$FaD6oo?)<)QT>Npf6Og!GO^GmPV(Km0!=+dE&bk#SNI+C9RGQ|{~O*VC+tXK3!n`5
zHfl6>lwf_aEVV3`0T!aHNZLsj$paS$=LL(?b!Czaa5bbSuZ6#$_@LK<(7yrrl+80|
z{tOFd=|ta2Z`^ssozD9BINn45NxUeCQis?-BKmU*Kt=FY-NJ+)8S1ecuFtN-M?&42
zl2$G>u!iNhAk*HoJ^4v^9#ORYp5t^wDj6|lx~5w45#E5wVqI1JQ~9l?nPp1YINf++
zMAdSif~_ETv@Er(EFBI^@L4BULFW>)NI+ejHFP*T}UhWNN`I)RRS8za?
z*@`1>9ZB}An%aT5K=_2iQmfE;GcBVHLF!$`I99o5GO`O%O_zLr9AG18>&^HkG(;=V
z%}c!OBQ~?MX(9h~tajX{=x)+!cbM7$YzTlmsPOdp2L-?GoW`@{lY9U3f;OUo*BwRB
z8A+nv(br0-SH#VxGy#ZrgnGD(=@;HME;yd46EgWJ`EL%oXc&lFpc@Y}^>G(W>h_v_
zlN!`idhX+OjL+~T?19sroAFVGfa5tX-D49w$1g2g_-T|EpHL6}K_aX4$K=LTvwtlF
zL*z}j{f+Uoe7{-px3_5iKPA<_7W=>Izkk)!l9ez2w%vi(?Y;i8AxRNLSOGDzNoqoI
zP!1uAl}r=_871(G?y`i&)-7{u=%nxk7CZ_Qh#!|ITec
zwQn`33GTUM`;D2POWnkqngqJhJRlM>CTONzTG}>^Q0wUunQyn|TAiHzyX2_%ATx%P
z%7gW)%4rA9^)M<_%k@`Y?RbC<29sWU&5;@|9thf2#zf8z12$hRcZ!CSb>kUp=4N#y
zl3hE#y6>kkA8VY2`W`g5Ip?2qC_BY$>R`iGQLhz2-S>x(RuWv)SPaGdl^)gGw7tjR
zH@;jwk!jIaCgSg_*9iF|a);sRUTq30(8I(obh^|}S~}P4U^BIGYqcz;MPpC~Y@k_m
zaw4WG1_vz2GdCAX!$_a%GHK**@IrHSkGoN>)e}>yzUTm52on`hYot7cB=oA-h1u|R
ztH$11t?54Qg2L+i33FPFKKRm1aOjKST{l1*(nps`>sv%VqeVMWjl5+Gh+9);hIP8?
zA@$?}Sc
z3qIRpba+y5yf{R6G(u8Z^vkg0Fu&D-7?1s=QZU`Ub{-!Y`I?AGf1VNuc^L3v>)>i#
z{DV9W$)>34wnzAXUiV^ZpYKw>UElrN_5Xj6{r_3|
z$X5PK`e5$7>~9Dj7gK5ash(dvs`vwfk}&RD`>04;j62zoXESkFBklYaKm5seyiX(P
zqQ-;XxlV*yg?Dhlx%xt!b0N3GHp@(p$A;8|%#
zZ5m2KL|{on4nr>2_s9Yh=r5ScQ0;aMF)G$-9-Ca6%wA`Pa)i?NGFA|#Yi?{X-4ZO_
z^}%7%vkzvUHa$-^Y#aA+aiR5sa%S|Ebyn`EV<3Pc?ax_f>@sBZF1S;7y$CXd5t5=WGsTKBk8$OfH4v|0?0I=Yp}7c=WBSCg!{0n)XmiU;lfx)**zZaYqmDJelxk$)nZyx5`x$6R|fz(;u
zEje5Dtm|a%zK!!tk3{i9$I2b{vXNFy%Bf{50X!x{98+BsDr_u9i>G5%*sqEX|06J0
z^IY{UcEbj6LDwuMh7cH`H@9sVt1l1#8kEQ(LyT@&+K}(ReE`ux8gb0r6L_#bDUo^P
z3Ka2lRo52Hdtl_%+pwVs14=q`{d^L58PsU@AMf(hENumaxM{7iAT5sYmWh@hQCO^
zK&}ijo=`VqZ#a3vE?`7QW0ZREL17ZvDfdqKGD?0D4fg{7v%|Yj&_jcKJAB)>=*RS*
zto8p6@k%;&^ZF>hvXm&$PCuEp{uqw3VPG$9VMdW5$w-fy2CNNT>E;>ejBgy-m_6`&
z97L1p{%srn@O_JQgFpa_#f(_)eb#YS>o>q3(*uB;uZb605(iqM$=NK{nHY=+X2*G)
zO3-_Xh%aG}fHWe*==58zBwp%&`mge<8uq8;xIxOd=P%9EK!34^E9sk|(Zq1QSz-JVeP12Fp)-`F|KY$LPwUE?rku
zY@OJ)Z9A!ojfzfeyJ9;zv2EM7ZQB)AR5xGa-tMn^bl)FmoIiVyJ@!~@%{}qXXD&Ns
zPnfe5U+&ohKefILu_1mPfLGuapX@btta5C#gPB2cjk5m4T}Nfi+Vfka!Yd(L?-c~5
z#ZK4VeQEXNPc4r$K00Fg>g#_W!YZ)cJ?JTS<&68_$#cZT-ME`}tcwqg3#``3M3UPvn+pi}(VNNx6y
zFIMVb6OwYU(2`at$gHba*qrMVUl8xk5z-z~fb@Q3Y_+aXuEKH}L+>eW__!IAd@V}L
zkw#s%H0v2k5-=vh$^vPCuAi22Luu3uKTf6fPo?*nvj$9(u)4$6tvF-%IM+3pt*cgs
z_?wW}J7VAA{_~!?))?s6{M=KPpVhg4fNuU*|3THp@_(q!b*hdl{fjRVFWtu^1dV(f
z6iOux9hi&+UK=|%M*~|aqFK{Urfl!TA}UWY#`w(0P!KMe1Si{8|o))Gy6d7;!JQYhgMYmXl?3FfOM2nQGN@~Ap6(G
z3+d_5y@=nkpKAhRqf{qQ~k7Z$v&l&@m7Ppt#FSNzKPZM
z8LhihcE6i=<(#87E|Wr~HKvVWhkll4iSK$^mUHaxgy8*K$_Zj;zJ`L$naPj+^3zTi
z-3NTaaKnD5FPY-~?Tq6QHnmDDRxu0mh0D|zD~Y=vv_qig5r-cIbCpxlju&8Sya)@{
zsmv6XUSi)@(?PvItkiZEeN*)AE~I_?#+Ja-r8$(XiXei2d@Hi7Rx8+rZZb?ZLa{;@*EHeRQ-YDadz~M*YCM4&F-r;E#M+@CSJMJ0oU|PQ^
z=E!HBJDMQ2TN*Y(Ag(ynAL8%^v;=~q?s4plA_hig&5Z0x_^Oab!T)@6kRN$)qEJ6E
zNuQjg|G7iwU(N8pI@_6==0CL;lRh1dQF#wePhmu@hADFd3B5KIH#dx(2A
zp~K&;Xw}F_N6CU~0)QpQk7s$a+LcTOj1%=WXI(U=Dv!6
z{#<#-)2+gCyyv=Jw?Ab#PVkxPDeH|sAxyG`|Ys}A$PW4TdBv%zDz
z^?lwrxWR<%Vzc8Sgt|?FL6ej_*e&rhqJZ3Y>k=X(^dytycR;XDU16}Pc9Vn0>_@H+
zQ;a`GSMEG64=JRAOg%~L)x*w{2re6DVprNp+FcNra4VdNjiaF0M^*>CdPkt(m150rCue?FVdL0nFL$V%5y6N
z%eLr5%YN7D06k5ji5*p4v$UMM)G??Q%RB27IvH7vYr_^3>1D-M66#MN8tWGw>WED}
z5AhlsanO=STFYFs)Il_0i)l)f<8qn|$DW7ZXhf5xI;m+7M5-%P63XFQrG9>DMqHc}
zsgNU9nR`b}E^mL5=@7<1_R~j@q_2U^3h|+`7YH-?C=vme1C3m`Fe0HC>pjt6f_XMh
zy~-i-8R46QNYneL4t@)<0VU7({aUO?aH`z4V2+kxgH5pYD5)wCh75JqQY)jIPN=U6
z+qi8cGiOtXG2tXm;_CfpH9ESCz#i5B(42}rBJJF$jh<1sbpj^8&L;gzGHb8M{of+}
zzF^8VgML2O9nxBW7AvdEt90vp+#kZxWf@A)o9f9}vKJy9NDBjBW
zSt=Hcs=YWCwnfY1UYx*+msp{g!w0HC<_SM!VL1(I2PE?CS}r(eh?{I)mQixmo5^p#
zV?2R!R@3GV6hwTCrfHiK#3Orj>I!GS2kYhk1S;aFBD_}u2v;0HYFq}Iz1Z(I4oca4
zxquja8$+8JW_EagDHf$a1OTk5S97umGSDaj)gH=fLs9>_=XvVj^Xj9a#gLdk=&3tl
zfmK9MNnIX9v{?%xdw7568
zNrZ|roYs(vC4pHB5RJ8>)^*OuyNC>x7ad)tB_}3SgQ96+-JT^Qi<`xi=)_=$Skwv~
zdqeT9Pa`LYvCAn&rMa2aCDV(TMI#PA5g#RtV|CWpgDYRA^|55LLN^uNh*gOU>Z=a06qJ;$C9z8;n-Pq=qZnc1zUwJ@t)L;&NN+E5m
zRkQ(SeM8=l-aoAKGKD>!@?mWTW&~)uF2PYUJ;tB^my`r9n|Ly~0c%diYzqs9W#FTjy?h&X3TnH
zXqA{QI82sdjPO->f=^K^f>N`+B`q9&rN0bOXO79S&a9XX8zund(kW7O76f4dcWhIu
zER`XSMSFbSL>b;Rp#`CuGJ&p$s~G|76){d?xSA5wVg##_O0DrmyEYppyBr%fyWbbv
zp`K84JwRNP$d-pJ!Qk|(RMr?*!wi1if-9G#0p>>1QXKXWFy)eB3ai)l3601q8!9JC
zvU#ZWWDNKq9g6fYs?JQ)Q4C_cgTy3FhgKb8s&m)DdmL5zhNK#8wWg!J*7G7Qhe9VU
zha?^AQTDpYcuN!B+#1dE*X{<#!M%zfUQbj=zLE{dW0XeQ7-oIsGY6RbkP2re@Q{}r_$iiH0xU%iN*ST`A)-EH6eaZB$GA#v)cLi
z*MpA(3bYk$oBDKAzu^kJoSUsDd|856DApz={3u8sbQV@JnRkp2nC|)m;#T=DvIL-O
zI4vh;g7824l}*`_p@MT4+d`JZ2%6NQh=N9bmgJ#q!hK@_<`HQq3}Z8Ij>3%~<*=
zcv=!oT#5xmeGI92lqm9sGVE%#X$ls;St|F#u!?5Y7syhx6q#MVRa&lBmmn%$C0QzU
z);*ldgwwCmzM3uglr}!Z2G+?&
zf%Dpo&mD%2ZcNFiN-Z0f;c_Q;A%f@>26f?{d1kxIJD}LxsQkB47SAdwinfMILZdN3
zfj^HmTzS3Ku5BxY>ANutS8WPQ-G>v4^_Qndy==P3pDm+Xc?>rUHl-4+^%Sp5atOja
z2oP}ftw-rqnb}+khR3CrRg^ibi6?QYk1*i^;kQGirQ=uB9Sd1NTfT-Rbv;hqnY4neE5H1YUrjS2m+2&@uXiAo-
zrKUX|Ohg7(6F(AoP~tj;NZlV#xsfo-5reuQHB$&EIAhyZk;bL;k9ouDmJNBAun;H&
zn;Of1z_Qj`x&M;5X;{s~iGzBQTY^kv-k{ksbE*Dl%Qf%N@hQCfY~iUw!=F-*$cpf2
z3wix|aLBV0b;W@z^%7S{>9Z^T^fLOI68_;l@+Qzaxo`nAI8emTV@rRhEKZ
z?*z_{oGdI~R*#<2{bkz$G~^Qef}$*4OYTgtL$e9q!FY7EqxJ2`zk6SQc}M(k(_MaV
zSLJnTXw&@djco1~a(vhBl^&w=$fa9{Sru>7g8SHahv$&Bl(D@(Zwxo_3r=;VH|uc5
zi1Ny)J!<(KN-EcQ(xlw%PNwK8U>4$9nVOhj(y0l9X^vP1TA>r_7WtSExIOsz`nDOP
zs}d>Vxb2Vo2e5x8p(n~Y5ggAyvib>d)6?)|E@{FIz?G3PVGLf7-;BxaP;c?7ddH$z
zA+{~k^V=bZuXafOv!RPsE1GrR3J2TH9uB=Z67gok+u`V#}BR86hB1xl}H4v`F+mRfr
zYhortD%@IGfh!JB(NUNSDh+qDz?4ztEgCz&bIG-Wg7w-ua4ChgQR_c+z8dT3<1?uX
z*G(DKy_LTl*Ea!%v!RhpCXW1WJO6F`bgS-SB;Xw9#!
z<*K}=#wVu9$`Yo|e!z-CPYH!nj7s9dEPr-E`DXUBu0n!xX~&|%#G=BeM?X@shQQMf
zMvr2!y7p_gD5-!Lnm|a@z8Of^EKboZsTMk%5VsJEm>VsJ4W7Kv{<|#4f-qDE$D-W>gWT%z-!qXnDHhOvLk=?^a1*|0j
z{pW{M0{#1VcR5;F!!fIlLVNh_Gj
zbnW(_j?0c2q$EHIi@fSMR{OUKBcLr{Y&$hrM8XhPByyZaXy|dd&{hYQRJ9@Fn%h3p7*VQolBIV@Eq`=y%5BU~3RPa^$a?ixp^cCg
z+}Q*X+CW9~TL29@OOng(#OAOd!)e$d%sr}^KBJ-?-X&|4HTmtemxmp?cT3uA?md4%
zT8yZ0U;6Rg6JHy3fJae{6TMGS?ZUX6+gGTT{Q{)SI85$5FD{g-eR%O0KMpWPY`4@O
zx!hen1*8^E(*}{m^V_?}(b5k3hYo=T+$&M32+B`}81~KKZhY;2H{7O-M@vbCzuX0n
zW-&HXeyr1%I3$@ns-V1~Lb@wIpkmx|8I~ob1Of7i6BTNysEwI}=!nU%q7(V_^+d*G
z7G;07m(CRTJup!`cdYi93r^+LY+`M*>aMuHJm(A8_O8C#A*$!Xvddgpjx5)?_EB*q
zgE8o5O>e~9IiSC@WtZpF{4Bj2J5eZ>uUzY%TgWF7wdDE!fSQIAWCP)V{;HsU3ap?4
znRsiiDbtN7i9hapO;(|Ew>Ip2TZSvK9Z^N21%J?OiA_&eP1{(Pu_=%JjKy|HOardq
ze?zK^K
zA%sjF64*Wufad%H<)
z^|t>e*h+Z1#l=5wHexzt9HNDNXgM=-OPWKd^5p!~%SIl>Fo&7BvNpbf8{NXmH)o{r
zO=aBJ;meX1^{O%q;kqdw*5k!Y7%t_30
zy{nGRVc&5qt?dBwLs+^Sfp;f`YVMSB#C>z^a9@fpZ!xb|b-JEz1LBX7ci)V@W+kvQ89KWA0T~Lj$aCcfW#nD5bt&Y_<
z-q{4ZXDqVg?|0o)j1%l0^_it0WF*LCn-+)c!2y5yS7aZIN$>0LqNnkujV*YVes(v$
zY@_-!Q;!ZyJ}Bg|G-~w@or&u0RO?vlt5*9~yeoPV_UWrO2J54b4#{D(D>jF(R88u2
zo#B^@iF_%S>{iXSol8jpmsZuJ?+;epg>k=$d`?GSegAVp3n$`GVDvK${N*#L_1`44
z{w0fL{2%)0|E+qgZtjX}itZz^KJt4Y;*8uSK}Ft38+3>j|K(PxIXXR-t4VopXo#9#
zt|F{LWr-?34y`$nLBVV_*UEgA6AUI65dYIbqpNq9cl&uLJ0~L}<=ESlOm?Y-S@L*d
z<7vt}`)TW#f%Rp$Q}6@3=j$7Tze@_uZO@aMn<|si{?S}~maII`VTjs&?}jQ4_cut9$)PEqMukwoXobzaKx^MV
z2fQwl+;LSZ$qy%Tys0oo^K=jOw$!YwCv^ei4NBVauL)tN%=wz9M{uf{IB(BxK|lT*pFkmNK_1tV`nb%jH=a0~VNq2RCKY(rG7jz!-D^k)Ec)yS%17pE#o6&eY+
z^qN(hQT$}5F(=4lgNQhlxj?nB4N6ntUY6(?+R#B?W3hY_a*)hnr4PA|vJ<6p`K3Z5Hy
z{{8(|ux~NLUW=!?9Qe&WXMTAkQnLXg(g=I@(VG3{HE13OaUT|DljyWXPs2FE@?`iU
z4GQlM&Q=T<4&v@Fe<+TuXiZQT3G~vZ&^POfmI1K2h6t4eD}Gk5XFGpbj1n_g*{qmD6Xy
z`6Vv|lLZtLmrnv*{Q%xxtcWVj3K4M%$bdBk_a&ar{{GWyu#ljM;dII;*jP;QH
z#+^o-A4np{@|Mz+LphTD0`FTyxYq#wY)*&Ls5o{0z9yg2K+K7ZN>j1>N&;r+Z`vI|
zDzG1LJZ+sE?m?>x{5LJx^)g&pGEpY=fQ-4}{x=ru;}FL$inHemOg%|R*ZXPodU}Kh
zFEd5#+8rGq$Y<_?k-}r5zgQ3jRV=ooHiF|@z_#D4pKVEmn5CGV(9VKCyG|sT9nc=U
zEoT67R`C->KY8Wp-fEcjjFm^;Cg(ls|*ABVHq8clBE(;~K^b+S>6uj70g?
z&{XQ5U&!Z$SO7zfP+y^8XBbiu*Cv-yJG|l-oe*!s5$@Lh_KpxYL2sx`B|V=dETN>5K+C+CU~a_3cI8{vbu$TNVdGf15*>D
zz@f{zIlorkY>TRh7mKuAlN9A0>N>SV`X)+bEHms=mfYTMWt_AJtz_h+JMmrgH?mZt
zm=lfdF`t^J*XLg7v+iS)XZROygK=CS@CvUaJo&w2W!Wb@aa?~Drtf`JV^cCMjngVZ
zv&xaIBEo8EYWuML+vxCpjjY^s1-ahXJzAV6hTw%ZIy!FjI}aJ+{rE&u#>rs)vzuxz
z+$5z=7W?zH2>Eb32dvgHYZtCAf!=OLY-pb4>Ae79rd68E2LkVPj-|jFeyqtBCCwiW
zkB@kO_(3wFq)7qwV}bA=zD!*@UhT`geq}ITo%@O(Z5Y80nEX~;0-8kO{oB6|(4fQh
z);73T!>3@{ZobPwRv*W?7m0Ml9GmJBCJd&6E?hdj9lV=
z4flNfsc(J*DyPv?RCOx!MSvk(M952PJ-G|JeVxWVjN~SNS6n-_Ge3Q;TGE;EQvZg86%wZ`MB
zSMQua(i*R8a75!6$QRO^(o7sGoomb+Y{OMy;m~Oa`;P9Yqo>?bJAhqXxLr7_3g_n>f#UVtxG!^F#1+y@os6x(sg
z^28bsQ@8rw%Gxk-stAEPRbv^}5sLe=VMbkc@Jjimqjvmd!3E7+QnL>|(^3!R}
zD-l1l7*Amu@j+PWLGHXXaFG0Ct2Q=}5YNUxEQHCAU7gA$sSC<5OGylNnQUa>>l%sM
zyu}z6i&({U@x^hln**o6r2s-(C-L50tQvz|zHTqW!ir?w&V23tuYEDJVV#5pE|OJu
z7^R!A$iM$YCe?8n67l*J-okwfZ+ZTkGvZ)tVPfR;|3gyFjF)8V
zyXXN=!*bpyRg9#~Bg1+UDYCt0
ztp4&?t1X0q>uz;ann$OrZs{5*r`(oNvw=$7O#rD|Wuv*wIi)4b
zGtq4%BX+kkagv3F9Id6~-c+1&?zny%w5j&nk9SQfo0k4LhdSU_kWGW7axkfpgR`8*
z!?UTG*Zi_baA1^0eda8S|@&F
z{)Rad0kiLjB|=}XFJhD(S3ssKlveFFmkN{Vl^_nb!o5M!RC=m)V&v2%e?ZoRC@h3>
zJ(?pvToFd`*Zc@HFPL#=otWKwtuuQ_dT-Hr{S%pQX<6dqVJ8;f(o)4~VM_kEQkMR+
zs1SCVi~k>M`u1u2xc}>#D!V&6nOOh-E$O&SzYrjJdZpaDv1!R-QGA141WjQe2s0J~
zQ;AXG)F+K#K8_5HVqRoRM%^EduqOnS(j2)|ctA6Q^=|s_WJYU;Z%5bHp08HPL`YF2
zR)Ad1z{zh`=sDs^&V}J
z%$Z$!jd7BY5AkT?j`eqMs%!Gm@T8)4w3GYEX~IwgE~`d|@T{WYHkudy(47brgHXx&
zBL1yFG6!!!VOSmDxBpefy2{L_u5yTwja&HA!mYA#wg#bc-m%~8aRR|~AvMnind@zs
zy>wkShe5&*un^zvSOdlVu%kHsEo>@puMQ`b1}(|)l~E{5)f7gC=E$fP(FC2=F<^|A
zxeIm?{EE!3sO!Gr7e{w)Dx(uU#3WrFZ>ibmKSQ1tY?*-Nh1TDHLe+k*;{Rp!Bmd_m
zb#^kh`Y*8l|9Cz2e{;RL%_lg{#^Ar+NH|3z*Zye>!alpt{z;4dFAw^^H!6ING*EFc
z_yqhr8d!;%nHX9AKhFQZBGrSzfzYCi%C!(Q5*~hX>)0N`vbhZ@N|i;_972WSx*>LH
z87?en(;2_`{_JHF`Sv6Wlps;dCcj+8IJ8ca6`DsOQCMb3n#
z3)_w%FuJ3>fjeOOtWyq)ag|PmgQbC-s}KRHG~enBcIwqIiGW8R8jFeBNY9|YswRY5
zjGUxdGgUD26wOpwM#8a!Nuqg68*dG@VM~SbOroL_On0N6QdT9?)NeB3@0FCC?Z|E0
z6TPZj(AsPtwCw>*{eDEE}Gby>0q{*lI+g2e&(YQrsY&uGM{O~}(oM@YWmb*F
zA0^rr5~UD^qmNljq$F#ARXRZ1igP`MQx4aS6*MS;Ot(1L5jF2NJ;de!NujUYg$dr#
z=TEL_zTj2@>ZZN(NYCeVX2==~=aT)R30gETO{G&GM4XN<+!&W&(WcDP%oL8PyIVUC
zs5AvMgh6qr-2?^unB@mXK*Dbil^y-GTC+>&N5HkzXtozVf93m~xOUHn8`HpX=$_v2
z61H;Z1qK9o;>->tb8y%#4H)765W4E>TQ1o0PFj)uTOPEvv&}%(_mG0ISmyhnQV33Z$#&yd{
zc{>8V8XK$3u8}04CmAQ#I@XvtmB*s4t8va?-IY4@CN>;)mLb_4!&P3XSw4pA_NzDb
zORn!blT-aHk1%Jpi>T~oGLuh{DB)JIGZ9KOsciWs2N7mM1JWM+lna4vkDL?Q)z_Ct
z`!mi0jtr+4*L&N7jk&LodVO#6?_qRGVaucqVB8*us6i3BTa^^EI0x%EREQSXV@f!lak6Wf1cNZ8>*artIJ(ADO*=<-an`3zB4d*oO*8D1K!f
z*A@P1bZCNtU=p!742MrAj%&5v%Xp_dSX@4YCw%F|%Dk=u|1BOmo)HsVz)nD5USa
zR~??e61sO(;PR)iaxK{M%QM_rIua9C^4ppVS$qCT9j2%?*em?`4Z;4@>I(c%M&#cH
z>4}*;ej<4cKkbCAjjDsyKS8rIm90O)Jjgyxj5^venBx&7B!xLmzxW3jhj7sR(^3Fz
z84EY|p1NauwXUr;FfZjdaAfh%ivyp+^!jBjJuAaKa!yCq=?T_)R!>16?{~p)FQ3LDoMyG%hL#pR!f@P%*;#90rs_y
z@9}@r1BmM-SJ#DeuqCQk=J?ixDSwL*wh|G#us;dd{H}3*-Y7Tv5m=bQJMcH+_S`zVtf;!0kt*(zwJ
zs+kedTm!A}cMiM!qv(c$o5K%}Yd0|nOd0iLjus&;s0Acvoi-PFrWm?+q9f^FslxGi
z6ywB`QpL$rJzWDg(4)C4+!2cLE}UPCTBLa*_=c#*$b2PWrRN46$y~yST3a2$7hEH=
zNjux+wna^AzQ=KEa_5#9Ph=G1{S0#hh1L3hQ`@HrVnCx{!fw_a0N5xV(iPdKZ-HOM
za)LdgK}1ww*C_>V7hbQnTzjURJL`S%`6nTHcgS+dB6b_;PY1FsrdE8(2K6FN>37!62j_cBlui{jO^$dPkGHV>pXvW0EiOA
zqW`YaSUBWg_v^Y5tPJfWLcLpsA8T
zG)!x>pKMpt!lv3&KV!-um=
zKCir6`bEL_LCFx4Z5bAFXW$g3Cq`?Q%)3q0r852XI*Der*JNuKUZ`C{cCuu8R8nkt
z%pnF>R$uY8L+D!V{s^9>IC+bmt<05h**>49R*#vpM*4i0qRB2uPbg8{{s#9yC;Z18
zD7|4m<9qneQ84uX|J&f-g8a|nFKFt34@Bt{CU`v(SYbbn95Q67*)_Esl_;v291s=9
z+#2F2apZU4Tq=x+?V}CjwD(P=U~d<=mfEFuyPB`Ey82V9G#Sk8H_Ob_RnP3s?)S_3
zr%}Pb?;lt_)Nf>@zX~D~TBr;-LS<1I##8z`;0ZCvI_QbXNh8Iv)$LS=*gHr;}dgb=w5$3k2la1keIm|=7<-JD>)U%=Avl0Vj@+&vxn
zt-)`vJxJr88D&!}2^{GPXc^nmRf#}nb$4MMkBA21GzB`-Or`-3lq^O^svO7Vs~FdM
zv`NvzyG+0T!P8l_&8gH|pzE{N(gv_tgDU7SWeiI-iHC#0Ai%Ixn4&nt{5y3(GQs)i
z&uA;~_0shP$0Wh0VooIeyC|lak__#KVJfxa7*mYmZ22@(<^W}FdKjd*U1CqSjNKW%
z*z$5$=t^+;Ui=MoDW~A7;)Mj%ibX1_p4gu>RC}Z_pl`U*{_z@+HN?AF{_W
z?M_X@o%w8fgFIJ$fIzBeK=v#*`mtY$HC3tqw7q^GCT!P$I%=2N4FY7j9nG8aIm$c9
zeKTxVKN!UJ{#W)zxW|Q^K!3s;(*7Gbn;e@pQBCDS(I|Y0euK#dSQ_W^)sv5pa%<^o
zyu}3d?Lx`)3-n5Sy9r#`I{+t6x%I%G(iewGbvor&I^{lhu-!#}*Q3^itvY(^UWXgvthH52zLy&T+B)Pw;5>4D6>74
zO_EBS)>l!zLTVkX@NDqyN2cXTwsUVao7$HcqV2%t$YzdAC&T)dwzExa3*kt9d(}al
zA~M}=%2NVNUjZiO7c>04YH)sRelXJYpWSn^aC$|Ji|E13a^-v2MB!Nc*b+=KY7MCm
zqIteKfNkONq}uM;PB?vvgQvfKLPMB8u5+Am=d#>g+o&Ysb>dX9EC8q?D$pJH!MTAqa=DS5$cb+;hEvjwVfF{4;M{5U&^_+r
zvZdu_rildI!*|*A$TzJ&apQWV@p{!W`=?t(o0{?9y&vM)V)ycGSlI3`;ps(vf2PUq
zX745#`cmT*ra7XECC0gKkpu2eyhFEUb?;4@X7weEnLjXj_F~?OzL1U1L0|s6M+kIhmi%`n5vvDALMagi4`wMc=JV{XiO+^
z?s9i7;GgrRW{Mx)d7rj)?(;|b-`iBNPqdwtt%32se@?w4<^KU&585_kZ=`Wy^oLu9
z?DQAh5z%q;UkP48jgMFHTf#mj?#z|=w=
z(q6~17Vn}P)J3M?O)x))%a5+>TFW3No~TgP;f}K$#icBh;rSS+R|}l鯊%1Et
zwk~hMkhq;MOw^Q5`7oC{CUUyTw9x>^%*FHx^qJw(LB+E0WBX@{Ghw;)6aA-KyYg8p
z7XDveQOpEr;B4je@2~usI5BlFadedX^ma{b{ypd|RNYqo#~d*mj&y`^iojR}s%~vF
z(H!u`yx68D1Tj(3(m;Q+Ma}s2n#;O~bcB1`lYk%Irx60&-nWIUBr2x&@}@76+*zJ5
ze&4?q8?m%L9c6h=J$WBzbiTf1Z-0Eb5$IZs>lvm$>1n_Mezp*qw_pr8<8$6f)5f<@
zyV#tzMCs51nTv_5ca`x`yfE5YA^*%O_H?;tWYdM_kHPubA%vy47i=9>Bq)
zRQ&0UwLQHeswmB1yP)+BiR;S+Vc-5TX84KUA;8VY9}yEj0eESSO`7HQ4lO
z4(CyA8y1G7_C;6kd4U3K-aNOK!sHE}KL_-^EDl(vB42P$2Km7$WGqNy=%fqB+
zSLdrlcbEH=T@W8V4(TgoXZ*G1_aq$K^@ek=TVhoKRjw;HyI&coln|uRr5mMOy2GXP
zwr*F^Y|!Sjr2YQXX(Fp^*`Wk905K%$bd03R4(igl0&7IIm*#f`A!DCarW9$h$z`kYk9MjjqN&5-DsH@8xh63!fTNPxWsFQhNv
z#|3RjnP$Thdb#Ys7M+v|>AHm0BVTw)EH}>x@_f4zca&3tXJhTZ8pO}aN?(dHo)44Z
z_5j+YP=jMlFqwvf3lq!57-SAuRV2_gJ*wsR_!Y4Z(trO}0wmB9%f#jNDHPdQGHFR;
zZXzS-$`;7DQ5vF~oSgP3bNV$6Z(rwo6W(U07b1n3UHqml>{=6&-4PALATsH@Bh^W?
z)ob%oAPaiw{?9HfMzpGb)@Kys^J$CN{uf*HX?)z=g`J(uK1YO^8~s1(ZIbG%Et(|q
z$D@_QqltVZu9Py4R0Ld8!U|#`5~^M=b>fnHthzKBRr=i+w@0Vr^l|W;=zFT#PJ?*a
zbC}G#It}rQP^Ait^W&aa6B;+0gNvz4cWUMzpv(1gvfw-X4xJ2Sv;mt;zb2Tsn|kSS
zo*U9N?I{=-;a-OybL4r;PolCfiaL=y@o9{%`>+&FI#D^uy#>)R@b^1ue&AKKwuI*`
zx%+6r48EIX6nF4o;>)zhV_8(IEX})NGU6Vs(yslrx{5fII}o3SMHW7wGtK9oIO4OM&@@ECtXSICLcPXoS|{;=_yj>hh*%hP27yZwOmj4&Lh
z*Nd@OMkd!aKReoqNOkp5cW*lC)&C$P?+H3*%8)6HcpBg&IhGP^77XPZpc%WKYLX$T
zsSQ$|ntaVVOoRat$6lvZO(G-QM5s#N4j*|N_;8cc2v_k4n6zx9c1L4JL*83F-C1Cn
zaJhd;>rHXB%%ZN=3_o3&Qd2YOxrK~&?1=UuN9QhL$~OY-Qyg&})#ez*8NpQW_*a&kD&ANjedxT0Ar
z<6r{eaVz3`d~+N~vkMaV8{F?RBVemN(jD@S8qO~L{rUw#=2a$V(7rLE+kGUZ<%pdr
z?$DP|Vg#gZ9S}w((O2NbxzQ^zTot=89!0^~hE{|c9q1hVzv0?YC5s42Yx($;hAp*E
zyoGuRyphQY{Q2ee0Xx`1&lv(l-SeC$NEyS~8iil3_aNlnqF_G|;zt#F%1;J)jnPT&
z@iU0S;wHJ2$f!juqEzPZeZkjcQ+Pa@eERSLKsWf=`{R@yv7AuRh&ALRTAy
z8=g&nxsSJCe!QLchJ=}6|LshnXIK)SNd
zRkJNiqHwKK{SO;N5m5wdL&qK`v|d?5<4!(FAsDxR>Ky#0#t$8XCMptvNo?|SY?d8b
z`*8dVBlXTUanlh6n)!EHf2&PDG8sXNAt6~u-_1EjPI1|<=33T8
zEnA00E!`4Ave0d&VVh0e>)Dc}=FfAFxpsC1u9ATfQ`-Cu;mhc8Z>2;uyXtqpLb7(P
zd2F9<3cXS}
znMg?{&8_YFTGRQZEPU-XPq55%51}RJpw@LO_|)CFAt62-_!u_Uq$csc+7|3+TV_!h
z+2a7Yh^5AA{q^m|=KSJL+w-EWDBc&I_I1vOr^}P8i?cKMhGy$CP0XKrQzCheG$}G#
zuglf8*PAFO8%xop7KSwI8||liTaQ9NCAFarr~psQt)g*pC@9bORZ>m`_GA`_K@~&%
zijH0z;T$fd;-Liw8%EKZas>BH8nYTqsK7F;>>@YsE=Rqo?_8}UO-S#|6~CAW0Oz1}
z3F(1=+#wrBJh4H)9jTQ_$~@#9|Bc1Pd3rAIA_&vOpvvbgDJOM(yNPhJJq2%PCcMaI
zrbe~toYzvkZYQ{ea(Wiyu#4WB#RRN%bMe=SOk!CbJZv^m?Flo5p{W8|0i3`hI3Np#
zvCZqY%o258CI=SGb+A3yJe~JH^i{uU`#U#fvSC~rWTq+K`E%J@
zasU07&pB6A4w3b?d?q}2=0rA#SA7D`X+zg@&zm^iA*HVi
z009#PUH<%lk4z~p^l0S{lCJk1Uxi=F4e_DwlfHA`X`rv(|JqWKAA5nH+u4Da+E_p+
zVmH@lg^n4ixs~*@gm_dgQ&eDmE1mnw5wBz9Yg?QdZwF|an67Xd*x!He)Gc8&2!urh
z4_uXzbYz-aX)X1>&iUjGp;P1u8&7TID0bTH-jCL&Xk8b&;;6p2op_=y^m@Nq*0{#o!!A;wNAFG@0%Z9rHo
zcJs?Th>Ny6+hI`+1XoU*ED$Yf@9f91m9Y=#N(HJP^Y@ZEYR6I?oM{>&Wq4|v0IB(p
zqX#Z<_3X(&{H+{3Tr|sFy}~=bv+l=P;|sBz$wk-n^R`G3p0(p>p=5ahpaD7>r|>pm
zv;V`_IR@tvZreIuv2EM7ZQHhO+qUgw#kOs%*ekY^n|=1#x9&c;Ro&I~{rG-#_3ZB1
z?|9}IFdbP}^DneP*T-JaoYHt~r@EfvnPE5EKUwIxjPbsr$%
zfWW83pgWST7*B(o=kmo)74$8UU)v0{@4DI+ci&%=#90}!CZz|rnH+Mz=HN~97G3~@
z;v5(9_2%eca(9iu@J@aqaMS6*$TMw!S>H(b
z4(*B!|H|8&EuB%mITr~O?vVEf%(Gr)6E=>H~1VR
z&1YOXluJSG1!?TnT)_*YmJ*o_Q@om~(GdrhI{$Fsx_zrkupc#y{DK1WOUR>tk>ZE)
ziOLoBkhZZ?0Uf}cm>GsA>Rd6V8@JF)J*EQlQ<=JD@m<)hyElXR0`pTku*3MU`HJn|
zIf7$)RlK^pW-$87U;431;Ye4Ie+l~_B3*bH1>*yKzn23cH0u(i5pXV!
z4K?{3oF7ZavmmtTq((wtml)m6i)8X6ot_mrE-QJCW}Yn!(3~aUHYG=^fA<^~`e3yc
z-NWTb{gR;DOUcK#zPbN^D*e=2eR^_!(!RKkiwMW@@yYtEoOp4XjOGgzi`;=8
zi3`Ccw1%L*y(FDj=C7Ro-V?q)-%p?Ob2ZElu`eZ99n14-ZkEV#y5C+{Pq87Gu3&>g
zFy~Wk7^6v*)4pF3@F@rE__k3ikx(hzN3@e*^0=KNA6|jC^B5nf(XaoQaZN?Xi}Rn3
z$8&m*KmWvPaUQ(V<#J+S&zO|8P-#!f%7G+n_%sXp9=J%Z4&9OkWXeuZN}ssgQ#Tcj
z8p6ErJQJWZ+fXLCco=RN8D{W%+*kko*2-LEb))xcHwNl~Xmir>kmAxW?eW50Osw3#
zki8Fl$#fvw*7rqd?%E?}ZX4`c5-R&w!Y0#EBbelVXSng+kUfeUiqofPehl}$ormli
zg%r)}?%=?_pHb9`Cq9Z|B`L8b>(!+8HSX?`5+5mm81AFXfnAt1*R3F
z%b2RPIacKAddx%JfQ8l{3U|vK@W7KB$CdLqn@wP^?azRks@x8z59#$Q*7q!KilY-P
zHUbs(IFYRGG1{~@RF;Lqyho$~7^hNC`NL3kn^Td%A7dRgr_&`2k=t+}D-o9&C!y^?
z6MsQ=tc3g0xkK(O%DzR9nbNB(r@L;1zQrs8mzx&4dz}?3KNYozOW5;=w18U6$G4U2
z#2^qRLT*Mo4bV1Oeo1PKQ2WQS2Y-hv&S|C7`xh6=Pj7MNLC5K-zokZ67S)C;(F0Dd
zloDK2_o1$Fmza>EMj3X9je7e%Q`$39Dk~GoOj89-6q9|_WJlSl!!+*{R=tGp
z8u|MuSwm^t7K^nUe+^0G3dkGZr3@(X+TL5eah)K^Tn
zXEtHmR9UIaEYgD5Nhh(s*fcG_lh-mfy5iUF3xxpRZ0q3nZ=1qAtUa?(LnT9I&~uxX
z`pV?+=|-Gl(kz?w!zIieXT}o}7@`QO>;u$Z!QB${a08_bW0_o@&9cjJUXzVyNGCm8
zm=W+$H!;_Kzp6WQqxUI;JlPY&`V}9C$8HZ^m?NvI*JT@~BM=()T()Ii#+*$y@lTZBkmMMda>7s#O(1YZR+zTG@&}!EXFG{
zEWPSDI5bFi;NT>Yj*FjH((=oe%t%xYmE~AGaOc4#9K_XsVpl<4SP@E!TgC0qpe1oi
zNpxU2b0(lEMcoibQ-G^cxO?ySVW26HoBNa;n0}CWL*{k)oBu1>F18X061$SP{Gu67
z-v-Fa=Fl^u3lnGY^o5v)Bux}bNZ~
z5pL+7F_Esoun8^5>z8NFoIdb$sNS&xT8_|`GTe8zSXQzs4r^g0kZjg(b0bJvz`g<70u9Z3fQILX1Lj@;@+##bP|FAOl)U^9U>0rx
zGi)M1(Hce)LAvQO-pW!MN$;#ZMX?VE(22lTlJrk#pB0FJNqVwC+*%${Gt#r_tH9I_
z;+#)#8cWAl?d@R+O+}@1A^hAR1s3UcW{G+>;X4utD2d9X(jF555}!TVN-hByV6t+A
zdFR^aE@GNNgSxxixS2p=on4(+*+f<8xrwAObC)D5)4!z7)}mTpb7&ofF3u&9&wPS<
zB62WHLGMhmrmOAgmJ+|c>qEWTD#jd~lHNgT0?t-p{T=~#EMcB|
z=AoDKOL+qXCfk~F)-Rv**V}}gWFl>liXOl7Uec_8v)(S#av99PX1sQIVZ9eNLkhq$
zt|qu0b?GW_uo}TbU8!jYn8iJeIP)r@;!Ze_7mj{AUV$GEz6bDSDO=D!&C9!M@*S2!
zfGyA|EPlXGMjkH6x7OMF?gKL7{GvGfED=Jte^p=91FpCu)#{whAMw`vSLa`K#atdN
zThnL+7!ZNmP{rc=Z>%$meH;Qi1=m1E3Lq2D_O1-X5C;!I0L>zur@tPAC9*7Jeh)`;eec}1`nkRP(%iv-`N
zZ@ip-g|7l6Hz%j%gcAM}6-nrC8oA$BkOTz^?dakvX?`^=ZkYh%vUE
z9+&)K1UTK=ahYiaNn&G5nHUY5niLGus@p5E2@RwZufRvF{@$hW{;{3QhjvEHMvduO
z#Wf-@oYU4ht?#uP{N3utVzV49mEc9>*TV_W2TVC`6+oI)zAjy$KJrr=*q##&kobiQ
z1vNbya&OVjK`2pdRrM?LuK6BgrLN7H_3m
z!qpNKg~87XgCwb#I=Q&0rI*l$wM!qTkXrx1ko5q-f;=R2fImRMwt5Qs{P*p^z@9ex
z`2#v(qE&F%MXlHpdO#QEZyZftn4f05ab^f2vjxuFaat2}jke{j?5GrF=WYBR?gS(^
z9SBiNi}anzBDBRc+QqizTTQuJrzm^bNA~A{j%ugXP7McZqJ}65l10({wk++$=e8O{
zxWjG!Qp#5OmI#XRQQM?n6?1ztl6^D40hDJr?4$Wc&O_{*OfMfxe)V0=e{|N?J#fgE>j9jAajze$iN!*yeF%jJU#G1c@@rm
zolGW!j?W6Q8pP=lkctNFdfgUMg92wlM4E$aks1??M$~WQfzzzXtS)wKrr2sJeCN4X
zY(X^H_c^PzfcO8Bq(Q*p4c_v@F$Y8cHLrH$`pJ2}=#*8%JYdqsqnGqEdBQMpl!Ot04tUGSXTQdsX&GDtjbWD=prcCT9(+
z&UM%lW%Q3yrl1yiYs;LxzIy>2G}EPY6|sBhL&X&RAQrSAV4Tlh2nITR?{6xO9ujGu
zr*)^E`>o!c=gT*_@6S&>0POxcXYNQd&HMw6<|#{eSute2C3{&h?Ah|cw56-AP^f8l
zT^kvZY$YiH8j)sk7_=;gx)vx-PW`hbSBXJGCTkpt;ap(}G2GY=2bbjABU5)ty%G#x
zAi07{Bjhv}>OD#5zh#$0w;-vvC@^}F!
z#X$@)zIs1L^E;2xDAwEjaXhTBw2<{&JkF*`;c3<1U@A4MaLPe{M5DGGkL}#{cHL%*
zYMG+-Fm0#qzPL#V)TvQVI|?_M>=zVJr9>(6ib*#z8q@mYKXDP`k&A4A};xMK0h=yrMp~JW{L?mE~ph&1Y1a#4%SO)@{
zK2juwynUOC)U*hVlJU17%llUxAJFuKZh3K0gU`aP)pc~bE~mM!i1mi!~LTf>1Wp<
zuG+ahp^gH8g8-M$u{HUWh0m^9Rg@cQ{&DAO{PTMudV6c?ka7+AO&
z746QylZ&Oj`1aqfu?l&zGtJnpEQOt;OAFq19MXTcI~`ZcoZmyMrIKDFRIDi`FH)w;
z8+*8tdevMDv*VtQi|e}CnB_JWs>fhLOH-+Os2Lh!&)Oh2utl{*AwR)QVLS49iTp{6
z;|172Jl!Ml17unF+pd+Ff@jIE-{Oxv)5|pOm@CkHW?{l}b@1>Pe!l}VccX#xp@xgJ
zyE<&ep$=*vT=}7vtvif0B?9xw_3Gej7mN*dOHdQPtW5kA5_zGD
zpA4tV2*0E^OUimSsV#?Tg#oiQ>%4D@1F5@AHwT8Kgen$bSMHD3sXCkq8^(uo7CWk`mT
zuslYq`6Yz;L%wJh$3l1%SZv#QnG3=NZ=BK4yzk#HAPbqXa92;3K5?0kn4TQ`%E%X}
z&>Lbt!!QclYKd6+J7Nl@xv!uD%)*bY-;p`y^ZCC<%LEHUi$l5biu!sT3TGGSTPA21
zT8@B&a0lJHVn1I$I3I1I{W9fJAYc+8
zVj8>HvD}&O`TqU2AAb={?eT;0hyL(R{|h23=4fDSZKC32;wWxsVj`P
z3J3{M$PwdH!ro*Cn!D&=jnFR>BNGR<<|I8CI@+@658Dy(lhqbhXfPTVecY@L8%`3Q
z1Fux2w?2C3th60jI~%OC9BtpNF$QPqcG+Pz96qZJ71_`0o0w_q7|h&O>`6U+^BA&5
zXd5Zp1Xkw~>M%RixTm&OqpNl8Q+ue=92Op_>T~_9UON?ZM2c0aGm=^A4ejrXj3dV9
zhh_bCt-b9`uOX#cFLj!vhZ#lS8Tc47OH>*)y#{O9?AT~KR9LntM|#l#Dlm^8{nZdk
zjMl#>ZM%#^nK2TPzLcKxqx24P7R1FPlBy7LSBrRvx>fE$9AJ;7{PQm~^LBX^k#6Zq
zw*Z(zJC|`!6_)EFR}8|n8&&Rbj8y028~P~sFXBFRt+tmqH-S3<%N;C&WGH!f3{7cm
zy_fCAb9@HqaXa1Y5vFbxWf%#zg6SI$C+Uz5=CTO}e|2fjWkZ;Dx|84Ow~bkI=LW+U
zuq;KSv9VMboRvs9)}2PAO|b(JCEC_A0wq{uEj|3x@}*=bOd
zwr{TgeCGG>HT<@Zeq8y}vTpwDg#UBvD)BEs@1KP$^3$sh&_joQPn{hjBXmLPJ{tC)
z*HS`*2+VtJO{|e$mM^|qv1R*8i(m1`%)}g=SU#T#0KlTM2RSvYUc1fP+va|4;5}Bfz98UvDCpq7}+SMV&;nX
zQw~N6qOX{P55{#LQkrZk(e5YGzr|(B;Q;ju;2a`q+S9bsEH@i1{_Y0;hWYn1-79jl
z5c&bytD*k)GqrVcHn6t-7kinadiD>B{Tl`ZY@`g|b~pvHh5!gKP4({rp?D0aFd_cN
zhHRo4dd5^S6ViN(>(28qZT6E>??aRhc($kP`>@<+lIKS5HdhjVU;>f7<4))E*5|g{
z&d1}D|vpuV^eRj5j|xx9nwaCxXFG?Qbjn~_WSy=N}P0W>MP
zG-F%70lX5Xr$a)2i6?i|iMyM|;Jtf*hO?=Jxj12oz&>P=1#h~lf%#fc73M2_(SUM-
zf&qnjS80|_Y0lDgl&I?*eMumUklLe_=Td!9G@eR*tcPOgIShJipp3{A10u(4eT~DY
zHezEj8V+7m!knn7)W!-5QI3=IvC^as5+TW1@Ern@yX|
z7Nn~xVx&fGSr+L%4iohtS3w^{-H1A_5=r&x8}R!YZvp<2T^YFvj8G_vm}5q;^UOJf
ztl=X3iL;;^^a#`t{Ae-%5Oq{?M#s6Npj+L(n-*LMI-yMR{)qki!~{5z{&`-iL}lgW
zxo+tnvICK=lImjV$Z|O_cYj_PlEYCzu-XBz&XC-JVxUh9;6*z4fuBG+H{voCC;`~GYV|hj%j_&I
zDZCj>Q_0RCwFauYoVMiUSB+*Mx`tg)bWmM^SwMA+?lBg12QUF_x2b)b?qb88K-YUd
z0dO}3k#QirBV<5%jL$#wlf!60dizu;tsp(7XLdI=eQs?P`tOZYMjVq&jE)qK*6B^$
zBe>VvH5TO>s>izhwJJ$<`a8fakTL!yM^Zfr2hV9`f}}VVUXK39p@G|xYRz{fTI+Yq
z20d=)iwjuG9RB$%$^&8#(c0_j0t_C~^|n+c`Apu|x7~;#cS-s=X1|C*YxX3ailhg_|0`g!E&GZJEr?bh#Tpb8siR=JxWKc{#w7g
zWznLwi;zLFmM1g8V5-P#RsM@iX>TK$xsWuujcsVR^7TQ@!+vCD<>Bk9tdCo7Mzgq5
zv8d>dK9x8C@Qoh01u@3h0X_`SZluTb@5o;{4{{eF!-4405x8X7hewZWpz
z2qEi4UTiXTvsa(0X7kQH{3VMF>W|6;6iTrrYD2fMggFA&-CBEfSqPlQDxqsa>{e2M
z(R5PJ7uOooFc|9GU0ELA%m4&4Ja#cQpNw8i8ACAoK6?-px+oBl_yKmenZut#Xumjz
zk8p^OV2KY&?5MUwGrBOo?ki`Sxo#?-Q4gw*Sh0k`@
zFTaYK2;}%Zk-68`#5DXU$2#=%YL#S&MTN8bF+!J2VT6x^XBci6O)Q#JfW{YMz)
zOBM>t2rSj)n#0a3cjvu}r|k3od6W(SN}V-cL?bi*Iz-8uOcCcsX0L>ZXjLqk
zZu2uHq5B|Kt>e+=pPKu=1P@1r9WLgYFq_TNV1p9pu0erHGd!+bBp!qGi+~4A(RsYN@CyXNrC&hxGmW)u5m35OmWwX`I+0yByglO`}HC4nGE^_HUs^&A(uaM
zKPj^=qI{&ayOq#z=p&pnx@@k&I1JI>cttJcu@Ihljt?6p^6{|ds`0MoQwp+I{3l6`
zB<9S((RpLG^>=Kic`1LnhpW2=Gu!x`m~=y;A`Qk!-w`IN;S8S930#vBVMv2vCKi}u
z6<-VPrU0AnE&vzwV(CFC0gnZYcpa-l5T0ZS$P6(?9AM;`Aj~XDvt;Jua=jIgF=Fm?
zdp=M$>`phx%+Gu};;-&7T|B1AcC#L4@mW5SV_^1BRbo6;2PWe$r+npRV`yc;T1mo&
z+~_?7rA+(Um&o@Tddl
zL_hxvWk~a)yY}%j`Y+200D%9$bWHy&;(yj{jpi?Rtz{J66ANw)UyPOm;t6FzY3$hx
zcn)Ir79nhFvNa7^a{SHN7XH*|Vlsx`CddPnA&Qvh8aNhEA;mPVv;Ah=k<*u!Zq^7
z<=xs*iQTQOMMcg|(NA_auh@x`3#_LFt=)}%SQppP{E>mu_LgquAWvh<>L7tf9+~rO
znwUDS52u)OtY<~!d$;m9+87aO+&`#2ICl@Y>&F{jI=H(K+@3M1$rr=*H^dye#~TyD
z!){#Pyfn+|ugUu}G;a~!&&0aqQ59U@UT3|_JuBlYUpT$2+11;}JBJ`{+lQN9T@QFY
z5+`t;6(TS0F?OlBTE!@7D`8#URDNqx2t6`GZ{ZgXeS@v%-eJzZOHz18aS|svxII$a
zZeFjrJ*$IwX$f-Rzr_G>xbu@euGl)B7pC&S+CmDJBg$BoV~jxSO#>y
z33`bupN#LDoW0feZe0%q8un0rYN|eRAnwDHQ6e_)xBTbtoZtTA=Fvk){q}9Os~6mQ
zKB80VI_&6iSq`LnK7*kfHZoeX6?WE}8yjuDn=2#JG$+;-TOA1%^=DnXx%w{b=w}tS
zQbU3XxtOI8E(!%`64r2`zog;5<0b4i)xBmGP^jiDZ2%HNSxIf3@wKs~uk4%3Mxz;~
zts_S~E4>W+YwI<-*-$U8*^HKDEa8oLbmqGg?3vewnaNg%Mm)W=)lcC_J+1ov^u*N3
zXJ?!BrH-+wGYziJq2Y#vyry6Z>NPgkEk+Ke`^DvNRdb>Q2Nlr#v%O@<5hbflI6EKE
z9dWc0-ORk^T}jP!nkJ1imyjdVX@GrjOs%cpgA8-c&FH&$(4od#x6Y&=LiJZPINVyW
z0snY$8JW@>tc2}DlrD3StQmA0Twck~@>8dSix9CyQOALcREdxoM$Sw*l!}bXKq9&r
zysMWR@%OY24@e`?+#xV2bk{T^C_xSo8v2ZI=lBI*l{RciPwuE>L5@uhz@{!l)rtVlWC>)6(G)1~n=Q|S!{E9~6*fdpa*n
z!()-8EpTdj=zr_Lswi;#{TxbtH$8*G=UM`I+icz7sr_SdnHXrv=?iEOF1UL+*6O;%
zPw>t^kbW9X@oEXx<97%lBm-9?O_7L!DeD)Me#rwE54t~UBu9VZ
zl_I1tBB~>jm@bw0Aljz8!
zXBB6ATG6iByKIxs!qr%pz%wgqbg(l{65DP4#v(vqhhL{0b#0C8mq`bnqZ1OwFV
z7mlZZJFMACm>h9v^2J9+^_zc1=JjL#qM5ZHaThH&n
zXPTsR8(+)cj&>Un{6v*z?@VTLr{TmZ@-fY%*o2G}*G}#!bmqpoo*Ay@U!JI^Q@7gj;Kg-HIrLj4}#ec4~D2~X6vo;ghep-@&yOivYP
zC19L0D`jjKy1Yi-SGPAn94(768Tcf$urAf{)1)9W58P`6MA{YG%O?|07!g9(b`8PXG1B1Sh0?HQmeJtP0M$O$hI
z{5G`&9XzYhh|y@qsF1GnHN|~^ru~HVf#)lOTSrv=S@DyR$UKQk
zjdEPFDz{uHM&UM;=mG!xKvp;xAGHOBo~>_=WFTmh$chpC7c`~7?36h)7$fF~Ii}8q
zF|YXxH-Z?d+Q+27Rs3X9S&K3N+)OBxMHn1u(vlrUC6ckBY@@jl+mgr#KQUKo#VeFm
zFwNYgv0<%~Wn}KeLeD9e1$S>jhOq&(e*I@L<=I5b(?G(zpqI*WBqf|Zge0&aoDUsC
zngMRA_Kt0>La+Erl=Uv_J^p(z=!?XHpenzn$%EA`JIq#yYF?JLDMYiPfM(&Csr#f{
zdd+LJL1by?xz|D8+(fgzRs~(N1k9DSyK@LJygwaYX8dZl0W!I&c^K?7)z{2is;OkE
zd$VK-(uH#AUaZrp=1z;O*n=b?QJkxu`Xsw&7yrX0?(CX=I-C#T;yi8a<{E~?vr3W>
zQrpPqOW2M+AnZ&p{hqmHZU-;Q(7?-
zP8L|Q0RM~sB0w1w53f&Kd*y}ofx@c
z5Y6B8qGel+uT1JMot$nT1!Tim6{>oZzJXdyA+4euOLME?5Fd_85Uk%#E*ln%y{u8Q
z$|?|R@Hpb~yTVK-Yr_S#%NUy7EBfYGAg>b({J|5b+j-PBpPy$Ns`PaJin4JdRfOaS
zE|<HjH%NuJgsd2wOlv>~y=np%=2)$M9LS|>P)zJ+Fei5vYo_N~B0XCn+GM76
z)Xz3tg*FRVFgIl9zpESgdpWAavvVViGlU8|UFY{{gVJskg*I!ZjWyk~OW-Td4(mZ6
zB&SQreAAMqwp}rjy`HsG({l2&q5Y52<@AULVAu~rWI$UbFuZs>Sc*x+XI<+ez%$U)|a^unjpiW0l0
zj1!K0(b6$8LOjzRqQ~K&dfbMIE=TF}XFAi)$+h}5SD3lo
z%%Qd>p9se=VtQG{kQ;N`sI)G^u|DN#7{aoEd
zkksYP%_X$Rq08);-s6o>CGJ<}v`qs%eYf+J%DQ^2k68C%nvikRsN?$ap--f+vCS`K
z#&~)f7!N^;sdUXu54gl3L=LN>FB^tuK=y2e#|hWiWUls__n@L|>xH{%8lIJTd5`w?
zSwZbnS;W~DawT4OwSJVdAylbY+u5S+ZH{4hAi2&}Iv~W(UvHg(1GTZRPz`@{SOqzy
z(8g&Dz=$PfRV=6FgxN~zo+G8OoPI&d-thcGVR*_^(R8COTM@bq?fDwY{}WhsQS1AK
zF6R1t8!RdFmfocpJ6?9Yv~;WYi~XPgs(|>{5})j!AR!voO7y9&cMPo#80A(`za@t>cx<0;qxM@S*m(jYP)dMXr*?q0E`oL;12}VAep179uEr8c<=D
zr5?A*C{eJ`z9Ee;E$8)MECqatHkbHH
z&Y+ho0B$31MIB-xm&;xyaFCtg<{m~M-QDbY)fQ>Q*Xibb~8ytxZQ?QMf9!%cV
zU0_X1@b4d+Pg#R!`OJ~DOrQz3@cpiGy~XSKjZQQ|^4J1puvwKeScrH8o{bscBsowomu
z^f12kTvje`yEI3eEXDHJ6L+O{Jv$HVj%IKb|J{IvD*l6IG8WUgDJ*UGz
z3!C%>?=dlfSJ>4U88)V+`U-!9r^@AxJBx8R;)J4Fn@`~k>8>v0M9xp90OJElWP&R5
zM#v*vtT}*Gm1^)Bv!s72T3PB0yVIjJW)H7a)ilkAvoaH?)jjb`MP>2z{%Y?}83
zUIwBKn`-MSg)=?R)1Q0z3b>dHE^)D8LFs}6ASG1|daDly_^lOSy&zIIhm*HXm1?VS=_iacG);_I9c
zUQH1>i#*?oPIwBMJkzi_*>HoUe}_4o>2(SHWzqQ=;TyhAHS;Enr7!#8;sdlty&(>d
zl%5cjri8`2X^Ds`jnw7>A`X|bl=U8n+3LKLy(1dAu8`g@9=5iw$R0qk)w8Vh_Dt^U
zIglK}sn^)W7aB(Q>HvrX=rxB
z+*L)3DiqpQ_%~|m=44LcD4-bxO3OO*LPjsh%p(k?&jvLp0py57oMH|*IMa(<|{m1(0S|x)?R-mqJ=I;_YUZA>J
z62v*eSK;5w!h8J+6Z2~oyGdZ68waWfy09?4fU&m7%u~zi?YPHPgK6LDwphgaYu%0j
zurtw)AYOpYKgHBrkX189mlJ`q)w-f|6>IER{5Lk97%P~a-JyCRFjejW@L>n4vt6#hq;!|m;hNE||LK3nw1{bJOy+eBJjK=QqNjI;Q6;Rp5
z&035pZDUZ#%Oa;&_7x0T<7!RW`#YBOj}F380Bq?MjjEhrvlCATPdkCTTl+2efTX$k
zH&0zR1n^`C3ef~^sXzJK-)52(T}uTG%OF8yDhT76L~|^+hZ2hiSM*QA9*D5odI1>&
z9kV9jC~twA5MwyOx(lsGD_ggYmztXPD`2=_V|ks_FOx!_J8!zM
zTzh^cc+=VNZ&(OdN=y4Juw)@8-85lwf_#VMN!Ed(eQiRiLB2^2e`4dp286h@v@`O%_b)Y~A;
zv}r6U?zs&@uD_+(_4bwoy7*uozNvp?bXFoB8?l8yG0qsm1JYzIvB_OH4_2G*IIOwT
zVl%HX1562vLVcxM_RG*~w_`FbIc!(T=3>r528#%mwwMK}uEhJ()3MEby
zQQjzqjWkwfI~;Fuj(Lj=Ug0y`>~C7`w&wzjK(rPw+Hpd~EvQ-ufQOiB4OMpyUKJhw
zqEt~jle9d7S~LI~$6Z->J~QJ{Vdn3!c}g9}*KG^Kzr^(7VI5Gk(mHLL{itj_hG?&K4Ws0+T4gLfi3eu$N=`s36geNC?c
zm!~}vG6lx9Uf^5M;bWntF<-{p^bruy~f?sk9
zcETAPQZLoJ8JzMMg<-=ju4keY@SY%Wo?u9Gx=j&dfa6LIAB|IrbORLV1-H==Z1zCM
zeZcOYpm5>U2fU7V*h;%n`8
zN95QhfD994={1*<2vKLCNF)feKOGk`R#K~G=;rfq}|)s20&MCa65
zUM?xF5!&e0lF%|U!#rD@I{~OsS_?=;s_MQ_b_s=PuWdC)q|UQ&ea)DMRh5>fpQjXe
z%9#*x=7{iRCtBKT#H>#v%>77|{4_slZ)XCY{s3j_r{tdpvb#|r|sbS^dU1x70$eJMU!h{Y7Kd{dl}9&vxQl6Jt1a`
zHQZrWyY0?!vqf@u-fxU_@+}u(%Wm>0I#KP48tiAPYY!TdW(o|KtVI|EUB9V`CBBNaBLVih7+yMVF|GSoIQD0Jfb{
z!OXq;(>Z?O`1gap(L~bUcp>Lc@Jl-})^=6P%<~~9ywY=$iu8pJ0m*hOPzr~q`23eX
zgbs;VOxxENe0UMVeN*>uCn9Gk!4siN-e>x)pIKAbQz!G)TcqIJ0`JBBaX>1-4_XO_-HCS^vr2vjv#7KltDZdyQ{tlWh4$Gm
zB>|O1cBDC)yG(sbnc*@w6e%e}r*|IhpXckx&;sQCwGdKH+3oSG-2)Bf#x`@<4ETAr
z0My%7RFh6ZLiZ_;X6Mu1YmXx7C$lSZ^}1h;j`EZd6@%JNUe=btBE
z%s=Xmo1Ps?8G`}9+6>iaB8bgjUdXT?=trMu|4yLX^m0Dg{m7rpKNJey|EwHI+nN1e
zL^>qN%5Fg)dGs4DO~uwIdXImN)QJ*Jhpj7$fq_^`{3fwpztL@WBB}OwQ#Epo-mqMO
zsM$UgpFiG&d#)lzEQ{3Q;)&zTw;SzGOah-Dpm{!q7<8*)Ti_;xvV2TYXa}=faXZy?
z3y?~GY@kl)>G&EvEijk9y1S`*=zBJSB1iet>0;x1Ai)*`^{pj0JMs)KAM=@UyOGtO
z3y0BouW$N&TnwU6!%zS%nIrnANvZF&vB1~P5_d`x-giHuG
zPJ;>XkVoghm#kZXRf>qxxEix;2;D1CC~NrbO6NBX!`&_$iXwP~P*c($EVV|669kDO
zKoTLZNF4Cskh!Jz5ga9uZ`3o%7Pv`d^;a=cXI|>y;zC3rYPFLQkF*nv(r>SQvD*##
z(Vo%^9g`%XwS0t#94zPq;mYGLKu4LU3;txF26?V~A0xZbU4Lmy`)>SoQX^m7fd^*E
z+%{R4eN!rIk~K)M&UEzxp9dbY;_I^c}
zOc{wlIrN_P(PPqi51k_$>Lt|X6A^|CGYgKAmoI#Li?;Wq%q~q*L7ehZkUrMxW67Jl
zhsb~+U?33QS>eqyN{(odAkbopo=Q$Az?L+NZW>j;#~@wCDX?=L5SI|OxI~7!Pli;e
zELMFcZtJY3!|=Gr2L4>z8yQ-{To>(f80*#;6`4IAiqUw`=Pg$%C?#1
z_g@hIGerILSU>=P>z{gM|DS91A4cT@PEIB^hSop!uhMo#2G;+tQSpDO_6nOnPWSLU
zS;a9m^DFMXR4?*X=}d7l;nXuHk&0|m`NQn%d?8|Ab3A9l9Jh5s120ibWBdB
z$5YwsK3;wvp!Kn@)Qae{ef`0#NwlRpQ}k^r>yos_Ne1;xyKLO?4)t_G4eK~wkUS2A&@_;)K0-03XGBzU+5f+uMDxC
z(s8!8!RvdC#@`~fx$r)TKdLD6fWEVdEYtV#{ncT-ZMX~eI#UeQ-+H(Z43vVn%Yj9X
zLdu9>o%wnWdvzA-#d6Z~vzj-}V3FQ5;axDIZ;i(95IIU=GQ4WuU{tl-{gk!5{l4_d
zvvb&uE{%!iFwpymz{wh?bKr1*qzeZb5f6e6m_ozRF&zux2mlK=v_(_s^R6b5lu?_W4W3#<$zeG~Pd)^!4tzhs}-Sx$FJP>)ZGF(hVTH|C3(U
zs0PO&*h_
zNA-&qZpTP$$LtIgfiCn07}XDbK#HIXdmv8zdz4TY;ifNIH-0jy(gMSByG2EF~Th#eb_TueZC`
zE?3I>UTMpKQ})=C;6p!?G)M6w^u*A57bD?2X`m3X^6;&4%i_m(uGJ3Z5h`nwxM<)H
z$I5m?wN>O~8`BGnZ=y^p6;0+%_0K}Dcg|K;+fEi|qoBqvHj(M&aHGqNF48~XqhtU?
z^ogwBzRlOfpAJ+Rw7IED8lRbTdBdyEK$gPUpUG}j-M42xDj_&qEAQEtbs>D#dRd7Y
z<&TpSZ(quQDHiCFn&0xsrz~4`4tz!CdL8m~HxZM_agu@IrBpyeL1Ft}V$HX_ZqDPm
z-f89)pjuEzGdq-PRu`b1m+qBGY{zr_>{6Ss>F|xHZlJj9dt5HD$u`1*WZe)qEIuDSR)%z+|n
zatVlhQ?$w#XRS7xUrFE;Y8vMGhQS5*T{ZnY=q1P?w5g$OKJ#M&e??tAmPWHMj3xhS
ziGxapy?kn@$~2%ZY;M8Bc@%$pkl%Rvj!?o%agBvpQ-Q61n9kznC4ttrRNQ4%GFR5u
zyv%Yo9~yxQJWJSfj
z?#HY$y=O~F|2pZs22pu|_&Ajd+D(Mt!nPUG{|1nlvP`=R#kKH
zO*s$r_%ss5h1YO7k0bHJ2CXN)Yd6CHn~W!R=SqkWe=&nAZu(Q1G!xgcUilM@YVei@2@a`8he
z9@pM`)VB*=e7-MWgLlXlc)t;fF&-AwM{E-EX}pViFn0I0CNw2bNEnN2dj!^4(^zS3
zobUm1uQnpqk_4q{pl*n06=TfK_C>UgurKFjRXsK_LEn};=79`TB12tv6KzwSu*-C8
z;=~ohDLZylHQ|Mpx-?yql>|e=vI1Z!epyUpAcDCp4T|*RV&X`Q$0ogNwy6mFALo^@
z9=&(9txO8V@E!@6^(W0{*~CT>+-MA~vnJULBxCTUW>X5>r7*eXYUT0B6+w@lzw%n>
z_VjJ<2qf|(d6jYq2(x$(ZDf!yVkfnbvNmb5c|hhZ^2TV_LBz`9w!e_V*W_(MiA7|=
z&EeIIkw*+$Xd!)j8<@_<}A5;~A_>3JT*kX^@}cDoLd>Qj<`Se^wdUa(j0dp+Tl8EptwBm{9OGsdFEq
zM`!pjf(Lm(`$e3FLOjqA5LnN5o!}z{
zNf}rJuZh@yUtq&ErjHeGzX4(!luV!jB&;FAP|!R_QHYw#^Z1LwTePAKJ6X&IDNO#;
z)#I@Xnnzyij~C@UH~X51JCgQeF0&hTXnuoElz#m{heZRexWc0k4<>0+ClX7%0
zEBqCCld1tD9Zwkr4{?Nor19#E5-YKfB8d?qgR82-Ow2^AuNevly2*tHA|sK!ybYkX
zm-sLQH72P&{vEAW6+z~O5d0qd=xW~rua~5a?ymYFSD@8&gV)E5@RNNBAj^C99+Z5Z
zR@Pq55mbCQbz+Mn$d_CMW<-+?TU960agEk1J<>d>0K=pF19yN))a~4>m^G&tc*xR+yMD*S=yip-q=H
zIlredHpsJV8H(32@Zxc@bX6a21dUV95Th--8pE6C&3F>pk=yv$yd6@Haw;$v4+Fcb
zRwn{Qo@0`7aPa2LQOP}j9v>sjOo5Kqvn|`FLizX
zB+@-u4Lw|jsvz{p^>n8Vo8H2peIqJJnMN}A)q6%$Tmig7eu^}K2
zrh$X?T|ZMsoh{6pdw1G$_T<`Ds-G=jc;qcGdK4{?dN2-XxjDNbb(7pk|3JUVCU4y;
z)?LXR>f+AAu)JEiti_Zy#z5{RgsC}R(@jl%9YZ>zu~hKQ*AxbvhC378-I@{~#%Y`Z
zy=a=9YpewPIC+gkEUUwtUL7|RU7=!^Aa}Mk^6uxOgRGA#JXjWLsjFUnix|Mau{hDT
z7mn*z1m5g`vP(#tjT0Zy4eAY(br&!RiiXE=ZI!{sE1#^#%x^Z7t1U)b<;%Y}Q9=5v
z;wpDCEZ@OE36TWT=|gxigT@VaW9BvHS05;_P(#s
z8zI4XFQys}q)<`tkX$WnSarn{3e!s}4(J!=Yf>+Y>cP3f;vr63f2{|S^`_pWc)^5_!R
z*(x-fuBxL51@xe!lnDBKi}Br$c$BMZ3%f2Sa6kLabiBS{pq*yj;q|k(86x`PiC{p6
z_bxCW{>Q2BA8~Ggz&0jkrcU+-$ANBsOop*ms>34K9lNYil@}jC;?cYP(m^P}nR6FV
zk(M%48Z&%2Rx$A&FhOEirEhY0(dn;-k(qkTU)sFQ`+-ih+s@A8g?r8Pw+}2;35WYf
zi}VO`jS`p(tc)$X$a>-#WXoW!phhatC*$}|rk>|wUU71eUJG^$c6_jwX?iSHM@6__
zvV|6%U*$sSXJu9SX?2%M^kK|}a2QJ8AhF{fuXrHZxXsI~O
zGKX45!K7p*MCPEQ=gp?eu&#AW*pR{lhQR##P_*{c_DjMGL|3T3-bSJ(o$|M{ytU}>
zAV>wq*uE*qFo9KvnA^@juy{x<-u*#2NvkV={Ly}ysKYB-k`K3@K#^S1Bb$8Y#0L0#
z`6IkSG&|Z$ODy|VLS+y5pFJx&8tvPmMd8c9FhCyiU8~k6FwkakUd^(_ml8`rnl>JS
zZV){9G*)xBqPz^LDqRwyS6w86#D^~xP4($150M)SOZRe9sn=>V#aG0Iy(_^YcPpIz8QYM-#s+n%
z@Jd?xQq?Xk6=<3xSY7XYP$$yd&Spu{A#uafiIfy8gRC`o0nk{ezEDjb=q_qRAlR1d
zFq^*9Gn)yTG4b}R{!+3hWQ+u3GT~8nwl2S1lpw`s0X_qpxv)g+JIkVKl${sYf_nV~B>Em>M;RlqGb5WVil(89
zs=ld@|#;dq1*vQGz=7--Br-|l)
zZ%Xh@v8>B7P?~}?Cg$q9_={59l%m~O&*a6TKsCMAzG&vD>k2WDzJ6!tc!V)+oxF;h
zJH;apM=wO?r_+*#;ulohuP=E>^zon}a$NnlcQ{1$SO*i=jnGVcQa^>QOILc)e6;eNTI>os=eaJ{*^DE+~jc
zS}TYeOykDmJ=6O%>m`i*>&pO_S;qMySJIyP=}4E&J%#1zju$RpVAkZbEl+p%?ZP^C
z*$$2b4t%a(e+%>a>d_f_<JjxI#J1x;=hPd1zFPx=6T$;;X1TD*2(edZ3f46zaAoW>L53vS_J*N8TMB|n+;LD|
zC=GkQPpyDY#Am4l49chDv*gojhRj_?63&&8#doW`INATAo(qY#{q}%nf@eTIXmtU<
zdB<7YWfyCmBs|c)cK>1)v&M#!yNj#4d$~pVfDWQc_ke1?fw{T1Nce_b`v|Vp5ig(H
zJvRD^+ps46^hLX;=e2!2e;w9y1D@!D$c@Jc&%%%IL=+xzw55&2?darw=9g~>P
z9>?Kdc$r?6c$m%x2S$sdpPl>GQZ{rC9mPS63*qjCVa?OIBj!fW
zm|g?>CVfGXNjOfcyqImXR_(tXS(F{FcoNzKvG5R$IgGaxC@)i(e+$ME}vPVIhd|mx2IIE+f
zM?9opQHIVgBWu)^A|RzXw!^??S!x)SZOwZaJkGjc<_}2l^eSBm!eAJG9T>EC6I_sy
z?bxzDIAn&K5*mX)$RQzDA?s)-no-XF(g*yl4%+GBf`##bDXJ==AQk*xmnatI;SsLp
zP9XTHq5mmS=iWu~9ES>b%Q=1aMa|ya^vj$@qz9S!ih{T8_PD%Sf_QrNKwgrXw9ldm
zHRVR98*{C?_XNpJn{abA!oix_mowRMu^2lV-LPi;0+?-F(>^5#OHX-fPED
zCu^l7u3E%STI}c4{J2!)9SUlGP_@!d?5W^QJXOI-Ea`hFMKjR7TluLvzC-ozCPn1`Tpy
z!vlv@_Z58ILX6>nDjTp-1LlFMx~-%GA`aJvG$?8*Ihn;mH37eK**rmOEwqegf-Ccx
zrIX4;{c~RK>XuTXxYo5kMiWMy)!IC{*DHG@E$hx?RwP@+wuad(P1{@%tRkyJRqD)3
zMHHHZ4boqDn>-=DgR5VlhQTpfVy182Gk;A_S8A1-;U1RR>+$62>(MUx@Nox$vTjHq
z%QR=j!6Gdyb5wu7y(YUktwMuW5<@jl?m4cv4BODiT5o8qVdC0MBqGr@-YBIwnpZAY
znX9(_uQjP}JJ=!~Ve9#5I~rUnN|P_3D$LqZcvBnywYhjlMSFHm`;u9GPla{5QD7(7*6Tb3Svr8;(nuAd81q$*uq6HC_&~je*Ca7hP4sJp0av{M8480wF
zxASi7Qv+~@2U%Nu1Ud;s-G4CTVWIPyx!sg&8ZG0Wq
zG_}i3C(6_1>q3w!EH7$Kwq8uBp2F2N7}l65mk1p*9v0&+;th=_E-W)E;w}P(j⁢
zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0
z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+
z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6
z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e
zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA
z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2
zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC
zi<%2x8Q24YN+&8U@CIlN
zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8
zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu
z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f
z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN
z@GXF$bL=&pBq-#vkTkh>7hl%K5|3
z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3|
zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF
z*L1+}JU7%QJOg|5|Tc|D8fN
zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A
zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7
zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;<
je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac72c34e8a..a80b22ce5c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 0adc8e1a53..1aa94a4269 100755
--- a/gradlew
+++ b/gradlew
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f13..25da30dbde 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

From 3a9d56c6a4fcc5b3adbb43b32833ac3fd14c3942 Mon Sep 17 00:00:00 2001
From: Noah van der Aa 
Date: Thu, 8 Feb 2024 22:39:57 +0100
Subject: [PATCH 35/47] Correct ConnectScreen.UNKNOWN_HOST_TEXT (#3781)

Co-authored-by: modmuss 
---
 .../client/gui/screen/multiplayer/ConnectScreen.mapping         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping
index 30d5b0178a..eab2f7ee41 100644
--- a/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping
@@ -13,7 +13,7 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/multiplayer/Connec
 	FIELD field_2412 parent Lnet/minecraft/class_437;
 	FIELD field_2413 status Lnet/minecraft/class_2561;
 	FIELD field_32238 NARRATOR_INTERVAL J
-	FIELD field_33736 BLOCKED_HOST_TEXT Lnet/minecraft/class_2561;
+	FIELD field_33736 UNKNOWN_HOST_TEXT Lnet/minecraft/class_2561;
 	FIELD field_44548 failureErrorMessage Lnet/minecraft/class_2561;
 	FIELD field_44970 ABORTED_TEXT Lnet/minecraft/class_2561;
 	FIELD field_44971 future Lio/netty/channel/ChannelFuture;

From 79f0be817332f7ae5c8508af534697556b8b0810 Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:58:32 +0900
Subject: [PATCH 36/47] 24w06a stuff (#3786)

* 24w06a stuff

* 24w06a resource, registry, network

* Finish ID rename

* Fix javadoc

* Fix typo
---
 .../net/minecraft/SharedConstants.mapping     |  1 +
 .../entity/EndGatewayBlockEntity.mapping      |  2 ++
 .../block/entity/HopperBlockEntity.mapping    |  3 ++
 mappings/net/minecraft/class_9224.mapping     |  3 --
 mappings/net/minecraft/class_9243.mapping     |  2 --
 mappings/net/minecraft/class_9247.mapping     |  5 ----
 .../minecraft/client/MinecraftClient.mapping  |  3 ++
 .../net/minecraft/client/font/Font.mapping    |  1 +
 .../client/font/FontFilterType.mapping        | 15 ++++++++++
 .../minecraft/client/font/FontLoader.mapping  |  4 +++
 .../minecraft/client/font/FontManager.mapping | 28 +++++++++++++++++++
 .../minecraft/client/font/FontStorage.mapping | 14 +++++++++-
 .../option/LanguageOptionsScreen.mapping      |  2 ++
 .../ClientConfigurationNetworkHandler.mapping |  5 ++++
 .../client/network/ClientRegistries.mapping   |  7 ++++-
 .../client/network/ClientTagLoader.mapping    | 22 +++++++++++++++
 .../net/minecraft/client/network/Tags.mapping |  6 ----
 .../client/option/GameOptions.mapping         |  6 +++-
 .../particle/GustEmitterParticle.mapping      | 17 +++++++++++
 .../client/particle/Particle.mapping          |  5 ++++
 .../client/realms/FileUpload.mapping          |  3 ++
 .../resource/ClientDataPackManager.mapping    | 10 +++++++
 .../DefaultClientResourcePackProvider.mapping |  8 +++++-
 .../server/ServerResourcePackLoader.mapping   |  1 +
 ...ping => RenameEntityAttributesFix.mapping} |  9 ++++--
 mappings/net/minecraft/entity/Entity.mapping  |  4 +--
 .../net/minecraft/entity/LivingEntity.mapping |  5 ++++
 .../entity/{ => data}/DataTracked.mapping     |  2 +-
 .../minecraft/entity/data/DataTracker.mapping |  1 +
 .../minecraft/entity/mob/MobEntity.mapping    |  2 ++
 .../minecraft/entity/mob/PatrolEntity.mapping |  2 ++
 .../passive/WanderingTraderEntity.mapping     |  2 ++
 .../entity/player/PlayerEntity.mapping        |  1 +
 mappings/net/minecraft/item/ItemStack.mapping |  5 ++++
 mappings/net/minecraft/nbt/NbtHelper.mapping  |  2 +-
 .../minecraft/network/PacketByteBuf.mapping   |  3 +-
 .../listener/ServerPlayPacketListener.mapping |  2 +-
 .../config/DynamicRegistriesS2CPacket.mapping |  1 +
 .../registry/MutableRegistry.mapping          |  1 +
 .../net/minecraft/registry/Registry.mapping   | 17 ++++++++++-
 .../minecraft/registry/RegistryLoader.mapping | 28 +++++++++++++++++++
 .../registry/SerializableRegistries.mapping   | 11 ++++++++
 .../minecraft/registry/SimpleRegistry.mapping |  3 ++
 .../VersionedIdentifier.mapping               |  2 +-
 .../registry/entry/RegistryEntryInfo.mapping  |  2 ++
 .../resource/AbstractFileResourcePack.mapping |  3 ++
 .../resource/DefaultResourcePack.mapping      |  9 +++++-
 .../DefaultResourcePackBuilder.mapping        |  1 +
 .../resource/DirectoryResourcePack.mapping    |  1 +
 .../resource/FileResourcePackProvider.mapping |  5 ++++
 .../resource/NamespaceResourceManager.mapping |  6 ++--
 .../net/minecraft/resource/Resource.mapping   |  7 +++--
 .../resource/ResourceFactory.mapping          |  3 ++
 .../minecraft/resource/ResourcePack.mapping   |  4 ++-
 .../resource/ResourcePackInfo.mapping         |  6 ++++
 .../resource/ResourcePackManager.mapping      | 12 ++++----
 .../resource/ResourcePackPosition.mapping     |  1 +
 .../resource/ResourcePackProfile.mapping      | 19 +++++++++++--
 .../resource/ResourcePackProvider.mapping     |  2 +-
 .../resource/ResourcePackSource.mapping       |  2 +-
 .../minecraft/resource/ResourceType.mapping   |  2 +-
 .../resource/VanillaDataPackProvider.mapping  | 10 ++++++-
 .../VanillaResourcePackProvider.mapping       |  9 +++---
 .../resource/ZipResourcePack.mapping          |  2 ++
 .../server/function/CommandFunction.mapping   |  2 ++
 .../ServerConfigurationNetworkHandler.mapping |  3 ++
 .../network/ServerPlayNetworkHandler.mapping  |  3 ++
 .../network/SynchronizeRegistriesTask.mapping | 14 ++++++++++
 mappings/net/minecraft/test/Batches.mapping   |  7 +++++
 .../net/minecraft/test/TestRunContext.mapping |  2 ++
 .../util/collection/Class2IntMap.mapping      | 12 ++++++++
 .../net/minecraft/util/dynamic/Codecs.mapping |  3 ++
 .../util/profiling/jfr/FlightProfiler.mapping | 12 ++++++++
 .../util/profiling/jfr/JfrJsonReport.mapping  |  9 ++++++
 .../profiling/jfr/JfrProfileRecorder.mapping  | 10 ++++++-
 .../util/profiling/jfr/JfrProfiler.mapping    |  1 +
 .../jfr/event/ChunkRegionEvent.mapping        | 27 ++++++++++--------
 .../jfr/sample/ChunkRegionSample.mapping      |  3 ++
 .../jfr/sample/NetworkIoStatistics.mapping    |  1 +
 .../{Packet.mapping => PacketSample.mapping}  |  2 +-
 .../minecraft/world/gen/WorldPresets.mapping  |  1 +
 .../world/poi/PointOfInterestStorage.mapping  |  7 +++++
 .../storage/ChunkPosKeyedStorage.mapping      |  4 +++
 .../storage/RecreatedChunkStorage.mapping     |  7 +++++
 .../world/storage/RecreationStorage.mapping   |  8 ++++++
 .../world/storage/RegionBasedStorage.mapping  |  5 ++++
 .../world/storage/RegionFile.mapping          | 10 +++++++
 .../world/storage/StorageIoWorker.mapping     |  4 +++
 .../world/storage/StorageKey.mapping          |  3 ++
 .../storage/VersionedChunkStorage.mapping     |  5 ++++
 .../world/updater/WorldUpdater.mapping        | 19 +++++++++++++
 91 files changed, 495 insertions(+), 71 deletions(-)
 delete mode 100644 mappings/net/minecraft/class_9224.mapping
 delete mode 100644 mappings/net/minecraft/class_9243.mapping
 delete mode 100644 mappings/net/minecraft/class_9247.mapping
 create mode 100644 mappings/net/minecraft/client/font/FontFilterType.mapping
 create mode 100644 mappings/net/minecraft/client/network/ClientTagLoader.mapping
 delete mode 100644 mappings/net/minecraft/client/network/Tags.mapping
 create mode 100644 mappings/net/minecraft/client/resource/ClientDataPackManager.mapping
 rename mappings/net/minecraft/datafixer/fix/{RenameItemStackAttributesFix.mapping => RenameEntityAttributesFix.mapping} (66%)
 rename mappings/net/minecraft/entity/{ => data}/DataTracked.mapping (69%)
 rename mappings/net/minecraft/{network/packet => registry}/VersionedIdentifier.mapping (75%)
 create mode 100644 mappings/net/minecraft/registry/entry/RegistryEntryInfo.mapping
 create mode 100644 mappings/net/minecraft/resource/ResourcePackInfo.mapping
 create mode 100644 mappings/net/minecraft/resource/ResourcePackPosition.mapping
 create mode 100644 mappings/net/minecraft/util/collection/Class2IntMap.mapping
 create mode 100644 mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping
 rename mappings/net/minecraft/util/profiling/jfr/sample/{Packet.mapping => PacketSample.mapping} (92%)
 create mode 100644 mappings/net/minecraft/world/storage/StorageKey.mapping

diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping
index d047cfc2d1..e6b2709750 100644
--- a/mappings/net/minecraft/SharedConstants.mapping
+++ b/mappings/net/minecraft/SharedConstants.mapping
@@ -25,6 +25,7 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants
 	FIELD field_34373 CURRENT_SERIES Ljava/lang/String;
 	FIELD field_36325 CRASH_ON_UNCAUGHT_THREAD_EXCEPTION Z
 	FIELD field_43095 requiredDataFixTypes Ljava/util/Set;
+	FIELD field_49017 EXPANDED_MACRO_COMMAND_MAX_LENGTH I
 	METHOD method_16673 getGameVersion ()Lnet/minecraft/class_6489;
 	METHOD method_31372 getProtocolVersion ()I
 	METHOD method_34872 setGameVersion (Lnet/minecraft/class_6489;)V
diff --git a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping
index 60176381d2..e8f62b34c2 100644
--- a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping
@@ -68,3 +68,5 @@ CLASS net/minecraft/class_2643 net/minecraft/block/entity/EndGatewayBlockEntity
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 blockEntity
+	METHOD method_57012 (Lnet/minecraft/class_2338;)V
+		ARG 1 exitPortalPos
diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
index aac85173a9..e5dc886366 100644
--- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 	FIELD field_12024 inventory Lnet/minecraft/class_2371;
 	FIELD field_31341 TRANSFER_COOLDOWN I
 	FIELD field_31342 INVENTORY_SIZE I
+	FIELD field_49100 AVAILABLE_SLOTS_CACHE [[I
 	FIELD field_49101 facing Lnet/minecraft/class_2350;
 	METHOD  (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
@@ -106,3 +107,5 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
+	METHOD method_57011 indexArray (I)[I
+		ARG 0 size
diff --git a/mappings/net/minecraft/class_9224.mapping b/mappings/net/minecraft/class_9224.mapping
deleted file mode 100644
index e056a42363..0000000000
--- a/mappings/net/minecraft/class_9224.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_9224
-	METHOD method_56927 (ZLnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
-		ARG 1 enabled
diff --git a/mappings/net/minecraft/class_9243.mapping b/mappings/net/minecraft/class_9243.mapping
deleted file mode 100644
index b383c0f366..0000000000
--- a/mappings/net/minecraft/class_9243.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS net/minecraft/class_9243
-	FIELD field_49114 CODEC Lcom/mojang/serialization/Codec;
diff --git a/mappings/net/minecraft/class_9247.mapping b/mappings/net/minecraft/class_9247.mapping
deleted file mode 100644
index d91db78ef7..0000000000
--- a/mappings/net/minecraft/class_9247.mapping
+++ /dev/null
@@ -1,5 +0,0 @@
-CLASS net/minecraft/class_9247
-	FIELD field_49124 realmsManager Lnet/minecraft/class_3283;
-	METHOD method_57046 createLifecycledResourceManager ()Lnet/minecraft/class_6860;
-	METHOD method_57048 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_3288;)V
-		ARG 1 resourcePackProfile
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
index 52a9ce28cf..6776d36e6b 100644
--- a/mappings/net/minecraft/client/MinecraftClient.mapping
+++ b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -538,6 +538,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_53526 getDebugHud ()Lnet/minecraft/class_340;
 	METHOD method_53527 onInitFinished (Lnet/minecraft/class_310$class_8764;)Ljava/lang/Runnable;
 		ARG 1 loadingContext
+	METHOD method_53865 (Ljava/util/List;)Lnet/minecraft/class_1123;
+		ARG 0 stacks
 	METHOD method_54116 formatSeconds (D)Ljava/lang/String;
 		ARG 0 seconds
 	METHOD method_54117 addUptimesToCrashReport (Lnet/minecraft/class_129;)V
@@ -553,6 +555,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_55607 getUserProperties ()Lcom/mojang/authlib/minecraft/UserApiService$UserProperties;
 	METHOD method_56134 disconnect (Lnet/minecraft/class_437;)V
 		ARG 1 disconnectionScreen
+	METHOD method_57017 onFontOptionsChanged ()V
 	CLASS class_5859 ChatRestriction
 		COMMENT Represents the restrictions on chat on a Minecraft client.
 		COMMENT
diff --git a/mappings/net/minecraft/client/font/Font.mapping b/mappings/net/minecraft/client/font/Font.mapping
index d75bae7442..4f74900ff5 100644
--- a/mappings/net/minecraft/client/font/Font.mapping
+++ b/mappings/net/minecraft/client/font/Font.mapping
@@ -3,3 +3,4 @@ CLASS net/minecraft/class_390 net/minecraft/client/font/Font
 		ARG 1 codePoint
 	METHOD method_27442 getProvidedGlyphs ()Lit/unimi/dsi/fastutil/ints/IntSet;
 		COMMENT {@return the set of code points for which this font can provide glyphs}
+	CLASS class_9241 FontFilterPair
diff --git a/mappings/net/minecraft/client/font/FontFilterType.mapping b/mappings/net/minecraft/client/font/FontFilterType.mapping
new file mode 100644
index 0000000000..37ce40e511
--- /dev/null
+++ b/mappings/net/minecraft/client/font/FontFilterType.mapping
@@ -0,0 +1,15 @@
+CLASS net/minecraft/class_9243 net/minecraft/client/font/FontFilterType
+	FIELD field_49114 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_49115 id Ljava/lang/String;
+	METHOD  (Ljava/lang/String;ILjava/lang/String;)V
+		ARG 3 id
+	CLASS class_9244 FilterMap
+		FIELD field_49117 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_49118 NO_FILTER Lnet/minecraft/class_9243$class_9244;
+		FIELD field_49119 activeFilters Ljava/util/Map;
+		METHOD  (Ljava/util/Map;)V
+			ARG 1 activeFilters
+		METHOD method_57031 apply (Lnet/minecraft/class_9243$class_9244;)Lnet/minecraft/class_9243$class_9244;
+			ARG 1 activeFilters
+		METHOD method_57032 isAllowed (Ljava/util/Set;)Z
+			ARG 1 activeFilters
diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping
index 692c709e0e..7349dca626 100644
--- a/mappings/net/minecraft/client/font/FontLoader.mapping
+++ b/mappings/net/minecraft/client/font/FontLoader.mapping
@@ -8,3 +8,7 @@ CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader
 		METHOD load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390;
 			ARG 1 resourceManager
 	CLASS class_8540 Reference
+	CLASS class_9245 Provider
+		FIELD field_49122 CODEC Lcom/mojang/serialization/Codec;
+		METHOD method_57040 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+			ARG 0 instance
diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping
index 99712cd1e7..35dc9995c6 100644
--- a/mappings/net/minecraft/client/font/FontManager.mapping
+++ b/mappings/net/minecraft/client/font/FontManager.mapping
@@ -8,12 +8,16 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 	FIELD field_40409 FINDER Lnet/minecraft/class_7654;
 	FIELD field_44757 GSON Lcom/google/gson/Gson;
 	FIELD field_44758 fonts Ljava/util/List;
+	FIELD field_49111 currentStorage Lnet/minecraft/class_377;
 	METHOD  (Lnet/minecraft/class_1060;)V
 		ARG 1 manager
 	METHOD method_27539 createTextRenderer ()Lnet/minecraft/class_327;
 	METHOD method_27540 (Lnet/minecraft/class_377;)V
 		ARG 0 fontStorage
 	METHOD method_45078 createAdvanceValidatingTextRenderer ()Lnet/minecraft/class_327;
+	METHOD method_51607 (Ljava/util/Set;Lnet/minecraft/class_2960;Ljava/util/List;)V
+		ARG 2 id
+		ARG 3 fonts
 	METHOD method_51608 loadIndex (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 resourceManager
 		ARG 2 executor
@@ -23,6 +27,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 		ARG 2 index
 	METHOD method_51611 (Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture;
 		ARG 3 dest
+	METHOD method_51612 (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8539;)V
+		ARG 6 loadable
 	METHOD method_51613 load (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8539;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 key
 		ARG 2 loadable
@@ -31,6 +37,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 	METHOD method_51614 reload (Lnet/minecraft/class_378$class_8536;Lnet/minecraft/class_3695;)V
 		ARG 1 index
 		ARG 2 profiler
+	METHOD method_51615 (Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8540;)V
+		ARG 3 reference
 	METHOD method_51617 getRequiredFontProviders (Ljava/util/List;)Ljava/util/Map;
 		ARG 1 entries
 	METHOD method_51618 (Ljava/util/List;I)V
@@ -40,6 +48,7 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 		ARG 1 id
 	METHOD method_51620 insertFont (Ljava/util/List;Lnet/minecraft/class_390$class_9241;)V
 		ARG 1 fonts
+		ARG 2 font
 	METHOD method_51621 (Ljava/util/List;Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage;
 		ARG 4 providers
 	METHOD method_51622 (Ljava/util/List;Ljava/util/Map;Ljava/lang/Void;)Lnet/minecraft/class_378$class_8536;
@@ -51,20 +60,39 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 		ARG 2 fonts
 	METHOD method_51626 (Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage;
 		ARG 2 entries
+	METHOD method_57023 getStorageInternal (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377;
+		ARG 1 id
+	METHOD method_57024 setActiveFilters (Lnet/minecraft/class_315;)V
+		ARG 1 options
+	METHOD method_57025 getStorage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377;
+		ARG 1 id
+	METHOD method_57026 getActiveFilters (Lnet/minecraft/class_315;)Ljava/util/Set;
+		ARG 0 options
+	METHOD method_57027 createEmptyFont ()Lnet/minecraft/class_390$class_9241;
 	CLASS class_8534 FontKey
 	CLASS class_8535 Builder
+		METHOD method_51628 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/Optional;
+			ARG 1 future
 		METHOD method_51629 build (Ljava/util/function/Function;)Ljava/util/Optional;
 			ARG 1 fontRetriever
 		METHOD method_51630 (Ljava/util/function/Function;Lnet/minecraft/class_2960;)Ljava/util/Optional;
 			ARG 2 referee
+		METHOD method_57028 applyFilter (Lnet/minecraft/class_390$class_9241;)Lnet/minecraft/class_390$class_9241;
+			ARG 1 font
+		METHOD method_57029 (Lnet/minecraft/class_390;)Ljava/util/List;
+			ARG 1 font
 	CLASS class_8536 ProviderIndex
 	CLASS class_8537 FontEntry
 		METHOD  (Lnet/minecraft/class_2960;)V
 			ARG 1 fontId
 		METHOD method_51631 addReferenceBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8540;)V
 			ARG 1 key
+			ARG 2 filters
+			ARG 3 reference
 		METHOD method_51632 addBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Ljava/util/concurrent/CompletableFuture;)V
 			ARG 1 key
+			ARG 2 filters
+			ARG 3 fontFuture
 		METHOD method_51633 (Lnet/minecraft/class_378$class_8535;)Ljava/util/stream/Stream;
 			ARG 0 builder
 		METHOD method_51634 getRequiredFontProviders (Ljava/util/function/Function;)Ljava/util/Optional;
diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping
index c60a90cb68..53e16a1455 100644
--- a/mappings/net/minecraft/client/font/FontStorage.mapping
+++ b/mappings/net/minecraft/client/font/FontStorage.mapping
@@ -9,11 +9,14 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
 	FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382;
 	FIELD field_2257 glyphCache Lnet/minecraft/class_8532;
 	FIELD field_39934 MAX_ADVANCE F
+	FIELD field_49120 allFonts Ljava/util/List;
+	FIELD field_49121 availableFonts Ljava/util/List;
 	METHOD  (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V
 		ARG 1 textureManager
 		ARG 2 id
 	METHOD method_2004 setFonts (Ljava/util/List;Ljava/util/Set;)V
-		ARG 1 fonts
+		ARG 1 allFonts
+		ARG 2 activeFilters
 	METHOD method_2010 closeGlyphAtlases ()V
 	METHOD method_2011 getGlyph (IZ)Lnet/minecraft/class_379;
 		COMMENT {@return the glyph of {@code codePoint}}
@@ -41,6 +44,15 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
 		ARG 0 rowCount
 	METHOD method_51638 (I)[[Lnet/minecraft/class_382;
 		ARG 0 rowCount
+	METHOD method_57034 getId ()Lnet/minecraft/class_2960;
+	METHOD method_57035 (Ljava/util/List;Ljava/util/Set;I)V
+		ARG 3 codePoint
+	METHOD method_57036 setActiveFilters (Ljava/util/Set;)V
+		ARG 1 activeFilters
+	METHOD method_57037 applyFilters (Ljava/util/List;Ljava/util/Set;)Ljava/util/List;
+		ARG 1 allFonts
+		ARG 2 activeFilters
+	METHOD method_57038 clear ()V
 	CLASS class_7647 GlyphPair
 		FIELD comp_979 glyph Lnet/minecraft/class_379;
 		FIELD comp_980 advanceValidatedGlyph Lnet/minecraft/class_379;
diff --git a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping
index e48eb0a2fb..b71a3042e8 100644
--- a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping
@@ -9,6 +9,8 @@ CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/option/LanguageOpt
 	METHOD method_19820 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_52184 onDone ()V
+	METHOD method_57042 (Lnet/minecraft/class_4185;)V
+		ARG 1 button
 	CLASS class_4195 LanguageSelectionListWidget
 		METHOD  (Lnet/minecraft/class_426;Lnet/minecraft/class_310;)V
 			ARG 2 client
diff --git a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping
index 430579abbd..e6046cb76b 100644
--- a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping
@@ -4,5 +4,10 @@ CLASS net/minecraft/class_8674 net/minecraft/client/network/ClientConfigurationN
 	FIELD field_45598 registryManager Lnet/minecraft/class_5455$class_6890;
 	FIELD field_45599 enabledFeatures Lnet/minecraft/class_7699;
 	FIELD field_48766 clientRegistries Lnet/minecraft/class_9173;
+	FIELD field_49123 dataPackManager Lnet/minecraft/class_9247;
 	METHOD method_52797 handleCustomPayload (Lnet/minecraft/class_8710;)V
 		ARG 1 payload
+	METHOD method_57043 (Lnet/minecraft/class_5912;)Lnet/minecraft/class_5455$class_6890;
+		ARG 1 factory
+	METHOD method_57044 openClientDataPack (Ljava/util/function/Function;)Ljava/lang/Object;
+		ARG 1 opener
diff --git a/mappings/net/minecraft/client/network/ClientRegistries.mapping b/mappings/net/minecraft/client/network/ClientRegistries.mapping
index 8bf55839f3..27a76d91d9 100644
--- a/mappings/net/minecraft/client/network/ClientRegistries.mapping
+++ b/mappings/net/minecraft/client/network/ClientRegistries.mapping
@@ -1,10 +1,13 @@
 CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries
 	FIELD field_48767 dynamicRegistries Lnet/minecraft/class_9173$class_9174;
-	FIELD field_48768 tags Lnet/minecraft/class_9175;
+	FIELD field_48768 tagLoader Lnet/minecraft/class_9175;
 	METHOD method_56583 putDynamicRegistry (Lnet/minecraft/class_5321;Ljava/util/List;)V
 		ARG 1 registryRef
 		ARG 2 entries
 	METHOD method_56585 createRegistryManager (Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;Z)Lnet/minecraft/class_5455$class_6890;
+		ARG 1 factory
+		ARG 2 registryManager
+		ARG 3 local
 	METHOD method_56586 putTags (Ljava/util/Map;)V
 		ARG 1 tags
 	CLASS class_9174 DynamicRegistries
@@ -15,3 +18,5 @@ CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries
 			ARG 1 registryRef
 			ARG 2 entries
 		METHOD method_56589 load (Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455;
+			ARG 1 factory
+			ARG 2 registryManager
diff --git a/mappings/net/minecraft/client/network/ClientTagLoader.mapping b/mappings/net/minecraft/client/network/ClientTagLoader.mapping
new file mode 100644
index 0000000000..7ef5cd3e3b
--- /dev/null
+++ b/mappings/net/minecraft/client/network/ClientTagLoader.mapping
@@ -0,0 +1,22 @@
+CLASS net/minecraft/class_9175 net/minecraft/client/network/ClientTagLoader
+	FIELD field_48770 tagsByRegistry Ljava/util/Map;
+	METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
+		ARG 1 registryRef
+		ARG 2 serialized
+	METHOD method_56591 load (Lnet/minecraft/class_5455;Ljava/util/function/Predicate;)V
+		ARG 1 registryManager
+		ARG 2 predicate
+	METHOD method_56592 (Ljava/util/function/Predicate;Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
+		ARG 2 registryRef
+		ARG 3 serialized
+	METHOD method_57050 onDynamicTagsLoaded ()V
+	METHOD method_57051 (Lnet/minecraft/class_5321;)Z
+		ARG 0 registryRef
+	METHOD method_57052 (Lnet/minecraft/class_5455$class_6892;)V
+		ARG 0 entry
+	METHOD method_57053 load (Lnet/minecraft/class_5455;Z)V
+		ARG 1 registryManager
+		ARG 2 local
+	METHOD method_57054 onStaticTagsLoaded ()V
+	METHOD method_57055 (Lnet/minecraft/class_5455$class_6892;)Z
+		ARG 0 registries
diff --git a/mappings/net/minecraft/client/network/Tags.mapping b/mappings/net/minecraft/client/network/Tags.mapping
deleted file mode 100644
index 5faf20770c..0000000000
--- a/mappings/net/minecraft/client/network/Tags.mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-CLASS net/minecraft/class_9175 net/minecraft/client/network/Tags
-	FIELD field_48770 tagsByRegistry Ljava/util/Map;
-	METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V
-		ARG 1 registryRef
-		ARG 2 serialized
-	METHOD method_56591 load (Lnet/minecraft/class_5455;Ljava/util/function/Predicate;)V
diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping
index 20ab1a5494..8fe593ab3a 100644
--- a/mappings/net/minecraft/client/option/GameOptions.mapping
+++ b/mappings/net/minecraft/client/option/GameOptions.mapping
@@ -599,6 +599,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	METHOD method_53842 getSyncedOptions ()Lnet/minecraft/class_8791;
 	METHOD method_54581 getHideSplashTexts ()Lnet/minecraft/class_7172;
 	METHOD method_57018 getJapaneseGlyphVariants ()Lnet/minecraft/class_7172;
+	METHOD method_57019 acceptProfiledOptions (Lnet/minecraft/class_315$class_9242;)V
+		ARG 1 visitor
 	METHOD method_57020 onFontOptionsChanged ()V
 	METHOD method_57021 shouldUseJapaneseGlyphsByDefault ()Z
 	METHOD method_57022 (Ljava/lang/Boolean;)V
@@ -633,5 +635,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		METHOD method_33684 visitBoolean (Ljava/lang/String;Z)Z
 			ARG 1 key
 			ARG 2 current
-	CLASS class_9242
+	CLASS class_9242 OptionVisitor
 		METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V
+			ARG 1 key
+			ARG 2 option
diff --git a/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping b/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping
index 04da029911..52f1990343 100644
--- a/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping
+++ b/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping
@@ -1,2 +1,19 @@
 CLASS net/minecraft/class_8979 net/minecraft/client/particle/GustEmitterParticle
+	FIELD field_49126 deviation D
+	FIELD field_49127 interval I
+	METHOD  (Lnet/minecraft/class_638;DDDDII)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 deviation
+		ARG 10 maxAge
+		ARG 11 interval
 	CLASS class_8980 Factory
+		FIELD field_49128 deviation D
+		FIELD field_49129 maxAge I
+		FIELD field_49130 interval I
+		METHOD  (DII)V
+			ARG 1 deviation
+			ARG 3 maxAge
+			ARG 4 interval
diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping
index ecdae0ab78..c2fbd8b6ab 100644
--- a/mappings/net/minecraft/client/particle/Particle.mapping
+++ b/mappings/net/minecraft/client/particle/Particle.mapping
@@ -38,6 +38,11 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle
 	FIELD field_3871 z D
 	FIELD field_3872 boundingBox Lnet/minecraft/class_238;
 	FIELD field_3874 x D
+	METHOD  (Lnet/minecraft/class_638;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
 	METHOD  (Lnet/minecraft/class_638;DDDDDD)V
 		ARG 1 world
 		ARG 2 x
diff --git a/mappings/net/minecraft/client/realms/FileUpload.mapping b/mappings/net/minecraft/client/realms/FileUpload.mapping
index 47a08985ea..14f2d76b78 100644
--- a/mappings/net/minecraft/client/realms/FileUpload.mapping
+++ b/mappings/net/minecraft/client/realms/FileUpload.mapping
@@ -13,6 +13,7 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload
 	FIELD field_19561 requestConfig Lorg/apache/http/client/config/RequestConfig;
 	FIELD field_32056 MAX_ATTEMPTS I
 	FIELD field_32057 UPLOAD_ENDPOINT Ljava/lang/String;
+	FIELD field_49104 worldVersion Ljava/lang/String;
 	METHOD  (Ljava/io/File;JILnet/minecraft/class_4888;Lnet/minecraft/class_320;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_4351;)V
 		ARG 1 file
 		ARG 2 worldId
@@ -20,6 +21,8 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload
 		ARG 5 uploadInfo
 		ARG 6 session
 		ARG 7 clientVersion
+		ARG 8 worldVersion
+		ARG 9 uploadStatus
 	METHOD method_20970 cancel ()V
 	METHOD method_20971 requestUpload (I)Lnet/minecraft/class_4429;
 		ARG 1 currentAttempt
diff --git a/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping b/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping
new file mode 100644
index 0000000000..4c935d6bff
--- /dev/null
+++ b/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9247 net/minecraft/client/resource/ClientDataPackManager
+	FIELD field_49124 packManager Lnet/minecraft/class_3283;
+	FIELD field_49125 knownPacks Ljava/util/Map;
+	METHOD method_57046 createResourceManager ()Lnet/minecraft/class_6860;
+	METHOD method_57047 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_9224;Lnet/minecraft/class_9226;)V
+		ARG 2 knownPackInfo
+	METHOD method_57048 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_3288;)V
+		ARG 1 resourcePackProfile
+	METHOD method_57049 getCommonKnownPacks (Ljava/util/List;)Ljava/util/List;
+		ARG 1 serverKnownPacks
diff --git a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping
index 6d6e67fcd1..04084c942f 100644
--- a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping
+++ b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping
@@ -4,7 +4,10 @@ CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResour
 	FIELD field_40559 PROFILE_NAME_TEXTS Ljava/util/Map;
 	FIELD field_40560 ID Lnet/minecraft/class_2960;
 	FIELD field_40561 resourcePacksPath Ljava/nio/file/Path;
-	FIELD field_43088 HIGH_CONTRAST_NAME Ljava/lang/String;
+	FIELD field_43088 HIGH_CONTRAST_ID Ljava/lang/String;
+	FIELD field_49131 INFO Lnet/minecraft/class_9224;
+	FIELD field_49132 REQUIRED_POSITION Lnet/minecraft/class_9225;
+	FIELD field_49133 OPTIONAL_POSITION Lnet/minecraft/class_9225;
 	METHOD  (Ljava/nio/file/Path;Lnet/minecraft/class_8580;)V
 		ARG 1 assetsPath
 		ARG 2 symlinkFinder
@@ -12,3 +15,6 @@ CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResour
 		ARG 1 path
 	METHOD method_45857 createDefaultPack (Ljava/nio/file/Path;)Lnet/minecraft/class_3268;
 		ARG 0 assetsPath
+	METHOD method_57056 createInfo (Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_9224;
+		ARG 0 id
+		ARG 1 title
diff --git a/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping b/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping
index abe84d4c66..685d3859ab 100644
--- a/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping
+++ b/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/server/ServerResour
 	FIELD field_47600 packSource Lnet/minecraft/class_5352;
 	FIELD field_47601 packStateChangeCallback Lnet/minecraft/class_9039;
 	FIELD field_47690 packIndex I
+	FIELD field_49134 POSITION Lnet/minecraft/class_9225;
 	FIELD field_5296 SHA1_PATTERN Ljava/util/regex/Pattern;
 	FIELD field_5298 LOGGER Lorg/slf4j/Logger;
 	METHOD  (Lnet/minecraft/class_310;Ljava/nio/file/Path;Lnet/minecraft/class_542$class_547;)V
diff --git a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameEntityAttributesFix.mapping
similarity index 66%
rename from mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping
rename to mappings/net/minecraft/datafixer/fix/RenameEntityAttributesFix.mapping
index 681d6aad37..0d4b89222a 100644
--- a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/RenameEntityAttributesFix.mapping
@@ -1,7 +1,10 @@
-CLASS net/minecraft/class_5129 net/minecraft/datafixer/fix/RenameItemStackAttributesFix
-	FIELD field_23695 RENAMES Ljava/util/function/UnaryOperator;
+CLASS net/minecraft/class_5129 net/minecraft/datafixer/fix/RenameEntityAttributesFix
+	FIELD field_23695 renames Ljava/util/function/UnaryOperator;
+	FIELD field_49056 description Ljava/lang/String;
 	METHOD  (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V
 		ARG 1 outputSchema
+		ARG 2 description
+		ARG 3 renames
 	METHOD method_26808 updateAttributeName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 	METHOD method_26810 updateAttributeModifiers (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
-	METHOD method_26814 updatePlayerAttributes (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
+	METHOD method_26814 updateEntityAttributes (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index ffb3214e57..44c7f0cb08 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -1360,8 +1360,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_5693 initDataTracker (Lnet/minecraft/class_2945$class_9222;)V
 		COMMENT Initializes data tracker.
 		COMMENT
-		COMMENT @apiNote Subclasses should override this and call {@link DataTracker#startTracking}
-		COMMENT for any data that needs to be tracked.
+		COMMENT @apiNote Subclasses should override this and add to the builder any data
+		COMMENT that needs to be tracked.
 		ARG 1 builder
 	METHOD method_5694 onPlayerCollision (Lnet/minecraft/class_1657;)V
 		COMMENT Called when a player collides with the entity. Does nothing by default.
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index 9553200965..3a172cbab5 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -375,6 +375,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
 		ARG 1 slot
 		ARG 2 stack
+	METHOD method_56991 canUseSlot (Lnet/minecraft/class_1304;)Z
+		ARG 1 slot
+	METHOD method_56992 isInCreativeMode ()Z
+	METHOD method_56993 getSafeFallDistance (F)I
+		ARG 1 health
 	METHOD method_56994 getJumpVelocity (F)F
 		ARG 1 strength
 	METHOD method_5877 getHandItems ()Ljava/lang/Iterable;
diff --git a/mappings/net/minecraft/entity/DataTracked.mapping b/mappings/net/minecraft/entity/data/DataTracked.mapping
similarity index 69%
rename from mappings/net/minecraft/entity/DataTracked.mapping
rename to mappings/net/minecraft/entity/data/DataTracked.mapping
index ed0cc28a4f..ef8cbbb39e 100644
--- a/mappings/net/minecraft/entity/DataTracked.mapping
+++ b/mappings/net/minecraft/entity/data/DataTracked.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_9221 net/minecraft/entity/DataTracked
+CLASS net/minecraft/class_9221 net/minecraft/entity/data/DataTracked
 	METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V
 		ARG 1 entries
 	METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V
diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping
index 6f2cd256b5..a633f0e64e 100644
--- a/mappings/net/minecraft/entity/data/DataTracker.mapping
+++ b/mappings/net/minecraft/entity/data/DataTracker.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker
 	FIELD field_13333 trackedEntity Lnet/minecraft/class_9221;
 	FIELD field_13334 LOGGER Lorg/slf4j/Logger;
 	FIELD field_33378 MAX_DATA_VALUE_ID I
+	FIELD field_49021 CLASS_TO_LAST_ID Lnet/minecraft/class_9227;
 	METHOD  (Lnet/minecraft/class_9221;[Lnet/minecraft/class_2945$class_2946;)V
 		ARG 1 trackedEntity
 		ARG 2 entries
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index 7ce5b9bea3..cd7aa3085e 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -156,6 +156,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	METHOD method_56677 isWearingBodyArmor ()Z
 	METHOD method_56678 equipBodyArmor (Lnet/minecraft/class_1799;)V
 		ARG 1 stack
+	METHOD method_56995 (Ljava/util/UUID;)Lnet/minecraft/class_2520;
+		ARG 0 uuid
 	METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
 		ARG 1 slot
 	METHOD method_5930 setForwardSpeed (F)V
diff --git a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping
index a1f08c3fcf..55aee4aa16 100644
--- a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping
@@ -22,6 +22,8 @@ CLASS net/minecraft/class_3732 net/minecraft/entity/mob/PatrolEntity
 		ARG 4 random
 	METHOD method_22332 setPatrolling (Z)V
 		ARG 1 patrolling
+	METHOD method_57005 (Lnet/minecraft/class_2338;)V
+		ARG 1 patrolTarget
 	CLASS class_3733 PatrolGoal
 		FIELD field_16480 leaderSpeed D
 		FIELD field_16481 entity Lnet/minecraft/class_3732;
diff --git a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping
index a4d259df88..308514fb0f 100644
--- a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping
@@ -13,6 +13,8 @@ CLASS net/minecraft/class_3989 net/minecraft/entity/passive/WanderingTraderEntit
 		ARG 1 wanderTarget
 	METHOD method_20508 tickDespawnDelay ()V
 	METHOD method_52557 fillRebalancedRecipes ()V
+	METHOD method_57006 (Lnet/minecraft/class_2338;)V
+		ARG 1 wanderTarget
 	CLASS class_3994 WanderToTargetGoal
 		FIELD field_17759 trader Lnet/minecraft/class_3989;
 		FIELD field_17760 proximityDistance D
diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
index 706bb401a7..b5c1f47e71 100644
--- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping
+++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 	FIELD field_41765 damageTiltYaw F
 	FIELD field_46174 DEFAULT_MAIN_ARM Lnet/minecraft/class_1306;
 	FIELD field_47821 VEHICLE_ATTACHMENT_POS Lnet/minecraft/class_243;
+	FIELD field_49094 ignoreFallDamageAboveY Ljava/lang/Double;
 	FIELD field_7483 strideDistance F
 	FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796;
 	FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730;
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
index 66f615ad87..7298e61687 100644
--- a/mappings/net/minecraft/item/ItemStack.mapping
+++ b/mappings/net/minecraft/item/ItemStack.mapping
@@ -300,6 +300,11 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 			COMMENT the item of the resultant stack
 		ARG 2 count
 			COMMENT the item count of the resultant stack
+	METHOD method_57008 decrementUnlessCreative (ILnet/minecraft/class_1309;)V
+		COMMENT Decrements the count of items in this item stack, unless {@code entity}
+		COMMENT is a creative mode player.
+		ARG 1 amount
+		ARG 2 entity
 	METHOD method_7909 getItem ()Lnet/minecraft/class_1792;
 		COMMENT {@return the item of this stack}
 		COMMENT
diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping
index 81b37f1e25..c076384f03 100644
--- a/mappings/net/minecraft/nbt/NbtHelper.mapping
+++ b/mappings/net/minecraft/nbt/NbtHelper.mapping
@@ -80,7 +80,7 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper
 	METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2520;
 		COMMENT {@return the serialized block position}
 		COMMENT
-		COMMENT @see #toBlockPos(NbtCompound)
+		COMMENT @see #toBlockPos(NbtCompound, String)
 		ARG 0 pos
 	METHOD method_25929 fromUuid (Ljava/util/UUID;)Lnet/minecraft/class_2495;
 		COMMENT Serializes a {@link UUID} into its equivalent NBT representation.
diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping
index 54edb1610b..bcf7826a6b 100644
--- a/mappings/net/minecraft/network/PacketByteBuf.mapping
+++ b/mappings/net/minecraft/network/PacketByteBuf.mapping
@@ -131,8 +131,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT {@linkplain #readIdentifier() read} or {@linkplain #writeIdentifier(Identifier)
 		COMMENT written} in their string form.
 	FIELD field_33284 MAX_TEXT_LENGTH I
-		COMMENT The maximum size, in terms of JSON string length, allowed of the text read by
-		COMMENT {@link #readText()} or written by {@link #writeText(Text)}.
+		COMMENT The maximum size, in terms of JSON string length, allowed for serialized texts.
 	FIELD field_33287 MAX_READ_NBT_SIZE I
 		COMMENT The maximum size, in number of bytes, allowed of the NBT compound read by
 		COMMENT {@link #readNbt()}.
diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping
index 8e0452e812..c85421f8d0 100644
--- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping
+++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping
@@ -92,5 +92,5 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi
 		ARG 1 packet
 	METHOD method_54436 onSlotChangedState (Lnet/minecraft/class_8875;)V
 		ARG 1 packet
-	METHOD method_56619 onDebugSampleSubcription (Lnet/minecraft/class_9179;)V
+	METHOD method_56619 onDebugSampleSubscription (Lnet/minecraft/class_9179;)V
 		ARG 1 packet
diff --git a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping
index 4fdaf7ded4..7018cce9e9 100644
--- a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping
@@ -1,2 +1,3 @@
 CLASS net/minecraft/class_8734 net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket
 	FIELD field_48692 CODEC Lnet/minecraft/class_9139;
+	FIELD field_48777 REGISTRY_KEY_CODEC Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping
index 0de8dafd00..156250f980 100644
--- a/mappings/net/minecraft/registry/MutableRegistry.mapping
+++ b/mappings/net/minecraft/registry/MutableRegistry.mapping
@@ -6,6 +6,7 @@ CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry
 	METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lnet/minecraft/class_9248;)Lnet/minecraft/class_6880$class_6883;
 		ARG 1 key
 		ARG 2 value
+		ARG 3 info
 	METHOD method_35863 isEmpty ()Z
 		COMMENT {@return whether the registry is empty}
 	METHOD method_46769 createMutableEntryLookup ()Lnet/minecraft/class_7871;
diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping
index a2b6e347a8..f184e1276d 100644
--- a/mappings/net/minecraft/registry/Registry.mapping
+++ b/mappings/net/minecraft/registry/Registry.mapping
@@ -237,7 +237,7 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
 		COMMENT
 		COMMENT @see #getEntry(RegistryKey)
 		ARG 1 key
-	METHOD method_40294 createEntryCodec ()Lcom/mojang/serialization/Codec;
+	METHOD method_40294 getEntryCodec ()Lcom/mojang/serialization/Codec;
 		COMMENT {@return the codec for serializing the registry entry of {@code T}}
 		COMMENT
 		COMMENT @implNote This serializes a registry entry using the ID.
@@ -251,6 +251,8 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
 	METHOD method_46772 getTagCreatingWrapper ()Lnet/minecraft/class_7225$class_7226;
 		COMMENT {@return a registry wrapper that creates and stores a new registry entry list
 		COMMENT when handling an unknown tag key}
+	METHOD method_47448 (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+		ARG 1 value
 	METHOD method_47983 getEntry (Ljava/lang/Object;)Lnet/minecraft/class_6880;
 		ARG 1 value
 	METHOD method_47984 registerReference (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883;
@@ -270,6 +272,19 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
 		ARG 2 random
 	METHOD method_56160 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional;
 		ARG 1 entryList
+	METHOD method_57058 getEntryInfo (Lnet/minecraft/class_5321;)Ljava/util/Optional;
+		ARG 1 key
+	METHOD method_57059 getReferenceEntryCodec ()Lcom/mojang/serialization/Codec;
+	METHOD method_57060 (Lnet/minecraft/class_6880$class_6883;)Lcom/mojang/serialization/Lifecycle;
+		ARG 1 entry
+	METHOD method_57061 validateReference (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult;
+		ARG 1 entry
+	METHOD method_57062 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960;
+		ARG 0 entry
+	METHOD method_57064 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880;
+		ARG 0 entry
+	METHOD method_57065 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult;
+		ARG 1 id
 	CLASS 1
 		METHOD method_46773 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880;
 			ARG 0 entry
diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping
index 8418aa4ee8..b0fee4f82e 100644
--- a/mappings/net/minecraft/registry/RegistryLoader.mapping
+++ b/mappings/net/minecraft/registry/RegistryLoader.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 	FIELD field_39969 DIMENSION_REGISTRIES Ljava/util/List;
 	FIELD field_39970 LOGGER Lorg/slf4j/Logger;
 	FIELD field_48709 SYNCED_REGISTRIES Ljava/util/List;
+	FIELD field_49024 EXPERIMENTAL_ENTRY_INFO Lnet/minecraft/class_9248;
+	FIELD field_49025 RESOURCE_ENTRY_INFO_GETTER Ljava/util/function/Function;
 	METHOD method_45119 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String;
 		ARG 0 id
 	METHOD method_45120 (Lnet/minecraft/class_7655$class_7656;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_7655$class_9158;)V
@@ -51,10 +53,34 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		ARG 2 entries
 	METHOD method_56516 (Ljava/lang/String;)V
 		ARG 0 error
+	METHOD method_56517 (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
+		ARG 2 loader
+		ARG 3 infoGetter
 	METHOD method_56518 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
 		ARG 0 data
+		ARG 1 factory
+		ARG 2 infoGetter
+		ARG 3 registry
+		ARG 4 decoder
+		ARG 5 loadingErrors
 	METHOD method_56519 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
 		ARG 0 data
+		ARG 1 factory
+		ARG 2 registryManager
+		ARG 3 entries
+	METHOD method_56913 (Ljava/lang/Boolean;)Lcom/mojang/serialization/Lifecycle;
+		ARG 0 vanilla
+	METHOD method_56914 (Ljava/util/Optional;)Lnet/minecraft/class_9248;
+		ARG 0 knownPacks
+	METHOD method_56915 parseAndAdd (Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Lnet/minecraft/class_6903;Lnet/minecraft/class_5321;Lnet/minecraft/class_3298;Lnet/minecraft/class_9248;)V
+		ARG 0 registry
+		ARG 1 decoder
+		ARG 2 ops
+		ARG 3 key
+		ARG 4 resource
+		ARG 5 entryInfo
+	METHOD method_56916 (Ljava/lang/String;)V
+		ARG 0 error
 	CLASS class_7656 RegistryLoadable
 		METHOD apply (Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
 			ARG 1 loader
@@ -71,3 +97,5 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 			ARG 2 infoGetter
 		METHOD method_56521 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_6903$class_7863;)V
 			ARG 1 data
+			ARG 2 factory
+			ARG 3 infoGetter
diff --git a/mappings/net/minecraft/registry/SerializableRegistries.mapping b/mappings/net/minecraft/registry/SerializableRegistries.mapping
index 7f96137e9e..c2fb2b3eea 100644
--- a/mappings/net/minecraft/registry/SerializableRegistries.mapping
+++ b/mappings/net/minecraft/registry/SerializableRegistries.mapping
@@ -6,12 +6,23 @@ CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries
 		ARG 0 dynamicRegistryManager
 	METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream;
 		ARG 0 combinedRegistries
+	METHOD method_56595 (Lnet/minecraft/class_2378;Ljava/util/Set;Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/List;Lnet/minecraft/class_6880$class_6883;)V
+		ARG 5 registryEntry
+	METHOD method_56596 (Ljava/util/Set;Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2378;)V
+		ARG 4 registry
 	METHOD method_56597 serialize (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;)V
 		ARG 0 nbtOps
+		ARG 1 entry
 		ARG 2 registryManager
+		ARG 3 knownPacks
+		ARG 4 callback
 	METHOD method_56598 forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;)V
 		ARG 0 nbtOps
 		ARG 1 registryManager
+		ARG 2 knownPacks
+		ARG 3 callback
+	METHOD method_56599 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/class_7655$class_7657;)V
+		ARG 4 registry
 	METHOD method_56600 (Lnet/minecraft/class_6880$class_6883;Ljava/lang/String;)Ljava/lang/IllegalArgumentException;
 		ARG 1 error
 	METHOD method_56601 (Lnet/minecraft/class_5455$class_6892;)Z
diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping
index f89348be85..9eb010f4e5 100644
--- a/mappings/net/minecraft/registry/SimpleRegistry.mapping
+++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping
@@ -15,6 +15,7 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry
 	FIELD field_40584 intrusiveValueToEntry Ljava/util/Map;
 	FIELD field_41126 key Lnet/minecraft/class_5321;
 	FIELD field_41127 wrapper Lnet/minecraft/class_7225$class_7226;
+	FIELD field_49135 keyToEntryInfo Ljava/util/Map;
 	METHOD  (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V
 		ARG 1 key
 		ARG 2 lifecycle
@@ -58,4 +59,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry
 		ARG 0 value
 		ARG 1 entry
 	METHOD method_45939 assertNotFrozen ()V
+	METHOD method_56594 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883;
+		ARG 1 k
 	CLASS 1
diff --git a/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping b/mappings/net/minecraft/registry/VersionedIdentifier.mapping
similarity index 75%
rename from mappings/net/minecraft/network/packet/VersionedIdentifier.mapping
rename to mappings/net/minecraft/registry/VersionedIdentifier.mapping
index ef40d34b73..9902778e1a 100644
--- a/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping
+++ b/mappings/net/minecraft/registry/VersionedIdentifier.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_9226 net/minecraft/network/packet/VersionedIdentifier
+CLASS net/minecraft/class_9226 net/minecraft/registry/VersionedIdentifier
 	FIELD field_49035 PACKET_CODEC Lnet/minecraft/class_9139;
 	FIELD field_49036 DEFAULT_NAMESPACE Ljava/lang/String;
 	METHOD method_56931 isVanilla ()Z
diff --git a/mappings/net/minecraft/registry/entry/RegistryEntryInfo.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryInfo.mapping
new file mode 100644
index 0000000000..4e5b11d022
--- /dev/null
+++ b/mappings/net/minecraft/registry/entry/RegistryEntryInfo.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_9248 net/minecraft/registry/entry/RegistryEntryInfo
+	FIELD field_49136 DEFAULT Lnet/minecraft/class_9248;
diff --git a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping
index 01a700c9f5..b7a12389cf 100644
--- a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping
+++ b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping
@@ -1,5 +1,8 @@
 CLASS net/minecraft/class_3255 net/minecraft/resource/AbstractFileResourcePack
 	FIELD field_14182 LOGGER Lorg/slf4j/Logger;
+	FIELD field_49031 info Lnet/minecraft/class_9224;
+	METHOD  (Lnet/minecraft/class_9224;)V
+		ARG 1 info
 	METHOD method_14392 parseMetadata (Lnet/minecraft/class_3270;Ljava/io/InputStream;)Ljava/lang/Object;
 		ARG 0 metaReader
 		ARG 1 inputStream
diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping
index f44c39ff60..e783b3d0c5 100644
--- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping
+++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping
@@ -4,6 +4,13 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
 	FIELD field_26938 metadata Lnet/minecraft/class_7662;
 	FIELD field_40002 rootPaths Ljava/util/List;
 	FIELD field_40003 namespacePaths Ljava/util/Map;
+	FIELD field_49032 info Lnet/minecraft/class_9224;
+	METHOD  (Lnet/minecraft/class_9224;Lnet/minecraft/class_7662;Ljava/util/Set;Ljava/util/List;Ljava/util/Map;)V
+		ARG 1 info
+		ARG 2 metadata
+		ARG 3 namespaces
+		ARG 4 rootPaths
+		ARG 5 namespacePaths
 	METHOD method_14418 collectIdentifiers (Lnet/minecraft/class_3262$class_7664;Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/List;)V
 		ARG 0 consumer
 		ARG 1 namespace
@@ -11,7 +18,7 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
 		ARG 3 prefixSegments
 	METHOD method_43032 getFactory ()Lnet/minecraft/class_5912;
 	METHOD method_45188 (Lnet/minecraft/class_2960;)Ljava/util/Optional;
-		ARG 1 name
+		ARG 1 id
 	METHOD method_45189 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3264;Ljava/util/List;)Lnet/minecraft/class_7367;
 		ARG 3 segments
 	METHOD method_45190 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3264;Ljava/util/function/Consumer;Ljava/util/List;)V
diff --git a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping
index 79ae7a54c5..72cbf2201c 100644
--- a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping
+++ b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping
@@ -34,6 +34,7 @@ CLASS net/minecraft/class_7665 net/minecraft/resource/DefaultResourcePackBuilder
 	METHOD method_45209 exists (Ljava/nio/file/Path;)Z
 		ARG 1 path
 	METHOD method_45210 build (Lnet/minecraft/class_9224;)Lnet/minecraft/class_3268;
+		ARG 1 info
 	METHOD method_45211 (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)V
 		ARG 1 type
 		ARG 2 path
diff --git a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping
index 6c8e9bb5ef..7ebb91e3d3 100644
--- a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping
+++ b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack
 	FIELD field_40000 SEPARATOR_JOINER Lcom/google/common/base/Joiner;
 	FIELD field_40001 root Ljava/nio/file/Path;
 	METHOD  (Lnet/minecraft/class_9224;Ljava/nio/file/Path;)V
+		ARG 1 info
 		ARG 2 root
 	METHOD method_14402 isValidPath (Ljava/nio/file/Path;)Z
 		ARG 0 path
diff --git a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping
index baf797b343..44319ad1af 100644
--- a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping
+++ b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider
 	FIELD field_40044 LOGGER Lorg/slf4j/Logger;
 	FIELD field_40045 type Lnet/minecraft/class_3264;
 	FIELD field_45054 symlinkFinder Lnet/minecraft/class_8580;
+	FIELD field_49034 POSITION Lnet/minecraft/class_9225;
 	METHOD  (Ljava/nio/file/Path;Lnet/minecraft/class_3264;Lnet/minecraft/class_5352;Lnet/minecraft/class_8580;)V
 		ARG 1 packsDir
 		ARG 2 type
@@ -12,8 +13,12 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider
 	METHOD method_45271 forEachProfile (Ljava/nio/file/Path;Lnet/minecraft/class_8580;Ljava/util/function/BiConsumer;)V
 		ARG 0 path
 		ARG 1 symlinkFinder
+		ARG 2 callback
 	METHOD method_45272 (Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_3288$class_7680;)V
+		ARG 2 path
 		ARG 3 packFactory
 	METHOD method_45273 getFileName (Ljava/nio/file/Path;)Ljava/lang/String;
 		ARG 0 path
+	METHOD method_56930 createPackInfo (Ljava/nio/file/Path;)Lnet/minecraft/class_9224;
+		ARG 1 path
 	CLASS class_8620 PackOpenerImpl
diff --git a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping
index 0998ba103c..c302aa69a7 100644
--- a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping
+++ b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping
@@ -30,11 +30,11 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
 		ARG 0 pack
 		ARG 1 idToEntryList
 	METHOD method_41260 addPack (Ljava/lang/String;Lnet/minecraft/class_3262;Ljava/util/function/Predicate;)V
-		ARG 1 name
+		ARG 1 id
 		ARG 2 underlyingPack
 		ARG 3 filter
 	METHOD method_41261 addPack (Ljava/lang/String;Ljava/util/function/Predicate;)V
-		ARG 1 name
+		ARG 1 id
 		ARG 2 filter
 	METHOD method_43035 createMetadataSupplier (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_7367;
 		ARG 1 id
@@ -71,7 +71,7 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
 		METHOD  (Ljava/io/InputStream;Lnet/minecraft/class_2960;Ljava/lang/String;)V
 			ARG 1 parent
 			ARG 2 id
-			ARG 3 packName
+			ARG 3 packId
 	CLASS class_7081 EntryList
 		FIELD comp_1005 id Lnet/minecraft/class_2960;
 		FIELD comp_527 metadataId Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping
index 6ebcf30728..845c34a755 100644
--- a/mappings/net/minecraft/resource/Resource.mapping
+++ b/mappings/net/minecraft/resource/Resource.mapping
@@ -16,16 +16,17 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource
 		ARG 1 pack
 		ARG 2 inputSupplier
 		ARG 3 metadataSupplier
-	METHOD method_14480 getResourcePackName ()Ljava/lang/String;
-		COMMENT Returns the user-friendly name of the pack this resource is from.
+	METHOD method_14480 getPackId ()Ljava/lang/String;
+		COMMENT {@return the ID of the pack this resource is from}
 	METHOD method_14481 getMetadata ()Lnet/minecraft/class_7368;
 		COMMENT {@return the metadata for the resource}
 		COMMENT
 		COMMENT 
    The metadata must then be decoded using
 		COMMENT {@link ResourceMetadata#decode(ResourceMetadataReader)} before using.
 	METHOD method_14482 getInputStream ()Ljava/io/InputStream;
-		COMMENT Returns the input stream of this resource.
+		COMMENT {@return the input stream of this resource}
 		COMMENT
 		COMMENT 
    This input stream is closed when this resource is closed.
 	METHOD method_43039 getReader ()Ljava/io/BufferedReader;
 	METHOD method_45304 getPack ()Lnet/minecraft/class_3262;
+	METHOD method_56936 getKnownPackInfo ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/resource/ResourceFactory.mapping b/mappings/net/minecraft/resource/ResourceFactory.mapping
index 7a23b9baf0..6dbecb9180 100644
--- a/mappings/net/minecraft/resource/ResourceFactory.mapping
+++ b/mappings/net/minecraft/resource/ResourceFactory.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_5912 net/minecraft/resource/ResourceFactory
 	COMMENT Provides resource access.
+	FIELD field_49043 MISSING Lnet/minecraft/class_5912;
 	METHOD fromMap (Ljava/util/Map;)Lnet/minecraft/class_5912;
 		ARG 0 map
 	METHOD getResourceOrThrow (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298;
@@ -15,6 +16,8 @@ CLASS net/minecraft/class_5912 net/minecraft/resource/ResourceFactory
 			COMMENT the resource identifier to search for
 	METHOD method_45307 (Ljava/util/Map;Lnet/minecraft/class_2960;)Ljava/util/Optional;
 		ARG 1 id
+	METHOD method_56937 (Lnet/minecraft/class_2960;)Ljava/util/Optional;
+		ARG 0 id
 	METHOD open (Lnet/minecraft/class_2960;)Ljava/io/InputStream;
 		ARG 1 id
 	METHOD openAsReader (Lnet/minecraft/class_2960;)Ljava/io/BufferedReader;
diff --git a/mappings/net/minecraft/resource/ResourcePack.mapping b/mappings/net/minecraft/resource/ResourcePack.mapping
index 51f0c0d38b..0eceaf7671 100644
--- a/mappings/net/minecraft/resource/ResourcePack.mapping
+++ b/mappings/net/minecraft/resource/ResourcePack.mapping
@@ -19,7 +19,9 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack
 		ARG 2 namespace
 		ARG 3 prefix
 		ARG 4 consumer
-	METHOD method_14409 getName ()Ljava/lang/String;
+	METHOD method_14409 getId ()Ljava/lang/String;
 	METHOD method_14410 openRoot ([Ljava/lang/String;)Lnet/minecraft/class_7367;
 		ARG 1 segments
+	METHOD method_56926 getInfo ()Lnet/minecraft/class_9224;
+	METHOD method_56929 getKnownPackInfo ()Ljava/util/Optional;
 	CLASS class_7664 ResultConsumer
diff --git a/mappings/net/minecraft/resource/ResourcePackInfo.mapping b/mappings/net/minecraft/resource/ResourcePackInfo.mapping
new file mode 100644
index 0000000000..52f30fc2d0
--- /dev/null
+++ b/mappings/net/minecraft/resource/ResourcePackInfo.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9224 net/minecraft/resource/ResourcePackInfo
+	METHOD method_56927 getInformationText (ZLnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
+		ARG 1 enabled
+		ARG 2 description
+	METHOD method_56928 (ZLnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
+		ARG 3 style
diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping
index 69c508ff45..023bb66721 100644
--- a/mappings/net/minecraft/resource/ResourcePackManager.mapping
+++ b/mappings/net/minecraft/resource/ResourcePackManager.mapping
@@ -13,15 +13,15 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager
 	METHOD method_14447 setEnabledProfiles (Ljava/util/Collection;)V
 		ARG 1 enabled
 	METHOD method_14449 getProfile (Ljava/lang/String;)Lnet/minecraft/class_3288;
-		ARG 1 name
-	METHOD method_29206 getNames ()Ljava/util/Collection;
+		ARG 1 id
+	METHOD method_29206 getIds ()Ljava/util/Collection;
 	METHOD method_29207 hasProfile (Ljava/lang/String;)Z
-		ARG 1 name
+		ARG 1 id
 	METHOD method_29208 buildEnabledProfiles (Ljava/util/Collection;)Ljava/util/List;
 		ARG 1 enabledNames
-	METHOD method_29209 streamProfilesByName (Ljava/util/Collection;)Ljava/util/stream/Stream;
-		ARG 1 names
-	METHOD method_29210 getEnabledNames ()Ljava/util/Collection;
+	METHOD method_29209 streamProfilesById (Ljava/util/Collection;)Ljava/util/stream/Stream;
+		ARG 1 ids
+	METHOD method_29210 getEnabledIds ()Ljava/util/Collection;
 	METHOD method_29211 createResourcePacks ()Ljava/util/List;
 	METHOD method_29212 providePackProfiles ()Ljava/util/Map;
 	METHOD method_29484 (Ljava/util/Map;Lnet/minecraft/class_3288;)V
diff --git a/mappings/net/minecraft/resource/ResourcePackPosition.mapping b/mappings/net/minecraft/resource/ResourcePackPosition.mapping
new file mode 100644
index 0000000000..b59b971bd9
--- /dev/null
+++ b/mappings/net/minecraft/resource/ResourcePackPosition.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9225 net/minecraft/resource/ResourcePackPosition
diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping
index 8cae08c26e..d457f50503 100644
--- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping
+++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping
@@ -10,10 +10,14 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
 	COMMENT 
    Closing the profile doesn't have any effect.
 	FIELD field_14273 packFactory Lnet/minecraft/class_3288$class_7680;
 	FIELD field_14279 LOGGER Lorg/slf4j/Logger;
+	FIELD field_49037 info Lnet/minecraft/class_9224;
 	FIELD field_49038 metaData Lnet/minecraft/class_3288$class_7679;
+	FIELD field_49039 position Lnet/minecraft/class_9225;
 	METHOD  (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_9225;)V
+		ARG 1 info
 		ARG 2 packFactory
 		ARG 3 metaData
+		ARG 4 position
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561;
@@ -22,19 +26,26 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
 	METHOD method_14460 getCompatibility ()Lnet/minecraft/class_3281;
 	METHOD method_14461 getInformationText (Z)Lnet/minecraft/class_2561;
 		ARG 1 enabled
-	METHOD method_14463 getName ()Ljava/lang/String;
-	METHOD method_14464 isAlwaysEnabled ()Z
+	METHOD method_14463 getId ()Ljava/lang/String;
+	METHOD method_14464 isRequired ()Z
 	METHOD method_14465 isPinned ()Z
 	METHOD method_14466 getInitialPosition ()Lnet/minecraft/class_3288$class_3289;
 	METHOD method_29483 getSource ()Lnet/minecraft/class_5352;
 	METHOD method_45274 loadMetadata (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;I)Lnet/minecraft/class_3288$class_7679;
+		ARG 0 info
 		ARG 1 packFactory
 		ARG 2 currentPackFormat
 	METHOD method_45275 create (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3264;Lnet/minecraft/class_9225;)Lnet/minecraft/class_3288;
+		ARG 0 info
+		ARG 1 packFactory
+		ARG 2 type
+		ARG 3 position
 	METHOD method_45276 getRequestedFeatures ()Lnet/minecraft/class_7699;
 	METHOD method_52440 getSupportedFormats (Ljava/lang/String;Lnet/minecraft/class_3272;)Lnet/minecraft/class_6497;
-		ARG 0 packName
+		ARG 0 packId
 		ARG 1 metadata
+	METHOD method_56933 getInfo ()Lnet/minecraft/class_9224;
+	METHOD method_56934 getPosition ()Lnet/minecraft/class_9225;
 	CLASS class_3289 InsertionPosition
 		METHOD method_14467 inverse ()Lnet/minecraft/class_3288$class_3289;
 		METHOD method_14468 insert (Ljava/util/List;Ljava/lang/Object;Ljava/util/function/Function;Z)I
@@ -45,5 +56,7 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
 	CLASS class_7679 Metadata
 	CLASS class_7680 PackFactory
 		METHOD method_52424 open (Lnet/minecraft/class_9224;)Lnet/minecraft/class_3262;
+			ARG 1 info
 		METHOD method_52425 openWithOverlays (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7679;)Lnet/minecraft/class_3262;
+			ARG 1 info
 			ARG 2 metadata
diff --git a/mappings/net/minecraft/resource/ResourcePackProvider.mapping b/mappings/net/minecraft/resource/ResourcePackProvider.mapping
index 0e30669bb3..26444888c2 100644
--- a/mappings/net/minecraft/resource/ResourcePackProvider.mapping
+++ b/mappings/net/minecraft/resource/ResourcePackProvider.mapping
@@ -5,6 +5,6 @@ CLASS net/minecraft/class_3285 net/minecraft/resource/ResourcePackProvider
 		COMMENT Register resource pack profiles created with the {@code factory} to the
 		COMMENT {@code profileAdder}.
 		COMMENT
-		COMMENT @see ResourcePackProfile#of
+		COMMENT @see ResourcePackProfile
 		ARG 1 profileAdder
 			COMMENT the profile adder that accepts created resource pack profiles
diff --git a/mappings/net/minecraft/resource/ResourcePackSource.mapping b/mappings/net/minecraft/resource/ResourcePackSource.mapping
index a743d00cfe..57f3d1dacf 100644
--- a/mappings/net/minecraft/resource/ResourcePackSource.mapping
+++ b/mappings/net/minecraft/resource/ResourcePackSource.mapping
@@ -12,6 +12,6 @@ CLASS net/minecraft/class_5352 net/minecraft/resource/ResourcePackSource
 		ARG 0 sourceTextSupplier
 		ARG 1 canBeEnabledLater
 	METHOD method_45282 decorate (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
-		ARG 1 packName
+		ARG 1 packDisplayName
 	METHOD method_45283 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
 		ARG 1 name
diff --git a/mappings/net/minecraft/resource/ResourceType.mapping b/mappings/net/minecraft/resource/ResourceType.mapping
index 8ee9c05dae..401321dfe7 100644
--- a/mappings/net/minecraft/resource/ResourceType.mapping
+++ b/mappings/net/minecraft/resource/ResourceType.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_3264 net/minecraft/resource/ResourceType
 	FIELD field_14189 directory Ljava/lang/String;
 	METHOD  (Ljava/lang/String;ILjava/lang/String;)V
-		ARG 3 name
+		ARG 3 directory
 	METHOD method_14413 getDirectory ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping
index 0c95c1ebe0..0dcd866cf4 100644
--- a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping
+++ b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping
@@ -3,6 +3,9 @@ CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider
 	FIELD field_40051 METADATA Lnet/minecraft/class_3272;
 	FIELD field_40052 FEATURE_FLAGS Lnet/minecraft/class_7663;
 	FIELD field_40053 ID Lnet/minecraft/class_2960;
+	FIELD field_49040 INFO Lnet/minecraft/class_9224;
+	FIELD field_49041 BOTTOM_POSITION Lnet/minecraft/class_9225;
+	FIELD field_49042 TOP_POSITION Lnet/minecraft/class_9225;
 	METHOD  (Lnet/minecraft/class_8580;)V
 		ARG 1 symlinkFinder
 	METHOD method_45285 createManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283;
@@ -11,4 +14,9 @@ CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider
 		ARG 0 dataPacksPath
 		ARG 1 symlinkFinder
 	METHOD method_45287 createDefaultPack ()Lnet/minecraft/class_3268;
-	METHOD method_52443 createRealmsManager ()Lnet/minecraft/class_3283;
+	METHOD method_52442 (Ljava/nio/file/Path;)Z
+		ARG 0 path
+	METHOD method_52443 createClientManager ()Lnet/minecraft/class_3283;
+	METHOD method_56935 createInfo (Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_9224;
+		ARG 0 id
+		ARG 1 title
diff --git a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping
index 8b90b61064..f6d52a0241 100644
--- a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping
+++ b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping
@@ -5,6 +5,7 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide
 	FIELD field_40042 resourcePack Lnet/minecraft/class_3268;
 	FIELD field_40043 id Lnet/minecraft/class_2960;
 	FIELD field_45052 symlinkFinder Lnet/minecraft/class_8580;
+	FIELD field_49033 VANILLA_ID Lnet/minecraft/class_9226;
 	METHOD  (Lnet/minecraft/class_3264;Lnet/minecraft/class_3268;Lnet/minecraft/class_2960;Lnet/minecraft/class_8580;)V
 		ARG 1 type
 		ARG 2 resourcePack
@@ -14,11 +15,11 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide
 	METHOD method_45257 createDefault (Lnet/minecraft/class_3262;)Lnet/minecraft/class_3288;
 		ARG 1 pack
 	METHOD method_45258 (Lnet/minecraft/class_3288$class_7680;Ljava/lang/String;)Lnet/minecraft/class_3288;
-		ARG 2 name
-	METHOD method_45259 getProfileName (Ljava/lang/String;)Lnet/minecraft/class_2561;
+		ARG 2 id
+	METHOD method_45259 getDisplayName (Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 1 id
 	METHOD method_45260 create (Ljava/lang/String;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_2561;)Lnet/minecraft/class_3288;
-		ARG 1 name
+		ARG 1 fileName
 		ARG 2 packFactory
 		ARG 3 displayName
 	METHOD method_45261 getFileName (Ljava/nio/file/Path;)Ljava/lang/String;
@@ -34,7 +35,7 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide
 		ARG 2 profilePath
 		ARG 3 factory
 	METHOD method_45266 (Ljava/util/function/Consumer;Ljava/lang/String;Ljava/util/function/Function;)V
-		ARG 1 fileName
+		ARG 1 id
 		ARG 2 packFactory
 	METHOD method_45267 forEachProfile (Ljava/util/function/Consumer;)V
 		ARG 1 consumer
diff --git a/mappings/net/minecraft/resource/ZipResourcePack.mapping b/mappings/net/minecraft/resource/ZipResourcePack.mapping
index 549a6e2f6f..8f349ad248 100644
--- a/mappings/net/minecraft/resource/ZipResourcePack.mapping
+++ b/mappings/net/minecraft/resource/ZipResourcePack.mapping
@@ -3,7 +3,9 @@ CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack
 	FIELD field_45038 zipFile Lnet/minecraft/class_3258$class_8616;
 	FIELD field_45039 overlay Ljava/lang/String;
 	METHOD  (Lnet/minecraft/class_9224;Lnet/minecraft/class_3258$class_8616;Ljava/lang/String;)V
+		ARG 1 info
 		ARG 2 zipFile
+		ARG 3 overlay
 	METHOD method_14391 openFile (Ljava/lang/String;)Lnet/minecraft/class_7367;
 		ARG 1 path
 	METHOD method_45177 toPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String;
diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping
index 8a09141a39..b908d2ff7e 100644
--- a/mappings/net/minecraft/server/function/CommandFunction.mapping
+++ b/mappings/net/minecraft/server/function/CommandFunction.mapping
@@ -9,6 +9,8 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction
 		ARG 0 dispatcher
 		ARG 1 source
 		ARG 2 reader
+	METHOD method_57057 validateCommandLength (Ljava/lang/CharSequence;)V
+		ARG 0 command
 	METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Ljava/util/List;)Lnet/minecraft/class_2158;
 		COMMENT Parses a function in the context of {@code source}.
 		COMMENT
diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
index 22743d8862..a57a5cde35 100644
--- a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
+++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
@@ -5,6 +5,7 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN
 	FIELD field_45023 tasks Ljava/util/Queue;
 	FIELD field_45024 currentTask Lnet/minecraft/class_8605;
 	FIELD field_46157 syncedOptions Lnet/minecraft/class_8791;
+	FIELD field_49026 synchronizedRegistriesTask Lnet/minecraft/class_9223;
 	METHOD method_52406 onTaskFinished (Lnet/minecraft/class_8605$class_8606;)V
 		ARG 1 key
 	METHOD method_52407 (Lnet/minecraft/server/MinecraftServer$class_7460;)V
@@ -13,3 +14,5 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN
 	METHOD method_52410 endConfiguration ()V
 	METHOD method_52411 queueSendResourcePackTask ()V
 	METHOD method_52412 pollTask ()V
+	METHOD method_56530 (Lnet/minecraft/class_3262;)Ljava/util/stream/Stream;
+		ARG 0 pack
diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping
index 5f84c693fe..a516183dd8 100644
--- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping
@@ -39,6 +39,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	FIELD field_45026 chunkDataSender Lnet/minecraft/class_8608;
 	METHOD  (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;Lnet/minecraft/class_8792;)V
 		ARG 1 server
+		ARG 2 connection
 		ARG 3 player
 		ARG 4 clientData
 	METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V
@@ -175,6 +176,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	METHOD method_48107 getConnectionAddress ()Ljava/net/SocketAddress;
 	METHOD method_52414 reconfigure ()V
 	METHOD method_52415 cleanUp ()V
+	METHOD method_56922 getMaxAllowedFloatingTicks (Lnet/minecraft/class_1297;)I
+		ARG 1 vehicle
 	CLASS 1
 		METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V
 			ARG 1 hand
diff --git a/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping b/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping
index b33004bb01..70675f8003 100644
--- a/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping
+++ b/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping
@@ -1,2 +1,16 @@
 CLASS net/minecraft/class_9223 net/minecraft/server/network/SynchronizeRegistriesTask
 	FIELD field_49028 KEY Lnet/minecraft/class_8605$class_8606;
+	FIELD field_49029 knownPacks Ljava/util/List;
+	FIELD field_49030 registries Lnet/minecraft/class_7780;
+	METHOD  (Ljava/util/List;Lnet/minecraft/class_7780;)V
+		ARG 1 knownPacks
+		ARG 2 registries
+	METHOD method_56923 onSelectKnownPacks (Ljava/util/List;Ljava/util/function/Consumer;)V
+		ARG 1 clientKnownPacks
+		ARG 2 sender
+	METHOD method_56924 (Ljava/util/function/Consumer;Lnet/minecraft/class_5321;Ljava/util/List;)V
+		ARG 1 key
+		ARG 2 entries
+	METHOD method_56925 syncRegistryAndTags (Ljava/util/function/Consumer;Ljava/util/Set;)V
+		ARG 1 sender
+		ARG 2 commonKnownPacks
diff --git a/mappings/net/minecraft/test/Batches.mapping b/mappings/net/minecraft/test/Batches.mapping
index aaeb48ea6e..addb73993b 100644
--- a/mappings/net/minecraft/test/Batches.mapping
+++ b/mappings/net/minecraft/test/Batches.mapping
@@ -1,10 +1,16 @@
 CLASS net/minecraft/class_9113 net/minecraft/test/Batches
 	FIELD field_48467 BATCH_SIZE I
 	METHOD method_56188 defaultBatcher ()Lnet/minecraft/class_4520$class_9116;
+	METHOD method_56189 (Lnet/minecraft/class_3218;Ljava/lang/String;Ljava/util/List;J)Lnet/minecraft/class_4514;
+		ARG 2 states
+		ARG 3 index
 	METHOD method_56190 (Lnet/minecraft/class_3218;Ljava/util/Map$Entry;)Ljava/util/stream/Stream;
 		ARG 1 entry
 	METHOD method_56191 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517;
 		ARG 1 testFunction
+	METHOD method_56192 (Ljava/lang/String;Ljava/util/List;J)Lnet/minecraft/class_4514;
+		ARG 1 states
+		ARG 2 index
 	METHOD method_56193 (Ljava/util/Collection;)Ljava/util/Collection;
 		ARG 0 states
 	METHOD method_56194 createBatches (Ljava/util/Collection;Lnet/minecraft/class_3218;)Ljava/util/Collection;
@@ -13,6 +19,7 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches
 	METHOD method_56195 create (Ljava/util/List;Ljava/lang/String;J)Lnet/minecraft/class_4514;
 		ARG 0 states
 		ARG 1 batchId
+		ARG 2 index
 	METHOD method_56196 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream;
 		ARG 0 entry
 	METHOD method_56197 (Lnet/minecraft/class_4517;)Ljava/lang/String;
diff --git a/mappings/net/minecraft/test/TestRunContext.mapping b/mappings/net/minecraft/test/TestRunContext.mapping
index 209d173b75..df3cd59445 100644
--- a/mappings/net/minecraft/test/TestRunContext.mapping
+++ b/mappings/net/minecraft/test/TestRunContext.mapping
@@ -43,6 +43,8 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestRunContext
 	METHOD method_56230 (Lnet/minecraft/class_4517;)V
 		ARG 0 state
 	METHOD method_56231 onFinish ()V
+	METHOD method_57072 (Lnet/minecraft/class_4517;)Ljava/lang/String;
+		ARG 0 state
 	CLASS 1
 		METHOD method_56232 onFinished ()V
 		METHOD method_56233 (J)V
diff --git a/mappings/net/minecraft/util/collection/Class2IntMap.mapping b/mappings/net/minecraft/util/collection/Class2IntMap.mapping
new file mode 100644
index 0000000000..56eafd2e5e
--- /dev/null
+++ b/mappings/net/minecraft/util/collection/Class2IntMap.mapping
@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_9227 net/minecraft/util/collection/Class2IntMap
+	COMMENT A map with {@link Class}es as keys and an integer as values.
+	COMMENT If the entry for the provided class does not exist, then it recursively checks
+	COMMENT their superclasses.
+	FIELD field_49052 MISSING I
+	FIELD field_49053 backingMap Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	METHOD method_56939 get (Ljava/lang/Class;)I
+		ARG 1 clazz
+	METHOD method_56940 getNext (Ljava/lang/Class;)I
+		ARG 1 clazz
+	METHOD method_56941 put (Ljava/lang/Class;)I
+		ARG 1 clazz
diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping
index 8e413c95ce..0745e57c45 100644
--- a/mappings/net/minecraft/util/dynamic/Codecs.mapping
+++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping
@@ -304,6 +304,9 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
 	METHOD method_56627 createRecursiveMap (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
 	METHOD method_56907 (Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult;
 		ARG 0 value
+	METHOD method_56942 withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
+		ARG 0 originalCodec
+		ARG 1 lifecycleGetter
 	CLASS 1
 		METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult;
 			ARG 1 ops
diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping
index 9c6de23f78..33e860c353 100644
--- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping
@@ -12,14 +12,26 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler
 		ARG 3 targetStatus
 	METHOD method_38656 onPacketReceived (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V
 		ARG 1 state
+		ARG 2 type
 		ARG 3 remoteAddress
 		ARG 4 bytes
 	METHOD method_38657 onPacketSent (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V
 		ARG 1 state
+		ARG 2 type
 		ARG 3 remoteAddress
 		ARG 4 bytes
 	METHOD method_38658 isAvailable ()Z
 	METHOD method_38659 startWorldLoadProfiling ()Lnet/minecraft/class_6613;
+	METHOD method_56979 onChunkRegionRead (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V
+		ARG 1 key
+		ARG 2 chunkPos
+		ARG 3 format
+		ARG 4 bytes
+	METHOD method_56980 onChunkRegionWrite (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V
+		ARG 1 key
+		ARG 2 chunkPos
+		ARG 3 format
+		ARG 4 bytes
 	CLASS class_6612 NoopProfiler
 		FIELD field_34924 LOGGER Lorg/slf4j/Logger;
 		FIELD field_34925 NOOP Lnet/minecraft/class_6613;
diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
index 6b8d86213c..e88a0a7d95 100644
--- a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
@@ -15,8 +15,11 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport
 		ARG 1 statistics
 	METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6767;Ljava/util/function/BiConsumer;)Lcom/google/gson/JsonElement;
 		ARG 1 statistics
+		ARG 2 callback
 	METHOD method_38015 collectThreadAllocationSection (Lnet/minecraft/class_6530$class_6531;)Lcom/google/gson/JsonElement;
 		ARG 1 statistics
+	METHOD method_38016 (Lcom/google/gson/JsonArray;Ljava/util/function/BiConsumer;Lcom/mojang/datafixers/util/Pair;)V
+		ARG 2 topContributor
 	METHOD method_38017 (Lcom/google/gson/JsonArray;Ljava/lang/String;Ljava/lang/Double;)V
 		ARG 1 threadName
 		ARG 2 allocation
@@ -51,3 +54,9 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport
 		ARG 1 samples
 	METHOD method_38664 (Lnet/minecraft/class_6532;)D
 		ARG 0 sample
+	METHOD method_56983 addChunkData (Lnet/minecraft/class_9234;Lcom/google/gson/JsonObject;)V
+		ARG 0 chunk
+		ARG 1 json
+	METHOD method_56984 addPacketData (Lnet/minecraft/class_6769;Lcom/google/gson/JsonObject;)V
+		ARG 0 packet
+		ARG 1 json
diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
index 2b22b64fb6..3fea768334 100644
--- a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
@@ -13,6 +13,8 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord
 	FIELD field_34433 threadAllocationStatisticsSamples Ljava/util/List;
 	FIELD field_34434 serverTickTimeSamples Ljava/util/List;
 	FIELD field_34435 worldGenDuration Ljava/time/Duration;
+	FIELD field_49070 chunkRegionReadCounter Ljava/util/Map;
+	FIELD field_49071 chunkRegionWriteCounter Ljava/util/Map;
 	METHOD  (Ljava/util/stream/Stream;)V
 		ARG 1 events
 	METHOD method_38000 createProfile ()Lnet/minecraft/class_6517;
@@ -37,7 +39,13 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord
 		ARG 1 event
 		ARG 2 bytes
 		ARG 3 packetsToCounter
-	CLASS class_6766 PacketCounter
+	METHOD method_56981 (Lnet/minecraft/class_9234;)Lnet/minecraft/class_6516$class_6766;
+		ARG 0 chunk
+	METHOD method_56982 addChunkRegionEvent (Ljdk/jfr/consumer/RecordedEvent;ILjava/util/Map;)V
+		ARG 1 event
+		ARG 2 bytes
+		ARG 3 chunksToCounter
+	CLASS class_6766 Counter
 		FIELD field_35581 totalCount J
 		FIELD field_35582 totalBytes J
 		METHOD method_39436 toStatistics ()Lnet/minecraft/class_6767$class_6768;
diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping
index 34905ac76b..efce971007 100644
--- a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping
@@ -11,6 +11,7 @@ CLASS net/minecraft/class_6505 net/minecraft/util/profiling/jfr/JfrProfiler
 	FIELD field_35576 INSTANCE Lnet/minecraft/class_6505;
 	FIELD field_35577 tickTime F
 	FIELD field_35578 summaryRecorderByAddress Ljava/util/Map;
+	FIELD field_49058 STORAGE Ljava/lang/String;
 	METHOD method_37982 (Lnet/minecraft/class_6506;Ljava/lang/String;Ljdk/jfr/Recording;)V
 		ARG 2 recording
 	METHOD method_37983 start (Ljava/io/Reader;Lnet/minecraft/class_6506;)Z
diff --git a/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping
index 0d477585c1..e8be28e5c0 100644
--- a/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping
@@ -1,16 +1,19 @@
 CLASS net/minecraft/class_9232 net/minecraft/util/profiling/jfr/event/ChunkRegionEvent
 	FIELD levelId worldId Ljava/lang/String;
 	METHOD  (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V
+		ARG 1 key
+		ARG 2 chunkPos
+		ARG 3 format
 		ARG 4 bytes
-	CLASS class_9233 Constants
-		FIELD field_49059 regionPosX Ljava/lang/String;
-		FIELD field_49060 regionPosZ Ljava/lang/String;
-		FIELD field_49061 localPosX Ljava/lang/String;
-		FIELD field_49062 localPosZ Ljava/lang/String;
-		FIELD field_49063 chunkPosX Ljava/lang/String;
-		FIELD field_49064 chunkPosZ Ljava/lang/String;
-		FIELD field_49065 world Ljava/lang/String;
-		FIELD field_49066 dimension Ljava/lang/String;
-		FIELD field_49067 type Ljava/lang/String;
-		FIELD field_49068 compression Ljava/lang/String;
-		FIELD field_49069 bytes Ljava/lang/String;
+	CLASS class_9233 Names
+		FIELD field_49059 REGION_POS_X Ljava/lang/String;
+		FIELD field_49060 REGION_POS_Z Ljava/lang/String;
+		FIELD field_49061 LOCAL_POS_X Ljava/lang/String;
+		FIELD field_49062 LOCAL_POS_Z Ljava/lang/String;
+		FIELD field_49063 CHUNK_POS_X Ljava/lang/String;
+		FIELD field_49064 CHUNK_POS_Z Ljava/lang/String;
+		FIELD field_49065 LEVEL Ljava/lang/String;
+		FIELD field_49066 DIMENSION Ljava/lang/String;
+		FIELD field_49067 TYPE Ljava/lang/String;
+		FIELD field_49068 COMPRESSION Ljava/lang/String;
+		FIELD field_49069 BYTES Ljava/lang/String;
diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping
new file mode 100644
index 0000000000..336045d5f9
--- /dev/null
+++ b/mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_9234 net/minecraft/util/profiling/jfr/sample/ChunkRegionSample
+	METHOD method_56985 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_9234;
+		ARG 0 event
diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping
index e1ac280700..145226f36e 100644
--- a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping
@@ -14,3 +14,4 @@ CLASS net/minecraft/class_6767 net/minecraft/util/profiling/jfr/sample/NetworkIo
 		FIELD field_35586 COMPARATOR Ljava/util/Comparator;
 		METHOD method_39444 add (Lnet/minecraft/class_6767$class_6768;)Lnet/minecraft/class_6767$class_6768;
 			ARG 1 statistics
+		METHOD method_56986 getAverageSize ()F
diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping
similarity index 92%
rename from mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping
rename to mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping
index cc4e3508cb..11189c9003 100644
--- a/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_6769 net/minecraft/util/profiling/jfr/sample/Packet
+CLASS net/minecraft/class_6769 net/minecraft/util/profiling/jfr/sample/PacketSample
 	FIELD comp_259 side Ljava/lang/String;
 	METHOD comp_259 side ()Ljava/lang/String;
 	METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6769;
diff --git a/mappings/net/minecraft/world/gen/WorldPresets.mapping b/mappings/net/minecraft/world/gen/WorldPresets.mapping
index dbea58e7cc..37338b4b22 100644
--- a/mappings/net/minecraft/world/gen/WorldPresets.mapping
+++ b/mappings/net/minecraft/world/gen/WorldPresets.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets
 	METHOD method_41593 bootstrap (Lnet/minecraft/class_7891;)V
 		ARG 0 presetRegisterable
 	METHOD method_41594 getWorldPreset (Lnet/minecraft/class_7723;)Ljava/util/Optional;
+		ARG 0 registry
 	METHOD method_41597 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
 	METHOD method_41598 createDemoOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723;
diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping
index d5a57f3b28..1a7f5e53b4 100644
--- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping
+++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping
@@ -1,6 +1,13 @@
 CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
 	FIELD field_18484 pointOfInterestDistanceTracker Lnet/minecraft/class_4153$class_4154;
 	FIELD field_20688 preloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet;
+	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V
+		ARG 1 storageKey
+		ARG 2 directory
+		ARG 3 dataFixer
+		ARG 4 dsync
+		ARG 5 registryManager
+		ARG 6 world
 	METHOD method_19112 remove (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
 	METHOD method_19113 (Lnet/minecraft/class_2338;ILnet/minecraft/class_4156;)Z
diff --git a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
index a7beb15489..b771e2eacc 100644
--- a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
+++ b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
@@ -3,6 +3,10 @@ CLASS net/minecraft/class_9172 net/minecraft/world/storage/ChunkPosKeyedStorage
 	FIELD field_48761 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_48762 dataFixTypes Lnet/minecraft/class_4284;
 	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_4284;)V
+		ARG 1 storageKey
+		ARG 2 directory
+		ARG 3 dataFixer
+		ARG 4 dsync
 		ARG 5 dataFixTypes
 	METHOD method_56565 set (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 pos
diff --git a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
index 3096ef698a..3c927b5dca 100644
--- a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
+++ b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
@@ -1,3 +1,10 @@
 CLASS net/minecraft/class_9170 net/minecraft/world/storage/RecreatedChunkStorage
 	FIELD field_48748 recreationWorker Lnet/minecraft/class_4698;
 	FIELD field_48749 outputDirectory Ljava/nio/file/Path;
+	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V
+		ARG 1 storageKey
+		ARG 2 directory
+		ARG 3 outputStorageKey
+		ARG 4 outputDirectory
+		ARG 5 dataFixer
+		ARG 6 dsync
diff --git a/mappings/net/minecraft/world/storage/RecreationStorage.mapping b/mappings/net/minecraft/world/storage/RecreationStorage.mapping
index cef5cd7b30..ba61b20a00 100644
--- a/mappings/net/minecraft/world/storage/RecreationStorage.mapping
+++ b/mappings/net/minecraft/world/storage/RecreationStorage.mapping
@@ -1,3 +1,11 @@
 CLASS net/minecraft/class_9171 net/minecraft/world/storage/RecreationStorage
 	FIELD field_48750 recreationWorker Lnet/minecraft/class_4698;
 	FIELD field_48751 outputDirectory Ljava/nio/file/Path;
+	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_4284;)V
+		ARG 1 storageKey
+		ARG 2 directory
+		ARG 3 outputStorageKey
+		ARG 4 outputDirectory
+		ARG 5 dataFixer
+		ARG 6 dsync
+		ARG 7 dataFixTypes
diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping
index a42ff95720..79121168f7 100644
--- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping
+++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping
@@ -4,6 +4,11 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage
 	FIELD field_23748 dsync Z
 	FIELD field_31425 MCA_EXTENSION Ljava/lang/String;
 	FIELD field_31426 MAX_CACHE_SIZE I
+	FIELD field_49103 storageKey Lnet/minecraft/class_9240;
+	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Z)V
+		ARG 1 storageKey
+		ARG 2 directory
+		ARG 3 dsync
 	METHOD method_12440 getRegionFile (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2861;
 		ARG 1 pos
 	METHOD method_17911 getTagAt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487;
diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping
index 442064177f..d2ebeb8721 100644
--- a/mappings/net/minecraft/world/storage/RegionFile.mapping
+++ b/mappings/net/minecraft/world/storage/RegionFile.mapping
@@ -11,8 +11,18 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	FIELD field_31417 SECTOR_DATA_LIMIT I
 	FIELD field_31421 FILE_EXTENSION Ljava/lang/String;
 	FIELD field_48752 path Ljava/nio/file/Path;
+	FIELD field_49102 storageKey Lnet/minecraft/class_9240;
+	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V
+		ARG 1 storageKey
+		ARG 2 path
+		ARG 3 directory
+		ARG 4 compressionFormat
+		ARG 5 dsync
 	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V
+		ARG 1 storageKey
 		ARG 2 directory
+		ARG 3 path
+		ARG 4 dsync
 	METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I
 		ARG 1 pos
 	METHOD method_12423 hasChunk (Lnet/minecraft/class_1923;)Z
diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
index 1f78a2716e..807bf7ad28 100644
--- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
+++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
@@ -6,6 +6,10 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker
 	FIELD field_24468 executor Lnet/minecraft/class_3846;
 	FIELD field_38240 blendingStatusCaches Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
 	FIELD field_38241 MAX_CACHE_SIZE I
+	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Z)V
+		ARG 1 storageKey
+		ARG 2 directory
+		ARG 3 dsync
 	METHOD method_23698 completeAll (Z)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 sync
 	METHOD method_23701 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_4698$class_4699;)V
diff --git a/mappings/net/minecraft/world/storage/StorageKey.mapping b/mappings/net/minecraft/world/storage/StorageKey.mapping
new file mode 100644
index 0000000000..bb42a9adef
--- /dev/null
+++ b/mappings/net/minecraft/world/storage/StorageKey.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_9240 net/minecraft/world/storage/StorageKey
+	METHOD method_57013 withSuffix (Ljava/lang/String;)Lnet/minecraft/class_9240;
+		ARG 1 suffix
diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
index 2cbf14c1df..da6ad4643c 100644
--- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
+++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
@@ -3,6 +3,11 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage
 	FIELD field_17655 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_21494 worker Lnet/minecraft/class_4698;
 	FIELD field_36219 FEATURE_UPDATING_VERSION I
+	METHOD  (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V
+		ARG 1 storageKey
+		ARG 2 directory
+		ARG 3 dataFixer
+		ARG 4 dsync
 	METHOD method_17907 updateChunkNbt (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;Ljava/util/Optional;)Lnet/minecraft/class_2487;
 		ARG 1 worldKey
 		ARG 2 persistentStateManagerFactory
diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
index 9eebe666c2..0d050c27cc 100644
--- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping
+++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
@@ -46,18 +46,29 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	METHOD method_5402 cancel ()V
 	METHOD method_5403 isDone ()Z
 	METHOD method_5404 updateWorld ()V
+	METHOD method_56987 getNewDirectoryPath (Ljava/nio/file/Path;)Ljava/nio/file/Path;
+		ARG 0 current
 	CLASS class_9161 Update
 		FIELD field_48732 pendingUpdateFuture Ljava/util/concurrent/CompletableFuture;
 		FIELD field_48733 dataFixTypes Lnet/minecraft/class_4284;
 		FIELD field_48735 upgradingText Lnet/minecraft/class_5250;
 		FIELD field_48736 finishedText Lnet/minecraft/class_5250;
 		FIELD field_48737 targetName Ljava/lang/String;
+		FIELD field_49072 name Ljava/lang/String;
+		METHOD  (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V
+			ARG 2 dataFixTypes
+			ARG 3 name
+			ARG 4 targetName
+			ARG 5 upgradingText
+			ARG 6 finishedText
 		METHOD method_56537 update ()V
 		METHOD method_56538 update (Lnet/minecraft/class_5321;Ljava/lang/AutoCloseable;Lnet/minecraft/class_1923;)Z
 			ARG 1 worldKey
 			ARG 2 storage
 			ARG 3 chunkPos
 		METHOD method_56539 listRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/List;
+			ARG 0 key
+			ARG 1 regionDirectory
 		METHOD method_56540 (Lnet/minecraft/class_1257$class_9165;)I
 			ARG 0 region
 		METHOD method_56541 recreate (Lnet/minecraft/class_2861;)V
@@ -71,7 +82,10 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 			ARG 3 worldKey
 		METHOD method_56544 listWoldData ()Ljava/util/List;
 		METHOD method_56545 enumerateRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/ListIterator;
+			ARG 1 key
+			ARG 2 regionDirectory
 		METHOD method_56546 openStorage (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable;
+			ARG 1 key
 			ARG 2 worldDirectory
 	CLASS class_9162 RegionUpdate
 	CLASS class_9163 WorldData
@@ -79,6 +93,11 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	CLASS class_9165 Region
 	CLASS class_9166 PoiUpdate
 	CLASS class_9167 ChunkPosKeyedStorageUpdate
+		METHOD  (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V
+			ARG 2 dataFixTypes
+			ARG 3 targetName
+			ARG 4 upgradingText
+			ARG 5 finishedText
 		METHOD method_56550 updateNbt (Lnet/minecraft/class_9172;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
 			ARG 1 storage
 			ARG 2 nbt

From 0904a6371686606a29f06cde1ac13f15fac099e7 Mon Sep 17 00:00:00 2001
From: Louis <82884007+Dev0Louis@users.noreply.github.com>
Date: Sat, 10 Feb 2024 13:26:09 +0100
Subject: [PATCH 37/47] Add LootableContainerBlockEntity#getHeldStacks :)
 (#3788)

* Add getInvStackList :)

* Fix error by renaming methods in LootableContainerBlockEntity.

---------

Co-authored-by: D1p4k <82884007+D1p4k@users.noreply.github.com>
---
 .../block/entity/LootableContainerBlockEntity.mapping          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping
index 5247f8c260..f3ffbc9dd8 100644
--- a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping
@@ -1,7 +1,8 @@
 CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlockEntity
 	FIELD field_12036 lootTableSeed J
 	FIELD field_12037 lootTableId Lnet/minecraft/class_2960;
-	METHOD method_11281 setInvStackList (Lnet/minecraft/class_2371;)V
+	METHOD method_11281 setHeldStacks (Lnet/minecraft/class_2371;)V
 		ARG 1 list
+	METHOD method_11282 getHeldStacks ()Lnet/minecraft/class_2371;
 	METHOD method_11285 (Lnet/minecraft/class_2960;)V
 		ARG 1 id

From 20aa9da7ee80a47a4fa03305cfa1d2bb576b6597 Mon Sep 17 00:00:00 2001
From: modmuss 
Date: Sun, 11 Feb 2024 12:39:07 +0000
Subject: [PATCH 38/47] Bump filament version

---
 filament/gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filament/gradle.properties b/filament/gradle.properties
index 36fb6e54dc..1a9a0ff206 100644
--- a/filament/gradle.properties
+++ b/filament/gradle.properties
@@ -1 +1 @@
-filament_version=0.6.2
\ No newline at end of file
+filament_version=0.7.0
\ No newline at end of file

From bd3e21e1cd577dc1b0f4ec41cc88d8933e78c7e1 Mon Sep 17 00:00:00 2001
From: Louis <82884007+Dev0Louis@users.noreply.github.com>
Date: Sun, 11 Feb 2024 18:31:56 +0100
Subject: [PATCH 39/47] ClientWorld#getStarBrightness (#3787)

Co-authored-by: D1p4k <82884007+D1p4k@users.noreply.github.com>
---
 mappings/net/minecraft/client/world/ClientWorld.mapping | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping
index 6c9ee91223..0b296e59cb 100644
--- a/mappings/net/minecraft/client/world/ClientWorld.mapping
+++ b/mappings/net/minecraft/client/world/ClientWorld.mapping
@@ -62,6 +62,8 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 	METHOD method_23784 reloadColor ()V
 	METHOD method_23785 getCloudsColor (F)Lnet/minecraft/class_243;
 		ARG 1 tickDelta
+	METHOD method_23787 getStarBrightness (F)F
+		ARG 1 tickDelta
 	METHOD method_23789 getLightningTicksLeft ()I
 	METHOD method_24462 (Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4761;)V
 		ARG 2 config

From 4674b66184231baebe54ca8bf95568fd677f25f8 Mon Sep 17 00:00:00 2001
From: ErrorCraft <51973682+ErrorCraft@users.noreply.github.com>
Date: Wed, 14 Feb 2024 16:15:43 +0100
Subject: [PATCH 40/47] Map the remaining fields in TridentItem (#3789)

---
 mappings/net/minecraft/item/TridentItem.mapping | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mappings/net/minecraft/item/TridentItem.mapping b/mappings/net/minecraft/item/TridentItem.mapping
index dbf9c1055f..812096ed15 100644
--- a/mappings/net/minecraft/item/TridentItem.mapping
+++ b/mappings/net/minecraft/item/TridentItem.mapping
@@ -1,3 +1,5 @@
 CLASS net/minecraft/class_1835 net/minecraft/item/TridentItem
 	FIELD field_23746 attributeModifiers Lcom/google/common/collect/Multimap;
+	FIELD field_30926 MIN_DRAW_DURATION I
 	FIELD field_30927 ATTACK_DAMAGE F
+	FIELD field_30928 THROW_SPEED F

From 6be03649b2916ed31d65064b6689ee352db58a38 Mon Sep 17 00:00:00 2001
From: modmuss50 
Date: Wed, 14 Feb 2024 16:16:49 +0000
Subject: [PATCH 41/47] 24w07a

---
 build.gradle                                  |  2 +-
 .../net/minecraft/block/entity/Hopper.mapping |  1 -
 mappings/net/minecraft/class_315.mapping      |  3 --
 .../StrayOverlayFeatureRenderer.mapping       |  3 +-
 .../datafixer/fix/WolfHealthFix.mapping       |  2 +-
 .../ai/pathing/BirdPathNodeMaker.mapping      |  2 +-
 .../ai/pathing/LandPathNodeMaker.mapping      | 29 ++-----------------
 .../entity/ai/pathing/PathNodeMaker.mapping   |  2 --
 .../ai/pathing/WaterPathNodeMaker.mapping     |  4 ---
 .../registry/RegistryBuilder.mapping          | 13 ++-------
 .../minecraft/registry/RegistryOps.mapping    |  2 --
 .../server/command/TeleportCommand.mapping    |  8 -----
 .../net/minecraft/test/TestFunction.mapping   |  3 +-
 13 files changed, 9 insertions(+), 65 deletions(-)
 delete mode 100644 mappings/net/minecraft/class_315.mapping

diff --git a/build.gradle b/build.gradle
index d1522ecf8e..d1fe75ac9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w06a"
+def minecraft_version = "24w07a"
 
 filament {
 	minecraftVersion = minecraft_version
diff --git a/mappings/net/minecraft/block/entity/Hopper.mapping b/mappings/net/minecraft/block/entity/Hopper.mapping
index eac4534168..dcfea7b2f9 100644
--- a/mappings/net/minecraft/block/entity/Hopper.mapping
+++ b/mappings/net/minecraft/block/entity/Hopper.mapping
@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_2615 net/minecraft/block/entity/Hopper
-	FIELD field_12025 INSIDE_SHAPE Lnet/minecraft/class_265;
 	FIELD field_12026 INPUT_AREA_SHAPE Lnet/minecraft/class_238;
 	METHOD method_11262 getInputAreaShape ()Lnet/minecraft/class_238;
 	METHOD method_11264 getHopperY ()D
diff --git a/mappings/net/minecraft/class_315.mapping b/mappings/net/minecraft/class_315.mapping
deleted file mode 100644
index 9c59be4b69..0000000000
--- a/mappings/net/minecraft/class_315.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_315
-	CLASS class_9242
-		METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V
diff --git a/mappings/net/minecraft/client/render/entity/feature/StrayOverlayFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StrayOverlayFeatureRenderer.mapping
index 49f321964f..28a2037536 100644
--- a/mappings/net/minecraft/client/render/entity/feature/StrayOverlayFeatureRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/feature/StrayOverlayFeatureRenderer.mapping
@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_1002 net/minecraft/client/render/entity/feature/StrayOverlayFeatureRenderer
-	FIELD field_4907 SKIN Lnet/minecraft/class_2960;
 	FIELD field_4908 model Lnet/minecraft/class_606;
-	METHOD  (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V
+	METHOD  (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_5601;Lnet/minecraft/class_2960;)V
 		ARG 1 context
 		ARG 2 loader
diff --git a/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping b/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping
index a75342ffe9..3c8fff5535 100644
--- a/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping
+++ b/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_9229 net/minecraft/datafixer/fix/WolfHealthFix
 	FIELD field_49054 WOLF_ENTITY_ID Ljava/lang/String;
-	FIELD field_49055 MAX_HEALTH_ATTRIBUTE_ID Lnet/minecraft/class_2960;
+	FIELD field_49055 MAX_HEALTH_ATTRIBUTE_ID Ljava/lang/String;
 	METHOD  (Lcom/mojang/datafixers/schemas/Schema;)V
 		ARG 1 outputSchema
diff --git a/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping
index 6ecd718b69..67cb2cbbee 100644
--- a/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_6 net/minecraft/entity/ai/pathing/BirdPathNodeMaker
 		ARG 1 node
 	METHOD method_22878 unvisited (Lnet/minecraft/class_9;)Z
 		ARG 1 node
-	METHOD method_31932 getNodeType (III)Lnet/minecraft/class_7;
+	METHOD method_31932 (III)Lnet/minecraft/class_7;
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping
index dd6b3abc5e..8c4a076c3b 100644
--- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping
@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker
-	FIELD field_25190 nodeTypes Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
 	FIELD field_25191 collidedBoxes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;
 	FIELD field_31809 Y_OFFSET D
 	FIELD field_40928 MIN_STEP_HEIGHT D
@@ -9,24 +8,17 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker
 	METHOD method_23476 getLandNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;)Lnet/minecraft/class_7;
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_27138 inflictsFireDamage (Lnet/minecraft/class_2680;)Z
-		ARG 0 state
-	METHOD method_29303 getNodeType (Lnet/minecraft/class_1308;III)Lnet/minecraft/class_7;
-		ARG 1 entity
-		ARG 2 x
-		ARG 3 y
-		ARG 4 z
 	METHOD method_29304 checkBoxCollision (Lnet/minecraft/class_238;)Z
 		ARG 1 box
 	METHOD method_29305 (Lnet/minecraft/class_238;Ljava/lang/Object;)Z
 		ARG 2 box2
 	METHOD method_29578 isBlocked (Lnet/minecraft/class_9;)Z
 		ARG 1 node
-	METHOD method_29579 isValidDiagonalSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z
+	METHOD method_29579 isValidDiagonalSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z
 		ARG 1 xNode
 		ARG 2 zNode
 		ARG 3 xDiagNode
-		ARG 4 zDiagNode
+	METHOD method_31932 getNodeType (III)Lnet/minecraft/class_7;
 	METHOD method_37003 getFeetY (Lnet/minecraft/class_2338;)D
 		ARG 1 pos
 	METHOD method_37004 isAmphibious ()Z
@@ -57,10 +49,6 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker
 	METHOD method_60 getFeetY (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)D
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_61 adjustNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_7;)Lnet/minecraft/class_7;
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 type
 	METHOD method_62 getPathNode (IIIIDLnet/minecraft/class_2350;Lnet/minecraft/class_7;)Lnet/minecraft/class_9;
 		ARG 1 x
 		ARG 2 y
@@ -69,16 +57,3 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker
 		ARG 5 prevFeetY
 		ARG 7 direction
 		ARG 8 nodeType
-	METHOD method_63 getNodeType (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7;
-		ARG 1 entity
-		ARG 2 pos
-	METHOD method_64 findNearbyNodeTypes (Lnet/minecraft/class_1922;IIILjava/util/EnumSet;Lnet/minecraft/class_7;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7;
-		COMMENT Adds the node types in the box with the given size to the input EnumSet.
-		COMMENT @return The node type at the least coordinates of the input box.
-		ARG 1 world
-		ARG 2 x
-		ARG 3 y
-		ARG 4 z
-		ARG 5 nearbyTypes
-		ARG 6 type
-		ARG 7 pos
diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping
index 91bbf57ab2..ef1296556a 100644
--- a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping
@@ -49,8 +49,6 @@ CLASS net/minecraft/class_8 net/minecraft/entity/ai/pathing/PathNodeMaker
 		ARG 5 mob
 	METHOD method_27137 getNode (Lnet/minecraft/class_2338;)Lnet/minecraft/class_9;
 		ARG 1 pos
-	METHOD method_43568 asTargetPathNode (Lnet/minecraft/class_9;)Lnet/minecraft/class_4459;
-		ARG 1 node
 	METHOD method_46737 setCanWalkOverFences (Z)V
 		ARG 1 canWalkOverFences
 	METHOD method_46738 canWalkOverFences ()Z
diff --git a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping
index 52ae494f54..15650ade2b 100644
--- a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping
@@ -7,10 +7,6 @@ CLASS net/minecraft/class_12 net/minecraft/entity/ai/pathing/WaterPathNodeMaker
 		ARG 4 pos
 	METHOD method_38487 hasNotVisited (Lnet/minecraft/class_9;)Z
 		ARG 1 node
-	METHOD method_38488 canPathThrough (Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z
-		ARG 1 diagonalNode
-		ARG 2 node1
-		ARG 3 node2
 	METHOD method_38489 addPathNodePos (III)Lnet/minecraft/class_7;
 		ARG 1 x
 		ARG 2 y
diff --git a/mappings/net/minecraft/registry/RegistryBuilder.mapping b/mappings/net/minecraft/registry/RegistryBuilder.mapping
index 9777983e6f..f33677b49b 100644
--- a/mappings/net/minecraft/registry/RegistryBuilder.mapping
+++ b/mappings/net/minecraft/registry/RegistryBuilder.mapping
@@ -25,10 +25,8 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		ARG 1 registry
 	METHOD method_49352 (Ljava/util/Map;Lnet/minecraft/class_7877$class_7883;)V
 		ARG 1 registry
-	METHOD method_55283 createWrapper (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_7225$class_7226;
-		ARG 0 registryRef
+	METHOD method_55283 createWrapper (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7876;Ljava/util/Map;)Lnet/minecraft/class_7225$class_7226;
 		ARG 1 lifecycle
-		ARG 2 entries
 	METHOD method_55285 (Lnet/minecraft/class_7876;Lnet/minecraft/class_5321;Lnet/minecraft/class_8990;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883;
 		ARG 6 key
 	METHOD method_55286 applyPatches (Lnet/minecraft/class_7876;Lnet/minecraft/class_8990$class_8991;Lnet/minecraft/class_5321;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;)Lnet/minecraft/class_7225$class_7226;
@@ -40,17 +38,13 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		ARG 6 lazyWrapper
 	METHOD method_55287 (Lnet/minecraft/class_7876;Lnet/minecraft/class_8990;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;Ljava/util/Map;Lnet/minecraft/class_6880$class_6883;)V
 		ARG 5 entry
-	METHOD method_55288 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_7225$class_7226;
-		ARG 0 entry
 	METHOD method_55289 createFullWrapperLookup (Lnet/minecraft/class_5455;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8990$class_8991;Ljava/util/Map;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874;
 		ARG 1 registryManager
 		ARG 2 base
 		ARG 3 cloneableRegistries
 		ARG 4 initializedRegistries
 		ARG 5 patches
-	METHOD method_55290 createWrapperLookup (Lnet/minecraft/class_5455;Ljava/util/stream/Stream;)Lnet/minecraft/class_7225$class_7874;
-		ARG 0 registryManager
-		ARG 1 additionalRegistries
+	METHOD method_55290 createWrapperLookup (Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_5455;Ljava/util/stream/Stream;)Lnet/minecraft/class_7225$class_7874;
 	METHOD method_55291 (Lnet/minecraft/class_7877$class_7878;Lnet/minecraft/class_7877$class_7883;)Lnet/minecraft/class_7225$class_7226;
 		ARG 1 registry
 	METHOD method_55292 (Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_8990$class_8991;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225$class_7226;
@@ -82,9 +76,6 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		COMMENT An owner that owns multiple registries and holds the owner object for those.
 		COMMENT {@link #ownerEquals} returns {@code true} for all owners {@linkplain #addOwner previously
 		COMMENT added}.
-		FIELD field_40944 owners Ljava/util/Set;
-		METHOD method_46801 addOwner (Lnet/minecraft/class_7876;)V
-			ARG 1 owner
 		METHOD method_55300 downcast ()Lnet/minecraft/class_7876;
 	CLASS class_7880 EntryListCreatingLookup
 		FIELD field_40945 entryOwner Lnet/minecraft/class_7876;
diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping
index cacc844015..10367aa09b 100644
--- a/mappings/net/minecraft/registry/RegistryOps.mapping
+++ b/mappings/net/minecraft/registry/RegistryOps.mapping
@@ -37,8 +37,6 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps
 	CLASS 1
 		FIELD field_40854 registryRefToInfo Ljava/util/Map;
 	CLASS 2
-		METHOD method_46640 (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_6903$class_7862;
-			ARG 0 wrapper
 	CLASS class_7862 RegistryInfo
 		FIELD comp_1131 entryLookup Lnet/minecraft/class_7871;
 		METHOD comp_1131 entryLookup ()Lnet/minecraft/class_7871;
diff --git a/mappings/net/minecraft/server/command/TeleportCommand.mapping b/mappings/net/minecraft/server/command/TeleportCommand.mapping
index ea9cee63e3..40791010b6 100644
--- a/mappings/net/minecraft/server/command/TeleportCommand.mapping
+++ b/mappings/net/minecraft/server/command/TeleportCommand.mapping
@@ -47,14 +47,6 @@ CLASS net/minecraft/class_3143 net/minecraft/server/command/TeleportCommand
 	METHOD method_36970 formatFloat (D)Ljava/lang/String;
 		ARG 0 d
 	CLASS class_3144 LookTarget
-		FIELD field_13758 target Lnet/minecraft/class_1297;
-		FIELD field_13759 targetAnchor Lnet/minecraft/class_2183$class_2184;
-		FIELD field_13760 targetPos Lnet/minecraft/class_243;
-		METHOD  (Lnet/minecraft/class_1297;Lnet/minecraft/class_2183$class_2184;)V
-			ARG 1 target
-			ARG 2 targetAnchor
-		METHOD  (Lnet/minecraft/class_243;)V
-			ARG 1 targetPos
 		METHOD method_13772 look (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;)V
 			ARG 1 source
 			ARG 2 entity
diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping
index e2c957a6a2..6b98b8d9cd 100644
--- a/mappings/net/minecraft/test/TestFunction.mapping
+++ b/mappings/net/minecraft/test/TestFunction.mapping
@@ -12,7 +12,7 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction
 		ARG 5 duration
 		ARG 7 required
 		ARG 8 starter
-	METHOD  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZIILjava/util/function/Consumer;)V
+	METHOD  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZIIZLjava/util/function/Consumer;)V
 		ARG 1 batchId
 		ARG 2 templatePath
 		ARG 3 templateName
@@ -22,7 +22,6 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction
 		ARG 8 required
 		ARG 9 requiredSuccesses
 		ARG 10 maxAttempts
-		ARG 11 starter
 	METHOD  (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZLjava/util/function/Consumer;)V
 		ARG 1 batchId
 		ARG 2 templatePath

From 4359ec7d9ebed69299f7c7458c416d318eda4954 Mon Sep 17 00:00:00 2001
From: Shnupbups 
Date: Thu, 15 Feb 2024 12:28:31 +1100
Subject: [PATCH 42/47] 24w07a stuff (#3790)

* 24w07a stuff

* Update TeleportCommand.mapping
---
 .../net/minecraft/block/HopperBlock.mapping   |  1 +
 .../net/minecraft/block/entity/Hopper.mapping |  1 +
 .../entity/BoggedEntityRenderer.mapping       |  3 ++
 ...=> SkeletonOverlayFeatureRenderer.mapping} |  5 ++-
 .../entity/model/EntityModelLayers.mapping    |  3 ++
 .../datafixer/schema/Schema3816.mapping       |  1 +
 .../ai/pathing/LandPathNodeMaker.mapping      | 37 ++++++++++++++++++-
 .../entity/ai/pathing/PathNodeMaker.mapping   |  6 +++
 .../ai/pathing/WaterPathNodeMaker.mapping     |  2 +
 .../entity/mob/AbstractSkeletonEntity.mapping |  4 ++
 .../minecraft/entity/mob/BoggedEntity.mapping |  4 ++
 .../server/command/TeleportCommand.mapping    |  2 +
 .../server/command/TestCommand.mapping        |  4 ++
 mappings/net/minecraft/test/GameTest.mapping  |  1 +
 .../minecraft/test/StructureTestUtil.mapping  | 11 ++++++
 .../net/minecraft/test/TestContext.mapping    |  8 ++++
 .../net/minecraft/util/math/Direction.mapping |  1 +
 17 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 mappings/net/minecraft/client/render/entity/BoggedEntityRenderer.mapping
 rename mappings/net/minecraft/client/render/entity/feature/{StrayOverlayFeatureRenderer.mapping => SkeletonOverlayFeatureRenderer.mapping} (68%)
 create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3816.mapping
 create mode 100644 mappings/net/minecraft/entity/mob/BoggedEntity.mapping

diff --git a/mappings/net/minecraft/block/HopperBlock.mapping b/mappings/net/minecraft/block/HopperBlock.mapping
index c73c4cfef9..da285794eb 100644
--- a/mappings/net/minecraft/block/HopperBlock.mapping
+++ b/mappings/net/minecraft/block/HopperBlock.mapping
@@ -16,6 +16,7 @@ CLASS net/minecraft/class_2377 net/minecraft/block/HopperBlock
 	FIELD field_11134 EAST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11135 WEST_RAYCAST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_46370 CODEC Lcom/mojang/serialization/MapCodec;
+	FIELD field_49154 INSIDE_SHAPE Lnet/minecraft/class_265;
 	METHOD method_10217 updateEnabled (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 world
 		ARG 2 pos
diff --git a/mappings/net/minecraft/block/entity/Hopper.mapping b/mappings/net/minecraft/block/entity/Hopper.mapping
index dcfea7b2f9..b7e7fbf3d4 100644
--- a/mappings/net/minecraft/block/entity/Hopper.mapping
+++ b/mappings/net/minecraft/block/entity/Hopper.mapping
@@ -4,3 +4,4 @@ CLASS net/minecraft/class_2615 net/minecraft/block/entity/Hopper
 	METHOD method_11264 getHopperY ()D
 	METHOD method_11265 getHopperZ ()D
 	METHOD method_11266 getHopperX ()D
+	METHOD method_57081 canBlockFromAbove ()Z
diff --git a/mappings/net/minecraft/client/render/entity/BoggedEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/BoggedEntityRenderer.mapping
new file mode 100644
index 0000000000..e5ef4690a0
--- /dev/null
+++ b/mappings/net/minecraft/client/render/entity/BoggedEntityRenderer.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_9255 net/minecraft/client/render/entity/BoggedEntityRenderer
+	FIELD field_49163 TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_49164 OVERLAY_TEXTURE Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/client/render/entity/feature/StrayOverlayFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/SkeletonOverlayFeatureRenderer.mapping
similarity index 68%
rename from mappings/net/minecraft/client/render/entity/feature/StrayOverlayFeatureRenderer.mapping
rename to mappings/net/minecraft/client/render/entity/feature/SkeletonOverlayFeatureRenderer.mapping
index 28a2037536..a52438d608 100644
--- a/mappings/net/minecraft/client/render/entity/feature/StrayOverlayFeatureRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/feature/SkeletonOverlayFeatureRenderer.mapping
@@ -1,5 +1,8 @@
-CLASS net/minecraft/class_1002 net/minecraft/client/render/entity/feature/StrayOverlayFeatureRenderer
+CLASS net/minecraft/class_1002 net/minecraft/client/render/entity/feature/SkeletonOverlayFeatureRenderer
 	FIELD field_4908 model Lnet/minecraft/class_606;
+	FIELD field_49166 texture Lnet/minecraft/class_2960;
 	METHOD  (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_5601;Lnet/minecraft/class_2960;)V
 		ARG 1 context
 		ARG 2 loader
+		ARG 3 layer
+		ARG 4 texture
diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping
index 863e9f7390..62427efe95 100644
--- a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping
+++ b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping
@@ -44,6 +44,9 @@ CLASS net/minecraft/class_5602 net/minecraft/client/render/entity/model/EntityMo
 	FIELD field_27697 CONDUIT_WIND Lnet/minecraft/class_5601;
 	FIELD field_27700 CREEPER_ARMOR Lnet/minecraft/class_5601;
 	FIELD field_32582 MAIN Ljava/lang/String;
+	FIELD field_49160 BOGGED_INNER_ARMOR Lnet/minecraft/class_5601;
+	FIELD field_49161 BOGGED_OUTER_ARMOR Lnet/minecraft/class_5601;
+	FIELD field_49162 BOGGED_OUTER Lnet/minecraft/class_5601;
 	METHOD method_32076 getLayers ()Ljava/util/stream/Stream;
 	METHOD method_32077 createBoat (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601;
 		ARG 0 type
diff --git a/mappings/net/minecraft/datafixer/schema/Schema3816.mapping b/mappings/net/minecraft/datafixer/schema/Schema3816.mapping
new file mode 100644
index 0000000000..a290367456
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/schema/Schema3816.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9253 net/minecraft/datafixer/schema/Schema3816
diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping
index 8c4a076c3b..41399c29c8 100644
--- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping
@@ -2,9 +2,11 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker
 	FIELD field_25191 collidedBoxes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;
 	FIELD field_31809 Y_OFFSET D
 	FIELD field_40928 MIN_STEP_HEIGHT D
+	FIELD field_49156 nodeTypes Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
+	FIELD field_49157 successors [Lnet/minecraft/class_9;
 	METHOD method_20536 isValidAdjacentSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z
 		ARG 1 node
-		ARG 2 successor1
+		ARG 2 successor
 	METHOD method_23476 getLandNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;)Lnet/minecraft/class_7;
 		ARG 0 world
 		ARG 1 pos
@@ -19,6 +21,9 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker
 		ARG 2 zNode
 		ARG 3 xDiagNode
 	METHOD method_31932 getNodeType (III)Lnet/minecraft/class_7;
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
 	METHOD method_37003 getFeetY (Lnet/minecraft/class_2338;)D
 		ARG 1 pos
 	METHOD method_37004 isAmphibious ()Z
@@ -39,6 +44,36 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker
 	METHOD method_46739 getStepHeight ()D
 	METHOD method_47893 canPathThrough (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos
+	METHOD method_57085 getJumpOnTopNode (IIIIDLnet/minecraft/class_2350;Lnet/minecraft/class_7;Lnet/minecraft/class_2338$class_2339;)Lnet/minecraft/class_9;
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 maxYStep
+		ARG 5 prevFeetY
+		ARG 7 direction
+		ARG 8 nodeType
+		ARG 9 mutablePos
+	METHOD method_57087 getNonWaterNodeBelow (IIILnet/minecraft/class_9;)Lnet/minecraft/class_9;
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 node
+	METHOD method_57088 getNodeWith (IIILnet/minecraft/class_7;)Lnet/minecraft/class_9;
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 type
+	METHOD method_57089 isValidDiagonalSuccessor (Lnet/minecraft/class_9;)Z
+		ARG 1 node
+	METHOD method_57090 getCollidingNodeTypes (Lnet/minecraft/class_1922;III)Ljava/util/Set;
+		ARG 1 world
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
+	METHOD method_57091 getOpenNode (III)Lnet/minecraft/class_9;
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
 	METHOD method_58 getCommonNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7;
 		ARG 0 world
 		ARG 1 pos
diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping
index ef1296556a..1aa8df73f0 100644
--- a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping
@@ -52,3 +52,9 @@ CLASS net/minecraft/class_8 net/minecraft/entity/ai/pathing/PathNodeMaker
 	METHOD method_46737 setCanWalkOverFences (Z)V
 		ARG 1 canWalkOverFences
 	METHOD method_46738 canWalkOverFences ()Z
+	METHOD method_57082 isFireDamaging (Lnet/minecraft/class_2680;)Z
+		ARG 0 state
+	METHOD method_57083 createNode (DDD)Lnet/minecraft/class_4459;
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
diff --git a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping
index 15650ade2b..a73e426eb6 100644
--- a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping
@@ -15,3 +15,5 @@ CLASS net/minecraft/class_12 net/minecraft/entity/ai/pathing/WaterPathNodeMaker
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
+	METHOD method_57084 hasPenalty (Lnet/minecraft/class_9;)Z
+		ARG 0 node
diff --git a/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping b/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping
index 7cc538918b..fa80fe04df 100644
--- a/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping
@@ -1,8 +1,12 @@
 CLASS net/minecraft/class_1547 net/minecraft/entity/mob/AbstractSkeletonEntity
+	FIELD field_49149 HARD_ATTACK_INTERVAL I
+	FIELD field_49150 REGULAR_ATTACK_INTERVAL I
 	FIELD field_7220 bowAttackGoal Lnet/minecraft/class_1380;
 	FIELD field_7221 meleeAttackGoal Lnet/minecraft/class_1366;
 	METHOD method_26905 createAbstractSkeletonAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_35191 isShaking ()Z
+	METHOD method_57078 getHardAttackInterval ()I
+	METHOD method_57079 getRegularAttackInterval ()I
 	METHOD method_6996 createArrowProjectile (Lnet/minecraft/class_1799;F)Lnet/minecraft/class_1665;
 		ARG 1 arrow
 		ARG 2 damageModifier
diff --git a/mappings/net/minecraft/entity/mob/BoggedEntity.mapping b/mappings/net/minecraft/entity/mob/BoggedEntity.mapping
new file mode 100644
index 0000000000..9ca2a59cf6
--- /dev/null
+++ b/mappings/net/minecraft/entity/mob/BoggedEntity.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9254 net/minecraft/entity/mob/BoggedEntity
+	FIELD field_49151 HARD_ATTACK_INTERVAL I
+	FIELD field_49152 REGULAR_ATTACK_INTERVAL I
+	METHOD method_57080 createBoggedAttributes ()Lnet/minecraft/class_5132$class_5133;
diff --git a/mappings/net/minecraft/server/command/TeleportCommand.mapping b/mappings/net/minecraft/server/command/TeleportCommand.mapping
index 40791010b6..9daea97893 100644
--- a/mappings/net/minecraft/server/command/TeleportCommand.mapping
+++ b/mappings/net/minecraft/server/command/TeleportCommand.mapping
@@ -50,3 +50,5 @@ CLASS net/minecraft/class_3143 net/minecraft/server/command/TeleportCommand
 		METHOD method_13772 look (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;)V
 			ARG 1 source
 			ARG 2 entity
+	CLASS class_9251 LookAtEntity
+	CLASS class_9252 LookAtPosition
diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping
index 323bfae34c..80f4a9035e 100644
--- a/mappings/net/minecraft/server/command/TestCommand.mapping
+++ b/mappings/net/minecraft/server/command/TestCommand.mapping
@@ -132,6 +132,10 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand
 		ARG 0 context
 	METHOD method_56287 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_4527$class_9121;
 		ARG 0 context
+	METHOD method_57105 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
+		ARG 1 pos
+	METHOD method_57106 (Lnet/minecraft/class_1297;)V
+		ARG 0 entity
 	CLASS class_4528 Listener
 		FIELD comp_2216 world Lnet/minecraft/class_3218;
 		FIELD comp_2217 tests Lnet/minecraft/class_4524;
diff --git a/mappings/net/minecraft/test/GameTest.mapping b/mappings/net/minecraft/test/GameTest.mapping
index 78fa9a7ed8..624591ca3b 100644
--- a/mappings/net/minecraft/test/GameTest.mapping
+++ b/mappings/net/minecraft/test/GameTest.mapping
@@ -10,3 +10,4 @@ CLASS net/minecraft/class_6302 net/minecraft/test/GameTest
 	METHOD method_35937 duration ()J
 	METHOD method_35938 maxAttempts ()I
 	METHOD method_35939 requiredSuccesses ()I
+	METHOD method_57098 skyAccess ()Z
diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping
index 5ffa06f1f8..fe73adb5cb 100644
--- a/mappings/net/minecraft/test/StructureTestUtil.mapping
+++ b/mappings/net/minecraft/test/StructureTestUtil.mapping
@@ -93,3 +93,14 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil
 		ARG 2 world
 	METHOD method_56253 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
 		ARG 1 p
+	METHOD method_57101 clearBarrierBox (Lnet/minecraft/class_238;Lnet/minecraft/class_3218;)V
+		ARG 0 box
+		ARG 1 world
+	METHOD method_57102 placeBarrierBox (Lnet/minecraft/class_238;Lnet/minecraft/class_3218;Z)V
+		ARG 0 box
+		ARG 1 world
+		ARG 2 noSkyAccess
+	METHOD method_57103 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
+		ARG 3 pos
+	METHOD method_57104 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
+		ARG 4 pos
diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping
index f830636292..c372d6f9a1 100644
--- a/mappings/net/minecraft/test/TestContext.mapping
+++ b/mappings/net/minecraft/test/TestContext.mapping
@@ -419,3 +419,11 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 		ARG 1 value
 		ARG 2 expected
 		ARG 3 name
+	METHOD method_57099 setEntityPos (Lnet/minecraft/class_1308;FFF)V
+		ARG 1 entity
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
+	METHOD method_57100 spawnItem (Lnet/minecraft/class_1792;Lnet/minecraft/class_243;)Lnet/minecraft/class_1542;
+		ARG 1 item
+		ARG 2 pos
diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping
index 791beca77f..526d4b812a 100644
--- a/mappings/net/minecraft/util/math/Direction.mapping
+++ b/mappings/net/minecraft/util/math/Direction.mapping
@@ -155,5 +155,6 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
 			ARG 1 random
 		METHOD method_43342 getShuffled (Lnet/minecraft/class_5819;)Ljava/util/List;
 			ARG 1 random
+		METHOD method_57092 getFacingCount ()I
 		METHOD test (Ljava/lang/Object;)Z
 			ARG 1 direction

From 65fa2009118c1e526684699f9f6c8d82b4dd0638 Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Thu, 15 Feb 2024 15:50:32 +0900
Subject: [PATCH 43/47] More 24w07a stuff (#3793)

---
 .../net/minecraft/datafixer/Schemas.mapping   |  4 +++
 .../registry/RegistryBuilder.mapping          | 28 +++++++++++++++++--
 .../minecraft/registry/RegistryOps.mapping    |  2 ++
 .../registry/RegistryWrapper.mapping          |  2 ++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping
index 71050c4dee..ac838d9c54 100644
--- a/mappings/net/minecraft/datafixer/Schemas.mapping
+++ b/mappings/net/minecraft/datafixer/Schemas.mapping
@@ -26,3 +26,7 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas
 		ARG 0 frogVariants
 	METHOD method_43062 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V
 		ARG 0 catVariants
+	METHOD method_57075 replacingRaw (Ljava/util/Map;)Ljava/util/function/UnaryOperator;
+		ARG 0 replacements
+	METHOD method_57076 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
+		ARG 1 string
diff --git a/mappings/net/minecraft/registry/RegistryBuilder.mapping b/mappings/net/minecraft/registry/RegistryBuilder.mapping
index f33677b49b..9f954761ce 100644
--- a/mappings/net/minecraft/registry/RegistryBuilder.mapping
+++ b/mappings/net/minecraft/registry/RegistryBuilder.mapping
@@ -26,7 +26,10 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 	METHOD method_49352 (Ljava/util/Map;Lnet/minecraft/class_7877$class_7883;)V
 		ARG 1 registry
 	METHOD method_55283 createWrapper (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7876;Ljava/util/Map;)Lnet/minecraft/class_7225$class_7226;
+		ARG 0 registryRef
 		ARG 1 lifecycle
+		ARG 2 owner
+		ARG 3 entries
 	METHOD method_55285 (Lnet/minecraft/class_7876;Lnet/minecraft/class_5321;Lnet/minecraft/class_8990;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883;
 		ARG 6 key
 	METHOD method_55286 applyPatches (Lnet/minecraft/class_7876;Lnet/minecraft/class_8990$class_8991;Lnet/minecraft/class_5321;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;)Lnet/minecraft/class_7225$class_7226;
@@ -38,6 +41,8 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		ARG 6 lazyWrapper
 	METHOD method_55287 (Lnet/minecraft/class_7876;Lnet/minecraft/class_8990;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;Ljava/util/Map;Lnet/minecraft/class_6880$class_6883;)V
 		ARG 5 entry
+	METHOD method_55288 (Ljava/util/Map;Lnet/minecraft/class_5455$class_6892;)V
+		ARG 1 registry
 	METHOD method_55289 createFullWrapperLookup (Lnet/minecraft/class_5455;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8990$class_8991;Ljava/util/Map;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874;
 		ARG 1 registryManager
 		ARG 2 base
@@ -45,6 +50,9 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		ARG 4 initializedRegistries
 		ARG 5 patches
 	METHOD method_55290 createWrapperLookup (Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_5455;Ljava/util/stream/Stream;)Lnet/minecraft/class_7225$class_7874;
+		ARG 0 entryOwner
+		ARG 1 registryManager
+		ARG 2 wrappers
 	METHOD method_55291 (Lnet/minecraft/class_7877$class_7878;Lnet/minecraft/class_7877$class_7883;)Lnet/minecraft/class_7225$class_7226;
 		ARG 1 registry
 	METHOD method_55292 (Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_8990$class_8991;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225$class_7226;
@@ -55,8 +63,13 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		ARG 5 entry
 	METHOD method_55295 (Ljava/util/Set;Lnet/minecraft/class_5321;)Z
 		ARG 1 key
+	METHOD method_57094 (Ljava/util/Map;Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_7225$class_7226;)V
+		ARG 2 wrapper
 	CLASS 2
 		FIELD field_40947 keysToEntries Ljava/util/Map;
+	CLASS 3
+		METHOD method_57095 get (Lnet/minecraft/class_5321;)Ljava/util/Optional;
+			ARG 1 registryRef
 	CLASS class_7878 Registries
 		METHOD method_46787 createRegisterable ()Lnet/minecraft/class_7891;
 		METHOD method_46790 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5455$class_6892;)V
@@ -73,9 +86,6 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		METHOD method_55298 checkOrphanedValues ()V
 		METHOD method_55299 checkUnreferencedKeys ()V
 	CLASS class_7879 AnyOwner
-		COMMENT An owner that owns multiple registries and holds the owner object for those.
-		COMMENT {@link #ownerEquals} returns {@code true} for all owners {@linkplain #addOwner previously
-		COMMENT added}.
 		METHOD method_55300 downcast ()Lnet/minecraft/class_7876;
 	CLASS class_7880 EntryListCreatingLookup
 		FIELD field_40945 entryOwner Lnet/minecraft/class_7876;
@@ -110,3 +120,15 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 			ARG 1 owner
 			ARG 2 key
 	CLASS class_8993 FullPatchesRegistriesPair
+	CLASS class_9256 WrapperInfoPair
+		METHOD method_57096 of (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7877$class_9256;
+			ARG 0 wrapper
+		METHOD method_57097 of (Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7877$class_9256;
+			ARG 0 owner
+			ARG 1 wrapper
+	CLASS class_9257 UntaggedDelegatingLookup
+		FIELD field_49169 base Lnet/minecraft/class_7225$class_7226;
+		METHOD  (Lnet/minecraft/class_7876;Lnet/minecraft/class_7225$class_7226;)V
+			ARG 1 entryOwner
+			ARG 2 base
+	CLASS class_9258 UntaggedLookup
diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping
index 10367aa09b..fc805f9d24 100644
--- a/mappings/net/minecraft/registry/RegistryOps.mapping
+++ b/mappings/net/minecraft/registry/RegistryOps.mapping
@@ -40,6 +40,8 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps
 	CLASS class_7862 RegistryInfo
 		FIELD comp_1131 entryLookup Lnet/minecraft/class_7871;
 		METHOD comp_1131 entryLookup ()Lnet/minecraft/class_7871;
+		METHOD method_57074 fromWrapper (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_6903$class_7862;
+			ARG 0 wrapper
 	CLASS class_7863 RegistryInfoGetter
 		METHOD method_46623 getRegistryInfo (Lnet/minecraft/class_5321;)Ljava/util/Optional;
 			ARG 1 registryRef
diff --git a/mappings/net/minecraft/registry/RegistryWrapper.mapping b/mappings/net/minecraft/registry/RegistryWrapper.mapping
index 080bc6b477..bec587ceef 100644
--- a/mappings/net/minecraft/registry/RegistryWrapper.mapping
+++ b/mappings/net/minecraft/registry/RegistryWrapper.mapping
@@ -35,6 +35,8 @@ CLASS net/minecraft/class_7225 net/minecraft/registry/RegistryWrapper
 		METHOD method_46762 getWrapperOrThrow (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225$class_7226;
 			ARG 1 registryRef
 		METHOD method_55282 streamAllRegistryKeys ()Ljava/util/stream/Stream;
+		METHOD method_57093 getOps (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/class_6903;
+			ARG 1 delegate
 		CLASS 1
 			METHOD method_46764 (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7871;
 				ARG 0 lookup

From ec47d43d67ea37866740c618a3affa6e7e106062 Mon Sep 17 00:00:00 2001
From: modmuss 
Date: Thu, 15 Feb 2024 13:02:36 +0000
Subject: [PATCH 44/47] Update CFR and Enigma (#3794)

* Update CFR and Enigma

* Update and fix build
---
 build.gradle                                    | 11 +++++++++--
 filament/gradle.properties                      |  2 +-
 .../task/mappingio/CompleteMappingsTask.java    | 17 +++++++++++++++++
 gradle.properties                               |  4 ++--
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 filament/src/main/java/net/fabricmc/filament/task/mappingio/CompleteMappingsTask.java

diff --git a/build.gradle b/build.gradle
index d1fe75ac9b..6634c35381 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,6 +104,7 @@ import net.fabricmc.filament.task.UnpickJarTask
 import net.fabricmc.filament.task.base.WithFileInput
 import net.fabricmc.filament.task.base.WithFileOutput
 import net.fabricmc.filament.task.enigma.MapSpecializedMethodsTask
+import net.fabricmc.filament.task.mappingio.CompleteMappingsTask
 import net.fabricmc.filament.task.mappingio.ConvertMappingsTask
 import net.fabricmc.filament.task.mappingio.MergeMappingsTask
 import net.fabricmc.mappingio.format.MappingFormat
@@ -179,12 +180,18 @@ tasks.register('checkMappings') {
 tasks.register('mapSpecializedMethods', MapSpecializedMethodsTask) {
 	intermediaryJarFile = mapIntermediaryJar.output
 	mappings = mappingsDir
-	output = new File(tempDir, "yarn-mappings-v2.tiny")
+	output = new File(tempDir, "yarn-specialized-mappings-v2.tiny")
 
 	inputMappingsFormat = "enigma"
 	outputMappingsFormat = "tinyv2:intermediary:named"
 }
 
+tasks.register('completeMappings', CompleteMappingsTask) {
+	input = mapSpecializedMethods.output
+	output = new File(tempDir, "yarn-mappings-v2.tiny")
+	outputFormat = MappingFormat.TINY_2_FILE
+}
+
 tasks.register('convertToV1', ConvertMappingsTask) {
 	input = mapSpecializedMethods.output
 	output = new File(tempDir, "yarn-mappings.tiny")
@@ -303,7 +310,7 @@ build.dependsOn constantsJar
 tasks.register('insertAutoGeneratedEnumMappings', FileInputOutput) {
 	dependsOn mapIntermediaryJar, downloadIntermediary
 	group = buildMappingGroup
-	input = mapSpecializedMethods.output
+	input = completeMappings.output
 	output = new File(tempDir, "unmerged-named-v2-with-enum.tiny")
 
 	inputs.file mapIntermediaryJar.output
diff --git a/filament/gradle.properties b/filament/gradle.properties
index 1a9a0ff206..af3f073a8d 100644
--- a/filament/gradle.properties
+++ b/filament/gradle.properties
@@ -1 +1 @@
-filament_version=0.7.0
\ No newline at end of file
+filament_version=0.7.1
\ No newline at end of file
diff --git a/filament/src/main/java/net/fabricmc/filament/task/mappingio/CompleteMappingsTask.java b/filament/src/main/java/net/fabricmc/filament/task/mappingio/CompleteMappingsTask.java
new file mode 100644
index 0000000000..1f980278b7
--- /dev/null
+++ b/filament/src/main/java/net/fabricmc/filament/task/mappingio/CompleteMappingsTask.java
@@ -0,0 +1,17 @@
+package net.fabricmc.filament.task.mappingio;
+
+import java.io.IOException;
+import java.util.Map;
+
+import net.fabricmc.filament.task.base.WithFileInput;
+import net.fabricmc.mappingio.MappingReader;
+import net.fabricmc.mappingio.MappingWriter;
+import net.fabricmc.mappingio.adapter.MappingNsCompleter;
+
+public abstract class CompleteMappingsTask extends MappingOutputTask implements WithFileInput {
+	@Override
+	void run(MappingWriter writer) throws IOException {
+		var nsCompleter = new MappingNsCompleter(writer, Map.of("named", "intermediary"), true);
+		MappingReader.read(getInputPath(), nsCompleter);
+	}
+}
diff --git a/gradle.properties b/gradle.properties
index 358a35e596..ab22e085db 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 org.gradle.configuration-cache=true
 
-enigma_version=2.3.3
+enigma_version=2.4.1
 unpick_version=2.3.0
-cfr_version=0.2.1
+cfr_version=0.2.2
 name_proposal_version=0.2.0
 asm_version=9.6
 

From 75e590d12e60c393724a98235c1ac9e955938f97 Mon Sep 17 00:00:00 2001
From: TheDeathlyCow <53499406+TheDeathlyCow@users.noreply.github.com>
Date: Wed, 21 Feb 2024 21:37:14 -1000
Subject: [PATCH 45/47] Change
 SculkShriekerWarningManager#canIncreaseWarningLevel to
 SculkShriekerWarningManager#isWardenNearby in (#3797)

---
 .../minecraft/block/entity/SculkShriekerWarningManager.mapping  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping b/mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping
index a018305159..95c7fe944e 100644
--- a/mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping
+++ b/mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping
@@ -26,7 +26,7 @@ CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningMa
 	METHOD method_42255 (Lnet/minecraft/class_243;Lnet/minecraft/class_3222;)Z
 		ARG 1 player
 	METHOD method_42258 reset ()V
-	METHOD method_42259 canIncreaseWarningLevel (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
+	METHOD method_42259 isWardenNearby (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
 	METHOD method_42261 increaseWarningLevel ()V

From 91f427184dfa42a21644781360efe881b21e3d0f Mon Sep 17 00:00:00 2001
From: AdamRaichu <91494019+AdamRaichu@users.noreply.github.com>
Date: Thu, 22 Feb 2024 02:37:25 -0500
Subject: [PATCH 46/47] Add Javadoc descriptions to the fields of AbstractBlock
 (#3796)

* document field AbstractBlock.jumpVelocityMultiplier

* fix address of `@see` notes in jumpVelocityMultiplier

* document the rest of the fields for AbstractBlock (except for DIRECTIONS)
---
 .../net/minecraft/block/AbstractBlock.mapping | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
index aa179285f9..f752b49b2e 100644
--- a/mappings/net/minecraft/block/AbstractBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -220,17 +220,53 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 	COMMENT 
  • Called before {@link #getDroppedStacks getDroppedStacks} in this case.
    • 
 	COMMENT 
 	FIELD field_23154 dynamicBounds Z
+		COMMENT Whether this block's collision shape can change.
+		COMMENT
+		COMMENT @see #hasDynamicBounds
 	FIELD field_23155 settings Lnet/minecraft/class_4970$class_2251;
+		COMMENT The {@link AbstractBlock.Settings} to apply to this block.
 	FIELD field_23156 lootTableId Lnet/minecraft/class_2960;
+		COMMENT The {@link net.minecraft.util.Identifier} of the loot table that determines what this block drops.
+		COMMENT
+		COMMENT @see #getLootTableId
+		COMMENT @see #getDroppedStacks
 	FIELD field_23157 DIRECTIONS [Lnet/minecraft/class_2350;
 	FIELD field_23159 collidable Z
+		COMMENT Whether this block can be walked on or through.
+		COMMENT
+		COMMENT @see #getCollisionShape
 	FIELD field_23160 resistance F
+		COMMENT The blast resistance of the block.
+		COMMENT
+		COMMENT @see Block#getBlastResistance
 	FIELD field_23161 randomTicks Z
+		COMMENT Whether this block should tick when randomly selected when ticking the world. An example of this ticking is crop growth.
+		COMMENT
+		COMMENT @see Block#hasRandomTicks
+		COMMENT @see net.minecraft.server.world.ServerWorld#tickChunk
 	FIELD field_23162 soundGroup Lnet/minecraft/class_2498;
+		COMMENT The collection of sounds played when breaking, stepping on, placing, hitting (with a projectile), or falling on this block.
+		COMMENT
+		COMMENT @see #getSoundGroup
 	FIELD field_23163 slipperiness F
+		COMMENT A speed reduction applied to a {@link net.minecraft.entity.LivingEntity} that tries to move across this block.
+		COMMENT
+		COMMENT @see Block#getSlipperiness
+		COMMENT @see net.minecraft.entity.LivingEntity#travel
 	FIELD field_23164 velocityMultiplier F
+		COMMENT The multiplier applied to the velocity of an {@link net.minecraft.entity.Entity} when it walks on this block.
+		COMMENT
+		COMMENT @see Block#getVelocityMultiplier
+		COMMENT @see net.minecraft.entity.Entity#getVelocityMultiplier
 	FIELD field_23165 jumpVelocityMultiplier F
+		COMMENT The multiplier applied to the velocity of a {@link net.minecraft.entity.LivingEntity} when it jumps off this block.
+		COMMENT
+		COMMENT @see Block#getJumpVelocityMultiplier
+		COMMENT @see net.minecraft.entity.Entity#getJumpVelocityMultiplier
 	FIELD field_40337 requiredFeatures Lnet/minecraft/class_7699;
+		COMMENT The set of {@link net.minecraft.resource.featuretoggle.FeatureFlag FeatureFlags} that are required for this block to work correctly.
+		COMMENT
+		COMMENT @see net.minecraft.resource.featuretoggle.FeatureFlags
 	METHOD  (Lnet/minecraft/class_4970$class_2251;)V
 		ARG 1 settings
 	METHOD method_17454 createScreenHandlerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908;

From 17034786adce218ef4dbf90cb971344794b6c5f4 Mon Sep 17 00:00:00 2001
From: ErrorCraft <51973682+ErrorCraft@users.noreply.github.com>
Date: Thu, 22 Feb 2024 08:37:33 +0100
Subject: [PATCH 47/47] Map some fields in a couple of item classes (#3795)

---
 mappings/net/minecraft/item/BrushItem.mapping    | 1 +
 mappings/net/minecraft/item/CrossbowItem.mapping | 2 ++
 mappings/net/minecraft/item/SpyglassItem.mapping | 1 +
 mappings/net/minecraft/item/map/MapState.mapping | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/mappings/net/minecraft/item/BrushItem.mapping b/mappings/net/minecraft/item/BrushItem.mapping
index b20e975845..608e177343 100644
--- a/mappings/net/minecraft/item/BrushItem.mapping
+++ b/mappings/net/minecraft/item/BrushItem.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_8162 net/minecraft/item/BrushItem
 	FIELD field_42683 MAX_BRUSH_TIME I
+	FIELD field_43390 ANIMATION_DURATION I
 	METHOD method_49184 addDustParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_3965;Lnet/minecraft/class_2680;Lnet/minecraft/class_243;Lnet/minecraft/class_1306;)V
 		ARG 1 world
 		ARG 2 hitResult
diff --git a/mappings/net/minecraft/item/CrossbowItem.mapping b/mappings/net/minecraft/item/CrossbowItem.mapping
index cc7ff5a380..389b1c6811 100644
--- a/mappings/net/minecraft/item/CrossbowItem.mapping
+++ b/mappings/net/minecraft/item/CrossbowItem.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem
 	FIELD field_30864 CHARGED_KEY Ljava/lang/String;
 	FIELD field_30865 CHARGED_PROJECTILES_KEY Ljava/lang/String;
 	FIELD field_30866 DEFAULT_PULL_TIME I
+	FIELD field_30867 CHARGE_PROGRESS F
+	FIELD field_30868 LOAD_PROGRESS F
 	FIELD field_30869 DEFAULT_SPEED F
 	FIELD field_30870 FIREWORK_ROCKET_SPEED F
 	FIELD field_7936 loaded Z
diff --git a/mappings/net/minecraft/item/SpyglassItem.mapping b/mappings/net/minecraft/item/SpyglassItem.mapping
index 2f13570ff1..9cd6dce039 100644
--- a/mappings/net/minecraft/item/SpyglassItem.mapping
+++ b/mappings/net/minecraft/item/SpyglassItem.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_5538 net/minecraft/item/SpyglassItem
 	FIELD field_30921 MAX_USE_TIME I
+	FIELD field_30922 FOV_MULTIPLIER F
 	METHOD method_31582 playStopUsingSound (Lnet/minecraft/class_1309;)V
 		ARG 1 user
diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping
index 4b700adc0a..8506c851ad 100644
--- a/mappings/net/minecraft/item/map/MapState.mapping
+++ b/mappings/net/minecraft/item/map/MapState.mapping
@@ -23,6 +23,8 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 	FIELD field_17403 locked Z
 	FIELD field_25019 LOGGER Lorg/slf4j/Logger;
 	FIELD field_31831 MAX_SCALE I
+	FIELD field_31832 SIZE I
+	FIELD field_31833 SIZE_HALF I
 	FIELD field_33991 MAX_ICONS I
 	FIELD field_33992 iconCount I
 	METHOD  (IIBZZZLnet/minecraft/class_5321;)V