Remove no longer needed MC-210802 fix (#13059 )

Give the right amount of experience after mending (#13047 )
Backport DFU changes from snapshots
2026-11-04 17:00:09 -05:00 · 2025-09-06 14:38:29 -07:00 · 2025-09-06 13:49:56 -07:00 · 2025-09-03 14:59:39 -07:00 · 2025-09-03 14:25:27 -07:00 · 2025-08-29 13:32:10 -07:00
713 changed files with 10143 additions and 33397 deletions
@@ -16,6 +16,12 @@ on:

 jobs:
  build:
+    env:
+      ORG_GRADLE_PROJECT_paperBuildCacheEnabled: true
+      ORG_GRADLE_PROJECT_paperBuildCacheUsername: ${{ secrets.PAPER_BUILD_CACHE_USERNAME }}
+      ORG_GRADLE_PROJECT_paperBuildCachePassword: ${{ secrets.PAPER_BUILD_CACHE_PASSWORD }}
+      ORG_GRADLE_PROJECT_paperBuildCachePush: true
+
    # The goal of the build workflow is split into multiple requirements.
    # 1. Run on pushes to same repo.
    # 2. Run on PR open/reopen/syncs from repos that are not the same (PRs from the same repo are covered by 1)
@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
    <groupId>io.papermc.paper</groupId>
    <artifactId>paper-api</artifactId>
-    <version>1.21.6-R0.1-SNAPSHOT</version>
+    <version>1.21.8-R0.1-SNAPSHOT</version>
    <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ repositories {
 }

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

 java {
@@ -5,10 +5,3 @@
 #     authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 #     datafixerupper com.mojang.datafixers.DataFixerBuilder
 #     datafixerupper com/mojang/datafixers/util/Either.java
-# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
-#     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
-#     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
-# To import minecraft data files, like the default chat type, use `mc_data` as the prefix:
-#     mc_data chat_type/chat.json
-#     mc_data dimension_type/overworld.json
-#
@@ -104,6 +104,9 @@ public net.minecraft.server.level.ServerPlayer wardenSpawnTracker
 public net.minecraft.server.level.ServerPlayer$RespawnPosAngle
 public net.minecraft.server.level.ServerPlayerGameMode level
 public net.minecraft.server.level.TicketType register(Ljava/lang/String;JZLnet/minecraft/server/level/TicketType$TicketUse;)Lnet/minecraft/server/level/TicketType;
+public net.minecraft.server.network.ServerConfigurationPacketListenerImpl clientInformation
+public net.minecraft.server.network.ServerConfigurationPacketListenerImpl currentTask
+public net.minecraft.server.network.ServerConfigurationPacketListenerImpl finishCurrentTask(Lnet/minecraft/server/network/ConfigurationTask$Type;)V
 public net.minecraft.server.network.ServerGamePacketListenerImpl isChatMessageIllegal(Ljava/lang/String;)Z
 public net.minecraft.server.network.ServerLoginPacketListenerImpl authenticatedProfile
 public net.minecraft.server.network.ServerLoginPacketListenerImpl connection
@@ -185,6 +188,7 @@ public net.minecraft.world.entity.Display$TextDisplay getTextOpacity()B
 public net.minecraft.world.entity.Display$TextDisplay setFlags(B)V
 public net.minecraft.world.entity.Display$TextDisplay setText(Lnet/minecraft/network/chat/Component;)V
 public net.minecraft.world.entity.Display$TextDisplay setTextOpacity(B)V
+public net.minecraft.world.entity.Entity DATA_TICKS_FROZEN
 public net.minecraft.world.entity.Entity FLAG_INVISIBLE
 public net.minecraft.world.entity.Entity getEncodeId()Ljava/lang/String;
 public net.minecraft.world.entity.Entity getFireImmuneTicks()I
@@ -251,6 +255,7 @@ public net.minecraft.world.entity.Mob lootTable
 public net.minecraft.world.entity.Mob lootTableSeed
 public net.minecraft.world.entity.OminousItemSpawner setItem(Lnet/minecraft/world/item/ItemStack;)V
 public net.minecraft.world.entity.OminousItemSpawner spawnItemAfterTicks
+public net.minecraft.world.entity.ai.attributes.Attribute sentiment
 public net.minecraft.world.entity.ai.attributes.AttributeSupplier getAttributeInstance(Lnet/minecraft/core/Holder;)Lnet/minecraft/world/entity/ai/attributes/AttributeInstance;
 public net.minecraft.world.entity.ai.control.MoveControl$Operation
 public net.minecraft.world.entity.ai.gossip.GossipContainer gossips
@@ -270,6 +275,7 @@ public net.minecraft.world.entity.animal.Bee setHasStung(Z)V
 public net.minecraft.world.entity.animal.Bee setRolling(Z)V
 public net.minecraft.world.entity.animal.Bee stayOutOfHiveCountdown
 public net.minecraft.world.entity.animal.Bee ticksWithoutNectarSinceExitingHive
+public net.minecraft.world.entity.animal.Bee timeSinceSting
 public net.minecraft.world.entity.animal.Cat isRelaxStateOne()Z
 public net.minecraft.world.entity.animal.Cat setCollarColor(Lnet/minecraft/world/item/DyeColor;)V
 public net.minecraft.world.entity.animal.Cat setRelaxStateOne(Z)V
@@ -506,6 +512,8 @@ public net.minecraft.world.inventory.AbstractContainerMenu quickcraftSlots
 public net.minecraft.world.inventory.AbstractContainerMenu quickcraftStatus
 public net.minecraft.world.inventory.AbstractContainerMenu quickcraftType
 public net.minecraft.world.inventory.AbstractContainerMenu resetQuickCraft()V
+public net.minecraft.world.inventory.AbstractContainerMenu synchronizeSlotToRemote(ILnet/minecraft/world/item/ItemStack;Ljava/util/function/Supplier;)V
+public net.minecraft.world.inventory.AbstractContainerMenu triggerSlotListeners(ILnet/minecraft/world/item/ItemStack;Ljava/util/function/Supplier;)V
 public net.minecraft.world.inventory.AbstractCraftingMenu craftSlots
 public net.minecraft.world.inventory.AbstractCraftingMenu resultSlots
 public net.minecraft.world.inventory.AnvilMenu cost
@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent

 plugins {
-    id("io.papermc.paperweight.core") version "2.0.0-beta.17" apply false
+    id("io.papermc.paperweight.core") version "2.0.0-beta.18" apply false
 }

 subprojects {
@@ -24,19 +24,19 @@ subprojects {
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"

 subprojects {
-    tasks.withType<JavaCompile> {
+    tasks.withType<JavaCompile>().configureEach {
        options.encoding = Charsets.UTF_8.name()
        options.release = 21
        options.isFork = true
        options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
    }
-    tasks.withType<Javadoc> {
+    tasks.withType<Javadoc>().configureEach {
        options.encoding = Charsets.UTF_8.name()
    }
-    tasks.withType<ProcessResources> {
+    tasks.withType<ProcessResources>().configureEach {
        filteringCharset = Charsets.UTF_8.name()
    }
-    tasks.withType<Test> {
+    tasks.withType<Test>().configureEach {
        testLogging {
            showStackTraces = true
            exceptionFormat = TestExceptionFormat.FULL
@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.21.6-R0.1-SNAPSHOT
-mcVersion=1.21.6
+version=1.21.8-R0.1-SNAPSHOT
+mcVersion=1.21.8

 # Set to true while updating Minecraft version
 updatingMinecraft=false
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -11,7 +11,7 @@ java {

 val annotationsVersion = "26.0.2"
 // Keep in sync with paper-server adventure-text-serializer-ansi dep
-val adventureVersion = "4.21.0"
+val adventureVersion = "4.24.0"
 val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
 val slf4jVersion = "2.0.16"
 val log4jVersion = "2.24.1"
@@ -66,8 +66,8 @@ dependencies {
    apiAndDocs("net.kyori:adventure-text-logger-slf4j")

    api("org.apache.maven:maven-resolver-provider:3.9.6") // make API dependency for Paper Plugins
-    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+    implementation("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+    implementation("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")

    // Annotations - Slowly migrate to jspecify
    val annotations = "org.jetbrains:annotations:$annotationsVersion"
@@ -164,7 +164,7 @@ abstract class Services {
 }
 val services = objects.newInstance<Services>()

-tasks.withType<Javadoc> {
+tasks.withType<Javadoc>().configureEach {
    val options = options as StandardJavadocDocletOptions
    options.overview = "src/main/javadoc/overview.html"
    options.use()
@@ -68,7 +68,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
    GoalKey<AbstractHorse> HORSE_RANDOM_STAND = create("horse_random_stand", AbstractHorse.class);

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class AttributeKeys {
    /**
     * {@code minecraft:armor}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class BannerPatternKeys {
    /**
     * {@code minecraft:base}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class BiomeKeys {
    /**
     * {@code minecraft:badlands}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class BlockTypeKeys {
    /**
     * {@code minecraft:acacia_button}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class CatVariantKeys {
    /**
     * {@code minecraft:all_black}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class ChickenVariantKeys {
    /**
     * {@code minecraft:cold}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class CowVariantKeys {
    /**
     * {@code minecraft:cold}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class DamageTypeKeys {
    /**
     * {@code minecraft:arrow}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class DataComponentTypeKeys {
    /**
     * {@code minecraft:attribute_modifiers}
@@ -0,0 +1,61 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.dialog.Dialog;
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#DIALOG}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@NullMarked
+@GeneratedFrom("1.21.8")
+public final class DialogKeys {
+    /**
+     * {@code minecraft:custom_options}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Dialog> CUSTOM_OPTIONS = create(key("custom_options"));
+
+    /**
+     * {@code minecraft:quick_actions}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Dialog> QUICK_ACTIONS = create(key("quick_actions"));
+
+    /**
+     * {@code minecraft:server_links}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Dialog> SERVER_LINKS = create(key("server_links"));
+
+    private DialogKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Dialog} in the registry {@code minecraft:dialog}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Dialog> create(final Key key) {
+        return TypedKey.create(RegistryKey.DIALOG, key);
+    }
+}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class EnchantmentKeys {
    /**
     * {@code minecraft:aqua_affinity}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class FluidKeys {
    /**
     * {@code minecraft:empty}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class FrogVariantKeys {
    /**
     * {@code minecraft:cold}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class GameEventKeys {
    /**
     * {@code minecraft:block_activate}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class InstrumentKeys {
    /**
     * {@code minecraft:admire_goat_horn}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class ItemTypeKeys {
    /**
     * {@code minecraft:acacia_boat}
@@ -5604,6 +5604,13 @@ public final class ItemTypeKeys {
     */
    public static final TypedKey<ItemType> MUSIC_DISC_FAR = create(key("music_disc_far"));

+    /**
+     * {@code minecraft:music_disc_lava_chicken}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> MUSIC_DISC_LAVA_CHICKEN = create(key("music_disc_lava_chicken"));
+
    /**
     * {@code minecraft:music_disc_mall}
     *
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class JukeboxSongKeys {
    /**
     * {@code minecraft:11}
@@ -88,6 +88,13 @@ public final class JukeboxSongKeys {
     */
    public static final TypedKey<JukeboxSong> FAR = create(key("far"));

+    /**
+     * {@code minecraft:lava_chicken}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> LAVA_CHICKEN = create(key("lava_chicken"));
+
    /**
     * {@code minecraft:mall}
     *
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class MapDecorationTypeKeys {
    /**
     * {@code minecraft:banner_black}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class MenuTypeKeys {
    /**
     * {@code minecraft:anvil}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class MobEffectKeys {
    /**
     * {@code minecraft:absorption}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class PaintingVariantKeys {
    /**
     * {@code minecraft:alban}
@@ -123,6 +123,13 @@ public final class PaintingVariantKeys {
     */
    public static final TypedKey<Art> CREEBET = create(key("creebet"));

+    /**
+     * {@code minecraft:dennis}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> DENNIS = create(key("dennis"));
+
    /**
     * {@code minecraft:donkey_kong}
     *
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class PigVariantKeys {
    /**
     * {@code minecraft:cold}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class SoundEventKeys {
    /**
     * {@code minecraft:ambient.basalt_deltas.additions}
@@ -11946,6 +11946,13 @@ public final class SoundEventKeys {
     */
    public static final TypedKey<Sound> MUSIC_DISC_FAR = create(key("music_disc.far"));

+    /**
+     * {@code minecraft:music_disc.lava_chicken}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> MUSIC_DISC_LAVA_CHICKEN = create(key("music_disc.lava_chicken"));
+
    /**
     * {@code minecraft:music_disc.mall}
     *
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class StructureKeys {
    /**
     * {@code minecraft:ancient_city}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class StructureTypeKeys {
    /**
     * {@code minecraft:buried_treasure}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class TrimMaterialKeys {
    /**
     * {@code minecraft:amethyst}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class TrimPatternKeys {
    /**
     * {@code minecraft:bolt}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class VillagerProfessionKeys {
    /**
     * {@code minecraft:armorer}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class VillagerTypeKeys {
    /**
     * {@code minecraft:desert}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class WolfSoundVariantKeys {
    /**
     * {@code minecraft:angry}
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
+@GeneratedFrom("1.21.8")
 public final class WolfVariantKeys {
    /**
     * {@code minecraft:ashen}
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.banner.PatternType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class BannerPatternTagKeys {
    /**
     * {@code #minecraft:no_item_required}
@@ -113,7 +111,6 @@ public final class BannerPatternTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<PatternType> create(final Key key) {
        return TagKey.create(RegistryKey.BANNER_PATTERN, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.Biome;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class BiomeTagKeys {
    /**
     * {@code #minecraft:allows_surface_slime_spawns}
@@ -540,7 +538,6 @@ public final class BiomeTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<Biome> create(final Key key) {
        return TagKey.create(RegistryKey.BIOME, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.BlockType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class BlockTypeTagKeys {
    /**
     * {@code #minecraft:acacia_logs}
@@ -1394,7 +1392,6 @@ public final class BlockTypeTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<BlockType> create(final Key key) {
        return TagKey.create(RegistryKey.BLOCK, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.damage.DamageType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class DamageTypeTagKeys {
    /**
     * {@code #minecraft:always_hurts_ender_dragons}
@@ -267,7 +265,6 @@ public final class DamageTypeTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<DamageType> create(final Key key) {
        return TagKey.create(RegistryKey.DAMAGE_TYPE, key);
    }
@@ -0,0 +1,54 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.dialog.Dialog;
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla tag keys for {@link RegistryKey#DIALOG}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@NullMarked
+@GeneratedFrom("1.21.8")
+public final class DialogTagKeys {
+    /**
+     * {@code #minecraft:pause_screen_additions}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Dialog> PAUSE_SCREEN_ADDITIONS = create(key("pause_screen_additions"));
+
+    /**
+     * {@code #minecraft:quick_actions}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Dialog> QUICK_ACTIONS = create(key("quick_actions"));
+
+    private DialogTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link Dialog} in the registry {@code minecraft:dialog}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    public static TagKey<Dialog> create(final Key key) {
+        return TagKey.create(RegistryKey.DIALOG, key);
+    }
+}
@@ -25,8 +25,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class EnchantmentTagKeys {
    /**
     * {@code #minecraft:curse}
@@ -317,7 +316,6 @@ public final class EnchantmentTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<Enchantment> create(final Key key) {
        return TagKey.create(RegistryKey.ENCHANTMENT, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.EntityType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class EntityTypeTagKeys {
    /**
     * {@code #minecraft:aquatic}
@@ -309,7 +307,6 @@ public final class EntityTypeTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<EntityType> create(final Key key) {
        return TagKey.create(RegistryKey.ENTITY_TYPE, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Fluid;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class FluidTagKeys {
    /**
     * {@code #minecraft:lava}
@@ -50,7 +48,6 @@ public final class FluidTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<Fluid> create(final Key key) {
        return TagKey.create(RegistryKey.FLUID, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.GameEvent;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class GameEventTagKeys {
    /**
     * {@code #minecraft:allay_can_listen}
@@ -71,7 +69,6 @@ public final class GameEventTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<GameEvent> create(final Key key) {
        return TagKey.create(RegistryKey.GAME_EVENT, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.MusicInstrument;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class InstrumentTagKeys {
    /**
     * {@code #minecraft:goat_horns}
@@ -57,7 +55,6 @@ public final class InstrumentTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<MusicInstrument> create(final Key key) {
        return TagKey.create(RegistryKey.INSTRUMENT, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.ItemType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class ItemTypeTagKeys {
    /**
     * {@code #minecraft:acacia_logs}
@@ -1289,7 +1287,6 @@ public final class ItemTypeTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<ItemType> create(final Key key) {
        return TagKey.create(RegistryKey.ITEM, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Art;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class PaintingVariantTagKeys {
    /**
     * {@code #minecraft:placeable}
@@ -43,7 +41,6 @@ public final class PaintingVariantTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<Art> create(final Key key) {
        return TagKey.create(RegistryKey.PAINTING_VARIANT, key);
    }
@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.generator.structure.Structure;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;

 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
        "SpellCheckingInspection"
 })
@NullMarked
-@GeneratedFrom("1.21.6")
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.8")
 public final class StructureTagKeys {
    /**
     * {@code #minecraft:cats_spawn_as_black}
@@ -176,7 +174,6 @@ public final class StructureTagKeys {
     * @param key the tag key's key
     * @return a new tag key
     */
-    @ApiStatus.Experimental
    public static TagKey<Structure> create(final Key key) {
        return TagKey.create(RegistryKey.STRUCTURE, key);
    }
@@ -6,18 +6,17 @@ package com.destroystokyo.paper;

 import com.google.common.collect.Lists;
 import io.papermc.paper.tag.BaseTag;
+import java.util.Collection;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -94,7 +93,8 @@ public class MaterialSetTag extends BaseTag<Material, MaterialSetTag> {
        return isTagged(item.getType());
    }

+    @Override
    public boolean isTagged(@NotNull Material material) {
-        return this.tagged.contains(material);
+        return super.isTagged(material);
    }
 }
@@ -23,6 +23,7 @@

 package com.destroystokyo.paper;

+import java.util.Objects;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Tag;
@@ -38,19 +39,32 @@ import org.bukkit.Tag;
 public class MaterialTags {

    private static NamespacedKey keyFor(String key) {
-        //noinspection deprecation
        return new NamespacedKey("paper", key + "_settag");
    }
-    public static final MaterialSetTag ARROWS = new MaterialSetTag(keyFor("arrows"))
-        .endsWith("ARROW")
-        .ensureSize("ARROWS", 3).lock();
+
+    private static MaterialSetTag replacedBy(Tag<Material> vanillaTag) {
+        return replacedBy(vanillaTag, Objects.requireNonNull(vanillaTag).key().value());
+    }
+
+    @SuppressWarnings("unchecked")
+    private static MaterialSetTag replacedBy(Tag<Material> vanillaTag, String legacyKey) {
+        Objects.requireNonNull(vanillaTag);
+        return new MaterialSetTag(keyFor(legacyKey)).add(vanillaTag).lock();
+    }
+
+    /**
+     * @deprecated in favour of {@link Tag#ITEMS_ARROWS}
+     */
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag ARROWS = replacedBy(Tag.ITEMS_ARROWS);

    /**
     * Covers all colors of beds.
+     *
+     * @deprecated in favour of {@link Tag#BEDS}
     */
-    public static final MaterialSetTag BEDS = new MaterialSetTag(keyFor("beds"))
-        .endsWith("_BED")
-        .ensureSize("BEDS", 16).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag BEDS = replacedBy(Tag.BEDS);

    /**
     * Covers all bucket items.
@@ -61,9 +75,11 @@ public class MaterialTags {

    /**
     * Covers coal and charcoal.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_COALS}
     */
-    public static final MaterialSetTag COALS = new MaterialSetTag(keyFor("coals"))
-        .add(Material.COAL, Material.CHARCOAL).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag COALS = replacedBy(Tag.ITEMS_COALS);

    /**
     * Covers both cobblestone wall variants.
@@ -87,10 +103,11 @@ public class MaterialTags {

    /**
     * Covers all colors of concrete powder.
+     *
+     * @deprecated in favour of {@link Tag#CONCRETE_POWDER}
     */
-    public static final MaterialSetTag CONCRETE_POWDER = new MaterialSetTag(keyFor("concrete_powder"))
-        .endsWith("_CONCRETE_POWDER")
-        .ensureSize("CONCRETE_POWDER", 16).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag CONCRETE_POWDER = replacedBy(Tag.CONCRETE_POWDER);

    /**
     * Covers the two types of cooked fish.
@@ -100,10 +117,11 @@ public class MaterialTags {

    /**
     * Covers all variants of doors.
+     *
+     * @deprecated in favour of {@link Tag#DOORS}
     */
-    public static final MaterialSetTag DOORS = new MaterialSetTag(keyFor("doors"))
-        .endsWith("_DOOR")
-        .ensureSize("DOORS", 21).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag DOORS = replacedBy(Tag.DOORS);

    /**
     * Covers all dyes.
@@ -114,17 +132,19 @@ public class MaterialTags {

    /**
     * Covers all variants of gates.
+     *
+     * @deprecated in favour of {@link Tag#FENCE_GATES}
     */
-    public static final MaterialSetTag FENCE_GATES = new MaterialSetTag(keyFor("fence_gates"))
-        .endsWith("_GATE")
-        .ensureSize("FENCE_GATES", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag FENCE_GATES = replacedBy(Tag.FENCE_GATES);

    /**
     * Covers all variants of fences.
+     *
+     * @deprecated in favour of {@link Tag#FENCES}
     */
-    public static final MaterialSetTag FENCES = new MaterialSetTag(keyFor("fences"))
-        .endsWith("_FENCE")
-        .ensureSize("FENCES", 13).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag FENCES = replacedBy(Tag.FENCES);

    /**
     * Covers all variants of fish buckets.
@@ -133,7 +153,7 @@ public class MaterialTags {
        .add(Material.COD_BUCKET, Material.PUFFERFISH_BUCKET, Material.SALMON_BUCKET, Material.TROPICAL_FISH_BUCKET).lock();

    /**
-     * Covers the non-colored glass and 16 stained glass (not panes).
+     * Covers the non-colored glass and 16 stained glasses (not panes).
     */
    public static final MaterialSetTag GLASS = new MaterialSetTag(keyFor("glass"))
        .endsWith("_GLASS")
@@ -214,10 +234,11 @@ public class MaterialTags {
    /**
     * Covers all ores.
     */
+    @SuppressWarnings("unchecked")
    public static final MaterialSetTag ORES = new MaterialSetTag(keyFor("ores"))
-        .add(Material.ANCIENT_DEBRIS)
-        .endsWith("_ORE")
-        .ensureSize("ORES", 19).lock();
+        .add(Tag.COAL_ORES, Tag.COPPER_ORES, Tag.IRON_ORES, Tag.GOLD_ORES,
+            Tag.LAPIS_ORES, Tag.REDSTONE_ORES, Tag.DIAMOND_ORES, Tag.EMERALD_ORES)
+        .add(Material.ANCIENT_DEBRIS, Material.NETHER_QUARTZ_ORE).lock();

    /**
     * Covers all piston typed items and blocks including the piston head and moving piston.
@@ -235,10 +256,11 @@ public class MaterialTags {

    /**
     * Covers all wooden pressure plates and the weighted pressure plates and the stone pressure plate.
+     *
+     * @deprecated in favour of {@link Tag#PRESSURE_PLATES}
     */
-    public static final MaterialSetTag PRESSURE_PLATES = new MaterialSetTag(keyFor("pressure_plates"))
-        .endsWith("_PRESSURE_PLATE")
-        .ensureSize("PRESSURE_PLATES", 16).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag PRESSURE_PLATES = replacedBy(Tag.PRESSURE_PLATES);

    /**
     * Covers the variants of prismarine blocks.
@@ -298,10 +320,11 @@ public class MaterialTags {

    /**
     * Covers the non-colored and colored shulker boxes.
+     *
+     * @deprecated in favour of {@link Tag#SHULKER_BOXES}
     */
-    public static final MaterialSetTag SHULKER_BOXES = new MaterialSetTag(keyFor("shulker_boxes"))
-        .endsWith("SHULKER_BOX")
-        .ensureSize("SHULKER_BOXES", 17).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag SHULKER_BOXES = replacedBy(Tag.SHULKER_BOXES);

    /**
     * Covers zombie, creeper, skeleton, dragon, and player heads.
@@ -335,43 +358,43 @@ public class MaterialTags {

    /**
     * Covers all variants of trapdoors.
+     *
+     * @deprecated in favour of {@link Tag#TRAPDOORS}
     */
-    public static final MaterialSetTag TRAPDOORS = new MaterialSetTag(keyFor("trapdoors"))
-        .endsWith("_TRAPDOOR")
-        .ensureSize("TRAPDOORS", 21).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag TRAPDOORS = replacedBy(Tag.TRAPDOORS);

    /**
     * Covers all wood variants of doors.
+     *
+     * @deprecated in favour of {@link Tag#WOODEN_DOORS}
     */
-    public static final MaterialSetTag WOODEN_DOORS = new MaterialSetTag(keyFor("wooden_doors"))
-        .endsWith("_DOOR")
-        .not(Material.IRON_DOOR)
-        .notContains("COPPER")
-        .ensureSize("WOODEN_DOORS", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag WOODEN_DOORS = replacedBy(Tag.WOODEN_DOORS);

    /**
     * Covers all wood variants of fences.
+     *
+     * @deprecated in favour of {@link Tag#WOODEN_FENCES}
     */
-    public static final MaterialSetTag WOODEN_FENCES = new MaterialSetTag(keyFor("wooden_fences"))
-        .endsWith("_FENCE")
-        .not(Material.NETHER_BRICK_FENCE)
-        .ensureSize("WOODEN_FENCES", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag WOODEN_FENCES = replacedBy(Tag.WOODEN_FENCES);

    /**
     * Covers all wood variants of trapdoors.
+     *
+     * @deprecated in favour of {@link Tag#WOODEN_TRAPDOORS}
     */
-    public static final MaterialSetTag WOODEN_TRAPDOORS = new MaterialSetTag(keyFor("wooden_trapdoors"))
-        .endsWith("_TRAPDOOR")
-        .not(Material.IRON_TRAPDOOR)
-        .notContains("COPPER")
-        .ensureSize("WOODEN_TRAPDOORS", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag WOODEN_TRAPDOORS = replacedBy(Tag.WOODEN_TRAPDOORS);

    /**
     * Covers the wood variants of gates.
+     *
+     * @deprecated in favour of {@link Tag#FENCE_GATES}
     */
-    public static final MaterialSetTag WOODEN_GATES = new MaterialSetTag(keyFor("wooden_gates"))
-        .endsWith("_GATE")
-        .ensureSize("WOODEN_GATES", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag WOODEN_GATES = replacedBy(Tag.FENCE_GATES, "wooden_gates");

    /**
     * Covers the variants of purpur.
@@ -382,10 +405,11 @@ public class MaterialTags {

    /**
     * Covers the variants of signs.
+     *
+     * @deprecated in favour of {@link Tag#ALL_SIGNS}
     */
-    public static final MaterialSetTag SIGNS = new MaterialSetTag(keyFor("signs"))
-        .endsWith("_SIGN")
-        .ensureSize("SIGNS", 48).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag SIGNS = replacedBy(Tag.ALL_SIGNS, "signs");

    /**
     * Covers the variants of a regular torch.
@@ -424,96 +448,113 @@ public class MaterialTags {

    /**
     * Covers the variants of rails.
+     *
+     * @deprecated in favour of {@link Tag#RAILS}
     */
-    public static final MaterialSetTag RAILS = new MaterialSetTag(keyFor("rails"))
-        .endsWith("RAIL")
-        .ensureSize("RAILS", 4).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag RAILS = replacedBy(Tag.RAILS);

    /**
     * Covers the variants of swords.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_SWORDS}
     */
-    public static final MaterialSetTag SWORDS = new MaterialSetTag(keyFor("swords"))
-        .endsWith("_SWORD")
-        .ensureSize("SWORDS", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag SWORDS = replacedBy(Tag.ITEMS_SWORDS);

    /**
     * Covers the variants of shovels.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_SHOVELS}
     */
-    public static final MaterialSetTag SHOVELS = new MaterialSetTag(keyFor("shovels"))
-        .endsWith("_SHOVEL")
-        .ensureSize("SHOVELS", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag SHOVELS = replacedBy(Tag.ITEMS_SHOVELS);

    /**
     * Covers the variants of pickaxes.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_PICKAXES}
     */
-    public static final MaterialSetTag PICKAXES = new MaterialSetTag(keyFor("pickaxes"))
-        .endsWith("_PICKAXE")
-        .ensureSize("PICKAXES", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag PICKAXES = replacedBy(Tag.ITEMS_PICKAXES);

    /**
     * Covers the variants of axes.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_AXES}
     */
-    public static final MaterialSetTag AXES = new MaterialSetTag(keyFor("axes"))
-        .endsWith("_AXE")
-        .ensureSize("AXES", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag AXES = replacedBy(Tag.ITEMS_AXES);

    /**
     * Covers the variants of hoes.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_HOES}
     */
-    public static final MaterialSetTag HOES = new MaterialSetTag(keyFor("hoes"))
-        .endsWith("_HOE")
-        .ensureSize("HOES", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag HOES = replacedBy(Tag.ITEMS_HOES);

    /**
     * Covers the variants of helmets.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_HEAD_ARMOR}
     */
-    public static final MaterialSetTag HELMETS = new MaterialSetTag(keyFor("helmets"))
-        .endsWith("_HELMET")
-        .ensureSize("HELMETS", 7).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag HELMETS = replacedBy(Tag.ITEMS_HEAD_ARMOR, "helmets");

    /**
     * Covers the variants of items that can be equipped in the helmet slot.
+     *
+     * @deprecated any item can be equippable with the right data component set on it
     */
+    @Deprecated(since = "1.21.8")
+    @SuppressWarnings("unchecked")
    public static final MaterialSetTag HEAD_EQUIPPABLE = new MaterialSetTag(keyFor("head_equippable"))
-        .endsWith("_HELMET")
-        .add(SKULLS)
-        .add(Material.CARVED_PUMPKIN)
-        .ensureSize("HEAD_EQUIPPABLE", 22).lock();
+        .add(Tag.ITEMS_HEAD_ARMOR, Tag.ITEMS_SKULLS)
+        .add(Material.CARVED_PUMPKIN).lock();

    /**
     * Covers the variants of chestplate.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_CHEST_ARMOR}
     */
-    public static final MaterialSetTag CHESTPLATES = new MaterialSetTag(keyFor("chestplates"))
-        .endsWith("_CHESTPLATE")
-        .ensureSize("CHESTPLATES", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag CHESTPLATES = replacedBy(Tag.ITEMS_CHEST_ARMOR, "chestplates");

    /**
     * Covers the variants of items that can be equipped in the chest slot.
+     *
+     * @deprecated any item can be equippable with the right data component set on it
     */
+    @Deprecated(since = "1.21.8")
+    @SuppressWarnings("unchecked")
    public static final MaterialSetTag CHEST_EQUIPPABLE = new MaterialSetTag(keyFor("chest_equippable"))
-        .endsWith("_CHESTPLATE")
-        .add(Material.ELYTRA)
-        .ensureSize("CHEST_EQUIPPABLE", 7).lock();
+        .add(Tag.ITEMS_CHEST_ARMOR)
+        .add(Material.ELYTRA).lock();

    /**
     * Covers the variants of leggings.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_LEG_ARMOR}
     */
-    public static final MaterialSetTag LEGGINGS = new MaterialSetTag(keyFor("leggings"))
-        .endsWith("_LEGGINGS")
-        .ensureSize("LEGGINGS", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag LEGGINGS = replacedBy(Tag.ITEMS_LEG_ARMOR, "leggings");

    /**
     * Covers the variants of boots.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_FOOT_ARMOR}
     */
-    public static final MaterialSetTag BOOTS = new MaterialSetTag(keyFor("boots"))
-        .endsWith("_BOOTS")
-        .ensureSize("BOOTS", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag BOOTS = replacedBy(Tag.ITEMS_FOOT_ARMOR, "boots");

    /**
     * Covers all variants of armor.
     */
-    public static final MaterialSetTag ARMOR = new MaterialSetTag(keyFor("armor")).add(HELMETS, CHESTPLATES, LEGGINGS, BOOTS)
-        .ensureSize("ARMOR", 25).lock();
+    @SuppressWarnings("unchecked")
+    public static final MaterialSetTag ARMOR = new MaterialSetTag(keyFor("armor"))
+        .add(Tag.ITEMS_HEAD_ARMOR, Tag.ITEMS_CHEST_ARMOR, Tag.ITEMS_LEG_ARMOR, Tag.ITEMS_FOOT_ARMOR)
+        .lock();

    /**
     * Covers the variants of bows.
@@ -521,21 +562,27 @@ public class MaterialTags {
    public static final MaterialSetTag BOWS = new MaterialSetTag(keyFor("bows"))
        .add(Material.BOW)
        .add(Material.CROSSBOW)
-        .ensureSize("BOWS", 2).lock();
+        .lock();

    /**
     * Covers the variants of player-throwable projectiles (not requiring a bow or any other "assistance").
     */
+    @SuppressWarnings("unchecked")
    public static final MaterialSetTag THROWABLE_PROJECTILES = new MaterialSetTag(keyFor("throwable_projectiles"))
-        .add(Material.EGG, Material.SNOWBALL, Material.SPLASH_POTION, Material.TRIDENT, Material.ENDER_PEARL, Material.EXPERIENCE_BOTTLE, Material.FIREWORK_ROCKET).lock();
+        .add(Tag.ITEMS_EGGS)
+        .add(Material.SNOWBALL, Material.SPLASH_POTION, Material.LINGERING_POTION,
+            Material.TRIDENT, Material.ENDER_PEARL, Material.EXPERIENCE_BOTTLE, Material.FIREWORK_ROCKET,
+            Material.WIND_CHARGE)
+        .lock();

    /**
-     * Covers materials that can be colored, such as wool, shulker boxes, stained glass etc.
+     * Covers materials that can be colored, such as wool, shulker boxes, stained glasses etc.
     */
    @SuppressWarnings("unchecked")
    public static final MaterialSetTag COLORABLE = new MaterialSetTag(keyFor("colorable"))
-        .add(Tag.WOOL, Tag.CARPETS).add(SHULKER_BOXES, STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES, BEDS).lock();
-    //.ensureSize("COLORABLE", 81).lock(); unit test don't have the vanilla item tags, so counts don't line up for real
+        .add(Tag.WOOL, Tag.WOOL_CARPETS, Tag.SHULKER_BOXES, Tag.BEDS)
+        .add(STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES)
+        .lock();

    /**
     * Covers the variants of coral.
@@ -561,15 +608,11 @@ public class MaterialTags {

    /**
     * Covers all items that can be enchanted from the enchantment table or anvil.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_ENCHANTABLE_VANISHING} and other similar enchantable tags
     */
-    public static final MaterialSetTag ENCHANTABLE = new MaterialSetTag(keyFor("enchantable"))
-        .add(PICKAXES, SWORDS, SHOVELS, AXES, HOES, HELMETS, CHEST_EQUIPPABLE, LEGGINGS, BOOTS, BOWS)
-        .add(Material.TRIDENT, Material.SHIELD, Material.FISHING_ROD, Material.SHEARS,
-            Material.FLINT_AND_STEEL, Material.CARROT_ON_A_STICK, Material.WARPED_FUNGUS_ON_A_STICK,
-            Material.BRUSH, Material.CARVED_PUMPKIN, Material.COMPASS, Material.SKELETON_SKULL,
-            Material.WITHER_SKELETON_SKULL, Material.PLAYER_HEAD, Material.ZOMBIE_HEAD,
-            Material.CREEPER_HEAD, Material.DRAGON_HEAD, Material.PIGLIN_HEAD, Material.MACE)
-        .ensureSize("ENCHANTABLE", 76).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag ENCHANTABLE = replacedBy(Tag.ITEMS_ENCHANTABLE_VANISHING, "enchantable"); // this tag already cover the others

    /**
     * Covers the variants of raw ores.
@@ -9,7 +9,6 @@ import org.bukkit.command.Command;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.server.ServerEvent;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -19,10 +18,8 @@ import org.jetbrains.annotations.NotNull;
 * This is done at Plugin Enable time after commands have been registered, but may also
 * run at a later point in the server lifetime due to plugins, a server reload, etc.</p>
 *
- * <p>This is a draft/experimental API and is subject to change.</p>
 * @deprecated For removal, use the new brigadier api.
 */
-@ApiStatus.Experimental
@Deprecated(since = "1.20.6")
@Warning(reason = "This event has been superseded by the Commands API and will be removed in a future release. Listen to LifecycleEvents.COMMANDS instead.", value = true)
 public class CommandRegisteredEvent<S extends com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource> extends ServerEvent implements Cancellable {
@@ -477,7 +477,7 @@ public class PaperServerListPingEvent extends ServerListPingEvent implements Can
        }

        @Override
-        public org.bukkit.profile.@NotNull PlayerProfile clone() {
+        public @NotNull PlayerProfile clone() {
            throw new UnsupportedOperationException();
        }

@@ -243,4 +243,12 @@ public interface PlayerProfile extends org.bukkit.profile.PlayerProfile {
    default boolean hasTextures() {
        return this.hasProperty("textures");
    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return the cloned player profile.
+     */
+    @Override
+    PlayerProfile clone();
 }
@@ -4,15 +4,12 @@ import java.util.Collection;
 import java.util.Collections;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;

 /**
 * Implementing this interface allows for easily creating "Bukkit-style" {@code String[] args} commands.
 * The implementation handles converting the command to a representation compatible with Brigadier on registration, usually in the form of {@literal /commandlabel <greedy_string>}.
 */
-@ApiStatus.Experimental
-@NullMarked
@FunctionalInterface
 public interface BasicCommand {

@@ -6,7 +6,6 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;

 /**
@@ -21,8 +20,6 @@ import org.jspecify.annotations.Nullable;
 * exist yet, or no specific sender is available. Methods on such a {@link CommandSender}
 * will either have no effect or throw an {@link UnsupportedOperationException}.</p>
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface CommandSourceStack {

@@ -17,7 +17,6 @@ import java.util.Set;
 import java.util.function.Predicate;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;

 /**
@@ -60,8 +59,6 @@ import org.jspecify.annotations.Nullable;
 *
 * @see io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents#COMMANDS
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface Commands extends Registrar {

@@ -1,16 +1,15 @@
 package io.papermc.paper.command.brigadier;

 import com.mojang.brigadier.Message;
+import java.util.Optional;
+import java.util.ServiceLoader;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * A component serializer for converting between {@link Message} and {@link Component}.
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface MessageComponentSerializer extends ComponentSerializer<Component, Component, Message> {

@@ -20,6 +19,9 @@ public interface MessageComponentSerializer extends ComponentSerializer<Componen
     * @return serializer instance
     */
    static MessageComponentSerializer message() {
-        return MessageComponentSerializerHolder.PROVIDER.orElseThrow();
+        final class Holder {
+            static final Optional<MessageComponentSerializer> PROVIDER = ServiceLoader.load(MessageComponentSerializer.class, MessageComponentSerializer.class.getClassLoader()).findFirst();
+        }
+        return Holder.PROVIDER.orElseThrow();
    }
 }
@@ -1,12 +0,0 @@
-package io.papermc.paper.command.brigadier;
-
-import java.util.Optional;
-import java.util.ServiceLoader;
-import org.jetbrains.annotations.ApiStatus;
-
-@ApiStatus.Internal
-final class MessageComponentSerializerHolder {
-
-    static final Optional<MessageComponentSerializer> PROVIDER = ServiceLoader.load(MessageComponentSerializer.class)
-        .findFirst();
-}
@@ -1,10 +1,14 @@
 package io.papermc.paper.command.brigadier.argument;

 import com.mojang.brigadier.arguments.ArgumentType;
+import io.papermc.paper.command.brigadier.argument.predicate.BlockInWorldPredicate;
 import io.papermc.paper.command.brigadier.argument.predicate.ItemStackPredicate;
 import io.papermc.paper.command.brigadier.argument.range.DoubleRangeProvider;
 import io.papermc.paper.command.brigadier.argument.range.IntegerRangeProvider;
+import io.papermc.paper.command.brigadier.argument.resolvers.AngleResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.BlockPositionResolver;
+import io.papermc.paper.command.brigadier.argument.resolvers.ColumnBlockPositionResolver;
+import io.papermc.paper.command.brigadier.argument.resolvers.ColumnFinePositionResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.FinePositionResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.PlayerProfileListResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.RotationResolver;
@@ -13,11 +17,14 @@ import io.papermc.paper.command.brigadier.argument.resolvers.selector.PlayerSele
 import io.papermc.paper.entity.LookAnchor;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
+import java.util.Set;
 import java.util.UUID;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextColor;
+import org.bukkit.Axis;
 import org.bukkit.GameMode;
 import org.bukkit.HeightMap;
 import org.bukkit.NamespacedKey;
@@ -29,7 +36,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.scoreboard.Criteria;
 import org.bukkit.scoreboard.DisplaySlot;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 import static io.papermc.paper.command.brigadier.argument.VanillaArgumentProvider.provider;

@@ -41,8 +47,6 @@ import static io.papermc.paper.command.brigadier.argument.VanillaArgumentProvide
 *
 * <p>{@link CustomArgumentType} is provided for customizing parsing or result types server-side, while sending the vanilla argument type to the client.</p>
 */
-@ApiStatus.Experimental
-@NullMarked
 public final class ArgumentTypes {

    /**
@@ -104,6 +108,26 @@ public final class ArgumentTypes {
        return provider().blockPosition();
    }

+    /**
+     * A column block position argument.
+     * 
+     * @return column block position argument
+     */
+    @ApiStatus.Experimental
+    public static ArgumentType<ColumnBlockPositionResolver> columnBlockPosition() {
+        return provider().columnBlockPosition();
+    }
+
+    /**
+     * A block predicate argument.
+     * 
+     * @return block predicate argument
+     */
+    @ApiStatus.Experimental
+    public static ArgumentType<BlockInWorldPredicate> blockInWorldPredicate() {
+        return provider().blockInWorldPredicate();
+    }
+
    /**
     * A fine position argument.
     *
@@ -124,6 +148,28 @@ public final class ArgumentTypes {
        return provider().finePosition(centerIntegers);
    }

+    /**
+     * A column fine position argument.
+     *
+     * @return column fine position argument
+     * @see #columnFinePosition(boolean) to center whole numbers
+     */
+    @ApiStatus.Experimental
+    public static ArgumentType<ColumnFinePositionResolver> columnFinePosition() {
+        return columnFinePosition(false);
+    }
+
+    /**
+     * A column fine position argument.
+     *
+     * @param centerIntegers if whole numbers should be centered (+0.5)
+     * @return column fine position argument
+     */
+    @ApiStatus.Experimental
+    public static ArgumentType<ColumnFinePositionResolver> columnFinePosition(final boolean centerIntegers) {
+        return provider().columnFinePosition(centerIntegers);
+    }
+
    /**
     * A rotation argument.
     *
@@ -133,6 +179,27 @@ public final class ArgumentTypes {
        return provider().rotation();
    }

+    /**
+     * An angle argument.
+     *
+     * @return angle argument
+     */
+    @ApiStatus.Experimental
+    public static ArgumentType<AngleResolver> angle() {
+        return provider().angle();
+    }
+
+    /**
+     * An argument used to resolve a set of axes.
+     *
+     * @return a set of axes.
+     * @see org.bukkit.Axis
+     */
+    @ApiStatus.Experimental
+    public static ArgumentType<AxisSet> axes() {
+        return provider().axes();
+    }
+
    /**
     * A blockstate argument which will provide rich parsing for specifying
     * the specific block variant and then the block entity NBT if applicable.
@@ -171,6 +238,15 @@ public final class ArgumentTypes {
        return provider().namedColor();
    }

+    /**
+     * A hex color argument.
+     *
+     * @return argument
+     */
+    public static ArgumentType<TextColor> hexColor() {
+        return provider().hexColor();
+    }
+
    /**
     * A component argument.
     *
@@ -0,0 +1,12 @@
+package io.papermc.paper.command.brigadier.argument;
+
+import com.mojang.brigadier.context.CommandContext;
+import org.bukkit.Axis;
+import java.util.Set;
+
+/**
+ * A set of {@link Axis} intended for use in {@link CommandContext#getArgument(String, Class)} instead of a raw {@link Set}.
+ */
+public interface AxisSet extends Set<Axis> {
+
+}
@@ -9,7 +9,6 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * An argument type that wraps around a native-to-vanilla argument type.
@@ -23,8 +22,6 @@ import org.jspecify.annotations.NullMarked;
 * @param <T> custom type
 * @param <N> type with an argument native to vanilla Minecraft (from {@link ArgumentTypes})
 */
-@ApiStatus.Experimental
-@NullMarked
 public interface CustomArgumentType<T, N> extends ArgumentType<T> {

    /**
@@ -107,7 +104,6 @@ public interface CustomArgumentType<T, N> extends ArgumentType<T> {
     * @param <T> custom type
     * @param <N> type with an argument native to vanilla Minecraft (from {@link ArgumentTypes})
     */
-    @ApiStatus.Experimental
    interface Converted<T, N> extends CustomArgumentType<T, N> {

        @ApiStatus.NonExtendable
@@ -3,12 +3,10 @@ package io.papermc.paper.command.brigadier.argument;
 import com.mojang.brigadier.context.CommandContext;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
-import org.jspecify.annotations.NullMarked;

 /**
 * Utilities for extracting registry-related arguments from a {@link CommandContext}.
 */
-@NullMarked
 public final class RegistryArgumentExtractor {

    /**
@@ -6,15 +6,12 @@ import io.papermc.paper.command.brigadier.CommandSourceStack;
 import java.util.concurrent.CompletableFuture;
 import net.kyori.adventure.chat.SignedMessage;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * A resolver for a {@link SignedMessage}
 *
 * @see ArgumentTypes#signedMessage()
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface SignedMessageResolver {

@@ -38,5 +35,4 @@ public interface SignedMessageResolver {
     * @throws CommandSyntaxException syntax exception
     */
    CompletableFuture<SignedMessage> resolveSignedMessage(String argumentName, CommandContext<CommandSourceStack> context) throws CommandSyntaxException;
-
 }
@@ -1,10 +1,14 @@
 package io.papermc.paper.command.brigadier.argument;

 import com.mojang.brigadier.arguments.ArgumentType;
+import io.papermc.paper.command.brigadier.argument.predicate.BlockInWorldPredicate;
 import io.papermc.paper.command.brigadier.argument.predicate.ItemStackPredicate;
 import io.papermc.paper.command.brigadier.argument.range.DoubleRangeProvider;
 import io.papermc.paper.command.brigadier.argument.range.IntegerRangeProvider;
+import io.papermc.paper.command.brigadier.argument.resolvers.AngleResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.BlockPositionResolver;
+import io.papermc.paper.command.brigadier.argument.resolvers.ColumnBlockPositionResolver;
+import io.papermc.paper.command.brigadier.argument.resolvers.ColumnFinePositionResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.FinePositionResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.PlayerProfileListResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.RotationResolver;
@@ -15,11 +19,14 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import java.util.Optional;
 import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.UUID;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextColor;
+import org.bukkit.Axis;
 import org.bukkit.GameMode;
 import org.bukkit.HeightMap;
 import org.bukkit.NamespacedKey;
@@ -31,14 +38,11 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.scoreboard.Criteria;
 import org.bukkit.scoreboard.DisplaySlot;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

@ApiStatus.Internal
-@NullMarked
 interface VanillaArgumentProvider {

-    Optional<VanillaArgumentProvider> PROVIDER = ServiceLoader.load(VanillaArgumentProvider.class)
-        .findFirst();
+    Optional<VanillaArgumentProvider> PROVIDER = ServiceLoader.load(VanillaArgumentProvider.class, VanillaArgumentProvider.class.getClassLoader()).findFirst();

    static VanillaArgumentProvider provider() {
        return PROVIDER.orElseThrow();
@@ -55,19 +59,31 @@ interface VanillaArgumentProvider {
    ArgumentType<PlayerProfileListResolver> playerProfiles();

    ArgumentType<BlockPositionResolver> blockPosition();
+    
+    ArgumentType<ColumnBlockPositionResolver> columnBlockPosition();

    ArgumentType<FinePositionResolver> finePosition(boolean centerIntegers);
+    
+    ArgumentType<ColumnFinePositionResolver> columnFinePosition(boolean centerIntegers);

    ArgumentType<RotationResolver> rotation();
+    
+    ArgumentType<AngleResolver> angle();
+
+    ArgumentType<AxisSet> axes();

    ArgumentType<BlockState> blockState();

+    ArgumentType<BlockInWorldPredicate> blockInWorldPredicate();
+
    ArgumentType<ItemStack> itemStack();

    ArgumentType<ItemStackPredicate> itemStackPredicate();

    ArgumentType<NamedTextColor> namedColor();

+    ArgumentType<TextColor> hexColor();
+
    ArgumentType<Component> component();

    ArgumentType<Style> style();
@@ -0,0 +1,7 @@
+/**
+ * Arguments.
+ */
+@NullMarked
+package io.papermc.paper.command.brigadier.argument;
+
+import org.jspecify.annotations.NullMarked;
@@ -0,0 +1,40 @@
+package io.papermc.paper.command.brigadier.argument.position;
+
+import io.papermc.paper.math.BlockPosition;
+import io.papermc.paper.math.Position;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * A block position, which does not have a y value.
+ */
+@ApiStatus.Experimental
+@NullMarked
+public interface ColumnBlockPosition {
+
+    /**
+     * Gets the X-coordinate of the block position.
+     *
+     * @return the block's X-coordinate
+     */
+    int blockX();
+
+    /**
+     * Gets the Z-coordinate of the block position.
+     *
+     * @return the block's Z-coordinate
+     */
+    int blockZ();
+
+    /**
+     * Converts this column-based position into a full 3D {@link BlockPosition}
+     * by supplying a Y-coordinate.
+     *
+     * @param y the Y-coordinate to include in the new position
+     * @return a {@link BlockPosition} representing the full 3D position
+     */
+    default BlockPosition toPosition(final int y) {
+        return Position.block(this.blockX(), y, this.blockZ());
+    }
+
+}
@@ -0,0 +1,39 @@
+package io.papermc.paper.command.brigadier.argument.position;
+
+import io.papermc.paper.math.FinePosition;
+import io.papermc.paper.math.Position;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * A fine position, which does not hold a y value.
+ */
+@ApiStatus.Experimental
+@NullMarked
+public interface ColumnFinePosition {
+
+    /**
+     * Gets the X-coordinate of this position.
+     *
+     * @return the X-coordinate as a double
+     */
+    double x();
+
+    /**
+     * Gets the Z-coordinate of this position.
+     *
+     * @return the Z-coordinate as a double
+     */
+    double z();
+
+    /**
+     * Converts this column-based position into a full 3D {@link FinePosition}
+     * by supplying a Y-coordinate.
+     *
+     * @param y the Y-coordinate to include in the new position
+     * @return a {@link FinePosition} representing the full 3D position
+     */
+    default FinePosition toPosition(final double y) {
+        return Position.fine(this.x(), y, this.z());
+    }
+}
@@ -0,0 +1,75 @@
+package io.papermc.paper.command.brigadier.argument.predicate;
+
+import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
+import org.bukkit.block.Block;
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * A predicate for a {@link Block}.
+ *
+ * @see ArgumentTypes#blockInWorldPredicate()
+ */
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface BlockInWorldPredicate {
+
+    /**
+     * Checks if the passed block matches the block predicate.
+     * <p>
+     * This method will load the chunk the block is at in a synchronous manner.
+     *
+     * @param block the block instance to check
+     * @return the predicate result.
+     */
+    default Result testBlock(final Block block) {
+        return this.testBlock(block, true);
+    }
+
+    /**
+     * Checks if the passed block matches the block predicate.
+     *
+     * @param block     the block instance to check
+     * @param loadChunk if the chunk the block is located at should be loaded.
+     * @return the predicate result.
+     */
+    Result testBlock(Block block, boolean loadChunk);
+
+    /**
+     * The predicate result is yielded by the {@link BlockInWorldPredicate} when applied to a block.
+     *
+     * @see #testBlock(Block)
+     * @see #testBlock(Block, boolean)
+     */
+    enum Result {
+        /**
+         * The block passed to the predicate matches the predicate.
+         */
+        TRUE,
+
+        /**
+         * The block passed to the predicate does not match the predicate.
+         */
+        FALSE,
+
+        /**
+         * The block passed to the predicate was in an unloaded chunk and the {@code loadChunk} flag was false.
+         */
+        UNLOADED_CHUNK,
+        ;
+
+        /**
+         * Converts the result into an approximated boolean representation.
+         * Specifically, the following mappings are applied:
+         * <ul>
+         * <li>{@link #TRUE} -> {@code true}</li>
+         * <li>{@link #FALSE} -> {@code false}</li>
+         * <li>{@link #UNLOADED_CHUNK} -> {@code false}</li>
+         * </ul>
+         *
+         * @return the boolean representation.
+         */
+        public boolean asBoolean() {
+            return this == TRUE;
+        }
+    }
+}
@@ -9,7 +9,6 @@ import org.jetbrains.annotations.ApiStatus;
 *
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#itemPredicate()
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface ItemStackPredicate extends Predicate<ItemStack> {
 }
@@ -0,0 +1,7 @@
+/**
+ * Predicates for argument types.
+ */
+@NullMarked
+package io.papermc.paper.command.brigadier.argument.predicate;
+
+import org.jspecify.annotations.NullMarked;
@@ -7,8 +7,6 @@ import org.jetbrains.annotations.ApiStatus;
 *
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#doubleRange()
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public non-sealed interface DoubleRangeProvider extends RangeProvider<Double> {
-
 }
@@ -7,8 +7,6 @@ import org.jetbrains.annotations.ApiStatus;
 *
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#integerRange()
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public non-sealed interface IntegerRangeProvider extends RangeProvider<Integer> {
-
 }
@@ -1,8 +1,6 @@
 package io.papermc.paper.command.brigadier.argument.range;

 import com.google.common.collect.Range;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * A provider for a range of numbers
@@ -10,8 +8,6 @@ import org.jspecify.annotations.NullMarked;
 * @param <T>
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes
 */
-@ApiStatus.Experimental
-@NullMarked
 public sealed interface RangeProvider<T extends Comparable<?>> permits DoubleRangeProvider, IntegerRangeProvider {

    /**
@@ -0,0 +1,7 @@
+/**
+ * Range providers.
+ */
+@NullMarked
+package io.papermc.paper.command.brigadier.argument.range;
+
+import org.jspecify.annotations.NullMarked;
@@ -0,0 +1,28 @@
+package io.papermc.paper.command.brigadier.argument.resolvers;
+
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * An {@link ArgumentResolver} capable of resolving
+ * an angle value using a {@link CommandSourceStack}.
+ *
+ * @see ArgumentTypes#angle()
+ */
+@ApiStatus.Experimental
+@NullMarked
+@ApiStatus.NonExtendable
+public interface AngleResolver {
+
+    /**
+     * Resolves the argument with the given
+     * command source stack.
+     *
+     * @param sourceStack source stack
+     * @return the resolved angle in degrees.
+     */
+    float resolve(CommandSourceStack sourceStack) throws CommandSyntaxException;
+}
@@ -3,7 +3,6 @@ package io.papermc.paper.command.brigadier.argument.resolvers;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;

 /**
 * An {@link ArgumentResolver} is capable of resolving
@@ -12,8 +11,6 @@ import org.jspecify.annotations.NullMarked;
 * @param <T> resolved type
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes
 */
-@ApiStatus.Experimental
-@NullMarked
@ApiStatus.NonExtendable
 public interface ArgumentResolver<T> {

@@ -10,7 +10,6 @@ import org.jetbrains.annotations.ApiStatus;
 *
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#blockPosition()
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface BlockPositionResolver extends ArgumentResolver<BlockPosition> {
 }
@@ -0,0 +1,17 @@
+package io.papermc.paper.command.brigadier.argument.resolvers;
+
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
+import io.papermc.paper.command.brigadier.argument.position.ColumnBlockPosition;
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * An {@link ArgumentResolver} that's capable of resolving
+ * a column block position argument value using a {@link CommandSourceStack}.
+ *
+ * @see ArgumentTypes#columnBlockPosition() 
+ */
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface ColumnBlockPositionResolver extends ArgumentResolver<ColumnBlockPosition> {
+}
@@ -0,0 +1,17 @@
+package io.papermc.paper.command.brigadier.argument.resolvers;
+
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.command.brigadier.argument.position.ColumnFinePosition;
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * An {@link ArgumentResolver} that's capable of resolving
+ * a column fine position argument value using a {@link CommandSourceStack}.
+ *
+ * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#columnFinePosition()
+ * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#columnFinePosition(boolean)
+ */
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface ColumnFinePositionResolver extends ArgumentResolver<ColumnFinePosition> {
+}
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.ApiStatus;
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#finePosition()
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#finePosition(boolean)
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface FinePositionResolver extends ArgumentResolver<FinePosition> {
 }
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.ApiStatus;
 *
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#playerProfiles()
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface PlayerProfileListResolver extends ArgumentResolver<Collection<PlayerProfile>> {
 }
@@ -10,7 +10,6 @@ import org.jetbrains.annotations.ApiStatus;
 *
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#rotation()
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface RotationResolver extends ArgumentResolver<Rotation> {
 }
@@ -0,0 +1,7 @@
+/**
+ * Argument resolvers.
+ */
+@NullMarked
+package io.papermc.paper.command.brigadier.argument.resolvers;
+
+import org.jspecify.annotations.NullMarked;
@@ -13,7 +13,6 @@ import org.jetbrains.annotations.ApiStatus;
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#entity()
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#entities()
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface EntitySelectorArgumentResolver extends SelectorArgumentResolver<List<Entity>> {
 }
@@ -13,7 +13,6 @@ import org.jetbrains.annotations.ApiStatus;
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#player()
 * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#players()
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface PlayerSelectorArgumentResolver extends SelectorArgumentResolver<List<Player>> {
 }
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.ApiStatus;
 * @param <T> resolved type
 * @see <a href="https://minecraft.wiki/w/Target_selectors">Target Selectors</a>
 */
-@ApiStatus.Experimental
@ApiStatus.NonExtendable
 public interface SelectorArgumentResolver<T> extends ArgumentResolver<T> {
 }
@@ -0,0 +1,7 @@
+/**
+ * Entity selector argument resolvers.
+ */
+@NullMarked
+package io.papermc.paper.command.brigadier.argument.resolvers.selector;
+
+import org.jspecify.annotations.NullMarked;
@@ -0,0 +1,7 @@
+/**
+ * Brigadier connection API.
+ */
+@NullMarked
+package io.papermc.paper.command.brigadier;
+
+import org.jspecify.annotations.NullMarked;
@@ -0,0 +1,46 @@
+package io.papermc.paper.connection;
+
+import java.util.Map;
+
+import com.destroystokyo.paper.ClientOption;
+import org.bukkit.ServerLinks;
+import org.bukkit.plugin.messaging.PluginMessageRecipient;
+
+/**
+ * Represents a connection that has properties shared between the GAME and CONFIG stage.
+ */
+public interface PlayerCommonConnection extends WritablePlayerCookieConnection, ReadablePlayerCookieConnection, PluginMessageRecipient {
+
+    /**
+     * Sends data to appear in this connection's report logs.
+     * This is useful for debugging server state that may be causing
+     * player disconnects.
+     * <p>
+     * These are formatted as key - value, where keys are limited to a length of 128 characters,
+     * values are limited to 4096, and 32 maximum entries can be sent.
+     *
+     * @param details report details
+     */
+    void sendReportDetails(Map<String, String> details);
+
+    /**
+     * Sends the given server links to this connection.
+     *
+     * @param links links to send
+     */
+    void sendLinks(ServerLinks links);
+
+    /**
+     * Transfers this connection to another server.
+     *
+     * @param host host
+     * @param port port
+     */
+    void transfer(String host, int port);
+
+    /**
+     * @param type client option
+     * @return the client option value of the player
+     */
+    <T> T getClientOption(ClientOption<T> type);
+}
@@ -0,0 +1,37 @@
+package io.papermc.paper.connection;
+
+import com.destroystokyo.paper.ClientOption;
+import com.destroystokyo.paper.profile.PlayerProfile;
+import net.kyori.adventure.audience.Audience;
+
+public interface PlayerConfigurationConnection extends PlayerCommonConnection {
+
+    /**
+     * Returns the audience representing the player in configuration mode.
+     * This can be used to interact with the Adventure API during the configuration stage.
+     * This is guaranteed to be an instance of {@link PlayerConfigurationConnection}
+     *
+     * @return the configuring player audience
+     */
+    Audience getAudience();
+
+    /**
+     * Gets the profile for this connection.
+     *
+     * @return profile
+     */
+    PlayerProfile getProfile();
+
+    /**
+     * Clears the players chat history and their local chat.
+     */
+    void clearChat();
+
+    /**
+     * Completes the configuration for this player, which will cause this player to reenter the game.
+     * <p>
+     * Note, this should be only be called if you are reconfiguring the player.
+     */
+    void completeReconfiguration();
+
+}
@@ -0,0 +1,60 @@
+package io.papermc.paper.connection;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import net.kyori.adventure.text.Component;
+import org.jspecify.annotations.Nullable;
+
+public interface PlayerConnection {
+
+    /**
+     * Disconnects the player connection.
+     * <p>
+     * Note that calling this during connection related events may caused undefined behavior.
+     *
+     * @param component disconnect reason
+     */
+    void disconnect(Component component);
+
+    /**
+     * Gets if this connection originated from a transferred connection.
+     * <p>
+     * Do note that this is sent and stored on the client.
+     *
+     * @return is transferred
+     */
+    boolean isTransferred();
+
+    /**
+     * Gets the raw remote address of the connection. This may be a proxy address
+     * or a Unix domain socket address, depending on how the channel was established.
+     *
+     * @return the remote {@link SocketAddress} of the channel
+     */
+    SocketAddress getAddress();
+
+    /**
+     * Gets the real client address of the player. If the connection is behind a proxy,
+     * this will be the actual player’s IP address extracted from the proxy handshake.
+     *
+     * @return the client {@link InetSocketAddress}
+     */
+    InetSocketAddress getClientAddress();
+
+    /**
+     * Returns the virtual host the client is connected to.
+     *
+     * <p>The virtual host refers to the hostname/port the client used to
+     * connect to the server.</p>
+     *
+     * @return The client's virtual host, or {@code null} if unknown
+     */
+    @Nullable InetSocketAddress getVirtualHost();
+
+    /**
+     * Gets the socket address of this player's proxy
+     *
+     * @return the player's proxy address, null if the server doesn't have Proxy Protocol enabled, or the player didn't connect to an HAProxy instance
+     */
+    @Nullable InetSocketAddress getHAProxyAddress();
+}
@@ -0,0 +1,21 @@
+package io.papermc.paper.connection;
+
+import org.bukkit.entity.Player;
+
+public interface PlayerGameConnection extends PlayerCommonConnection {
+
+    /**
+     * Bumps the player to the configuration stage.
+     * <p>
+     * This will, by default, cause the player to stay until their connection is released by
+     * {@link PlayerConfigurationConnection#completeReconfiguration()}
+     */
+    void reenterConfiguration();
+
+    /**
+     * Gets the player that is associated with this game connection.
+     *
+     * @return player
+     */
+    Player getPlayer();
+}
@@ -0,0 +1,23 @@
+package io.papermc.paper.connection;
+
+import com.destroystokyo.paper.profile.PlayerProfile;
+import org.jspecify.annotations.Nullable;
+
+public interface PlayerLoginConnection extends ReadablePlayerCookieConnection {
+
+    /**
+     * Gets the authenticated profile for this connection.
+     * This may return null depending on what stage this connection is at.
+     *
+     * @return authenticated profile, or null if not present
+     */
+    @Nullable PlayerProfile getAuthenticatedProfile();
+
+    /**
+     * Gets the player profile that this connection is requesting to authenticate as.
+     *
+     * @return the unsafe unauthenticated profile, or null if not sent
+     */
+    @Nullable
+    PlayerProfile getUnsafeProfile();
+}
@@ -0,0 +1,18 @@
+package io.papermc.paper.connection;
+
+import java.util.concurrent.CompletableFuture;
+import org.bukkit.NamespacedKey;
+
+public interface ReadablePlayerCookieConnection extends PlayerConnection {
+
+    /**
+     * Retrieves a cookie from this connection.
+     *
+     * @param key the key identifying the cookie
+     * @return a {@link CompletableFuture} that will be completed when the
+     * Cookie response is received or otherwise available. If the cookie is not
+     * set in the client, the {@link CompletableFuture} will complete with a
+     * null value.
+     */
+    CompletableFuture<byte[]> retrieveCookie(NamespacedKey key);
+}
@@ -0,0 +1,15 @@
+package io.papermc.paper.connection;
+
+import org.bukkit.NamespacedKey;
+
+public interface WritablePlayerCookieConnection extends PlayerConnection {
+
+    /**
+     * Stores a cookie in this player's client.
+     *
+     * @param key the key identifying the cookie
+     * @param value the data to store in the cookie
+     * @throws IllegalStateException if a cookie cannot be stored at this time
+     */
+    void storeCookie(NamespacedKey key, byte[] value);
+}
Author	SHA1	Message	Date
Jason Penilla	29c8822d90	Remove no longer needed MC-210802 fix (#13059 )	2025-09-06 14:38:29 -07:00
Lulu13022002	19156cdd3b	Give the right amount of experience after mending (#13047 )	2025-09-06 13:49:56 -07:00
Spottedleaf	9aaaadffaa	Backport DFU changes from snapshots When converting to components: - Remove enchantments with levels <= 0 - Remove the item name if it is not valid JSON - Remove lore entries that are not valid JSON	2025-09-03 14:59:39 -07:00
Spottedleaf	78aecfebaf	Do not remove plugin chunk tickets on shutdown The chunk system may not be responsive in a shutdown (i.e watchdog timeout). Therefore, we should avoid interacting with the chunk system to increase the odds of a graceful shutdown.	2025-09-03 14:25:27 -07:00
Jason Penilla	65641d1006	Only log name instead of full profile for configuration phase disconnects (#13038 )	2025-08-29 13:32:10 -07:00
Emil	49ca2d2d76	chore: remove experimental status from Damageable#damage (#13021 )	2025-08-29 18:15:29 +01:00
Jason Penilla	63cd4af408	Fix createProfile not always returning a new profile (#13036 )	2025-08-29 09:42:35 -07:00
Jason Penilla	704107c3dd	Resend frozen ticks when cancelling EntityInsideBlockEvent for powder snow fixes #13033 (#13035 )	2025-08-28 18:11:29 -07:00
Jason Penilla	9d1d0ef3f3	Add and call RegionizedServerInitEvent from Folia (#13034 )	2025-08-28 18:09:09 -07:00
Jason Penilla	b6168b7ccc	Get console Brig suggestions from main thread fixes #13027 (#13028 )	2025-08-28 17:25:42 -07:00
Shane Freeder	51706e5ac1	Fixed DyeItem sheep dye hunk	2025-08-25 02:49:26 +01:00
Aeltumn Bjarne Koll Lulu13022002	614e9acfca	Improve APIs around riptide tridents (#12996 ) Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>	2025-08-23 21:12:30 +00:00
MCdragonmaster	52d9a2216c	[ci skip] Fix typo in Display javadoc (#13010 )	2025-08-23 20:59:05 +00:00
Strokkur24 Bjarne Koll Lulu13022002	42b653b197	Expose more argument types (#12665 ) Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>	2025-08-23 21:10:41 +01:00
Strokkur24andLulu13022002	5622c9dd73	Expose attribute sentiment (#12974 ) Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>	2025-08-23 17:15:16 +00:00
Pedro	a9e7674933	Support for showNotification in PlayerRecipeDiscoverEvent (#12992 )	2025-08-23 17:53:46 +01:00
MC_XiaoHeiandJake Potrebic	ea014f7a77	feat: add stuckEntityPoiRetryDelay config (#12949 ) Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>	2025-08-23 09:39:19 -07:00
Warrior	79cf1353b9	Ignore HopperInventorySearchEvent when it has no listeners (#13009 )	2025-08-23 16:25:40 +00:00
Lulu13022002	1922be9074	Update custom tags (#12183 )	2025-08-23 16:53:07 +01:00
Pedro	b0da38c278	Repository details in RuntimeException for MavenLibraryResolver#addRepository (#12939 )	2025-08-22 11:25:08 +01:00
Moulberry	38fe16b5f2	Fix missing reason in disconnectAsync (#13001 )	2025-08-21 22:13:31 +01:00
Moulberry	f866a5fd54	Use LinkedHashMap in ChannelInitializeListenerHolder (#13000 )	2025-08-19 17:53:03 +02:00
Esophose	616a8795ea	Add LootTable to BlockDispenseLootEvent (#12917 )	2025-08-17 15:53:00 +01:00
Strokkur24	47f983f430	Add allow-remote-ender-dragon-respawning setting (#12602 )	2025-08-17 13:49:30 +02:00
Pedro	b200237c7d	Fix clone return for Paper PlayerProfile (#12984 )	2025-08-15 21:56:54 +01:00
David	a22447a555	Added getWorldPath to World API (#12952 )	2025-08-15 21:39:09 +01:00
Warrior	a743e6b1c7	[ci skip] Clarify tab completion ordering in event jd (#12965 )	2025-08-15 21:33:10 +01:00
Warrior	2456ff26ed	[ci skip] Update javadoc for tinted leaves particle (#12962 )	2025-08-15 21:30:16 +01:00
Emil	651fa124c5	Fix cancelled EnderDragonShootFireballEvent playing sound (#12977 )	2025-08-15 21:55:31 +02:00
swim5678	f0c1f856f2	Fix Phantom entity Spawn reason (#12980 )	2025-08-14 17:46:02 +01:00
Jason Penilla	86b716bc5b	Fix BlockFadeEvent not being called when fire extinguishes in rain (#12972 )	2025-08-13 08:29:06 -07:00
Alejandro Nieto	4fe66e5800	Fix lead_break sound playing after cancelling EntityUnleashEvent (#12944 )	2025-08-12 11:01:39 +02:00
Alejandro Nieto	3d1425f086	Fix phantoms failing to target players near non-insomniacs (#12953 )	2025-08-11 22:13:29 +02:00
Pedro	abf6b6c228	Allow replace effects in Consumable Component Builder (#12938 )	2025-08-08 18:17:34 +02:00
Žiga Slatnar Štagar	a664311f0f	Fix AbstractArrow not setting noPhysics flag (#12935 )	2025-08-07 12:55:48 -04:00
Lumine1909andHelvetica Volubi	9694886daa	Fix endermite spawn position The player teleport has been moved up in ThrownEnderpearl to prevent endermite spawning in case of a cancelled teleport. This however placed the player at the teleport destination prior to the endermite spawn logic, creating the entity at the wrong location. The commit stores the location of the player pre teleportation and uses said location for spawning the endermite instead. Co-authored-by: Helvetica Volubi <suisuroru@blue-millennium.fun> Reviewed-in: https://github.com/PaperMC/Paper/pull/12912	2025-08-07 12:36:47 +02:00
Pedro	6d0833ece5	Use target level for waypoint modify command (#12933 )	2025-08-07 12:36:23 +02:00
Emily	846c64f4d1	Allow for sending plugin messages during configuration stage (#12915 )	2025-08-04 15:06:52 +02:00
Bjarne Koll	e9380882f2	Lazy evaluate ender chest inventory holder	2025-08-04 14:45:52 +02:00
Warrior	c60f4436f0	Restore players being the inventory holder of an enderchest (#12923 )	2025-08-04 13:53:50 +02:00
Gero	bf465e0029	Cancel hit for all vanished entities, not only players (#12906 )	2025-08-03 17:17:41 +02:00
Red	ed31825a8d	HIDE_ADDITIONAL_TOOLTIP backwards compat. not hiding disc names (#12900 )	2025-07-30 22:26:35 -04:00
Jason Penilla	0c8efe4d02	[ci skip] Remove redundant adventure version specification This is handled by a version constraint from the BOM dependency in -api	2025-07-30 10:48:12 -07:00
Kezz	ec9c83fa2b	Adventure 4.24.0 (#12908 )	2025-07-30 10:43:51 -07:00
TonytheMacaroni	a4da45e3b2	Fix typo in give command (#12905 )	2025-07-30 08:52:40 +01:00
Jake Potrebic	4f79e9eeca	[ci skip] no need to ever import non-library files ever again (#12765 )	2025-07-29 20:25:43 -04:00
Théo SZANTO	4d44b5fd55	Remove @Experimental annotation from the org.bukkit.damage package (#12898 )	2025-07-29 20:22:46 -04:00
Noah van der Aa	dbc367ba2d	Keep non-container slots synced when in container view (#12881 )	2025-07-26 21:46:30 +00:00
David	a57636189a	Add WorldDifficultyChangeEvent (#12471 )	2025-07-26 23:38:16 +02:00
David Mayr	57c13137e4	Allow to change despawnInPeaceful (#12880 )	2025-07-26 14:13:42 -07:00
Alejandro Nieto	9ccc51df43	Fix legacy pearls forgetting owner on disconnect (#12884 )	2025-07-26 21:53:29 +02:00
Lulu13022002	840dd9e1f8	Fix dialog preconditions (#12895 )	2025-07-26 21:35:19 +02:00
David	6bb9dc6b73	Normalize and trim spaces in Player#performCommand (#12892 )	2025-07-26 21:29:47 +02:00
Bjarne Koll	103187750e	[ci skip] Update mache for codebook 1.0.15 (#12887 )	2025-07-24 01:24:41 +02:00
Nassim Jahnke	a5f2f6140d	Fix offhand item desync on cancelling interact events (#12828 )	2025-07-22 10:42:22 +02:00
Emil Bjarne Koll Jake Potrebic	c8a8c0ef89	feat(plugin): make Plugin extend Namespaced (#12867 ) Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>	2025-07-20 22:01:22 +00:00
ookiegajwaandBjarne Koll	602ea9f0e1	Restore previous PlayerToggleSneakEvent behaviour (#12815 ) Co-authored-by: Bjarne Koll <git@lynxplay.dev>	2025-07-20 23:54:27 +02:00
Jake Potrebic	617e5a46a1	Update to configurate 4.2.0 (#12869 )	2025-07-20 23:05:42 +02:00
Jake Potrebic	a2d37f12fb	Remove invalid team colors nicely (#12874 )	2025-07-20 22:42:24 +02:00
Fisher	782ce950b8	Allow forcing break effects when using breakNaturally (#12734 )	2025-07-18 22:17:38 +02:00
Umbre11as	0dad7f150b	Add Bee#set/getTimeSinceSting() methods (#12792 )	2025-07-18 22:17:06 +02:00
metabrix	f7c59f914c	Fix broken resource pack API when configured in configuration stage (#12866 ) Correctly return the resource pack status from Player#getResourcePackStatus() when the resource pack was send and accepted during the configuration stage.	2025-07-18 20:22:28 +02:00
Spottedleaf	aa4ef06748	Update DataConverter constants for 1.21.8	2025-07-17 16:23:33 -07:00
Junhyung Park	6fb36e34b6	Replace compileOnly with implementation for test visibility (#12841 )	2025-07-17 18:01:04 +02:00
Tamion	1f93f56670	[ci-skip] Improve getPotentialBedLocation deprecation (#12857 )	2025-07-17 17:59:36 +02:00
Spottedleaf	d8cb3f5852	Update DataConverter to 1.21.8-RC1 Add a non-Vanilla converter which removes ENTITY fall_distance entries if they are equal to 0.0. This fixes incorrectly converted data before https://github.com/PaperMC/DataConverter/commit/b6675e47ca068f152c3b648b3869fe63ca12b720	2025-07-17 07:03:10 -07:00
Bjarne Koll	6db4bc01a6	1.21.8 generators	2025-07-17 15:48:06 +02:00
Bjarne Koll	a4feb28898	Update to 1.21.8	2025-07-17 15:47:55 +02:00
David	e792779dd8	Allow AreaEffectCloud#setColor to reset color for null (#12760 )	2025-07-16 22:00:54 +02:00
David	a6e0c08fdf	Add getRotation to Location (#12799 )	2025-07-16 21:52:05 +02:00
Jason Penilla	22d80a3b3b	[ci skip] Update Gradle wrapper and Fill plugin (#12846 )	2025-07-16 11:00:29 -07:00
Spottedleaf	04f95191f1	Fix spawners converted from 1.21.4 not running finalisation logic DataConverter incorrectly placed a fall_distance value with 0.0 if the entity did not have a FallDistance entry. This results in the entity spawn data having 2 entries, which prevents finalisation logic from running. We can fix this by removing the fall_distance entry if it is 0.0. In 1.21.8 there will be a proper fix for this and the patch can be dropped.	2025-07-16 10:33:06 -07:00
Spottedleaf	21fb54246e	Do not write fall_distance tag unless it already existed before It looks like BaseSpawner will not run natural spawn finalization unless the entire data tag only contains the ID. This only fixes converting old data, we need a fix for already converted data.	2025-07-15 17:09:06 -07:00
Shane Freeder	94d60e15b3	Copy thrown pearls list for removal (#12840 )	2025-07-14 23:04:02 +02:00
Clexus	bda84069b4	[ci skip] fix typo in AttributeInstance (#12843 )	2025-07-14 17:57:12 +02:00
Brokkonaut	d9b5003fa1	Dried Ghast events and Happy Ghast spawn reason (#12788 )	2025-07-14 17:56:44 +02:00
Jake Potrebic	533d93c758	Don't consume anchor charge if loc changes (#12835 )	2025-07-12 19:03:48 +00:00
Jake Potrebic	ba7c982605	Add missing Range annotations to dialog types Closes #12825	2025-07-12 09:01:14 -07:00
Lach	25d358cf01	[ci skip] javadoc: Fix grammatical error for getState (#12817 )	2025-07-12 17:44:23 +02:00
David	4000fcc3d7	Fix typo in PluginBootstrap javadocs (#12821 )	2025-07-12 17:43:49 +02:00
caramel	fcfc6c3fe8	Expose HexColor argument type (#12833 )	2025-07-12 17:41:21 +02:00
partydev	76fb5060c1	Add vanilla error message to precondition for DialogBaseImpl (#12831 )	2025-07-12 11:15:48 +02:00
Jason Penilla	1bf6364b97	Update Mache for horse decompile fix	2025-07-11 18:07:23 -07:00
Bjarne Koll	40764534a2	Specify the class loader when loading services (#12829 )	2025-07-11 18:05:07 -07:00
Nassim Jahnke	cb47e01823	Remove more dead code, fix pre-existing desync when cancelling and closing container	2025-07-11 22:24:20 +02:00
Nassim Jahnke	a939945148	Fixup sendAllDataToRemote calls Reduces unnecessary item copies by a lot	2025-07-11 17:43:05 +02:00
Jake Potrebic	b4466ec981	Dialog API (#12671 )	2025-07-06 20:49:43 +02:00
Jason Penilla	f7d5a0a017	[ci skip] Add remote build cache configuration through Gradle properties (#12797 )	2025-07-04 13:12:45 -07:00
Jason Penilla Lulu13022002 Shane Freeder	6e598f8527	Fix incorrect createPath overload arguments, fixes #12043 (#12794 ) Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com>	2025-07-03 12:40:19 -07:00
Owen	0cadaefc09	Fix quitmessage nullability issues (#12783 )	2025-07-01 18:44:17 -04:00
David	2141ca5273	Port plugins command to brigadier (#12632 )	2025-07-01 16:24:38 -04:00
Shane Freeder	108255cbbb	Reduce PlayerLoginEvent alt behavior nag for now (#12782 )	2025-07-01 21:47:37 +02:00
Nassim Jahnke	3fec37a9c1	Move the double call into the dispatch method At some point later,	2025-07-01 21:44:24 +02:00
Nassim Jahnke	c3be00f0ec	Always call plugin message dispatch on PlayerConnection	2025-07-01 21:09:44 +02:00
Owen	6ea679eb07	Allow listening to plugin messages during configuration phase (#12775 )	2025-07-01 15:40:50 +02:00
Newwind	51d28af8fa	[ci skip] Typo in CartographyInventory (#12777 )	2025-06-30 19:17:27 -07:00
PedroandLulu13022002	5661fbbab9	Add registry builder for Instrument (#12682 ) Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>	2025-06-30 21:33:02 +02:00
masmc05	6e021c8272	Fix CraftContainer#getNotchInventoryType detection of player inventory (#12751 )	2025-06-30 19:33:40 +02:00
masmc05	00e79dfb22	Fix wrong size in InventoryType#PLAYER (#12758 )	2025-06-30 19:32:05 +02:00
Jake Potrebic	4cdcf00dca	Only namespaced reload (#12773 )	2025-06-30 10:27:30 -07:00
Pedro	723510f9aa	Make warning of PlayerLoginEvent use unique plugin names (#12772 )	2025-06-30 19:27:20 +02:00
Noah van der Aa	9686f8b34d	Enable obfuscation mappings for 1.21.7 (#12770 )	2025-06-30 17:31:40 +02:00
Spottedleaf	4c47c76ecf	Update DataConverter constants for 1.21.7 https://github.com/PaperMC/DataConverter/commit/04b08a102a3d2473420edceed05420b5ccb3b771	2025-06-30 08:28:39 -07:00
Nassim Jahnke	4045339e4c	1.21.7	2025-06-30 16:16:56 +02:00
Owen1212055	a9f74cbf6e	Readd dropped diff during 1.21.6	2025-06-30 11:49:21 +02:00
Jake Potrebic	371a422567	Remove a bunch more experimental annotations (#12712 )	2025-06-30 11:49:19 +02:00
Owen	7f60924390	Configuration API (#12301 ) This implements a solution that preemptively exits the tick loop if we have already marked the connection as disconnecting. This avoids changing the result of Connection#isConnected in order to avoid other possibly unintentional changes. Fundamentally it should be investigated if closing the connection async is really still needed. This also additionally removes the login disconnecting logic for server stopping, as this was also a possible issue in the config stage but also shouldn't be an issue as connections are closed on server stop very early. Additionally, do not check for isConnecting() on VERIFYING, as that seemed to be an old diff originally trying to resolve this code, however isConnected is not updated at this point so it pretty much was useless.	2025-06-30 11:49:15 +02:00
Bjarne Koll	dda39a0f05	1.21.7-rc2	2025-06-30 11:49:13 +02:00
Nassim Jahnke	4d854e66b8	Disable MC-163962 fix by default It changes restocking behavior pretty drastically compared to Vanilla, keep it as a config option for those that want it Fixes #12761	2025-06-30 11:39:07 +02:00
Jake Potrebic	57c202e015	Allow adventure nbt codec to parse all tags	2025-06-28 13:05:31 -07:00
FlorianMichael	bd79e20c66	[ci skip] PluginManager#getPlugin and PluginManager#isPluginEnabled are case-insensitive (#12723 )	2025-06-26 21:17:20 +02:00
Shane Freeder	35b2c6ece4	Use dropped item for stats info (#12747 ) We are already using the dropped stack to determine the type, we might as well also use it for the count, given that plugins can already mutate the type, might as well let them mess with the amount.	2025-06-26 19:44:29 +01:00
Nassim Jahnke	e382e6872c	Fix 0 yield on explosion events Fixes #12745 That cooked is mildly cooked and should be fixed differently, e.g. a custom loot context param, but reverting the recent change in this line works for now	2025-06-26 16:58:05 +02:00
Nassim Jahnke	4e1a2555be	Update try catch for command handling Fixes #12729	2025-06-25 22:42:38 +02:00
Nassim Jahnke	7ec3174a33	Jump out of experimental phase	2025-06-25 22:14:31 +02:00
Lulu13022002	c9e89f49b0	Expose arrow velocity in EntityShootBowEvent for mobs (#12688 )	2025-06-25 22:11:18 +02:00
Pedro	aa6cd74c03	Remove unnecesary item check for ServerboundPlayerActionPacket RELEASE_USE_ITEM (#12668 )	2025-06-25 22:09:11 +02:00
Owen	ea10fa4a79	Don't mutate the position of Items for MC-4 Fix (#12702 )	2025-06-25 21:51:26 +02:00
Spottedleaf	692e93a91f	Fix MC-299110 When converting entity/poi data (SimpleRegionStorage), we need to insert the new data version so that force upgrading will write the data back with the correct version.	2025-06-25 12:25:45 -07:00
Kezz	bee287927c	Adventure 4.23.0 (#12690 )	2025-06-25 21:16:18 +02:00
Owen	0caf75f839	Fix #12721 (#12725 ) * Fix #12721 Track when knots are created and only fire the event then * Use mutable boolean + check if actually spawned	2025-06-25 14:16:03 -04:00
Owen	d7510efc16	Fix #12722 (#12726 ) Use our getRegistryAccess to null check against world	2025-06-24 15:26:37 -04:00
Spottedleaf	aa6ee44a7a	Re-add global region scheduler tick erroneously removed in last commit	2025-06-24 08:14:29 -07:00
Spottedleaf	7c90c7c497	Optimise EntityScheduler ticking The vast majority of the time, there are no tasks scheduled to the EntityScheduler. We can avoid iterating the entire entity list by tracking which schedulers have any tasks scheduled.	2025-06-24 07:19:33 -07:00
Spottedleaf	2f083acbed	Ensure player entity schedulers are ticked when they are dead If the player dies, then they are removed from the world and as a result are not present in the world entity map. To guarantee that the player entity scheduler is ticked, we can tick all schedulers for players in the server player list, and then skip all players we find in the world entity map. This problem is not present on Folia since Folia must guarantee that the player remains in the world.	2025-06-24 05:12:58 -07:00
Spottedleaf	38c1ddb52a	Add and use FeatureHooks.getAllEntities The ServerLevel#getAllEntities function only returns entities which are accessible. FeatureHooks#getAllEntities will return all entities, whether or not they are accessible. Use the new hook in the EntityCommand, which allows server admins to inspect entities in unloaded chunks. Use the hook as well for ticking the EntityScheduler. This fixes an issue whether unloaded entities did not have their scheduler ticked.	2025-06-24 04:55:58 -07:00
Spottedleaf	46b4b0b8d5	Improve keepalive ping system Send more keepalives, record all transactions within the last minute. We send more keepalives so that the latency calculation is more accurate. Since we send more keepalives, we track all pending keepalives in case multiple end up in flight. Additionally, replace the latency calculation with a true average over the last 5 seconds of keepalive transactions.	2025-06-24 04:23:08 -07:00
Spottedleaf	d0e808f44c	Move player to correct position in vehicle move packet handler We add the change to guarantee that the player position moves in-sync with the vehicle's. As a result, it should be teleporting the player using the new position of the vehicle rather than the old.	2025-06-24 02:09:39 -07:00
wiicart	e454fef40e	Add support for private constructors in plugin main classes (#12652 )	2025-06-23 22:50:59 -04:00