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] 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