From e2d5c4e04072097308b46191cb522539d944ccf5 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 11 Jan 2025 05:45:09 +0900 Subject: [PATCH] 25w02a more stuff (#4084) --- .../PlayerAdvancementTracker.mapping | 1 + .../net/minecraft/block/AbstractBlock.mapping | 9 + .../minecraft/block/AbstractFireBlock.mapping | 1 + .../block/AmethystClusterBlock.mapping | 4 +- .../net/minecraft/block/AnvilBlock.mapping | 1 + mappings/net/minecraft/block/BedBlock.mapping | 1 + .../minecraft/block/BigDripleafBlock.mapping | 3 + .../block/BigDripleafStemBlock.mapping | 1 + mappings/net/minecraft/block/Block.mapping | 6 + .../net/minecraft/block/ButtonBlock.mapping | 2 + .../net/minecraft/block/ChainBlock.mapping | 1 + .../net/minecraft/block/ChestBlock.mapping | 2 + .../net/minecraft/block/CocoaBlock.mapping | 1 + .../net/minecraft/block/CropBlock.mapping | 1 + .../net/minecraft/block/FireBlock.mapping | 2 + .../minecraft/block/FluidDrainable.mapping | 1 + .../net/minecraft/block/FluidFillable.mapping | 1 + .../net/minecraft/block/Segmented.mapping | 2 +- .../block/entity/BlockEntity.mapping | 7 + .../block/entity/BrushableBlockEntity.mapping | 4 + .../entity/CreakingHeartBlockEntity.mapping | 5 + .../block/enums/TrialSpawnerState.mapping | 2 + .../block/spawner/MobSpawnerLogic.mapping | 4 + .../type/BundleContentsComponent.mapping | 2 + .../net/minecraft/datafixer/FixUtil.mapping | 1 + .../net/minecraft/datafixer/Schemas.mapping | 2 + .../fix/BlockPropertyRenameFix.mapping | 16 ++ .../datafixer/fix/DisplayNameFix.mapping | 7 + .../datafixer/fix/ItemNbtFix.mapping | 2 + .../fix/OminousBannerItemRenameFix.mapping | 6 + .../fix/RemoveFilteredBookTextFix.mapping | 2 + .../fix/SimpleBlockPropertyRenameFix.mapping | 14 ++ .../fix/SimpleItemNbtFix.mapping} | 2 +- .../datafixer/schema/Schema1458.mapping | 7 + mappings/net/minecraft/entity/Entity.mapping | 15 +- .../entity/EntityAttachments.mapping | 4 + .../minecraft/entity/EntityStatuses.mapping | 1 + .../net/minecraft/entity/EntityType.mapping | 5 + .../entity/ExperienceOrbEntity.mapping | 2 + .../entity/LazyEntityReference.mapping | 33 ++++ .../net/minecraft/entity/LivingEntity.mapping | 17 ++ .../entity/PositionInterpolator.mapping | 48 +++++ .../net/minecraft/entity/Tameable.mapping | 1 + .../data/TrackedDataHandlerRegistry.mapping | 1 + .../entity/decoration/DisplayEntity.mapping | 1 + .../entity/effect/StatusEffect.mapping | 12 ++ .../effect/StatusEffectInstance.mapping | 7 + .../passive/AbstractHorseEntity.mapping | 3 + .../entity/passive/FoxEntity.mapping | 10 ++ .../entity/passive/PigEntity.mapping | 6 + .../entity/passive/TameableEntity.mapping | 7 +- .../entity/player/PlayerEntity.mapping | 2 + .../projectile/thrown/PotionEntity.mapping | 5 + .../entity/vehicle/AbstractBoatEntity.mapping | 2 + .../vehicle/DefaultMinecartController.mapping | 3 + .../entity/vehicle/MinecartController.mapping | 1 + .../net/minecraft/loot/LootTables.mapping | 3 + .../play/AdvancementUpdateS2CPacket.mapping | 3 + .../entity/EntitySubPredicateTypes.mapping | 2 + .../DefaultResourcePackBuilder.mapping | 2 + .../scoreboard/ScoreboardScore.mapping | 2 + .../scoreboard/ScoreboardState.mapping | 4 + .../server/SampleSubscriptionTracker.mapping | 2 + .../server/command/AdvancementCommand.mapping | 7 + .../server/command/CloneCommand.mapping | 40 +++++ .../server/command/FillCommand.mapping | 1 + .../server/command/PlaceCommand.mapping | 3 + .../server/command/SetBlockCommand.mapping | 5 + .../server/network/EntityTrackerEntry.mapping | 7 + .../server/world/ChunkLevelManager.mapping | 91 ++++++++++ .../ChunkPosDistanceLevelPropagator.mapping | 2 +- .../server/world/ChunkTicket.mapping | 15 ++ .../server/world/ChunkTicketManager.mapping | 168 ++++++++++-------- .../server/world/ChunkTicketType.mapping | 10 ++ .../world/ServerChunkLoadingManager.mapping | 18 +- .../server/world/ServerChunkManager.mapping | 15 +- .../server/world/ServerWorld.mapping | 2 +- .../SimulationDistanceLevelPropagator.mapping | 8 + .../TicketDistanceLevelPropagator.mapping | 5 + ...ndomGroupStructurePoolAliasBinding.mapping | 2 + .../RandomStructurePoolAliasBinding.mapping | 2 + .../net/minecraft/text/HoverEvent.mapping | 2 + .../net/minecraft/text/NbtTextContent.mapping | 2 + mappings/net/minecraft/text/Style.mapping | 2 + .../net/minecraft/util/ItemScatterer.mapping | 4 + .../util/math/ChunkSectionPos.mapping | 2 + .../net/minecraft/util/math/Direction.mapping | 4 + .../util/math/DirectionTransformation.mapping | 15 ++ .../util/profiler/ProfilerSystem.mapping | 2 + .../minecraft/util/shape/VoxelShape.mapping | 2 + .../SimulationDistanceLevelPropagator.mapping | 5 - mappings/net/minecraft/world/World.mapping | 21 ++- .../net/minecraft/world/WorldAccess.mapping | 3 + .../world/biome/SpawnSettings.mapping | 12 ++ .../net/minecraft/world/chunk/Chunk.mapping | 4 + .../world/chunk/ChunkManager.mapping | 1 + .../entity/EntityQueriable.mapping} | 2 +- .../entity/UniquelyIdentifiable.mapping} | 2 +- .../gen/feature/HugeMushroomFeature.mapping | 6 + .../feature/VegetationPlacedFeatures.mapping | 4 + unpick-definitions/entity_status.unpick | 1 + .../set_block_state_flags.unpick | 2 + unpick-definitions/world_events.unpick | 2 +- 103 files changed, 728 insertions(+), 100 deletions(-) create mode 100644 mappings/net/minecraft/datafixer/fix/BlockPropertyRenameFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/DisplayNameFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/SimpleBlockPropertyRenameFix.mapping rename mappings/net/minecraft/{class_10565.mapping => datafixer/fix/SimpleItemNbtFix.mapping} (59%) create mode 100644 mappings/net/minecraft/datafixer/schema/Schema1458.mapping create mode 100644 mappings/net/minecraft/entity/LazyEntityReference.mapping create mode 100644 mappings/net/minecraft/entity/PositionInterpolator.mapping create mode 100644 mappings/net/minecraft/server/world/ChunkLevelManager.mapping rename mappings/net/minecraft/{ => server}/world/ChunkPosDistanceLevelPropagator.mapping (61%) create mode 100644 mappings/net/minecraft/server/world/SimulationDistanceLevelPropagator.mapping delete mode 100644 mappings/net/minecraft/world/SimulationDistanceLevelPropagator.mapping rename mappings/net/minecraft/{class_10598.mapping => world/entity/EntityQueriable.mapping} (54%) rename mappings/net/minecraft/{class_10599.mapping => world/entity/UniquelyIdentifiable.mapping} (50%) diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping index d6fa456ba9..0bf5b1bad9 100644 --- a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping +++ b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke ARG 1 owner METHOD method_12876 sendUpdate (Lnet/minecraft/class_3222;Z)V ARG 1 player + ARG 2 showToast METHOD method_12878 grantCriterion (Lnet/minecraft/class_8779;Ljava/lang/String;)Z ARG 1 advancement ARG 2 criterionName diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index e3087f7fbf..4e15752b12 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -388,6 +388,11 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 state ARG 2 world ARG 3 pos + METHOD method_66388 onStateReplaced (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Z)V + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 moved METHOD method_8389 asItem ()Lnet/minecraft/class_1792; COMMENT {@return the block's corresponding item} COMMENT @@ -1324,6 +1329,10 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 world ARG 2 pos ARG 3 includeData + METHOD method_66478 onStateReplaced (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Z)V + ARG 1 world + ARG 2 pos + ARG 3 moved CLASS class_3752 ShapeCache FIELD field_16559 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_17651 exceedsCube Z diff --git a/mappings/net/minecraft/block/AbstractFireBlock.mapping b/mappings/net/minecraft/block/AbstractFireBlock.mapping index 616807b851..0b12d474c5 100644 --- a/mappings/net/minecraft/block/AbstractFireBlock.mapping +++ b/mappings/net/minecraft/block/AbstractFireBlock.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4770 net/minecraft/block/AbstractFireBlock FIELD field_31008 SET_ON_FIRE_SECONDS I FIELD field_54470 MIN_FIRE_TICK_INCREMENT I FIELD field_54471 MAX_FIRE_TICK_INCREMENT I + FIELD field_55731 BASE_SHAPE Lnet/minecraft/class_265; METHOD (Lnet/minecraft/class_4970$class_2251;F)V ARG 1 settings ARG 2 damage diff --git a/mappings/net/minecraft/block/AmethystClusterBlock.mapping b/mappings/net/minecraft/block/AmethystClusterBlock.mapping index 1707c4f0bd..8e391e9779 100644 --- a/mappings/net/minecraft/block/AmethystClusterBlock.mapping +++ b/mappings/net/minecraft/block/AmethystClusterBlock.mapping @@ -3,9 +3,11 @@ CLASS net/minecraft/class_5542 net/minecraft/block/AmethystClusterBlock FIELD field_27087 FACING Lnet/minecraft/class_2754; FIELD field_46255 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_46256 height F + FIELD field_55728 width F + FIELD field_55729 shapesByDirections Ljava/util/Map; METHOD (FFLnet/minecraft/class_4970$class_2251;)V ARG 1 height - ARG 2 xzOffset + ARG 2 width ARG 3 settings METHOD method_53970 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/block/AnvilBlock.mapping b/mappings/net/minecraft/block/AnvilBlock.mapping index 1c445cb255..e895129a45 100644 --- a/mappings/net/minecraft/block/AnvilBlock.mapping +++ b/mappings/net/minecraft/block/AnvilBlock.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2199 net/minecraft/block/AnvilBlock FIELD field_30993 FALLING_BLOCK_ENTITY_DAMAGE_MULTIPLIER F FIELD field_30994 FALLING_BLOCK_ENTITY_MAX_DAMAGE I FIELD field_46258 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55730 SHAPES_BY_AXES Ljava/util/Map; FIELD field_9883 FACING Lnet/minecraft/class_2754; METHOD method_17453 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 2 syncId diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 69e51449dd..98c04933ee 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock FIELD field_46273 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55732 SHAPES_BY_AXES Ljava/util/Map; FIELD field_9966 color Lnet/minecraft/class_1767; FIELD field_9967 PART Lnet/minecraft/class_2754; FIELD field_9968 OCCUPIED Lnet/minecraft/class_2746; diff --git a/mappings/net/minecraft/block/BigDripleafBlock.mapping b/mappings/net/minecraft/block/BigDripleafBlock.mapping index 49e9e5c318..3560f424d6 100644 --- a/mappings/net/minecraft/block/BigDripleafBlock.mapping +++ b/mappings/net/minecraft/block/BigDripleafBlock.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_5801 net/minecraft/block/BigDripleafBlock FIELD field_28661 TILT Lnet/minecraft/class_2754; FIELD field_28662 NEXT_TILT_DELAYS Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_46277 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55736 SHAPES_BY_TILTS Ljava/util/Map; + FIELD field_55737 shapeGetter Ljava/util/function/Function; METHOD method_33601 playTiltSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;)V ARG 0 world ARG 1 pos @@ -43,3 +45,4 @@ CLASS net/minecraft/class_5801 net/minecraft/block/BigDripleafBlock ARG 3 direction METHOD method_33727 canGrowInto (Lnet/minecraft/class_2680;)Z ARG 0 state + METHOD method_66392 getShapeGetter ()Ljava/util/function/Function; diff --git a/mappings/net/minecraft/block/BigDripleafStemBlock.mapping b/mappings/net/minecraft/block/BigDripleafStemBlock.mapping index bbeec619b7..ebd43c005f 100644 --- a/mappings/net/minecraft/block/BigDripleafStemBlock.mapping +++ b/mappings/net/minecraft/block/BigDripleafStemBlock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5802 net/minecraft/block/BigDripleafStemBlock FIELD field_28667 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_46278 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55738 SHAPES_BY_DIRECTIONS Ljava/util/Map; METHOD method_33728 placeStemAt (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_2350;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index e7ef56b9b0..2d717e3087 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -46,12 +46,18 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block COMMENT Prevents the previous block (container) from dropping items when destroyed. FIELD field_31033 MOVED I COMMENT Signals that the current block is being moved to a different location, usually because of a piston. + FIELD field_31035 SKIP_REDRAW_AND_CALLBACKS I + COMMENT @see #NO_REDRAW + COMMENT @see #SKIP_CALLBACKS FIELD field_31036 NOTIFY_ALL I COMMENT The default setBlockState behavior. Same as {@code NOTIFY_NEIGHBORS | NOTIFY_LISTENERS}. FIELD field_36404 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_46280 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_53822 SKIP_REDSTONE_WIRE_STATE_REPLACEMENT I COMMENT Skips {@link AbstractBlock#getStateForNeighborUpdate} call for redstone wire. + FIELD field_55739 SKIP_CALLBACKS I + COMMENT Skips {@link AbstractBlock#onBlockAdded} and {@link BlockEntity#onStateReplaced}. + COMMENT Used when placing structures. METHOD method_16361 hasTopRim (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/ButtonBlock.mapping b/mappings/net/minecraft/block/ButtonBlock.mapping index b74964a5b5..514dc87af2 100644 --- a/mappings/net/minecraft/block/ButtonBlock.mapping +++ b/mappings/net/minecraft/block/ButtonBlock.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2269 net/minecraft/block/ButtonBlock FIELD field_40298 pressTicks I FIELD field_42753 blockSetType Lnet/minecraft/class_8177; FIELD field_46293 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55743 shapeGetter Ljava/util/function/Function; METHOD (Lnet/minecraft/class_8177;ILnet/minecraft/class_4970$class_2251;)V ARG 1 blockSetType ARG 2 pressTicks @@ -18,6 +19,7 @@ CLASS net/minecraft/class_2269 net/minecraft/block/ButtonBlock ARG 0 block METHOD method_53985 (Lnet/minecraft/class_2269;)Lnet/minecraft/class_8177; ARG 0 block + METHOD method_66419 getShapeGetter ()Ljava/util/function/Function; METHOD method_9712 getClickSound (Z)Lnet/minecraft/class_3414; ARG 1 powered METHOD method_9713 updateNeighbors (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/block/ChainBlock.mapping b/mappings/net/minecraft/block/ChainBlock.mapping index 33487a0d2e..3fc96c4b75 100644 --- a/mappings/net/minecraft/block/ChainBlock.mapping +++ b/mappings/net/minecraft/block/ChainBlock.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_5172 net/minecraft/block/ChainBlock FIELD field_24411 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_46309 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55746 SHAPES_BY_AXES Ljava/util/Map; diff --git a/mappings/net/minecraft/block/ChestBlock.mapping b/mappings/net/minecraft/block/ChestBlock.mapping index db19b9b8ce..8f8647788c 100644 --- a/mappings/net/minecraft/block/ChestBlock.mapping +++ b/mappings/net/minecraft/block/ChestBlock.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_2281 net/minecraft/block/ChestBlock FIELD field_17356 INVENTORY_RETRIEVER Lnet/minecraft/class_4732$class_3923; FIELD field_17357 NAME_RETRIEVER Lnet/minecraft/class_4732$class_3923; FIELD field_46311 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55747 SINGLE_SHAPE Lnet/minecraft/class_265; + FIELD field_55748 DOUBLE_SHAPES_BY_DIRECTIONS Ljava/util/Map; METHOD (Ljava/util/function/Supplier;Lnet/minecraft/class_4970$class_2251;)V ARG 1 blockEntityTypeSupplier ARG 2 settings diff --git a/mappings/net/minecraft/block/CocoaBlock.mapping b/mappings/net/minecraft/block/CocoaBlock.mapping index 8f28627995..20b016cd12 100644 --- a/mappings/net/minecraft/block/CocoaBlock.mapping +++ b/mappings/net/minecraft/block/CocoaBlock.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_2282 net/minecraft/block/CocoaBlock FIELD field_10779 AGE Lnet/minecraft/class_2758; FIELD field_31061 MAX_AGE I FIELD field_46315 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55749 SHAPES Ljava/util/List; diff --git a/mappings/net/minecraft/block/CropBlock.mapping b/mappings/net/minecraft/block/CropBlock.mapping index 015ccb031f..ad7555084c 100644 --- a/mappings/net/minecraft/block/CropBlock.mapping +++ b/mappings/net/minecraft/block/CropBlock.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_2302 net/minecraft/block/CropBlock METHOD method_9826 applyGrowth (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos + ARG 3 state METHOD method_9827 getMaxAge ()I METHOD method_9828 withAge (I)Lnet/minecraft/class_2680; ARG 1 age diff --git a/mappings/net/minecraft/block/FireBlock.mapping b/mappings/net/minecraft/block/FireBlock.mapping index d168c50332..5d21ce0351 100644 --- a/mappings/net/minecraft/block/FireBlock.mapping +++ b/mappings/net/minecraft/block/FireBlock.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock FIELD field_11095 burnChances Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_11096 NORTH Lnet/minecraft/class_2746; FIELD field_46352 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55760 shapeGetter Ljava/util/function/Function; METHOD method_10189 registerFlammableBlock (Lnet/minecraft/class_2248;II)V ARG 1 block ARG 2 burnChance @@ -44,3 +45,4 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock ARG 3 age METHOD method_26155 getFireTickDelay (Lnet/minecraft/class_5819;)I ARG 0 random + METHOD method_66432 getShapeGetter ()Ljava/util/function/Function; diff --git a/mappings/net/minecraft/block/FluidDrainable.mapping b/mappings/net/minecraft/block/FluidDrainable.mapping index d1f22b0e9f..cd93d2f006 100644 --- a/mappings/net/minecraft/block/FluidDrainable.mapping +++ b/mappings/net/minecraft/block/FluidDrainable.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2263 net/minecraft/block/FluidDrainable COMMENT COMMENT @see net.minecraft.fluid.Fluid#getBucketFillSound() METHOD method_9700 tryDrainFluid (Lnet/minecraft/class_1309;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; + ARG 1 drainer ARG 2 world ARG 3 pos ARG 4 state diff --git a/mappings/net/minecraft/block/FluidFillable.mapping b/mappings/net/minecraft/block/FluidFillable.mapping index 1532dba19b..87b8b1e391 100644 --- a/mappings/net/minecraft/block/FluidFillable.mapping +++ b/mappings/net/minecraft/block/FluidFillable.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2402 net/minecraft/block/FluidFillable METHOD method_10310 canFillWithFluid (Lnet/minecraft/class_1309;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)Z + ARG 1 filler ARG 2 world ARG 3 pos ARG 4 state diff --git a/mappings/net/minecraft/block/Segmented.mapping b/mappings/net/minecraft/block/Segmented.mapping index 100b5c1cf5..7e74629f7d 100644 --- a/mappings/net/minecraft/block/Segmented.mapping +++ b/mappings/net/minecraft/block/Segmented.mapping @@ -15,6 +15,6 @@ CLASS net/minecraft/class_10596 net/minecraft/block/Segmented ARG 3 property METHOD method_66465 buildShapeFunction (Lnet/minecraft/class_2754;Lnet/minecraft/class_2758;)Ljava/util/function/Function; ARG 1 directionProperty - ARG 2 segementAmountProperty + ARG 2 segmentAmountProperty METHOD method_66466 (Lnet/minecraft/class_2754;Lnet/minecraft/class_2758;Ljava/util/Map;Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; ARG 3 state diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 22590d0667..f605f60639 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -250,12 +250,19 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_59535 createComponentlessNbtWithIdentifyingData (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; ARG 1 registries METHOD method_59894 tryParseCustomName (Lnet/minecraft/class_2520;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2561; + ARG 0 nbt ARG 1 registries METHOD method_61175 validateSupports (Lnet/minecraft/class_2680;)V ARG 1 state METHOD method_61176 supports (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_61177 getNameForReport ()Ljava/lang/String; + METHOD method_66473 onStateReplaced (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V + ARG 1 pos + ARG 2 oldState + ARG 3 moved + METHOD method_66474 (Ljava/lang/String;)V + ARG 0 error CLASS class_9472 Components FIELD field_50176 CODEC Lcom/mojang/serialization/Codec; CLASS class_9473 ComponentsAccess diff --git a/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping b/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping index 5f11522219..50a7940db4 100644 --- a/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_8174 net/minecraft/block/entity/BrushableBlockEntity METHOD method_49215 brush (JLnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;)Z ARG 1 worldTime ARG 3 world + ARG 4 brusher ARG 5 hitDirection ARG 6 brush METHOD method_49216 setLootTable (Lnet/minecraft/class_5321;J)V @@ -24,14 +25,17 @@ CLASS net/minecraft/class_8174 net/minecraft/block/entity/BrushableBlockEntity ARG 2 seed METHOD method_49217 generateItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V ARG 1 world + ARG 2 brusher ARG 3 brush METHOD method_49218 finishBrushing (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V ARG 1 world + ARG 2 brusher ARG 3 brush METHOD method_49219 scheduledTick (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_49220 spawnItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V ARG 1 world + ARG 2 brusher ARG 3 brush METHOD method_49222 readLootTableFromNbt (Lnet/minecraft/class_2487;)Z ARG 1 nbt diff --git a/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping b/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping index 262a7e1681..e4bf7fcafd 100644 --- a/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping @@ -51,3 +51,8 @@ CLASS net/minecraft/class_10323 net/minecraft/block/entity/CreakingHeartBlockEnt METHOD method_65906 setCreakingPuppetFromUuid (Ljava/util/UUID;)V ARG 1 creakingPuppetUuid METHOD method_65907 clearCreakingPuppet ()V + METHOD method_66475 getBlockState (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_10323;)Lnet/minecraft/class_2680; + ARG 0 world + ARG 1 state + ARG 2 pos + ARG 3 creakingHeart diff --git a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping index dd74a1a44e..9a3f1af58f 100644 --- a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping +++ b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_8967 net/minecraft/block/enums/TrialSpawnerState ARG 3 lootTable METHOD method_55212 (Lnet/minecraft/class_8966;Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;Lnet/minecraft/class_8963;Ljava/util/UUID;)V ARG 4 uuid + METHOD method_55213 (Lnet/minecraft/class_8966;Lnet/minecraft/class_8963;Lnet/minecraft/class_1952;)V + ARG 2 spawnData METHOD method_55214 tick (Lnet/minecraft/class_2338;Lnet/minecraft/class_8963;Lnet/minecraft/class_3218;)Lnet/minecraft/class_8967; ARG 1 pos ARG 2 logic diff --git a/mappings/net/minecraft/block/spawner/MobSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/MobSpawnerLogic.mapping index 6b60a65c37..6660e6853f 100644 --- a/mappings/net/minecraft/block/spawner/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/block/spawner/MobSpawnerLogic.mapping @@ -21,12 +21,16 @@ CLASS net/minecraft/class_1917 net/minecraft/block/spawner/MobSpawnerLogic METHOD method_31589 clientTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos + METHOD method_33356 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1952;)V + ARG 3 spawnPotential METHOD method_38080 (Ljava/lang/String;)V ARG 0 error METHOD method_46404 getSpawnEntry (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1952; ARG 1 world ARG 2 random ARG 3 pos + METHOD method_46405 (Ljava/lang/String;)V + ARG 0 error METHOD method_8272 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_8273 sendStatus (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V diff --git a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping index 4c4f698b60..545921701f 100644 --- a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping @@ -59,3 +59,5 @@ CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsCompon METHOD method_59709 clear ()Lnet/minecraft/class_9276$class_9277; METHOD method_64662 setSelectedStackIndex (I)V ARG 1 selectedStackIndex + METHOD method_66335 isOutOfBounds (I)Z + ARG 1 index diff --git a/mappings/net/minecraft/datafixer/FixUtil.mapping b/mappings/net/minecraft/datafixer/FixUtil.mapping index 802bf2d9d2..62518615cf 100644 --- a/mappings/net/minecraft/datafixer/FixUtil.mapping +++ b/mappings/net/minecraft/datafixer/FixUtil.mapping @@ -25,3 +25,4 @@ CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil ARG 2 value METHOD method_61358 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map$Entry;)Lcom/mojang/serialization/Dynamic; ARG 1 entry + METHOD method_66040 withType (Lcom/mojang/datafixers/types/Type;Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index 0a9e6a7ecd..34b41f92c7 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -43,3 +43,5 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas ARG 0 followRange METHOD method_65957 (D)D ARG 0 followRange + METHOD method_66036 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 value diff --git a/mappings/net/minecraft/datafixer/fix/BlockPropertyRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockPropertyRenameFix.mapping new file mode 100644 index 0000000000..c59b860f16 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BlockPropertyRenameFix.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_10560 net/minecraft/datafixer/fix/BlockPropertyRenameFix + FIELD field_55627 name Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V + ARG 1 outputSchema + ARG 2 name + METHOD method_66042 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 typed + METHOD method_66043 fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 blockState + METHOD method_66044 shouldFix (Ljava/lang/String;)Z + ARG 1 id + METHOD method_66045 fix (Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 id + ARG 2 properties + METHOD method_66046 (Ljava/util/Optional;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 2 properties diff --git a/mappings/net/minecraft/datafixer/fix/DisplayNameFix.mapping b/mappings/net/minecraft/datafixer/fix/DisplayNameFix.mapping new file mode 100644 index 0000000000..12d18b74e7 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/DisplayNameFix.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_10567 net/minecraft/datafixer/fix/DisplayNameFix + FIELD field_55640 name Ljava/lang/String; + FIELD field_55641 typeReference Lcom/mojang/datafixers/DSL$TypeReference; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 typeReference diff --git a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping index 535046f2f5..4c0f62f0ab 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_7505 net/minecraft/datafixer/fix/ItemNbtFix ARG 0 itemStackType ARG 1 itemIdPredicate ARG 2 nbtFixer + METHOD method_66067 fix (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 typed diff --git a/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping index bf98faa66c..15952eb882 100644 --- a/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping @@ -3,3 +3,9 @@ CLASS net/minecraft/class_4294 net/minecraft/datafixer/fix/OminousBannerItemRena ARG 1 outputSchema METHOD method_44194 (Ljava/lang/String;)Z ARG 0 itemId + METHOD method_66114 fixBannerNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 nbt + METHOD method_66115 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 display + METHOD method_66116 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 name diff --git a/mappings/net/minecraft/datafixer/fix/RemoveFilteredBookTextFix.mapping b/mappings/net/minecraft/datafixer/fix/RemoveFilteredBookTextFix.mapping index cf6c5cfd02..fc4b4c9146 100644 --- a/mappings/net/minecraft/datafixer/fix/RemoveFilteredBookTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RemoveFilteredBookTextFix.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/class_7503 net/minecraft/datafixer/fix/RemoveFilteredBookTex ARG 1 outputSchema METHOD method_44189 (Ljava/lang/String;)Z ARG 0 itemId + METHOD method_66068 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 nbt diff --git a/mappings/net/minecraft/datafixer/fix/SimpleBlockPropertyRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/SimpleBlockPropertyRenameFix.mapping new file mode 100644 index 0000000000..6d50111129 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/SimpleBlockPropertyRenameFix.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_10562 net/minecraft/datafixer/fix/SimpleBlockPropertyRenameFix + FIELD field_55630 targetId Ljava/lang/String; + FIELD field_55631 oldPropertyName Ljava/lang/String; + FIELD field_55632 newPropertyName Ljava/lang/String; + FIELD field_55633 valueConverter Ljava/util/function/UnaryOperator; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 targetId + ARG 4 oldPropertyName + ARG 5 newPropertyName + ARG 6 valueConverter + METHOD method_66054 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 value diff --git a/mappings/net/minecraft/class_10565.mapping b/mappings/net/minecraft/datafixer/fix/SimpleItemNbtFix.mapping similarity index 59% rename from mappings/net/minecraft/class_10565.mapping rename to mappings/net/minecraft/datafixer/fix/SimpleItemNbtFix.mapping index 138b1d4a87..0f6fed179c 100644 --- a/mappings/net/minecraft/class_10565.mapping +++ b/mappings/net/minecraft/datafixer/fix/SimpleItemNbtFix.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_10565 +CLASS net/minecraft/class_10565 net/minecraft/datafixer/fix/SimpleItemNbtFix METHOD method_20445 fixNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic diff --git a/mappings/net/minecraft/datafixer/schema/Schema1458.mapping b/mappings/net/minecraft/datafixer/schema/Schema1458.mapping new file mode 100644 index 0000000000..985ead5bfb --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema1458.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_10572 net/minecraft/datafixer/schema/Schema1458 + METHOD method_66146 itemsAndCustomName (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 0 schema + METHOD method_66148 customName (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 0 schema + METHOD registerBlockEntities (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 fd47551bda..96d09d8d7d 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1298,6 +1298,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT net.minecraft.entity.vehicle.BoatEntity} uses this to spawn splash particles. ARG 1 drag COMMENT whether the entity should be dragged downwards + ARG 2 pos METHOD method_5701 isSilent ()Z COMMENT {@return whether the entity is silent} COMMENT @@ -2140,7 +2141,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 stepHeight METHOD method_59922 getRandom ()Lnet/minecraft/class_5819; METHOD method_59958 getWeaponStack ()Lnet/minecraft/class_1799; - METHOD method_6034 canMoveVoluntarily ()Z + METHOD method_6034 canActVoluntarily ()Z METHOD method_60478 getMovement ()Lnet/minecraft/class_243; METHOD method_60490 recalculateDimensions (Lnet/minecraft/class_4048;)Z ARG 1 previous @@ -2257,6 +2258,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 reason METHOD method_65037 checkBlockCollision (Ljava/util/List;Ljava/util/List;)V ARG 1 queuedCollisionChecks + ARG 2 collidedBlocks METHOD method_65038 isControlledByPlayer ()Z METHOD method_65341 calculateDefaultBoundingBox (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; ARG 1 pos @@ -2268,6 +2270,17 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 yDifference ARG 5 zDifference ARG 7 onGround + METHOD method_66233 getInterpolator ()Lnet/minecraft/class_10584; + METHOD method_66245 isInterpolating ()Z + METHOD method_66246 updateTrackedPositionAndAngles (Lnet/minecraft/class_243;FF)V + ARG 1 pos + ARG 2 yaw + ARG 3 pitch + METHOD method_66247 isLogicalSideForUpdatingMovement ()Z + METHOD method_66248 isControlledByMainPlayer ()Z + METHOD method_66249 canMoveVoluntarily ()Z + METHOD method_66250 spawnBubbleColumnParticles (Lnet/minecraft/class_2338;)V + ARG 1 pos METHOD method_7325 isSpectator ()Z COMMENT {@return whether the entity is a spectator} COMMENT diff --git a/mappings/net/minecraft/entity/EntityAttachments.mapping b/mappings/net/minecraft/entity/EntityAttachments.mapping index 7440ef39db..20e81f4ff6 100644 --- a/mappings/net/minecraft/entity/EntityAttachments.mapping +++ b/mappings/net/minecraft/entity/EntityAttachments.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_9066 net/minecraft/entity/EntityAttachments METHOD method_55844 of (FF)Lnet/minecraft/class_9066; ARG 0 width ARG 1 height + METHOD method_66251 (FFFLnet/minecraft/class_9064;)Ljava/util/List; + ARG 4 type CLASS class_9067 Builder FIELD field_47753 points Ljava/util/Map; METHOD method_55680 build (FF)Lnet/minecraft/class_9066; @@ -40,3 +42,5 @@ CLASS net/minecraft/class_9066 net/minecraft/entity/EntityAttachments METHOD method_55683 add (Lnet/minecraft/class_9064;Lnet/minecraft/class_243;)Lnet/minecraft/class_9066$class_9067; ARG 1 type ARG 2 point + METHOD method_66252 (FFLnet/minecraft/class_9064;)Ljava/util/List; + ARG 3 type diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping index 18059de912..3729be2947 100644 --- a/mappings/net/minecraft/entity/EntityStatuses.mapping +++ b/mappings/net/minecraft/entity/EntityStatuses.mapping @@ -57,3 +57,4 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_49074 PEEKING B FIELD field_49215 BREAK_BODY B FIELD field_54559 INVULNERABLE_CREAKING_HIT B + FIELD field_55660 ADD_BUBBLE_PARTICLES B diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 6d26c64ddc..fefdda2df2 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -88,12 +88,14 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_48009 copier (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)Ljava/util/function/Consumer; ARG 0 world ARG 1 stack + ARG 2 spawner METHOD method_48010 (Lnet/minecraft/class_2561;Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_48011 nbtCopier (Ljava/util/function/Consumer;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)Ljava/util/function/Consumer; ARG 0 chained ARG 1 world ARG 2 stack + ARG 3 spawner METHOD method_48012 customNameCopier (Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)Ljava/util/function/Consumer; ARG 0 chained ARG 1 stack @@ -103,6 +105,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 chained ARG 1 world ARG 2 stack + ARG 3 spawner METHOD method_53125 isIn (Lnet/minecraft/class_6885;)Z ARG 1 entityTypeEntryList METHOD method_58629 getSpawnBox (DDD)Lnet/minecraft/class_238; @@ -111,6 +114,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 5 z METHOD method_5881 loadFromEntityNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_9279;)V ARG 0 world + ARG 1 spawner ARG 2 entity ARG 3 nbt METHOD method_5882 getTranslationKey ()Ljava/lang/String; @@ -140,6 +144,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_5894 spawnFromItemStack (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; ARG 1 world ARG 2 stack + ARG 3 spawner ARG 4 pos ARG 5 spawnReason ARG 6 alignPosition diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping index 4cc824c71c..c1946bd577 100644 --- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping +++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity FIELD field_30055 DESPAWN_AGE I FIELD field_30056 EXPENSIVE_UPDATE_INTERVAL I FIELD field_30058 MERGING_CHANCE_FRACTION I + FIELD field_55662 interpolator Lnet/minecraft/class_10584; FIELD field_6159 amount I FIELD field_6161 health I FIELD field_6162 target Lnet/minecraft/class_1657; @@ -49,3 +50,4 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity METHOD method_5919 getExperienceAmount ()I METHOD method_5920 getOrbSize ()I METHOD method_5921 applyWaterMovement ()V + METHOD method_66264 moveTowardsPlayer ()V diff --git a/mappings/net/minecraft/entity/LazyEntityReference.mapping b/mappings/net/minecraft/entity/LazyEntityReference.mapping new file mode 100644 index 0000000000..7432743aa2 --- /dev/null +++ b/mappings/net/minecraft/entity/LazyEntityReference.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_10583 net/minecraft/entity/LazyEntityReference + FIELD field_55661 value Lcom/mojang/datafixers/util/Either; + METHOD (Ljava/util/UUID;)V + ARG 1 value + METHOD (Lnet/minecraft/class_10599;)V + ARG 1 value + METHOD method_66253 createCodec ()Lcom/mojang/serialization/Codec; + METHOD method_66254 resolve (Lnet/minecraft/class_10583;Lnet/minecraft/class_10598;Ljava/lang/Class;)Lnet/minecraft/class_10599; + ARG 0 entity + ARG 1 world + ARG 2 type + METHOD method_66255 resolve (Lnet/minecraft/class_10598;Ljava/lang/Class;)Lnet/minecraft/class_10599; + ARG 1 world + ARG 2 type + METHOD method_66256 uuidEquals (Lnet/minecraft/class_10599;)Z + ARG 1 o + METHOD method_66257 cast (Lnet/minecraft/class_10599;Ljava/lang/Class;)Lnet/minecraft/class_10599; + ARG 1 entity + ARG 2 clazz + METHOD method_66258 (Ljava/util/UUID;)Ljava/util/UUID; + ARG 0 uuid + METHOD method_66259 writeNbt (Lnet/minecraft/class_2487;Ljava/lang/String;)V + ARG 1 nbt + ARG 2 key + METHOD method_66260 fromNbtOrPlayerName (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_1937;)Lnet/minecraft/class_10583; + ARG 0 nbt + ARG 1 key + ARG 2 world + METHOD method_66261 createPacketCodec ()Lnet/minecraft/class_9139; + METHOD method_66262 fromNbt (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_10583; + ARG 0 nbt + ARG 1 key + METHOD method_66263 getUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index c367724e2e..d65c04fb3d 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -31,6 +31,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_51996 SPRINTING_SPEED_MODIFIER_ID Lnet/minecraft/class_2960; FIELD field_52447 elytraFlightController Lnet/minecraft/class_9863; FIELD field_54564 NOT_WEARING_GAZE_DISGUISE_PREDICATE Ljava/util/function/Predicate; + FIELD field_55674 attackerReference Lnet/minecraft/class_10583; + FIELD field_55675 interpolator Lnet/minecraft/class_10584; FIELD field_6212 sidewaysSpeed F FIELD field_6213 deathTime I FIELD field_6214 POTION_SWIRLS_AMBIENT Lnet/minecraft/class_2940; @@ -214,6 +216,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_29503 hurtByWater ()Z METHOD method_29504 isDead ()Z METHOD method_29505 setAttacking (Lnet/minecraft/class_10583;I)V + ARG 1 attackingPlayer + ARG 2 playerHitTimer METHOD method_29920 shouldSwimInFluids ()Z METHOD method_30120 (Ljava/util/List;Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 2 slot @@ -656,6 +660,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 source ARG 2 amount METHOD method_61417 travelGliding (Lnet/minecraft/class_243;)V + ARG 1 movementInput METHOD method_61418 (DLnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 2 pos METHOD method_61419 forEachShearedItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;Lnet/minecraft/class_1799;Ljava/util/function/BiConsumer;)V @@ -735,8 +740,20 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 damageSource METHOD method_65344 becomeAngry (Lnet/minecraft/class_1282;)V ARG 1 damageSource + METHOD method_66276 addBubbleParticles ()V + METHOD method_66277 setAttacking (Lnet/minecraft/class_1657;I)V + ARG 1 attackingPlayer + ARG 2 playerHitTimer + METHOD method_66278 setAttacking (Ljava/util/UUID;I)V + ARG 1 attackingPlayer + ARG 2 playerHitTimer METHOD method_66279 getEffectFadeFactor (Lnet/minecraft/class_6880;F)F ARG 1 effect ARG 2 tickDelta + METHOD method_66280 getAttackingPlayer ()Lnet/minecraft/class_1657; + METHOD method_66281 stopGliding ()V + METHOD method_66282 tickMovementInput ()V + METHOD method_66283 playThornsSound (Lnet/minecraft/class_1282;)V + ARG 1 damageSource METHOD method_7292 getLuck ()F CLASS class_6823 FallSounds diff --git a/mappings/net/minecraft/entity/PositionInterpolator.mapping b/mappings/net/minecraft/entity/PositionInterpolator.mapping new file mode 100644 index 0000000000..5992184fe7 --- /dev/null +++ b/mappings/net/minecraft/entity/PositionInterpolator.mapping @@ -0,0 +1,48 @@ +CLASS net/minecraft/class_10584 net/minecraft/entity/PositionInterpolator + FIELD field_55663 DEFAULT_INTERPOLATION_DURATION I + FIELD field_55664 entity Lnet/minecraft/class_1297; + FIELD field_55665 lerpDuration I + FIELD field_55666 data Lnet/minecraft/class_10584$class_10585; + FIELD field_55667 lastPos Lnet/minecraft/class_243; + FIELD field_55668 lastRotation Lnet/minecraft/class_241; + FIELD field_55669 callback Ljava/util/function/Consumer; + METHOD (Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD (Lnet/minecraft/class_1297;I)V + ARG 1 entity + ARG 2 lerpDuration + METHOD (Lnet/minecraft/class_1297;ILjava/util/function/Consumer;)V + ARG 1 entity + ARG 2 lerpDuration + ARG 3 callback + METHOD (Lnet/minecraft/class_1297;Ljava/util/function/Consumer;)V + ARG 1 entity + ARG 2 callback + METHOD method_66265 getLerpedPos ()Lnet/minecraft/class_243; + METHOD method_66266 setLerpDuration (I)V + ARG 1 lerpDuration + METHOD method_66267 refreshPositionAndAngles (Lnet/minecraft/class_243;FF)V + ARG 1 pow + ARG 2 yaw + ARG 3 pitch + METHOD method_66268 getLerpedYaw ()F + METHOD method_66269 getLerpedPitch ()F + METHOD method_66270 isInterpolating ()Z + METHOD method_66271 tick ()V + METHOD method_66272 clear ()V + CLASS class_10585 Data + FIELD field_55670 step I + FIELD field_55671 pos Lnet/minecraft/class_243; + FIELD field_55672 yaw F + FIELD field_55673 pitch F + METHOD (ILnet/minecraft/class_243;FF)V + ARG 1 step + ARG 2 pos + ARG 3 yaw + ARG 4 pitch + METHOD method_66273 tick ()V + METHOD method_66274 addRotation (FF)V + ARG 1 yaw + ARG 2 pitch + METHOD method_66275 addPos (Lnet/minecraft/class_243;)V + ARG 1 pos diff --git a/mappings/net/minecraft/entity/Tameable.mapping b/mappings/net/minecraft/entity/Tameable.mapping index 6bae54a9b0..23b00f4ee5 100644 --- a/mappings/net/minecraft/entity/Tameable.mapping +++ b/mappings/net/minecraft/entity/Tameable.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_6025 net/minecraft/entity/Tameable METHOD method_35057 getOwner ()Lnet/minecraft/class_1309; METHOD method_37908 getWorld ()Lnet/minecraft/class_1937; + METHOD method_66287 getOwnerReference ()Lnet/minecraft/class_10583; diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 0455d5b830..f9323aadc8 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -33,6 +33,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis FIELD field_49713 WOLF_VARIANT Lnet/minecraft/class_2941; FIELD field_49774 PARTICLE_LIST Lnet/minecraft/class_2941; FIELD field_55583 PIG_VARIANT Lnet/minecraft/class_2941; + FIELD field_55584 LAZY_ENTITY_REFERENCE 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/DisplayEntity.mapping b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping index d97027f359..54914c4d5e 100644 --- a/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping @@ -37,6 +37,7 @@ CLASS net/minecraft/class_8113 net/minecraft/entity/decoration/DisplayEntity FIELD field_45113 INTERPOLATION_DURATION Lnet/minecraft/class_2940; FIELD field_45114 TELEPORT_DURATION Lnet/minecraft/class_2940; FIELD field_52434 tooSmallToRender Z + FIELD field_55654 interpolator Lnet/minecraft/class_10584; METHOD method_48844 getLerpProgress (F)F ARG 1 delta METHOD method_48845 getTransformation (Lnet/minecraft/class_2945;)Lnet/minecraft/class_4590; diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 997b733ddc..247dd0a8b5 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect FIELD field_50115 requiredFeatures Lnet/minecraft/class_7699; FIELD field_51933 ENTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_51934 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_55650 fadeInTicks I + FIELD field_55651 fadeOutTicks I + FIELD field_55652 fadeOutThresholdTicks I FIELD field_5883 translationKey Ljava/lang/String; FIELD field_5885 attributeModifiers Ljava/util/Map; FIELD field_5886 color I @@ -82,6 +85,15 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect METHOD method_58620 playApplySound (Lnet/minecraft/class_1309;I)V ARG 1 entity ARG 2 amplifier + METHOD method_66222 fadeTicks (I)Lnet/minecraft/class_1291; + ARG 1 fadeTicks + METHOD method_66223 fadeTicks (III)Lnet/minecraft/class_1291; + ARG 1 fadeInTicks + ARG 2 fadeOutTicks + ARG 3 fadeOutThresholdTicks + METHOD method_66224 getFadeInTicks ()I + METHOD method_66225 getFadeOutTicks ()I + METHOD method_66226 getFadeOutThresholdTicks ()I CLASS class_8634 EffectAttributeModifierCreator FIELD comp_2183 baseValue D METHOD comp_2183 baseValue ()D diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 2c1d07c935..0e222f66f5 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -96,6 +96,9 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 0 nbt METHOD method_5584 getDuration ()I METHOD method_5585 update (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Ljava/lang/Runnable;)Z + ARG 1 world + ARG 2 entity + ARG 3 hiddenEffectCallback METHOD method_5586 getTranslationKey ()Ljava/lang/String; METHOD method_5588 updateDuration ()V METHOD method_5590 upgrade (Lnet/minecraft/class_1293;)Z @@ -123,6 +126,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 1 durationMultiplier METHOD method_66228 (FI)I ARG 1 duration + METHOD method_66229 tickClient ()V + METHOD method_66230 tickHiddenEffect ()Z CLASS class_9063 Fading COMMENT Computes the factor (multiplier) for effect fade-in and fade-out. COMMENT @@ -144,6 +149,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 2 tickDelta METHOD method_55661 update (Lnet/minecraft/class_1293;)V ARG 1 effect + METHOD method_66231 shouldFadeIn (Lnet/minecraft/class_1293;)Z + ARG 0 effect CLASS class_9195 Parameters FIELD field_48822 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_49208 PACKET_CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index cd906961f5..3f46bbbe05 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity FIELD field_42645 MIN_HEALTH_BONUS F FIELD field_42646 MAX_HEALTH_BONUS F FIELD field_48830 armorInventory Lnet/minecraft/class_1263; + FIELD field_55705 ownerReference Lnet/minecraft/class_10583; FIELD field_6955 temper I FIELD field_6956 IS_BRED_HORSE Lnet/minecraft/class_4051$class_10254; FIELD field_6957 tailWagTicks I @@ -79,6 +80,8 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 random METHOD method_60977 getInventorySize (I)I ARG 0 columns + METHOD method_66323 setOwner (Lnet/minecraft/class_1309;)V + ARG 1 entity METHOD method_6702 getInventoryColumns ()I METHOD method_6721 onChestedStatusChanged ()V METHOD method_6723 playJumpSound ()V diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 1fb3dee515..cec8933ff9 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -79,6 +79,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity METHOD method_18302 setSleeping (Z)V ARG 1 sleeping METHOD method_18428 canTrust (Lnet/minecraft/class_1309;)Z + ARG 1 entity METHOD method_18429 (Lnet/minecraft/class_1309;Lnet/minecraft/class_3218;)Z ARG 1 entity ARG 2 world @@ -98,6 +99,15 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_66290 trust (Lnet/minecraft/class_10583;)V + ARG 1 entity + METHOD method_66291 (Lnet/minecraft/class_1309;Lnet/minecraft/class_10583;)Z + ARG 1 trusted + METHOD method_66292 (Lnet/minecraft/class_2499;Ljava/util/UUID;)V + ARG 1 uuid + METHOD method_66293 getTrustedEntities ()Ljava/util/stream/Stream; + METHOD method_66294 trust (Lnet/minecraft/class_1309;)V + ARG 1 entity CLASS class_4020 DefendFriendGoal FIELD field_17966 offender Lnet/minecraft/class_1309; FIELD field_17967 friend Lnet/minecraft/class_1309; diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index 360a8e97c4..2f9fff7f05 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -10,3 +10,9 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity ARG 0 stack METHOD method_63649 (Lnet/minecraft/class_1590;)V ARG 1 zombifiedPiglin + METHOD method_66295 (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 variantKey + METHOD method_66296 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 variantId + METHOD method_66297 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V + ARG 1 variantKey diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping index 791e8156fe..f253f87487 100644 --- a/mappings/net/minecraft/entity/passive/TameableEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TameableEntity.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity METHOD method_60716 canTeleportOntoLeaves ()Z METHOD method_60717 canTeleportTo (Lnet/minecraft/class_2338;)Z ARG 1 pos - METHOD method_6170 setOwner (Lnet/minecraft/class_1657;)V + METHOD method_6170 setTamedBy (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_6171 isOwner (Lnet/minecraft/class_1309;)Z ARG 1 entity @@ -29,7 +29,8 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity METHOD method_6173 setTamed (ZZ)V ARG 1 tamed ARG 2 updateAttributes - METHOD method_6174 setOwnerUuid (Lnet/minecraft/class_1309;)V + METHOD method_6174 setOwner (Lnet/minecraft/class_1309;)V + ARG 1 owner METHOD method_6178 canAttackWithOwner (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 target ARG 2 owner @@ -38,6 +39,8 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity METHOD method_6180 showEmoteParticle (Z)V ARG 1 positive METHOD method_6181 isTamed ()Z + METHOD method_66288 setOwner (Lnet/minecraft/class_10583;)V + ARG 1 owner CLASS class_9788 TameableEscapeDangerGoal METHOD (Lnet/minecraft/class_1321;D)V ARG 2 speed diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 68decf7c39..e9a4007073 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -181,6 +181,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_65351 tickLoaded ()V METHOD method_65352 setLoaded (Z)V ARG 1 loaded + METHOD method_66324 shouldSkipBlockDrops ()Z + METHOD method_66325 getExpectedPose ()Lnet/minecraft/class_4050; 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/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index af72858471..cea46e92e8 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -12,11 +12,16 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti ARG 3 stack METHOD method_46401 (Lnet/minecraft/class_1309;)Z ARG 0 entity + METHOD method_48575 (FDI)I + ARG 3 duration METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1844;F)V ARG 1 potion + ARG 2 durationScale METHOD method_7498 applySplashPotion (Lnet/minecraft/class_3218;Ljava/lang/Iterable;FLnet/minecraft/class_1297;)V ARG 1 world ARG 2 effects + ARG 3 durationScale + ARG 4 hitEntity METHOD method_7499 extinguishFire (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_7500 applyWater (Lnet/minecraft/class_3218;)V diff --git a/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping index 4e32162a03..75a31d9f0d 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractBoatEntity.mapping @@ -24,9 +24,11 @@ CLASS net/minecraft/class_10255 net/minecraft/entity/vehicle/AbstractBoatEntity FIELD field_54453 paddlePhases [F FIELD field_54455 ticksUnderwater F FIELD field_54456 yawVelocity F + FIELD field_55706 interpolator Lnet/minecraft/class_10584; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Ljava/util/function/Supplier;)V ARG 1 type ARG 2 world + ARG 3 itemSupplier METHOD method_64476 handleBubbleColumn ()V METHOD method_64478 checkLocation ()Lnet/minecraft/class_10255$class_1691; METHOD method_64479 checkBoatInWater ()Z diff --git a/mappings/net/minecraft/entity/vehicle/DefaultMinecartController.mapping b/mappings/net/minecraft/entity/vehicle/DefaultMinecartController.mapping index ca1d973e21..681718e497 100644 --- a/mappings/net/minecraft/entity/vehicle/DefaultMinecartController.mapping +++ b/mappings/net/minecraft/entity/vehicle/DefaultMinecartController.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_9883 net/minecraft/entity/vehicle/DefaultMinecartController FIELD field_52554 velocity Lnet/minecraft/class_243; + FIELD field_55707 interpolator Lnet/minecraft/class_10584; METHOD method_61619 (DDDD)Lnet/minecraft/class_243; ARG 1 x ARG 3 y @@ -8,3 +9,5 @@ CLASS net/minecraft/class_9883 net/minecraft/entity/vehicle/DefaultMinecartContr ARG 1 x ARG 3 y ARG 5 z + METHOD method_66329 onLerp (Lnet/minecraft/class_10584;)V + ARG 1 interpolator diff --git a/mappings/net/minecraft/entity/vehicle/MinecartController.mapping b/mappings/net/minecraft/entity/vehicle/MinecartController.mapping index efdf5686db..ad9e70cfb6 100644 --- a/mappings/net/minecraft/entity/vehicle/MinecartController.mapping +++ b/mappings/net/minecraft/entity/vehicle/MinecartController.mapping @@ -44,3 +44,4 @@ CLASS net/minecraft/class_9878 net/minecraft/entity/vehicle/MinecartController ARG 1 world METHOD method_61599 getSpeedRetention ()D METHOD method_62826 handleCollision ()Z + METHOD method_66328 getInterpolator ()Lnet/minecraft/class_10584; diff --git a/mappings/net/minecraft/loot/LootTables.mapping b/mappings/net/minecraft/loot/LootTables.mapping index c070d86369..ee05dea94f 100644 --- a/mappings/net/minecraft/loot/LootTables.mapping +++ b/mappings/net/minecraft/loot/LootTables.mapping @@ -26,3 +26,6 @@ CLASS net/minecraft/class_39 net/minecraft/loot/LootTables METHOD method_271 registerLootTable (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; ARG 0 key METHOD method_61883 registerAllDyeColors (Ljava/lang/String;)Ljava/util/Map; + ARG 0 prefix + METHOD method_66490 (Ljava/lang/String;Lnet/minecraft/class_1767;)Lnet/minecraft/class_5321; + ARG 1 color diff --git a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping index dd584b2802..baace229f0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping @@ -4,6 +4,7 @@ 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; + FIELD field_55580 showToast Z METHOD (Lnet/minecraft/class_9129;)V ARG 1 buf METHOD (ZLjava/util/Collection;Ljava/util/Set;Ljava/util/Map;Z)V @@ -11,6 +12,7 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement ARG 2 toEarn ARG 3 toRemove ARG 4 toSetProgress + ARG 5 showToast METHOD method_11924 shouldClearCurrent ()Z METHOD method_11926 getAdvancementIdsToRemove ()Ljava/util/Set; METHOD method_11927 getAdvancementsToProgress ()Ljava/util/Map; @@ -20,3 +22,4 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement ARG 1 progress METHOD method_55952 write (Lnet/minecraft/class_9129;)V ARG 1 buf + METHOD method_65970 shouldShowToast ()Z diff --git a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping index fbfb7be636..88a7cd3e05 100644 --- a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping +++ b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping @@ -44,6 +44,8 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate ARG 0 wolfVariant METHOD method_64175 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity + METHOD method_66289 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity CLASS class_7380 VariantType FIELD field_38741 variantGetter Ljava/util/function/Function; FIELD field_49794 codec Lcom/mojang/serialization/MapCodec; diff --git a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping index 72cbf2201c..552e6965ab 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping @@ -40,3 +40,5 @@ CLASS net/minecraft/class_7665 net/minecraft/resource/DefaultResourcePackBuilder ARG 2 path METHOD method_45212 addRootPath (Ljava/nio/file/Path;)V ARG 1 path + METHOD method_66030 (Lnet/minecraft/class_3264;)Ljava/util/List; + ARG 1 type diff --git a/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping b/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping index 254af9d8d0..7bf2683692 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping @@ -25,3 +25,5 @@ CLASS net/minecraft/class_267 net/minecraft/scoreboard/ScoreboardScore METHOD method_55407 getDisplayText ()Lnet/minecraft/class_2561; METHOD method_55408 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; ARG 1 registries + METHOD method_66508 (Lnet/minecraft/class_267;Lnet/minecraft/class_2561;)V + ARG 1 display diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index bda7c1043d..6a46582835 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -24,3 +24,7 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState METHOD method_32481 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_273; ARG 1 nbt ARG 2 registries + METHOD method_55435 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 format + METHOD method_66509 (Ljava/lang/String;Lcom/mojang/serialization/DataResult$Error;)V + ARG 1 error diff --git a/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping b/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping index 7f9421af86..9447ce0129 100644 --- a/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping +++ b/mappings/net/minecraft/server/SampleSubscriptionTracker.mapping @@ -23,5 +23,7 @@ CLASS net/minecraft/class_9188 net/minecraft/server/SampleSubscriptionTracker METHOD method_56658 onUnsubscription (JI)V ARG 1 measuringTimeMs ARG 3 tick + METHOD method_66206 (Lnet/minecraft/class_9192;)Ljava/util/Map; + ARG 0 type CLASS class_9189 PlayerSubscriptionData CLASS class_9190 MeasureTimeTick diff --git a/mappings/net/minecraft/server/command/AdvancementCommand.mapping b/mappings/net/minecraft/server/command/AdvancementCommand.mapping index 4728c2ee41..21b5fbc448 100644 --- a/mappings/net/minecraft/server/command/AdvancementCommand.mapping +++ b/mappings/net/minecraft/server/command/AdvancementCommand.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_3008 net/minecraft/server/command/AdvancementCommand ARG 1 targets ARG 2 operation ARG 3 selection + ARG 4 skipSync METHOD method_12989 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_12990 addChildrenRecursivelyToList (Lnet/minecraft/class_8781;Ljava/util/List;)V @@ -58,6 +59,11 @@ CLASS net/minecraft/class_3008 net/minecraft/server/command/AdvancementCommand METHOD method_54924 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 advancement ARG 1 criterion + METHOD method_65972 executeAdvancement (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_3008$class_3009;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets + ARG 2 operation + ARG 3 selection CLASS class_3009 Operation FIELD field_13454 commandPrefix Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V @@ -65,6 +71,7 @@ CLASS net/minecraft/class_3008 net/minecraft/server/command/AdvancementCommand METHOD method_12999 processAll (Lnet/minecraft/class_3222;Ljava/lang/Iterable;Z)I ARG 1 player ARG 2 advancements + ARG 3 skipSync METHOD method_13000 processEachCriterion (Lnet/minecraft/class_3222;Lnet/minecraft/class_8779;Ljava/lang/String;)Z ARG 1 player ARG 2 advancement diff --git a/mappings/net/minecraft/server/command/CloneCommand.mapping b/mappings/net/minecraft/server/command/CloneCommand.mapping index 8e3b16be4b..b0ad4cc1a1 100644 --- a/mappings/net/minecraft/server/command/CloneCommand.mapping +++ b/mappings/net/minecraft/server/command/CloneCommand.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand ARG 3 destination ARG 4 filter ARG 5 mode + ARG 6 strict METHOD method_13094 (Lnet/minecraft/class_2168;)Z ARG 0 source METHOD method_13096 (Lnet/minecraft/class_2694;)Z @@ -25,6 +26,10 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand ARG 1 endPosGetter ARG 2 destinationPosGetter ARG 3 filterGetter + ARG 4 strict + ARG 5 builder + METHOD method_48036 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + ARG 5 context METHOD method_48040 createDimensionalPos (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3218;Ljava/lang/String;)Lnet/minecraft/class_3023$class_8010; ARG 0 context ARG 1 world @@ -32,6 +37,10 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand METHOD method_48042 createSourceArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 commandRegistryAccess ARG 1 worldGetter + METHOD method_48044 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + ARG 5 context + METHOD method_48049 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + ARG 5 context METHOD method_48055 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; ARG 0 context METHOD method_48056 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; @@ -40,6 +49,37 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand ARG 0 context METHOD method_48058 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; ARG 0 context + METHOD method_65973 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_65974 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + ARG 1 context + METHOD method_65975 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; + ARG 0 context + METHOD method_65976 (Lnet/minecraft/class_2694;)Z + ARG 0 pos + METHOD method_65977 createDestinationArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 registries + ARG 1 currentWorldGetter + ARG 2 targetWorldGetter + METHOD method_65978 appendMode (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 registries + ARG 1 beginPosGetter + ARG 2 endPosGetter + ARG 3 destinationPosGetter + ARG 4 strict + ARG 5 builder + METHOD method_65979 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + ARG 1 context + METHOD method_65980 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; + ARG 0 context + METHOD method_65981 (Lnet/minecraft/class_2694;)Z + ARG 0 pos + METHOD method_65982 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + ARG 1 context + METHOD method_65983 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; + ARG 0 context + METHOD method_65984 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;ZLcom/mojang/brigadier/context/CommandContext;)I + ARG 5 context CLASS class_3024 BlockInfo FIELD comp_2539 pos Lnet/minecraft/class_2338; FIELD comp_2540 state Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/server/command/FillCommand.mapping b/mappings/net/minecraft/server/command/FillCommand.mapping index 8a570be6f1..064335019c 100644 --- a/mappings/net/minecraft/server/command/FillCommand.mapping +++ b/mappings/net/minecraft/server/command/FillCommand.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand ARG 2 block ARG 3 mode ARG 4 filter + ARG 5 strict METHOD method_65985 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I ARG 4 context METHOD method_65986 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/PlaceCommand.mapping b/mappings/net/minecraft/server/command/PlaceCommand.mapping index 10848f0c86..79f6ca276f 100644 --- a/mappings/net/minecraft/server/command/PlaceCommand.mapping +++ b/mappings/net/minecraft/server/command/PlaceCommand.mapping @@ -55,6 +55,7 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand ARG 4 mirror ARG 5 integrity ARG 6 seed + ARG 7 strict METHOD method_43920 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id METHOD method_43921 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -70,3 +71,5 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand METHOD method_44145 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 builder + METHOD method_66003 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context diff --git a/mappings/net/minecraft/server/command/SetBlockCommand.mapping b/mappings/net/minecraft/server/command/SetBlockCommand.mapping index e9de8a0987..b8d4c2f6df 100644 --- a/mappings/net/minecraft/server/command/SetBlockCommand.mapping +++ b/mappings/net/minecraft/server/command/SetBlockCommand.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_3119 net/minecraft/server/command/SetBlockCommand ARG 2 block ARG 3 mode ARG 4 condition + ARG 5 strict METHOD method_13622 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13623 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V @@ -19,4 +20,8 @@ CLASS net/minecraft/class_3119 net/minecraft/server/command/SetBlockCommand ARG 0 context METHOD method_13627 (Lnet/minecraft/class_2168;)Z ARG 0 source + METHOD method_66004 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_66005 (Ljava/util/function/Predicate;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context CLASS class_3121 Mode diff --git a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping index 01914cb86e..5717382129 100644 --- a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping +++ b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping @@ -16,12 +16,14 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry FIELD field_18278 velocity Lnet/minecraft/class_243; FIELD field_39019 trackedPos Lnet/minecraft/class_7422; FIELD field_41697 changedEntries Ljava/util/List; + FIELD field_55595 packetSender Ljava/util/function/BiConsumer; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;IZLjava/util/function/Consumer;Ljava/util/function/BiConsumer;)V ARG 1 world ARG 2 entity ARG 3 tickInterval ARG 4 alwaysUpdateVelocity ARG 5 receiver + ARG 6 packetSender METHOD method_14302 stopTracking (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_14306 syncEntityData ()V @@ -36,6 +38,7 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry METHOD method_18760 startTracking (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_49753 streamChangedPassengers (Ljava/util/List;)Ljava/util/stream/Stream; + ARG 1 newPassengers METHOD method_60942 getPos ()Lnet/minecraft/class_243; METHOD method_60943 getVelocity ()Lnet/minecraft/class_243; METHOD method_60944 getPitch ()F @@ -46,3 +49,7 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry ARG 2 yaw ARG 3 pitch ARG 4 changedAngles + METHOD method_66013 (Lnet/minecraft/class_1297;)Z + ARG 1 passenger + METHOD method_66014 (Ljava/util/List;Lnet/minecraft/class_1297;)Z + ARG 1 passenger diff --git a/mappings/net/minecraft/server/world/ChunkLevelManager.mapping b/mappings/net/minecraft/server/world/ChunkLevelManager.mapping new file mode 100644 index 0000000000..697c8bbbf5 --- /dev/null +++ b/mappings/net/minecraft/server/world/ChunkLevelManager.mapping @@ -0,0 +1,91 @@ +CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkLevelManager + FIELD field_16210 chunkHoldersWithPendingUpdates Ljava/util/Set; + FIELD field_16211 LOGGER Lorg/slf4j/Logger; + FIELD field_17452 NEARBY_PLAYER_TICKET_LEVEL I + FIELD field_17453 playersByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_17454 distanceFromNearestPlayerTracker Lnet/minecraft/class_3204$class_3205; + FIELD field_17455 nearbyChunkTicketUpdater Lnet/minecraft/class_3204$class_3948; + FIELD field_17459 freshPlayerTicketPositions Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_17460 mainThreadExecutor Ljava/util/concurrent/Executor; + FIELD field_34887 simulationDistance I + FIELD field_54044 scheduler Lnet/minecraft/class_10173; + FIELD field_55589 ticketDistanceLevelPropagator Lnet/minecraft/class_4077; + FIELD field_55590 simulationDistanceLevelPropagator Lnet/minecraft/class_6609; + FIELD field_55591 ticketManager Lnet/minecraft/class_10592; + METHOD (Lnet/minecraft/class_10592;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V + ARG 1 ticketManager + ARG 2 executor + ARG 3 mainThreadExecutor + METHOD method_14035 isUnloaded (J)Z + ARG 1 pos + METHOD method_14038 getChunkHolder (J)Lnet/minecraft/class_3193; + ARG 1 pos + METHOD method_14040 (Lnet/minecraft/class_3228;)Z + ARG 0 ticket + METHOD method_14048 handleChunkEnter (Lnet/minecraft/class_4076;Lnet/minecraft/class_3222;)V + ARG 1 pos + ARG 2 player + METHOD method_14049 setWatchDistance (I)V + ARG 1 viewDistance + METHOD method_14051 handleChunkLeave (Lnet/minecraft/class_4076;Lnet/minecraft/class_3222;)V + ARG 1 pos + ARG 2 player + METHOD method_14052 getTickedChunkCount ()I + METHOD method_14053 setLevel (JILnet/minecraft/class_3193;I)Lnet/minecraft/class_3193; + ARG 1 pos + ARG 3 level + ARG 4 holder + METHOD method_15892 update (Lnet/minecraft/class_3898;)Z + COMMENT Update the states related to chunk tickets and chunk loading levels, which mainly involves three kind of updates: + COMMENT
    + COMMENT
  • Add or remove PLAYER tickets when necessary.
    • + COMMENT
  • Update the expected loading states of chunks depending on their new levels.
    • + COMMENT
  • Special updates of chunks with PLAYER tickets added recently.
    • + COMMENT
+ ARG 1 chunkLoadingManager + METHOD method_17642 (JLnet/minecraft/class_9259;)V + ARG 3 optionalChunk + METHOD method_17655 (J)Lit/unimi/dsi/fastutil/objects/ObjectSet; + ARG 0 sectionPos + METHOD method_20800 shouldTick (J)Z + ARG 1 chunkPos + METHOD method_21683 toDumpString ()Ljava/lang/String; + METHOD method_38629 setSimulationDistance (I)V + ARG 1 simulationDistance + METHOD method_38630 shouldTickEntities (J)Z + ARG 1 chunkPos + METHOD method_38632 shouldTickBlocks (J)Z + ARG 1 chunkPos + METHOD method_38633 getPlayerSimulationLevel ()I + METHOD method_39996 shouldDelayShutdown ()Z + METHOD method_61262 iterateChunkPosToTick ()Lit/unimi/dsi/fastutil/longs/LongIterator; + METHOD method_66007 getLevel (JZ)I + ARG 1 pos + ARG 3 forSimulation + CLASS class_3205 DistanceFromNearestPlayerTracker + FIELD field_13896 distanceFromNearestPlayer Lit/unimi/dsi/fastutil/longs/Long2ByteMap; + FIELD field_17461 maxDistance I + METHOD (Lnet/minecraft/class_3204;I)V + ARG 2 maxDistance + METHOD method_14056 isPlayerInChunk (J)Z + ARG 1 chunkPos + METHOD method_14057 updateLevels ()V + METHOD method_17657 onDistanceChange (JII)V + ARG 1 pos + ARG 3 oldDistance + ARG 4 distance + CLASS class_3948 NearbyChunkTicketUpdater + FIELD field_17464 watchDistance I + FIELD field_17465 distances Lit/unimi/dsi/fastutil/longs/Long2IntMap; + FIELD field_17466 positionsAffected Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD method_17658 setWatchDistance (I)V + ARG 1 watchDistance + METHOD method_17660 updateTicket (JIZZ)V + ARG 1 pos + ARG 3 distance + ARG 4 oldWithinViewDistance + ARG 5 withinViewDistance + METHOD method_17662 (JI)V + ARG 3 level + METHOD method_17664 isWithinViewDistance (I)Z + ARG 1 distance diff --git a/mappings/net/minecraft/world/ChunkPosDistanceLevelPropagator.mapping b/mappings/net/minecraft/server/world/ChunkPosDistanceLevelPropagator.mapping similarity index 61% rename from mappings/net/minecraft/world/ChunkPosDistanceLevelPropagator.mapping rename to mappings/net/minecraft/server/world/ChunkPosDistanceLevelPropagator.mapping index 5f1aa0c528..f306fad3a4 100644 --- a/mappings/net/minecraft/world/ChunkPosDistanceLevelPropagator.mapping +++ b/mappings/net/minecraft/server/world/ChunkPosDistanceLevelPropagator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3196 net/minecraft/world/ChunkPosDistanceLevelPropagator +CLASS net/minecraft/class_3196 net/minecraft/server/world/ChunkPosDistanceLevelPropagator METHOD method_14027 updateLevel (JIZ)V ARG 1 chunkPos ARG 3 distance diff --git a/mappings/net/minecraft/server/world/ChunkTicket.mapping b/mappings/net/minecraft/server/world/ChunkTicket.mapping index 2b97a2aa20..8dfc44c89a 100644 --- a/mappings/net/minecraft/server/world/ChunkTicket.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicket.mapping @@ -2,5 +2,20 @@ CLASS net/minecraft/class_3228 net/minecraft/server/world/ChunkTicket COMMENT Represents a chunk ticket, which specifies the reason a chunk has been loaded. FIELD field_14023 type Lnet/minecraft/class_3230; FIELD field_14025 level I + FIELD field_55597 ticksLeft J + METHOD (Lnet/minecraft/class_3230;I)V + ARG 1 type + ARG 2 level + METHOD (Lnet/minecraft/class_3230;IJ)V + ARG 1 type + ARG 2 level + ARG 3 ticksLeft METHOD method_14281 getType ()Lnet/minecraft/class_3230; METHOD method_14283 getLevel ()I + METHOD method_66020 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3228; + ARG 0 nbt + METHOD method_66021 writeNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_66022 refreshExpiry ()V + METHOD method_66023 tick ()V + METHOD method_66024 isExpired ()Z diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index be3c80f3cb..a56c6f1f6d 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -1,81 +1,103 @@ -CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager - FIELD field_16210 chunkHoldersWithPendingUpdates Ljava/util/Set; - FIELD field_16211 LOGGER Lorg/slf4j/Logger; - FIELD field_17452 NEARBY_PLAYER_TICKET_LEVEL I - FIELD field_17453 playersByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; - FIELD field_17454 distanceFromNearestPlayerTracker Lnet/minecraft/class_3204$class_3205; - FIELD field_17455 nearbyChunkTicketUpdater Lnet/minecraft/class_3204$class_3948; - FIELD field_17459 freshPlayerTicketPositions Lit/unimi/dsi/fastutil/longs/LongSet; - FIELD field_17460 mainThreadExecutor Ljava/util/concurrent/Executor; - FIELD field_34887 simulationDistance I - FIELD field_54044 scheduler Lnet/minecraft/class_10173; - METHOD method_14035 isUnloaded (J)Z +CLASS net/minecraft/class_10592 net/minecraft/server/world/ChunkTicketManager + FIELD field_55718 CHUNKS_NBT_KEY Ljava/lang/String; + FIELD field_55719 DEFAULT_TICKETS_MAP_SIZE I + FIELD field_55720 LOGGER Lorg/slf4j/Logger; + FIELD field_55721 TICKETS_NBT_KEY Ljava/lang/String; + FIELD field_55722 CHUNK_POS_NBT_KEY Ljava/lang/String; + FIELD field_55723 tickets Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; + FIELD field_55724 savedTickets Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; + FIELD field_55725 forcedChunks Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_55726 loadingLevelUpdater Lnet/minecraft/class_10592$class_10593; + FIELD field_55727 simulationLevelUpdater Lnet/minecraft/class_10592$class_10593; + METHOD (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V + ARG 1 tickets + ARG 2 savedTickets + METHOD method_66350 getType ()Lnet/minecraft/class_18$class_8645; + METHOD method_66351 updateLevel (ILnet/minecraft/class_3230;)V + ARG 1 level + ARG 2 type + METHOD method_66352 getTickets (J)Ljava/util/List; ARG 1 pos - METHOD method_14038 getChunkHolder (J)Lnet/minecraft/class_3193; + METHOD method_66353 addTicket (JLnet/minecraft/class_3228;)Z ARG 1 pos - METHOD method_14040 (Lnet/minecraft/class_3228;)Z + ARG 3 ticket + METHOD method_66354 getLevel (JZ)I + ARG 1 pos + ARG 3 forSimulation + METHOD method_66355 (Lnet/minecraft/class_3228;)Z ARG 0 ticket - METHOD method_14048 handleChunkEnter (Lnet/minecraft/class_4076;Lnet/minecraft/class_3222;)V + METHOD method_66356 ticketsEqual (Lnet/minecraft/class_3228;Lnet/minecraft/class_3228;)Z + ARG 0 a + ARG 1 b + METHOD method_66357 addTicket (Lnet/minecraft/class_3228;Lnet/minecraft/class_1923;)V + ARG 1 ticket + ARG 2 pos + METHOD method_66358 addTicket (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;I)V + ARG 1 type + ARG 2 pos + ARG 3 radius + METHOD method_66359 setChunkForced (Lnet/minecraft/class_1923;Z)Z ARG 1 pos - ARG 2 player - METHOD method_14049 setWatchDistance (I)V - ARG 1 viewDistance - METHOD method_14051 handleChunkLeave (Lnet/minecraft/class_4076;Lnet/minecraft/class_3222;)V + ARG 2 forced + METHOD method_66360 setLoadingLevelUpdater (Lnet/minecraft/class_10592$class_10593;)V + ARG 1 loadingLevelUpdater + METHOD method_66361 (Lit/unimi/dsi/fastutil/longs/Long2ObjectMap$Entry;J)Ljava/util/List; ARG 1 pos - ARG 2 player - METHOD method_14052 getTickedChunkCount ()I - METHOD method_14053 setLevel (JILnet/minecraft/class_3193;I)Lnet/minecraft/class_3193; + METHOD method_66362 getLevel (Ljava/util/List;Z)I + ARG 0 tickets + ARG 1 forSimulation + METHOD method_66363 getAllChunksMatching (Ljava/util/function/Predicate;)Lit/unimi/dsi/fastutil/longs/LongSet; + ARG 1 predicate + METHOD method_66364 removeTicketsIf (Ljava/util/function/Predicate;Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V + ARG 1 predicate + ARG 2 transferTo + METHOD method_66365 writeNbt (Lnet/minecraft/class_2499;JLjava/util/List;)V + ARG 0 list ARG 1 pos - ARG 3 level - ARG 4 holder - METHOD method_15892 update (Lnet/minecraft/class_3898;)Z - COMMENT Update the states related to chunk tickets and chunk loading levels, which mainly involves three kind of updates: - COMMENT
    - COMMENT
  • Add or remove PLAYER tickets when necessary.
    • - COMMENT
  • Update the expected loading states of chunks depending on their new levels.
    • - COMMENT
  • Special updates of chunks with PLAYER tickets added recently.
    • - COMMENT
- ARG 1 chunkLoadingManager - METHOD method_17642 (JLnet/minecraft/class_9259;)V - ARG 3 optionalChunk - METHOD method_17655 (J)Lit/unimi/dsi/fastutil/objects/ObjectSet; - ARG 0 sectionPos - METHOD method_20800 shouldTick (J)Z - ARG 1 chunkPos - METHOD method_21683 toDumpString ()Ljava/lang/String; - METHOD method_38629 setSimulationDistance (I)V - ARG 1 simulationDistance - METHOD method_38630 shouldTickEntities (J)Z - ARG 1 chunkPos - METHOD method_38632 shouldTickBlocks (J)Z - ARG 1 chunkPos - METHOD method_38633 getPlayerSimulationLevel ()I - METHOD method_39996 shouldDelayShutdown ()Z - METHOD method_61262 iterateChunkPosToTick ()Lit/unimi/dsi/fastutil/longs/LongIterator; - CLASS class_3205 DistanceFromNearestPlayerTracker - FIELD field_13896 distanceFromNearestPlayer Lit/unimi/dsi/fastutil/longs/Long2ByteMap; - FIELD field_17461 maxDistance I - METHOD (Lnet/minecraft/class_3204;I)V - ARG 2 maxDistance - METHOD method_14056 isPlayerInChunk (J)Z - ARG 1 chunkPos - METHOD method_14057 updateLevels ()V - METHOD method_17657 onDistanceChange (JII)V - ARG 1 pos - ARG 3 oldDistance - ARG 4 distance - CLASS class_3948 NearbyChunkTicketUpdater - FIELD field_17464 watchDistance I - FIELD field_17465 distances Lit/unimi/dsi/fastutil/longs/Long2IntMap; - FIELD field_17466 positionsAffected Lit/unimi/dsi/fastutil/longs/LongSet; - METHOD method_17658 setWatchDistance (I)V - ARG 1 watchDistance - METHOD method_17660 updateTicket (JIZZ)V + ARG 3 tickets + METHOD method_66366 (Lnet/minecraft/class_2499;Ljava/lang/Long;Ljava/util/List;)V + ARG 1 pos + ARG 2 tickets + METHOD method_66367 promoteToRealTickets ()V + METHOD method_66368 getTicketsMutable (J)Ljava/util/List; + ARG 1 pos + METHOD method_66369 removeTicket (JLnet/minecraft/class_3228;)Z + ARG 1 pos + ARG 3 ticket + METHOD method_66370 getDebugString (JZ)Ljava/lang/String; + ARG 1 pos + ARG 3 forSimulation + METHOD method_66371 (Lnet/minecraft/class_3228;)Z + ARG 0 ticket + METHOD method_66372 removeTicket (Lnet/minecraft/class_3228;Lnet/minecraft/class_1923;)V + ARG 1 ticket + ARG 2 pos + METHOD method_66373 removeTicket (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;I)V + ARG 1 type + ARG 2 pos + ARG 3 radius + METHOD method_66374 setSimulationLevelUpdater (Lnet/minecraft/class_10592$class_10593;)V + ARG 1 simulationLevelUpdater + METHOD method_66375 getActiveTicket (Ljava/util/List;Z)Lnet/minecraft/class_3228; + ARG 0 tickets + ARG 1 forSimulation + METHOD method_66376 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_10592; + ARG 0 nbt + ARG 1 registries + METHOD method_66377 (Lnet/minecraft/class_2499;Ljava/lang/Long;Ljava/util/List;)V + ARG 1 pos + ARG 2 tickets + METHOD method_66378 hasTickets ()Z + METHOD method_66379 (J)Ljava/util/List; + ARG 0 chunkPos + METHOD method_66380 (Lnet/minecraft/class_3228;)Z + ARG 0 ticket + METHOD method_66381 tick ()V + METHOD method_66383 shutdown ()V + METHOD method_66384 getForcedChunks ()Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD method_66385 recomputeForcedChunks ()V + CLASS class_10593 LevelUpdater + METHOD update (JIZ)V ARG 1 pos - ARG 3 distance - ARG 4 oldWithinViewDistance - ARG 5 withinViewDistance - METHOD method_17662 (JI)V ARG 3 level - METHOD method_17664 isWithinViewDistance (I)Z - ARG 1 distance + ARG 4 added diff --git a/mappings/net/minecraft/server/world/ChunkTicketType.mapping b/mappings/net/minecraft/server/world/ChunkTicketType.mapping index 214df10d18..627b8bddd6 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketType.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketType.mapping @@ -9,4 +9,14 @@ CLASS net/minecraft/class_3230 net/minecraft/server/world/ChunkTicketType COMMENT Used by the ender dragon to load the central end island during the boss battle. FIELD field_19280 PORTAL Lnet/minecraft/class_3230; COMMENT Used by a nether portal to load chunks in the other dimension. + FIELD field_55598 NO_EXPIRATION I METHOD comp_3474 expiryTicks ()J + METHOD method_66025 isForLoading ()Z + METHOD method_66026 register (Ljava/lang/String;JZLnet/minecraft/class_3230$class_10558;)Lnet/minecraft/class_3230; + ARG 0 id + ARG 1 expiryTicks + ARG 3 persist + ARG 4 use + METHOD method_66027 isForSimulation ()Z + METHOD method_66028 canExpire ()Z + CLASS class_10558 Use diff --git a/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping b/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping index af4095c3ac..76d7a3140e 100644 --- a/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana FIELD field_17220 chunkHolders Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; FIELD field_17221 unloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_17222 chunkHolderListDirty Z - FIELD field_17228 ticketManager Lnet/minecraft/class_3898$class_3216; + FIELD field_17228 levelManager Lnet/minecraft/class_3898$class_3216; FIELD field_17230 totalChunksLoadedCount Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_17442 worldGenerationProgressListener Lnet/minecraft/class_3949; FIELD field_17705 persistentStateManagerFactory Ljava/util/function/Supplier; @@ -20,6 +20,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana FIELD field_19343 unloadTaskQueue Ljava/util/Queue; FIELD field_23786 chunkToType Lit/unimi/dsi/fastutil/longs/Long2ByteMap; FIELD field_26931 chunkStatusChangeListener Lnet/minecraft/class_5567; + FIELD field_29670 FORCED_CHUNK_LEVEL I FIELD field_29671 PROTO_CHUNK B FIELD field_29672 UNMARKED_CHUNK B FIELD field_29673 LEVEL_CHUNK B @@ -35,6 +36,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana FIELD field_54035 lightScheduler Lnet/minecraft/class_10171; FIELD field_54964 chunksToSave Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_54965 chunksBeingSavedCount Ljava/util/concurrent/atomic/AtomicInteger; + FIELD field_55588 ticketManager Lnet/minecraft/class_10592; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;Lnet/minecraft/class_10592;IZ)V ARG 1 world ARG 2 session @@ -47,6 +49,9 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana ARG 9 worldGenerationProgressListener ARG 10 chunkStatusChangeListener ARG 11 persistentStateManagerFactory + ARG 12 ticketManager + ARG 13 viewDistance + ARG 14 dsync METHOD method_17212 getLightingProvider ()Lnet/minecraft/class_3227; METHOD method_17214 setViewDistance (I)V ARG 1 watchDistance @@ -87,7 +92,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana METHOD method_17255 getCurrentChunkHolder (J)Lnet/minecraft/class_3193; ARG 1 pos METHOD method_17260 getLoadedChunkCount ()I - METHOD method_17263 getTicketManager ()Lnet/minecraft/class_3204; + METHOD method_17263 getLevelManager ()Lnet/minecraft/class_3204; METHOD method_17264 entryIterator ()Ljava/lang/Iterable; METHOD method_17604 getCompletedLevelSupplier (J)Ljava/util/function/IntSupplier; ARG 1 pos @@ -333,6 +338,11 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana METHOD method_22844 getMaxTrackDistance ()I METHOD method_27906 adjustTrackingDistance (I)I ARG 1 initialDistance - CLASS class_3216 TicketManager + METHOD method_66006 sendToOtherNearbyPlayers (Lnet/minecraft/class_2596;Ljava/util/List;)V + ARG 1 packet + ARG 2 except + CLASS class_3216 LevelManager METHOD (Lnet/minecraft/class_3898;Lnet/minecraft/class_10592;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V - ARG 3 mainThreadExecutor + ARG 2 ticketManager + ARG 3 executor + ARG 4 mainThreadExecutor diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index d5200807f0..e136107fcb 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager FIELD field_13929 spawnMonsters Z FIELD field_13941 spawnAnimals Z FIELD field_13945 world Lnet/minecraft/class_3218; - FIELD field_17252 ticketManager Lnet/minecraft/class_3204; + FIELD field_17252 levelManager Lnet/minecraft/class_3204; FIELD field_17253 serverThread Ljava/lang/Thread; FIELD field_17254 chunkLoadingManager Lnet/minecraft/class_3898; FIELD field_17708 persistentStateManager Lnet/minecraft/class_26; @@ -17,6 +17,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager FIELD field_52354 LOGGER Lorg/slf4j/Logger; FIELD field_52355 chunks Ljava/util/List; FIELD field_52356 chunksToBroadcastUpdate Ljava/util/Set; + FIELD field_55594 ticketManager Lnet/minecraft/class_10592; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;IIZLnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;)V ARG 1 world ARG 2 session @@ -109,6 +110,18 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager ARG 2 chunk METHOD method_65078 markForUpdate (Lnet/minecraft/class_3193;)V ARG 1 chunkHolder + METHOD method_66008 addTicket (Lnet/minecraft/class_3228;Lnet/minecraft/class_1923;)V + ARG 1 ticket + ARG 2 pos + METHOD method_66009 addTicket (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;I)V + ARG 1 type + ARG 2 pos + ARG 3 radius + METHOD method_66010 removeTicket (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;I)V + ARG 1 type + ARG 2 pos + ARG 3 radius + METHOD method_66012 shutdown ()V CLASS class_4212 MainThreadExecutor METHOD (Lnet/minecraft/class_3215;Lnet/minecraft/class_1937;)V ARG 2 world diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index f539851b67..0691257ba6 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -292,7 +292,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 0 poiType METHOD method_31423 loadEntities (Ljava/util/stream/Stream;)V ARG 1 entities - METHOD method_31424 getDragonPart (I)Lnet/minecraft/class_1297; + METHOD method_31424 getEntityOrDragonPart (I)Lnet/minecraft/class_1297; ARG 1 id METHOD method_31426 addEntities (Ljava/util/stream/Stream;)V ARG 1 entities diff --git a/mappings/net/minecraft/server/world/SimulationDistanceLevelPropagator.mapping b/mappings/net/minecraft/server/world/SimulationDistanceLevelPropagator.mapping new file mode 100644 index 0000000000..53544b99ba --- /dev/null +++ b/mappings/net/minecraft/server/world/SimulationDistanceLevelPropagator.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_6609 net/minecraft/server/world/SimulationDistanceLevelPropagator + FIELD field_34888 levels Lit/unimi/dsi/fastutil/longs/Long2ByteMap; + FIELD field_55596 ticketManager Lnet/minecraft/class_10592; + METHOD (Lnet/minecraft/class_10592;)V + ARG 1 ticketManager + METHOD method_38635 updateLevels ()V + METHOD method_38640 getLevel (Lnet/minecraft/class_1923;)I + ARG 1 pos diff --git a/mappings/net/minecraft/server/world/TicketDistanceLevelPropagator.mapping b/mappings/net/minecraft/server/world/TicketDistanceLevelPropagator.mapping index 6ecec0123a..c7e17a6710 100644 --- a/mappings/net/minecraft/server/world/TicketDistanceLevelPropagator.mapping +++ b/mappings/net/minecraft/server/world/TicketDistanceLevelPropagator.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_4077 net/minecraft/server/world/TicketDistanceLevelPropagator FIELD field_44854 UNLOADED I + FIELD field_55592 levelManager Lnet/minecraft/class_3204; + FIELD field_55593 ticketManager Lnet/minecraft/class_10592; + METHOD (Lnet/minecraft/class_3204;Lnet/minecraft/class_10592;)V + ARG 1 levelManager + ARG 2 ticketManager METHOD method_18746 update (I)I ARG 1 distance diff --git a/mappings/net/minecraft/structure/pool/alias/RandomGroupStructurePoolAliasBinding.mapping b/mappings/net/minecraft/structure/pool/alias/RandomGroupStructurePoolAliasBinding.mapping index c3882628bb..3c233c452d 100644 --- a/mappings/net/minecraft/structure/pool/alias/RandomGroupStructurePoolAliasBinding.mapping +++ b/mappings/net/minecraft/structure/pool/alias/RandomGroupStructurePoolAliasBinding.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_8893 net/minecraft/structure/pool/alias/RandomGroupStructurePoolAliasBinding FIELD field_46828 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_54516 (Lnet/minecraft/class_5819;Ljava/util/function/BiConsumer;Ljava/util/List;)V + ARG 2 group METHOD method_54517 (Lnet/minecraft/class_5819;Ljava/util/function/BiConsumer;Lnet/minecraft/class_8889;)V ARG 2 binding METHOD method_54518 (Lnet/minecraft/class_6010;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/structure/pool/alias/RandomStructurePoolAliasBinding.mapping b/mappings/net/minecraft/structure/pool/alias/RandomStructurePoolAliasBinding.mapping index b2e71dcaae..cd5851bd21 100644 --- a/mappings/net/minecraft/structure/pool/alias/RandomStructurePoolAliasBinding.mapping +++ b/mappings/net/minecraft/structure/pool/alias/RandomStructurePoolAliasBinding.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_8892 net/minecraft/structure/pool/alias/RandomStructur FIELD field_46827 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_54514 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_54515 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_5321;)V + ARG 2 target diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index f397fab5dc..bdb906540d 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent FIELD field_55912 CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/class_1799;)V ARG 1 stack + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o CLASS class_10613 ShowText FIELD field_55913 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_66578 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/text/NbtTextContent.mapping b/mappings/net/minecraft/text/NbtTextContent.mapping index 57988c97cc..6ae6a40ae1 100644 --- a/mappings/net/minecraft/text/NbtTextContent.mapping +++ b/mappings/net/minecraft/text/NbtTextContent.mapping @@ -20,6 +20,8 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtTextContent ARG 4 dataSource METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD method_10917 (Lnet/minecraft/class_6903;Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILnet/minecraft/class_2520;)Ljava/util/stream/Stream; + ARG 4 nbt METHOD method_10918 (Lnet/minecraft/class_2487;)Ljava/util/stream/Stream; ARG 1 nbt METHOD method_10919 parsePath (Ljava/lang/String;)Lnet/minecraft/class_2203$class_2209; diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping index 5182532b8c..1baaf7950a 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -190,6 +190,8 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style ARG 0 style METHOD method_54221 (Lnet/minecraft/class_2583;)Ljava/util/Optional; ARG 0 style + METHOD method_65303 (Lnet/minecraft/class_2583;)Ljava/util/Optional; + ARG 0 style CLASS class_7418 Writer FIELD field_39012 shouldAppendComma Z METHOD method_43478 appendComma ()V diff --git a/mappings/net/minecraft/util/ItemScatterer.mapping b/mappings/net/minecraft/util/ItemScatterer.mapping index 6a91032891..7dc2e7799c 100644 --- a/mappings/net/minecraft/util/ItemScatterer.mapping +++ b/mappings/net/minecraft/util/ItemScatterer.mapping @@ -35,3 +35,7 @@ CLASS net/minecraft/class_1264 net/minecraft/util/ItemScatterer ARG 0 world ARG 1 entity ARG 2 inventory + METHOD method_66221 onStateReplaced (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 0 state + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping index 8b56503703..16ad6d52ed 100644 --- a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping @@ -157,6 +157,8 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos METHOD method_51687 withZeroY (II)J ARG 0 x ARG 1 z + METHOD method_66549 toChunkPos (J)J + ARG 0 sectionPos CLASS 1 FIELD field_19263 iterator Lnet/minecraft/class_3980; METHOD tryAdvance (Ljava/util/function/Consumer;)Z diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index ad20aee619..8a4300a556 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -148,6 +148,10 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction METHOD method_64922 getPositiveDirection ()Lnet/minecraft/class_2350; METHOD method_64923 getNegativeDirection ()Lnet/minecraft/class_2350; METHOD method_64924 getDirections ()[Lnet/minecraft/class_2350; + METHOD method_66548 choose (ZZZ)Z + ARG 1 x + ARG 2 y + ARG 3 z CLASS class_2352 AxisDirection FIELD field_11057 description Ljava/lang/String; FIELD field_11059 offset I diff --git a/mappings/net/minecraft/util/math/DirectionTransformation.mapping b/mappings/net/minecraft/util/math/DirectionTransformation.mapping index 4de959dd1e..2909675d1e 100644 --- a/mappings/net/minecraft/util/math/DirectionTransformation.mapping +++ b/mappings/net/minecraft/util/math/DirectionTransformation.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_4990 net/minecraft/util/math/DirectionTransformation FIELD field_23295 axisTransformation Lnet/minecraft/class_4998; FIELD field_23296 COMBINATIONS [[Lnet/minecraft/class_4990; FIELD field_23297 INVERSES [Lnet/minecraft/class_4990; + FIELD field_55876 AXES [Lnet/minecraft/class_2350$class_2351; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_4998;ZZZ)V ARG 3 name ARG 4 axisTransformation @@ -16,12 +17,26 @@ CLASS net/minecraft/class_4990 net/minecraft/util/math/DirectionTransformation ARG 7 flipZ METHOD method_26385 prepend (Lnet/minecraft/class_4990;)Lnet/minecraft/class_4990; ARG 1 transformation + METHOD method_26386 (Lnet/minecraft/class_4990;Lnet/minecraft/class_4990;)Z + ARG 1 b METHOD method_26387 shouldFlipDirection (Lnet/minecraft/class_2350$class_2351;)Z ARG 1 axis METHOD method_26388 map (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; ARG 1 direction METHOD method_26389 mapJigsawOrientation (Lnet/minecraft/class_5000;)Lnet/minecraft/class_5000; ARG 1 orientation + METHOD method_26390 ([[Lnet/minecraft/class_4990;)V + ARG 0 combinations METHOD method_26391 getAxisFlips ()Lit/unimi/dsi/fastutil/booleans/BooleanList; + METHOD method_26392 (Lnet/minecraft/class_4990;)Lnet/minecraft/class_4990; + ARG 0 a + METHOD method_26393 (Lnet/minecraft/class_4990;)Lnet/minecraft/class_4990; + ARG 0 transformation + METHOD method_26394 (Lnet/minecraft/class_4990;)Lcom/mojang/datafixers/util/Pair; + ARG 0 transformation METHOD method_35813 inverse ()Lnet/minecraft/class_4990; METHOD method_35814 getMatrix ()Lorg/joml/Matrix3f; + METHOD method_66544 map (Lnet/minecraft/class_2350$class_2351;)Lnet/minecraft/class_2350$class_2351; + ARG 1 axis + METHOD method_66545 (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; + ARG 1 direction diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping index 5a6c9e93ea..5c32cb63f5 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -12,9 +12,11 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem FIELD field_21819 currentInfo Lnet/minecraft/class_3533$class_4746; FIELD field_21961 timeGetter Ljava/util/function/LongSupplier; FIELD field_33873 sampleTypes Ljava/util/Set; + FIELD field_55643 timeoutDisabled Ljava/util/function/BooleanSupplier; METHOD (Ljava/util/function/LongSupplier;Ljava/util/function/IntSupplier;Ljava/util/function/BooleanSupplier;)V ARG 1 timeGetter ARG 2 tickGetter + ARG 3 timeoutDisabled METHOD method_24245 (Ljava/lang/String;)Lnet/minecraft/class_3533$class_4746; ARG 0 k METHOD method_24246 getCurrentInfo ()Lnet/minecraft/class_3533$class_4746; diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index 1a6fc6c96e..44ec213f3c 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -95,3 +95,5 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape METHOD method_61897 isCube ()Z METHOD method_64034 offset (Lnet/minecraft/class_243;)Lnet/minecraft/class_265; ARG 1 vec3d + METHOD method_66507 offset (Lnet/minecraft/class_2382;)Lnet/minecraft/class_265; + ARG 1 vec diff --git a/mappings/net/minecraft/world/SimulationDistanceLevelPropagator.mapping b/mappings/net/minecraft/world/SimulationDistanceLevelPropagator.mapping deleted file mode 100644 index 2382bc9018..0000000000 --- a/mappings/net/minecraft/world/SimulationDistanceLevelPropagator.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_6609 net/minecraft/world/SimulationDistanceLevelPropagator - FIELD field_34888 levels Lit/unimi/dsi/fastutil/longs/Long2ByteMap; - METHOD method_38635 updateLevels ()V - METHOD method_38640 getLevel (Lnet/minecraft/class_1923;)I - ARG 1 pos diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index e1a3a58f76..aac62b03e6 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -142,7 +142,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT Plays a sound caused by a source. On the client, the sound will only play if the source is the same as the client's player. COMMENT On the server, sound packets will be sent to players around the source, excluding the source itself. ARG 1 source - COMMENT the player that caused this sound, or {@code null} + COMMENT the entity that caused this sound, or {@code null} ARG 2 x ARG 4 y ARG 6 z @@ -154,7 +154,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT Plays a sound caused by a source at the provided entity's position. On the client, the sound will only play if the source is the same as the client's player. COMMENT On the server, sound packets will be sent to players around the source, excluding the source itself. ARG 1 source - COMMENT the player that caused this sound, or {@code null} + COMMENT the entity that caused this sound, or {@code null} ARG 2 entity ARG 3 sound ARG 4 category @@ -199,7 +199,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT Plays a sound caused by a source. On the client, the sound will only play if the source is the same as the client's player. COMMENT On the server, sound packets will be sent to players around the source, excluding the source itself. ARG 1 source - COMMENT the player that caused this sound, or {@code null} + COMMENT the entity that caused this sound, or {@code null} ARG 2 x ARG 4 y ARG 6 z @@ -214,6 +214,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_48963 getDamageSources ()Lnet/minecraft/class_8109; METHOD method_54719 getTickManager ()Lnet/minecraft/class_8921; METHOD method_54762 playSound (Lnet/minecraft/class_1297;DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;)V + ARG 1 source ARG 2 x ARG 4 y ARG 6 z @@ -237,6 +238,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 12 explosionSourceType METHOD method_59547 getBrewingRecipeRegistry ()Lnet/minecraft/class_1845; METHOD method_60511 playSound (Lnet/minecraft/class_1297;DDDLnet/minecraft/class_6880;Lnet/minecraft/class_3419;FF)V + ARG 1 source ARG 2 x ARG 4 y ARG 6 z @@ -247,6 +249,11 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_61269 getFuelRegistry ()Lnet/minecraft/class_9895; METHOD method_63020 canHaveWeather ()Z METHOD method_65097 getEnderDragonParts ()Ljava/util/Collection; + METHOD method_66016 onBlockStateChanged (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 oldState + ARG 3 newState + METHOD method_66346 isNightAndNatural ()Z METHOD method_66349 getCrammedEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/List; ARG 1 entity ARG 2 box @@ -412,13 +419,15 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8501 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 pos ARG 2 state - METHOD method_8505 canPlayerModifyAt (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)Z - COMMENT {@return whether {@code player} can modify blocks at {@code pos}} + METHOD method_8505 canEntityModifyAt (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)Z + COMMENT {@return whether {@code entity} can modify blocks at {@code pos}} COMMENT - COMMENT @implNote This checks the spawn protection and the world border. + COMMENT @implNote For players, this checks the spawn protection and the world border. + COMMENT This is always {@code true} on the client and for non-player entities. COMMENT COMMENT @see #isInBuildLimit COMMENT @see #isValid + ARG 1 entity ARG 2 pos METHOD method_8508 updateNeighborsExcept (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2350;Lnet/minecraft/class_9904;)V COMMENT Emits a neighbor update to neighboring blocks of {@code pos}, except diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index fdb850fc70..768fc87fad 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 2 pos ARG 3 emitter METHOD method_45447 playSound (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;)V + ARG 1 source ARG 2 pos ARG 3 sound ARG 4 category @@ -37,6 +38,7 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 2 pos ARG 3 emitter METHOD method_8396 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 ARG 3 sound ARG 4 category @@ -64,6 +66,7 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 2 block METHOD method_8409 getRandom ()Lnet/minecraft/class_5819; METHOD method_8444 syncWorldEvent (Lnet/minecraft/class_1297;ILnet/minecraft/class_2338;I)V + ARG 1 source ARG 2 eventId ARG 3 pos ARG 4 data diff --git a/mappings/net/minecraft/world/biome/SpawnSettings.mapping b/mappings/net/minecraft/world/biome/SpawnSettings.mapping index 668d28a51b..9d05b3df75 100644 --- a/mappings/net/minecraft/world/biome/SpawnSettings.mapping +++ b/mappings/net/minecraft/world/biome/SpawnSettings.mapping @@ -12,6 +12,12 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings ARG 3 spawnCosts METHOD method_30791 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_30794 (Lnet/minecraft/class_5483;)Ljava/util/Map; + ARG 0 settings + METHOD method_30795 (Lnet/minecraft/class_5483;)Ljava/util/Map; + ARG 0 settings + METHOD method_30796 (Lnet/minecraft/class_5483;)Ljava/lang/Float; + ARG 0 settings METHOD method_31002 getCreatureSpawnProbability ()F METHOD method_31003 getSpawnDensity (Lnet/minecraft/class_1299;)Lnet/minecraft/class_5483$class_5265; ARG 1 entityType @@ -75,3 +81,9 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings ARG 4 gravityLimit METHOD method_31011 spawn (Lnet/minecraft/class_1311;ILnet/minecraft/class_5483$class_1964;)Lnet/minecraft/class_5483$class_5496; ARG 1 spawnGroup + ARG 2 weight + ARG 3 entry + METHOD method_31012 (Ljava/util/Map$Entry;)Lnet/minecraft/class_6012; + ARG 0 spawner + METHOD method_31013 (Lnet/minecraft/class_1311;)Lnet/minecraft/class_6012$class_6006; + ARG 0 group diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 9b5ead198c..afae02d8bb 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12010 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Lnet/minecraft/class_2680; ARG 1 pos ARG 2 state + ARG 3 flags METHOD method_12011 getHeightmaps ()Ljava/util/Collection; METHOD method_12012 getPostProcessingLists ()[Lit/unimi/dsi/fastutil/shorts/ShortList; METHOD method_12013 getBlockTickScheduler ()Lnet/minecraft/class_6763; @@ -128,4 +129,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_65063 markNeedsSaving ()V METHOD method_65064 tryMarkSaved ()Z METHOD method_65069 isSerializable ()Z + METHOD method_66480 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 pos + ARG 2 state CLASS class_6745 TickSchedulers diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping index e62805719c..f701dc92fc 100644 --- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping @@ -30,3 +30,4 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager ARG 2 sectionY ARG 3 z ARG 4 previouslyEmpty + METHOD method_66011 getForcedChunks ()Lit/unimi/dsi/fastutil/longs/LongSet; diff --git a/mappings/net/minecraft/class_10598.mapping b/mappings/net/minecraft/world/entity/EntityQueriable.mapping similarity index 54% rename from mappings/net/minecraft/class_10598.mapping rename to mappings/net/minecraft/world/entity/EntityQueriable.mapping index b4fd479c48..0bcf35b890 100644 --- a/mappings/net/minecraft/class_10598.mapping +++ b/mappings/net/minecraft/world/entity/EntityQueriable.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_10598 +CLASS net/minecraft/class_10598 net/minecraft/world/entity/EntityQueriable METHOD method_66348 getEntity (Ljava/util/UUID;)Lnet/minecraft/class_10599; ARG 1 uuid diff --git a/mappings/net/minecraft/class_10599.mapping b/mappings/net/minecraft/world/entity/UniquelyIdentifiable.mapping similarity index 50% rename from mappings/net/minecraft/class_10599.mapping rename to mappings/net/minecraft/world/entity/UniquelyIdentifiable.mapping index 9e4589212a..8d3e5d8aef 100644 --- a/mappings/net/minecraft/class_10599.mapping +++ b/mappings/net/minecraft/world/entity/UniquelyIdentifiable.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_10599 +CLASS net/minecraft/class_10599 net/minecraft/world/entity/UniquelyIdentifiable METHOD method_31481 isRemoved ()Z METHOD method_5667 getUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping index 9b873240a2..3d3a038880 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping @@ -16,9 +16,15 @@ CLASS net/minecraft/class_4625 net/minecraft/world/gen/feature/HugeMushroomFeatu ARG 5 mutable ARG 6 config METHOD method_23376 generateStem (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4635;ILnet/minecraft/class_2338$class_2339;)V + ARG 1 world ARG 2 random ARG 3 pos ARG 4 config ARG 5 height + ARG 6 mutablePos METHOD method_23377 getHeight (Lnet/minecraft/class_5819;)I ARG 1 random + METHOD method_66481 generateStem (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2680;)V + ARG 1 world + ARG 2 pos + ARG 3 state diff --git a/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping index f5aebb5ca3..31b98e22b3 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping @@ -79,6 +79,10 @@ CLASS net/minecraft/class_6819 net/minecraft/world/gen/feature/VegetationPlacedF FIELD field_55188 FLOWER_PALE_GARDEN Lnet/minecraft/class_5321; FIELD field_55189 PALE_GARDEN_FLOWERS Lnet/minecraft/class_5321; FIELD field_55190 PALE_MOSS_PATCH Lnet/minecraft/class_5321; + FIELD field_55898 PATCH_LEAF_LITTER Lnet/minecraft/class_5321; + FIELD field_55899 WILDFLOWERS_BIRCH_FOREST Lnet/minecraft/class_5321; + FIELD field_55900 WILDFLOWERS_MEADOW Lnet/minecraft/class_5321; + FIELD field_55901 PATCH_GRASS_MEADOW Lnet/minecraft/class_5321; METHOD method_39738 modifiers (I)Ljava/util/List; ARG 0 count METHOD method_39739 mushroomModifiers (ILnet/minecraft/class_6797;)Ljava/util/List; diff --git a/unpick-definitions/entity_status.unpick b/unpick-definitions/entity_status.unpick index e0e5c08a8f..b44df12e35 100644 --- a/unpick-definitions/entity_status.unpick +++ b/unpick-definitions/entity_status.unpick @@ -58,6 +58,7 @@ constant entity_statuses net/minecraft/entity/EntityStatuses START_DIGGING constant entity_statuses net/minecraft/entity/EntityStatuses PEEKING constant entity_statuses net/minecraft/entity/EntityStatuses BREAK_BODY constant entity_statuses net/minecraft/entity/EntityStatuses INVULNERABLE_CREAKING_HIT +constant entity_statuses net/minecraft/entity/EntityStatuses ADD_BUBBLE_PARTICLES target_method net/minecraft/entity/Entity handleStatus (B)V param 0 entity_statuses diff --git a/unpick-definitions/set_block_state_flags.unpick b/unpick-definitions/set_block_state_flags.unpick index ca08243287..a65976f94b 100644 --- a/unpick-definitions/set_block_state_flags.unpick +++ b/unpick-definitions/set_block_state_flags.unpick @@ -10,6 +10,8 @@ flag set_block_state_flags net/minecraft/block/Block FORCE_STATE flag set_block_state_flags net/minecraft/block/Block SKIP_DROPS flag set_block_state_flags net/minecraft/block/Block MOVED flag set_block_state_flags net/minecraft/block/Block SKIP_REDSTONE_WIRE_STATE_REPLACEMENT +flag set_block_state_flags net/minecraft/block/Block SKIP_CALLBACKS +flag set_block_state_flags net/minecraft/block/Block SKIP_REDRAW_AND_CALLBACKS target_method net/minecraft/world/ModifiableWorld setBlockState (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z param 2 set_block_state_flags diff --git a/unpick-definitions/world_events.unpick b/unpick-definitions/world_events.unpick index 7aec3fe928..f3641c800b 100644 --- a/unpick-definitions/world_events.unpick +++ b/unpick-definitions/world_events.unpick @@ -82,7 +82,7 @@ constant world_events net/minecraft/world/WorldEvents OMINOUS_TRIAL_SPAWNER_DETE constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_TURNS_OMINOUS constant world_events net/minecraft/world/WorldEvents OMINOUS_ITEM_SPAWNER_SPAWNS_ITEM -target_method net/minecraft/world/WorldAccess syncWorldEvent (Lnet/minecraft/entity/player/PlayerEntity;ILnet/minecraft/util/math/BlockPos;I)V +target_method net/minecraft/world/WorldAccess syncWorldEvent (Lnet/minecraft/entity/Entity;ILnet/minecraft/util/math/BlockPos;I)V param 1 world_events target_method net/minecraft/world/WorldAccess syncWorldEvent (ILnet/minecraft/util/math/BlockPos;I)V param 0 world_events