Use hasImpulse vs hurtMarked for setVelocity

This will prevent projectiles from using the less accurate path for updating motion when interfaced with the API. However, hasImpulse is the more proper way of marking that the entity needs its velocity updated anyways. This seems to be fairly unused logic in vanilla
Improve AbstractHurtingProjectile syncing
2026-11-04 08:52:01 -05:00 · 2025-06-23 22:39:41 -04:00 · 2025-06-23 22:36:49 -04:00 · 2025-06-23 22:28:24 -04:00 · 2025-06-23 22:27:17 -04:00 · 2025-06-23 14:13:13 -07:00
824 changed files with 41847 additions and 6862 deletions
@@ -49,6 +49,9 @@ jobs:

      - name: Setup Gradle
        uses: gradle/actions/setup-gradle@v4
+        with:
+          # Allow cache writes on main and dev branches
+          cache-read-only: ${{ github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/dev/') }}

      - name: Configure Build
        uses: actions/github-script@v7
@@ -22,7 +22,8 @@ jobs:
        with:
          run_id: ${{ github.event.workflow_run.id }}
          path: test_artifacts
-          name: Test Results
+          name: "Test Results|Event File"
+          name_is_regexp: true
      - name: Publish Test Results
        uses: EnricoMi/publish-unit-test-result-action@v2
        with:
@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
    <groupId>io.papermc.paper</groupId>
    <artifactId>paper-api</artifactId>
-    <version>1.21.5-R0.1-SNAPSHOT</version>
+    <version>1.21.6-R0.1-SNAPSHOT</version>
    <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ repositories {
 }

 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT")
 }

 java {
@@ -140,12 +140,11 @@ public net.minecraft.world.effect.MobEffect attributeModifiers
 public net.minecraft.world.effect.MobEffect$AttributeTemplate
 public net.minecraft.world.effect.MobEffectInstance hiddenEffect
 public net.minecraft.world.entity.AreaEffectCloud durationOnUse
-public net.minecraft.world.entity.AreaEffectCloud ownerUUID
+public net.minecraft.world.entity.AreaEffectCloud owner
 public net.minecraft.world.entity.AreaEffectCloud potionContents
 public net.minecraft.world.entity.AreaEffectCloud radiusOnUse
 public net.minecraft.world.entity.AreaEffectCloud radiusPerTick
 public net.minecraft.world.entity.AreaEffectCloud reapplicationDelay
-public net.minecraft.world.entity.AreaEffectCloud updateColor()V
 public net.minecraft.world.entity.AreaEffectCloud waitTime
 public net.minecraft.world.entity.Display DATA_POS_ROT_INTERPOLATION_DURATION_ID
 public net.minecraft.world.entity.Display createTransformation(Lnet/minecraft/network/syncher/SynchedEntityData;)Lcom/mojang/math/Transformation;
@@ -330,14 +329,8 @@ public net.minecraft.world.entity.animal.wolf.Wolf setSoundVariant(Lnet/minecraf
 public net.minecraft.world.entity.animal.wolf.Wolf setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.boss.enderdragon.EnderDragon subEntities
 public net.minecraft.world.entity.boss.wither.WitherBoss bossEvent
-public net.minecraft.world.entity.decoration.ArmorStand bodyPose
 public net.minecraft.world.entity.decoration.ArmorStand disabledSlots
-public net.minecraft.world.entity.decoration.ArmorStand headPose
 public net.minecraft.world.entity.decoration.ArmorStand isDisabled(Lnet/minecraft/world/entity/EquipmentSlot;)Z
-public net.minecraft.world.entity.decoration.ArmorStand leftArmPose
-public net.minecraft.world.entity.decoration.ArmorStand leftLegPose
-public net.minecraft.world.entity.decoration.ArmorStand rightArmPose
-public net.minecraft.world.entity.decoration.ArmorStand rightLegPose
 public net.minecraft.world.entity.decoration.ArmorStand setMarker(Z)V
 public net.minecraft.world.entity.decoration.ArmorStand setSmall(Z)V
 public net.minecraft.world.entity.decoration.HangingEntity setDirection(Lnet/minecraft/core/Direction;)V
@@ -364,8 +357,6 @@ public net.minecraft.world.entity.monster.Creeper explodeCreeper()V
 public net.minecraft.world.entity.monster.Creeper explosionRadius
 public net.minecraft.world.entity.monster.Creeper maxSwell
 public net.minecraft.world.entity.monster.Creeper swell
-public net.minecraft.world.entity.monster.Drowned groundNavigation
-public net.minecraft.world.entity.monster.Drowned waterNavigation
 public net.minecraft.world.entity.monster.EnderMan teleport()Z
 public net.minecraft.world.entity.monster.EnderMan teleportTowards(Lnet/minecraft/world/entity/Entity;)Z
 public net.minecraft.world.entity.monster.Endermite life
@@ -392,6 +383,7 @@ public net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell
 public net.minecraft.world.entity.monster.Strider steering
 public net.minecraft.world.entity.monster.Vex hasLimitedLife
 public net.minecraft.world.entity.monster.Vex limitedLifeTicks
+public net.minecraft.world.entity.monster.Vex owner
 public net.minecraft.world.entity.monster.Vindicator DOOR_BREAKING_PREDICATE
 public net.minecraft.world.entity.monster.Vindicator isJohnny
 public net.minecraft.world.entity.monster.Witch usingTime
@@ -450,9 +442,7 @@ public net.minecraft.world.entity.projectile.Arrow updateColor()V
 public net.minecraft.world.entity.projectile.EvokerFangs warmupDelayTicks
 public net.minecraft.world.entity.projectile.EyeOfEnder life
 public net.minecraft.world.entity.projectile.EyeOfEnder surviveAfterDeath
-public net.minecraft.world.entity.projectile.EyeOfEnder tx
-public net.minecraft.world.entity.projectile.EyeOfEnder ty
-public net.minecraft.world.entity.projectile.EyeOfEnder tz
+public net.minecraft.world.entity.projectile.EyeOfEnder target
 public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ATTACHED_TO_TARGET
 public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ID_FIREWORKS_ITEM
 public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_SHOT_AT_ANGLE
@@ -472,10 +462,9 @@ public net.minecraft.world.entity.projectile.FishingHook timeUntilHooked
 public net.minecraft.world.entity.projectile.FishingHook timeUntilLured
 public net.minecraft.world.entity.projectile.FishingHook$FishHookState
 public net.minecraft.world.entity.projectile.LargeFireball explosionPower
-public net.minecraft.world.entity.projectile.Projectile cachedOwner
 public net.minecraft.world.entity.projectile.Projectile hasBeenShot
 public net.minecraft.world.entity.projectile.Projectile leftOwner
-public net.minecraft.world.entity.projectile.Projectile ownerUUID
+public net.minecraft.world.entity.projectile.Projectile owner
 public net.minecraft.world.entity.projectile.ShulkerBullet currentMoveDirection
 public net.minecraft.world.entity.projectile.ShulkerBullet flightSteps
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaX
@@ -616,7 +605,7 @@ public net.minecraft.world.level.block.entity.BedBlockEntity color
 public net.minecraft.world.level.block.entity.BeehiveBlockEntity savedFlowerPos
 public net.minecraft.world.level.block.entity.BellBlockEntity resonating
 public net.minecraft.world.level.block.entity.BellBlockEntity resonationTicks
-public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/nbt/CompoundTag;)V
+public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/world/level/storage/ValueOutput;)V
 public net.minecraft.world.level.block.entity.BlockEntityType validBlocks
 public net.minecraft.world.level.block.entity.BrewingStandBlockEntity brewTime
 public net.minecraft.world.level.block.entity.BrewingStandBlockEntity fuel
@@ -628,10 +617,11 @@ public net.minecraft.world.level.block.entity.CampfireBlockEntity cookingTime
 public net.minecraft.world.level.block.entity.ChestBlockEntity openersCounter
 public net.minecraft.world.level.block.entity.ChestBlockEntity playSound(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/sounds/SoundEvent;)V
 public net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity lastInteractedSlot
+public net.minecraft.world.level.block.entity.ConduitBlockEntity MIN_KILL_SIZE
 public net.minecraft.world.level.block.entity.ConduitBlockEntity destroyTarget
-public net.minecraft.world.level.block.entity.ConduitBlockEntity destroyTargetUUID
 public net.minecraft.world.level.block.entity.ConduitBlockEntity effectBlocks
 public net.minecraft.world.level.block.entity.ConduitBlockEntity getDestroyRangeAABB(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/AABB;
+public net.minecraft.world.level.block.entity.ConduitBlockEntity updateDestroyTarget(Lnet/minecraft/world/entity/EntityReference;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Z)Lnet/minecraft/world/entity/EntityReference;
 public net.minecraft.world.level.block.entity.CrafterBlockEntity craftingTicksRemaining
 public net.minecraft.world.level.block.entity.DecoratedPotBlockEntity decorations
 public net.minecraft.world.level.block.entity.EnderChestBlockEntity openersCounter
@@ -665,13 +655,14 @@ public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity age
 public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exactTeleport
 public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exitPortal
 public net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity trialSpawner
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner config
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner isOminous
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner stateAccessor
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData cooldownEndsAt
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData currentMobs
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData detectedPlayers
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextMobSpawnsAt
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextSpawnData
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData cooldownEndsAt
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData currentMobs
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData detectedPlayers
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData nextMobSpawnsAt
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData nextSpawnData
 public net.minecraft.world.level.block.entity.vault.VaultBlockEntity serverData
 public net.minecraft.world.level.block.entity.vault.VaultServerData getRewardedPlayers()Ljava/util/Set;
 public net.minecraft.world.level.block.entity.vault.VaultServerData pauseStateUpdatingUntil(J)V
@@ -690,7 +681,7 @@ public net.minecraft.world.level.chunk.LevelChunk level
 public net.minecraft.world.level.chunk.LevelChunk loaded
 public net.minecraft.world.level.chunk.LevelChunkSection states
 public net.minecraft.world.level.chunk.PalettedContainer registry
-public net.minecraft.world.level.chunk.status.ChunkStatusTasks postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;)V
+public net.minecraft.world.level.chunk.status.ChunkStatusTasks postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/storage/ValueInput$ValueInputList;)V
 public net.minecraft.world.level.chunk.storage.EntityStorage entityDeserializerQueue
 public net.minecraft.world.level.chunk.storage.EntityStorage level
 public net.minecraft.world.level.chunk.storage.RegionFileStorage regionCache
@@ -777,10 +768,6 @@ public-f net.minecraft.world.level.LevelSettings hardcore
 public-f net.minecraft.world.level.LevelSettings levelName
 public-f net.minecraft.world.level.block.ChestBlock MENU_PROVIDER_COMBINER
 public-f net.minecraft.world.level.block.entity.BannerBlockEntity baseColor
-public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner normalConfig
-public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner ominousConfig
-public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner requiredPlayerRange
-public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner targetCooldownLength
 public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData centerX
 public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData centerZ
 public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData dimension
@@ -21,7 +21,7 @@ c	net/minecraft/world/level/chunk/LevelChunk	net/minecraft/world/level/chunk/Chu

 # See mappings-patch.tiny
 c	net/minecraft/server/level/ChunkMap	net/minecraft/server/level/PlayerChunkMap
-	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	G
+	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	H

 # The method is made public by Spigot, which then causes accidental overrides
 c	net/minecraft/world/entity/Entity	net/minecraft/world/entity/Entity
@@ -1,10 +1,9 @@
 group=io.papermc.paper
-version=1.21.5-R0.1-SNAPSHOT
-mcVersion=1.21.5
+version=1.21.6-R0.1-SNAPSHOT
+mcVersion=1.21.6

 # Set to true while updating Minecraft version
-updatingMinecraft=true
-updateTaskListIssue=https://github.com/PaperMC/Paper/issues/11736
+updatingMinecraft=false

 org.gradle.configuration-cache=true
 org.gradle.caching=true
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -184,7 +184,7 @@ tasks.withType<Javadoc> {
        "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
        "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
-        // "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/", // TODO: Broken
+        "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
    )
    options.tags("apiNote:a:API Note:")
@@ -21,6 +21,7 @@ import org.bukkit.entity.Fish;
 import org.bukkit.entity.Fox;
 import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Guardian;
+import org.bukkit.entity.HappyGhast;
 import org.bukkit.entity.Illager;
 import org.bukkit.entity.Illusioner;
 import org.bukkit.entity.IronGolem;
@@ -67,17 +68,17 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
-    GoalKey<AbstractHorse> RANDOM_STAND = create("random_stand", AbstractHorse.class);
+    GoalKey<AbstractHorse> HORSE_RANDOM_STAND = create("horse_random_stand", AbstractHorse.class);

-    GoalKey<AbstractHorse> RUN_AROUND_LIKE_CRAZY = create("run_around_like_crazy", AbstractHorse.class);
+    GoalKey<AbstractHorse> HORSE_RUN_AROUND_LIKE_CRAZY = create("horse_run_around_like_crazy", AbstractHorse.class);

-    GoalKey<AbstractSkeleton> ABSTRACT_SKELETON_MELEE = create("abstract_skeleton_melee", AbstractSkeleton.class);
+    GoalKey<AbstractSkeleton> SKELETON_MELEE = create("skeleton_melee", AbstractSkeleton.class);

-    GoalKey<AbstractVillager> LOOK_AT_TRADING_PLAYER = create("look_at_trading_player", AbstractVillager.class);
+    GoalKey<AbstractVillager> VILLAGER_LOOK_AT_TRADING_PLAYER = create("villager_look_at_trading_player", AbstractVillager.class);

-    GoalKey<AbstractVillager> TRADE_WITH_PLAYER = create("trade_with_player", AbstractVillager.class);
+    GoalKey<AbstractVillager> VILLAGER_TRADE_WITH_PLAYER = create("villager_trade_with_player", AbstractVillager.class);

    GoalKey<Animals> BREED = create("breed", Animals.class);

@@ -101,12 +102,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Bee> BEE_POLLINATE = create("bee_pollinate", Bee.class);

+    GoalKey<Bee> BEE_VALIDATE_FLOWER = create("bee_validate_flower", Bee.class);
+
+    GoalKey<Bee> BEE_VALIDATE_HIVE = create("bee_validate_hive", Bee.class);
+
    GoalKey<Bee> BEE_WANDER = create("bee_wander", Bee.class);

-    GoalKey<Bee> VALIDATE_FLOWER = create("validate_flower", Bee.class);
-
-    GoalKey<Bee> VALIDATE_HIVE = create("validate_hive", Bee.class);
-
    GoalKey<Blaze> BLAZE_ATTACK = create("blaze_attack", Blaze.class);

    GoalKey<Cat> CAT_AVOID_ENTITY = create("cat_avoid_entity", Cat.class);
@@ -165,16 +166,16 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Creature> WATER_AVOIDING_RANDOM_STROLL = create("water_avoiding_random_stroll", Creature.class);

-    GoalKey<Creeper> SWELL = create("swell", Creeper.class);
+    GoalKey<Creeper> CREEPER_SWELL = create("creeper_swell", Creeper.class);

    GoalKey<Dolphin> DOLPHIN_JUMP = create("dolphin_jump", Dolphin.class);

+    GoalKey<Dolphin> DOLPHIN_PLAY_WITH_ITEMS = create("dolphin_play_with_items", Dolphin.class);
+
    GoalKey<Dolphin> DOLPHIN_SWIM_TO_TREASURE = create("dolphin_swim_to_treasure", Dolphin.class);

    GoalKey<Dolphin> DOLPHIN_SWIM_WITH_PLAYER = create("dolphin_swim_with_player", Dolphin.class);

-    GoalKey<Dolphin> PLAY_WITH_ITEMS = create("play_with_items", Dolphin.class);
-
    GoalKey<Drowned> DROWNED_ATTACK = create("drowned_attack", Drowned.class);

    GoalKey<Drowned> DROWNED_GO_TO_BEACH = create("drowned_go_to_beach", Drowned.class);
@@ -199,14 +200,14 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Fish> FISH_SWIM = create("fish_swim", Fish.class);

-    GoalKey<Fox> DEFEND_TRUSTED = create("defend_trusted", Fox.class);
-
-    GoalKey<Fox> FACEPLANT = create("faceplant", Fox.class);
-
    GoalKey<Fox> FOX_BREED = create("fox_breed", Fox.class);

+    GoalKey<Fox> FOX_DEFEND_TRUSTED = create("fox_defend_trusted", Fox.class);
+
    GoalKey<Fox> FOX_EAT_BERRIES = create("fox_eat_berries", Fox.class);

+    GoalKey<Fox> FOX_FACEPLANT = create("fox_faceplant", Fox.class);
+
    GoalKey<Fox> FOX_FLOAT = create("fox_float", Fox.class);

    GoalKey<Fox> FOX_FOLLOW_PARENT = create("fox_follow_parent", Fox.class);
@@ -217,29 +218,27 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Fox> FOX_PANIC = create("fox_panic", Fox.class);

+    GoalKey<Fox> FOX_PERCH_AND_SEARCH = create("fox_perch_and_search", Fox.class);
+
    GoalKey<Fox> FOX_POUNCE = create("fox_pounce", Fox.class);

    GoalKey<Fox> FOX_SEARCH_FOR_ITEMS = create("fox_search_for_items", Fox.class);

+    GoalKey<Fox> FOX_SEEK_SHELTER = create("fox_seek_shelter", Fox.class);
+
+    GoalKey<Fox> FOX_SLEEP = create("fox_sleep", Fox.class);
+
+    GoalKey<Fox> FOX_STALK_PREY = create("fox_stalk_prey", Fox.class);
+
    GoalKey<Fox> FOX_STROLL_THROUGH_VILLAGE = create("fox_stroll_through_village", Fox.class);

-    GoalKey<Fox> PERCH_AND_SEARCH = create("perch_and_search", Fox.class);
-
-    GoalKey<Fox> SEEK_SHELTER = create("seek_shelter", Fox.class);
-
-    GoalKey<Fox> SLEEP = create("sleep", Fox.class);
-
-    GoalKey<Fox> STALK_PREY = create("stalk_prey", Fox.class);
-
-    GoalKey<Ghast> GHAST_LOOK = create("ghast_look", Ghast.class);
-
    GoalKey<Ghast> GHAST_SHOOT_FIREBALL = create("ghast_shoot_fireball", Ghast.class);

-    GoalKey<Ghast> RANDOM_FLOAT_AROUND = create("random_float_around", Ghast.class);
-
    GoalKey<Guardian> GUARDIAN_ATTACK = create("guardian_attack", Guardian.class);

-    GoalKey<Illager> HOLD_GROUND_ATTACK = create("hold_ground_attack", Illager.class);
+    GoalKey<HappyGhast> HAPPY_GHAST_FLOAT = create("happy_ghast_float", HappyGhast.class);
+
+    GoalKey<Illager> ILLAGER_HOLD_GROUND_ATTACK = create("illager_hold_ground_attack", Illager.class);

    GoalKey<Illager> RAIDER_OPEN_DOOR = create("raider_open_door", Illager.class);

@@ -247,9 +246,9 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Illusioner> ILLUSIONER_MIRROR_SPELL = create("illusioner_mirror_spell", Illusioner.class);

-    GoalKey<IronGolem> DEFEND_VILLAGE = create("defend_village", IronGolem.class);
+    GoalKey<IronGolem> IRON_GOLEM_DEFEND_VILLAGE = create("iron_golem_defend_village", IronGolem.class);

-    GoalKey<IronGolem> OFFER_FLOWER = create("offer_flower", IronGolem.class);
+    GoalKey<IronGolem> IRON_GOLEM_OFFER_FLOWER = create("iron_golem_offer_flower", IronGolem.class);

    GoalKey<Llama> LLAMA_ATTACK_WOLF = create("llama_attack_wolf", Llama.class);

@@ -269,6 +268,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Mob> FOLLOW_MOB = create("follow_mob", Mob.class);

+    GoalKey<Mob> GHAST_LOOK = create("ghast_look", Mob.class);
+
    GoalKey<Mob> INTERACT = create("interact", Mob.class);

    GoalKey<Mob> LEAP_AT = create("leap_at", Mob.class);
@@ -281,10 +282,14 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Mob> OPEN_DOOR = create("open_door", Mob.class);

+    GoalKey<Mob> RANDOM_FLOAT_AROUND = create("random_float_around", Mob.class);
+
    GoalKey<Mob> RANDOM_LOOK_AROUND = create("random_look_around", Mob.class);

    GoalKey<Mob> RESET_UNIVERSAL_ANGER = create("reset_universal_anger", Mob.class);

+    GoalKey<Mob> TEMPT_FOR_NON_PATHFINDERS = create("tempt_for_non_pathfinders", Mob.class);
+
    GoalKey<Mob> USE_ITEM = create("use_item", Mob.class);

    GoalKey<Mob> VINDICATOR_BREAK_DOOR = create("vindicator_break_door", Mob.class);
@@ -317,7 +322,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Panda> PANDA_SNEEZE = create("panda_sneeze", Panda.class);

-    GoalKey<Parrot> LAND_ON_OWNERS_SHOULDER = create("land_on_owners_shoulder", Parrot.class);
+    GoalKey<Parrot> PARROT_LAND_ON_OWNERS_SHOULDER = create("parrot_land_on_owners_shoulder", Parrot.class);

    GoalKey<Phantom> PHANTOM_ATTACK_PLAYER = create("phantom_attack_player", Phantom.class);

@@ -339,27 +344,27 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Rabbit> RABBIT_PANIC = create("rabbit_panic", Rabbit.class);

-    GoalKey<Rabbit> RAID_GARDEN = create("raid_garden", Rabbit.class);
-
-    GoalKey<Raider> LONG_DISTANCE_PATROL = create("long_distance_patrol", Raider.class);
-
-    GoalKey<Raider> NEAREST_ATTACKABLE_WITCH = create("nearest_attackable_witch", Raider.class);
-
-    GoalKey<Raider> NEAREST_HEALABLE_RAIDER = create("nearest_healable_raider", Raider.class);
-
-    GoalKey<Raider> OBTAIN_RAID_LEADER_BANNER = create("obtain_raid_leader_banner", Raider.class);
-
-    GoalKey<Raider> PATHFIND_TO_RAID = create("pathfind_to_raid", Raider.class);
+    GoalKey<Rabbit> RABBIT_RAID_GARDEN = create("rabbit_raid_garden", Rabbit.class);

    GoalKey<Raider> RAIDER_CELEBRATION = create("raider_celebration", Raider.class);

+    GoalKey<Raider> RAIDER_LONG_DISTANCE_PATROL = create("raider_long_distance_patrol", Raider.class);
+
    GoalKey<Raider> RAIDER_MOVE_THROUGH_VILLAGE = create("raider_move_through_village", Raider.class);

+    GoalKey<Raider> RAIDER_NEAREST_ATTACKABLE_WITCH = create("raider_nearest_attackable_witch", Raider.class);
+
+    GoalKey<Raider> RAIDER_NEAREST_HEALABLE_RAIDER = create("raider_nearest_healable_raider", Raider.class);
+
+    GoalKey<Raider> RAIDER_OBTAIN_RAID_LEADER_BANNER = create("raider_obtain_raid_leader_banner", Raider.class);
+
+    GoalKey<Raider> RAIDER_PATHFIND_TO_RAID = create("raider_pathfind_to_raid", Raider.class);
+
    GoalKey<RangedEntity> DROWNED_TRIDENT_ATTACK = create("drowned_trident_attack", RangedEntity.class);

    GoalKey<RangedEntity> RANGED_ATTACK = create("ranged_attack", RangedEntity.class);

-    GoalKey<SchoolableFish> FOLLOW_FLOCK_LEADER = create("follow_flock_leader", SchoolableFish.class);
+    GoalKey<SchoolableFish> SCHOOLABLE_FISH_FOLLOW_FLOCK_LEADER = create("schoolable_fish_follow_flock_leader", SchoolableFish.class);

    GoalKey<Shulker> SHULKER_ATTACK = create("shulker_attack", Shulker.class);

@@ -373,7 +378,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Silverfish> SILVERFISH_WAKE_UP_FRIENDS = create("silverfish_wake_up_friends", Silverfish.class);

-    GoalKey<SkeletonHorse> SKELETON_TRAP = create("skeleton_trap", SkeletonHorse.class);
+    GoalKey<SkeletonHorse> SKELETON_HORSE_SKELETON_TRAP = create("skeleton_horse_skeleton_trap", SkeletonHorse.class);

    GoalKey<Slime> SLIME_ATTACK = create("slime_attack", Slime.class);

@@ -429,14 +434,14 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Vindicator> VINDICATOR_JOHNNY_ATTACK = create("vindicator_johnny_attack", Vindicator.class);

-    GoalKey<WanderingTrader> WANDER_TO_POSITION = create("wander_to_position", WanderingTrader.class);
+    GoalKey<WanderingTrader> WANDERING_TRADER_WANDER_TO_POSITION = create("wandering_trader_wander_to_position", WanderingTrader.class);

    GoalKey<Wither> WITHER_DO_NOTHING = create("wither_do_nothing", Wither.class);

-    GoalKey<Wolf> BEG = create("beg", Wolf.class);
-
    GoalKey<Wolf> WOLF_AVOID_ENTITY = create("wolf_avoid_entity", Wolf.class);

+    GoalKey<Wolf> WOLF_BEG = create("wolf_beg", Wolf.class);
+
    GoalKey<Zombie> ZOMBIE_ATTACK = create("zombie_attack", Zombie.class);

    GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class AttributeKeys {
    /**
     * {@code minecraft:armor}
@@ -81,6 +81,13 @@ public final class AttributeKeys {
     */
    public static final TypedKey<Attribute> BURNING_TIME = create(key("burning_time"));

+    /**
+     * {@code minecraft:camera_distance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> CAMERA_DISTANCE = create(key("camera_distance"));
+
    /**
     * {@code minecraft:entity_interaction_range}
     *
@@ -249,6 +256,20 @@ public final class AttributeKeys {
     */
    public static final TypedKey<Attribute> WATER_MOVEMENT_EFFICIENCY = create(key("water_movement_efficiency"));

+    /**
+     * {@code minecraft:waypoint_receive_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> WAYPOINT_RECEIVE_RANGE = create(key("waypoint_receive_range"));
+
+    /**
+     * {@code minecraft:waypoint_transmit_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> WAYPOINT_TRANSMIT_RANGE = create(key("waypoint_transmit_range"));
+
    private AttributeKeys() {
    }

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class BannerPatternKeys {
    /**
     * {@code minecraft:base}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class BiomeKeys {
    /**
     * {@code minecraft:badlands}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class BlockTypeKeys {
    /**
     * {@code minecraft:acacia_button}
@@ -2475,6 +2475,13 @@ public final class BlockTypeKeys {
     */
    public static final TypedKey<BlockType> DRAGON_WALL_HEAD = create(key("dragon_wall_head"));

+    /**
+     * {@code minecraft:dried_ghast}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> DRIED_GHAST = create(key("dried_ghast"));
+
    /**
     * {@code minecraft:dried_kelp_block}
     *
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class CatVariantKeys {
    /**
     * {@code minecraft:all_black}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class ChickenVariantKeys {
    /**
     * {@code minecraft:cold}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class CowVariantKeys {
    /**
     * {@code minecraft:cold}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class DamageTypeKeys {
    /**
     * {@code minecraft:arrow}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class DataComponentTypeKeys {
    /**
     * {@code minecraft:attribute_modifiers}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class EnchantmentKeys {
    /**
     * {@code minecraft:aqua_affinity}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class FluidKeys {
    /**
     * {@code minecraft:empty}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class FrogVariantKeys {
    /**
     * {@code minecraft:cold}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class GameEventKeys {
    /**
     * {@code minecraft:block_activate}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class InstrumentKeys {
    /**
     * {@code minecraft:admire_goat_horn}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class JukeboxSongKeys {
    /**
     * {@code minecraft:11}
@@ -144,6 +144,13 @@ public final class JukeboxSongKeys {
     */
    public static final TypedKey<JukeboxSong> STRAD = create(key("strad"));

+    /**
+     * {@code minecraft:tears}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> TEARS = create(key("tears"));
+
    /**
     * {@code minecraft:wait}
     *
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class MapDecorationTypeKeys {
    /**
     * {@code minecraft:banner_black}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class MenuTypeKeys {
    /**
     * {@code minecraft:anvil}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class MobEffectKeys {
    /**
     * {@code minecraft:absorption}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class PaintingVariantKeys {
    /**
     * {@code minecraft:alban}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class PigVariantKeys {
    /**
     * {@code minecraft:cold}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class SoundEventKeys {
    /**
     * {@code minecraft:ambient.basalt_deltas.additions}
@@ -1929,6 +1929,62 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> BLOCK_DISPENSER_LAUNCH = create(key("block.dispenser.launch"));

+    /**
+     * {@code minecraft:block.dried_ghast.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_AMBIENT = create(key("block.dried_ghast.ambient"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.ambient_water}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_AMBIENT_WATER = create(key("block.dried_ghast.ambient_water"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_BREAK = create(key("block.dried_ghast.break"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_FALL = create(key("block.dried_ghast.fall"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_PLACE = create(key("block.dried_ghast.place"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.place_in_water}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_PLACE_IN_WATER = create(key("block.dried_ghast.place_in_water"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_STEP = create(key("block.dried_ghast.step"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.transition}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_TRANSITION = create(key("block.dried_ghast.transition"));
+
    /**
     * {@code minecraft:block.dripstone_block.break}
     *
@@ -1964,6 +2020,13 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> BLOCK_DRIPSTONE_BLOCK_STEP = create(key("block.dripstone_block.step"));

+    /**
+     * {@code minecraft:block.dry_grass.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRY_GRASS_AMBIENT = create(key("block.dry_grass.ambient"));
+
    /**
     * {@code minecraft:block.enchantment_table.use}
     *
@@ -4113,13 +4176,6 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> BLOCK_SAND_STEP = create(key("block.sand.step"));

-    /**
-     * {@code minecraft:block.sand.wind}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_SAND_WIND = create(key("block.sand.wind"));
-
    /**
     * {@code minecraft:block.scaffolding.break}
     *
@@ -7207,6 +7263,34 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> ENTITY_GHAST_WARN = create(key("entity.ghast.warn"));

+    /**
+     * {@code minecraft:entity.ghastling.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_GHASTLING_AMBIENT = create(key("entity.ghastling.ambient"));
+
+    /**
+     * {@code minecraft:entity.ghastling.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_GHASTLING_DEATH = create(key("entity.ghastling.death"));
+
+    /**
+     * {@code minecraft:entity.ghastling.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_GHASTLING_HURT = create(key("entity.ghastling.hurt"));
+
+    /**
+     * {@code minecraft:entity.ghastling.spawn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_GHASTLING_SPAWN = create(key("entity.ghastling.spawn"));
+
    /**
     * {@code minecraft:entity.glow_item_frame.add_item}
     *
@@ -7452,6 +7536,62 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> ENTITY_GUARDIAN_HURT_LAND = create(key("entity.guardian.hurt_land"));

+    /**
+     * {@code minecraft:entity.happy_ghast.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_AMBIENT = create(key("entity.happy_ghast.ambient"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_DEATH = create(key("entity.happy_ghast.death"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.equip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_EQUIP = create(key("entity.happy_ghast.equip"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.harness_goggles_down}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN = create(key("entity.happy_ghast.harness_goggles_down"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.harness_goggles_up}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP = create(key("entity.happy_ghast.harness_goggles_up"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_HURT = create(key("entity.happy_ghast.hurt"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.riding}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_RIDING = create(key("entity.happy_ghast.riding"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.unequip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_UNEQUIP = create(key("entity.happy_ghast.unequip"));
+
    /**
     * {@code minecraft:entity.hoglin.ambient}
     *
@@ -7816,20 +7956,6 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> ENTITY_ITEM_FRAME_ROTATE_ITEM = create(key("entity.item_frame.rotate_item"));

-    /**
-     * {@code minecraft:entity.leash_knot.break}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_LEASH_KNOT_BREAK = create(key("entity.leash_knot.break"));
-
-    /**
-     * {@code minecraft:entity.leash_knot.place}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_LEASH_KNOT_PLACE = create(key("entity.leash_knot.place"));
-
    /**
     * {@code minecraft:entity.lightning_bolt.impact}
     *
@@ -8880,13 +9006,6 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> ENTITY_POLAR_BEAR_WARNING = create(key("entity.polar_bear.warning"));

-    /**
-     * {@code minecraft:entity.puffer_fish.ambient}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_PUFFER_FISH_AMBIENT = create(key("entity.puffer_fish.ambient"));
-
    /**
     * {@code minecraft:entity.puffer_fish.blow_out}
     *
@@ -11323,6 +11442,13 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> ITEM_HONEYCOMB_WAX_ON = create(key("item.honeycomb.wax_on"));

+    /**
+     * {@code minecraft:item.horse_armor.unequip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_HORSE_ARMOR_UNEQUIP = create(key("item.horse_armor.unequip"));
+
    /**
     * {@code minecraft:item.ink_sac.use}
     *
@@ -11330,6 +11456,34 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> ITEM_INK_SAC_USE = create(key("item.ink_sac.use"));

+    /**
+     * {@code minecraft:item.lead.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_LEAD_BREAK = create(key("item.lead.break"));
+
+    /**
+     * {@code minecraft:item.lead.tied}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_LEAD_TIED = create(key("item.lead.tied"));
+
+    /**
+     * {@code minecraft:item.lead.untied}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_LEAD_UNTIED = create(key("item.lead.untied"));
+
+    /**
+     * {@code minecraft:item.llama_carpet.unequip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_LLAMA_CARPET_UNEQUIP = create(key("item.llama_carpet.unequip"));
+
    /**
     * {@code minecraft:item.lodestone_compass.lock}
     *
@@ -11372,6 +11526,20 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> ITEM_OMINOUS_BOTTLE_DISPOSE = create(key("item.ominous_bottle.dispose"));

+    /**
+     * {@code minecraft:item.saddle.unequip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_SADDLE_UNEQUIP = create(key("item.saddle.unequip"));
+
+    /**
+     * {@code minecraft:item.shears.snip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_SHEARS_SNIP = create(key("item.shears.snip"));
+
    /**
     * {@code minecraft:item.shield.block}
     *
@@ -11834,6 +12002,13 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> MUSIC_DISC_STRAD = create(key("music_disc.strad"));

+    /**
+     * {@code minecraft:music_disc.tears}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> MUSIC_DISC_TEARS = create(key("music_disc.tears"));
+
    /**
     * {@code minecraft:music_disc.wait}
     *
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class StructureKeys {
    /**
     * {@code minecraft:ancient_city}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class StructureTypeKeys {
    /**
     * {@code minecraft:buried_treasure}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class TrimMaterialKeys {
    /**
     * {@code minecraft:amethyst}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class TrimPatternKeys {
    /**
     * {@code minecraft:bolt}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class VillagerProfessionKeys {
    /**
     * {@code minecraft:armorer}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class VillagerTypeKeys {
    /**
     * {@code minecraft:desert}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class WolfSoundVariantKeys {
    /**
     * {@code minecraft:angry}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class WolfVariantKeys {
    /**
     * {@code minecraft:ashen}
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class BannerPatternTagKeys {
    /**
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class BiomeTagKeys {
    /**
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class BlockTypeTagKeys {
    /**
@@ -580,6 +580,13 @@ public final class BlockTypeTagKeys {
     */
    public static final TagKey<BlockType> GUARDED_BY_PIGLINS = create(key("guarded_by_piglins"));

+    /**
+     * {@code #minecraft:happy_ghast_avoids}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> HAPPY_GHAST_AVOIDS = create(key("happy_ghast_avoids"));
+
    /**
     * {@code #minecraft:hoglin_repellents}
     *
@@ -909,13 +916,6 @@ public final class BlockTypeTagKeys {
     */
    public static final TagKey<BlockType> PLANKS = create(key("planks"));

-    /**
-     * {@code #minecraft:plays_ambient_desert_block_sounds}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<BlockType> PLAYS_AMBIENT_DESERT_BLOCK_SOUNDS = create(key("plays_ambient_desert_block_sounds"));
-
    /**
     * {@code #minecraft:polar_bears_spawnable_on_alternate}
     *
@@ -1203,6 +1203,27 @@ public final class BlockTypeTagKeys {
     */
    public static final TagKey<BlockType> TRAPDOORS = create(key("trapdoors"));

+    /**
+     * {@code #minecraft:triggers_ambient_desert_dry_vegetation_block_sounds}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> TRIGGERS_AMBIENT_DESERT_DRY_VEGETATION_BLOCK_SOUNDS = create(key("triggers_ambient_desert_dry_vegetation_block_sounds"));
+
+    /**
+     * {@code #minecraft:triggers_ambient_desert_sand_block_sounds}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> TRIGGERS_AMBIENT_DESERT_SAND_BLOCK_SOUNDS = create(key("triggers_ambient_desert_sand_block_sounds"));
+
+    /**
+     * {@code #minecraft:triggers_ambient_dried_ghast_block_sounds}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> TRIGGERS_AMBIENT_DRIED_GHAST_BLOCK_SOUNDS = create(key("triggers_ambient_dried_ghast_block_sounds"));
+
    /**
     * {@code #minecraft:underwater_bonemeals}
     *
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class DamageTypeTagKeys {
    /**
@@ -25,7 +25,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class EnchantmentTagKeys {
    /**
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class EntityTypeTagKeys {
    /**
@@ -83,6 +83,13 @@ public final class EntityTypeTagKeys {
     */
    public static final TagKey<EntityType> CAN_BREATHE_UNDER_WATER = create(key("can_breathe_under_water"));

+    /**
+     * {@code #minecraft:can_equip_harness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CAN_EQUIP_HARNESS = create(key("can_equip_harness"));
+
    /**
     * {@code #minecraft:can_equip_saddle}
     *
@@ -125,6 +132,13 @@ public final class EntityTypeTagKeys {
     */
    public static final TagKey<EntityType> FALL_DAMAGE_IMMUNE = create(key("fall_damage_immune"));

+    /**
+     * {@code #minecraft:followable_friendly_mobs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> FOLLOWABLE_FRIENDLY_MOBS = create(key("followable_friendly_mobs"));
+
    /**
     * {@code #minecraft:freeze_hurts_extra_types}
     *
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class FluidTagKeys {
    /**
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class GameEventTagKeys {
    /**
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class InstrumentTagKeys {
    /**
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class ItemTypeTagKeys {
    /**
@@ -601,6 +601,27 @@ public final class ItemTypeTagKeys {
     */
    public static final TagKey<ItemType> HANGING_SIGNS = create(key("hanging_signs"));

+    /**
+     * {@code #minecraft:happy_ghast_food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> HAPPY_GHAST_FOOD = create(key("happy_ghast_food"));
+
+    /**
+     * {@code #minecraft:happy_ghast_tempt_items}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> HAPPY_GHAST_TEMPT_ITEMS = create(key("happy_ghast_tempt_items"));
+
+    /**
+     * {@code #minecraft:harnesses}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> HARNESSES = create(key("harnesses"));
+
    /**
     * {@code #minecraft:head_armor}
     *
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class PaintingVariantTagKeys {
    /**
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
@ApiStatus.Experimental
 public final class StructureTagKeys {
    /**
@@ -317,7 +317,7 @@ public class MaterialTags {
     */
    public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
        .endsWith("_SPAWN_EGG")
-        .ensureSize("SPAWN_EGGS", 81).lock();
+        .ensureSize("SPAWN_EGGS", 82).lock();

    /**
     * Covers all colors of stained glass.
@@ -15,45 +15,46 @@ import org.jspecify.annotations.Nullable;
@NullMarked
 public final class GoalKey<T extends Mob> {

-    private final Class<T> entityClass;
-    private final NamespacedKey namespacedKey;
+    private final Class<T> type;
+    private final NamespacedKey key;

-    private GoalKey(Class<T> entityClass, NamespacedKey namespacedKey) {
-        this.entityClass = entityClass;
-        this.namespacedKey = namespacedKey;
+    private GoalKey(Class<T> type, NamespacedKey key) {
+        this.type = type;
+        this.key = key;
    }

    public Class<T> getEntityClass() {
-        return this.entityClass;
+        return this.type;
    }

    public NamespacedKey getNamespacedKey() {
-        return this.namespacedKey;
+        return this.key;
    }

    @Override
    public boolean equals(@Nullable Object o) {
        if (this == o) return true;
        if (o == null || this.getClass() != o.getClass()) return false;
+
        GoalKey<?> goalKey = (GoalKey<?>) o;
-        return Objects.equals(this.entityClass, goalKey.entityClass) &&
-            Objects.equals(this.namespacedKey, goalKey.namespacedKey);
+        return Objects.equals(this.type, goalKey.type) &&
+            Objects.equals(this.key, goalKey.key);
    }

    @Override
    public int hashCode() {
-        return Objects.hash(this.entityClass, this.namespacedKey);
+        return Objects.hash(this.type, this.key);
    }

    @Override
    public String toString() {
        return new StringJoiner(", ", GoalKey.class.getSimpleName() + "[", "]")
-            .add("entityClass=" + this.entityClass)
-            .add("namespacedKey=" + this.namespacedKey)
+            .add("type=" + this.type)
+            .add("key=" + this.key)
            .toString();
    }

-    public static <A extends Mob> GoalKey<A> of(Class<A> entityClass, NamespacedKey namespacedKey) {
-        return new GoalKey<>(entityClass, namespacedKey);
+    public static <A extends Mob> GoalKey<A> of(Class<A> type, NamespacedKey key) {
+        return new GoalKey<>(type, key);
    }
 }
@@ -1,5 +1,6 @@
 package io.papermc.paper;

+import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.world.damagesource.CombatEntry;
 import io.papermc.paper.world.damagesource.FallLocationType;
 import net.kyori.adventure.util.Services;
@@ -11,6 +12,8 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;

+import java.util.function.Predicate;
+
 /**
 * Static bridge to the server internals.
 * <p>
@@ -73,5 +76,15 @@ public interface InternalAPIBridge {
     * @return combat entry
     */
    CombatEntry createCombatEntry(DamageSource damageSource, float damage, @Nullable FallLocationType fallLocationType, float fallDistance);
+
+    /**
+     * Causes this predicate to be considered restricted.
+     * Applying this to a command node prevents this command from being executed from an
+     * unattended context, such as click events.
+     *
+     * @param predicate wrapped predicate
+     * @return wrapped predicate
+     */
+    Predicate<CommandSourceStack> restricted(Predicate<CommandSourceStack> predicate);
 }

@@ -17,7 +17,8 @@ public enum CommandRegistrationFlag {
    @Deprecated(since = "1.21.4")
    FLATTEN_ALIASES,
    /**
-     * Prevents this command from being sent to the client.
+     * @deprecated Removed as it causes a warning to appear on the client now.
     */
+    @Deprecated(since = "1.21.6", forRemoval = true)
    SERVER_ONLY
 }
@@ -5,6 +5,7 @@ import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.tree.LiteralCommandNode;
+import io.papermc.paper.InternalAPIBridge;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
 import io.papermc.paper.plugin.configuration.PluginMeta;
@@ -13,6 +14,7 @@ import io.papermc.paper.plugin.lifecycle.event.registrar.Registrar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
+import java.util.function.Predicate;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Unmodifiable;
 import org.jspecify.annotations.NullMarked;
@@ -85,6 +87,22 @@ public interface Commands extends Registrar {
        return RequiredArgumentBuilder.argument(name, argumentType);
    }

+    /**
+     * Creates a restricted {@link Predicate} that wraps the given predicate.
+     * <p>
+     * A restricted predicate prevents execution in unattended contexts, such as from
+     * chat click events. A warning is shown on the client before executing the command.
+     * <p>
+     * This is used by vanilla to prevent invocation of sensitive commands (like op) from
+     * players without their knowledge.
+     *
+     * @param predicate the original predicate to wrap
+     * @return a new predicate with restricted execution behavior
+     */
+    static Predicate<CommandSourceStack> restricted(final Predicate<CommandSourceStack> predicate) {
+        return InternalAPIBridge.get().restricted(predicate);
+    }
+
    /**
     * Gets the underlying {@link CommandDispatcher}.
     *
@@ -21,4 +21,13 @@ public interface ServerConfiguration {
     * @return whether the server is in online mode or behind a proxy configured for online mode
     */
    boolean isProxyOnlineMode();
+
+    /**
+     * Gets whether the server is configured to work behind a proxy.
+     * <p>
+     * This returns true if either Velocity or BungeeCord is enabled.
+     *
+     * @return whether the server is configured to work behind a proxy
+     */
+    boolean isProxyEnabled();
 }
@@ -3,7 +3,6 @@ package io.papermc.paper.datacomponent;
 import org.bukkit.Utility;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -23,8 +22,8 @@ public interface DataComponentHolder extends DataComponentView {
     * @param <T> value type
     */
    @Utility
-    @org.jetbrains.annotations.ApiStatus.Experimental
-    public <T> void setData(final io.papermc.paper.datacomponent.DataComponentType.@NotNull Valued<T> type, final @NotNull io.papermc.paper.datacomponent.DataComponentBuilder<T> valueBuilder);
+    @ApiStatus.Experimental
+    <T> void setData(final DataComponentType.Valued<T> type, final DataComponentBuilder<T> valueBuilder);

    /**
     * Sets the value of the data component type for this holder.
@@ -33,16 +32,16 @@ public interface DataComponentHolder extends DataComponentView {
     * @param value value to set
     * @param <T> value type
     */
-    @org.jetbrains.annotations.ApiStatus.Experimental
-    public <T> void setData(final io.papermc.paper.datacomponent.DataComponentType.@NotNull Valued<T> type, final @NotNull T value);
+    @ApiStatus.Experimental
+    <T> void setData(final DataComponentType.Valued<T> type, final T value);

    /**
     * Marks this non-valued data component type as present in this itemstack.
     *
     * @param type the data component type
     */
-    @org.jetbrains.annotations.ApiStatus.Experimental
-    public void setData(final io.papermc.paper.datacomponent.DataComponentType.@NotNull NonValued type);
+    @ApiStatus.Experimental
+    void setData(final DataComponentType.NonValued type);

   // TODO: Do we even want to have the concept of overriding here? Not sure what is going on with entity components
 }
@@ -364,8 +364,8 @@ public final class DataComponentTypes {
    public static final DataComponentType.Valued<Rabbit.Type> RABBIT_VARIANT = valued("rabbit/variant");
    public static final DataComponentType.Valued<Pig.Variant> PIG_VARIANT = valued("pig/variant");
    public static final DataComponentType.Valued<Cow.Variant> COW_VARIANT = valued("cow/variant");
-    // TODO: This is a eitherholder? Why specifically the chicken?? Oh wait this is prolly for chicken egg cause legacy item loading
    public static final DataComponentType.Valued<Chicken.Variant> CHICKEN_VARIANT = valued("chicken/variant");
+    // This is a eitherholder? Why specifically the chicken?? Oh wait this is prolly for chicken egg cause legacy item loading
    public static final DataComponentType.Valued<Frog.Variant> FROG_VARIANT = valued("frog/variant");
    public static final DataComponentType.Valued<Horse.Color> HORSE_VARIANT = valued("horse/variant");
    public static final DataComponentType.Valued<Art> PAINTING_VARIANT = valued("painting/variant");
@@ -376,7 +376,6 @@ public final class DataComponentTypes {
    public static final DataComponentType.Valued<DyeColor> SHEEP_COLOR = valued("sheep/color");
    public static final DataComponentType.Valued<DyeColor> SHULKER_COLOR = valued("shulker/color");

-
    private static DataComponentType.NonValued unvalued(final String name) {
        final DataComponentType dataComponentType = requireNonNull(Registry.DATA_COMPONENT_TYPE.get(NamespacedKey.minecraft(name)), name + " unvalued data component type couldn't be found, this is a bug.");
        if (dataComponentType instanceof DataComponentType.NonValued) {
@@ -3,9 +3,8 @@ package io.papermc.paper.datacomponent;
 import org.bukkit.Utility;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;

 /**
 * This represents a view of a data component holder. No
@@ -23,11 +22,11 @@ public interface DataComponentView {
     * @param type the data component type
     * @param <T> the value type
     * @return the value for the data component type, or {@code null} if not set or marked as removed
-     * @see #hasData(io.papermc.paper.datacomponent.DataComponentType) for DataComponentType.NonValued
+     * @see #hasData(DataComponentType) for DataComponentType.NonValued
     */
    @Contract(pure = true)
    @ApiStatus.Experimental
-    public <T> @Nullable T getData(final DataComponentType.@NotNull Valued<T> type);
+    <T> @Nullable T getData(final DataComponentType.Valued<T> type);

    /**
     * Gets the value for the data component type on this holder with
@@ -41,7 +40,7 @@ public interface DataComponentView {
    @Utility
    @Contract(value = "_, !null -> !null", pure = true)
    @ApiStatus.Experimental
-    public <T> @Nullable T getDataOrDefault(final DataComponentType.@NotNull Valued<? extends T> type, final @Nullable T fallback);
+    <T> @Nullable T getDataOrDefault(final DataComponentType.Valued<? extends T> type, final @Nullable T fallback);

    /**
     * Checks if the data component type is set on this holder.
@@ -51,7 +50,7 @@ public interface DataComponentView {
     */
    @Contract(pure = true)
    @ApiStatus.Experimental
-    boolean hasData(final io.papermc.paper.datacomponent.@NotNull DataComponentType type);
+    boolean hasData(final DataComponentType type);

    // Not applicable to entities
    // /**
@@ -61,5 +60,5 @@ public interface DataComponentView {
    //  */
    // @Contract("-> new")
    // @ApiStatus.Experimental
-    // java.util.@Unmodifiable Set<io.papermc.paper.datacomponent.@NotNull DataComponentType> getDataTypes();
+    // @Unmodifiable Set<DataComponentType> getDataTypes();
 }
@@ -4,13 +4,13 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import io.papermc.paper.datacomponent.item.blocksattacks.DamageReduction;
 import io.papermc.paper.datacomponent.item.blocksattacks.ItemDamageFunction;
 import io.papermc.paper.registry.tag.TagKey;
+import java.util.List;
 import net.kyori.adventure.key.Key;
 import org.bukkit.damage.DamageType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
-import java.util.List;

 /**
 * Holds block attacks to the holding player like Shield.
@@ -62,24 +62,21 @@ public interface BlocksAttacks {
     *
     * @return a damage type tag key, or null if there is no such tag key
     */
-    @Nullable
-    TagKey<DamageType> bypassedBy();
+    @Nullable TagKey<DamageType> bypassedBy();

    /**
     * Gets the key sound to play when an attack is successfully blocked.
     *
     * @return a key of the sound
     */
-    @Nullable
-    Key blockSound();
+    @Nullable Key blockSound();

    /**
     * Gets the key sound to play when the item goes on its disabled cooldown due to an attack.
     *
     * @return a key of the sound
     */
-    @Nullable
-    Key disableSound();
+    @Nullable Key disableSound();

    /**
     * Builder for {@link BlocksAttacks}.
@@ -1,7 +1,7 @@
 package io.papermc.paper.datacomponent.item;

-import java.util.List;
 import io.papermc.paper.datacomponent.DataComponentBuilder;
+import java.util.List;
 import org.bukkit.Color;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
@@ -104,6 +104,22 @@ public interface Equippable extends BuildableDataComponent<Equippable, Equippabl
    @Contract(pure = true)
    boolean equipOnInteract();

+    /**
+     * Checks if the item can be sheared off an entity.
+     *
+     * @return true if can be sheared off an entity, false otherwise
+     */
+    @Contract(pure = true)
+    boolean canBeSheared();
+
+    /**
+     * Returns the sound that is played when shearing this equipment off an entity.
+     *
+     * @return shear sound
+     */
+    @Contract(pure = true)
+    Key shearSound();
+
    /**
     * Builder for {@link Equippable}.
     */
@@ -182,5 +198,23 @@ public interface Equippable extends BuildableDataComponent<Equippable, Equippabl
         */
        @Contract(value = "_ -> this", mutates = "this")
        Builder equipOnInteract(boolean equipOnInteract);
+
+        /**
+         * Sets whether the item can be sheared off an entity.
+         *
+         * @param canBeSheared true if can be sheared off an entity
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder canBeSheared(boolean canBeSheared);
+
+        /**
+         * Sets the sound that is played when shearing this equipment off an entity.
+         *
+         * @param shearSound the shear sound key
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder shearSound(Key shearSound);
    }
 }
@@ -1,7 +1,6 @@
 package io.papermc.paper.datacomponent.item;

 import io.papermc.paper.block.BlockPredicate;
-import io.papermc.paper.datacomponent.BuildableDataComponent;
 import io.papermc.paper.datacomponent.DataComponentBuilder;
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
@@ -1,6 +1,7 @@
 package io.papermc.paper.datacomponent.item;

 import io.papermc.paper.datacomponent.DataComponentBuilder;
+import io.papermc.paper.datacomponent.item.attribute.AttributeModifierDisplay;
 import java.util.List;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
@@ -55,13 +56,21 @@ public interface ItemAttributeModifiers {
        AttributeModifier modifier();

        /**
-         * Gets the slot group for this attribute.
+         * Gets the slot group for the paired attribute.
         *
         * @return the slot group
         */
        default EquipmentSlotGroup getGroup() {
            return this.modifier().getSlotGroup();
        }
+
+        /**
+         * The display behavior for the attribute modifier.
+         *
+         * @return the display behavior
+         */
+        @Contract(pure = true)
+        AttributeModifierDisplay display();
    }

    /**
@@ -74,24 +83,55 @@ public interface ItemAttributeModifiers {
        /**
         * Adds a modifier to this builder.
         *
-         * @param attribute attribute
-         * @param modifier  modifier
+         * @param attribute the attribute
+         * @param modifier  the modifier
         * @return the builder for chaining
         * @see #modifiers()
         */
        @Contract(value = "_, _ -> this", mutates = "this")
-        Builder addModifier(Attribute attribute, AttributeModifier modifier);
+        default Builder addModifier(Attribute attribute, AttributeModifier modifier) {
+            return this.addModifier(attribute, modifier, modifier.getSlotGroup());
+        }

        /**
         * Adds a modifier to this builder.
         *
-         * @param attribute          attribute
-         * @param modifier           modifier
+         * @param attribute          the attribute
+         * @param modifier           the modifier
         * @param equipmentSlotGroup the slot group this modifier applies to (overrides any slot group in the modifier)
         * @return the builder for chaining
         * @see #modifiers()
         */
        @Contract(value = "_, _, _ -> this", mutates = "this")
-        Builder addModifier(Attribute attribute, AttributeModifier modifier, EquipmentSlotGroup equipmentSlotGroup);
+        default Builder addModifier(Attribute attribute, AttributeModifier modifier, EquipmentSlotGroup equipmentSlotGroup) {
+            return this.addModifier(attribute, modifier, equipmentSlotGroup, AttributeModifierDisplay.reset());
+        }
+
+        /**
+         * Adds a modifier to this builder.
+         *
+         * @param attribute          the attribute
+         * @param modifier           the modifier
+         * @param display            the modifier display behavior
+         * @return the builder for chaining
+         * @see #modifiers()
+         */
+        @Contract(value = "_, _, _ -> this", mutates = "this")
+        default Builder addModifier(Attribute attribute, AttributeModifier modifier, AttributeModifierDisplay display) {
+            return this.addModifier(attribute, modifier, modifier.getSlotGroup(), display);
+        }
+
+        /**
+         * Adds a modifier to this builder.
+         *
+         * @param attribute          the attribute
+         * @param modifier           the modifier
+         * @param equipmentSlotGroup the slot group this modifier applies to (overrides any slot group in the modifier)
+         * @param display            the modifier display behavior
+         * @return the builder for chaining
+         * @see #modifiers()
+         */
+        @Contract(value = "_, _, _, _ -> this", mutates = "this")
+        Builder addModifier(Attribute attribute, AttributeModifier modifier, EquipmentSlotGroup equipmentSlotGroup, AttributeModifierDisplay display);
    }
 }
@@ -90,7 +90,7 @@ interface ItemComponentTypesBridge {

    MapId mapId(int id);

-    UseRemainder useRemainder(ItemStack itemStack);
+    UseRemainder useRemainder(ItemStack stack);

    Consumable.Builder consumable();

@@ -0,0 +1,85 @@
+package io.papermc.paper.datacomponent.item.attribute;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * The display behavior for a dedicated attribute entry.
+ *
+ * @see io.papermc.paper.datacomponent.DataComponentTypes#ATTRIBUTE_MODIFIERS
+ * @see io.papermc.paper.datacomponent.item.ItemAttributeModifiers#itemAttributes()
+ */
+@NullMarked
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface AttributeModifierDisplay {
+
+    /**
+     * Reset any override of the text displayed by the attribute modifier
+     * to its default behavior displaying the statistics.
+     *
+     * @return the new display behavior instance
+     */
+    @Contract(value = "-> new", pure = true)
+    static Default reset() {
+        return AttributeModifierDisplayBridge.bridge().reset();
+    }
+
+    /**
+     * Hides the statistics displayed by the attribute modifier.
+     *
+     * @return the new display behavior instance
+     */
+    @Contract(value = "-> new", pure = true)
+    static Hidden hidden() {
+        return AttributeModifierDisplayBridge.bridge().hidden();
+    }
+
+    /**
+     * Override the statistics displayed by the attribute modifier
+     * to an arbitrary text.
+     *
+     * @param text the overridden text
+     * @return the new display behavior instance
+     */
+    @Contract(value = "_ -> new", pure = true)
+    static OverrideText override(final ComponentLike text) {
+        return AttributeModifierDisplayBridge.bridge().override(text);
+    }
+
+    /**
+     * Hidden statistics display for the attribute modifier.
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface Hidden extends AttributeModifierDisplay {
+    }
+
+    /**
+     * Default display for the attribute modifier, showing
+     * the statistic of its effect.
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface Default extends AttributeModifierDisplay {
+    }
+
+    /**
+     * Specifies an overridden text to show instead of
+     * the default behavior for the attribute modifier.
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface OverrideText extends AttributeModifierDisplay {
+
+        /**
+         * Overridden text
+         *
+         * @return the overridden text
+         */
+        Component text();
+    }
+}
@@ -0,0 +1,24 @@
+package io.papermc.paper.datacomponent.item.attribute;
+
+import java.util.Optional;
+import java.util.ServiceLoader;
+import net.kyori.adventure.text.ComponentLike;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+@ApiStatus.Internal
+interface AttributeModifierDisplayBridge {
+
+    Optional<AttributeModifierDisplayBridge> BRIDGE = ServiceLoader.load(AttributeModifierDisplayBridge.class).findFirst();
+
+    static AttributeModifierDisplayBridge bridge() {
+        return BRIDGE.orElseThrow();
+    }
+
+    AttributeModifierDisplay.Default reset();
+
+    AttributeModifierDisplay.Hidden hidden();
+
+    AttributeModifierDisplay.OverrideText override(ComponentLike text);
+}
@@ -1,9 +1,9 @@
 package io.papermc.paper.datacomponent.item.blocksattacks;

-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 import java.util.Optional;
 import java.util.ServiceLoader;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;

@NullMarked
@ApiStatus.Internal
@@ -30,16 +30,14 @@ public interface DamageReduction {
     *
     * @return the set of damage type
     */
-    @Nullable
-    RegistryKeySet<DamageType> type();
+    @Nullable RegistryKeySet<DamageType> type();

    /**
     * Get the maximum angle between the users facing direction and the direction of the incoming attack to be blocked.
     *
     * @return the angle
     */
-    @Positive
-    float horizontalBlockingAngle();
+    @Positive float horizontalBlockingAngle();

    /**
     * Get the constant amount of damage to be blocked.
@@ -1,11 +1,14 @@
 package io.papermc.paper.datacomponent.item.consumable;

+import org.jetbrains.annotations.ApiStatus;
+
 /**
 * Represents the hand animation that is used when a player is consuming this item.
 */
+@ApiStatus.Experimental
 public enum ItemUseAnimation {
    // Start generate - ItemUseAnimation
-    // @GeneratedFrom 1.21.5
+    // @GeneratedFrom 1.21.6
    NONE,
    EAT,
    DRINK,
@@ -157,7 +157,7 @@ public interface PermissionManager {
    void addPermissions(List<Permission> perm);

    /**
-     * Clears the current registered permissinos.
+     * Clears all the current registered permissions.
     * <p>
     * This is used for reloading.
     */
@@ -1,8 +1,7 @@
 /**
 * The paper configuration package contains the new java representation of a plugins configuration file.
 * While most values are described in detail on {@link io.papermc.paper.plugin.configuration.PluginMeta}, a full
- * entry on the paper contains a full and extensive example of possible configurations of the paper-plugin.yml.
- * @see <a href="https://docs.papermc.io/paper">Extensive documentation and examples of the paper-plugin.yml</a>
- * <!--TODO update the documentation link once documentation for this exists and is deployed-->
+ * entry on the paper website contains a full and extensive example of possible configurations of the paper-plugin.yml.
+ * @see <a href="https://docs.papermc.io/paper/dev/getting-started/paper-plugins">Extensive documentation and examples of the paper-plugin.yml</a>
 */
 package io.papermc.paper.plugin.configuration;
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.ApiStatus;
 * server initialization.
 * @see LifecycleEvents
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface LifecycleEvent {
 }
@@ -4,7 +4,6 @@ import io.papermc.paper.plugin.lifecycle.event.handler.LifecycleEventHandler;
 import io.papermc.paper.plugin.lifecycle.event.handler.configuration.LifecycleEventHandlerConfiguration;
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEventType;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * Manages a plugin's lifecycle events. Can be obtained
@@ -12,8 +11,6 @@ import org.jspecify.annotations.NullMarked;
 *
 * @param <O> the owning type, {@link org.bukkit.plugin.Plugin} or {@link io.papermc.paper.plugin.bootstrap.BootstrapContext}
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface LifecycleEventManager<O extends LifecycleEventOwner> {

@@ -2,7 +2,6 @@ package io.papermc.paper.plugin.lifecycle.event;

 import io.papermc.paper.plugin.configuration.PluginMeta;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * Implemented by types that are considered owners
@@ -11,8 +10,6 @@ import org.jspecify.annotations.NullMarked;
 * a {@link LifecycleEventManager} where you can register
 * event handlers.
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface LifecycleEventOwner {

@@ -1,8 +1,6 @@
 package io.papermc.paper.plugin.lifecycle.event.handler;

 import io.papermc.paper.plugin.lifecycle.event.LifecycleEvent;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * A handler for a specific event. Can be implemented
@@ -10,8 +8,6 @@ import org.jspecify.annotations.NullMarked;
 *
 * @param <E> the event
 */
-@ApiStatus.Experimental
-@NullMarked
@FunctionalInterface
 public interface LifecycleEventHandler<E extends LifecycleEvent> {

@@ -3,7 +3,6 @@ package io.papermc.paper.plugin.lifecycle.event.handler.configuration;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEventOwner;
 import io.papermc.paper.plugin.lifecycle.event.handler.LifecycleEventHandler;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * Base type for constructing configured event handlers for
@@ -13,8 +12,6 @@ import org.jspecify.annotations.NullMarked;
 * @param <O>
 */
@SuppressWarnings("unused")
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface LifecycleEventHandlerConfiguration<O extends LifecycleEventOwner> {
 }
@@ -3,15 +3,12 @@ package io.papermc.paper.plugin.lifecycle.event.handler.configuration;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEventOwner;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;

 /**
 * Handler configuration for event types that allow "monitor" handlers.
 *
 * @param <O> the required owner type
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface MonitorLifecycleEventHandlerConfiguration<O extends LifecycleEventOwner> extends LifecycleEventHandlerConfiguration<O> {

@@ -3,7 +3,6 @@ package io.papermc.paper.plugin.lifecycle.event.handler.configuration;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEventOwner;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;

 /**
 * Handler configuration that allows both "monitor" and prioritized handlers.
@@ -11,8 +10,6 @@ import org.jspecify.annotations.NullMarked;
 *
 * @param <O> the required owner type
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface PrioritizedLifecycleEventHandlerConfiguration<O extends LifecycleEventOwner> extends LifecycleEventHandlerConfiguration<O> {

@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event.handler.configuration;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event.handler;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
@@ -6,7 +6,6 @@ import org.jetbrains.annotations.ApiStatus;
 * To be implemented by types that provide ways to register types
 * either on server start or during a reload
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface Registrar {
 }
@@ -3,7 +3,6 @@ package io.papermc.paper.plugin.lifecycle.event.registrar;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEvent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;

 /**
 * A lifecycle event that exposes a {@link Registrar} of some kind
@@ -13,8 +12,6 @@ import org.jspecify.annotations.NullMarked;
 * @param <R> registrar type
 * @see ReloadableRegistrarEvent
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface RegistrarEvent<R extends Registrar> extends LifecycleEvent {

@@ -2,7 +2,6 @@ package io.papermc.paper.plugin.lifecycle.event.registrar;

 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;

 /**
 * A lifecycle event that exposes a {@link Registrar} that is
@@ -11,8 +10,6 @@ import org.jspecify.annotations.NullMarked;
 * @param <R> the registrar type
 * @see RegistrarEvent
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface ReloadableRegistrarEvent<R extends Registrar> extends RegistrarEvent<R> {

@@ -24,7 +21,6 @@ public interface ReloadableRegistrarEvent<R extends Registrar> extends Registrar
    @Contract(pure = true)
    Cause cause();

-    @ApiStatus.Experimental
    enum Cause {
        /**
         * The initial load of the server.
@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event.registrar;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
@@ -9,7 +9,6 @@ import io.papermc.paper.plugin.lifecycle.event.handler.configuration.MonitorLife
 import io.papermc.paper.plugin.lifecycle.event.handler.configuration.PrioritizedLifecycleEventHandlerConfiguration;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;

 /**
 * Base type for all types of lifecycle events. Differs from
@@ -22,8 +21,6 @@ import org.jspecify.annotations.NullMarked;
 * @param <E> the event object type
 * @param <C> the configuration type
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface LifecycleEventType<O extends LifecycleEventOwner, E extends LifecycleEvent, C extends LifecycleEventHandlerConfiguration<O>> {

@@ -55,7 +52,6 @@ public interface LifecycleEventType<O extends LifecycleEventOwner, E extends Lif
     * @param <O> the required owner type
     * @param <E> the event object type
     */
-    @ApiStatus.Experimental
    @ApiStatus.NonExtendable
    interface Monitorable<O extends LifecycleEventOwner, E extends LifecycleEvent> extends LifecycleEventType<O, E, MonitorLifecycleEventHandlerConfiguration<O>> {
    }
@@ -67,7 +63,6 @@ public interface LifecycleEventType<O extends LifecycleEventOwner, E extends Lif
     * @param <O> the required owner type
     * @param <E> the event object type
     */
-    @ApiStatus.Experimental
    @ApiStatus.NonExtendable
    interface Prioritizable<O extends LifecycleEventOwner, E extends LifecycleEvent> extends LifecycleEventType<O, E, PrioritizedLifecycleEventHandlerConfiguration<O>> {
    }
@@ -5,10 +5,8 @@ import io.papermc.paper.plugin.lifecycle.event.LifecycleEventOwner;
 import java.util.Optional;
 import java.util.ServiceLoader;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

@ApiStatus.Internal
-@NullMarked
 interface LifecycleEventTypeProvider {

    Optional<LifecycleEventTypeProvider> INSTANCE = ServiceLoader.load(LifecycleEventTypeProvider.class)
@@ -10,15 +10,12 @@ import io.papermc.paper.plugin.lifecycle.event.registrar.RegistrarEvent;
 import io.papermc.paper.plugin.lifecycle.event.registrar.ReloadableRegistrarEvent;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * Holds various types of lifecycle events for
 * use when creating event handler configurations
 * in {@link LifecycleEventManager}.
 */
-@ApiStatus.Experimental
-@NullMarked
 public final class LifecycleEvents {

    /**
@@ -6,7 +6,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.tag.PostFlattenTagRegistrar;
 import io.papermc.paper.tag.PreFlattenTagRegistrar;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * Provides event types for tag registration.
@@ -14,8 +13,6 @@ import org.jspecify.annotations.NullMarked;
 * @see PreFlattenTagRegistrar
 * @see PostFlattenTagRegistrar
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface TagEventTypeProvider {

@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event.types;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 * MavenLibraryResolver resolver = new MavenLibraryResolver();
 * resolver.addDependency(new Dependency(new DefaultArtifact("org.jooq:jooq:3.17.7"), null));
 * resolver.addRepository(new RemoteRepository.Builder(
- *     "central", "default", "https://repo1.maven.org/maven2/"
+ *     "central", "default", MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR
 * ).build());
 * }</pre>
 * <p>
@@ -50,6 +50,21 @@ import org.slf4j.LoggerFactory;
@NullMarked
 public class MavenLibraryResolver implements ClassPathLibrary {

+    /**
+     * The default Maven Central mirror, configurable through the {@code PAPER_DEFAULT_CENTRAL_REPOSITORY} environment
+     * variable. Use this instead of Maven Central directly when you do not have your own mirror, as using
+     * Maven Central as a CDN is against the Maven Central Terms of Service, and you will cause users to hit
+     * rate limits.
+     *
+     * <p>This repository is also used by the legacy {@link org.bukkit.plugin.java.LibraryLoader}.</p>
+     */
+    public static final String MAVEN_CENTRAL_DEFAULT_MIRROR = getDefaultMavenCentralMirror();
+    private static final List<String> MAVEN_CENTRAL_URLS = List.of(
+        "https://repo1.maven.org/maven2",
+        "http://repo1.maven.org/maven2",
+        "https://repo.maven.apache.org/maven2",
+        "http://repo.maven.apache.org/maven2"
+    );
    private static final Logger LOGGER = LoggerFactory.getLogger("MavenLibraryResolver");

    private final RepositorySystem repository;
@@ -105,6 +120,12 @@ public class MavenLibraryResolver implements ClassPathLibrary {
     * dependencies from
     */
    public void addRepository(final RemoteRepository remoteRepository) {
+        if (MAVEN_CENTRAL_URLS.stream().anyMatch(remoteRepository.getUrl()::startsWith)) {
+            LOGGER.warn(
+                "Use of Maven Central as a CDN is against the Maven Central Terms of Service. Use MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR instead.",
+                new RuntimeException("Plugin used Maven Central for library resolution")
+            );
+        }
        this.repositories.add(remoteRepository);
    }

@@ -130,4 +151,15 @@ public class MavenLibraryResolver implements ClassPathLibrary {
            store.addLibrary(file.toPath());
        }
    }
+
+    private static String getDefaultMavenCentralMirror() {
+        String central = System.getenv("PAPER_DEFAULT_CENTRAL_REPOSITORY");
+        if (central == null) {
+            central = System.getProperty("org.bukkit.plugin.java.LibraryLoader.centralURL");
+        }
+        if (central == null) {
+            central = "https://maven-central.storage-download.googleapis.com/maven2";
+        }
+        return central;
+    }
 }
@@ -76,16 +76,14 @@ public sealed interface RegistryKey<T> extends Keyed permits RegistryKeyImpl {
     */
    RegistryKey<PotionEffectType> MOB_EFFECT = create("mob_effect");
    /**
-     * @apiNote DO NOT USE
+     * Built-in registry for block types.
+     * @see io.papermc.paper.registry.keys.BlockTypeKeys
     */
-    @ApiStatus.Internal
    RegistryKey<BlockType> BLOCK = create("block");
    /**
-     * @apiNote use preferably only in the context of registry entries.
-     * @see io.papermc.paper.registry.data
+     * Built-in registry for item types.
     * @see io.papermc.paper.registry.keys.ItemTypeKeys
     */
-    @ApiStatus.Experimental // Paper - already required for registry builders
    RegistryKey<ItemType> ITEM = create("item");
    /**
     * Built-in registry for villager professions.
@@ -1,16 +1,19 @@
 package io.papermc.paper.registry;

 import net.kyori.adventure.key.Key;
+import net.kyori.adventure.key.KeyPattern;
 import org.jspecify.annotations.NullMarked;

@NullMarked
 record TypedKeyImpl<T>(Key key, RegistryKey<T> registryKey) implements TypedKey<T> {
    // Wrap key methods to make this easier to use
+    @KeyPattern.Namespace
    @Override
    public String namespace() {
        return this.key.namespace();
    }

+    @KeyPattern.Value
    @Override
    public String value() {
        return this.key.value();
@@ -3,6 +3,7 @@ package io.papermc.paper.registry.data;
 import io.papermc.paper.registry.RegistryBuilder;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
+import io.papermc.paper.registry.event.RegistryComposeEvent;
 import io.papermc.paper.registry.set.RegistryKeySet;
 import io.papermc.paper.registry.set.RegistrySet;
 import io.papermc.paper.registry.tag.TagKey;
@@ -153,7 +154,7 @@ public interface EnchantmentRegistryEntry {
        /**
         * Configures the set of supported items this enchantment can be applied on. This
         * can be a {@link RegistryKeySet} created via {@link RegistrySet#keySet(io.papermc.paper.registry.RegistryKey, Iterable)} or
-         * a tag obtained via {@link io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)} with
+         * a tag obtained via {@link RegistryComposeEvent#getOrCreateTag(TagKey)} with
         * tag keys found in {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys} such as
         * {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#ENCHANTABLE_ARMOR} and
         * {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#ENCHANTABLE_SWORD}.
@@ -161,7 +162,7 @@ public interface EnchantmentRegistryEntry {
         * @param supportedItems the registry key set representing the supported items.
         * @return this builder instance.
         * @see RegistrySet#keySet(RegistryKey, TypedKey[])
-         * @see io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)
+         * @see RegistryComposeEvent#getOrCreateTag(TagKey)
         */
        @Contract(value = "_ -> this", mutates = "this")
        Builder supportedItems(RegistryKeySet<ItemType> supportedItems);
@@ -170,7 +171,7 @@ public interface EnchantmentRegistryEntry {
         * Configures a set of item types this enchantment can naturally be applied to, when enchanting in an
         * enchantment table.This can be a {@link RegistryKeySet} created via
         * {@link RegistrySet#keySet(io.papermc.paper.registry.RegistryKey, Iterable)} or a tag obtained via
-         * {@link io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)} with
+         * {@link RegistryComposeEvent#getOrCreateTag(TagKey)} with
         * tag keys found in {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys} such as
         * {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#ENCHANTABLE_ARMOR} and
         * {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#ENCHANTABLE_SWORD}.
@@ -182,7 +183,7 @@ public interface EnchantmentRegistryEntry {
         * @param primaryItems the registry key set representing the primary items.
         * @return this builder instance.
         * @see RegistrySet#keySet(RegistryKey, TypedKey[])
-         * @see io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)
+         * @see RegistryComposeEvent#getOrCreateTag(TagKey)
         */
        @Contract(value = "_ -> this", mutates = "this")
        Builder primaryItems(@Nullable RegistryKeySet<ItemType> primaryItems);
@@ -285,7 +286,7 @@ public interface EnchantmentRegistryEntry {
         * @param exclusiveWith a registry set of enchantments exclusive to this one.
         * @return this builder instance.
         * @see RegistrySet#keySet(RegistryKey, TypedKey[])
-         * @see io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)
+         * @see RegistryComposeEvent#getOrCreateTag(TagKey)
         */
        @Contract(value = "_ -> this", mutates = "this")
        Builder exclusiveWith(RegistryKeySet<Enchantment> exclusiveWith);
@@ -18,5 +18,4 @@ public interface InlinedRegistryBuilderProvider {
        return Holder.INSTANCE.orElseThrow();
    }

-    Art createPaintingVariant(Consumer<RegistryBuilderFactory<Art, ? extends PaintingVariantRegistryEntry.Builder>> value);
 }
@@ -0,0 +1,134 @@
+package io.papermc.paper.registry.data;
+
+import io.papermc.paper.registry.RegistryBuilder;
+import io.papermc.paper.registry.RegistryBuilderFactory;
+import io.papermc.paper.registry.TypedKey;
+import io.papermc.paper.registry.holder.RegistryHolder;
+import java.util.function.Consumer;
+import net.kyori.adventure.text.Component;
+import org.bukkit.JukeboxSong;
+import org.bukkit.Sound;
+import org.checkerframework.checker.index.qual.Positive;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Range;
+
+/**
+ * A data-centric version-specific registry entry for the {@link JukeboxSong} type.
+ */
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface JukeboxSongRegistryEntry {
+
+    /**
+     * Gets the sound event for this song.
+     *
+     * @return the sound event
+     */
+    @Contract(pure = true)
+    RegistryHolder<Sound, SoundEventRegistryEntry> soundEvent();
+
+    /**
+     * Gets the description for this song.
+     *
+     * @return the description
+     */
+    @Contract(pure = true)
+    Component description();
+
+    /**
+     * Gets the length in seconds for this song.
+     *
+     * @return the length in seconds
+     */
+    @Contract(pure = true)
+    @Positive float lengthInSeconds();
+
+    /**
+     * Gets the comparator output for this song.
+     *
+     * @return the comparator output
+     */
+    @Contract(pure = true)
+    @Range(from = 0, to = 15) int comparatorOutput();
+
+    /**
+     * A mutable builder for the {@link JukeboxSongRegistryEntry} plugins may change in applicable registry events.
+     * <p>
+     * The following values are required for each builder:
+     * <ul>
+     *     <li>
+     *         {@link #soundEvent(TypedKey)}, {@link #soundEvent(Consumer)} or {@link #soundEvent(RegistryHolder)}
+     *     </li>
+     *     <li>{@link #description(Component)}</li>
+     *     <li>{@link #lengthInSeconds(float)}</li>
+     *     <li>{@link #comparatorOutput(int)}</li>
+     * </ul>
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface Builder extends JukeboxSongRegistryEntry, RegistryBuilder<JukeboxSong> {
+
+        /**
+         * Sets the sound event for this song to a sound event present
+         * in the {@link io.papermc.paper.registry.RegistryKey#SOUND_EVENT} registry.
+         * <p>This will override both {@link #soundEvent(Consumer)} and {@link #soundEvent(RegistryHolder)}</p>
+         *
+         * @param soundEvent the sound event
+         * @return this builder
+         * @see #soundEvent(Consumer)
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder soundEvent(TypedKey<Sound> soundEvent);
+
+        /**
+         * Sets the sound event for this song to a new sound event.
+         * <p>This will override both {@link #soundEvent(TypedKey)} and {@link #soundEvent(RegistryHolder)}</p>
+         *
+         * @param soundEvent the sound event
+         * @return this builder
+         * @see #soundEvent(TypedKey)
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder soundEvent(Consumer<RegistryBuilderFactory<Sound, ? extends SoundEventRegistryEntry.Builder>> soundEvent);
+
+        /**
+         * Sets the sound event for this song.
+         * <p>This will override both {@link #soundEvent(Consumer)} and {@link #soundEvent(TypedKey)}</p>
+         *
+         * @param soundEvent the sound event
+         * @return this builder
+         * @see #soundEvent(TypedKey)
+         * @see #soundEvent(Consumer)
+         */
+        @Contract( value = "_ -> this", mutates = "this")
+        Builder soundEvent(RegistryHolder<Sound, SoundEventRegistryEntry> soundEvent);
+
+        /**
+         * Sets the description for this song.
+         *
+         * @param description the description
+         * @return this builder
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder description(Component description);
+
+        /**
+         * Sets the length in seconds for this song.
+         *
+         * @param lengthInSeconds the length in seconds (positive)
+         * @return this builder
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder lengthInSeconds(@Positive float lengthInSeconds);
+
+        /**
+         * Sets the comparator output for this song.
+         *
+         * @param comparatorOutput the comparator output [0-15]
+         * @return this builder
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder comparatorOutput(@Range(from = 0, to = 15) int comparatorOutput);
+    }
+}
@@ -0,0 +1,63 @@
+package io.papermc.paper.registry.data;
+
+import io.papermc.paper.registry.RegistryBuilder;
+import net.kyori.adventure.key.Key;
+import org.bukkit.Sound;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * A data-centric version-specific registry entry for the {@link Sound} type.
+ */
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface SoundEventRegistryEntry {
+
+    /**
+     * Gets the resource pack location for this sound event.
+     *
+     * @return the location
+     */
+    @Contract(pure = true)
+    Key location();
+
+    /**
+     * Gets the fixed range for this sound event, if present.
+     *
+     * @return the fixed range, or {@code null} if not present
+     */
+    @Contract(pure = true)
+    @Nullable Float fixedRange();
+
+    /**
+     * A mutable builder for the {@link SoundEventRegistryEntry} plugins may change in applicable registry events.
+     * <p>
+     * The following values are required for each builder:
+     * <ul>
+     *     <li>{@link #location(Key)}</li>
+     * </ul>
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface Builder extends SoundEventRegistryEntry, RegistryBuilder<Sound> {
+
+        /**
+         * Sets the resource pack location for this sound event.
+         *
+         * @param location the location
+         * @return this builder
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder location(Key location);
+
+        /**
+         * Sets the fixed range for this sound event.
+         *
+         * @param fixedRange the fixed range
+         * @return this builder
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder fixedRange(@Nullable Float fixedRange);
+    }
+}
@@ -0,0 +1,38 @@
+package io.papermc.paper.registry.event;
+
+import io.papermc.paper.registry.RegistryBuilder;
+import io.papermc.paper.registry.tag.Tag;
+import io.papermc.paper.registry.tag.TagKey;
+import org.bukkit.Keyed;
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * Event object for {@link RegistryEventProvider#compose()}. This
+ * event is fired after a registry is loaded with its normal values.
+ * It provides a way for plugins to add new objects to the registry.
+ *
+ * @param <T> registry entry type
+ * @param <B> registry entry builder type
+ */
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface RegistryComposeEvent<T, B extends RegistryBuilder<T>> extends RegistryEvent<T> {
+
+    /**
+     * Get the writable registry.
+     *
+     * @return a writable registry
+     */
+    WritableRegistry<T, B> registry();
+
+    /**
+     * Gets or creates a tag for the given tag key. This tag
+     * is then required to be filled either from the built-in or
+     * custom datapack.
+     *
+     * @param tagKey the tag key
+     * @return the tag
+     * @param <V> the tag value type
+     */
+    <V extends Keyed> Tag<V> getOrCreateTag(TagKey<V> tagKey); // TODO remove Keyed
+}
Author	SHA1	Message	Date
Owen1212055	daa4fe5fb5	Use hasImpulse vs hurtMarked for setVelocity This will prevent projectiles from using the less accurate path for updating motion when interfaced with the API. However, hasImpulse is the more proper way of marking that the entity needs its velocity updated anyways. This seems to be fairly unused logic in vanilla	2025-06-23 22:39:41 -04:00
Owen1212055	068a1ccda1	Improve AbstractHurtingProjectile syncing I am sure this has been reported before but I cannot search for any bugs due to Mojang's new bug tracker. Projectiles at high velocities very obviously go off track from their original course when sent to the client. This is due to the aggressive downsizing of velocity when sent over the client, and these entities typically have large velocity and still work just fine. We workaround this by sending the velocity for these entities exactly by using a teleport packet with relative flags and zero positional data. This prevents any possible position syncing, but sends an accurate velocity. Then, we properly send the ClientboundProjectilePowerPacket on the first tick the entity is created, as vanilla only updates this when the delta is updated typically.	2025-06-23 22:36:49 -04:00
Owen1212055	10c7914592	Remove move this.update() usages These can be removed as these values can now be updated on the client through synched values, additionally remove the extra bit that triggered redstone on rotation update which is not vanilla behavior.	2025-06-23 22:28:24 -04:00
Owen1212055	c2e1beaec8	Fix MC-297817 This issue causes the item frame to move on the client erroneously, so we force the entity to resend its position the next tick. This utilizes a moonrise patch which has a resync flag that can be triggered for the next tick, so we just utilize this. I stub out the method to ensure that it still compiles without the feature patch.	2025-06-23 22:27:17 -04:00
Riley Park	1814d8b47a	build: publish to fill (#12717 )	2025-06-23 14:13:13 -07:00
Pedro	803baf0ba6	Support hidden entities in Waypoints (#12715 )	2025-06-22 13:42:06 -04:00
Owen	5edcf6ddf6	Cleanup/command dispatching (#12713 )	2025-06-21 21:44:07 -04:00
Strokkur24	186e9e331b	Relocate CommandMap#registerServerAliases() call to after lifecycle events have been run (#12601 )	2025-06-21 14:44:07 -04:00
Jake Potrebic	cceffe3d98	Release ItemType and BlockType (#12708 )	2025-06-21 11:27:46 -07:00
Pedro	6d0821d2b5	[ci skip] Fix docs for Spawner class and cleanup (#12710 )	2025-06-21 17:54:24 +02:00
CraftBukkit/Spigot	e714de6365	Fix excess slot updates By: AJ Ferguson <fergusonjva@gmail.com>	2025-06-21 13:16:55 +02:00
David	c0dda0ea14	Add `isForceDefaultGameMode` method (#12673 )	2025-06-21 13:10:11 +02:00
David	5652882134	Add `isProxyEnabled` method to ServerConfiguration (#12664 )	2025-06-21 13:09:44 +02:00
Kezz	4419afb9c9	fix: Safely handle nanosecond overflow in ClickCallback (#12686 ) If you are creating a click callback using e.g. ChronoUnit.FOREVER.getDuration() this code will throw an ArithmeticException because toNanos overflows. The only way toNanos throws this exception is if the nanos overflow, so we can just safely cap it here as the max value for a long.	2025-06-21 12:58:46 +02:00
Lulu13022002	29fc853271	Allow empty paths in namespaced keys (#12687 )	2025-06-21 01:56:45 -04:00
Strokkur24	d61a51e81e	Add ItemType#getBurnDuration() (#12604 )	2025-06-21 01:54:29 -04:00
Pedro	3750927a06	[ci skip] Fix PermissionManager#clearPermissions() docs bad wording (#12657 )	2025-06-21 01:01:11 -04:00
Owen	71b0c76861	Adds support for vanilla negative explosions (#12705 ) Fixes #10460	2025-06-21 00:54:53 -04:00
Spottedleaf	e4eb69b8a1	Do not allow ticket level decreases to be processed asynchronously Note: This cannot happen on the Fabric/NeoForge versions since async ticket level processing is not allowed, but can happen on Paper. This change is made here so that Paper can remain in sync. Ticket level decreases may be handled asynchronously when the off-thread invokes processTicketUpdates() when the main thread is running ChunkHolderManager#tick(). This is because the ticket update is queued during tick(), but not executed (invoking processTicketUpdates) until after releasing the ticket lock. This creates a small window for an off-thread to invoke processTicketUpdates() and steal the update. When the update is stolen, the full chunk status update (if any) will be eventually queued to execute via the chunk task queue. If the chunk queue is processed during the server tick at any point other than the ChunkHolderManager tick, then any ticket level decrease will violate an important invariant in the Moonrise chunk system: ticket level decreases only occur during ChunkHolderManager tick. This invariant exists to make interfacing with the chunk system easier, especially working with off-thread contexts. This change is specifically made to work towards fixing https://github.com/PaperMC/Folia/issues/363	2025-06-20 21:10:09 -07:00
Spottedleaf	219f86ee06	Implement chunk unload delay config option Fixes https://github.com/PaperMC/Paper/issues/12056	2025-06-20 21:07:21 -07:00
Spottedleaf	c77d5f99f9	Fix MC-297591 Vanilla does not increment ticket timeouts if the chunk is progressing in generation. They made this change in 1.21.6 so that the ender pearl ticket does not expire if the chunk fails to generate before the timeout expires. Rather than blindly adjusting the entire system behavior to fix this small issue, we instead add non-expirable tickets to keep ender pearls ticking.	2025-06-20 20:53:01 -07:00
Owen	839c6a1845	Fix #11169 (#12706 ) This technically fixes the improperly updated patch, and also no longer checks canPickUpLoot.	2025-06-20 19:22:27 -04:00
Owen	6a51c44ec2	Cleanup Primed TNT Fix (#12704 ) This option should probably be removed as its a descendant of an option that allows "old tnt cannon" behavior before ~1.9 But this improves the fix so properly update the velocity/position rather than the questionable way it was doing it before.	2025-06-20 18:22:37 -04:00
Bjarne Koll	a7dd263566	Enable spigot obfuscation support (#12695 )	2025-06-20 22:11:33 +01:00
Owen	4b3f967e49	Improve Fix MC-44654 (#12703 ) This more properly implement spigot's fix for teleportation area effect clouds, now however supporting many other entity types specified in this bug report. Currently, this is not an issue for (all) hanging blocks since they have a fix identical to this inside of setPos. Note however the client does not nicely support moving these entities anyways.	2025-06-20 16:02:24 -04:00
Pedro	74fbcce5ae	Check type of Material in get/set stats (#12607 )	2025-06-20 16:45:40 +02:00
Antti Koponen	4781d28b4b	Re-add Log4j Javadocs (#12693 )	2025-06-18 18:31:59 -07:00
Lulu13022002	f5534cb7c7	[ci skip] Run generators (#12691 )	2025-06-18 20:05:50 +02:00
Jason Penilla	62b7f86dae	Avoid and discourage use of Maven Central as a CDN (#12689 ) * Default LibraryLoader to Google's Maven Central mirror, add MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR, and warn on use of Maven Central with MavenLibraryResolver * Account for both Maven Central URLs * Update Javadoc	2025-06-18 10:47:21 -07:00
Shane Freeder	5613ed6dfb	Provide env environment variable and copy spigots sys prop for overriding default repository	2025-06-18 11:04:48 +01:00
Spottedleaf	8980ead7ea	Directly walk text component after converting from JSON It's important to convert the ItemStack present inside the text component. The ItemStack nests TEXT_COMPONENT (written book pages, custom name, ...) which would otherwise not be walked since we have set a breakpoint at the version and moved the walker to the next version step. This fixes item names for hover events inside written book pages failing to convert to NBT. This issue is also present on DFU.	2025-06-17 19:02:35 -07:00
Spottedleaf	e4d7178a3c	Implement WaypointTransmitter#isChunkVisible The Vanilla chunk tracker on Moonrise always returns false. We need to redirect to Moonrise's chunk loader. https://github.com/Tuinity/Moonrise/commit/aef2b81d6e805f6af7d12d904fb88cdca1f721ca	2025-06-17 17:53:12 -07:00
Spottedleaf	1fcc4162d1	Implement FeatureHooks#isChunkSent for Moonrise chunk system Need to use the player chunk loader, as that will contain the sent chunks.	2025-06-17 17:47:50 -07:00
Spottedleaf	40d5d31c83	Fix recursively converting JSON Text Components See https://github.com/PaperMC/DataConverter/commit/142ec80d2892a1978ccd0a85a8f99e704e4b3a8d	2025-06-17 16:38:01 -07:00
Bjarne Koll	023e6c2953	Ensure waypoints are per world	2025-06-17 23:43:05 +02:00
Shane Freeder	d2b1158e6c	Set correct world access on BSL snapshots	2025-06-17 20:38:39 +01:00
Spottedleaf	8318dcb74b	Update DataConverter to 1.21.6-rc1 https://github.com/PaperMC/DataConverter/commit/b388a85809b1af6a762339d33c6afa6a4bd45d50 The 1.21.6 update will include better handling of legacy hover events.	2025-06-17 10:00:54 -07:00
Spottedleaf	b28d77b3e3	Update Moonrise to 1.21.6 https://github.com/Tuinity/Moonrise/commit/0451444abfd5f0011afe13054347c11a8f57de59	2025-06-17 09:46:59 -07:00
Nassim Jahnke	245b5473a0	Update base to 1.21.6	2025-06-17 17:17:44 +02:00
Nassim Jahnke	457a0a69bf	Bump version string and protocol version to 1.21.6 release Notably, this does not bump the world data version. This will be left for when the actual Vanilla base is updated, just in case. This early bump will likely be the exception for more ironed out update previews in the future.	2025-06-17 15:54:23 +02:00
Bjarne Koll Jake Potrebic Jason Penilla Lulu13022002 Noah van der Aa Owen1212055 Spottedleaf	a24f9b204c	1.21.6 dev Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>	2025-06-17 15:45:25 +02:00