Remove Experimental from TypedKey (#12134)

Machine-Maker · web-flow · commit f07008182505 · 2025-02-17T15:33:26.000-08:00
diff --git a/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java b/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java
@@ -101,7 +101,6 @@ private MethodSpec.Builder createMethod(final TypeName returnType) {
             .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;
@@ -157,8 +156,6 @@ protected TypeSpec getTypeSpec() {
         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();
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/AttributeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/AttributeKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class AttributeKeys {
     /**
      * {@code minecraft:armor}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/BannerPatternKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/BannerPatternKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class BannerPatternKeys {
     /**
      * {@code minecraft:base}
@@ -337,7 +335,6 @@ private BannerPatternKeys() {
      * @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);
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/BiomeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/BiomeKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class BiomeKeys {
     /**
      * {@code minecraft:badlands}
@@ -491,7 +489,6 @@ private BiomeKeys() {
      * @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);
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/BlockTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/BlockTypeKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class BlockTypeKeys {
     /**
      * {@code minecraft:acacia_button}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/CatVariantKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/CatVariantKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class CatVariantKeys {
     /**
      * {@code minecraft:all_black}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/DamageTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/DamageTypeKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class DamageTypeKeys {
     /**
      * {@code minecraft:arrow}
@@ -379,7 +377,6 @@ private DamageTypeKeys() {
      * @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);
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/EnchantmentKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/EnchantmentKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class EnchantmentKeys {
     /**
      * {@code minecraft:aqua_affinity}
@@ -330,7 +328,6 @@ private EnchantmentKeys() {
      * @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);
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/FluidKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/FluidKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class FluidKeys {
     /**
      * {@code minecraft:empty}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/FrogVariantKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/FrogVariantKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class FrogVariantKeys {
     /**
      * {@code minecraft:cold}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/GameEventKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/GameEventKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class GameEventKeys {
     /**
      * {@code minecraft:block_activate}
@@ -456,7 +454,6 @@ private GameEventKeys() {
      * @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);
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/InstrumentKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/InstrumentKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class InstrumentKeys {
     /**
      * {@code minecraft:admire_goat_horn}
@@ -92,7 +90,6 @@ private InstrumentKeys() {
      * @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);
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/ItemTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/ItemTypeKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class ItemTypeKeys {
     /**
      * {@code minecraft:acacia_boat}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/JukeboxSongKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/JukeboxSongKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class JukeboxSongKeys {
     /**
      * {@code minecraft:11}
@@ -169,7 +167,6 @@ private JukeboxSongKeys() {
      * @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);
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/MapDecorationTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/MapDecorationTypeKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class MapDecorationTypeKeys {
     /**
      * {@code minecraft:banner_black}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/MenuTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/MenuTypeKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class MenuTypeKeys {
     /**
      * {@code minecraft:anvil}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/MobEffectKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/MobEffectKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class MobEffectKeys {
     /**
      * {@code minecraft:absorption}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/PaintingVariantKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/PaintingVariantKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class PaintingVariantKeys {
     /**
      * {@code minecraft:alban}
@@ -386,7 +384,6 @@ private PaintingVariantKeys() {
      * @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);
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/SoundEventKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/SoundEventKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class SoundEventKeys {
     /**
      * {@code minecraft:ambient.basalt_deltas.additions}
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureKeys.java
@@ -7,7 +7,6 @@
 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;
 
 /**
@@ -25,7 +24,6 @@
 })
 @GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
 public final class StructureKeys {
     /**
      * {@code minecraft:ancient_city}
@@ -274,7 +272,6 @@ private StructureKeys() {
      * @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);
     }
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureTypeKeys.java
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimMaterialKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimMaterialKeys.java
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimPatternKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimPatternKeys.java
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerProfessionKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerProfessionKeys.java
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerTypeKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerTypeKeys.java
diff --git a/paper-api/src/generated/java/io/papermc/paper/registry/keys/WolfVariantKeys.java b/paper-api/src/generated/java/io/papermc/paper/registry/keys/WolfVariantKeys.java
diff --git a/paper-api/src/main/java/io/papermc/paper/registry/RegistryKey.java b/paper-api/src/main/java/io/papermc/paper/registry/RegistryKey.java
diff --git a/paper-api/src/main/java/io/papermc/paper/registry/TypedKey.java b/paper-api/src/main/java/io/papermc/paper/registry/TypedKey.java
diff --git a/paper-api/src/main/java/io/papermc/paper/registry/tag/TagKey.java b/paper-api/src/main/java/io/papermc/paper/registry/tag/TagKey.java

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,6 @@ private MethodSpec.Builder createMethod(final TypeName returnType) {`
`101`	`101`	`.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)`
`102`	`102`	`.returns(returnType);`
`103`	`103`	`if (this.publicCreateKeyMethod) {`
`104`		`- create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental`
`105`	`104`	`create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.location().toString());`
`106`	`105`	`}`
`107`	`106`	`return create;`
`@@ -157,8 +156,6 @@ protected TypeSpec getTypeSpec() {`
`157`	`156`	`if (allExperimental) {`
`158`	`157`	`typeBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API`
`159`	`158`	`createMethod.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API`
`160`		`- } else {`
`161`		`- typeBuilder.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO experimental API`
`162`	`159`	`}`
`163`	`160`	`return typeBuilder.addMethod(createMethod.build()).build();`
`164`	`161`	`}`