temporarily disable final local var check

also only gets diff for commits that are on HEAD but not remote main

.editorconfig

@@ -1,40 +1,53 @@
-root = true
-
 [*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 4
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=4
 ij_any_block_comment_add_space = false
 ij_any_block_comment_at_first_column = false
 ij_any_line_comment_at_first_column = false
 ij_any_line_comment_add_space = true
+trim_trailing_whitespace = true
 
 [*.tiny]
-indent_style = tab
+indent_style=tab
 
 [*.bat]
-end_of_line = crlf
+end_of_line=crlf
 
 [*.yml]
-indent_size = 2
+indent_size=2
 
-[*.patch]
-trim_trailing_whitespace = false
+[{*.patch,*.md}]
+trim_trailing_whitespace=false
 
 [*.java]
 ij_continuation_indent_size = 4
 ij_java_class_count_to_use_import_on_demand = 999999
 ij_java_insert_inner_class_imports = false
 ij_java_names_count_to_use_import_on_demand = 999999
-ij_java_imports_layout = *, |, $*
+ij_java_imports_layout = *,|,$*
+ij_java_layout_static_imports_separately = true
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 ij_java_method_parameters_new_line_after_left_paren = true
 ij_java_method_parameters_right_paren_on_new_line = true
 ij_java_use_fq_class_names = false
 ij_java_class_names_in_javadoc = 1
+# javadoc
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = true
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_use_throws_not_exception_tag = true
 
 [paper-server/src/minecraft/java/**/*.java]
 ij_java_use_fq_class_names = true
@@ -42,5 +55,5 @@ ij_java_use_fq_class_names = true
 [paper-server/src/minecraft/resources/data/**/*.json]
 indent_size = 2
 
-[paper-{server,api}/src/generated/java/**/*.java]
-ij_java_imports_layout = $*, |, *
+[paper-api-generator/generated/**/*.java]
+ij_java_imports_layout = $*,|,*

.gitignore

@@ -45,7 +45,7 @@ logs/
 !gradle/wrapper/gradle-wrapper.jar
 
 test-plugin.settings.gradle.kts
-paper-generator.settings.gradle.kts
+paper-api-generator.settings.gradle.kts
 
 # Don't track patched vanilla submodules
 paper-server/src/minecraft/

CONTRIBUTING.md

@@ -208,8 +208,7 @@ required.
   with `// Paper end - <COMMIT DESCRIPTION>`.
 - One-line changes should have `// Paper - <COMMIT DESCRIPTION>` at the end of the line.
 
-> [!NOTE]
-> These comments are incredibly important to be able to keep track of changes
+> [!NOTE] These comments are incredibly important to be able to keep track of changes
 > across files and to remember what they are for, even a decade into the future.
 
 Here's an example of how to mark changes by Paper:

build-data/paper.at

@@ -186,7 +186,6 @@ public net.minecraft.world.entity.Entity getEncodeId()Ljava/lang/String;
 public net.minecraft.world.entity.Entity getFireImmuneTicks()I
 public net.minecraft.world.entity.Entity getSharedFlag(I)Z
 public net.minecraft.world.entity.Entity hasVisualFire
-public net.minecraft.world.entity.Entity isAffectedByBlocks()Z
 public net.minecraft.world.entity.Entity isInBubbleColumn()Z
 public net.minecraft.world.entity.Entity isInRain()Z
 public net.minecraft.world.entity.Entity isInvulnerableToBase(Lnet/minecraft/world/damagesource/DamageSource;)Z
@@ -505,7 +504,6 @@ public net.minecraft.world.item.ItemStackLinkedSet TYPE_AND_TAG
 public net.minecraft.world.item.JukeboxSongPlayer song
 public net.minecraft.world.item.MapItem createNewSavedData(Lnet/minecraft/world/level/Level;IIIZZLnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/saveddata/maps/MapId;
 public net.minecraft.world.item.StandingAndWallBlockItem wallBlock
-public net.minecraft.world.item.component.BundleContents$Mutable getMaxAmountToAdd(Lnet/minecraft/world/item/ItemStack;)I
 public net.minecraft.world.item.component.ItemContainerContents MAX_SIZE
 public net.minecraft.world.item.component.ItemContainerContents items
 public net.minecraft.world.item.context.UseOnContext <init>(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/phys/BlockHitResult;)V
@@ -625,16 +623,9 @@ public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exitPorta
 public net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity trialSpawner
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner isOminous
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner stateAccessor
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData cooldownEndsAt
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData currentMobs
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData detectedPlayers
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextMobSpawnsAt
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextSpawnData
-public net.minecraft.world.level.block.entity.vault.VaultBlockEntity serverData
-public net.minecraft.world.level.block.entity.vault.VaultServerData getRewardedPlayers()Ljava/util/Set;
-public net.minecraft.world.level.block.entity.vault.VaultServerData pauseStateUpdatingUntil(J)V
-public net.minecraft.world.level.block.entity.vault.VaultServerData stateUpdatingResumesAt()J
-public net.minecraft.world.level.block.entity.vault.VaultSharedData getConnectedPlayers()Ljava/util/Set;
 public net.minecraft.world.level.block.state.BlockBehaviour getMenuProvider(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/MenuProvider;
 public net.minecraft.world.level.block.state.BlockBehaviour hasCollision
 public net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase destroySpeed
@@ -733,7 +724,6 @@ public-f net.minecraft.world.item.trading.MerchantOffer rewardExp
 public-f net.minecraft.world.item.trading.MerchantOffer xp
 public-f net.minecraft.world.level.LevelSettings hardcore
 public-f net.minecraft.world.level.LevelSettings levelName
-public-f net.minecraft.world.level.block.ChestBlock MENU_PROVIDER_COMBINER
 public-f net.minecraft.world.level.block.entity.BannerBlockEntity baseColor
 public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner normalConfig
 public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner ominousConfig

build.gradle.kts

@@ -12,7 +12,7 @@ import java.nio.file.Path
 import kotlin.random.Random
 
 plugins {
-    id("io.papermc.paperweight.core") version "2.0.0-beta.14" apply false
+    id("io.papermc.paperweight.core") version "2.0.0-SNAPSHOT" apply false
 }
 
 subprojects {

paper-api-generator/build.gradle.kts

@@ -0,0 +1,37 @@
+import io.papermc.paperweight.util.defaultJavaLauncher
+
+plugins {
+    java
+    id("io.papermc.paperweight.source-generator")
+}
+
+paperweight {
+    atFile.set(layout.projectDirectory.file("wideners.at"))
+}
+
+dependencies {
+    minecraftJar(project(":paper-server", "mappedJarOutgoing"))
+    implementation(project(":paper-server", "macheMinecraftLibraries"))
+
+    implementation("com.squareup:javapoet:1.13.0")
+    implementation(project(":paper-api"))
+    implementation("io.github.classgraph:classgraph:4.8.47")
+    implementation("org.jetbrains:annotations:26.0.1")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+}
+
+tasks.register<JavaExec>("generate") {
+    dependsOn(tasks.check)
+    mainClass.set("io.papermc.generator.Main")
+    classpath(sourceSets.main.map { it.runtimeClasspath })
+    args(projectDir.toPath().resolve("generated").toString())
+    javaLauncher = javaToolchains.defaultJavaLauncher(project)
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+
+group = "io.papermc.paper"
+version = "1.0-SNAPSHOT"

paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java

@@ -66,8 +66,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
     GoalKey<AbstractHorse> RANDOM_STAND = create("random_stand", AbstractHorse.class);
 

paper-api-generator/generated/io/papermc/paper/registry/keys/AttributeKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.attribute.Attribute;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class AttributeKeys {
     /**
      * {@code minecraft:armor}

paper-api-generator/generated/io/papermc/paper/registry/keys/BannerPatternKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.banner.PatternType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class BannerPatternKeys {
     /**
      * {@code minecraft:base}
@@ -330,11 +332,12 @@ public final class BannerPatternKeys {
     }
 
     /**
-     * Creates a typed key for {@link PatternType} in the registry {@code minecraft:banner_pattern}.
+     * Creates a key for {@link PatternType} in the registry {@code minecraft:banner_pattern}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<PatternType> create(final Key key) {
         return TypedKey.create(RegistryKey.BANNER_PATTERN, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.Biome;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class BiomeKeys {
     /**
      * {@code minecraft:badlands}
@@ -484,11 +486,12 @@ public final class BiomeKeys {
     }
 
     /**
-     * Creates a typed key for {@link Biome} in the registry {@code minecraft:worldgen/biome}.
+     * Creates a key for {@link Biome} in the registry {@code minecraft:worldgen/biome}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<Biome> create(final Key key) {
         return TypedKey.create(RegistryKey.BIOME, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/BlockTypeKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.BlockType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class BlockTypeKeys {
     /**
      * {@code minecraft:acacia_button}

paper-api-generator/generated/io/papermc/paper/registry/keys/CatVariantKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Cat;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class CatVariantKeys {
     /**
      * {@code minecraft:all_black}

paper-api-generator/generated/io/papermc/paper/registry/keys/DamageTypeKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.damage.DamageType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class DamageTypeKeys {
     /**
      * {@code minecraft:arrow}
@@ -372,11 +374,12 @@ public final class DamageTypeKeys {
     }
 
     /**
-     * Creates a typed key for {@link DamageType} in the registry {@code minecraft:damage_type}.
+     * Creates a key for {@link DamageType} in the registry {@code minecraft:damage_type}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<DamageType> create(final Key key) {
         return TypedKey.create(RegistryKey.DAMAGE_TYPE, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/EnchantmentKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.enchantments.Enchantment;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class EnchantmentKeys {
     /**
      * {@code minecraft:aqua_affinity}
@@ -323,11 +325,12 @@ public final class EnchantmentKeys {
     }
 
     /**
-     * Creates a typed key for {@link Enchantment} in the registry {@code minecraft:enchantment}.
+     * Creates a key for {@link Enchantment} in the registry {@code minecraft:enchantment}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<Enchantment> create(final Key key) {
         return TypedKey.create(RegistryKey.ENCHANTMENT, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/FluidKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Fluid;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class FluidKeys {
     /**
      * {@code minecraft:empty}

paper-api-generator/generated/io/papermc/paper/registry/keys/FrogVariantKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Frog;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class FrogVariantKeys {
     /**
      * {@code minecraft:cold}

paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.GameEvent;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class GameEventKeys {
     /**
      * {@code minecraft:block_activate}
@@ -449,11 +451,12 @@ public final class GameEventKeys {
     }
 
     /**
-     * Creates a typed key for {@link GameEvent} in the registry {@code minecraft:game_event}.
+     * Creates a key for {@link GameEvent} in the registry {@code minecraft:game_event}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<GameEvent> create(final Key key) {
         return TypedKey.create(RegistryKey.GAME_EVENT, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/InstrumentKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.MusicInstrument;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class InstrumentKeys {
     /**
      * {@code minecraft:admire_goat_horn}
@@ -85,11 +87,12 @@ public final class InstrumentKeys {
     }
 
     /**
-     * Creates a typed key for {@link MusicInstrument} in the registry {@code minecraft:instrument}.
+     * Creates a key for {@link MusicInstrument} in the registry {@code minecraft:instrument}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<MusicInstrument> create(final Key key) {
         return TypedKey.create(RegistryKey.INSTRUMENT, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/ItemTypeKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.ItemType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class ItemTypeKeys {
     /**
      * {@code minecraft:acacia_boat}

paper-api-generator/generated/io/papermc/paper/registry/keys/JukeboxSongKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.JukeboxSong;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class JukeboxSongKeys {
     /**
      * {@code minecraft:11}
@@ -162,11 +164,12 @@ public final class JukeboxSongKeys {
     }
 
     /**
-     * Creates a typed key for {@link JukeboxSong} in the registry {@code minecraft:jukebox_song}.
+     * Creates a key for {@link JukeboxSong} in the registry {@code minecraft:jukebox_song}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<JukeboxSong> create(final Key key) {
         return TypedKey.create(RegistryKey.JUKEBOX_SONG, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/MapDecorationTypeKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.map.MapCursor;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class MapDecorationTypeKeys {
     /**
      * {@code minecraft:banner_black}

paper-api-generator/generated/io/papermc/paper/registry/keys/MenuTypeKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.MenuType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class MenuTypeKeys {
     /**
      * {@code minecraft:anvil}

paper-api-generator/generated/io/papermc/paper/registry/keys/MobEffectKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class MobEffectKeys {
     /**
      * {@code minecraft:absorption}

paper-api-generator/generated/io/papermc/paper/registry/keys/PaintingVariantKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Art;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class PaintingVariantKeys {
     /**
      * {@code minecraft:alban}
@@ -379,11 +381,12 @@ public final class PaintingVariantKeys {
     }
 
     /**
-     * Creates a typed key for {@link Art} in the registry {@code minecraft:painting_variant}.
+     * Creates a key for {@link Art} in the registry {@code minecraft:painting_variant}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<Art> create(final Key key) {
         return TypedKey.create(RegistryKey.PAINTING_VARIANT, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/SoundEventKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Sound;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class SoundEventKeys {
     /**
      * {@code minecraft:ambient.basalt_deltas.additions}

paper-api-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.generator.structure.Structure;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class StructureKeys {
     /**
      * {@code minecraft:ancient_city}
@@ -267,11 +269,12 @@ public final class StructureKeys {
     }
 
     /**
-     * Creates a typed key for {@link Structure} in the registry {@code minecraft:worldgen/structure}.
+     * Creates a key for {@link Structure} in the registry {@code minecraft:worldgen/structure}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<Structure> create(final Key key) {
         return TypedKey.create(RegistryKey.STRUCTURE, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.generator.structure.StructureType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class StructureTypeKeys {
     /**
      * {@code minecraft:buried_treasure}

paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.meta.trim.TrimMaterial;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class TrimMaterialKeys {
     /**
      * {@code minecraft:amethyst}
@@ -106,11 +108,12 @@ public final class TrimMaterialKeys {
     }
 
     /**
-     * Creates a typed key for {@link TrimMaterial} in the registry {@code minecraft:trim_material}.
+     * Creates a key for {@link TrimMaterial} in the registry {@code minecraft:trim_material}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<TrimMaterial> create(final Key key) {
         return TypedKey.create(RegistryKey.TRIM_MATERIAL, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.meta.trim.TrimPattern;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class TrimPatternKeys {
     /**
      * {@code minecraft:bolt}
@@ -155,11 +157,12 @@ public final class TrimPatternKeys {
     }
 
     /**
-     * Creates a typed key for {@link TrimPattern} in the registry {@code minecraft:trim_pattern}.
+     * Creates a key for {@link TrimPattern} in the registry {@code minecraft:trim_pattern}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<TrimPattern> create(final Key key) {
         return TypedKey.create(RegistryKey.TRIM_PATTERN, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/VillagerProfessionKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Villager;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class VillagerProfessionKeys {
     /**
      * {@code minecraft:armorer}

paper-api-generator/generated/io/papermc/paper/registry/keys/VillagerTypeKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Villager;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class VillagerTypeKeys {
     /**
      * {@code minecraft:desert}

paper-api-generator/generated/io/papermc/paper/registry/keys/WolfVariantKeys.java

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Wolf;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
 public final class WolfVariantKeys {
     /**
      * {@code minecraft:ashen}
@@ -92,11 +94,12 @@ public final class WolfVariantKeys {
     }
 
     /**
-     * Creates a typed key for {@link Wolf.Variant} in the registry {@code minecraft:wolf_variant}.
+     * Creates a key for {@link Wolf.Variant} in the registry {@code minecraft:wolf_variant}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
+    @ApiStatus.Experimental
     public static TypedKey<Wolf.Variant> create(final Key key) {
         return TypedKey.create(RegistryKey.WOLF_VARIANT, key);
     }

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/BannerPatternTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#BANNER_PATTERN}.
+ * Vanilla keys for {@link RegistryKey#BANNER_PATTERN}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class BannerPatternTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/BiomeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#BIOME}.
+ * Vanilla keys for {@link RegistryKey#BIOME}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class BiomeTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/BlockTypeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#BLOCK}.
+ * Vanilla keys for {@link RegistryKey#BLOCK}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class BlockTypeTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/CatVariantTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#CAT_VARIANT}.
+ * Vanilla keys for {@link RegistryKey#CAT_VARIANT}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class CatVariantTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/DamageTypeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#DAMAGE_TYPE}.
+ * Vanilla keys for {@link RegistryKey#DAMAGE_TYPE}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class DamageTypeTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java

@@ -12,7 +12,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#ENCHANTMENT}.
+ * Vanilla keys for {@link RegistryKey#ENCHANTMENT}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -24,8 +24,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class EnchantmentTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EntityTypeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#ENTITY_TYPE}.
+ * Vanilla keys for {@link RegistryKey#ENTITY_TYPE}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class EntityTypeTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/FluidTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#FLUID}.
+ * Vanilla keys for {@link RegistryKey#FLUID}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class FluidTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/GameEventTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#GAME_EVENT}.
+ * Vanilla keys for {@link RegistryKey#GAME_EVENT}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class GameEventTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/InstrumentTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#INSTRUMENT}.
+ * Vanilla keys for {@link RegistryKey#INSTRUMENT}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class InstrumentTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#ITEM}.
+ * Vanilla keys for {@link RegistryKey#ITEM}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class ItemTypeTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/PaintingVariantTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#PAINTING_VARIANT}.
+ * Vanilla keys for {@link RegistryKey#PAINTING_VARIANT}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class PaintingVariantTagKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/StructureTagKeys.java

@@ -12,7 +12,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla tag keys for {@link RegistryKey#STRUCTURE}.
+ * Vanilla keys for {@link RegistryKey#STRUCTURE}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -24,8 +24,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@NullMarked
 @GeneratedFrom("1.21.4")
+@NullMarked
 @ApiStatus.Experimental
 public final class StructureTagKeys {
     /**

paper-api-generator/src/main/java/io/papermc/generator/Generators.java

@@ -0,0 +1,96 @@
+package io.papermc.generator;
+
+import io.papermc.generator.types.GeneratedKeyType;
+import io.papermc.generator.types.GeneratedTagKeyType;
+import io.papermc.generator.types.SourceGenerator;
+import io.papermc.generator.types.goal.MobGoalGenerator;
+import io.papermc.paper.registry.RegistryKey;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import org.bukkit.Art;
+import org.bukkit.Fluid;
+import org.bukkit.GameEvent;
+import org.bukkit.JukeboxSong;
+import org.bukkit.MusicInstrument;
+import org.bukkit.Sound;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.block.Biome;
+import org.bukkit.block.BlockType;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.damage.DamageType;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Cat;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Frog;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Wolf;
+import org.bukkit.generator.structure.Structure;
+import org.bukkit.generator.structure.StructureType;
+import org.bukkit.inventory.ItemType;
+import org.bukkit.inventory.MenuType;
+import org.bukkit.inventory.meta.trim.TrimMaterial;
+import org.bukkit.inventory.meta.trim.TrimPattern;
+import org.bukkit.map.MapCursor;
+import org.bukkit.potion.PotionEffectType;
+
+public interface Generators {
+
+    SourceGenerator[] API = {
+        // built-ins
+        simpleKey("GameEventKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT, true),
+        simpleKey("StructureTypeKeys", StructureType.class, Registries.STRUCTURE_TYPE, RegistryKey.STRUCTURE_TYPE, false),
+        simpleKey("MobEffectKeys", PotionEffectType.class, Registries.MOB_EFFECT, RegistryKey.MOB_EFFECT, false),
+        simpleKey("BlockTypeKeys", BlockType.class, Registries.BLOCK, RegistryKey.BLOCK, false),
+        simpleKey("ItemTypeKeys", ItemType.class, Registries.ITEM, RegistryKey.ITEM, false),
+        simpleKey("CatVariantKeys", Cat.Type.class, Registries.CAT_VARIANT, RegistryKey.CAT_VARIANT, false),
+        simpleKey("FrogVariantKeys", Frog.Variant.class, Registries.FROG_VARIANT, RegistryKey.FROG_VARIANT, false),
+        simpleKey("VillagerProfessionKeys", Villager.Profession.class, Registries.VILLAGER_PROFESSION, RegistryKey.VILLAGER_PROFESSION, false),
+        simpleKey("VillagerTypeKeys", Villager.Type.class, Registries.VILLAGER_TYPE, RegistryKey.VILLAGER_TYPE, false),
+        simpleKey("MapDecorationTypeKeys", MapCursor.Type.class, Registries.MAP_DECORATION_TYPE, RegistryKey.MAP_DECORATION_TYPE, false),
+        simpleKey("MenuTypeKeys", MenuType.class, Registries.MENU, RegistryKey.MENU, false),
+        simpleKey("AttributeKeys", Attribute.class, Registries.ATTRIBUTE, RegistryKey.ATTRIBUTE, false),
+        simpleKey("FluidKeys", Fluid.class, Registries.FLUID, RegistryKey.FLUID, false),
+        simpleKey("SoundEventKeys", Sound.class, Registries.SOUND_EVENT, RegistryKey.SOUND_EVENT, false),
+
+        // data-driven
+        simpleKey("BiomeKeys", Biome.class, Registries.BIOME, RegistryKey.BIOME, true),
+        simpleKey("StructureKeys", Structure.class, Registries.STRUCTURE, RegistryKey.STRUCTURE, true),
+        simpleKey("TrimMaterialKeys", TrimMaterial.class, Registries.TRIM_MATERIAL, RegistryKey.TRIM_MATERIAL, true),
+        simpleKey("TrimPatternKeys", TrimPattern.class, Registries.TRIM_PATTERN, RegistryKey.TRIM_PATTERN, true),
+        simpleKey("DamageTypeKeys", DamageType.class, Registries.DAMAGE_TYPE, RegistryKey.DAMAGE_TYPE, true),
+        simpleKey("WolfVariantKeys", Wolf.Variant.class, Registries.WOLF_VARIANT, RegistryKey.WOLF_VARIANT, true),
+        simpleKey("EnchantmentKeys", Enchantment.class, Registries.ENCHANTMENT, RegistryKey.ENCHANTMENT, true),
+        simpleKey("JukeboxSongKeys", JukeboxSong.class, Registries.JUKEBOX_SONG, RegistryKey.JUKEBOX_SONG, true),
+        simpleKey("BannerPatternKeys", PatternType.class, Registries.BANNER_PATTERN, RegistryKey.BANNER_PATTERN, true),
+        simpleKey("PaintingVariantKeys", Art.class, Registries.PAINTING_VARIANT, RegistryKey.PAINTING_VARIANT, true),
+        simpleKey("InstrumentKeys", MusicInstrument.class, Registries.INSTRUMENT, RegistryKey.INSTRUMENT, true),
+
+        // tags
+        simpleTagKey("GameEventTagKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT),
+        simpleTagKey("BlockTypeTagKeys", BlockType.class, Registries.BLOCK, RegistryKey.BLOCK),
+        simpleTagKey("ItemTypeTagKeys", ItemType.class, Registries.ITEM, RegistryKey.ITEM),
+        simpleTagKey("CatVariantTagKeys", Cat.Type.class, Registries.CAT_VARIANT, RegistryKey.CAT_VARIANT),
+        simpleTagKey("FluidTagKeys", Fluid.class, Registries.FLUID, RegistryKey.FLUID),
+
+        simpleTagKey("BiomeTagKeys", Biome.class, Registries.BIOME, RegistryKey.BIOME),
+        simpleTagKey("StructureTagKeys", Structure.class, Registries.STRUCTURE, RegistryKey.STRUCTURE),
+        simpleTagKey("DamageTypeTagKeys", DamageType.class, Registries.DAMAGE_TYPE, RegistryKey.DAMAGE_TYPE),
+        simpleTagKey("EnchantmentTagKeys", Enchantment.class, Registries.ENCHANTMENT, RegistryKey.ENCHANTMENT),
+        simpleTagKey("BannerPatternTagKeys", PatternType.class, Registries.BANNER_PATTERN, RegistryKey.BANNER_PATTERN),
+        simpleTagKey("PaintingVariantTagKeys", Art.class, Registries.PAINTING_VARIANT, RegistryKey.PAINTING_VARIANT),
+        simpleTagKey("InstrumentTagKeys", MusicInstrument.class, Registries.INSTRUMENT, RegistryKey.INSTRUMENT),
+
+        // api only
+        simpleTagKey("EntityTypeTagKeys", EntityType.class, Registries.ENTITY_TYPE, RegistryKey.ENTITY_TYPE),
+        new MobGoalGenerator("VanillaGoal", "com.destroystokyo.paper.entity.ai")
+    };
+
+    private static <T, A> SourceGenerator simpleKey(final String className, final Class<A> apiType, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey, final boolean publicCreateKeyMethod) {
+        return new GeneratedKeyType<>(className, apiType, "io.papermc.paper.registry.keys", registryKey, apiRegistryKey, publicCreateKeyMethod);
+    }
+
+    private static <T, A> SourceGenerator simpleTagKey(final String className, final Class<A> apiType, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey) {
+        return new GeneratedTagKeyType<>(className, apiType, "io.papermc.paper.registry.keys.tags", registryKey, apiRegistryKey, true);
+    }
+}

paper-api-generator/src/main/java/io/papermc/generator/Main.java

@@ -0,0 +1,93 @@
+package io.papermc.generator;
+
+import com.google.common.util.concurrent.MoreExecutors;
+import com.mojang.logging.LogUtils;
+import io.papermc.generator.types.SourceGenerator;
+import io.papermc.generator.utils.TagCollector;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.SharedConstants;
+import net.minecraft.commands.Commands;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.LayeredRegistryAccess;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.resources.RegistryDataLoader;
+import net.minecraft.server.Bootstrap;
+import net.minecraft.server.RegistryLayer;
+import net.minecraft.server.ReloadableServerResources;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.server.packs.repository.ServerPacksSource;
+import net.minecraft.server.packs.resources.MultiPackResourceManager;
+import net.minecraft.tags.TagKey;
+import net.minecraft.tags.TagLoader;
+import net.minecraft.world.flag.FeatureFlags;
+import org.apache.commons.io.file.PathUtils;
+import org.slf4j.Logger;
+
+public final class Main {
+
+    private static final Logger LOGGER = LogUtils.getLogger();
+    public static final RegistryAccess.Frozen REGISTRY_ACCESS;
+    public static final Map<TagKey<?>, String> EXPERIMENTAL_TAGS;
+
+    static {
+        SharedConstants.tryDetectVersion();
+        Bootstrap.bootStrap();
+        Bootstrap.validate();
+
+        final PackRepository resourceRepository = ServerPacksSource.createVanillaTrustedRepository();
+        resourceRepository.reload();
+        final MultiPackResourceManager resourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, resourceRepository.getAvailablePacks().stream().map(Pack::open).toList());
+        LayeredRegistryAccess<RegistryLayer> layers = RegistryLayer.createRegistryAccess();
+        final List<Registry.PendingTags<?>> pendingTags = TagLoader.loadTagsForExistingRegistries(resourceManager, layers.getLayer(RegistryLayer.STATIC));
+        final List<HolderLookup.RegistryLookup<?>> worldGenLayer = TagLoader.buildUpdatedLookups(layers.getAccessForLoading(RegistryLayer.WORLDGEN), pendingTags);
+        final RegistryAccess.Frozen frozenWorldgenRegistries = RegistryDataLoader.load(resourceManager, worldGenLayer, RegistryDataLoader.WORLDGEN_REGISTRIES);
+        layers = layers.replaceFrom(RegistryLayer.WORLDGEN, frozenWorldgenRegistries);
+        REGISTRY_ACCESS = layers.compositeAccess().freeze();
+        final ReloadableServerResources reloadableServerResources = ReloadableServerResources.loadResources(
+            resourceManager,
+            layers,
+            pendingTags,
+            FeatureFlags.VANILLA_SET,
+            Commands.CommandSelection.DEDICATED,
+            0,
+            MoreExecutors.directExecutor(),
+            MoreExecutors.directExecutor()
+        ).join();
+        reloadableServerResources.updateStaticRegistryTags();
+        EXPERIMENTAL_TAGS = TagCollector.grabExperimental(resourceManager);
+    }
+
+    private Main() {
+    }
+
+    public static void main(final String[] args) {
+        LOGGER.info("Running API generators...");
+        generate(Paths.get(args[0]), Generators.API);
+        // LOGGER.info("Running Server generators...");
+        // generate(Paths.get(args[1]), Generators.SERVER);
+    }
+
+    private static void generate(Path output, SourceGenerator[] generators) {
+        try {
+            if (Files.exists(output)) {
+                PathUtils.deleteDirectory(output);
+            }
+            Files.createDirectories(output);
+
+            for (final SourceGenerator generator : generators) {
+                generator.writeToFile(output);
+            }
+
+            LOGGER.info("Files written to {}", output.toAbsolutePath());
+        } catch (final Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+}

paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java

@@ -0,0 +1,207 @@
+package io.papermc.generator.types;
+
+import com.google.common.collect.Sets;
+import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+import io.papermc.generator.Main;
+import io.papermc.generator.utils.Annotations;
+import io.papermc.generator.utils.CollectingContext;
+import io.papermc.generator.utils.Formatting;
+import io.papermc.generator.utils.Javadocs;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.lang.model.SourceVersion;
+import net.kyori.adventure.key.Key;
+import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistrySetBuilder;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.data.registries.VanillaRegistries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.flag.FeatureElement;
+import net.minecraft.world.flag.FeatureFlags;
+import org.bukkit.MinecraftExperimental;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.framework.qual.DefaultQualifier;
+
+import static com.squareup.javapoet.TypeSpec.classBuilder;
+import static io.papermc.generator.utils.Annotations.EXPERIMENTAL_API_ANNOTATION;
+import static io.papermc.generator.utils.Annotations.experimentalAnnotations;
+import static java.util.Objects.requireNonNull;
+import static javax.lang.model.element.Modifier.FINAL;
+import static javax.lang.model.element.Modifier.PRIVATE;
+import static javax.lang.model.element.Modifier.PUBLIC;
+import static javax.lang.model.element.Modifier.STATIC;
+
+@DefaultQualifier(NonNull.class)
+public class GeneratedKeyType<T, A> extends SimpleGenerator {
+
+    private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> VANILLA_REGISTRY_ENTRIES = VanillaRegistries.BUILDER.entries.stream()
+            .collect(Collectors.toMap(RegistrySetBuilder.RegistryStub::key, RegistrySetBuilder.RegistryStub::bootstrap));
+
+    private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> EXPERIMENTAL_REGISTRY_ENTRIES = Map.of(); // Update for Experimental API
+    private static final Map<RegistryKey<?>, String> REGISTRY_KEY_FIELD_NAMES;
+    static {
+        final Map<RegistryKey<?>, String> map = new HashMap<>();
+        try {
+            for (final Field field : RegistryKey.class.getFields()) {
+                if (!Modifier.isStatic(field.getModifiers()) || !Modifier.isFinal(field.getModifiers()) || field.getType() != RegistryKey.class) {
+                    continue;
+                }
+                map.put((RegistryKey<?>) field.get(null), field.getName());
+            }
+            REGISTRY_KEY_FIELD_NAMES = Map.copyOf(map);
+        } catch (final ReflectiveOperationException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private static final String CREATE_JAVADOC = """
+        Creates a key for {@link $T} in the registry {@code $L}.
+        
+        @param key the value's key in the registry
+        @return a new typed key
+        """;
+
+    private final Class<A> apiType;
+    private final ResourceKey<? extends Registry<T>> registryKey;
+    private final RegistryKey<A> apiRegistryKey;
+    private final boolean publicCreateKeyMethod;
+
+    public GeneratedKeyType(final String keysClassName, final Class<A> apiType, final String pkg, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey, final boolean publicCreateKeyMethod) {
+        super(keysClassName, pkg);
+        this.apiType = apiType;
+        this.registryKey = registryKey;
+        this.apiRegistryKey = apiRegistryKey;
+        this.publicCreateKeyMethod = publicCreateKeyMethod;
+    }
+
+    private MethodSpec.Builder createMethod(final TypeName returnType) {
+        final TypeName keyType = TypeName.get(Key.class);
+
+        final ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
+        final MethodSpec.Builder create = MethodSpec.methodBuilder("create")
+            .addModifiers(this.publicCreateKeyMethod ? PUBLIC : PRIVATE, STATIC)
+            .addParameter(keyParam)
+            .addCode("return $T.create($T.$L, $N);", TypedKey.class, RegistryKey.class, requireNonNull(REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey), "Missing field for " + this.apiRegistryKey), keyParam)
+            .returns(returnType);
+        if (this.publicCreateKeyMethod) {
+            create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental
+            create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.location().toString());
+        }
+        return create;
+    }
+
+    private TypeSpec.Builder keyHolderType() {
+        return classBuilder(this.className)
+            .addModifiers(PUBLIC, FINAL)
+            .addJavadoc(Javadocs.getVersionDependentClassHeader("{@link $T#$L}"), RegistryKey.class, REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey))
+            .addAnnotations(Annotations.CLASS_HEADER)
+            .addMethod(MethodSpec.constructorBuilder()
+                .addModifiers(PRIVATE)
+                .build()
+            );
+    }
+
+    @Deprecated
+    private static final Map<String, String> JUKEBOX_SONG_NAMES = Map.of(
+        "5", "FIVE",
+        "11", "ELEVEN",
+        "13", "THIRTEEN"
+    );
+
+    @Override
+    protected TypeSpec getTypeSpec() {
+        final TypeName typedKey = ParameterizedTypeName.get(TypedKey.class, this.apiType);
+
+        final TypeSpec.Builder typeBuilder = this.keyHolderType();
+        final MethodSpec.Builder createMethod = this.createMethod(typedKey);
+
+        final Registry<T> registry = Main.REGISTRY_ACCESS.lookupOrThrow(this.registryKey);
+        final Set<ResourceKey<T>> experimental = this.collectExperimentalKeys(registry);
+
+        boolean allExperimental = true;
+        for (final Holder.Reference<T> reference : registry.listElements().sorted(Formatting.alphabeticKeyOrder(reference -> reference.key().location().getPath())).toList()) {
+            final ResourceKey<T> key = reference.key();
+            final String keyPath = key.location().getPath();
+            String fieldName = Formatting.formatKeyAsField(keyPath);
+            if (!SourceVersion.isIdentifier(fieldName) && this.registryKey.equals(Registries.JUKEBOX_SONG) && JUKEBOX_SONG_NAMES.containsKey(fieldName)) {
+                fieldName = JUKEBOX_SONG_NAMES.get(fieldName);
+            }
+
+            final FieldSpec.Builder fieldBuilder = FieldSpec.builder(typedKey, fieldName, PUBLIC, STATIC, FINAL)
+                .initializer("$N(key($S))", createMethod.build(), keyPath)
+                .addJavadoc(Javadocs.getVersionDependentField("{@code $L}"), key.location().toString());
+            if (experimental.contains(key)) {
+                fieldBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
+            } else {
+                allExperimental = false;
+            }
+            typeBuilder.addField(fieldBuilder.build());
+        }
+        if (allExperimental) {
+            typeBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
+            createMethod.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
+        } else {
+            typeBuilder.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO experimental API
+        }
+        return typeBuilder.addMethod(createMethod.build()).build();
+    }
+
+    // todo at some point this should be per feature data pack not all merged
+    private Set<ResourceKey<T>> collectExperimentalKeys(final Registry<T> registry) {
+        if (FeatureElement.FILTERED_REGISTRIES.contains(registry.key())) {
+            return this.collectExperimentalKeysBuiltIn(registry);
+        } else {
+            return this.collectExperimentalKeysDataDriven(registry);
+        }
+    }
+
+    private Set<ResourceKey<T>> collectExperimentalKeysBuiltIn(final Registry<T> registry) {
+        final HolderLookup.RegistryLookup<T> filteredLookup = registry.filterElements(v -> {
+            return v instanceof final FeatureElement featureElement && FeatureFlags.isExperimental(featureElement.requiredFeatures()); // Update for Experimental API
+        });
+        return filteredLookup.listElementIds().collect(Collectors.toUnmodifiableSet());
+    }
+
+    @SuppressWarnings("unchecked")
+    private Set<ResourceKey<T>> collectExperimentalKeysDataDriven(final Registry<T> registry) {
+        final RegistrySetBuilder.@Nullable RegistryBootstrap<T> experimentalBootstrap = (RegistrySetBuilder.RegistryBootstrap<T>) EXPERIMENTAL_REGISTRY_ENTRIES.get(this.registryKey);
+        if (experimentalBootstrap == null) {
+            return Collections.emptySet();
+        }
+        final Set<ResourceKey<T>> experimental = Collections.newSetFromMap(new IdentityHashMap<>());
+        final CollectingContext<T> experimentalCollector = new CollectingContext<>(experimental, registry);
+        experimentalBootstrap.run(experimentalCollector);
+
+        final RegistrySetBuilder.@Nullable RegistryBootstrap<T> vanillaBootstrap = (RegistrySetBuilder.RegistryBootstrap<T>) VANILLA_REGISTRY_ENTRIES.get(this.registryKey);
+        if (vanillaBootstrap != null) {
+            final Set<ResourceKey<T>> vanilla = Collections.newSetFromMap(new IdentityHashMap<>());
+            final CollectingContext<T> vanillaCollector = new CollectingContext<>(vanilla, registry);
+            vanillaBootstrap.run(vanillaCollector);
+            return Sets.difference(experimental, vanilla);
+        }
+        return experimental;
+    }
+
+    @Override
+    protected JavaFile.Builder file(final JavaFile.Builder builder) {
+        return builder
+            .addStaticImport(Key.class, "key");
+    }
+}

paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedTagKeyType.java

@@ -0,0 +1,138 @@
+package io.papermc.generator.types;
+
+import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+import io.papermc.generator.Main;
+import io.papermc.generator.utils.Annotations;
+import io.papermc.generator.utils.Formatting;
+import io.papermc.generator.utils.Javadocs;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import net.kyori.adventure.key.Key;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+import org.bukkit.MinecraftExperimental;
+
+import static com.squareup.javapoet.TypeSpec.classBuilder;
+import static io.papermc.generator.utils.Annotations.EXPERIMENTAL_API_ANNOTATION;
+import static io.papermc.generator.utils.Annotations.experimentalAnnotations;
+import static java.util.Objects.requireNonNull;
+import static javax.lang.model.element.Modifier.FINAL;
+import static javax.lang.model.element.Modifier.PRIVATE;
+import static javax.lang.model.element.Modifier.PUBLIC;
+import static javax.lang.model.element.Modifier.STATIC;
+
+public class GeneratedTagKeyType<T, A> extends SimpleGenerator {
+
+    private static final Map<RegistryKey<?>, String> REGISTRY_KEY_FIELD_NAMES;
+    static {
+        final Map<RegistryKey<?>, String> map = new HashMap<>();
+        try {
+            for (final Field field : RegistryKey.class.getFields()) {
+                if (!Modifier.isStatic(field.getModifiers()) || !Modifier.isFinal(field.getModifiers()) || field.getType() != RegistryKey.class) {
+                    continue;
+                }
+                map.put((RegistryKey<?>) field.get(null), field.getName());
+            }
+            REGISTRY_KEY_FIELD_NAMES = Map.copyOf(map);
+        } catch (final ReflectiveOperationException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private static final String CREATE_JAVADOC = """
+        Creates a tag key for {@link $T} in the registry {@code $L}.
+        
+        @param key the tag key's key
+        @return a new tag key
+        """;
+
+    private final Class<A> apiType;
+    private final ResourceKey<? extends Registry<T>> registryKey;
+    private final RegistryKey<A> apiRegistryKey;
+    private final boolean publicCreateKeyMethod;
+
+    public GeneratedTagKeyType(final String keysClassName, final Class<A> apiType, final String pkg, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey, final boolean publicCreateKeyMethod) {
+        super(keysClassName, pkg);
+        this.apiType = apiType;
+        this.registryKey = registryKey;
+        this.apiRegistryKey = apiRegistryKey;
+        this.publicCreateKeyMethod = publicCreateKeyMethod;
+    }
+
+    private MethodSpec.Builder createMethod(final TypeName returnType) {
+        final TypeName keyType = TypeName.get(Key.class);
+
+        final ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
+        final MethodSpec.Builder create = MethodSpec.methodBuilder("create")
+            .addModifiers(this.publicCreateKeyMethod ? PUBLIC : PRIVATE, STATIC)
+            .addParameter(keyParam)
+            .addCode("return $T.create($T.$L, $N);", TagKey.class, RegistryKey.class, requireNonNull(REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey), "Missing field for " + this.apiRegistryKey), keyParam)
+            .returns(returnType);
+        if (this.publicCreateKeyMethod) {
+            create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental
+            create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.location().toString());
+        }
+        return create;
+    }
+
+    private TypeSpec.Builder keyHolderType() {
+        return classBuilder(this.className)
+            .addModifiers(PUBLIC, FINAL)
+            .addJavadoc(Javadocs.getVersionDependentClassHeader("{@link $T#$L}"), RegistryKey.class, REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey))
+            .addAnnotations(Annotations.CLASS_HEADER)
+            .addMethod(MethodSpec.constructorBuilder()
+                .addModifiers(PRIVATE)
+                .build()
+            );
+    }
+
+    @Override
+    protected TypeSpec getTypeSpec() {
+        final TypeName tagKey = ParameterizedTypeName.get(TagKey.class, this.apiType);
+
+        final TypeSpec.Builder typeBuilder = this.keyHolderType();
+        final MethodSpec.Builder createMethod = this.createMethod(tagKey);
+
+        final Registry<T> registry = Main.REGISTRY_ACCESS.lookupOrThrow(this.registryKey);
+
+        final AtomicBoolean allExperimental = new AtomicBoolean(true);
+        registry.listTagIds().sorted(Formatting.alphabeticKeyOrder(nmsTagKey -> nmsTagKey.location().getPath())).forEach(nmsTagKey -> {
+            final String fieldName = Formatting.formatKeyAsField(nmsTagKey.location().getPath());
+            final FieldSpec.Builder fieldBuilder = FieldSpec.builder(tagKey, fieldName, PUBLIC, STATIC, FINAL)
+                .initializer("$N(key($S))", createMethod.build(), nmsTagKey.location().getPath())
+                .addJavadoc(Javadocs.getVersionDependentField("{@code $L}"), "#" + nmsTagKey.location());
+            final String featureFlagName = Main.EXPERIMENTAL_TAGS.get(nmsTagKey);
+            if (featureFlagName != null) {
+                fieldBuilder.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.valueOf(featureFlagName.toUpperCase(Locale.ENGLISH)))); // Update for Experimental API
+            } else {
+                allExperimental.set(false);
+            }
+            typeBuilder.addField(fieldBuilder.build());
+        });
+        if (allExperimental.get()) {
+            typeBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
+            createMethod.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
+        } else {
+            typeBuilder.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO experimental API
+        }
+        return typeBuilder.addMethod(createMethod.build()).build();
+    }
+
+    @Override
+    protected JavaFile.Builder file(final JavaFile.Builder builder) {
+        return builder
+            .addStaticImport(Key.class, "key");
+    }
+}

paper-api-generator/src/main/java/io/papermc/generator/types/SimpleGenerator.java

@@ -2,16 +2,13 @@ package io.papermc.generator.types;
 
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.TypeSpec;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 public abstract class SimpleGenerator implements SourceGenerator {
 
-    public static final String INDENT_UNIT = "    ";
-
     protected final String className;
     protected final String packageName;
 
@@ -22,15 +19,14 @@ public abstract class SimpleGenerator implements SourceGenerator {
 
     protected abstract TypeSpec getTypeSpec();
 
-    protected JavaFile.Builder file(JavaFile.Builder builder) {
-        return builder;
-    }
+    protected abstract JavaFile.Builder file(JavaFile.Builder builder);
 
     @Override
     public void writeToFile(Path parent) throws IOException {
+
         JavaFile.Builder builder = JavaFile.builder(this.packageName, this.getTypeSpec());
         this.file(builder)
-            .indent(INDENT_UNIT)
+            .indent("    ")
             .skipJavaLangImports(true);
 
         builder.build().writeTo(parent, StandardCharsets.UTF_8);

paper-api-generator/src/main/java/io/papermc/generator/types/SourceGenerator.java

@@ -2,9 +2,7 @@ package io.papermc.generator.types;
 
 import java.io.IOException;
 import java.nio.file.Path;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 public interface SourceGenerator {
 
     void writeToFile(Path parent) throws IOException;

paper-api-generator/src/main/java/io/papermc/generator/types/goal/MobGoalGenerator.java

@@ -3,6 +3,7 @@ package io.papermc.generator.types.goal;
 import com.destroystokyo.paper.entity.ai.GoalKey;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
@@ -15,29 +16,28 @@ import io.papermc.generator.types.SimpleGenerator;
 import io.papermc.generator.utils.Annotations;
 import io.papermc.generator.utils.Formatting;
 import io.papermc.generator.utils.Javadocs;
-import io.papermc.typewriter.util.ClassHelper;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Stream;
 import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.entity.ai.goal.GoalSelector;
 import net.minecraft.world.entity.ai.goal.WrappedGoal;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Mob;
-import org.jspecify.annotations.NullMarked;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
+import org.jetbrains.annotations.Nullable;
 
 import static javax.lang.model.element.Modifier.FINAL;
 import static javax.lang.model.element.Modifier.PRIVATE;
 import static javax.lang.model.element.Modifier.PUBLIC;
 import static javax.lang.model.element.Modifier.STATIC;
 
-@NullMarked
+@DefaultQualifier(NonNull.class)
 public class MobGoalGenerator extends SimpleGenerator {
 
-    private static final String CLASS_HEADER = Javadocs.getVersionDependentClassHeader("keys", "Mob Goals");
+    private static final String CLASS_HEADER = Javadocs.getVersionDependentClassHeader("Mob Goals");
 
-    public MobGoalGenerator(String className, String packageName) {
-        super(className, packageName);
+    public MobGoalGenerator(final String keysClassName, final String pkg) {
+        super(keysClassName, pkg);
     }
 
     @Override
@@ -51,8 +51,9 @@ public class MobGoalGenerator extends SimpleGenerator {
             .addJavadoc(CLASS_HEADER);
 
         TypeName mobType = ParameterizedTypeName.get(ClassName.get(Class.class), type);
+        TypeName keyType = TypeName.get(String.class);
 
-        ParameterSpec keyParam = ParameterSpec.builder(String.class, "key", FINAL).build();
+        ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
         ParameterSpec typeParam = ParameterSpec.builder(mobType, "type", FINAL).build();
         MethodSpec.Builder createMethod = MethodSpec.methodBuilder("create")
             .addModifiers(PRIVATE, STATIC)
@@ -67,25 +68,33 @@ public class MobGoalGenerator extends SimpleGenerator {
             classes = scanResult.getSubclasses(Goal.class.getName()).loadClasses(Goal.class);
         }
 
-        Stream<GoalKey<Mob>> vanillaGoals = classes.stream()
+        List<GoalKey<Mob>> vanillaNames = classes.stream()
             .filter(clazz -> !java.lang.reflect.Modifier.isAbstract(clazz.getModifiers()))
-            .filter(clazz -> !clazz.isAnonymousClass() || ClassHelper.getTopLevelClass(clazz) != GoalSelector.class)
             .filter(clazz -> !WrappedGoal.class.equals(clazz)) // TODO - properly fix
-            .map(MobGoalNames::getKey)
+            .map(goalClass -> MobGoalNames.getKey(goalClass.getName(), goalClass))
+            .filter((key) -> !MobGoalNames.isIgnored(key.getNamespacedKey().getKey()))
             .sorted(Comparator.<GoalKey<?>, String>comparing(o -> o.getEntityClass().getSimpleName())
                 .thenComparing(vanillaGoalKey -> vanillaGoalKey.getNamespacedKey().getKey())
-            );
+            )
+            .toList();
 
-        vanillaGoals.forEach(goalKey -> {
-            String keyPath = goalKey.getNamespacedKey().getKey();
-            String fieldName = Formatting.formatKeyAsField(keyPath);
 
+        for (final GoalKey<?> goalKey : vanillaNames) {
             TypeName typedKey = ParameterizedTypeName.get(GoalKey.class, goalKey.getEntityClass());
+            NamespacedKey key = goalKey.getNamespacedKey();
+
+            String keyPath = key.getKey();
+            String fieldName = Formatting.formatKeyAsField(keyPath);
             FieldSpec.Builder fieldBuilder = FieldSpec.builder(typedKey, fieldName, PUBLIC, STATIC, FINAL)
                 .initializer("$N($S, $T.class)", createMethod.build(), keyPath, goalKey.getEntityClass());
             typeBuilder.addField(fieldBuilder.build());
-        });
+        }
 
         return typeBuilder.addMethod(createMethod.build()).build();
     }
+
+    @Override
+    protected JavaFile.Builder file(JavaFile.Builder builder) {
+        return builder;
+    }
 }

paper-api-generator/src/main/java/io/papermc/generator/types/goal/MobGoalNames.java

@@ -2,32 +2,140 @@ package io.papermc.generator.types.goal;
 
 import com.destroystokyo.paper.entity.RangedEntity;
 import com.destroystokyo.paper.entity.ai.GoalKey;
-import com.google.common.base.CaseFormat;
-import io.papermc.generator.utils.Formatting;
-import io.papermc.paper.entity.SchoolableFish;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import net.minecraft.world.entity.FlyingMob;
+import net.minecraft.world.entity.PathfinderMob;
+import net.minecraft.world.entity.TamableAnimal;
+import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.entity.ambient.AmbientCreature;
+import net.minecraft.world.entity.animal.AbstractFish;
+import net.minecraft.world.entity.animal.AbstractGolem;
+import net.minecraft.world.entity.animal.AbstractSchoolingFish;
+import net.minecraft.world.entity.animal.Animal;
+import net.minecraft.world.entity.animal.Pufferfish;
+import net.minecraft.world.entity.animal.ShoulderRidingEntity;
+import net.minecraft.world.entity.animal.SnowGolem;
+import net.minecraft.world.entity.animal.WaterAnimal;
+import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
+import net.minecraft.world.entity.boss.wither.WitherBoss;
+import net.minecraft.world.entity.monster.AbstractIllager;
+import net.minecraft.world.entity.monster.EnderMan;
+import net.minecraft.world.entity.monster.PatrollingMonster;
+import net.minecraft.world.entity.monster.RangedAttackMob;
+import net.minecraft.world.entity.monster.SpellcasterIllager;
+import net.minecraft.world.entity.monster.ZombifiedPiglin;
+import net.minecraft.world.entity.monster.piglin.AbstractPiglin;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.AbstractHorse;
+import org.bukkit.entity.AbstractSkeleton;
+import org.bukkit.entity.AbstractVillager;
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.Ambient;
+import org.bukkit.entity.Animals;
+import org.bukkit.entity.Bat;
+import org.bukkit.entity.Bee;
+import org.bukkit.entity.Blaze;
+import org.bukkit.entity.Cat;
+import org.bukkit.entity.CaveSpider;
+import org.bukkit.entity.ChestedHorse;
+import org.bukkit.entity.Chicken;
+import org.bukkit.entity.Cod;
+import org.bukkit.entity.Cow;
+import org.bukkit.entity.Creature;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Dolphin;
+import org.bukkit.entity.Donkey;
+import org.bukkit.entity.Drowned;
+import org.bukkit.entity.ElderGuardian;
+import org.bukkit.entity.EnderDragon;
+import org.bukkit.entity.Enderman;
+import org.bukkit.entity.Endermite;
+import org.bukkit.entity.Evoker;
+import org.bukkit.entity.Fish;
+import org.bukkit.entity.Flying;
+import org.bukkit.entity.Fox;
+import org.bukkit.entity.Ghast;
+import org.bukkit.entity.Giant;
+import org.bukkit.entity.Golem;
+import org.bukkit.entity.Guardian;
+import org.bukkit.entity.Hoglin;
+import org.bukkit.entity.Horse;
+import org.bukkit.entity.Husk;
+import org.bukkit.entity.Illager;
+import org.bukkit.entity.Illusioner;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Llama;
+import org.bukkit.entity.MagmaCube;
+import org.bukkit.entity.Mob;
+import org.bukkit.entity.Monster;
+import org.bukkit.entity.Mule;
+import org.bukkit.entity.MushroomCow;
+import org.bukkit.entity.Ocelot;
+import org.bukkit.entity.Panda;
+import org.bukkit.entity.Parrot;
+import org.bukkit.entity.Phantom;
+import org.bukkit.entity.Pig;
+import org.bukkit.entity.PigZombie;
+import org.bukkit.entity.Piglin;
+import org.bukkit.entity.PiglinAbstract;
+import org.bukkit.entity.PiglinBrute;
+import org.bukkit.entity.Pillager;
+import org.bukkit.entity.PolarBear;
+import org.bukkit.entity.PufferFish;
+import org.bukkit.entity.Rabbit;
+import org.bukkit.entity.Raider;
+import org.bukkit.entity.Ravager;
+import org.bukkit.entity.Salmon;
+import org.bukkit.entity.Sheep;
+import org.bukkit.entity.Shulker;
+import org.bukkit.entity.Silverfish;
+import org.bukkit.entity.Skeleton;
+import org.bukkit.entity.SkeletonHorse;
+import org.bukkit.entity.Slime;
+import org.bukkit.entity.Snowman;
+import org.bukkit.entity.Spellcaster;
+import org.bukkit.entity.Spider;
+import org.bukkit.entity.Squid;
+import org.bukkit.entity.Stray;
+import org.bukkit.entity.Strider;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.TraderLlama;
+import org.bukkit.entity.TropicalFish;
+import org.bukkit.entity.Turtle;
+import org.bukkit.entity.Vex;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Vindicator;
+import org.bukkit.entity.WanderingTrader;
+import org.bukkit.entity.WaterMob;
+import org.bukkit.entity.Witch;
+import org.bukkit.entity.Wither;
+import org.bukkit.entity.WitherSkeleton;
+import org.bukkit.entity.Wolf;
+import org.bukkit.entity.Zoglin;
+import org.bukkit.entity.Zombie;
+import org.bukkit.entity.ZombieHorse;
+import org.bukkit.entity.ZombieVillager;
+
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
+import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.entity.monster.RangedAttackMob;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.bukkit.NamespacedKey;
-import org.bukkit.entity.*;
-import org.jspecify.annotations.NullMarked;
+import java.util.Set;
 
-@NullMarked
-public final class MobGoalNames { // todo sync with MobGoalHelper ideally this should not be duplicated
+public class MobGoalNames {
 
     private static final Map<Class<? extends Goal>, Class<? extends Mob>> entityClassCache = new HashMap<>();
-    public static final Map<Class<? extends net.minecraft.world.entity.Mob>, Class<? extends Mob>> bukkitMap = new LinkedHashMap<>();
+    public static final Map<Class<? extends net.minecraft.world.entity.Mob>, Class<? extends Mob>> bukkitMap = new HashMap<>();
+
 
     static {
         //<editor-fold defaultstate="collapsed" desc="bukkitMap Entities">
         bukkitMap.put(net.minecraft.world.entity.Mob.class, Mob.class);
         bukkitMap.put(net.minecraft.world.entity.AgeableMob.class, Ageable.class);
-        bukkitMap.put(net.minecraft.world.entity.ambient.AmbientCreature.class, Ambient.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Animal.class, Animals.class);
+        bukkitMap.put(AmbientCreature.class, Ambient.class);
+        bukkitMap.put(Animal.class, Animals.class);
         bukkitMap.put(net.minecraft.world.entity.ambient.Bat.class, Bat.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Bee.class, Bee.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Blaze.class, Blaze.class);
@@ -36,51 +144,51 @@ public final class MobGoalNames { // todo sync with MobGoalHelper ideally this s
         bukkitMap.put(net.minecraft.world.entity.animal.Chicken.class, Chicken.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Cod.class, Cod.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Cow.class, Cow.class);
-        bukkitMap.put(net.minecraft.world.entity.PathfinderMob.class, Creature.class);
+        bukkitMap.put(PathfinderMob.class, Creature.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Creeper.class, Creeper.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Dolphin.class, Dolphin.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Drowned.class, Drowned.class);
         bukkitMap.put(net.minecraft.world.entity.boss.enderdragon.EnderDragon.class, EnderDragon.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.EnderMan.class, Enderman.class);
+        bukkitMap.put(EnderMan.class, Enderman.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Endermite.class, Endermite.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Evoker.class, Evoker.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.AbstractFish.class, Fish.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.AbstractSchoolingFish.class, SchoolableFish.class);
-        bukkitMap.put(net.minecraft.world.entity.FlyingMob.class, Flying.class);
+        bukkitMap.put(AbstractFish.class, Fish.class);
+        bukkitMap.put(AbstractSchoolingFish.class, io.papermc.paper.entity.SchoolableFish.class);
+        bukkitMap.put(FlyingMob.class, Flying.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Fox.class, Fox.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Ghast.class, Ghast.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Giant.class, Giant.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.AbstractGolem.class, Golem.class);
+        bukkitMap.put(AbstractGolem.class, Golem.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Guardian.class, Guardian.class);
         bukkitMap.put(net.minecraft.world.entity.monster.ElderGuardian.class, ElderGuardian.class);
         bukkitMap.put(net.minecraft.world.entity.animal.horse.Horse.class, Horse.class);
         bukkitMap.put(net.minecraft.world.entity.animal.horse.AbstractHorse.class, AbstractHorse.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.horse.AbstractChestedHorse.class, ChestedHorse.class);
+        bukkitMap.put(AbstractChestedHorse.class, ChestedHorse.class);
         bukkitMap.put(net.minecraft.world.entity.animal.horse.Donkey.class, Donkey.class);
         bukkitMap.put(net.minecraft.world.entity.animal.horse.Mule.class, Mule.class);
         bukkitMap.put(net.minecraft.world.entity.animal.horse.SkeletonHorse.class, SkeletonHorse.class);
         bukkitMap.put(net.minecraft.world.entity.animal.horse.ZombieHorse.class, ZombieHorse.class);
         bukkitMap.put(net.minecraft.world.entity.animal.camel.Camel.class, org.bukkit.entity.Camel.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.AbstractIllager.class, Illager.class);
+        bukkitMap.put(AbstractIllager.class, Illager.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Illusioner.class, Illusioner.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.SpellcasterIllager.class, Spellcaster.class);
+        bukkitMap.put(SpellcasterIllager.class, Spellcaster.class);
         bukkitMap.put(net.minecraft.world.entity.animal.IronGolem.class, IronGolem.class);
         bukkitMap.put(net.minecraft.world.entity.animal.horse.Llama.class, Llama.class);
         bukkitMap.put(net.minecraft.world.entity.animal.horse.TraderLlama.class, TraderLlama.class);
         bukkitMap.put(net.minecraft.world.entity.monster.MagmaCube.class, MagmaCube.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Monster.class, Monster.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.PatrollingMonster.class, Raider.class); // close enough
+        bukkitMap.put(PatrollingMonster.class, Raider.class); // close enough
         bukkitMap.put(net.minecraft.world.entity.animal.MushroomCow.class, MushroomCow.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Ocelot.class, Ocelot.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Panda.class, Panda.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Parrot.class, Parrot.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.ShoulderRidingEntity.class, Parrot.class); // close enough
+        bukkitMap.put(ShoulderRidingEntity.class, Parrot.class); // close enough
         bukkitMap.put(net.minecraft.world.entity.monster.Phantom.class, Phantom.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Pig.class, Pig.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.ZombifiedPiglin.class, PigZombie.class);
+        bukkitMap.put(ZombifiedPiglin.class, PigZombie.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Pillager.class, Pillager.class);
         bukkitMap.put(net.minecraft.world.entity.animal.PolarBear.class, PolarBear.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Pufferfish.class, PufferFish.class);
+        bukkitMap.put(Pufferfish.class, PufferFish.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Rabbit.class, Rabbit.class);
         bukkitMap.put(net.minecraft.world.entity.raid.Raider.class, Raider.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Ravager.class, Ravager.class);
@@ -93,10 +201,10 @@ public final class MobGoalNames { // todo sync with MobGoalHelper ideally this s
         bukkitMap.put(net.minecraft.world.entity.monster.Stray.class, Stray.class);
         bukkitMap.put(net.minecraft.world.entity.monster.WitherSkeleton.class, WitherSkeleton.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Slime.class, Slime.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.SnowGolem.class, Snowman.class);
+        bukkitMap.put(SnowGolem.class, Snowman.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Spider.class, Spider.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Squid.class, Squid.class);
-        bukkitMap.put(net.minecraft.world.entity.TamableAnimal.class, Tameable.class);
+        bukkitMap.put(TamableAnimal.class, Tameable.class);
         bukkitMap.put(net.minecraft.world.entity.animal.TropicalFish.class, TropicalFish.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Turtle.class, Turtle.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Vex.class, Vex.class);
@@ -104,85 +212,108 @@ public final class MobGoalNames { // todo sync with MobGoalHelper ideally this s
         bukkitMap.put(net.minecraft.world.entity.npc.AbstractVillager.class, AbstractVillager.class);
         bukkitMap.put(net.minecraft.world.entity.npc.WanderingTrader.class, WanderingTrader.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Vindicator.class, Vindicator.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.WaterAnimal.class, WaterMob.class);
+        bukkitMap.put(WaterAnimal.class, WaterMob.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Witch.class, Witch.class);
-        bukkitMap.put(net.minecraft.world.entity.boss.wither.WitherBoss.class, Wither.class);
+        bukkitMap.put(WitherBoss.class, Wither.class);
         bukkitMap.put(net.minecraft.world.entity.animal.Wolf.class, Wolf.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Zombie.class, Zombie.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Husk.class, Husk.class);
         bukkitMap.put(net.minecraft.world.entity.monster.ZombieVillager.class, ZombieVillager.class);
         bukkitMap.put(net.minecraft.world.entity.monster.hoglin.Hoglin.class, Hoglin.class);
         bukkitMap.put(net.minecraft.world.entity.monster.piglin.Piglin.class, Piglin.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.piglin.AbstractPiglin.class, PiglinAbstract.class);
+        bukkitMap.put(AbstractPiglin.class, PiglinAbstract.class);
         bukkitMap.put(net.minecraft.world.entity.monster.piglin.PiglinBrute.class, PiglinBrute.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Strider.class, Strider.class);
         bukkitMap.put(net.minecraft.world.entity.monster.Zoglin.class, Zoglin.class);
-        bukkitMap.put(net.minecraft.world.entity.GlowSquid.class, GlowSquid.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.axolotl.Axolotl.class, Axolotl.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.goat.Goat.class, Goat.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.frog.Frog.class, Frog.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.frog.Tadpole.class, Tadpole.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.warden.Warden.class, Warden.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.allay.Allay.class, Allay.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.sniffer.Sniffer.class, Sniffer.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.breeze.Breeze.class, Breeze.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.armadillo.Armadillo.class, Armadillo.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Bogged.class, Bogged.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.creaking.Creaking.class, Creaking.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.AgeableWaterCreature.class, Squid.class); // close enough
+        bukkitMap.put(net.minecraft.world.entity.GlowSquid.class, org.bukkit.entity.GlowSquid.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.axolotl.Axolotl.class, org.bukkit.entity.Axolotl.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.goat.Goat.class, org.bukkit.entity.Goat.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.frog.Frog.class, org.bukkit.entity.Frog.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.frog.Tadpole.class, org.bukkit.entity.Tadpole.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.warden.Warden.class, org.bukkit.entity.Warden.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.allay.Allay.class, org.bukkit.entity.Allay.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.sniffer.Sniffer.class, org.bukkit.entity.Sniffer.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.breeze.Breeze.class, org.bukkit.entity.Breeze.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.armadillo.Armadillo.class, org.bukkit.entity.Armadillo.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Bogged.class, org.bukkit.entity.Bogged.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.creaking.Creaking.class, org.bukkit.entity.Creaking.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.AgeableWaterCreature.class, org.bukkit.entity.Squid.class); // close enough
         //</editor-fold>
     }
 
-    private static final Map<String, String> deobfuscationMap = new HashMap<>();
+    private static final BiMap<String, String> deobfuscationMap = HashBiMap.create();
+    static final Set<String> ignored = new HashSet<>();
 
     static {
-        // TODO these kinda should be checked on each release, in case obfuscation changes
         deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee");
+
+        ignored.add("goal_selector_1");
+        ignored.add("goal_selector_2");
+        ignored.add("selector_1");
+        ignored.add("selector_2");
+        ignored.add("wrapped");
     }
 
-    private static String getPathName(String name) {
-        String pathName = name.substring(name.lastIndexOf('.') + 1);
-        boolean needDeobfMap = false;
-
+    public static String getUsableName(String name) {
+        final String original = name;
+        name = name.substring(name.lastIndexOf(".") + 1);
+        boolean flag = false;
         // inner classes
-        int firstInnerDelimiter = pathName.indexOf('$');
-        if (firstInnerDelimiter != -1) {
-            String innerClassName = pathName.substring(firstInnerDelimiter + 1);
-            for (String nestedClass : innerClassName.split("\\$")) {
-                if (NumberUtils.isDigits(nestedClass)) {
-                    needDeobfMap = true;
-                    break;
-                }
+        if (name.contains("$")) {
+            String cut = name.substring(name.indexOf("$") + 1);
+            if (cut.length() <= 2) {
+                name = name.replace("Entity", "");
+                name = name.replace("$", "_");
+                flag = true;
+            } else {
+                // mapped, wooo
+                name = cut;
             }
-            if (!needDeobfMap) {
-                pathName = innerClassName;
-            }
-            pathName = pathName.replace('$', '_');
-            // mapped, wooo!
         }
 
-        pathName = Formatting.stripWordOfCamelCaseName(pathName, "TargetGoal", true); // replace last? reverse search?
-        pathName = Formatting.stripWordOfCamelCaseName(pathName, "Goal", true);
-        pathName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, pathName);
+        name = name.replace("PathfinderGoal", "");
+        name = name.replace("TargetGoal", "");
+        name = name.replace("Goal", "");
+        StringBuilder sb = new StringBuilder();
+        for (char c : name.toCharArray()) {
+            if (c >= 'A' && c <= 'Z') {
+                sb.append("_");
+                sb.append(Character.toLowerCase(c));
+            } else {
+                sb.append(c);
+            }
+        }
+        name = sb.toString();
+        name = name.replaceFirst("_", "");
 
-        if (needDeobfMap && !deobfuscationMap.containsKey(pathName)) {
-            System.err.println("need to map " + name + " (" + pathName + ")");
+        if (flag && !deobfuscationMap.containsKey(name.toLowerCase(Locale.ROOT)) && !ignored.contains(name)) {
+            System.out.println("need to map " + original + " (" + name.toLowerCase(Locale.ROOT) + ")");
         }
 
         // did we rename this key?
-        return deobfuscationMap.getOrDefault(pathName, pathName);
+        return deobfuscationMap.getOrDefault(name, name);
     }
 
-    public static <T extends Mob> GoalKey<T> getKey(Class<? extends Goal> goalClass) {
-        String name = getPathName(goalClass.getName());
+    public static boolean isIgnored(String name) {
+        return ignored.contains(name);
+    }
+
+
+    public static <T extends Mob> GoalKey<T> getKey(String clazzName, Class<? extends Goal> goalClass) {
+        String name = getUsableName(clazzName);
+        if (MobGoalNames.isIgnored(name)) {
+            //noinspection unchecked
+            return (GoalKey<T>) GoalKey.of(Mob.class, NamespacedKey.minecraft(name));
+        }
         return GoalKey.of(getEntity(goalClass), NamespacedKey.minecraft(name));
     }
 
-    private static <T extends Mob> Class<T> getEntity(Class<? extends Goal> goalClass) {
+    public static <T extends Mob> Class<T> getEntity(Class<? extends Goal> goalClass) {
         //noinspection unchecked
         return (Class<T>) entityClassCache.computeIfAbsent(goalClass, key -> {
             for (Constructor<?> ctor : key.getDeclaredConstructors()) {
-                for (Class<?> param : ctor.getParameterTypes()) {
+                for (int i = 0; i < ctor.getParameterCount(); i++) {
+                    Class<?> param = ctor.getParameterTypes()[i];
                     if (net.minecraft.world.entity.Mob.class.isAssignableFrom(param)) {
                         //noinspection unchecked
                         return toBukkitClass((Class<? extends net.minecraft.world.entity.Mob>) param);
@@ -191,11 +322,11 @@ public final class MobGoalNames { // todo sync with MobGoalHelper ideally this s
                     }
                 }
             }
-            throw new RuntimeException("Can't figure out applicable entity for mob goal " + goalClass); // maybe just return Mob?
+            throw new RuntimeException("Can't figure out applicable entity for mob goal " + goalClass); // maybe just return EntityInsentient?
         });
     }
 
-    private static Class<? extends Mob> toBukkitClass(Class<? extends net.minecraft.world.entity.Mob> nmsClass) {
+    public static Class<? extends Mob> toBukkitClass(Class<? extends net.minecraft.world.entity.Mob> nmsClass) {
         Class<? extends Mob> bukkitClass = bukkitMap.get(nmsClass);
         if (bukkitClass == null) {
             throw new RuntimeException("Can't figure out applicable bukkit entity for nms entity " + nmsClass); // maybe just return Mob?

paper-api-generator/src/main/java/io/papermc/generator/utils/Annotations.java

@@ -0,0 +1,65 @@
+package io.papermc.generator.utils;
+
+import com.squareup.javapoet.AnnotationSpec;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import net.minecraft.SharedConstants;
+import org.bukkit.MinecraftExperimental;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+
+public final class Annotations {
+
+    public static List<AnnotationSpec> experimentalAnnotations(final MinecraftExperimental.@Nullable Requires requiredFeatureFlag) {
+        final List<AnnotationSpec> annotationSpecs = new ArrayList<>();
+        annotationSpecs.add(AnnotationSpec.builder(ApiStatus.Experimental.class).build());
+        if (requiredFeatureFlag != null) {
+            annotationSpecs.add(AnnotationSpec.builder(MinecraftExperimental.class)
+                .addMember("value", "$T.$L", MinecraftExperimental.Requires.class, requiredFeatureFlag.name())
+                .build());
+        } else {
+            annotationSpecs.add(AnnotationSpec.builder(MinecraftExperimental.class).build());
+        }
+        return annotationSpecs;
+    }
+
+    public static AnnotationSpec deprecatedVersioned(final @Nullable String version, final boolean forRemoval) {
+        final AnnotationSpec.Builder annotationSpec = AnnotationSpec.builder(Deprecated.class);
+        if (forRemoval) {
+            annotationSpec.addMember("forRemoval", "$L", true);
+        }
+        if (version != null) {
+            annotationSpec.addMember("since", "$S", version);
+        }
+
+        return annotationSpec.build();
+    }
+
+    public static AnnotationSpec scheduledRemoval(final @Nullable String version) {
+        return AnnotationSpec.builder(ApiStatus.ScheduledForRemoval.class)
+            .addMember("inVersion", "$S", version)
+            .build();
+    }
+
+    @ApiStatus.Experimental
+    public static final AnnotationSpec EXPERIMENTAL_API_ANNOTATION = AnnotationSpec.builder(ApiStatus.Experimental.class).build();
+    public static final AnnotationSpec NULL_MARKED = AnnotationSpec.builder(NullMarked.class).build();
+    private static final AnnotationSpec SUPPRESS_WARNINGS = AnnotationSpec.builder(SuppressWarnings.class)
+        .addMember("value", "$S", "unused")
+        .addMember("value", "$S", "SpellCheckingInspection")
+        .build();
+    private static final AnnotationSpec GENERATED_FROM = AnnotationSpec.builder(GeneratedFrom.class)
+        .addMember("value", "$S", SharedConstants.getCurrentVersion().getName())
+        .build();
+    public static final Iterable<AnnotationSpec> CLASS_HEADER = List.of(
+        SUPPRESS_WARNINGS,
+        GENERATED_FROM,
+        NULL_MARKED
+    );
+
+    private Annotations() {
+    }
+}

paper-api-generator/src/main/java/io/papermc/generator/utils/CollectingContext.java

@@ -1,4 +1,4 @@
-package io.papermc.generator.utils.experimental;
+package io.papermc.generator.utils;
 
 import com.mojang.serialization.Lifecycle;
 import io.papermc.generator.Main;
@@ -8,20 +8,21 @@ import net.minecraft.core.HolderGetter;
 import net.minecraft.core.Registry;
 import net.minecraft.data.worldgen.BootstrapContext;
 import net.minecraft.resources.ResourceKey;
-import org.jspecify.annotations.NullMarked;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
 
-@NullMarked
+@DefaultQualifier(NonNull.class)
 public record CollectingContext<T>(Set<ResourceKey<T>> registered,
                                    Registry<T> registry) implements BootstrapContext<T> {
 
     @Override
-    public Holder.Reference<T> register(ResourceKey<T> key, T value, Lifecycle lifecycle) {
-        this.registered.add(key);
-        return Holder.Reference.createStandAlone(this.registry, key);
+    public Holder.Reference<T> register(final ResourceKey<T> resourceKey, final @NonNull T t, final Lifecycle lifecycle) {
+        this.registered.add(resourceKey);
+        return Holder.Reference.createStandAlone(this.registry, resourceKey);
     }
 
     @Override
-    public <S> HolderGetter<S> lookup(ResourceKey<? extends Registry<? extends S>> key) {
-        return Main.REGISTRY_ACCESS.lookupOrThrow(key);
+    public <S> HolderGetter<S> lookup(final ResourceKey<? extends Registry<? extends S>> resourceKey) {
+        return Main.REGISTRY_ACCESS.lookupOrThrow(resourceKey);
     }
 }

paper-api-generator/src/main/java/io/papermc/generator/utils/Formatting.java

@@ -0,0 +1,59 @@
+package io.papermc.generator.utils;
+
+import java.util.Optional;
+import org.apache.commons.lang3.math.NumberUtils;
+import java.util.Comparator;
+import java.util.Locale;
+import java.util.OptionalInt;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+
+public final class Formatting {
+
+    private static final Pattern ILLEGAL_FIELD_CHARACTERS = Pattern.compile("[.-/]");
+
+    public static String formatKeyAsField(String path) {
+        return ILLEGAL_FIELD_CHARACTERS.matcher(path.toUpperCase(Locale.ROOT)).replaceAll("_");
+    }
+
+    public static Optional<String> formatTagKey(String tagDir, String resourcePath) {
+        int tagsIndex = resourcePath.indexOf(tagDir);
+        int dotIndex = resourcePath.lastIndexOf('.');
+        if (tagsIndex == -1 || dotIndex == -1) {
+            return Optional.empty();
+        }
+        return Optional.of(resourcePath.substring(tagsIndex + tagDir.length() + 1, dotIndex)); // namespace/tags/registry_key/[tag_key].json
+    }
+
+    public static Comparator<String> ALPHABETIC_KEY_ORDER = alphabeticKeyOrder(path -> path);
+
+    public static <T> Comparator<T> alphabeticKeyOrder(Function<T, String> mapper) {
+        return (o1, o2) -> {
+            String path1 = mapper.apply(o1);
+            String path2 = mapper.apply(o2);
+
+            OptionalInt trailingInt1 = tryParseTrailingInt(path1);
+            OptionalInt trailingInt2 = tryParseTrailingInt(path2);
+
+            if (trailingInt1.isPresent() && trailingInt2.isPresent()) {
+                return Integer.compare(trailingInt1.getAsInt(), trailingInt2.getAsInt());
+            }
+
+            return path1.compareTo(path2);
+        };
+    }
+
+    private static OptionalInt tryParseTrailingInt(String path) {
+        int delimiterIndex = path.lastIndexOf('_');
+        if (delimiterIndex != -1) {
+            String score = path.substring(delimiterIndex + 1);
+            if (NumberUtils.isDigits(score)) {
+                return OptionalInt.of(Integer.parseInt(score));
+            }
+        }
+        return OptionalInt.empty();
+    }
+
+    private Formatting() {
+    }
+}

paper-api-generator/src/main/java/io/papermc/generator/utils/Javadocs.java

@@ -0,0 +1,27 @@
+package io.papermc.generator.utils;
+
+public final class Javadocs {
+
+    public static String getVersionDependentClassHeader(String headerIdentifier) {
+        return """
+        Vanilla keys for %s.
+        
+        @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.
+        """.formatted(headerIdentifier);
+    }
+
+    public static String getVersionDependentField(String headerIdentifier) {
+        return """
+        %s
+        
+        @apiNote This field is version-dependant and may be removed in future Minecraft versions
+        """.formatted(headerIdentifier);
+    }
+
+    private Javadocs() {
+    }
+}

paper-api-generator/src/main/java/io/papermc/generator/utils/TagCollector.java

@@ -0,0 +1,79 @@
+package io.papermc.generator.utils;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.mojang.logging.LogUtils;
+import io.papermc.generator.Main;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.packs.PackResources;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.repository.BuiltInPackSource;
+import net.minecraft.server.packs.resources.MultiPackResourceManager;
+import net.minecraft.tags.TagKey;
+import org.slf4j.Logger;
+
+// collect all the tags by grabbing the json from the data-packs
+// another (probably) way is to hook into the data generator like the typed keys generator
+public final class TagCollector {
+
+    private static final Logger LOGGER = LogUtils.getLogger();
+
+    public static Map<TagKey<?>, String> grabExperimental(final MultiPackResourceManager resourceManager) {
+        Map<TagKey<?>, String> result = new IdentityHashMap<>();
+
+        // collect all vanilla tags
+        Multimap<ResourceKey<? extends Registry<?>>, String> vanillaTags = HashMultimap.create();
+        PackResources vanillaPack = resourceManager.listPacks()
+            .filter(packResources -> packResources.packId().equals(BuiltInPackSource.VANILLA_ID))
+            .findFirst()
+            .orElseThrow();
+        collectFromPack(vanillaPack, (entry, path) -> vanillaTags.put(entry.key(), path));
+
+        // then distinct with other data-pack tags to know for sure newly created tags and so experimental one
+        resourceManager.listPacks().forEach(pack -> {
+            String packId = pack.packId();
+            if (packId.equals(BuiltInPackSource.VANILLA_ID)) return;
+
+            collectFromPack(pack, (entry, path) -> {
+                if (vanillaTags.get(entry.key()).contains(path)) {
+                    return;
+                }
+
+                result.put(entry.value().listTagIds()
+                    .filter(tagKey -> tagKey.location().getPath().equals(path))
+                    .findFirst()
+                    .orElseThrow(), packId);
+            });
+        });
+        return Collections.unmodifiableMap(result);
+    }
+
+    private static void collectFromPack(PackResources pack, BiConsumer<RegistryAccess.RegistryEntry<?>, String> output) {
+        Set<String> namespaces = pack.getNamespaces(PackType.SERVER_DATA);
+
+        for (String namespace : namespaces) {
+            Main.REGISTRY_ACCESS.registries().forEach(entry -> {
+                // this is probably expensive but can't find another way around and data-pack loader has similar logic
+                // the issue is that registry key can have parent/key (and custom folder too) but tag key can also have parent/key so parsing become a mess
+                // without having at least one of the two values
+                String tagDir = Registries.tagsDirPath(entry.key());
+                pack.listResources(PackType.SERVER_DATA, namespace, tagDir, (id, supplier) -> {
+                    Formatting.formatTagKey(tagDir, id.getPath()).ifPresentOrElse(path -> output.accept(entry, path), () -> {
+                        LOGGER.warn("Unable to parse the path: {}/{}/{}.json in the data-pack {} into a tag key", namespace, tagDir, id.getPath(), pack.packId());
+                    });
+                });
+            });
+        }
+    }
+
+    private TagCollector() {
+    }
+}

paper-api-generator/src/test/java/io/papermc/generator/MobGoalConverterTest.java

@@ -3,21 +3,21 @@ package io.papermc.generator;
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ScanResult;
 import io.papermc.generator.types.goal.MobGoalNames;
-import java.util.ArrayList;
-import java.util.List;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Mob;
 import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class MobGoalConverterTest {
 
     @Test
     public void testBukkitMap() {
         final List<Class<Mob>> classes;
-        try (ScanResult scanResult = new ClassGraph().enableClassInfo().whitelistPackages(Entity.class.getPackageName()).scan()) {
+        try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages(Entity.class.getPackageName()).scan()) {
             classes = scanResult.getSubclasses(Mob.class.getName()).loadClasses(Mob.class);
         }
 
@@ -30,6 +30,8 @@ public class MobGoalConverterTest {
             }
         }
 
-        assertTrue(missingClasses.isEmpty(), () -> "Missing some entity classes in the bukkit map: " + String.join(", ", missingClasses));
+        if (!missingClasses.isEmpty()) {
+            fail("Missing some entity classes in the bukkit map: " + String.join(", ", missingClasses));
+        }
     }
 }

paper-api-generator/wideners.at

@@ -1,10 +1,6 @@
-public net/minecraft/world/level/material/MapColor MATERIAL_COLORS
-public net/minecraft/world/level/block/state/properties/IntegerProperty min
-
 # for auto-marking experimental stuff
 public net/minecraft/core/RegistrySetBuilder entries
 public net/minecraft/core/RegistrySetBuilder$RegistryStub
 public net/minecraft/data/registries/VanillaRegistries BUILDER
+public net/minecraft/data/registries/WinterDropRegistries BUILDER
 public net/minecraft/data/registries/TradeRebalanceRegistries BUILDER
-public net/minecraft/world/flag/FeatureFlagRegistry names
-public net/minecraft/world/flag/FeatureFlagSet mask

paper-api/.checkstyle/checkstyle.xml

@@ -0,0 +1,214 @@
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <module name="SuppressionFilter">
+        <property name="file" value="${config_loc}/suppressions.xml"/>
+        <property name="optional" value="false"/>
+    </module>
+
+    <!--Single Suppression Filters-->
+    <module name="SuppressionSingleFilter">
+        <!--Suppresses warnings except for common TYPE_USE that should be on same line-->
+        <property name="checks" value="AnnotationOnSameLine"/>
+        <property name="message" value="^Annotation '(?!(${type_use_annotations}))"/>
+    </module>
+    <module name="SuppressionSingleFilter">
+        <property name="checks" value="Javadoc(Method|Type)"/>
+        <!--[A-Z].* check is for java annotations inside code blocks inside javadocs-->
+        <property name="message" value="^Unknown tag '(${custom_javadoc_tags}|[A-Z].*)'.$"/>
+    </module>
+
+    <!--Javadoc Comments-->
+    <module name="JavadocPackage"/>
+    <!--Misc-->
+    <module name="NewlineAtEndOfFile"/>
+    <module name="OrderedProperties"/>
+    <!--Whitespace-->
+    <module name="FileTabCharacter"/>
+
+    <module name="TreeWalker">
+        <module name="SuppressionXpathFilter">
+            <property name="file" value="${config_loc}/xpath-suppressions.xml"/>
+            <property name="optional" value="false"/>
+        </module>
+
+        <!--Annotations-->
+        <module name="AnnotationOnSameLine">
+            <!--matches all annotations, but most are suppressed in above-->
+            <property name="tokens" value="METHOD_DEF"/>
+        </module>
+        <module name="AnnotationUseStyle"/>
+        <module name="MissingDeprecated"/>
+
+        <!--Block Checks-->
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock"/>
+        <module name="LeftCurly"/>
+        <module name="RightCurly"/>
+        <module name="OneTopLevelClass"/>
+        <module name="SealedShouldHavePermitsList"/>
+
+        <!--Class Design-->
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+
+        <!--Coding-->
+        <module name="ArrayTrailingComma"/>
+        <module name="AvoidDoubleBraceInitialization"/>
+        <module name="AvoidNoArgumentSuperConstructorCall"/>
+        <module name="ConstructorsDeclarationGrouping"/>
+        <module name="CovariantEquals"/>
+        <module name="DeclarationOrder"/>
+        <module name="DefaultComesLast"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsAvoidNull"/>
+        <module name="EqualsHashCode"/>
+        <module name="FallThrough"/>
+        <!--<module name="FinalLocalVariable">
+            <property name="validateEnhancedForLoopVariable" value="true"/>
+            <property name="validateUnnamedVariables" value="true"/>
+            &lt;!&ndash;TODO atm, PARAMETER_DEF doesn't seem to function inside interfaces&ndash;&gt;
+            &lt;!&ndash;https://github.com/checkstyle/checkstyle/issues/16081&ndash;&gt;
+            <property name="tokens" value="PARAMETER_DEF,VARIABLE_DEF"/>
+        </module>-->
+        <module name="IllegalToken"/> <!--just labels by default-->
+        <module name="IllegalType"/>
+        <module name="RequireThis">
+            <property name="validateOnlyOverlapping" value="false"/>
+        </module>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StringLiteralEquality"/>
+        <module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
+        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
+        <module name="UnnecessarySemicolonInEnumeration"/>
+        <module name="UnnecessarySemicolonInTryWithResources"/>
+        <module name="UnusedCatchParameterShouldBeUnnamed"/>
+        <module name="UnusedLambdaParameterShouldBeUnnamed"/>
+        <module name="UnusedLocalVariable"/>
+        <module name="WhenShouldBeUsed"/>
+
+        <!--Headers--> <!--N/A-->
+
+        <!--Imports-->
+        <module name="AvoidStarImport"/>
+        <module name="CustomImportOrder">
+            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE,STATIC"/>
+            <property name="standardPackageRegExp" value="^$"/>
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+        </module>
+        <module name="IllegalImport">
+            <property name="regexp" value="true"/>
+            <!--checker-qual nullability-->
+            <property name="illegalClasses" value="org\.checkerframework\.checker\.nullness\.qual\.(Nullable|NonNull|DefaultQualifier)"/>
+            <!--jetbrains nullability-->
+            <property name="illegalClasses" value="org\.jetbrains\.annotations\.(NotNull|Nullable|NotNullByDefault)"/>
+            <!--javax nullability-->
+        </module>
+        <module name="IllegalImport">
+            <property name="regexp" value="true"/>
+            <!--attempts to guard against nested imports (by looking for capital letters in imports)-->
+            <property name="illegalClasses" value="^[^\.A-Z]+(\.[^\.A-Z]+)+?(\.[A-Z][^\.]*)(\.[A-Z][^\.]*)+$"/>
+            <message key="import.illegal" value="Illegal nested import - {0}"/>
+        </module>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+        <!--Javadoc Comments-->
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @see, @deprecated, @hidden"/>
+        </module>
+        <module name="InvalidJavadocPosition"/>
+        <module name="JavadocBlockTagLocation"/>
+        <module name="JavadocContentLocation"/>
+        <module name="JavadocLeadingAsteriskAlign"/>
+        <module name="JavadocMethod">
+            <!--checks all, but doesn't require. If we have a doc, it should be valid-->
+            <property name="validateThrows" value="true"/>
+        </module>
+        <module name="JavadocMissingLeadingAsterisk"/>
+        <module name="JavadocMissingWhitespaceAfterAsterisk"/>
+        <module name="JavadocStyle"/> <!--checks all, but doesn't require. If we have a doc, it should be valid-->
+        <module name="JavadocTagContinuationIndentation"/>
+        <module name="JavadocType"/> <!--checks all, but doesn't require. If we have a doc, it should be valid-->
+        <module name="MissingJavadocMethod">
+            <property name="allowedAnnotations" value="Override, ApiStatus.Internal"/>
+            <property name="ignoreMethodNamesRegex" value="^getHandlerList$"/>
+        </module>
+        <module name="MissingJavadocPackage"/>
+        <module name="MissingJavadocType">
+            <property name="skipAnnotations" value="Generated, ApiStatus.Internal" />
+        </module>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+
+        <!--Metrics--> <!--N/A-->
+
+        <!--Miscellaneous-->
+        <module name="ArrayTypeStyle"/>
+        <module name="AvoidEscapedUnicodeCharacters"/>
+        <module name="CommentsIndentation"/>
+        <module name="FinalParameters"/>
+
+        <module name="NoCodeInFile"/>
+        <module name="OuterTypeFilename"/>
+        <module name="UpperEll"/>
+
+        <!--Modifiers-->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+        <!--Naming Conventions-->
+        <module name="AbbreviationAsWordInName">
+            <property name="allowedAbbreviations" value="JSON,UUID"/>
+            <property name="ignoreFinal" value="false"/>
+        </module>
+        <module name="ClassTypeParameterName"/>
+        <module name="ConstantName"/>
+        <module name="IllegalIdentifierName"/>
+        <module name="InterfaceTypeParameterName"/>
+        <module name="LambdaParameterName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="MethodTypeParameterName"/>
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+        </module>
+        <module name="ParameterName"/>
+        <module name="PatternVariableName"/>
+        <module name="RecordComponentName"/>
+        <module name="RecordTypeParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+        <!--Regexp--> <!--N/A-->
+        <!--Size Violations--> <!--N/A-->
+
+        <!--Whitespace-->
+        <module name="EmptyForInitializerPad"/>
+        <module name="EmptyForIteratorPad"/>
+        <module name="EmptyLineSeparator">
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+            <property name="tokens" value="IMPORT,STATIC_IMPORT,CLASS_DEF,INTERFACE_DEF,ENUM_DEF,STATIC_INIT,INSTANCE_INIT,METHOD_DEF,CTOR_DEF,VARIABLE_DEF,RECORD_DEF,COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="GenericWhitespace"/>
+        <module name="MethodParamPad"/>
+        <module name="NoLineWrap"/> <!--just imports and packages-->
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="NoWhitespaceBeforeCaseDefaultColon"/>
+        <module name="ParenPad"/>
+        <module name="SingleSpaceSeparator"/>
+        <module name="TypecastParenPad"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+
+        <!--Custom-->
+        <module name="JavadocAlignParameterDescription"/>
+        <module name="NullabilityAnnotations"/>
+    </module>
+</module>

paper-api/.checkstyle/packages.txt

@@ -0,0 +1,182 @@
+paper-api-generator/generated/com/destroystokyo/paper/entity/ai/
+paper-api-generator/generated/io/papermc/paper/registry/keys/
+paper-api-generator/generated/io/papermc/paper/registry/keys/tags/
+paper-api/src/main/java/co/aikar/timings/
+paper-api/src/main/java/co/aikar/util/
+paper-api/src/main/java/com/destroystokyo/paper/
+paper-api/src/main/java/com/destroystokyo/paper/block/
+paper-api/src/main/java/com/destroystokyo/paper/brigadier/
+paper-api/src/main/java/com/destroystokyo/paper/entity/
+paper-api/src/main/java/com/destroystokyo/paper/entity/ai/
+paper-api/src/main/java/com/destroystokyo/paper/entity/villager/
+paper-api/src/main/java/com/destroystokyo/paper/event/block/
+paper-api/src/main/java/com/destroystokyo/paper/event/brigadier/
+paper-api/src/main/java/com/destroystokyo/paper/event/entity/
+paper-api/src/main/java/com/destroystokyo/paper/event/inventory/
+paper-api/src/main/java/com/destroystokyo/paper/event/player/
+paper-api/src/main/java/com/destroystokyo/paper/event/profile/
+paper-api/src/main/java/com/destroystokyo/paper/event/server/
+paper-api/src/main/java/com/destroystokyo/paper/exception/
+paper-api/src/main/java/com/destroystokyo/paper/inventory/meta/
+paper-api/src/main/java/com/destroystokyo/paper/loottable/
+paper-api/src/main/java/com/destroystokyo/paper/network/
+paper-api/src/main/java/com/destroystokyo/paper/profile/
+paper-api/src/main/java/com/destroystokyo/paper/util/
+paper-api/src/main/java/com/destroystokyo/paper/utils/
+paper-api/src/main/java/io/papermc/paper/advancement/
+paper-api/src/main/java/io/papermc/paper/annotation/
+paper-api/src/main/java/io/papermc/paper/ban/
+paper-api/src/main/java/io/papermc/paper/block/
+paper-api/src/main/java/io/papermc/paper/block/fluid/
+paper-api/src/main/java/io/papermc/paper/block/fluid/type/
+paper-api/src/main/java/io/papermc/paper/brigadier/
+paper-api/src/main/java/io/papermc/paper/chat/
+paper-api/src/main/java/io/papermc/paper/command/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/predicate/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/range/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/resolvers/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/resolvers/selector/
+paper-api/src/main/java/io/papermc/paper/datacomponent/
+paper-api/src/main/java/io/papermc/paper/datacomponent/item/
+paper-api/src/main/java/io/papermc/paper/datacomponent/item/consumable/
+paper-api/src/main/java/io/papermc/paper/datapack/
+paper-api/src/main/java/io/papermc/paper/enchantments/
+paper-api/src/main/java/io/papermc/paper/entity/
+paper-api/src/main/java/io/papermc/paper/event/block/
+paper-api/src/main/java/io/papermc/paper/event/entity/
+paper-api/src/main/java/io/papermc/paper/event/executor/
+paper-api/src/main/java/io/papermc/paper/event/packet/
+paper-api/src/main/java/io/papermc/paper/event/player/
+paper-api/src/main/java/io/papermc/paper/event/server/
+paper-api/src/main/java/io/papermc/paper/event/world/
+paper-api/src/main/java/io/papermc/paper/event/world/border/
+paper-api/src/main/java/io/papermc/paper/generated/
+paper-api/src/main/java/io/papermc/paper/inventory/
+paper-api/src/main/java/io/papermc/paper/inventory/tooltip/
+paper-api/src/main/java/io/papermc/paper/item/
+paper-api/src/main/java/io/papermc/paper/math/
+paper-api/src/main/java/io/papermc/paper/persistence/
+paper-api/src/main/java/io/papermc/paper/plugin/
+paper-api/src/main/java/io/papermc/paper/plugin/bootstrap/
+paper-api/src/main/java/io/papermc/paper/plugin/configuration/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/configuration/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/registrar/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/types/
+paper-api/src/main/java/io/papermc/paper/plugin/loader/
+paper-api/src/main/java/io/papermc/paper/plugin/loader/library/
+paper-api/src/main/java/io/papermc/paper/plugin/loader/library/impl/
+paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/
+paper-api/src/main/java/io/papermc/paper/plugin/provider/entrypoint/
+paper-api/src/main/java/io/papermc/paper/plugin/provider/util/
+paper-api/src/main/java/io/papermc/paper/potion/
+paper-api/src/main/java/io/papermc/paper/registry/
+paper-api/src/main/java/io/papermc/paper/registry/data/
+paper-api/src/main/java/io/papermc/paper/registry/event/
+paper-api/src/main/java/io/papermc/paper/registry/event/type/
+paper-api/src/main/java/io/papermc/paper/registry/set/
+paper-api/src/main/java/io/papermc/paper/registry/tag/
+paper-api/src/main/java/io/papermc/paper/scoreboard/numbers/
+paper-api/src/main/java/io/papermc/paper/tag/
+paper-api/src/main/java/io/papermc/paper/text/
+paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/
+paper-api/src/main/java/io/papermc/paper/util/
+paper-api/src/main/java/io/papermc/paper/world/
+paper-api/src/main/java/io/papermc/paper/world/flag/
+paper-api/src/main/java/org/bukkit/
+paper-api/src/main/java/org/bukkit/advancement/
+paper-api/src/main/java/org/bukkit/attribute/
+paper-api/src/main/java/org/bukkit/ban/
+paper-api/src/main/java/org/bukkit/block/
+paper-api/src/main/java/org/bukkit/block/banner/
+paper-api/src/main/java/org/bukkit/block/data/
+paper-api/src/main/java/org/bukkit/block/data/type/
+paper-api/src/main/java/org/bukkit/block/sign/
+paper-api/src/main/java/org/bukkit/block/spawner/
+paper-api/src/main/java/org/bukkit/block/structure/
+paper-api/src/main/java/org/bukkit/boss/
+paper-api/src/main/java/org/bukkit/command/
+paper-api/src/main/java/org/bukkit/command/defaults/
+paper-api/src/main/java/org/bukkit/configuration/
+paper-api/src/main/java/org/bukkit/configuration/file/
+paper-api/src/main/java/org/bukkit/configuration/serialization/
+paper-api/src/main/java/org/bukkit/conversations/
+paper-api/src/main/java/org/bukkit/damage/
+paper-api/src/main/java/org/bukkit/enchantments/
+paper-api/src/main/java/org/bukkit/entity/
+paper-api/src/main/java/org/bukkit/entity/boat/
+paper-api/src/main/java/org/bukkit/entity/memory/
+paper-api/src/main/java/org/bukkit/entity/minecart/
+paper-api/src/main/java/org/bukkit/event/
+paper-api/src/main/java/org/bukkit/event/block/
+paper-api/src/main/java/org/bukkit/event/command/
+paper-api/src/main/java/org/bukkit/event/enchantment/
+paper-api/src/main/java/org/bukkit/event/entity/
+paper-api/src/main/java/org/bukkit/event/hanging/
+paper-api/src/main/java/org/bukkit/event/inventory/
+paper-api/src/main/java/org/bukkit/event/player/
+paper-api/src/main/java/org/bukkit/event/raid/
+paper-api/src/main/java/org/bukkit/event/server/
+paper-api/src/main/java/org/bukkit/event/vehicle/
+paper-api/src/main/java/org/bukkit/event/weather/
+paper-api/src/main/java/org/bukkit/event/world/
+paper-api/src/main/java/org/bukkit/generator/
+paper-api/src/main/java/org/bukkit/generator/structure/
+paper-api/src/main/java/org/bukkit/help/
+paper-api/src/main/java/org/bukkit/inventory/
+paper-api/src/main/java/org/bukkit/inventory/meta/
+paper-api/src/main/java/org/bukkit/inventory/meta/components/
+paper-api/src/main/java/org/bukkit/inventory/meta/tags/
+paper-api/src/main/java/org/bukkit/inventory/meta/trim/
+paper-api/src/main/java/org/bukkit/inventory/recipe/
+paper-api/src/main/java/org/bukkit/inventory/view/
+paper-api/src/main/java/org/bukkit/loot/
+paper-api/src/main/java/org/bukkit/map/
+paper-api/src/main/java/org/bukkit/material/
+paper-api/src/main/java/org/bukkit/material/types/
+paper-api/src/main/java/org/bukkit/metadata/
+paper-api/src/main/java/org/bukkit/packs/
+paper-api/src/main/java/org/bukkit/permissions/
+paper-api/src/main/java/org/bukkit/persistence/
+paper-api/src/main/java/org/bukkit/plugin/
+paper-api/src/main/java/org/bukkit/plugin/java/
+paper-api/src/main/java/org/bukkit/plugin/messaging/
+paper-api/src/main/java/org/bukkit/potion/
+paper-api/src/main/java/org/bukkit/profile/
+paper-api/src/main/java/org/bukkit/projectiles/
+paper-api/src/main/java/org/bukkit/scheduler/
+paper-api/src/main/java/org/bukkit/scoreboard/
+paper-api/src/main/java/org/bukkit/spawner/
+paper-api/src/main/java/org/bukkit/structure/
+paper-api/src/main/java/org/bukkit/tag/
+paper-api/src/main/java/org/bukkit/util/
+paper-api/src/main/java/org/bukkit/util/io/
+paper-api/src/main/java/org/bukkit/util/noise/
+paper-api/src/main/java/org/bukkit/util/permissions/
+paper-api/src/main/java/org/spigotmc/
+paper-api/src/main/java/org/spigotmc/event/player/
+paper-api/src/test/java/com/destroystokyo/paper/
+paper-api/src/test/java/io/papermc/paper/
+paper-api/src/test/java/io/papermc/paper/adventure/
+paper-api/src/test/java/io/papermc/paper/registry/
+paper-api/src/test/java/io/papermc/paper/testing/
+paper-api/src/test/java/io/papermc/paper/util/
+paper-api/src/test/java/org/bukkit/
+paper-api/src/test/java/org/bukkit/configuration/
+paper-api/src/test/java/org/bukkit/configuration/file/
+paper-api/src/test/java/org/bukkit/conversations/
+paper-api/src/test/java/org/bukkit/entity/memory/
+paper-api/src/test/java/org/bukkit/event/
+paper-api/src/test/java/org/bukkit/materials/
+paper-api/src/test/java/org/bukkit/metadata/
+paper-api/src/test/java/org/bukkit/plugin/
+paper-api/src/test/java/org/bukkit/plugin/messaging/
+paper-api/src/test/java/org/bukkit/scoreboard/
+paper-api/src/test/java/org/bukkit/support/
+paper-api/src/test/java/org/bukkit/support/provider/
+paper-api/src/test/java/org/bukkit/support/test/
+paper-api/src/test/java/org/bukkit/util/
+paper-api/src/test/java/org/bukkit/util/io/

paper-api/.checkstyle/suppressions.xml

@@ -0,0 +1,6 @@
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+    <suppress checks="MissingJavadoc.*" files="src[\\/]test[\\/]java[^\\/]*[\\/].*"/>
+</suppressions>

paper-api/.checkstyle/type-use-annotations.txt

@@ -0,0 +1,9 @@
+NonNull
+NotNull
+Nullable
+UnknownNullability
+Unmodifiable
+UnmodifiableView
+Range
+Positive
+NonNegative

paper-api/.checkstyle/xpath-suppressions.xml

@@ -0,0 +1,17 @@
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd">
+<suppressions>
+    <!--ignores all checks for @Deprecated(forRemoval=*) children-->
+    <suppress-xpath checks=".*" query="//*[MODIFIERS/ANNOTATION[(@text = 'Deprecated' or *[@text = 'Deprecated'] and ANNOTATION_MEMBER_VALUE_PAIR/IDENT[@text='forRemoval'])]]/descendant-or-self::node()"/>
+    <!--special case to ignore extra checks outside the root CLASS_DEF if the root CLASS_DEF is marked as deprecated for removal-->
+    <suppress-xpath checks=".*" query="/COMPILATION_UNIT[CLASS_DEF/MODIFIERS/ANNOTATION[IDENT[@text = 'Deprecated'] and ANNOTATION_MEMBER_VALUE_PAIR/IDENT[@text='forRemoval']]]/descendant-or-self::node()"/>
+    <!--ignores MissingJavadoc for ApiStatus.Internal children-->
+    <suppress-xpath checks="MissingJavadoc(Method|Type)" query="//*[MODIFIERS/ANNOTATION/DOT[@text = 'Internal' or *[@text = 'Internal']]]/descendant-or-self::node()"/>
+
+    <!--skip for private classes-->
+    <suppress-xpath checks="FinalClass" query="//CLASS_DEF[MODIFIERS/LITERAL_PRIVATE]"/>
+
+    <!--skip for classes inside of methods-->
+    <suppress-xpath checks="HideUtilityClassConstructor|MissingJavadoc(Method|Type)" query="//CLASS_DEF[ancestor::METHOD_DEF]"/>
+</suppressions>

paper-api/build.gradle.kts

@@ -1,7 +1,12 @@
+import io.papermc.paperweight.checkstyle.JavadocTag
+import io.papermc.paperweight.checkstyle.PaperCheckstyleTask
+import io.papermc.paperweight.checkstyle.setCustomJavadocTags
+
 plugins {
     `java-library`
     `maven-publish`
     idea
+    id("io.papermc.paperweight.paper-checkstyle")
 }
 
 java {
@@ -9,6 +14,22 @@ java {
     withJavadocJar()
 }
 
+val customJavadocTags = setOf(
+    JavadocTag("apiNote", "a", "API Note:"),
+)
+
+paperCheckstyle {
+    val packagesToSkipSource = providers.fileContents(projectLocalCheckstyleConfig.file("packages.txt")).asText.map { it.trim().split("\n").toSet() }
+    val typeUseAnnotationsProvider = providers.fileContents(projectLocalCheckstyleConfig.file("type-use-annotations.txt")).asText.map { it.trim().split("\n").toSet() }
+
+    directoriesToSkip.set(packagesToSkipSource)
+    typeUseAnnotations.set(typeUseAnnotationsProvider)
+}
+
+tasks.withType<PaperCheckstyleTask> {
+    setCustomJavadocTags(customJavadocTags)
+}
+
 val annotationsVersion = "26.0.1"
 val bungeeCordChatVersion = "1.20-R0.2"
 val adventureVersion = "4.18.0"
@@ -39,6 +60,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
 }
 
 dependencies {
+    checkstyle(project(":paper-api:custom-checkstyle"))
 
     // api dependencies are listed transitively to API consumers
     api("com.google.guava:guava:33.3.1-jre")
@@ -93,16 +115,16 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
+val generatedApiPath: java.nio.file.Path = rootProject.projectDir.toPath().resolve("paper-api-generator/generated")
 idea {
     module {
-        generatedSourceDirs.add(generatedDir.toFile())
+        generatedSourceDirs.add(generatedApiPath.toFile())
     }
 }
 sourceSets {
     main {
         java {
-            srcDir(generatedDir)
+            srcDir(generatedApiPath)
         }
     }
 }
@@ -190,7 +212,7 @@ tasks.withType<Javadoc> {
         "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
         "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
     )
-    options.tags("apiNote:a:API Note:")
+    options.tags(customJavadocTags.map { it.toOptionString() })
 
     inputs.files(apiAndDocs).ignoreEmptyDirectories().withPropertyName(apiAndDocs.name + "-configuration")
     val apiAndDocsElements = apiAndDocs.elements
@@ -228,23 +250,21 @@ tasks.compileTestJava {
     options.compilerArgs.add("-parameters")
 }
 
-val scanJarForBadCalls by tasks.registering(io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
+val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
     badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
     jarToScan.set(tasks.jar.flatMap { it.archiveFile })
     classpath.from(configurations.compileClasspath)
 }
 tasks.check {
-    dependsOn(scanJarForBadCalls)
+    dependsOn(scanJar)
 }
 
-if (providers.gradleProperty("updatingMinecraft").getOrElse("false").toBoolean()) {
-    val scanJarForOldGeneratedCode by tasks.registering(io.papermc.paperweight.tasks.ScanJarForOldGeneratedCode::class) {
-        mcVersion.set(providers.gradleProperty("mcVersion"))
-        annotation.set("Lio/papermc/paper/generated/GeneratedFrom;")
-        jarToScan.set(tasks.jar.flatMap { it.archiveFile })
-        classpath.from(configurations.compileClasspath)
-    }
-    tasks.check {
-        dependsOn(scanJarForOldGeneratedCode)
-    }
+val scanJarForOldGeneratedCode = tasks.register("scanJarForOldGeneratedCode", io.papermc.paperweight.tasks.ScanJarForOldGeneratedCode::class) {
+    mcVersion.set(providers.gradleProperty("mcVersion"))
+    annotation.set("Lio/papermc/paper/generated/GeneratedFrom;")
+    jarToScan.set(tasks.jar.flatMap { it.archiveFile })
+    classpath.from(configurations.compileClasspath)
+}
+tasks.check {
+    dependsOn(scanJarForOldGeneratedCode)
 }

paper-api/custom-checkstyle/build.gradle.kts

@@ -0,0 +1,8 @@
+plugins {
+    java
+}
+
+dependencies {
+    implementation("com.puppycrawl.tools:checkstyle:10.21.1")
+    implementation("org.jspecify:jspecify:1.0.0")
+}

paper-api/custom-checkstyle/src/main/java/io/papermc/checkstyle/Util.java

@@ -0,0 +1,90 @@
+package io.papermc.checkstyle;
+
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+import com.puppycrawl.tools.checkstyle.api.DetailNode;
+import com.puppycrawl.tools.checkstyle.utils.JavadocUtil;
+import com.puppycrawl.tools.checkstyle.utils.TokenUtil;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Utility class containing utility methods for custom checkstyle checks.
+ */
+public final class Util {
+
+    private Util() {
+    }
+
+    /**
+     * Gets the previous sibling of the given node with the given type.
+     *
+     * @param node the node
+     * @param type the type
+     * @return the previous sibling with the given type, or {@code null} if not found
+     */
+    public static @Nullable DetailNode getPreviousSibling(final DetailNode node, final int type) {
+        DetailNode sibling = JavadocUtil.getPreviousSibling(node);
+        while (sibling != null && sibling.getType() != type) {
+            sibling = JavadocUtil.getPreviousSibling(sibling);
+        }
+        return sibling;
+    }
+
+    /**
+     * Gets the next sibling of the given node with the given type.
+     *
+     * @param node the node
+     * @param type the type
+     * @return the next sibling with the given type, or {@code null} if not found
+     */
+    public static @Nullable DetailAST getNextSibling(final DetailAST node, final int type) {
+        DetailAST sibling = node.getNextSibling();
+        while (sibling != null && sibling.getType() != type) {
+            sibling = sibling.getNextSibling();
+        }
+        return sibling;
+    }
+
+    /**
+     * Gets the enclosing type declaration of the given node.
+     *
+     * @param node the node
+     * @return the enclosing type declaration, or {@code null} if not found
+     */
+    public static @Nullable DetailAST getEnclosingTypeDeclaration(final DetailAST node) {
+        DetailAST parent = node.getParent();
+        while (parent != null && !TokenUtil.isTypeDeclaration(parent.getType())) {
+            parent = parent.getParent();
+        }
+        return parent;
+    }
+
+    /**
+     * Gets an iterator over the children of the given node with the given type.
+     *
+     * @param ast the node
+     * @param type the type
+     * @return the iterator
+     */
+    public static Iterable<DetailAST> childrenIterator(final DetailAST ast, final int type) {
+        return () -> new Iterator<>() {
+            private @Nullable DetailAST current = TokenUtil.findFirstTokenByPredicate(ast, child -> child.getType() == type).orElse(null);
+
+            @Override
+            public boolean hasNext() {
+                return this.current != null;
+            }
+
+            @Override
+            public DetailAST next() {
+                if (this.current == null) {
+                    throw new NoSuchElementException();
+                }
+                final DetailAST result = this.current;
+                this.current = getNextSibling(this.current, type);
+                return result;
+            }
+        };
+    }
+}

paper-api/custom-checkstyle/src/main/java/io/papermc/checkstyle/checks/JavadocAlignParameterDescriptionCheck.java

@@ -0,0 +1,49 @@
+package io.papermc.checkstyle.checks;
+
+import com.puppycrawl.tools.checkstyle.api.DetailNode;
+import com.puppycrawl.tools.checkstyle.api.JavadocTokenTypes;
+import com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck;
+import com.puppycrawl.tools.checkstyle.utils.JavadocUtil;
+import io.papermc.checkstyle.Util;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Checks that parameter descriptions in Javadoc are aligned.
+ */
+public final class JavadocAlignParameterDescriptionCheck extends AbstractJavadocCheck {
+
+    @Override
+    public int[] getDefaultJavadocTokens() {
+        return new int[]{JavadocTokenTypes.JAVADOC};
+    }
+
+    @Override
+    public void visitJavadocToken(final DetailNode detailNode) {
+        final List<DetailNode> params = new ArrayList<>();
+        int maxColumn = -1;
+        for (final DetailNode child : detailNode.getChildren()) {
+            final DetailNode paramLiteralNode = JavadocUtil.findFirstToken(child, JavadocTokenTypes.PARAM_LITERAL);
+            if (child.getType() != JavadocTokenTypes.JAVADOC_TAG || paramLiteralNode == null) {
+                continue;
+            }
+            final DetailNode paramDescription = JavadocUtil.getNextSibling(paramLiteralNode, JavadocTokenTypes.DESCRIPTION);
+            maxColumn = Math.max(maxColumn, paramDescription.getColumnNumber());
+            params.add(paramDescription);
+        }
+
+        for (final DetailNode param : params) {
+            if (param.getColumnNumber() != maxColumn) {
+                final DetailNode paramNameNode = Util.getPreviousSibling(param, JavadocTokenTypes.PARAMETER_NAME);
+                if (paramNameNode == null) {
+                    continue;
+                }
+                this.log(
+                    param.getLineNumber(),
+                    param.getColumnNumber() - 1,
+                    "Param description for %s should start at column %d".formatted(paramNameNode.getText(), maxColumn)
+                );
+            }
+        }
+    }
+}

paper-api/custom-checkstyle/src/main/java/io/papermc/checkstyle/checks/NullabilityAnnotationsCheck.java

@@ -0,0 +1,154 @@
+package io.papermc.checkstyle.checks;
+
+import com.puppycrawl.tools.checkstyle.JavaParser;
+import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
+import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import io.papermc.checkstyle.Util;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Set;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Checks that nullability annotations are present where required.
+ */
+public final class NullabilityAnnotationsCheck extends AbstractCheck {
+
+    @Override
+    public int[] getDefaultTokens() {
+        return this.getRequiredTokens();
+    }
+
+    @Override
+    public int[] getAcceptableTokens() {
+        return this.getRequiredTokens();
+    }
+
+    @Override
+    public int[] getRequiredTokens() {
+        return new int[]{
+            TokenTypes.METHOD_DEF,
+            TokenTypes.PARAMETER_DEF,
+            TokenTypes.ANNOTATION_FIELD_DEF,
+            TokenTypes.RECORD_COMPONENT_DEF, // annotations are in ANNOTATIONS token block
+        };
+    }
+
+    private static final Set<String> NULLABILITY_ANNOTATIONS = Set.of("Nullable", "NonNull");
+
+    // for checking for annotations on nested types like "OuterType.@Nullable InnerType"
+    private static boolean typeHasNullabilityAnnotation(final @Nullable DetailAST type) {
+        final DetailAST dot;
+        if (type == null || (dot = type.findFirstToken(TokenTypes.DOT)) == null) {
+            return false;
+        }
+        return hasNullabilityAnnotationChild(dot.findFirstToken(TokenTypes.ANNOTATIONS));
+    }
+
+    private static boolean hasNullabilityAnnotationChild(final @Nullable DetailAST ast) {
+        if (ast == null) {
+            return false;
+        }
+        for (final DetailAST annotation : Util.childrenIterator(ast, TokenTypes.ANNOTATION)) {
+            if (annotation.getChildCount(TokenTypes.IDENT) != 1) {
+                // skip `.` annotations like ApiStatus.Internal as these aren't nullability annotations
+                continue;
+            }
+            final String ident = annotation.findFirstToken(TokenTypes.IDENT).getText();
+            if (NULLABILITY_ANNOTATIONS.contains(ident)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean hasNullabilityAnnotation(final DetailAST inputAst) {
+        if (inputAst.getType() == TokenTypes.RECORD_COMPONENT_DEF && hasNullabilityAnnotationChild(inputAst.findFirstToken(TokenTypes.ANNOTATIONS))) {
+            return true;
+        } else if (inputAst.getType() != TokenTypes.RECORD_COMPONENT_DEF && hasNullabilityAnnotationChild(inputAst.findFirstToken(TokenTypes.MODIFIERS))) {
+            return true;
+        } else {
+            return typeHasNullabilityAnnotation(inputAst.findFirstToken(TokenTypes.TYPE));
+        }
+    }
+
+    private static boolean isNullMarkedAnnotation(final DetailAST annotation) {
+        if (annotation.getChildCount(TokenTypes.IDENT) != 1) {
+            return false;
+        }
+        final String ident = annotation.findFirstToken(TokenTypes.IDENT).getText();
+        return "NullMarked".equals(ident);
+    }
+
+    private static boolean isTypeDeclarationNullMarked(final DetailAST typeDeclaration) {
+        final DetailAST modifiers = typeDeclaration.findFirstToken(TokenTypes.MODIFIERS);
+        if (modifiers == null) {
+            return false;
+        }
+        for (final DetailAST annotation : Util.childrenIterator(modifiers, TokenTypes.ANNOTATION)) {
+            if (isNullMarkedAnnotation(annotation)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isPackageInfoNullMarked() {
+        final Path currentPath = Path.of(this.getFilePath());
+        final Path packageInfo = currentPath.getParent().resolve("package-info.java");
+        if (Files.notExists(packageInfo)) {
+            return false;
+        }
+        final DetailAST packageInfoAst;
+        try {
+            packageInfoAst = JavaParser.parseFile(packageInfo.toFile(), JavaParser.Options.WITHOUT_COMMENTS);
+        } catch (final IOException | CheckstyleException e) {
+            throw new RuntimeException(e);
+        }
+        final DetailAST firstToken = packageInfoAst.findFirstToken(TokenTypes.PACKAGE_DEF);
+        if (firstToken == null) {
+            return false;
+        }
+        final DetailAST annotations = firstToken.findFirstToken(TokenTypes.ANNOTATIONS);
+        for (final DetailAST annotation : Util.childrenIterator(annotations, TokenTypes.ANNOTATION)) {
+            if (isNullMarkedAnnotation(annotation)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void visitToken(final DetailAST ast) {
+        if (hasNullabilityAnnotation(ast)) {
+            return;
+        }
+        for (DetailAST parentDef = Util.getEnclosingTypeDeclaration(ast); parentDef != null; parentDef = Util.getEnclosingTypeDeclaration(parentDef)) {
+            if (isTypeDeclarationNullMarked(parentDef)) {
+                return;
+            }
+        }
+        if (this.isPackageInfoNullMarked()) {
+            return;
+        }
+        this.recordViolation(ast);
+    }
+
+    private static DetailAST getTypeAstForViolation(final DetailAST inputAst) {
+        final DetailAST typeToken = inputAst.findFirstToken(TokenTypes.TYPE);
+        final DetailAST dot;
+        if (typeToken != null && (dot = typeToken.findFirstToken(TokenTypes.DOT)) != null) {
+            return Objects.requireNonNullElse(dot.getLastChild(), inputAst);
+        }
+        return Objects.requireNonNullElse(typeToken, inputAst);
+    }
+
+    private void recordViolation(final DetailAST ast) {
+        final DetailAST typeAst = getTypeAstForViolation(ast);
+        this.log(typeAst.getLineNo(), typeAst.getColumnNo() - 1, "Missing nullability annotation");
+    }
+}

paper-api/custom-checkstyle/src/main/java/io/papermc/checkstyle/checks/package-info.java

@@ -0,0 +1,8 @@
+/**
+ * Custom checkstyle checks for PaperMC projects.
+ */
+@NullMarked
+@SuppressWarnings("unused")
+package io.papermc.checkstyle.checks;
+
+import org.jspecify.annotations.NullMarked;

paper-api/custom-checkstyle/src/main/java/io/papermc/checkstyle/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * This package contains custom checkstyle rules for PaperMC projects.
+ */
+@NullMarked
+package io.papermc.checkstyle;
+
+import org.jspecify.annotations.NullMarked;

paper-api/custom-checkstyle/src/main/resources/checkstyle_packages.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE checkstyle-packages PUBLIC
+    "-//Checkstyle//DTD Package Names Configuration 1.0//EN"
+    "https://checkstyle.org/dtds/packages_1_0.dtd">
+
+<checkstyle-packages>
+    <package name="io.papermc.checkstyle.checks"/>
+</checkstyle-packages>

paper-api/src/generated/java/io/papermc/paper/registry/keys/DataComponentTypeKeys.java

@@ -1,503 +0,0 @@
-package io.papermc.paper.registry.keys;
-
-import static net.kyori.adventure.key.Key.key;
-
-import io.papermc.paper.datacomponent.DataComponentType;
-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#DATA_COMPONENT_TYPE}.
- *
- * @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.4")
-public final class DataComponentTypeKeys {
-    /**
-     * {@code minecraft:attribute_modifiers}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> ATTRIBUTE_MODIFIERS = create(key("attribute_modifiers"));
-
-    /**
-     * {@code minecraft:banner_patterns}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> BANNER_PATTERNS = create(key("banner_patterns"));
-
-    /**
-     * {@code minecraft:base_color}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> BASE_COLOR = create(key("base_color"));
-
-    /**
-     * {@code minecraft:bees}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> BEES = create(key("bees"));
-
-    /**
-     * {@code minecraft:block_entity_data}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> BLOCK_ENTITY_DATA = create(key("block_entity_data"));
-
-    /**
-     * {@code minecraft:block_state}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> BLOCK_STATE = create(key("block_state"));
-
-    /**
-     * {@code minecraft:bucket_entity_data}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> BUCKET_ENTITY_DATA = create(key("bucket_entity_data"));
-
-    /**
-     * {@code minecraft:bundle_contents}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> BUNDLE_CONTENTS = create(key("bundle_contents"));
-
-    /**
-     * {@code minecraft:can_break}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CAN_BREAK = create(key("can_break"));
-
-    /**
-     * {@code minecraft:can_place_on}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CAN_PLACE_ON = create(key("can_place_on"));
-
-    /**
-     * {@code minecraft:charged_projectiles}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CHARGED_PROJECTILES = create(key("charged_projectiles"));
-
-    /**
-     * {@code minecraft:consumable}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CONSUMABLE = create(key("consumable"));
-
-    /**
-     * {@code minecraft:container}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CONTAINER = create(key("container"));
-
-    /**
-     * {@code minecraft:container_loot}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CONTAINER_LOOT = create(key("container_loot"));
-
-    /**
-     * {@code minecraft:creative_slot_lock}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CREATIVE_SLOT_LOCK = create(key("creative_slot_lock"));
-
-    /**
-     * {@code minecraft:custom_data}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CUSTOM_DATA = create(key("custom_data"));
-
-    /**
-     * {@code minecraft:custom_model_data}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CUSTOM_MODEL_DATA = create(key("custom_model_data"));
-
-    /**
-     * {@code minecraft:custom_name}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> CUSTOM_NAME = create(key("custom_name"));
-
-    /**
-     * {@code minecraft:damage}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> DAMAGE = create(key("damage"));
-
-    /**
-     * {@code minecraft:damage_resistant}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> DAMAGE_RESISTANT = create(key("damage_resistant"));
-
-    /**
-     * {@code minecraft:death_protection}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> DEATH_PROTECTION = create(key("death_protection"));
-
-    /**
-     * {@code minecraft:debug_stick_state}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> DEBUG_STICK_STATE = create(key("debug_stick_state"));
-
-    /**
-     * {@code minecraft:dyed_color}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> DYED_COLOR = create(key("dyed_color"));
-
-    /**
-     * {@code minecraft:enchantable}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> ENCHANTABLE = create(key("enchantable"));
-
-    /**
-     * {@code minecraft:enchantment_glint_override}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> ENCHANTMENT_GLINT_OVERRIDE = create(key("enchantment_glint_override"));
-
-    /**
-     * {@code minecraft:enchantments}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> ENCHANTMENTS = create(key("enchantments"));
-
-    /**
-     * {@code minecraft:entity_data}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> ENTITY_DATA = create(key("entity_data"));
-
-    /**
-     * {@code minecraft:equippable}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> EQUIPPABLE = create(key("equippable"));
-
-    /**
-     * {@code minecraft:firework_explosion}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> FIREWORK_EXPLOSION = create(key("firework_explosion"));
-
-    /**
-     * {@code minecraft:fireworks}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> FIREWORKS = create(key("fireworks"));
-
-    /**
-     * {@code minecraft:food}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> FOOD = create(key("food"));
-
-    /**
-     * {@code minecraft:glider}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> GLIDER = create(key("glider"));
-
-    /**
-     * {@code minecraft:hide_additional_tooltip}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> HIDE_ADDITIONAL_TOOLTIP = create(key("hide_additional_tooltip"));
-
-    /**
-     * {@code minecraft:hide_tooltip}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> HIDE_TOOLTIP = create(key("hide_tooltip"));
-
-    /**
-     * {@code minecraft:instrument}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> INSTRUMENT = create(key("instrument"));
-
-    /**
-     * {@code minecraft:intangible_projectile}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> INTANGIBLE_PROJECTILE = create(key("intangible_projectile"));
-
-    /**
-     * {@code minecraft:item_model}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> ITEM_MODEL = create(key("item_model"));
-
-    /**
-     * {@code minecraft:item_name}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> ITEM_NAME = create(key("item_name"));
-
-    /**
-     * {@code minecraft:jukebox_playable}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> JUKEBOX_PLAYABLE = create(key("jukebox_playable"));
-
-    /**
-     * {@code minecraft:lock}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> LOCK = create(key("lock"));
-
-    /**
-     * {@code minecraft:lodestone_tracker}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> LODESTONE_TRACKER = create(key("lodestone_tracker"));
-
-    /**
-     * {@code minecraft:lore}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> LORE = create(key("lore"));
-
-    /**
-     * {@code minecraft:map_color}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> MAP_COLOR = create(key("map_color"));
-
-    /**
-     * {@code minecraft:map_decorations}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> MAP_DECORATIONS = create(key("map_decorations"));
-
-    /**
-     * {@code minecraft:map_id}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> MAP_ID = create(key("map_id"));
-
-    /**
-     * {@code minecraft:map_post_processing}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> MAP_POST_PROCESSING = create(key("map_post_processing"));
-
-    /**
-     * {@code minecraft:max_damage}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> MAX_DAMAGE = create(key("max_damage"));
-
-    /**
-     * {@code minecraft:max_stack_size}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> MAX_STACK_SIZE = create(key("max_stack_size"));
-
-    /**
-     * {@code minecraft:note_block_sound}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> NOTE_BLOCK_SOUND = create(key("note_block_sound"));
-
-    /**
-     * {@code minecraft:ominous_bottle_amplifier}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> OMINOUS_BOTTLE_AMPLIFIER = create(key("ominous_bottle_amplifier"));
-
-    /**
-     * {@code minecraft:pot_decorations}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> POT_DECORATIONS = create(key("pot_decorations"));
-
-    /**
-     * {@code minecraft:potion_contents}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> POTION_CONTENTS = create(key("potion_contents"));
-
-    /**
-     * {@code minecraft:profile}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> PROFILE = create(key("profile"));
-
-    /**
-     * {@code minecraft:rarity}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> RARITY = create(key("rarity"));
-
-    /**
-     * {@code minecraft:recipes}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> RECIPES = create(key("recipes"));
-
-    /**
-     * {@code minecraft:repair_cost}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> REPAIR_COST = create(key("repair_cost"));
-
-    /**
-     * {@code minecraft:repairable}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> REPAIRABLE = create(key("repairable"));
-
-    /**
-     * {@code minecraft:stored_enchantments}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> STORED_ENCHANTMENTS = create(key("stored_enchantments"));
-
-    /**
-     * {@code minecraft:suspicious_stew_effects}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> SUSPICIOUS_STEW_EFFECTS = create(key("suspicious_stew_effects"));
-
-    /**
-     * {@code minecraft:tool}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> TOOL = create(key("tool"));
-
-    /**
-     * {@code minecraft:tooltip_style}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> TOOLTIP_STYLE = create(key("tooltip_style"));
-
-    /**
-     * {@code minecraft:trim}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> TRIM = create(key("trim"));
-
-    /**
-     * {@code minecraft:unbreakable}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> UNBREAKABLE = create(key("unbreakable"));
-
-    /**
-     * {@code minecraft:use_cooldown}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> USE_COOLDOWN = create(key("use_cooldown"));
-
-    /**
-     * {@code minecraft:use_remainder}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> USE_REMAINDER = create(key("use_remainder"));
-
-    /**
-     * {@code minecraft:writable_book_content}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> WRITABLE_BOOK_CONTENT = create(key("writable_book_content"));
-
-    /**
-     * {@code minecraft:written_book_content}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> WRITTEN_BOOK_CONTENT = create(key("written_book_content"));
-
-    private DataComponentTypeKeys() {
-    }
-
-    private static TypedKey<DataComponentType> create(final Key key) {
-        return TypedKey.create(RegistryKey.DATA_COMPONENT_TYPE, key);
-    }
-}

paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java

@@ -5,7 +5,6 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
@@ -17,10 +16,8 @@ import static org.bukkit.Material.*;
  * Called when the player themselves change their armor items
  * <p>
  * Not currently called for environmental factors though it <strong>MAY BE IN THE FUTURE</strong>
- * @apiNote Use {@link io.papermc.paper.event.entity.EntityEquipmentChangedEvent} for all entity equipment changes
  */
 @NullMarked
-@ApiStatus.Obsolete(since = "1.21.4")
 public class PlayerArmorChangeEvent extends PlayerEvent {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
@@ -41,27 +38,11 @@ public class PlayerArmorChangeEvent extends PlayerEvent {
      * Gets the type of slot being altered.
      *
      * @return type of slot being altered
-     * @deprecated {@link SlotType} does not accurately represent what item types are valid in each slot. Use {@link #getSlot()} instead.
      */
-    @Deprecated(since = "1.21.4")
     public SlotType getSlotType() {
         return this.slotType;
     }
 
-    /**
-     * Gets the slot being altered.
-     *
-     * @return slot being altered
-     */
-    public EquipmentSlot getSlot() {
-        return switch (this.slotType) {
-            case HEAD -> EquipmentSlot.HEAD;
-            case CHEST -> EquipmentSlot.CHEST;
-            case LEGS -> EquipmentSlot.LEGS;
-            case FEET -> EquipmentSlot.FEET;
-        };
-    }
-
     /**
      * Gets the existing item that's being replaced
      *
@@ -89,10 +70,6 @@ public class PlayerArmorChangeEvent extends PlayerEvent {
         return HANDLER_LIST;
     }
 
-    /**
-     * @deprecated {@link SlotType} does not accurately represent what item types are valid in each slot.
-     */
-    @Deprecated(since = "1.21.4")
     public enum SlotType {
         HEAD(NETHERITE_HELMET, DIAMOND_HELMET, GOLDEN_HELMET, IRON_HELMET, CHAINMAIL_HELMET, LEATHER_HELMET, CARVED_PUMPKIN, PLAYER_HEAD, SKELETON_SKULL, ZOMBIE_HEAD, CREEPER_HEAD, WITHER_SKELETON_SKULL, TURTLE_HELMET, DRAGON_HEAD, PIGLIN_HEAD),
         CHEST(NETHERITE_CHESTPLATE, DIAMOND_CHESTPLATE, GOLDEN_CHESTPLATE, IRON_CHESTPLATE, CHAINMAIL_CHESTPLATE, LEATHER_CHESTPLATE, ELYTRA),

paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java

@@ -11,7 +11,7 @@ import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
- * Represents an event that is called when a player clicks an unknown entity.
+ * Represents an event that is called when a player right-clicks an unknown entity.
  * Useful for plugins dealing with virtual entities (entities that aren't actually spawned on the server).
  * <br>
  * This event may be called multiple times per interaction with different interaction hands

paper-api/src/main/java/io/papermc/paper/InternalAPIBridge.java

@@ -3,7 +3,6 @@ package io.papermc.paper;
 import net.kyori.adventure.util.Services;
 import org.bukkit.damage.DamageEffect;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Static bridge to the server internals.
@@ -12,7 +11,6 @@ import org.jspecify.annotations.NullMarked;
  * cause issues when called under unexpected circumstances.
  */
 @ApiStatus.Internal
-@NullMarked
 public interface InternalAPIBridge {
 
     /**
@@ -36,4 +34,3 @@ public interface InternalAPIBridge {
      */
     DamageEffect getDamageEffect(String key);
 }
-

paper-api/src/main/java/io/papermc/paper/ServerBuildInfo.java

@@ -6,12 +6,10 @@ import java.util.OptionalInt;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.util.Services;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Information about the current server build.
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ServerBuildInfo {
     /**
@@ -30,6 +28,7 @@ public interface ServerBuildInfo {
             static final Optional<ServerBuildInfo> INSTANCE = Services.service(ServerBuildInfo.class);
         }
         //</editor-fold>
+
         return Holder.INSTANCE.orElseThrow();
     }
 
@@ -47,7 +46,7 @@ public interface ServerBuildInfo {
      * @return {@code true} if the server supports the specified brand
      */
     @ApiStatus.Experimental
-    boolean isBrandCompatible(final Key brandId);
+    boolean isBrandCompatible(Key brandId);
 
     /**
      * Gets the brand name of the server.
@@ -104,7 +103,7 @@ public interface ServerBuildInfo {
      * @param representation the type of representation
      * @return a string
      */
-    String asString(final StringRepresentation representation);
+    String asString(StringRepresentation representation);
 
     /**
      * String representation types.

paper-api/src/main/java/io/papermc/paper/command/brigadier/CommandRegistrationFlag.java

@@ -10,10 +10,5 @@ import org.jetbrains.annotations.ApiStatus;
  */
 @ApiStatus.Internal
 public enum CommandRegistrationFlag {
-
-    /**
-     * @deprecated This is the default behavior now.
-     */
-    @Deprecated(since = "1.21.4")
     FLATTEN_ALIASES
 }

paper-api/src/main/java/io/papermc/paper/command/brigadier/CommandSourceStack.java

@@ -1,7 +1,5 @@
 package io.papermc.paper.command.brigadier;
 
-import com.mojang.brigadier.RedirectModifier;
-import com.mojang.brigadier.tree.CommandNode;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
@@ -50,24 +48,4 @@ public interface CommandSourceStack {
      * @return entity that executes this command
      */
     @Nullable Entity getExecutor();
-
-    /**
-     * Creates a new CommandSourceStack object with a different location for redirecting commands to other nodes.
-     *
-     * @param location The location to create a new CommandSourceStack object with
-     * @return The newly created CommandSourceStack
-     * @see #getLocation()
-     * @see com.mojang.brigadier.builder.ArgumentBuilder#fork(CommandNode, RedirectModifier)
-     */
-    CommandSourceStack withLocation(Location location);
-
-    /**
-     * Creates a new CommandSourceStack object with a different executor for redirecting commands to other nodes.
-     *
-     * @param executor The executing entity to create a new CommandSourceStack object with
-     * @return The newly created CommandSourceStack
-     * @see #getExecutor()
-     * @see com.mojang.brigadier.builder.ArgumentBuilder#fork(CommandNode, RedirectModifier)
-     */
-    CommandSourceStack withExecutor(Entity executor);
 }

paper-api/src/main/java/io/papermc/paper/command/brigadier/Commands.java

@@ -113,7 +113,6 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
-     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *
@@ -130,7 +129,6 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
-     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *
@@ -148,7 +146,6 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
-     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *
@@ -166,7 +163,6 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
-     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *
@@ -183,7 +179,6 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
-     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *

paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java

@@ -7,7 +7,6 @@ import io.papermc.paper.command.brigadier.argument.range.IntegerRangeProvider;
 import io.papermc.paper.command.brigadier.argument.resolvers.BlockPositionResolver;
 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;
 import io.papermc.paper.command.brigadier.argument.resolvers.selector.EntitySelectorArgumentResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.selector.PlayerSelectorArgumentResolver;
 import io.papermc.paper.entity.LookAnchor;
@@ -124,15 +123,6 @@ public final class ArgumentTypes {
         return provider().finePosition(centerIntegers);
     }
 
-    /**
-     * A rotation argument.
-     *
-     * @return rotation argument
-     */
-    public static ArgumentType<RotationResolver> rotation() {
-        return provider().rotation();
-    }
-
     /**
      * A blockstate argument which will provide rich parsing for specifying
      * the specific block variant and then the block entity NBT if applicable.

paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProvider.java

@@ -7,7 +7,6 @@ import io.papermc.paper.command.brigadier.argument.range.IntegerRangeProvider;
 import io.papermc.paper.command.brigadier.argument.resolvers.BlockPositionResolver;
 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;
 import io.papermc.paper.command.brigadier.argument.resolvers.selector.EntitySelectorArgumentResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.selector.PlayerSelectorArgumentResolver;
 import io.papermc.paper.entity.LookAnchor;
@@ -58,8 +57,6 @@ interface VanillaArgumentProvider {
 
     ArgumentType<FinePositionResolver> finePosition(boolean centerIntegers);
 
-    ArgumentType<RotationResolver> rotation();
-
     ArgumentType<BlockState> blockState();
 
     ArgumentType<ItemStack> itemStack();

paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/resolvers/RotationResolver.java

@@ -1,16 +0,0 @@
-package io.papermc.paper.command.brigadier.argument.resolvers;
-
-import io.papermc.paper.command.brigadier.CommandSourceStack;
-import io.papermc.paper.math.Rotation;
-import org.jetbrains.annotations.ApiStatus;
-
-/**
- * An {@link ArgumentResolver} that's capable of resolving
- * a rotation argument value using a {@link CommandSourceStack}.
- *
- * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#rotation()
- */
-@ApiStatus.Experimental
-@ApiStatus.NonExtendable
-public interface RotationResolver extends ArgumentResolver<Rotation> {
-}

paper-api/src/main/java/io/papermc/paper/datacomponent/DataComponentTypes.java

@@ -63,76 +63,21 @@ import static java.util.Objects.requireNonNull;
 @ApiStatus.Experimental
 public final class DataComponentTypes {
 
-    // Start generate - DataComponentTypes
-    // @GeneratedFrom 1.21.4
     /**
-     * Holds attribute modifiers applied to any item,
-     * if not set, has an implicit default value based on the item type's
-     * default attributes (e.g. attack damage for weapons).
+     * Controls the maximum stacking size of this item.
+     * <br>
+     * Values greater than 1 are mutually exclusive with the {@link #MAX_DAMAGE} component.
      */
-    public static final DataComponentType.Valued<ItemAttributeModifiers> ATTRIBUTE_MODIFIERS = valued("attribute_modifiers");
-
+    public static final DataComponentType.Valued<@IntRange(from = 1, to = 99) Integer> MAX_STACK_SIZE = valued("max_stack_size");
     /**
-     * Stores the additional patterns applied to a Banner or Shield.
-     */
-    public static final DataComponentType.Valued<BannerPatternLayers> BANNER_PATTERNS = valued("banner_patterns");
-
-    /**
-     * Stores the base color for a Shield.
-     */
-    public static final DataComponentType.Valued<DyeColor> BASE_COLOR = valued("base_color");
-
-    /**
-     * Holds block state properties to apply when placing a block.
-     */
-    public static final DataComponentType.Valued<BlockItemDataProperties> BLOCK_DATA = valued("block_state");
-
-    /**
-     * Holds all items stored inside a Bundle.
-     * If removed, items cannot be added to the Bundle.
-     */
-    public static final DataComponentType.Valued<BundleContents> BUNDLE_CONTENTS = valued("bundle_contents");
-
-    /**
-     * Controls which blocks a player in Adventure mode can break with this item.
-     */
-    public static final DataComponentType.Valued<ItemAdventurePredicate> CAN_BREAK = valued("can_break");
-
-    /**
-     * Controls which blocks a player in Adventure mode can place on with this item.
-     */
-    public static final DataComponentType.Valued<ItemAdventurePredicate> CAN_PLACE_ON = valued("can_place_on");
-
-    /**
-     * Holds all projectiles that have been loaded into a Crossbow.
-     * If not present, the Crossbow is not charged.
-     */
-    public static final DataComponentType.Valued<ChargedProjectiles> CHARGED_PROJECTILES = valued("charged_projectiles");
-
-    public static final DataComponentType.Valued<Consumable> CONSUMABLE = valued("consumable");
-
-    /**
-     * Holds the contents of container blocks (Chests, Shulker Boxes) in item form.
-     */
-    public static final DataComponentType.Valued<ItemContainerContents> CONTAINER = valued("container");
-
-    /**
-     * Holds the unresolved loot table and seed of a container-like block.
-     */
-    public static final DataComponentType.Valued<SeededContainerLoot> CONTAINER_LOOT = valued("container_loot");
-
-    /**
-     * Controls the minecraft:custom_model_data property in the item model.
-     */
-    public static final DataComponentType.Valued<CustomModelData> CUSTOM_MODEL_DATA = valued("custom_model_data");
-
-    /**
-     * Custom name override for an item (as set by renaming with an Anvil).
+     * Controls the maximum amount of damage than an item can take,
+     * if not present, the item cannot be damaged.
+     * <br>
+     * Mutually exclusive with the {@link #MAX_STACK_SIZE} component greater than 1.
      *
-     * @see #ITEM_NAME
+     * @see #DAMAGE
      */
-    public static final DataComponentType.Valued<Component> CUSTOM_NAME = valued("custom_name");
-
+    public static final DataComponentType.Valued<@Positive Integer> MAX_DAMAGE = valued("max_damage");
     /**
      * The amount of durability removed from an item,
      * for damageable items (with the {@link #MAX_DAMAGE} component), has an implicit default value of: {@code 0}.
@@ -140,80 +85,16 @@ public final class DataComponentTypes {
      * @see #MAX_DAMAGE
      */
     public static final DataComponentType.Valued<@NonNegative Integer> DAMAGE = valued("damage");
-
     /**
-     * If present, this item will not take damage from the specified damage types.
+     * If set, the item will not lose any durability when used.
      */
-    public static final DataComponentType.Valued<DamageResistant> DAMAGE_RESISTANT = valued("damage_resistant");
-
-    public static final DataComponentType.Valued<DeathProtection> DEATH_PROTECTION = valued("death_protection");
-
+    public static final DataComponentType.Valued<Unbreakable> UNBREAKABLE = valued("unbreakable");
     /**
-     * Represents a color applied to a dyeable item (in the {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#DYEABLE} item tag).
-     */
-    public static final DataComponentType.Valued<DyedItemColor> DYED_COLOR = valued("dyed_color");
-
-    public static final DataComponentType.Valued<Enchantable> ENCHANTABLE = valued("enchantable");
-
-    /**
-     * Overrides the enchantment glint effect on an item.
-     * If not present, default behaviour is used.
-     */
-    public static final DataComponentType.Valued<Boolean> ENCHANTMENT_GLINT_OVERRIDE = valued("enchantment_glint_override");
-
-    /**
-     * Controls the enchantments on an item.
-     * <br>
-     * If not present on a non-enchantment book, this item will not work in an anvil.
+     * Custom name override for an item (as set by renaming with an Anvil).
      *
-     * @see #STORED_ENCHANTMENTS
+     * @see #ITEM_NAME
      */
-    public static final DataComponentType.Valued<ItemEnchantments> ENCHANTMENTS = valued("enchantments");
-
-    public static final DataComponentType.Valued<Equippable> EQUIPPABLE = valued("equippable");
-
-    /**
-     * Stores the explosion crafted in a Firework Star.
-     */
-    public static final DataComponentType.Valued<FireworkEffect> FIREWORK_EXPLOSION = valued("firework_explosion");
-
-    /**
-     * Stores all explosions crafted into a Firework Rocket, as well as flight duration.
-     */
-    public static final DataComponentType.Valued<Fireworks> FIREWORKS = valued("fireworks");
-
-    /**
-     * Controls potential food benefits gained when consuming the item the component is applied on.
-     * Requires the {@link #CONSUMABLE} component to allow consumption in the first place.
-     */
-    public static final DataComponentType.Valued<FoodProperties> FOOD = valued("food");
-
-    public static final DataComponentType.NonValued GLIDER = unvalued("glider");
-
-    /**
-     * If set, disables 'additional' tooltip part which comes from the item type
-     * (e.g. content of a shulker).
-     */
-    public static final DataComponentType.NonValued HIDE_ADDITIONAL_TOOLTIP = unvalued("hide_additional_tooltip");
-
-    /**
-     * If set, it will completely hide whole item tooltip (that includes item name).
-     */
-    public static final DataComponentType.NonValued HIDE_TOOLTIP = unvalued("hide_tooltip");
-
-    /**
-     * Holds the instrument type used by a Goat Horn.
-     */
-    public static final DataComponentType.Valued<MusicInstrument> INSTRUMENT = valued("instrument");
-
-    /**
-     * Marks that a projectile item would be intangible when fired
-     * (i.e. can only be picked up by a creative mode player).
-     */
-    public static final DataComponentType.NonValued INTANGIBLE_PROJECTILE = unvalued("intangible_projectile");
-
-    public static final DataComponentType.Valued<Key> ITEM_MODEL = valued("item_model");
-
+    public static final DataComponentType.Valued<Component> CUSTOM_NAME = valued("custom_name");
     /**
      * When present, replaces default item name with contained chat component.
      * <p>
@@ -228,100 +109,91 @@ public final class DataComponentTypes {
      * @see #CUSTOM_NAME
      */
     public static final DataComponentType.Valued<Component> ITEM_NAME = valued("item_name");
-
-    public static final DataComponentType.Valued<JukeboxPlayable> JUKEBOX_PLAYABLE = valued("jukebox_playable");
-
-    /**
-     * If present, specifies that the Compass is a Lodestone Compass.
-     */
-    public static final DataComponentType.Valued<LodestoneTracker> LODESTONE_TRACKER = valued("lodestone_tracker");
-
+    public static final DataComponentType.Valued<Key> ITEM_MODEL = valued("item_model");
     /**
      * Additional lines to include in an item's tooltip.
      */
     public static final DataComponentType.Valued<ItemLore> LORE = valued("lore");
-
-    /**
-     * Represents the tint of the decorations on the {@link org.bukkit.inventory.ItemType#FILLED_MAP} item.
-     */
-    public static final DataComponentType.Valued<MapItemColor> MAP_COLOR = valued("map_color");
-
-    /**
-     * Holds a list of markers to be placed on a {@link org.bukkit.inventory.ItemType#FILLED_MAP} (used for Explorer Maps).
-     */
-    public static final DataComponentType.Valued<MapDecorations> MAP_DECORATIONS = valued("map_decorations");
-
-    /**
-     * References the shared map state holding map contents and markers for a {@link org.bukkit.inventory.ItemType#FILLED_MAP}.
-     */
-    public static final DataComponentType.Valued<MapId> MAP_ID = valued("map_id");
-
-    /**
-     * Internal map item state used in the map crafting recipe.
-     */
-    public static final DataComponentType.Valued<MapPostProcessing> MAP_POST_PROCESSING = valued("map_post_processing");
-
-    /**
-     * Controls the maximum amount of damage than an item can take,
-     * if not present, the item cannot be damaged.
-     * <br>
-     * Mutually exclusive with the {@link #MAX_STACK_SIZE} component greater than 1.
-     *
-     * @see #DAMAGE
-     */
-    public static final DataComponentType.Valued<@Positive Integer> MAX_DAMAGE = valued("max_damage");
-
-    /**
-     * Controls the maximum stacking size of this item.
-     * <br>
-     * Values greater than 1 are mutually exclusive with the {@link #MAX_DAMAGE} component.
-     */
-    public static final DataComponentType.Valued<Integer> MAX_STACK_SIZE = valued("max_stack_size");
-
-    /**
-     * Controls the sound played by a Player Head when placed on a Note Block.
-     */
-    public static final DataComponentType.Valued<Key> NOTE_BLOCK_SOUND = valued("note_block_sound");
-
-    /**
-     * Controls the amplifier amount for an Ominous Bottle's Bad Omen effect.
-     */
-    public static final DataComponentType.Valued<OminousBottleAmplifier> OMINOUS_BOTTLE_AMPLIFIER = valued("ominous_bottle_amplifier");
-
-    /**
-     * Stores the Sherds applied to each side of a Decorated Pot.
-     */
-    public static final DataComponentType.Valued<PotDecorations> POT_DECORATIONS = valued("pot_decorations");
-
-    /**
-     * Holds the contents of a potion (Potion, Splash Potion, Lingering Potion),
-     * or potion applied to a Tipped Arrow.
-     */
-    public static final DataComponentType.Valued<PotionContents> POTION_CONTENTS = valued("potion_contents");
-
-    /**
-     * Controls the skin displayed on a Player Head.
-     */
-    public static final DataComponentType.Valued<ResolvableProfile> PROFILE = valued("profile");
-
     /**
      * Controls the color of the item name.
      */
     public static final DataComponentType.Valued<ItemRarity> RARITY = valued("rarity");
-
     /**
-     * List of recipes that should be unlocked when using the Knowledge Book item.
+     * Controls the enchantments on an item.
+     * <br>
+     * If not present on a non-enchantment book, this item will not work in an anvil.
+     *
+     * @see #STORED_ENCHANTMENTS
      */
-    public static final DataComponentType.Valued<List<Key>> RECIPES = valued("recipes");
-
+    public static final DataComponentType.Valued<ItemEnchantments> ENCHANTMENTS = valued("enchantments");
+    /**
+     * Controls which blocks a player in Adventure mode can place on with this item.
+     */
+    public static final DataComponentType.Valued<ItemAdventurePredicate> CAN_PLACE_ON = valued("can_place_on");
+    /**
+     * Controls which blocks a player in Adventure mode can break with this item.
+     */
+    public static final DataComponentType.Valued<ItemAdventurePredicate> CAN_BREAK = valued("can_break");
+    /**
+     * Holds attribute modifiers applied to any item,
+     * if not set, has an implicit default value based on the item type's
+     * default attributes (e.g. attack damage for weapons).
+     */
+    public static final DataComponentType.Valued<ItemAttributeModifiers> ATTRIBUTE_MODIFIERS = valued("attribute_modifiers");
+    /**
+     * Controls the minecraft:custom_model_data property in the item model.
+     */
+    public static final DataComponentType.Valued<CustomModelData> CUSTOM_MODEL_DATA = valued("custom_model_data");
+    /**
+     * If set, disables 'additional' tooltip part which comes from the item type
+     * (e.g. content of a shulker).
+     */
+    public static final DataComponentType.NonValued HIDE_ADDITIONAL_TOOLTIP = unvalued("hide_additional_tooltip");
+    /**
+     * If set, it will completely hide whole item tooltip (that includes item name).
+     */
+    public static final DataComponentType.NonValued HIDE_TOOLTIP = unvalued("hide_tooltip");
     /**
      * The additional experience cost required to modify an item in an Anvil.
      * If not present, has an implicit default value of: {@code 0}.
      */
     public static final DataComponentType.Valued<@NonNegative Integer> REPAIR_COST = valued("repair_cost");
-
+    // /**
+    //  * Causes an item to not be pickable in the creative menu, currently not very useful.
+    //  */
+    // public static final DataComponentType.NonValued CREATIVE_SLOT_LOCK = unvalued("creative_slot_lock");
+    /**
+     * Overrides the enchantment glint effect on an item.
+     * If not present, default behaviour is used.
+     */
+    public static final DataComponentType.Valued<Boolean> ENCHANTMENT_GLINT_OVERRIDE = valued("enchantment_glint_override");
+    /**
+     * Marks that a projectile item would be intangible when fired
+     * (i.e. can only be picked up by a creative mode player).
+     */
+    public static final DataComponentType.NonValued INTANGIBLE_PROJECTILE = unvalued("intangible_projectile");
+    /**
+     * Controls potential food benefits gained when consuming the item the component is applied on.
+     * Requires the {@link #CONSUMABLE} component to allow consumption in the first place.
+     */
+    public static final DataComponentType.Valued<FoodProperties> FOOD = valued("food");
+    public static final DataComponentType.Valued<Consumable> CONSUMABLE = valued("consumable");
+    public static final DataComponentType.Valued<UseRemainder> USE_REMAINDER = valued("use_remainder");
+    public static final DataComponentType.Valued<UseCooldown> USE_COOLDOWN = valued("use_cooldown");
+    /**
+     * If present, this item will not take damage from the specified damage types.
+     */
+    public static final DataComponentType.Valued<DamageResistant> DAMAGE_RESISTANT = valued("damage_resistant");
+    /**
+     * Controls the behavior of the item as a tool.
+     */
+    public static final DataComponentType.Valued<Tool> TOOL = valued("tool");
+    public static final DataComponentType.Valued<Enchantable> ENCHANTABLE = valued("enchantable");
+    public static final DataComponentType.Valued<Equippable> EQUIPPABLE = valued("equippable");
     public static final DataComponentType.Valued<Repairable> REPAIRABLE = valued("repairable");
-
+    public static final DataComponentType.NonValued GLIDER = unvalued("glider");
+    public static final DataComponentType.Valued<Key> TOOLTIP_STYLE = valued("tooltip_style");
+    public static final DataComponentType.Valued<DeathProtection> DEATH_PROTECTION = valued("death_protection");
     /**
      * Stores list of enchantments and their levels for an Enchanted Book.
      * Unlike {@link #ENCHANTMENTS}, the effects provided by enchantments
@@ -336,51 +208,114 @@ public final class DataComponentTypes {
      * @see #ENCHANTMENTS
      */
     public static final DataComponentType.Valued<ItemEnchantments> STORED_ENCHANTMENTS = valued("stored_enchantments");
-
+    /**
+     * Represents a color applied to a dyeable item (in the {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#DYEABLE} item tag).
+     */
+    public static final DataComponentType.Valued<DyedItemColor> DYED_COLOR = valued("dyed_color");
+    /**
+     * Represents the tint of the decorations on the {@link org.bukkit.inventory.ItemType#FILLED_MAP} item.
+     */
+    public static final DataComponentType.Valued<MapItemColor> MAP_COLOR = valued("map_color");
+    /**
+     * References the shared map state holding map contents and markers for a {@link org.bukkit.inventory.ItemType#FILLED_MAP}.
+     */
+    public static final DataComponentType.Valued<MapId> MAP_ID = valued("map_id");
+    /**
+     * Holds a list of markers to be placed on a {@link org.bukkit.inventory.ItemType#FILLED_MAP} (used for Explorer Maps).
+     */
+    public static final DataComponentType.Valued<MapDecorations> MAP_DECORATIONS = valued("map_decorations");
+    /**
+     * Internal map item state used in the map crafting recipe.
+     */
+    public static final DataComponentType.Valued<MapPostProcessing> MAP_POST_PROCESSING = valued("map_post_processing");
+    /**
+     * Holds all projectiles that have been loaded into a Crossbow.
+     * If not present, the Crossbow is not charged.
+     */
+    public static final DataComponentType.Valued<ChargedProjectiles> CHARGED_PROJECTILES = valued("charged_projectiles");
+    /**
+     * Holds all items stored inside a Bundle.
+     * If removed, items cannot be added to the Bundle.
+     */
+    public static final DataComponentType.Valued<BundleContents> BUNDLE_CONTENTS = valued("bundle_contents");
+    /**
+     * Holds the contents of a potion (Potion, Splash Potion, Lingering Potion),
+     * or potion applied to a Tipped Arrow.
+     */
+    public static final DataComponentType.Valued<PotionContents> POTION_CONTENTS = valued("potion_contents");
     /**
      * Holds the effects that will be applied when consuming Suspicious Stew.
      */
     public static final DataComponentType.Valued<SuspiciousStewEffects> SUSPICIOUS_STEW_EFFECTS = valued("suspicious_stew_effects");
-
-    /**
-     * Controls the behavior of the item as a tool.
-     */
-    public static final DataComponentType.Valued<Tool> TOOL = valued("tool");
-
-    public static final DataComponentType.Valued<Key> TOOLTIP_STYLE = valued("tooltip_style");
-
-    /**
-     * Holds the trims applied to an item in recipes
-     */
-    public static final DataComponentType.Valued<ItemArmorTrim> TRIM = valued("trim");
-
-    /**
-     * If set, the item will not lose any durability when used.
-     */
-    public static final DataComponentType.Valued<Unbreakable> UNBREAKABLE = valued("unbreakable");
-
-    public static final DataComponentType.Valued<UseCooldown> USE_COOLDOWN = valued("use_cooldown");
-
-    public static final DataComponentType.Valued<UseRemainder> USE_REMAINDER = valued("use_remainder");
-
     /**
      * Holds the contents in a Book and Quill.
      */
     public static final DataComponentType.Valued<WritableBookContent> WRITABLE_BOOK_CONTENT = valued("writable_book_content");
-
     /**
      * Holds the contents and metadata of a Written Book.
      */
     public static final DataComponentType.Valued<WrittenBookContent> WRITTEN_BOOK_CONTENT = valued("written_book_content");
-    // End generate - DataComponentTypes
-    // /**
-    //  * Causes an item to not be pickable in the creative menu, currently not very useful.
-    //  */
-    // public static final DataComponentType.NonValued CREATIVE_SLOT_LOCK = unvalued("creative_slot_lock");
+    /**
+     * Holds the trims applied to an item in recipes
+     */
+    public static final DataComponentType.Valued<ItemArmorTrim> TRIM = valued("trim");
     // debug_stick_state - Block Property API
     // entity_data
     // bucket_entity_data
     // block_entity_data
+    /**
+     * Holds the instrument type used by a Goat Horn.
+     */
+    public static final DataComponentType.Valued<MusicInstrument> INSTRUMENT = valued("instrument");
+    /**
+     * Controls the amplifier amount for an Ominous Bottle's Bad Omen effect.
+     */
+    public static final DataComponentType.Valued<OminousBottleAmplifier> OMINOUS_BOTTLE_AMPLIFIER = valued("ominous_bottle_amplifier");
+    public static final DataComponentType.Valued<JukeboxPlayable> JUKEBOX_PLAYABLE = valued("jukebox_playable");
+    /**
+     * List of recipes that should be unlocked when using the Knowledge Book item.
+     */
+    public static final DataComponentType.Valued<List<Key>> RECIPES = valued("recipes");
+    /**
+     * If present, specifies that the Compass is a Lodestone Compass.
+     */
+    public static final DataComponentType.Valued<LodestoneTracker> LODESTONE_TRACKER = valued("lodestone_tracker");
+    /**
+     * Stores the explosion crafted in a Firework Star.
+     */
+    public static final DataComponentType.Valued<FireworkEffect> FIREWORK_EXPLOSION = valued("firework_explosion");
+    /**
+     * Stores all explosions crafted into a Firework Rocket, as well as flight duration.
+     */
+    public static final DataComponentType.Valued<Fireworks> FIREWORKS = valued("fireworks");
+    /**
+     * Controls the skin displayed on a Player Head.
+     */
+    public static final DataComponentType.Valued<ResolvableProfile> PROFILE = valued("profile");
+    /**
+     * Controls the sound played by a Player Head when placed on a Note Block.
+     */
+    public static final DataComponentType.Valued<Key> NOTE_BLOCK_SOUND = valued("note_block_sound");
+    /**
+     * Stores the additional patterns applied to a Banner or Shield.
+     */
+    public static final DataComponentType.Valued<BannerPatternLayers> BANNER_PATTERNS = valued("banner_patterns");
+    /**
+     * Stores the base color for a Shield.
+     */
+    public static final DataComponentType.Valued<DyeColor> BASE_COLOR = valued("base_color");
+    /**
+     * Stores the Sherds applied to each side of a Decorated Pot.
+     */
+    public static final DataComponentType.Valued<PotDecorations> POT_DECORATIONS = valued("pot_decorations");
+    /**
+     * Holds the contents of container blocks (Chests, Shulker Boxes) in item form.
+     */
+    public static final DataComponentType.Valued<ItemContainerContents> CONTAINER = valued("container");
+    /**
+     * Holds block state properties to apply when placing a block.
+     */
+    public static final DataComponentType.Valued<BlockItemDataProperties> BLOCK_DATA = valued("block_state");
     // bees
     // /**
     //  * Holds the lock state of a container-like block,
@@ -390,6 +325,10 @@ public final class DataComponentTypes {
     //  * to open this container.
     //  */
     // public static final DataComponentType.Valued<LockCode> LOCK = valued("lock");
+    /**
+     * Holds the unresolved loot table and seed of a container-like block.
+     */
+    public static final DataComponentType.Valued<SeededContainerLoot> CONTAINER_LOOT = valued("container_loot");
 
     private static DataComponentType.NonValued unvalued(final String name) {
         return (DataComponentType.NonValued) requireNonNull(Registry.DATA_COMPONENT_TYPE.get(NamespacedKey.minecraft(name)), name + " unvalued data component type couldn't be found, this is a bug.");

paper-api/src/main/java/io/papermc/paper/datacomponent/item/DamageResistant.java

@@ -21,9 +21,9 @@ public interface DamageResistant {
     }
 
     /**
-     * The types that this damage type is invincible to.
+     * The types that this damage type is invincible tp.
      *
-     * @return the key of the tag holding the respective damage types.
+     * @return item
      */
     @Contract(value = "-> new", pure = true)
     TagKey<DamageType> types();

paper-api/src/main/java/io/papermc/paper/datacomponent/item/consumable/ConsumeEffect.java

@@ -21,7 +21,7 @@ public interface ConsumeEffect {
      * Creates a consume effect that randomly teleports the entity on consumption.
      *
      * @param diameter diameter of random teleportation
-     * @return the effect instance
+     * @return the effect
      */
     @Contract(value = "_ -> new", pure = true)
     static TeleportRandomly teleportRandomlyEffect(final float diameter) {
@@ -29,21 +29,21 @@ public interface ConsumeEffect {
     }
 
     /**
-     * Creates a consume effect that removes status effects on consumption.
+     * Creates a consume effect that gives status effects on consumption.
      *
-     * @param effects the potion effects to remove
-     * @return the effect instance
+     * @param key the sound effect to play
+     * @return the effect
      */
     @Contract(value = "_ -> new", pure = true)
-    static RemoveStatusEffects removeEffects(final RegistryKeySet<PotionEffectType> effects) {
-        return ConsumableTypesBridge.bridge().removeStatusEffects(effects);
+    static RemoveStatusEffects removeEffects(final RegistryKeySet<PotionEffectType> key) {
+        return ConsumableTypesBridge.bridge().removeStatusEffects(key);
     }
 
     /**
      * Creates a consume effect that plays a sound on consumption.
      *
-     * @param key the key sound effect to play
-     * @return the effect instance
+     * @param key the sound effect to play
+     * @return the effect
      */
     @Contract(value = "_ -> new", pure = true)
     static PlaySound playSoundConsumeEffect(final Key key) {
@@ -53,7 +53,7 @@ public interface ConsumeEffect {
     /**
      * Creates a consume effect that clears all status effects.
      *
-     * @return the effect instance
+     * @return effect instance
      */
     @Contract(value = "-> new", pure = true)
     static ClearAllStatusEffects clearAllStatusEffects() {
@@ -61,20 +61,17 @@ public interface ConsumeEffect {
     }
 
     /**
-     * Creates a consume effect that gives potion effects on consumption.
+     * Creates a consume effect that gives status effects on consumption.
      *
      * @param effects     the potion effects to apply
-     * @param probability the probability of these effects being applied, between 0 and 1 inclusive
-     * @return the effect instance
+     * @param probability the probability of these effects being applied, between 0 and 1 inclusive.
+     * @return the effect
      */
     @Contract(value = "_, _ -> new", pure = true)
     static ApplyStatusEffects applyStatusEffects(final List<PotionEffect> effects, final float probability) {
         return ConsumableTypesBridge.bridge().applyStatusEffects(effects, probability);
     }
 
-    /**
-     * Represents a consumable effect that randomly teleports the entity on consumption.
-     */
     @ApiStatus.Experimental
     @ApiStatus.NonExtendable
     interface TeleportRandomly extends ConsumeEffect {
@@ -88,14 +85,14 @@ public interface ConsumeEffect {
     }
 
     /**
-     * Represents a consumable effect that removes status effects on consumption.
+     * Represents a consumable effect that removes status effects on consumption
      */
     @ApiStatus.Experimental
     @ApiStatus.NonExtendable
     interface RemoveStatusEffects extends ConsumeEffect {
 
         /**
-         * Potion effects to remove.
+         * Potion effects to remove
          *
          * @return effects
          */
@@ -110,7 +107,7 @@ public interface ConsumeEffect {
     interface PlaySound extends ConsumeEffect {
 
         /**
-         * Sound effect to play in the world.
+         * Sound effect to play in the world
          *
          * @return sound effect
          */
@@ -127,16 +124,16 @@ public interface ConsumeEffect {
     }
 
     /**
-     * Represents a consumable effect that applies potion effects based on a probability on consumption.
+     * Represents a consumable effect that applies effects based on a probability on consumption.
      */
     @ApiStatus.Experimental
     @ApiStatus.NonExtendable
     interface ApplyStatusEffects extends ConsumeEffect {
 
         /**
-         * Potion effect instances to grant.
+         * Effect instances to grant
          *
-         * @return potion effects
+         * @return effect
          */
         List<PotionEffect> effects();
 

paper-api/src/main/java/io/papermc/paper/datacomponent/item/consumable/ItemUseAnimation.java

@@ -4,8 +4,6 @@ package io.papermc.paper.datacomponent.item.consumable;
  * Represents the hand animation that is used when a player is consuming this item.
  */
 public enum ItemUseAnimation {
-    // Start generate - ItemUseAnimation
-    // @GeneratedFrom 1.21.4
     NONE,
     EAT,
     DRINK,
@@ -16,6 +14,5 @@ public enum ItemUseAnimation {
     SPYGLASS,
     TOOT_HORN,
     BRUSH,
-    BUNDLE;
-    // End generate - ItemUseAnimation
+    BUNDLE
 }

paper-api/src/main/java/io/papermc/paper/datapack/DatapackRegistrar.java

@@ -19,13 +19,11 @@ import org.jspecify.annotations.Nullable;
  * is called anytime the game tries to discover datapacks at any of the
  * configured locations. This means that if a datapack should stay available to the server,
  * it must always be discovered whenever this event fires.
- * <p>
- * An example of a plugin loading a datapack from within its own jar is below,
- * assuming the datapack is included under {@code resources/pack} folder:
+ * <p>An example of a plugin loading a datapack from within it's own jar is below</p>
  * <pre>{@code
  * public class YourPluginBootstrap implements PluginBootstrap {
  *     @Override
- *     public void bootstrap(BootstrapContext context) {
+ *     public void bootstrap(BoostrapContext context) {
  *         final LifecycleEventManager<BootstrapContext> manager = context.getLifecycleManager();
  *         manager.registerEventHandler(LifecycleEvents.DATAPACK_DISCOVERY, event -> {
  *             DatapackRegistrar registrar = event.registrar();
@@ -41,7 +39,6 @@ import org.jspecify.annotations.Nullable;
  *     }
  * }
  * }</pre>
- *
  * @see io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents#DATAPACK_DISCOVERY
  */
 @ApiStatus.NonExtendable

paper-api/src/main/java/io/papermc/paper/entity/PlayerGiveResult.java

@@ -1,39 +0,0 @@
-package io.papermc.paper.entity;
-
-import java.util.Collection;
-import org.bukkit.entity.Item;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
-
-/**
- * A result type used by {@link org.bukkit.entity.Player#give(ItemStack...)} and its overloads.
- */
-@NullMarked
-public interface PlayerGiveResult {
-
-    /**
-     * A collection of itemstacks that were not added to the player's inventory as they did not fit.
-     * The collection is derived from the collections of items to add by creating copies of each stack that was not
-     * fully added to the inventory and assigning the non-added count as their amount.
-     * <p>
-     * Itemstacks found here *may* also be found as item entities in the {@link #drops()} collection, as the
-     * give logic may have dropped them.
-     *
-     * @return the unmodifiable collection of itemstacks that are leftover as they could not be added. Each element is a
-     * copy of the input stack they are derived from.
-     */
-    @Unmodifiable
-    Collection<ItemStack> leftovers();
-
-    /**
-     * A collection of item entities dropped as a result of this call to {@link org.bukkit.entity.Player#give(ItemStack...)}.
-     * The item entities contained here are not guaranteed to match the {@link #leftovers()} as plugins may cancel the
-     * spawning of item entities.
-     *
-     * @return the unmodifiable collection of dropped item entities.
-     */
-    @Unmodifiable
-    Collection<Item> drops();
-
-}

paper-api/src/main/java/io/papermc/paper/event/block/PlayerShearBlockEvent.java

@@ -12,10 +12,10 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Called when a player uses shears on a block.
+ * Called when a player uses sheers on a block.
  * <p>
- * This event is <b>not</b> called when a player breaks blocks with shears, but rather when a
- * player uses the shears on a block to collect drops from it and/or modify its state.
+ * This event is <b>not</b> called when breaking blocks with shears but instead only when a
+ * player uses the sheer item on a block to garner drops from said block and/or change its state.
  * <p>
  * Examples include shearing a pumpkin to turn it into a carved pumpkin or shearing a beehive to get honeycomb.
  */

paper-api/src/main/java/io/papermc/paper/event/entity/EntityAttemptSmashAttackEvent.java

@@ -1,103 +0,0 @@
-package io.papermc.paper.event.entity;
-
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.entity.EntityEvent;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
-
-/**
- * Called when an entity attempts to perform a smash attack.
- */
-@NullMarked
-public class EntityAttemptSmashAttackEvent extends EntityEvent {
-
-    private static final HandlerList HANDLER_LIST = new HandlerList();
-
-    private final LivingEntity target;
-    private final ItemStack weapon;
-    private final boolean originalResult;
-    private Result result = Result.DEFAULT;
-
-    @ApiStatus.Internal
-    public EntityAttemptSmashAttackEvent(
-        final LivingEntity attacker,
-        final LivingEntity target,
-        final ItemStack weapon,
-        final boolean originalResult
-    ) {
-        super(attacker);
-        this.target = target;
-        this.weapon = weapon;
-        this.originalResult = originalResult;
-    }
-
-    /**
-     * Yields the target of the attempted smash attack.
-     *
-     * @return the target entity
-     */
-    public LivingEntity getTarget() {
-        return target;
-    }
-
-    /**
-     * Yields a copy of the itemstack used in the smash attack attempt.
-     *
-     * @return the itemstack
-     */
-    public ItemStack getWeapon() {
-        return weapon.clone();
-    }
-
-    /**
-     * Yields the original result the server computed.
-     *
-     * @return {@code true} if this attempt would have been successful by vanilla's logic, {@code false} otherwise.
-     */
-    public boolean getOriginalResult() {
-        return originalResult;
-    }
-
-    /**
-     * Yields the effective result of this event.
-     * The result may take one of three values:
-     *
-     * <ul>
-     *     <li>{@link Result#ALLOW}: The attempt will succeed.</li>
-     *     <li>{@link Result#DENY}: The attempt will fail.</li>
-     *     <li>{@link Result#DEFAULT}: The attempt will succeed if {@link #getOriginalResult()} is {@code true} and fail otherwise.</li>
-     * </ul>
-     *
-     * @return the result.
-     */
-    public Result getResult() {
-        return this.result;
-    }
-
-    /**
-     * Configures a new result for this event.
-     * The passes result may take one of three values:
-     *
-     * <ul>
-     *     <li>{@link Result#ALLOW}: The attempt will succeed.</li>
-     *     <li>{@link Result#DENY}: The attempt will fail.</li>
-     *     <li>{@link Result#DEFAULT}: The attempt will succeed if {@link #getOriginalResult()} is {@code true} and fail otherwise.</li>
-     * </ul>
-     *
-     * @param result the new result of the event.
-     */
-    public void setResult(final Result result) {
-        this.result = result;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return HANDLER_LIST;
-    }
-
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
-    }
-}

paper-api/src/main/java/io/papermc/paper/event/entity/EntityEffectTickEvent.java

@@ -1,75 +0,0 @@
-package io.papermc.paper.event.entity;
-
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.entity.EntityEvent;
-import org.bukkit.potion.PotionEffectType;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
-
-/**
- * An event that is triggered when an entity receives a potion effect instantly
- * or when the potion effect is applied on each tick (e.g. every 25 ticks for Poison level 1).
- * <p>
- * For example, this event may be called when an entity regenerates health
- * or takes poison damage as a result of a potion effect.
- */
-@NullMarked
-public class EntityEffectTickEvent extends EntityEvent implements Cancellable {
-
-    private static final HandlerList HANDLER_LIST = new HandlerList();
-
-    private final PotionEffectType type;
-    private final int amplifier;
-    private boolean cancelled;
-
-    @ApiStatus.Internal
-    public EntityEffectTickEvent(final LivingEntity entity, final PotionEffectType type, final int amplifier) {
-        super(entity);
-        this.type = type;
-        this.amplifier = amplifier;
-    }
-
-    @Override
-    public LivingEntity getEntity() {
-        return (LivingEntity) super.getEntity();
-    }
-
-    /**
-     * Gets the type of the potion effect associated with this event.
-     *
-     * @return the {@link PotionEffectType} of the effect
-     */
-    public PotionEffectType getType() {
-        return type;
-    }
-
-    /**
-     * Gets the amplifier level of the potion effect associated with this event.
-     *
-     * @return the amplifier level of the potion effect
-     */
-    public int getAmplifier() {
-        return amplifier;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean cancel) {
-        this.cancelled = cancel;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return HANDLER_LIST;
-    }
-
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
-    }
-}

paper-api/src/main/java/io/papermc/paper/event/entity/EntityEquipmentChangedEvent.java

@@ -1,89 +0,0 @@
-package io.papermc.paper.event.entity;
-
-import java.util.Collections;
-import java.util.Map;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.entity.EntityEvent;
-import org.bukkit.inventory.EquipmentSlot;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
-
-/**
- * Called whenever a change to an entity's equipment has been detected. This event is called after effects from
- * attribute modifiers and enchantments have been updated.
- * <p>
- * Examples of actions that can trigger this event:
- * <ul>
- *     <li>An entity being added to a world.</li>
- *     <li>A player logging in.</li>
- *     <li>The durability of an equipment item changing.</li>
- *     <li>A dispenser equipping an item onto an entity.</li>
- *     <li>An entity picking up an armor or weapon item from the ground.</li>
- *     <li>A player changing their equipped armor.</li>
- *     <li>A player changes their currently held item.</li>
- * </ul>
- */
-@NullMarked
-public class EntityEquipmentChangedEvent extends EntityEvent {
-
-    private static final HandlerList HANDLER_LIST = new HandlerList();
-
-    private final Map<EquipmentSlot, EquipmentChange> equipmentChanges;
-
-    @ApiStatus.Internal
-    public EntityEquipmentChangedEvent(final LivingEntity entity, final Map<EquipmentSlot, EquipmentChange> equipmentChanges) {
-        super(entity);
-
-        this.equipmentChanges = equipmentChanges;
-    }
-
-    @Override
-    public LivingEntity getEntity() {
-        return (LivingEntity) this.entity;
-    }
-
-    /**
-     * Gets a map of changed slots to their respective equipment changes.
-     *
-     * @return the equipment changes map
-     */
-    public @Unmodifiable Map<EquipmentSlot, EquipmentChange> getEquipmentChanges() {
-        return Collections.unmodifiableMap(this.equipmentChanges);
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return HANDLER_LIST;
-    }
-
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
-    }
-
-    /**
-     * Represents a change in equipment for a single equipment slot.
-     */
-    @ApiStatus.NonExtendable
-    public interface EquipmentChange {
-
-        /**
-         * Gets the existing item that is being replaced.
-         *
-         * @return the existing item
-         */
-        @Contract(pure = true, value = "-> new")
-        ItemStack oldItem();
-
-        /**
-         * Gets the new item that is replacing the existing item.
-         *
-         * @return the new item
-         */
-        @Contract(pure = true, value = "-> new")
-        ItemStack newItem();
-    }
-}

paper-api/src/main/java/io/papermc/paper/event/player/PlayerClientLoadedWorldEvent.java

@@ -1,46 +0,0 @@
-package io.papermc.paper.event.player;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
-
-/**
- * Called when a player is marked as loaded.
- * <p>
- * This either happens when the player notifies the server after loading the world (closing the downloading terrain screen)
- * or when the player has not done so for 60 ticks after joining the server or respawning.
- */
-@NullMarked
-public class PlayerClientLoadedWorldEvent extends PlayerEvent {
-
-    private static final HandlerList HANDLER_LIST = new HandlerList();
-
-    private final boolean timeout;
-
-    @ApiStatus.Internal
-    public PlayerClientLoadedWorldEvent(final Player who, final boolean timeout) {
-        super(who);
-        this.timeout = timeout;
-    }
-
-    /**
-     * True if the event was triggered because the server has not been notified by the player
-     * for 60 ticks after the player joined the server or respawned.
-     *
-     * @return true if the event was triggered because of a timeout
-     */
-    public boolean isTimeout() {
-        return timeout;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return HANDLER_LIST;
-    }
-
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
-    }
-}

paper-api/src/main/java/io/papermc/paper/math/Rotation.java

@@ -1,34 +0,0 @@
-package io.papermc.paper.math;
-
-import org.jspecify.annotations.NullMarked;
-
-/**
- * Represents a rotation with specified pitch and yaw values.
- */
-@NullMarked
-public interface Rotation {
-    /**
-     * Creates a new rotation with the specified yaw and pitch values.
-     *
-     * @param yaw   the yaw component of the rotation, measured in degrees
-     * @param pitch the pitch component of the rotation, measured in degrees
-     * @return a new {@code Rotation} instance with the specified yaw and pitch
-     */
-    static Rotation rotation(float yaw, float pitch) {
-        return new RotationImpl(yaw, pitch);
-    }
-
-    /**
-     * Retrieves the pitch component of the rotation, measured in degrees.
-     *
-     * @return the pitch value in degrees
-     */
-    float pitch();
-
-    /**
-     * Retrieves the yaw component of the rotation, measured in degrees.
-     *
-     * @return the yaw value in degrees
-     */
-    float yaw();
-}

paper-api/src/main/java/io/papermc/paper/math/RotationImpl.java

@@ -1,4 +0,0 @@
-package io.papermc.paper.math;
-
-record RotationImpl(float yaw, float pitch) implements Rotation {
-}

paper-api/src/main/java/io/papermc/paper/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * Root package for the Paper API.
+ */
+@NullMarked
+package io.papermc.paper;
+
+import org.jspecify.annotations.NullMarked;

paper-api/src/main/java/io/papermc/paper/raytracing/PositionedRayTraceConfigurationBuilder.java

@@ -1,112 +0,0 @@
-package io.papermc.paper.raytracing;
-
-import java.util.function.Predicate;
-import org.bukkit.FluidCollisionMode;
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
-import org.bukkit.util.Vector;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
-
-/**
- * A builder for configuring a raytrace with a starting location
- * and direction.
- */
-@NullMarked
-public interface PositionedRayTraceConfigurationBuilder {
-
-    /**
-     * Sets the starting location.
-     *
-     * @param start the new starting location
-     * @return a reference to this object
-     */
-    @Contract(value = "_ -> this", mutates = "this")
-    PositionedRayTraceConfigurationBuilder start(Location start);
-
-    /**
-     * Sets the direction.
-     *
-     * @param direction the new direction
-     * @return a reference to this object
-     */
-    @Contract(value = "_ -> this", mutates = "this")
-    PositionedRayTraceConfigurationBuilder direction(Vector direction);
-
-    /**
-     * Sets the maximum distance.
-     *
-     * @param maxDistance the new maxDistance
-     * @return a reference to this object
-     */
-    @Contract(value = "_ -> this", mutates = "this")
-    PositionedRayTraceConfigurationBuilder maxDistance(@NonNegative double maxDistance);
-
-    /**
-     * Sets the FluidCollisionMode when looking for block collisions.
-     * <p>
-     * If collisions with passable blocks are ignored, fluid collisions are
-     * ignored as well regardless of the fluid collision mode.
-     *
-     * @param fluidCollisionMode the new FluidCollisionMode
-     * @return a reference to this object
-     */
-    @Contract(value = "_ -> this", mutates = "this")
-    PositionedRayTraceConfigurationBuilder fluidCollisionMode(FluidCollisionMode fluidCollisionMode);
-
-    /**
-     * Sets whether the raytrace should ignore passable blocks when looking for
-     * block collisions.
-     * <p>
-     * If collisions with passable blocks are ignored, fluid collisions are
-     * ignored as well regardless of the fluid collision mode.
-     * <p>
-     * Portal blocks are only considered passable if the ray starts within them.
-     * Apart from that collisions with portal blocks will be considered even if
-     * collisions with passable blocks are otherwise ignored.
-     *
-     * @param ignorePassableBlocks if the raytrace should ignore passable blocks
-     * @return a reference to this object
-     */
-    @Contract(value = "_ -> this", mutates = "this")
-    PositionedRayTraceConfigurationBuilder ignorePassableBlocks(boolean ignorePassableBlocks);
-
-    /**
-     * Sets the size of the raytrace when looking for entity collisions.
-     *
-     * @param raySize the new raytrace size
-     * @return a reference to this object
-     */
-    @Contract(value = "_ -> this", mutates = "this")
-    PositionedRayTraceConfigurationBuilder raySize(@NonNegative double raySize);
-
-    /**
-     * Sets the current entity filter when looking for entity collisions.
-     *
-     * @param entityFilter predicate for entities the ray can potentially collide with
-     * @return a reference to this object
-     */
-    @Contract(value = "_ -> this", mutates = "this")
-    PositionedRayTraceConfigurationBuilder entityFilter(Predicate<? super Entity> entityFilter);
-
-    /**
-     * Sets the current block filter when looking for block collisions.
-     *
-     * @param blockFilter predicate for blocks the ray can potentially collide with
-     * @return a reference to this object
-     */
-    @Contract(value = "_ -> this", mutates = "this")
-    PositionedRayTraceConfigurationBuilder blockFilter(Predicate<? super Block> blockFilter);
-
-    /**
-     * Sets the targets for the rayTrace.
-     *
-     * @param first the first target
-     * @param others the other targets
-     * @return a reference to this object
-     */
-    @Contract(value = "_, _ -> this", mutates = "this")
-    PositionedRayTraceConfigurationBuilder targets(RayTraceTarget first, RayTraceTarget... others);
-}

paper-api/src/main/java/io/papermc/paper/raytracing/RayTraceTarget.java

@@ -1,9 +0,0 @@
-package io.papermc.paper.raytracing;
-
-/**
- * List of Targets a builder can target.
- */
-public enum RayTraceTarget {
-    ENTITY,
-    BLOCK
-}