Plugin-scoped resources

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
3a3bea52 SPIGOT-7829: Increase maximum outgoing plugin message size to match Vanilla intention
5cd1c8cb SPIGOT-7831: Add CreatureSpawnEvent.SpawnReason#POTION_EFFECT
a8e278f0 SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-players can now create portals
53729d12 Remove spurious ApiStatus.Internal annotation
b9f57486 SPIGOT-7799, PR-1039: Expose explosion world interaction in EntityExplodeEvent and BlockExplodeEvent
7983b966 PR-1029: Trial changing a small number of inner enums to classes/interfaces to better support custom values

CraftBukkit Changes:
403accd56 SPIGOT-7831: Add CreatureSpawnEvent.SpawnReason#POTION_EFFECT
812761660 Increase outdated build delay
bed1e3ff6 SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-players can now create portals
2444c8b23 SPIGOT-7823: Suspicious sand and gravel material are not marked as having gravity correctly
aceddcd0b SPIGOT-7820: Enum changes - duplicate method name
a0d2d6a84 SPIGOT-7813: Material#isInteractable() always returns false
8fd64b091 SPIGOT-7806: Handle both loot and inventory item drop behaviour in PlayerDeathEvent
a4ee40b74 SPIGOT-7799, PR-1436: Expose explosion world interaction in EntityExplodeEvent and BlockExplodeEvent
082aa51c5 PR-1424: Trial changing a small number of inner enums to classes/interfaces to better support custom values
66e78a96b SPIGOT-7815: Consider EntityDamageEvent status for Wolf armor damage

Spigot Changes:
5bbef5ad SPIGOT-7834: Modify max value for generic.max_absorption

.editorconfig

@@ -29,6 +29,8 @@ ij_java_names_count_to_use_import_on_demand = 999999
 ij_java_imports_layout = *,|,$*
 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
 
 [test-plugin/**/*.java]
 ij_java_use_fq_class_names = false

README.md

@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.20.6-R0.1-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
 }
 
 java {

build-data/reobf-mappings-patch.tiny

@@ -21,7 +21,7 @@ c	net/minecraft/world/level/chunk/LevelChunk	net/minecraft/world/level/chunk/Chu
 
 # See mappings-patch.tiny
 c	net/minecraft/server/level/ChunkMap	net/minecraft/server/level/PlayerChunkMap
-	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	F
+	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	G
 
 # The method is made public by Spigot, which then causes accidental overrides
 c	net/minecraft/world/entity/Entity	net/minecraft/world/entity/Entity

build.gradle.kts

@@ -67,8 +67,8 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.20.6+build.1:mergedv2")
-    remapper("net.fabricmc:tiny-remapper:0.10.2:fat")
+    paramMappings("net.fabricmc:yarn:1.21+build.1:mergedv2")
+    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")
     paperclip("io.papermc:paperclip:3.0.3")

gradle.properties

@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.20.6-R0.1-SNAPSHOT
-mcVersion=1.20.6
+version=1.21-R0.1-SNAPSHOT
+mcVersion=1.21
 
 # Set to true while updating Minecraft version
 updatingMinecraft=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

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

@@ -31,12 +31,10 @@ import org.bukkit.entity.Ocelot;
 import org.bukkit.entity.Panda;
 import org.bukkit.entity.Parrot;
 import org.bukkit.entity.Phantom;
-import org.bukkit.entity.PigZombie;
 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.Shulker;
 import org.bukkit.entity.Silverfish;
 import org.bukkit.entity.SkeletonHorse;
@@ -46,7 +44,6 @@ import org.bukkit.entity.Spider;
 import org.bukkit.entity.Squid;
 import org.bukkit.entity.Strider;
 import org.bukkit.entity.Tameable;
-import org.bukkit.entity.TraderLlama;
 import org.bukkit.entity.Turtle;
 import org.bukkit.entity.Vex;
 import org.bukkit.entity.Vindicator;
@@ -54,7 +51,6 @@ import org.bukkit.entity.WanderingTrader;
 import org.bukkit.entity.Wither;
 import org.bukkit.entity.Wolf;
 import org.bukkit.entity.Zombie;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -70,7 +66,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
     GoalKey<AbstractHorse> RANDOM_STAND = create("random_stand", AbstractHorse.class);
 
@@ -330,8 +326,6 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<PolarBear> POLAR_BEAR_MELEE_ATTACK = create("polar_bear_melee_attack", PolarBear.class);
 
-    GoalKey<PolarBear> POLAR_BEAR_PANIC = create("polar_bear_panic", PolarBear.class);
-
     GoalKey<PufferFish> PUFFERFISH_PUFF = create("pufferfish_puff", PufferFish.class);
 
     GoalKey<Rabbit> RABBIT_AVOID_ENTITY = create("rabbit_avoid_entity", Rabbit.class);
@@ -406,6 +400,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Tameable> SIT_WHEN_ORDERED_TO = create("sit_when_ordered_to", Tameable.class);
 
+    GoalKey<Tameable> TAMABLE_ANIMAL_PANIC = create("tamable_animal_panic", Tameable.class);
+
     GoalKey<Turtle> TURTLE_BREED = create("turtle_breed", Turtle.class);
 
     GoalKey<Turtle> TURTLE_GO_HOME = create("turtle_go_home", Turtle.class);
@@ -436,692 +432,10 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Wolf> WOLF_AVOID_ENTITY = create("wolf_avoid_entity", Wolf.class);
 
-    GoalKey<Wolf> WOLF_PANIC = create("wolf_panic", Wolf.class);
-
     GoalKey<Zombie> ZOMBIE_ATTACK = create("zombie_attack", Zombie.class);
 
     GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
 
-    /**
-     * Removed in 1.20.2
-     */
-    @Deprecated(
-            since = "1.20.2"
-    )
-    GoalKey<Vindicator> VINDICATOR_MELEE_ATTACK = create("vindicator_melee_attack", Vindicator.class);
-
-    /**
-     * Removed in 1.20.2
-     */
-    @Deprecated(
-            since = "1.20.2"
-    )
-    GoalKey<Ravager> RAVAGER_MELEE_ATTACK = create("ravager_melee_attack", Ravager.class);
-
-    /**
-     * Removed in 1.20.2
-     */
-    @Deprecated(
-            since = "1.20.2"
-    )
-    GoalKey<Rabbit> EVIL_RABBIT_ATTACK = create("evil_rabbit_attack", Rabbit.class);
-
-    /**
-     * Removed in 1.16
-     */
-    @Deprecated(
-            forRemoval = true,
-            since = "1.16"
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PigZombie> ANGER = create("anger", PigZombie.class);
-
-    /**
-     * Removed in 1.16
-     */
-    @Deprecated(
-            forRemoval = true,
-            since = "1.16"
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PigZombie> ANGER_OTHER = create("anger_other", PigZombie.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Blaze> BLAZE_FIREBALL = create("blaze_fireball", Blaze.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Cat> TEMPT_CHANCE = create("tempt_chance", Cat.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Dolphin> DOLPHIN_PLAY_WITH_ITEMS = create("dolphin_play_with_items", Dolphin.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Drowned> DROWNED_GOTO_BEACH = create("drowned_goto_beach", Drowned.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> DROWNED_GOTO_WATER = create("drowned_goto_water", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Enderman> ENDERMAN_PICKUP_BLOCK = create("enderman_pickup_block", Enderman.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Enderman> ENDERMAN_PLACE_BLOCK = create("enderman_place_block", Enderman.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Enderman> PLAYER_WHO_LOOKED_AT_TARGET = create("player_who_looked_at_target", Enderman.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Evoker> EVOKER_CAST_SPELL = create("evoker_cast_spell", Evoker.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_DEFEND_TRUSTED = create("fox_defend_trusted", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_FACEPLANT = create("fox_faceplant", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_PERCH_AND_SEARCH = create("fox_perch_and_search", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_SLEEP = create("fox_sleep", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_SEEK_SHELTER = create("fox_seek_shelter", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_STALK_PREY = create("fox_stalk_prey", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Ghast> GHAST_ATTACK_TARGET = create("ghast_attack_target", Ghast.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Ghast> GHAST_IDLE_MOVE = create("ghast_idle_move", Ghast.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Ghast> GHAST_MOVE_TOWARDS_TARGET = create("ghast_move_towards_target", Ghast.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Spellcaster> SPELLCASTER_CAST_SPELL = create("spellcaster_cast_spell", Spellcaster.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<TraderLlama> LLAMATRADER_DEFENDED_WANDERING_TRADER = create("llamatrader_defended_wandering_trader", TraderLlama.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Panda> PANDA_HURT_BY_TARGET = create("panda_hurt_by_target", Panda.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PolarBear> POLARBEAR_ATTACK_PLAYERS = create("polarbear_attack_players", PolarBear.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PolarBear> POLARBEAR_HURT_BY = create("polarbear_hurt_by", PolarBear.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PolarBear> POLARBEAR_MELEE = create("polarbear_melee", PolarBear.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PolarBear> POLARBEAR_PANIC = create("polarbear_panic", PolarBear.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Rabbit> EAT_CARROTS = create("eat_carrots", Rabbit.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Rabbit> KILLER_RABBIT_MELEE_ATTACK = create("killer_rabbit_melee_attack", Rabbit.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Rabbit> RABBIT_AVOID_TARGET = create("rabbit_avoid_target", Rabbit.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Raider> RAIDER_HOLD_GROUND = create("raider_hold_ground", Raider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Raider> RAIDER_OBTAIN_BANNER = create("raider_obtain_banner", Raider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Shulker> SHULKER_DEFENSE = create("shulker_defense", Shulker.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Shulker> SHULKER_NEAREST = create("shulker_nearest", Shulker.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Silverfish> SILVERFISH_HIDE_IN_BLOCK = create("silverfish_hide_in_block", Silverfish.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Silverfish> SILVERFISH_WAKE_OTHERS = create("silverfish_wake_others", Silverfish.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Slime> SLIME_IDLE = create("slime_idle", Slime.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Slime> SLIME_NEAREST_PLAYER = create("slime_nearest_player", Slime.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Slime> SLIME_RANDOM_JUMP = create("slime_random_jump", Slime.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Spider> SPIDER_MELEE_ATTACK = create("spider_melee_attack", Spider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Spider> SPIDER_NEAREST_ATTACKABLE_TARGET = create("spider_nearest_attackable_target", Spider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Squid> SQUID = create("squid", Squid.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Turtle> TURTLE_GOTO_WATER = create("turtle_goto_water", Turtle.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Turtle> TURTLE_TEMPT = create("turtle_tempt", Turtle.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Vex> VEX_COPY_TARGET_OF_OWNER = create("vex_copy_target_of_owner", Vex.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<WanderingTrader> VILLAGERTRADER_WANDER_TO_POSITION = create("villagertrader_wander_to_position", WanderingTrader.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<RangedEntity> ARROW_ATTACK = create("arrow_attack", RangedEntity.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> AVOID_TARGET = create("avoid_target", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Monster> BOW_SHOOT = create("bow_shoot", Monster.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> BREATH = create("breath", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Cat> CAT_SIT_ON_BED = create("cat_sit_on_bed", Cat.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Monster> CROSSBOW_ATTACK = create("crossbow_attack", Monster.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> DOOR_OPEN = create("door_open", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> EAT_TILE = create("eat_tile", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fish> FISH_SCHOOL = create("fish_school", Fish.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> FOLLOW_ENTITY = create("follow_entity", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<SkeletonHorse> HORSE_TRAP = create("horse_trap", SkeletonHorse.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> HURT_BY_TARGET = create("hurt_by_target", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Cat> JUMP_ON_BLOCK = create("jump_on_block", Cat.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> LEAP_AT_TARGET = create("leap_at_target", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Llama> LLAMA_FOLLOW = create("llama_follow", Llama.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> MOVE_TOWARDS_TARGET = create("move_towards_target", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> NEAREST_ATTACKABLE_TARGET = create("nearest_attackable_target", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Raider> NEAREST_ATTACKABLE_TARGET_WITCH = create("nearest_attackable_target_witch", Raider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> NEAREST_VILLAGE = create("nearest_village", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Tameable> OWNER_HURT_BY_TARGET = create("owner_hurt_by_target", Tameable.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Tameable> OWNER_HURT_TARGET = create("owner_hurt_target", Tameable.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Parrot> PERCH = create("perch", Parrot.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Raider> RAID = create("raid", Raider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> RANDOM_FLY = create("random_fly", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> RANDOM_LOOKAROUND = create("random_lookaround", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> RANDOM_STROLL_LAND = create("random_stroll_land", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> RANDOM_SWIM = create("random_swim", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Tameable> RANDOM_TARGET_NON_TAMED = create("random_target_non_tamed", Tameable.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Tameable> SIT = create("sit", Tameable.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> STROLL_VILLAGE = create("stroll_village", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<AbstractHorse> TAME = create("tame", AbstractHorse.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> WATER = create("water", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Dolphin> WATER_JUMP = create("water_jump", Dolphin.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> STROLL_VILLAGE_GOLEM = create("stroll_village_golem", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> UNIVERSAL_ANGER_RESET = create("universal_anger_reset", Mob.class);
-
     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
             final @NotNull Class<T> type) {
         return GoalKey.of(type, NamespacedKey.minecraft(key));

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

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class BiomeKeys {
     /**

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

@@ -6,7 +6,6 @@ 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.bukkit.MinecraftExperimental;
 import org.bukkit.damage.DamageType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class DamageTypeKeys {
     /**
@@ -48,6 +47,13 @@ public final class DamageTypeKeys {
      */
     public static final TypedKey<DamageType> CACTUS = create(key("cactus"));
 
+    /**
+     * {@code minecraft:campfire}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> CAMPFIRE = create(key("campfire"));
+
     /**
      * {@code minecraft:cramming}
      *
@@ -333,8 +339,6 @@ public final class DamageTypeKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<DamageType> WIND_CHARGE = create(key("wind_charge"));
 
     /**

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

@@ -6,7 +6,6 @@ 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.bukkit.MinecraftExperimental;
 import org.bukkit.enchantments.Enchantment;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class EnchantmentKeys {
     /**
@@ -60,8 +59,6 @@ public final class EnchantmentKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<Enchantment> BREACH = create(key("breach"));
 
     /**
@@ -76,8 +73,6 @@ public final class EnchantmentKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<Enchantment> DENSITY = create(key("density"));
 
     /**
@@ -323,8 +318,6 @@ public final class EnchantmentKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<Enchantment> WIND_BURST = create(key("wind_burst"));
 
     private EnchantmentKeys() {

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

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class GameEventKeys {
     /**

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

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class InstrumentKeys {
     /**

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

@@ -6,7 +6,6 @@ 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.bukkit.MinecraftExperimental;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class MobEffectKeys {
     /**
@@ -116,8 +115,6 @@ public final class MobEffectKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<PotionEffectType> INFESTED = create(key("infested"));
 
     /**
@@ -188,8 +185,6 @@ public final class MobEffectKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<PotionEffectType> OOZING = create(key("oozing"));
 
     /**
@@ -204,8 +199,6 @@ public final class MobEffectKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<PotionEffectType> RAID_OMEN = create(key("raid_omen"));
 
     /**
@@ -262,8 +255,6 @@ public final class MobEffectKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<PotionEffectType> TRIAL_OMEN = create(key("trial_omen"));
 
     /**
@@ -292,8 +283,6 @@ public final class MobEffectKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<PotionEffectType> WEAVING = create(key("weaving"));
 
     /**
@@ -301,8 +290,6 @@ public final class MobEffectKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<PotionEffectType> WIND_CHARGED = create(key("wind_charged"));
 
     /**

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

@@ -6,7 +6,6 @@ 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.bukkit.MinecraftExperimental;
 import org.bukkit.generator.structure.Structure;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class StructureKeys {
     /**
@@ -228,8 +227,6 @@ public final class StructureKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<Structure> TRIAL_CHAMBERS = create(key("trial_chambers"));
 
     /**

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

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class StructureTypeKeys {
     /**

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

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class TrimMaterialKeys {
     /**

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

@@ -6,7 +6,6 @@ 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.bukkit.MinecraftExperimental;
 import org.bukkit.inventory.meta.trim.TrimPattern;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class TrimPatternKeys {
     /**
@@ -32,8 +31,6 @@ public final class TrimPatternKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<TrimPattern> BOLT = create(key("bolt"));
 
     /**
@@ -62,8 +59,6 @@ public final class TrimPatternKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
     public static final TypedKey<TrimPattern> FLOW = create(key("flow"));
 
     /**

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

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.21")
 @ApiStatus.Experimental
 public final class WolfVariantKeys {
     /**

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

@@ -0,0 +1,323 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.MinecraftExperimental;
+import org.bukkit.enchantments.Enchantment;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * 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
+ * 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"
+})
+@GeneratedFrom("1.21")
+@ApiStatus.Experimental
+public final class EnchantmentTagKeys {
+    /**
+     * {@code #minecraft:trades/swamp_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SWAMP_SPECIAL = create(key("trades/swamp_special"));
+
+    /**
+     * {@code #minecraft:trades/plains_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_PLAINS_SPECIAL = create(key("trades/plains_special"));
+
+    /**
+     * {@code #minecraft:on_traded_equipment}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> ON_TRADED_EQUIPMENT = create(key("on_traded_equipment"));
+
+    /**
+     * {@code #minecraft:trades/desert_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_DESERT_SPECIAL = create(key("trades/desert_special"));
+
+    /**
+     * {@code #minecraft:prevents_ice_melting}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> PREVENTS_ICE_MELTING = create(key("prevents_ice_melting"));
+
+    /**
+     * {@code #minecraft:trades/taiga_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_TAIGA_COMMON = create(key("trades/taiga_common"));
+
+    /**
+     * {@code #minecraft:tradeable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> TRADEABLE = create(key("tradeable"));
+
+    /**
+     * {@code #minecraft:curse}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> CURSE = create(key("curse"));
+
+    /**
+     * {@code #minecraft:treasure}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> TREASURE = create(key("treasure"));
+
+    /**
+     * {@code #minecraft:prevents_infested_spawns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> PREVENTS_INFESTED_SPAWNS = create(key("prevents_infested_spawns"));
+
+    /**
+     * {@code #minecraft:trades/savanna_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SAVANNA_SPECIAL = create(key("trades/savanna_special"));
+
+    /**
+     * {@code #minecraft:exclusive_set/riptide}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_RIPTIDE = create(key("exclusive_set/riptide"));
+
+    /**
+     * {@code #minecraft:double_trade_price}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> DOUBLE_TRADE_PRICE = create(key("double_trade_price"));
+
+    /**
+     * {@code #minecraft:trades/taiga_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_TAIGA_SPECIAL = create(key("trades/taiga_special"));
+
+    /**
+     * {@code #minecraft:smelts_loot}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> SMELTS_LOOT = create(key("smelts_loot"));
+
+    /**
+     * {@code #minecraft:exclusive_set/boots}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_BOOTS = create(key("exclusive_set/boots"));
+
+    /**
+     * {@code #minecraft:trades/plains_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_PLAINS_COMMON = create(key("trades/plains_common"));
+
+    /**
+     * {@code #minecraft:on_mob_spawn_equipment}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> ON_MOB_SPAWN_EQUIPMENT = create(key("on_mob_spawn_equipment"));
+
+    /**
+     * {@code #minecraft:trades/desert_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_DESERT_COMMON = create(key("trades/desert_common"));
+
+    /**
+     * {@code #minecraft:exclusive_set/mining}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_MINING = create(key("exclusive_set/mining"));
+
+    /**
+     * {@code #minecraft:tooltip_order}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> TOOLTIP_ORDER = create(key("tooltip_order"));
+
+    /**
+     * {@code #minecraft:prevents_decorated_pot_shattering}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> PREVENTS_DECORATED_POT_SHATTERING = create(key("prevents_decorated_pot_shattering"));
+
+    /**
+     * {@code #minecraft:exclusive_set/bow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_BOW = create(key("exclusive_set/bow"));
+
+    /**
+     * {@code #minecraft:on_random_loot}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> ON_RANDOM_LOOT = create(key("on_random_loot"));
+
+    /**
+     * {@code #minecraft:exclusive_set/armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_ARMOR = create(key("exclusive_set/armor"));
+
+    /**
+     * {@code #minecraft:trades/jungle_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_JUNGLE_COMMON = create(key("trades/jungle_common"));
+
+    /**
+     * {@code #minecraft:in_enchanting_table}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> IN_ENCHANTING_TABLE = create(key("in_enchanting_table"));
+
+    /**
+     * {@code #minecraft:trades/swamp_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SWAMP_COMMON = create(key("trades/swamp_common"));
+
+    /**
+     * {@code #minecraft:trades/snow_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SNOW_SPECIAL = create(key("trades/snow_special"));
+
+    /**
+     * {@code #minecraft:non_treasure}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> NON_TREASURE = create(key("non_treasure"));
+
+    /**
+     * {@code #minecraft:trades/jungle_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_JUNGLE_SPECIAL = create(key("trades/jungle_special"));
+
+    /**
+     * {@code #minecraft:prevents_bee_spawns_when_mining}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> PREVENTS_BEE_SPAWNS_WHEN_MINING = create(key("prevents_bee_spawns_when_mining"));
+
+    /**
+     * {@code #minecraft:exclusive_set/damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_DAMAGE = create(key("exclusive_set/damage"));
+
+    /**
+     * {@code #minecraft:trades/savanna_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SAVANNA_COMMON = create(key("trades/savanna_common"));
+
+    /**
+     * {@code #minecraft:trades/snow_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SNOW_COMMON = create(key("trades/snow_common"));
+
+    /**
+     * {@code #minecraft:exclusive_set/crossbow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_CROSSBOW = create(key("exclusive_set/crossbow"));
+
+    private EnchantmentTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link Enchantment} in the registry {@code minecraft:root}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static @NotNull TagKey<Enchantment> create(final @NotNull Key key) {
+        return TagKey.create(RegistryKey.ENCHANTMENT, key);
+    }
+}

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

@@ -1,6 +1,7 @@
 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;
@@ -15,6 +16,7 @@ import org.bukkit.enchantments.Enchantment;
 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.meta.trim.TrimMaterial;
 import org.bukkit.inventory.meta.trim.TrimPattern;
 import org.bukkit.potion.PotionEffectType;
@@ -33,10 +35,18 @@ public interface Generators {
         simpleKey("MobEffectKeys", PotionEffectType.class, Registries.MOB_EFFECT, RegistryKey.MOB_EFFECT, false),
         simpleKey("DamageTypeKeys", DamageType.class, Registries.DAMAGE_TYPE, RegistryKey.DAMAGE_TYPE, true),
         simpleKey("WolfVariantKeys", Wolf.Variant.class, Registries.WOLF_VARIANT, RegistryKey.WOLF_VARIANT, true),
+        simpleKey("ItemTypeKeys", ItemType.class, Registries.ITEM, RegistryKey.ITEM, false),
+
+        simpleTagKey("EnchantmentTagKeys", Enchantment.class, Registries.ENCHANTMENT, RegistryKey.ENCHANTMENT),
+        simpleTagKey("ItemTypeTagKeys", ItemType.class, Registries.ITEM, RegistryKey.ITEM),
         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

@@ -1,22 +1,29 @@
 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.Map;
 import net.minecraft.SharedConstants;
+import net.minecraft.commands.Commands;
 import net.minecraft.core.LayeredRegistryAccess;
 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.WorldLoader;
 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.world.flag.FeatureFlags;
 import org.apache.commons.io.file.PathUtils;
 import org.slf4j.Logger;
 
@@ -24,6 +31,7 @@ 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();
@@ -36,6 +44,10 @@ public final class Main {
         LayeredRegistryAccess<RegistryLayer> layers = RegistryLayer.createRegistryAccess();
         layers = WorldLoader.loadAndReplaceLayer(resourceManager, layers, RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES);
         REGISTRY_ACCESS = layers.compositeAccess().freeze();
+        final ReloadableServerResources datapack = ReloadableServerResources.loadResources(resourceManager, layers, FeatureFlags.REGISTRY.allFlags(), Commands.CommandSelection.DEDICATED, 0, MoreExecutors.directExecutor(), MoreExecutors.directExecutor()).join();
+        datapack.updateRegistryTags();
+
+        EXPERIMENTAL_TAGS = TagCollector.grabExperimental(resourceManager);
     }
 
     private Main() {

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

@@ -28,7 +28,6 @@ import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistrySetBuilder;
-import net.minecraft.data.registries.UpdateOneTwentyOneRegistries;
 import net.minecraft.data.registries.VanillaRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.flag.FeatureElement;
@@ -54,8 +53,7 @@ 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 = UpdateOneTwentyOneRegistries.BUILDER.entries.stream()
-            .collect(Collectors.toMap(RegistrySetBuilder.RegistryStub::key, RegistrySetBuilder.RegistryStub::bootstrap));
+    private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> EXPERIMENTAL_REGISTRY_ENTRIES = Collections.emptyMap(); // Update for Experimental API
 
     private static final Map<RegistryKey<?>, String> REGISTRY_KEY_FIELD_NAMES;
     static {
@@ -139,15 +137,15 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
                 .initializer("$N(key($S))", createMethod.build(), keyPath)
                 .addJavadoc(Javadocs.getVersionDependentField("{@code $L}"), key.location().toString());
             if (experimental.contains(key)) {
-                fieldBuilder.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.UPDATE_1_21));
+                fieldBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
             } else {
                 allExperimental = false;
             }
             typeBuilder.addField(fieldBuilder.build());
         }
         if (allExperimental) {
-            typeBuilder.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.UPDATE_1_21));
-            createMethod.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.UPDATE_1_21));
+            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
         }
@@ -164,7 +162,7 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
 
     private Set<ResourceKey<T>> collectExperimentalKeysBuiltIn(final Registry<T> registry) {
         final HolderLookup.RegistryLookup<T> filteredLookup = registry.asLookup().filterElements(v -> {
-            return ((FeatureElement) v).requiredFeatures().contains(FeatureFlags.UPDATE_1_21);
+            return false; // Update for Experimental API
         });
         return filteredLookup.listElementIds().collect(Collectors.toUnmodifiableSet());
     }

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

@@ -0,0 +1,149 @@
+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.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import net.kyori.adventure.key.Key;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistrySetBuilder;
+import net.minecraft.data.registries.VanillaRegistries;
+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.NOT_NULL;
+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<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 = Collections.emptyMap(); // 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 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).annotated(NOT_NULL);
+
+        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.annotated(NOT_NULL));
+        if (this.publicCreateKeyMethod) {
+            create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental
+            create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.registry().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.registryOrThrow(this.registryKey);
+
+        final AtomicBoolean allExperimental = new AtomicBoolean(true);
+        registry.getTags().forEach(pair -> {
+            final net.minecraft.tags.TagKey<T> nmsTagKey = pair.getFirst();
+            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());
+            if (Main.EXPERIMENTAL_TAGS.containsKey(nmsTagKey)) {
+                fieldBuilder.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.TRADE_REBALANCE)); // 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
+            .skipJavaLangImports(true)
+            .addStaticImport(Key.class, "key")
+            .indent("    ");
+    }
+}

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

@@ -71,95 +71,6 @@ public class MobGoalGenerator extends SimpleGenerator {
 
     private static final String CLASS_HEADER = Javadocs.getVersionDependentClassHeader("Mob Goals");
 
-    private static final DeprecatedEntry[] DEPRECATED_ENTRIES = {
-        //<editor-fold defaultstate="collapsed" desc="legacy entries">
-        new DeprecatedEntry(Vindicator.class, "vindicator_melee_attack", null, "1.20.2"),
-        new DeprecatedEntry(Ravager.class, "ravager_melee_attack", null, "1.20.2"),
-        new DeprecatedEntry(Rabbit.class, "evil_rabbit_attack", null, "1.20.2"),
-        new DeprecatedEntry(PigZombie.class, "anger", "1.21", "1.16"),
-        new DeprecatedEntry(PigZombie.class, "anger_other", "1.21", "1.16"),
-        new DeprecatedEntry(Blaze.class, "blaze_fireball", "1.21", null),
-        new DeprecatedEntry(Cat.class, "tempt_chance", "1.21", null),
-        new DeprecatedEntry(Dolphin.class, "dolphin_play_with_items", "1.21", null),
-        new DeprecatedEntry(Drowned.class, "drowned_goto_beach", "1.21", null),
-        new DeprecatedEntry(Creature.class, "drowned_goto_water", "1.21", null),
-        new DeprecatedEntry(Enderman.class, "enderman_pickup_block", "1.21", null),
-        new DeprecatedEntry(Enderman.class, "enderman_place_block", "1.21", null),
-        new DeprecatedEntry(Enderman.class, "player_who_looked_at_target", "1.21", null),
-        new DeprecatedEntry(Evoker.class, "evoker_cast_spell", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_defend_trusted", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_faceplant", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_perch_and_search", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_sleep", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_seek_shelter", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_stalk_prey", "1.21", null),
-        new DeprecatedEntry(Ghast.class, "ghast_attack_target", "1.21", null),
-        new DeprecatedEntry(Ghast.class, "ghast_idle_move", "1.21", null),
-        new DeprecatedEntry(Ghast.class, "ghast_move_towards_target", "1.21", null),
-        new DeprecatedEntry(Spellcaster.class, "spellcaster_cast_spell", "1.21", null),
-        new DeprecatedEntry(TraderLlama.class, "llamatrader_defended_wandering_trader", "1.21", null),
-        new DeprecatedEntry(Panda.class, "panda_hurt_by_target", "1.21", null),
-        new DeprecatedEntry(PolarBear.class, "polarbear_attack_players", "1.21", null),
-        new DeprecatedEntry(PolarBear.class, "polarbear_hurt_by", "1.21", null),
-        new DeprecatedEntry(PolarBear.class, "polarbear_melee", "1.21", null),
-        new DeprecatedEntry(PolarBear.class, "polarbear_panic", "1.21", null),
-        new DeprecatedEntry(Rabbit.class, "eat_carrots", "1.21", null),
-        new DeprecatedEntry(Rabbit.class, "killer_rabbit_melee_attack", "1.21", null),
-        new DeprecatedEntry(Rabbit.class, "rabbit_avoid_target", "1.21", null),
-        new DeprecatedEntry(Raider.class, "raider_hold_ground", "1.21", null),
-        new DeprecatedEntry(Raider.class, "raider_obtain_banner", "1.21", null),
-        new DeprecatedEntry(Shulker.class, "shulker_defense", "1.21", null),
-        new DeprecatedEntry(Shulker.class, "shulker_nearest", "1.21", null),
-        new DeprecatedEntry(Silverfish.class, "silverfish_hide_in_block", "1.21", null),
-        new DeprecatedEntry(Silverfish.class, "silverfish_wake_others", "1.21", null),
-        new DeprecatedEntry(Slime.class, "slime_idle", "1.21", null),
-        new DeprecatedEntry(Slime.class, "slime_nearest_player", "1.21", null),
-        new DeprecatedEntry(Slime.class, "slime_random_jump", "1.21", null),
-        new DeprecatedEntry(Spider.class, "spider_melee_attack", "1.21", null),
-        new DeprecatedEntry(Spider.class, "spider_nearest_attackable_target", "1.21", null),
-        new DeprecatedEntry(Squid.class, "squid", "1.21", null),
-        new DeprecatedEntry(Turtle.class, "turtle_goto_water", "1.21", null),
-        new DeprecatedEntry(Turtle.class, "turtle_tempt", "1.21", null),
-        new DeprecatedEntry(Vex.class, "vex_copy_target_of_owner", "1.21", null),
-        new DeprecatedEntry(WanderingTrader.class, "villagertrader_wander_to_position", "1.21", null),
-        new DeprecatedEntry(RangedEntity.class, "arrow_attack", "1.21", null),
-        new DeprecatedEntry(Creature.class, "avoid_target", "1.21", null),
-        new DeprecatedEntry(Monster.class, "bow_shoot", "1.21", null),
-        new DeprecatedEntry(Creature.class, "breath", "1.21", null),
-        new DeprecatedEntry(Cat.class, "cat_sit_on_bed", "1.21", null),
-        new DeprecatedEntry(Monster.class, "crossbow_attack", "1.21", null),
-        new DeprecatedEntry(Mob.class, "door_open", "1.21", null),
-        new DeprecatedEntry(Mob.class, "eat_tile", "1.21", null),
-        new DeprecatedEntry(Fish.class, "fish_school", "1.21", null),
-        new DeprecatedEntry(Mob.class, "follow_entity", "1.21", null),
-        new DeprecatedEntry(SkeletonHorse.class, "horse_trap", "1.21", null),
-        new DeprecatedEntry(Creature.class, "hurt_by_target", "1.21", null),
-        new DeprecatedEntry(Cat.class, "jump_on_block", "1.21", null),
-        new DeprecatedEntry(Mob.class, "leap_at_target", "1.21", null),
-        new DeprecatedEntry(Llama.class, "llama_follow", "1.21", null),
-        new DeprecatedEntry(Creature.class, "move_towards_target", "1.21", null),
-        new DeprecatedEntry(Mob.class, "nearest_attackable_target", "1.21", null),
-        new DeprecatedEntry(Raider.class, "nearest_attackable_target_witch", "1.21", null),
-        new DeprecatedEntry(Creature.class, "nearest_village", "1.21", null),
-        new DeprecatedEntry(Tameable.class, "owner_hurt_by_target", "1.21", null),
-        new DeprecatedEntry(Tameable.class, "owner_hurt_target", "1.21", null),
-        new DeprecatedEntry(Parrot.class, "perch", "1.21", null),
-        new DeprecatedEntry(Raider.class, "raid", "1.21", null),
-        new DeprecatedEntry(Creature.class, "random_fly", "1.21", null),
-        new DeprecatedEntry(Mob.class, "random_lookaround", "1.21", null),
-        new DeprecatedEntry(Creature.class, "random_stroll_land", "1.21", null),
-        new DeprecatedEntry(Creature.class, "random_swim", "1.21", null),
-        new DeprecatedEntry(Tameable.class, "random_target_non_tamed", "1.21", null),
-        new DeprecatedEntry(Tameable.class, "sit", "1.21", null),
-        new DeprecatedEntry(Creature.class, "stroll_village", "1.21", null),
-        new DeprecatedEntry(AbstractHorse.class, "tame", "1.21", null),
-        new DeprecatedEntry(Creature.class, "water", "1.21", null),
-        new DeprecatedEntry(Dolphin.class, "water_jump", "1.21", null),
-        new DeprecatedEntry(Creature.class, "stroll_village_golem", "1.21", null),
-        new DeprecatedEntry(Mob.class, "universal_anger_reset", "1.21", null)
-        //</editor-fold>
-    };
-
     public MobGoalGenerator(final String keysClassName, final String pkg) {
         super(keysClassName, pkg);
     }
@@ -216,26 +127,6 @@ public class MobGoalGenerator extends SimpleGenerator {
             typeBuilder.addField(fieldBuilder.build());
         }
 
-        for (final DeprecatedEntry value : DEPRECATED_ENTRIES) {
-            TypeName typedKey = ParameterizedTypeName.get(GoalKey.class, value.entity);
-            NamespacedKey key = NamespacedKey.minecraft(value.entryName);
-
-            String keyPath = key.getKey();
-            String fieldName = Formatting.formatKeyAsField(keyPath);
-            FieldSpec.Builder fieldBuilder = FieldSpec.builder(typedKey, fieldName, PUBLIC, STATIC, FINAL)
-                .addAnnotation(Annotations.deprecatedVersioned(value.removedVersion, value.removalVersion != null))
-                .initializer("$N($S, $T.class)", createMethod.build(), keyPath, value.entity);
-
-            if (value.removedVersion != null) {
-                fieldBuilder.addJavadoc("Removed in $L", value.removedVersion);
-            }
-            if (value.removalVersion != null) {
-                fieldBuilder.addAnnotation(Annotations.scheduledRemoval(value.removalVersion));
-            }
-
-            typeBuilder.addField(fieldBuilder.build());
-        }
-
         return typeBuilder.addMethod(createMethod.build()).build();
     }
 

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

@@ -1,6 +1,7 @@
 package io.papermc.generator.utils;
 
 import com.squareup.javapoet.AnnotationSpec;
+import java.util.ArrayList;
 import java.util.List;
 
 import io.papermc.paper.generated.GeneratedFrom;
@@ -12,13 +13,17 @@ import org.jetbrains.annotations.Nullable;
 
 public final class Annotations {
 
-    public static List<AnnotationSpec> experimentalAnnotations(final MinecraftExperimental.Requires requiredFeatureFlag) {
-        return List.of(
-            AnnotationSpec.builder(ApiStatus.Experimental.class).build(),
-            AnnotationSpec.builder(MinecraftExperimental.class)
+    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()
-        );
+                .build());
+        } else {
+            annotationSpecs.add(AnnotationSpec.builder(MinecraftExperimental.class).build());
+        }
+        return annotationSpecs;
     }
 
     public static AnnotationSpec deprecatedVersioned(final @Nullable String version, boolean forRemoval) {

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

@@ -1,5 +1,6 @@
 package io.papermc.generator.utils;
 
+import java.util.Optional;
 import org.apache.commons.lang3.math.NumberUtils;
 import java.util.Comparator;
 import java.util.Locale;
@@ -15,6 +16,15 @@ public final class Formatting {
         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) {

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

@@ -0,0 +1,81 @@
+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 io.papermc.generator.utils.Formatting;
+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 net.minecraft.tags.TagManager;
+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().getTagNames()
+                               .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() {
+    }
+}

patches/api/0001-Convert-project-to-Gradle.patch

@@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index bea9ac450de7ec05f9752d253743e95d79c1cd14..0000000000000000000000000000000000000000
+index 86628114c1d111f6d256186ca739ba8a44b3412a..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,267 +0,0 @@
@@ -135,7 +135,7 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.20.6-R0.1-SNAPSHOT</version>
+-    <version>1.21-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>

patches/api/0003-Test-changes.patch

@@ -66,7 +66,7 @@ index 0000000000000000000000000000000000000000..77154095cfb8b259bdb318e8ff40cb6f
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 64e7aef6220097edefdff3b98a771b988365930d..a899f63eb2ce58b3cf708e91819cbbdeffda5d9f 100644
+index 64e7aef6220097edefdff3b98a771b988365930d..d9091ba1e5a55e03adca98305233cce9d6888609 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -29,7 +29,13 @@ public class AnnotationTest {
@@ -103,7 +103,7 @@ index 64e7aef6220097edefdff3b98a771b988365930d..a899f63eb2ce58b3cf708e91819cbbde
      };
  
      @Test
-@@ -67,14 +83,40 @@ public class AnnotationTest {
+@@ -67,14 +83,48 @@ public class AnnotationTest {
                  }
  
                  if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) {
@@ -132,8 +132,16 @@ index 64e7aef6220097edefdff3b98a771b988365930d..a899f63eb2ce58b3cf708e91819cbbde
                  for (int i = 0; i < paramTypes.length; i++) {
                      if (mustBeAnnotated(paramTypes[i]) ^ isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) {
 +                        // Paper start
-+                        if (method.invisibleTypeAnnotations != null || method.visibleTypeAnnotations != null) {
-+                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : java.util.Objects.requireNonNullElse(method.invisibleTypeAnnotations, method.visibleTypeAnnotations)) {
++                        if (method.invisibleTypeAnnotations != null) {
++                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
++                                final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
++                                if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.asList(ACCEPTED_ANNOTATIONS).contains(invisibleTypeAnnotation.desc)) {
++                                    continue dancing;
++                                }
++                            }
++                        }
++                        if (method.visibleTypeAnnotations != null) {
++                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.visibleTypeAnnotations) {
 +                                final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
 +                                if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.asList(ACCEPTED_ANNOTATIONS).contains(invisibleTypeAnnotation.desc)) {
 +                                    continue dancing;
@@ -144,7 +152,7 @@ index 64e7aef6220097edefdff3b98a771b988365930d..a899f63eb2ce58b3cf708e91819cbbde
                          ParameterNode paramNode = parameters == null ? null : parameters.get(i);
                          String paramName = paramNode == null ? null : paramNode.name;
  
-@@ -91,13 +133,18 @@ public class AnnotationTest {
+@@ -91,13 +141,18 @@ public class AnnotationTest {
  
          Collections.sort(errors);
  
@@ -167,7 +175,7 @@ index 64e7aef6220097edefdff3b98a771b988365930d..a899f63eb2ce58b3cf708e91819cbbde
      }
  
      private static void collectClasses(@NotNull File from, @NotNull Map<String, ClassNode> to) throws IOException {
-@@ -140,6 +187,11 @@ public class AnnotationTest {
+@@ -140,6 +195,11 @@ public class AnnotationTest {
              // Exceptions are excluded
              return false;
          }
@@ -179,7 +187,7 @@ index 64e7aef6220097edefdff3b98a771b988365930d..a899f63eb2ce58b3cf708e91819cbbde
  
          for (String excludedClass : EXCLUDED_CLASSES) {
              if (excludedClass.equals(clazz.name)) {
-@@ -152,7 +204,7 @@ public class AnnotationTest {
+@@ -152,7 +212,7 @@ public class AnnotationTest {
  
      private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map<String, ClassNode> allClasses) {
          // Exclude private, synthetic and deprecated methods
@@ -188,7 +196,7 @@ index 64e7aef6220097edefdff3b98a771b988365930d..a899f63eb2ce58b3cf708e91819cbbde
              return false;
          }
  
-@@ -170,11 +222,30 @@ public class AnnotationTest {
+@@ -170,11 +230,30 @@ public class AnnotationTest {
          if ("<init>".equals(method.name) && isAnonymous(clazz)) {
              return false;
          }

patches/api/0004-Code-Generation.patch

@@ -85,16 +85,17 @@ index 0000000000000000000000000000000000000000..2512dba27edfdccbc4430815b6cba048
 +}
 diff --git a/src/main/java/io/papermc/paper/registry/RegistryKey.java b/src/main/java/io/papermc/paper/registry/RegistryKey.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7b79bf33074355020e0b3b5ef40c7f2e6ba644b4
+index 0000000000000000000000000000000000000000..76daccf4ea502e1747a6f9176dc16fd20c561286
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/RegistryKey.java
-@@ -0,0 +1,141 @@
+@@ -0,0 +1,147 @@
 +package io.papermc.paper.registry;
 +
 +import net.kyori.adventure.key.Keyed;
 +import org.bukkit.Art;
 +import org.bukkit.Fluid;
 +import org.bukkit.GameEvent;
++import org.bukkit.JukeboxSong;
 +import org.bukkit.MusicInstrument;
 +import org.bukkit.Particle;
 +import org.bukkit.Sound;
@@ -156,11 +157,6 @@ index 0000000000000000000000000000000000000000..7b79bf33074355020e0b3b5ef40c7f2e
 +     */
 +    RegistryKey<MusicInstrument> INSTRUMENT = create("instrument");
 +    /**
-+     * Built-in registry for enchantments.
-+     * @see io.papermc.paper.registry.keys.EnchantmentKeys
-+     */
-+    RegistryKey<Enchantment> ENCHANTMENT = create("enchantment");
-+    /**
 +     * Built-in registry for potion effect types (mob effects).
 +     * @see io.papermc.paper.registry.keys.MobEffectKeys
 +     */
@@ -206,10 +202,20 @@ index 0000000000000000000000000000000000000000..7b79bf33074355020e0b3b5ef40c7f2e
 +     */
 +    RegistryKey<DamageType> DAMAGE_TYPE = create("damage_type");
 +    /**
-+     * Data-driven registry for wolf variants
++     * Data-driven registry for wolf variants.
 +     * @see io.papermc.paper.registry.keys.WolfVariantKeys
 +     */
 +    RegistryKey<Wolf.Variant> WOLF_VARIANT = create("wolf_variant");
++    /**
++     * Data-driven registry for enchantments.
++     * @see io.papermc.paper.registry.keys.EnchantmentKeys
++     */
++    RegistryKey<Enchantment> ENCHANTMENT = create("enchantment");
++    /**
++     * Data-driven registry for jukebox songs.
++     */
++    @ApiStatus.Experimental
++    RegistryKey<JukeboxSong> JUKEBOX_SONG = create("jukebox_song");
 +
 +
 +    /* ******************* *
@@ -325,14 +331,13 @@ index 0000000000000000000000000000000000000000..1a97b3359c4ece5c29131da7c3f208aa
 +record TypedKeyImpl<T>(@NotNull Key key, @NotNull RegistryKey<T> registryKey) implements TypedKey<T> {
 +}
 diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java/org/bukkit/MinecraftExperimental.java
-index b6f4810e387c22c4a70609ea1d605130245689a5..03824ae54e1bdb8b14f79b3c5e0294ae725e43f8 100644
+index a86b87e4c3332202e40e484c3f9c6562b419c70f..305532968f9f7dd497c77259ed147ea2f081bc74 100644
 --- a/src/main/java/org/bukkit/MinecraftExperimental.java
 +++ b/src/main/java/org/bukkit/MinecraftExperimental.java
-@@ -47,6 +47,6 @@ public @interface MinecraftExperimental {
+@@ -47,5 +47,6 @@ public @interface MinecraftExperimental {
      @ApiStatus.Internal
      public enum Requires {
  
--        UPDATE_1_21
-+        UPDATE_1_21, BUNDLE, TRADE_REBALANCE // Paper
++        BUNDLE, TRADE_REBALANCE // Paper
      }
  }

patches/api/0006-Adventure.patch

@@ -8,7 +8,7 @@ Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 Co-authored-by: Yannick Lamprecht <yannicklamprecht@live.de>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..bae542d05c059d53199b9171bee505de818df349 100644
+index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..af3514113abdf3f42c41f1e7ff0f930cc1a417f5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,12 +11,28 @@ java {
@@ -55,7 +55,7 @@ index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..bae542d05c059d53199b9171bee505de
      // Paper end
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-@@ -99,14 +122,30 @@ tasks.withType<Javadoc> {
+@@ -99,14 +122,31 @@ tasks.withType<Javadoc> {
          "https://guava.dev/releases/32.1.2-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
          "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
@@ -67,6 +67,7 @@ index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..bae542d05c059d53199b9171bee505de
          // Paper end
 +        // Paper start
 +        "https://jd.advntr.dev/api/$adventureVersion/",
++        "https://jd.advntr.dev/key/$adventureVersion/",
 +        "https://jd.advntr.dev/text-minimessage/$adventureVersion/",
 +        "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
 +        "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
@@ -374,10 +375,10 @@ index 0000000000000000000000000000000000000000..01cf89d3558132912c4d0eb48c98cd8c
 +}
 diff --git a/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java b/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d4c01e4d332b46f0b129dd5f9e9737ba19923562
+index 0000000000000000000000000000000000000000..2e492f4cd179135bd40ad951ab23acb562be2f06
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,105 @@
 +package io.papermc.paper.event.player;
 +
 +import net.kyori.adventure.text.Component;
@@ -459,19 +460,6 @@ index 0000000000000000000000000000000000000000..d4c01e4d332b46f0b129dd5f9e9737ba
 +        this.result = result;
 +    }
 +
-+    /**
-+     * If this decorating is part of a preview request/response.
-+     *
-+     * @return {@code true} if part of previewing
-+     * @deprecated chat preview was removed in 1.19.3
-+     */
-+    @Deprecated(forRemoval = true, since = "1.19.3")
-+    @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    @Contract(value = "-> false", pure = true)
-+    public boolean isPreview() {
-+        return false;
-+    }
-+
 +    @Override
 +    public boolean isCancelled() {
 +        return this.cancelled;
@@ -778,10 +766,10 @@ index 0000000000000000000000000000000000000000..1a11cfde07db55194cd26757863a268b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172efa1864648 100644
+index 67b6e7e6740cd0f98e2de8087ad87fdf9cdf83d1..fe6c43405e3f11272c1ff015f1dcd47129a68d41 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -422,7 +422,9 @@ public final class Bukkit {
+@@ -423,7 +423,9 @@ public final class Bukkit {
       *
       * @param message the message
       * @return the number of players
@@ -791,7 +779,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      public static int broadcastMessage(@NotNull String message) {
          return server.broadcastMessage(message);
      }
-@@ -1223,6 +1225,19 @@ public final class Bukkit {
+@@ -1227,6 +1229,19 @@ public final class Bukkit {
          server.shutdown();
      }
  
@@ -811,7 +799,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      /**
       * Broadcasts the specified message to every user with the given
       * permission name.
-@@ -1232,6 +1247,21 @@ public final class Bukkit {
+@@ -1236,6 +1251,21 @@ public final class Bukkit {
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
       */
@@ -833,7 +821,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      public static int broadcast(@NotNull String message, @NotNull String permission) {
          return server.broadcast(message, permission);
      }
-@@ -1493,6 +1523,7 @@ public final class Bukkit {
+@@ -1497,6 +1527,7 @@ public final class Bukkit {
          return server.createInventory(owner, type);
      }
  
@@ -841,7 +829,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      /**
       * Creates an empty inventory with the specified type and title. If the type
       * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1518,6 +1549,38 @@ public final class Bukkit {
+@@ -1522,6 +1553,38 @@ public final class Bukkit {
       * @see InventoryType#isCreatable()
       */
      @NotNull
@@ -880,7 +868,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
          return server.createInventory(owner, type, title);
      }
-@@ -1536,6 +1599,7 @@ public final class Bukkit {
+@@ -1540,6 +1603,7 @@ public final class Bukkit {
          return server.createInventory(owner, size);
      }
  
@@ -888,7 +876,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1548,10 +1612,30 @@ public final class Bukkit {
+@@ -1552,10 +1616,30 @@ public final class Bukkit {
       * @throws IllegalArgumentException if the size is not a multiple of 9
       */
      @NotNull
@@ -919,7 +907,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      /**
       * Creates an empty merchant.
       *
-@@ -1559,7 +1643,20 @@ public final class Bukkit {
+@@ -1563,7 +1647,20 @@ public final class Bukkit {
       * when the merchant inventory is viewed
       * @return a new merchant
       */
@@ -940,7 +928,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      public static Merchant createMerchant(@Nullable String title) {
          return server.createMerchant(title);
      }
-@@ -1676,12 +1773,43 @@ public final class Bukkit {
+@@ -1680,12 +1777,43 @@ public final class Bukkit {
          return server.isPrimaryThread();
      }
  
@@ -984,7 +972,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      public static String getMotd() {
          return server.getMotd();
      }
-@@ -1690,7 +1818,9 @@ public final class Bukkit {
+@@ -1694,7 +1822,9 @@ public final class Bukkit {
       * Set the message that is displayed on the server list.
       *
       * @param motd The message to be displayed
@@ -994,7 +982,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef
      public static void setMotd(@NotNull String motd) {
          server.setMotd(motd);
      }
-@@ -1699,8 +1829,10 @@ public final class Bukkit {
+@@ -1714,8 +1844,10 @@ public final class Bukkit {
       * Gets the default message that is displayed when the server is stopped.
       *
       * @return the shutdown message
@@ -1019,6 +1007,25 @@ index e3f185dc982d1c38195a4e01ddd485c13ffa58c0..918a045165cdcde264bc24082b7afebb
  public enum ChatColor {
      /**
       * Represents black
+diff --git a/src/main/java/org/bukkit/JukeboxSong.java b/src/main/java/org/bukkit/JukeboxSong.java
+index 3bf2743fbf123af981d03f0eee6fafd68786ace5..bf487bd9a9fb627c15c7f5e0c623441d367e7c80 100644
+--- a/src/main/java/org/bukkit/JukeboxSong.java
++++ b/src/main/java/org/bukkit/JukeboxSong.java
+@@ -34,4 +34,14 @@ public interface JukeboxSong extends Keyed, Translatable {
+     private static JukeboxSong get(@NotNull String s) {
+         return Objects.requireNonNull(Registry.JUKEBOX_SONG.get(NamespacedKey.minecraft(s)), "Missing song " + s);
+     }
++
++    // Paper start - adventure
++    /**
++     * @deprecated this method assumes that jukebox song description will
++     * always be a translatable component which is not guaranteed.
++     */
++    @Override
++    @Deprecated(forRemoval = true)
++    @org.jetbrains.annotations.NotNull String getTranslationKey();
++    // Paper end - adventure
+ }
 diff --git a/src/main/java/org/bukkit/Keyed.java b/src/main/java/org/bukkit/Keyed.java
 index 32c92621c2c15eec14c50965f5ecda00c46e6c80..e076d447da62445764a9776ee2554c077637d270 100644
 --- a/src/main/java/org/bukkit/Keyed.java
@@ -1176,10 +1183,10 @@ index 9562fcd522b2e2b24ec57fbf18ddeebba3e50abf..9b61129c3ef83d0bfceba54aba2effa1
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b 100644
+index 19d2b0abfef1cff5d7c5ce661416c6b53a307dc2..fa6ad07214d5e38866bf6bee9139c6c938e9f51a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -65,13 +65,13 @@ import org.jetbrains.annotations.Nullable;
+@@ -66,13 +66,13 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a server implementation.
   */
@@ -1195,7 +1202,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
       */
      public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin";
  
-@@ -79,7 +79,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -80,7 +80,7 @@ public interface Server extends PluginMessageRecipient {
       * Used for all announcement messages, such as informing users that a
       * player has joined.
       * <p>
@@ -1204,7 +1211,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
       */
      public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
  
-@@ -355,7 +355,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -356,7 +356,9 @@ public interface Server extends PluginMessageRecipient {
       *
       * @param message the message
       * @return the number of players
@@ -1214,7 +1221,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
      public int broadcastMessage(@NotNull String message);
  
      /**
-@@ -1049,8 +1051,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -1053,8 +1055,33 @@ public interface Server extends PluginMessageRecipient {
       * @param permission the required permission {@link Permissible
       *     permissibles} must have to receive the broadcast
       * @return number of message recipients
@@ -1248,7 +1255,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
  
      /**
       * Gets the player by the given name, regardless if they are offline or
-@@ -1267,6 +1294,35 @@ public interface Server extends PluginMessageRecipient {
+@@ -1271,6 +1298,35 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
  
@@ -1284,7 +1291,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
      /**
       * Creates an empty inventory with the specified type and title. If the type
       * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1288,9 +1344,11 @@ public interface Server extends PluginMessageRecipient {
+@@ -1292,9 +1348,11 @@ public interface Server extends PluginMessageRecipient {
       * @return The new inventory.
       * @throws IllegalArgumentException if the {@link InventoryType} cannot be
       * viewed.
@@ -1296,7 +1303,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
  
-@@ -1306,6 +1364,22 @@ public interface Server extends PluginMessageRecipient {
+@@ -1310,6 +1368,22 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
  
@@ -1319,7 +1326,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
      /**
       * Creates an empty inventory of type {@link InventoryType#CHEST} with the
       * specified size and title.
-@@ -1316,18 +1390,32 @@ public interface Server extends PluginMessageRecipient {
+@@ -1320,18 +1394,32 @@ public interface Server extends PluginMessageRecipient {
       *     viewed
       * @return a new inventory
       * @throws IllegalArgumentException if the size is not a multiple of 9
@@ -1352,7 +1359,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
      Merchant createMerchant(@Nullable String title);
  
      /**
-@@ -1423,27 +1511,56 @@ public interface Server extends PluginMessageRecipient {
+@@ -1427,19 +1515,46 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean isPrimaryThread();
  
@@ -1399,6 +1406,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
      void setMotd(@NotNull String motd);
  
      /**
+@@ -1455,8 +1570,10 @@ public interface Server extends PluginMessageRecipient {
       * Gets the default message that is displayed when the server is stopped.
       *
       * @return the shutdown message
@@ -1409,7 +1417,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
      String getShutdownMessage();
  
      /**
-@@ -1834,7 +1951,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1847,7 +1964,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends the component to the player
           *
           * @param component the components to send
@@ -1419,7 +1427,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
          public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1843,7 +1962,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1856,7 +1975,9 @@ public interface Server extends PluginMessageRecipient {
           * Sends an array of components as a single message to the player
           *
           * @param components the components to send
@@ -1429,11 +1437,67 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1
          public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
+diff --git a/src/main/java/org/bukkit/ServerLinks.java b/src/main/java/org/bukkit/ServerLinks.java
+index 18a53194483410c4d5ad35f901c90d44efaeef60..aff43d77f31d81b82e5fc5fea6272dda24506562 100644
+--- a/src/main/java/org/bukkit/ServerLinks.java
++++ b/src/main/java/org/bukkit/ServerLinks.java
+@@ -50,13 +50,27 @@ public interface ServerLinks {
+     @NotNull
+     ServerLink addLink(@NotNull Type type, @NotNull URI url);
+ 
++    // Paper start - Adventure
++    /**
++     * Adds the given link to the list of links.
++     *
++     * @param displayName link name / display text Component
++     * @param url link url
++     * @return the added link
++     */
++    @NotNull
++    ServerLink addLink(@NotNull net.kyori.adventure.text.Component displayName, @NotNull URI url);
++    // Paper end - Adventure
++
+     /**
+      * Adds the given link to the list of links.
+      *
+      * @param displayName link name / display text
+      * @param url link url
+      * @return the added link
++     * @deprecated in favour of {@link ServerLinks#addLink(net.kyori.adventure.text.Component, URI)}
+      */
++    @Deprecated // Paper - Adventure
+     @NotNull
+     ServerLink addLink(@NotNull String displayName, @NotNull URI url);
+ 
+@@ -89,11 +103,23 @@ public interface ServerLinks {
+         @Nullable
+         Type getType();
+ 
++        // Paper start - Adventure
++        /**
++         * Gets the display name/text Component of this link.
++         *
++         * @return display name Component
++         */
++        @NotNull
++        net.kyori.adventure.text.Component displayName();
++        // Paper end - Adventure
++
+         /**
+          * Gets the display name/text of this link.
+          *
+          * @return display name
++         * @deprecated in favour of {@link ServerLink#displayName()}
+          */
++        @Deprecated // Paper - Adventure
+         @NotNull
+         String getDisplayName();
+ 
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 72260e6284e3f5ce1813635aa07518c47dbf0899..375172e05a78611deb3003f780867516cb6cd1a4 100644
+index f4d7efee38c3b1381fdbcd47ab1f59fb02728cf2..b2ff1da3386223a544ab5fc363a90c66c8869242 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
-@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
   * guarantee values will not be removed from this Enum. As such, you should not
   * depend on the ordinal values of this class.
   */
@@ -1442,7 +1506,7 @@ index 72260e6284e3f5ce1813635aa07518c47dbf0899..375172e05a78611deb3003f780867516
  
      AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"),
      AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"),
-@@ -1725,4 +1725,11 @@ public enum Sound implements Keyed {
+@@ -1635,4 +1635,11 @@ public enum Sound implements Keyed {
      public NamespacedKey getKey() {
          return key;
      }
@@ -1491,7 +1555,7 @@ index ac5e263d737973af077e3406a84a84baca4370db..2d91924b7f5ef16a91d40cdc1bfc3d68
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index ce9bb54a6ef8a7d31804ec63aa1f6cbbd6ae2d54..baf49da3dd46039da2f24a4af8b1b8617bb25501 100644
+index 0bb3637d73132f1882af38ca7ad6864a44812edc..9ba1a4e838538ecd55f4f8e50ffb0c5f1f474382 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -30,6 +30,15 @@ import org.jetbrains.annotations.Nullable;
@@ -2182,10 +2246,10 @@ index b7d8dd30360a38dbdc7bbce40c8e6ced7261f833..0817f2395c2b18828565435568ce651f
      public void sendRawMessage(@Nullable UUID sender, @NotNull String message);
  }
 diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index f52cff3abcded891f6002a5fe4d5229ab551fe73..9db24da6836de45b7aff8d89782e6b0e1bc5391b 100644
+index 80fb27d6c54988e53857fb330f45bbf32227aee8..c7a901707048e9dc82b8f17f3285727460173c72 100644
 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java
 +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -319,6 +319,19 @@ public abstract class Enchantment implements Keyed, Translatable {
+@@ -316,6 +316,19 @@ public abstract class Enchantment implements Keyed, Translatable {
       * @return True if the enchantment may be applied, otherwise False
       */
      public abstract boolean canEnchantItem(@NotNull ItemStack item);
@@ -2256,10 +2320,10 @@ index 558fe6e23f562ee873fc84112f930c6ea19a09f4..c78fb359bd28b8dc1ba242642ec612e8
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689c58fbe12 100644
+index fb976b3f5e92016373b83b1ab70032fb910f60d3..5bcec42a91859002409cab9756999e5adc4c867f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -56,7 +56,41 @@ import org.jetbrains.annotations.Nullable;
+@@ -57,7 +57,41 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */
@@ -2302,7 +2366,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
  
      /**
       * {@inheritDoc}
-@@ -73,7 +107,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -74,7 +108,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * places defined by plugins.
       *
       * @return the friendly name
@@ -2312,7 +2376,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      @NotNull
      public String getDisplayName();
  
-@@ -85,15 +121,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -86,15 +122,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * places defined by plugins.
       *
       * @param name The new display name.
@@ -2363,7 +2427,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public String getPlayerListName();
  
      /**
-@@ -102,14 +173,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -103,14 +174,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * If the value is null, the name will be identical to {@link #getName()}.
       *
       * @param name new player list name
@@ -2382,7 +2446,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      @Nullable
      public String getPlayerListHeader();
  
-@@ -117,7 +192,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -118,7 +193,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Gets the currently displayed player list footer for this player.
       *
       * @return player list header or null
@@ -2392,7 +2456,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      @Nullable
      public String getPlayerListFooter();
  
-@@ -125,14 +202,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -126,14 +203,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Sets the currently displayed player list header for this player.
       *
       * @param header player list header, null for empty
@@ -2411,7 +2475,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public void setPlayerListFooter(@Nullable String footer);
  
      /**
-@@ -141,7 +222,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -142,7 +223,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param header player list header, null for empty
       * @param footer player list footer, null for empty
@@ -2421,7 +2485,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
  
      /**
-@@ -221,9 +304,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -219,9 +302,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Kicks player with custom kick message.
       *
       * @param message kick message
@@ -2447,7 +2511,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      /**
       * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
       * update the entry.
-@@ -886,6 +985,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -884,6 +983,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map<EquipmentSlot, ItemStack> items);
  
@@ -2554,7 +2618,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      /**
       * Send a sign change. This fakes a sign change packet for a user at
       * a certain location. This will not actually change the world in any way.
-@@ -903,7 +1102,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -901,7 +1100,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param lines the new text on the sign or null to clear it
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2566,7 +2630,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
  
      /**
-@@ -925,7 +1128,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -923,7 +1126,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if dyeColor is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2578,7 +2642,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
  
      /**
-@@ -948,7 +1155,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -946,7 +1153,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if dyeColor is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2590,7 +2654,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
  
      /**
-@@ -1416,7 +1627,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1421,7 +1632,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long.
       * @deprecated Minecraft no longer uses textures packs. Instead you
@@ -2599,7 +2663,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
       */
      @Deprecated
      public void setTexturePack(@NotNull String url);
-@@ -1452,7 +1663,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1457,7 +1668,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -2609,7 +2673,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -1484,6 +1697,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1489,6 +1702,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -2617,7 +2681,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
       * @param url The URL from which the client will download the resource
       *     pack. The string must contain only US-ASCII characters and should
       *     be encoded as per RFC 1738.
-@@ -1496,6 +1710,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1501,6 +1715,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2625,7 +2689,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public void setResourcePack(@NotNull String url, @Nullable byte[] hash);
  
      /**
-@@ -1520,12 +1735,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1525,12 +1740,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
       * <li>To remove a resource pack you can use
@@ -2640,7 +2704,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
       * @param url The URL from which the client will download the resource
       *     pack. The string must contain only US-ASCII characters and should
       *     be encoded as per RFC 1738.
-@@ -1539,8 +1755,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1544,8 +1760,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2651,7 +2715,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1563,7 +1781,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1568,7 +1786,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
       * <li>To remove a resource pack you can use
@@ -2707,7 +2771,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
       * <li>The request is sent with empty string as the hash when the hash is
       *     not provided. This might result in newer versions not loading the
       *     pack correctly.
-@@ -1582,7 +1847,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1587,7 +1852,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     length restriction is an implementation specific arbitrary value.
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
@@ -2717,7 +2781,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public void setResourcePack(@NotNull String url, @Nullable byte[] hash, boolean force);
  
      /**
-@@ -1607,7 +1874,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1612,7 +1879,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
       * <li>To remove a resource pack you can use
@@ -2726,7 +2790,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
       * <li>The request is sent with empty string as the hash when the hash is
       *     not provided. This might result in newer versions not loading the
       *     pack correctly.
-@@ -1627,9 +1894,61 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1632,9 +1899,61 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     length restriction is an implementation specific arbitrary value.
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
@@ -2788,7 +2852,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1652,7 +1971,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1657,7 +1976,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
       * <li>To remove a resource pack you can use
@@ -2797,7 +2861,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
       * <li>The request is sent with empty string as the hash when the hash is
       *     not provided. This might result in newer versions not loading the
       *     pack correctly.
-@@ -1673,9 +1992,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1678,9 +1997,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     length restriction is an implementation specific arbitrary value.
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
@@ -2858,7 +2922,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      /**
       * Request that the player's client download and include another resource pack.
       * <p>
-@@ -1728,12 +2098,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1733,12 +2103,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param id the id of the resource pack.
       * @throws IllegalArgumentException If the ID is null.
@@ -2873,7 +2937,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
       */
      public void removeResourcePacks();
  
-@@ -1871,7 +2243,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1876,7 +2248,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param title Title text
       * @param subtitle Subtitle text
@@ -2882,7 +2946,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
       */
      @Deprecated
      public void sendTitle(@Nullable String title, @Nullable String subtitle);
-@@ -1890,7 +2262,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1895,7 +2267,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param fadeIn time in ticks for titles to fade in. Defaults to 10.
       * @param stay time in ticks for titles to stay. Defaults to 70.
       * @param fadeOut time in ticks for titles to fade out. Defaults to 20.
@@ -2892,7 +2956,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
  
      /**
-@@ -2165,6 +2539,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2170,6 +2544,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public int getClientViewDistance();
  
@@ -2907,7 +2971,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      /**
       * Gets the player's estimated ping in milliseconds.
       *
-@@ -2190,8 +2572,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2195,8 +2577,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * they wish.
       *
       * @return the player's locale
@@ -2918,7 +2982,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      public String getLocale();
  
      /**
-@@ -2243,6 +2627,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2248,6 +2632,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public boolean isAllowingServerListings();
  
@@ -2933,7 +2997,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
      // Spigot start
      public class Spigot extends Entity.Spigot {
  
-@@ -2274,11 +2666,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2279,11 +2671,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2947,7 +3011,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
          @Override
          public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
-@@ -2289,7 +2683,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2294,7 +2688,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param component the components to send
@@ -2957,7 +3021,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -2299,7 +2695,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2304,7 +2700,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param components the components to send
@@ -2967,7 +3031,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -2310,7 +2708,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2315,7 +2713,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           * @param position the screen position
           * @param sender the sender of the message
           * @param component the components to send
@@ -2977,7 +3041,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -2321,7 +2721,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2326,7 +2726,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           * @param position the screen position
           * @param sender the sender of the message
           * @param components the components to send
@@ -3279,10 +3343,10 @@ index 133760be6c73436512ba684a3ac77a514b2d8765..9473303bd8ab1f6b63b6999a5f5ff3ec
       * Gets how much EXP the Player should have at respawn.
       * <p>
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 45acff6f8b4859b6e111d925ae01d59dd361b8c9..f5bdd6b6df126abfa26ce727c80a5772d2ab1a1b 100644
+index c5734d66686e68080f55034754d43ae55030c3eb..32cd8ee2e849df602a7e10aa5d0a218007faa0ac 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -164,6 +164,18 @@ public enum InventoryType {
+@@ -161,6 +161,18 @@ public enum InventoryType {
      private final String title;
      private final boolean isCreatable;
  
@@ -3301,7 +3365,7 @@ index 45acff6f8b4859b6e111d925ae01d59dd361b8c9..f5bdd6b6df126abfa26ce727c80a5772
      private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) {
          this(defaultSize, defaultTitle, true);
      }
-@@ -172,6 +184,7 @@ public enum InventoryType {
+@@ -169,6 +181,7 @@ public enum InventoryType {
          size = defaultSize;
          title = defaultTitle;
          this.isCreatable = isCreatable;
@@ -3309,7 +3373,7 @@ index 45acff6f8b4859b6e111d925ae01d59dd361b8c9..f5bdd6b6df126abfa26ce727c80a5772
      }
  
      public int getDefaultSize() {
-@@ -179,6 +192,7 @@ public enum InventoryType {
+@@ -176,6 +189,7 @@ public enum InventoryType {
      }
  
      @NotNull
@@ -4263,12 +4327,12 @@ index 5adbe0514129abf3cfbc4b29a213f522359fe2e1..72ebc29db42d08d1d0361dba462fc8a5
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java
-index e12996492c1558fed9fab30de9f8018e0ed7fac3..002acfbdce1db10f7ba1b6a013e678f504ac6e69 100644
+index 5b479ff2abe8cdd5e889803c73a713bc9855bc0b..5954dff2134654bb0ccc3b4c3b51a8e1ca77f6c9 100644
 --- a/src/main/java/org/bukkit/inventory/InventoryView.java
 +++ b/src/main/java/org/bukkit/inventory/InventoryView.java
-@@ -447,12 +447,26 @@ public abstract class InventoryView {
-         return getPlayer().setWindowProperty(prop, value);
-     }
+@@ -267,12 +267,26 @@ public interface InventoryView {
+      */
+     public boolean setProperty(@NotNull Property prop, int value);
  
 +    // Paper start
      /**
@@ -4277,7 +4341,7 @@ index e12996492c1558fed9fab30de9f8018e0ed7fac3..002acfbdce1db10f7ba1b6a013e678f5
       * @return The title.
       */
      @NotNull
-+    public /*abstract*/ net.kyori.adventure.text.Component title() {
++    default net.kyori.adventure.text.Component title() {
 +        return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(this.getTitle());
 +    }
 +    // Paper end
@@ -4290,7 +4354,7 @@ index e12996492c1558fed9fab30de9f8018e0ed7fac3..002acfbdce1db10f7ba1b6a013e678f5
 +     */
 +    @Deprecated // Paper
 +    @NotNull
-     public abstract String getTitle();
+     public String getTitle();
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -4596,10 +4660,10 @@ index 9bab73c3c2ca759b8e1c7d07d98cc593c961666a..f0c6943da3f783101ca647b75b3230fa
              throw new UnsupportedOperationException("Not supported yet.");
          }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe256d6286c 100644
+index 9fb9f00f39d68777cde660b06beaa58b25cd4470..014c1a0379e532a5c924694a8e0715eb0ba50ec2 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -36,6 +36,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -37,6 +37,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       */
      boolean hasDisplayName();
  
@@ -4624,7 +4688,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2
      /**
       * Gets the display name that is set.
       * <p>
-@@ -43,7 +61,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -44,7 +62,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * before calling this method.
       *
       * @return the display name that is set
@@ -4634,7 +4698,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2
      @NotNull
      String getDisplayName();
  
-@@ -51,7 +71,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -52,7 +72,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Sets the display name.
       *
       * @param name the name to set
@@ -4644,7 +4708,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2
      void setDisplayName(@Nullable String name);
  
      /**
-@@ -64,6 +86,32 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -65,6 +87,32 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       */
      boolean hasItemName();
  
@@ -4677,7 +4741,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2
      /**
       * Gets the item name that is set.
       * <br>
-@@ -74,7 +122,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -75,7 +123,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * calling this method.
       *
       * @return the item name that is set
@@ -4687,7 +4751,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2
      @NotNull
      String getItemName();
  
-@@ -85,7 +135,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -86,7 +136,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * anvil, is not styled with italics, and does not show labels.
       *
       * @param name the name to set
@@ -4697,7 +4761,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2
      void setItemName(@Nullable String name);
  
      /**
-@@ -126,6 +178,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -127,6 +179,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       */
      boolean hasLore();
  
@@ -4722,7 +4786,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2
      /**
       * Gets the lore that is set.
       * <p>
-@@ -133,7 +203,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -134,7 +204,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * calling this method.
       *
       * @return a list of lore that is set
@@ -4732,7 +4796,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2
      @Nullable
      List<String> getLore();
  
-@@ -142,7 +214,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -143,7 +215,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Removes lore when given null.
       *
       * @param lore the lore that will be set
@@ -4816,19 +4880,19 @@ index bd512a7840d4686759097ee4cbd8b375c530956b..f2242ddc4085f7e7cdd748d860857822
 +    // Paper end - adventure
  }
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index 9679cc595b5009990d8441a6344505eef1f5d265..f973f0f3925819765412f6f134e553d7d74f1467 100644
+index 8250821fe7be7987c92edbc36911f88875c470fc..2aadb995ab512086ac41b48df4c724722697e166 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java
 +++ b/src/main/java/org/bukkit/map/MapCursor.java
-@@ -12,7 +12,7 @@ public final class MapCursor {
+@@ -17,7 +17,7 @@ public final class MapCursor {
      private byte x, y;
-     private byte direction, type;
+     private byte direction;
      private boolean visible;
 -    private String caption;
 +    private net.kyori.adventure.text.Component caption; // Paper
+     private Type type;
  
      /**
-      * Initialize the map cursor.
-@@ -26,7 +26,7 @@ public final class MapCursor {
+@@ -32,7 +32,7 @@ public final class MapCursor {
       */
      @Deprecated
      public MapCursor(byte x, byte y, byte direction, byte type, boolean visible) {
@@ -4837,7 +4901,7 @@ index 9679cc595b5009990d8441a6344505eef1f5d265..f973f0f3925819765412f6f134e553d7
      }
  
      /**
-@@ -39,7 +39,7 @@ public final class MapCursor {
+@@ -45,7 +45,7 @@ public final class MapCursor {
       * @param visible Whether the cursor is visible by default.
       */
      public MapCursor(byte x, byte y, byte direction, @NotNull Type type, boolean visible) {
@@ -4846,22 +4910,22 @@ index 9679cc595b5009990d8441a6344505eef1f5d265..f973f0f3925819765412f6f134e553d7
      }
  
      /**
-@@ -51,7 +51,7 @@ public final class MapCursor {
+@@ -57,7 +57,7 @@ public final class MapCursor {
       * @param type The type (color/style) of the map cursor.
       * @param visible Whether the cursor is visible by default.
       * @param caption cursor caption
--     * @deprecated Magic value
-+     * @deprecated Magic value. Use {@link #MapCursor(byte, byte, byte, byte, boolean, net.kyori.adventure.text.Component)}
+-     * @deprecated Magic value, use {@link #MapCursor(byte, byte, byte, Type, boolean, String)}
++     * @deprecated Magic value. Use {@link #MapCursor(byte, byte, byte, Type, boolean, net.kyori.adventure.text.Component)}
       */
      @Deprecated
      public MapCursor(byte x, byte y, byte direction, byte type, boolean visible, @Nullable String caption) {
-@@ -60,8 +60,42 @@ public final class MapCursor {
+@@ -66,8 +66,42 @@ public final class MapCursor {
          setDirection(direction);
          setRawType(type);
          this.visible = visible;
 -        this.caption = caption;
 +        this.caption = caption == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(caption); // Paper
-     }
++    }
 +    // Paper start
 +    /**
 +     * Initialize the map cursor.
@@ -4879,7 +4943,7 @@ index 9679cc595b5009990d8441a6344505eef1f5d265..f973f0f3925819765412f6f134e553d7
 +        this.x = x; this.y = y; this.visible = visible; this.caption = caption;
 +        setDirection(direction);
 +        setRawType(type);
-+    }
+     }
 +    /**
 +     * Initialize the map cursor.
 +     *
@@ -4899,25 +4963,25 @@ index 9679cc595b5009990d8441a6344505eef1f5d265..f973f0f3925819765412f6f134e553d7
  
      /**
       * Initialize the map cursor.
-@@ -79,7 +113,7 @@ public final class MapCursor {
+@@ -85,7 +119,7 @@ public final class MapCursor {
          setDirection(direction);
-         setType(type);
+         this.type = type;
          this.visible = visible;
 -        this.caption = caption;
 +        this.caption = caption == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(caption); // Paper
      }
  
      /**
-@@ -202,23 +236,45 @@ public final class MapCursor {
+@@ -204,23 +238,45 @@ public final class MapCursor {
          this.visible = visible;
      }
  
 +    // Paper start
-+    /**
-+     * Gets the caption on this cursor.
-+     *
-+     * @return caption
-+     */
+     /**
+      * Gets the caption on this cursor.
+      *
+      * @return caption
+      */
 +    public net.kyori.adventure.text.@Nullable Component caption() {
 +        return this.caption;
 +    }
@@ -4930,12 +4994,12 @@ index 9679cc595b5009990d8441a6344505eef1f5d265..f973f0f3925819765412f6f134e553d7
 +        this.caption = caption;
 +    }
 +    // Paper end
-     /**
-      * Gets the caption on this cursor.
-      *
-      * @return caption
++    /**
++     * Gets the caption on this cursor.
++     *
++     * @return caption
 +     * @deprecated in favour of {@link #caption()}
-      */
++     */
      @Nullable
 +    @Deprecated // Paper
      public String getCaption() {

patches/api/0008-Use-ASM-for-event-executors.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 106d4d5756dc579c446699106f52462085ea9a52..d6252c1ff21c92bf0d232d5bfdf828d1d2ce38c0 100644
+index af3514113abdf3f42c41f1e7ff0f930cc1a417f5..ed0b67ac322aa22b191cd35502ae5b4f20af19f8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -47,6 +47,9 @@ dependencies {

patches/api/0009-Paper-Plugins.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a0c6f2c36fa4c16787616a79b5d996523c274fe0..effad8017bff46e2651af01f1789cb8dd08a49d5 100644
+index ed0b67ac322aa22b191cd35502ae5b4f20af19f8..258d7010d24c529c9bbc76cc26adf226c641ee58 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -52,7 +52,7 @@ dependencies {
@@ -17,7 +17,7 @@ index a0c6f2c36fa4c16787616a79b5d996523c274fe0..effad8017bff46e2651af01f1789cb8d
      compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
      compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
  
-@@ -138,6 +138,7 @@ tasks.withType<Javadoc> {
+@@ -139,6 +139,7 @@ tasks.withType<Javadoc> {
          "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
          "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
          // Paper end
@@ -1347,10 +1347,10 @@ index 0000000000000000000000000000000000000000..6bf3d212a6156ad9ab0e82d1ca0a04f8
 +
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index baf49da3dd46039da2f24a4af8b1b8617bb25501..7cf61228754527ddaa6b39b5f1426e0527cdaac9 100644
+index 9ba1a4e838538ecd55f4f8e50ffb0c5f1f474382..d8b346fe0f9634218954fe818d53272a0896af9c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -137,4 +137,14 @@ public interface UnsafeValues {
+@@ -141,4 +141,14 @@ public interface UnsafeValues {
  
      @ApiStatus.Internal
      <B extends Keyed> B get(Registry<B> registry, NamespacedKey key);

patches/api/0011-Timings-v2.patch

@@ -2851,10 +2851,10 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6425151b7003a1376977717dca6172efa1864648..e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b 100644
+index fe6c43405e3f11272c1ff015f1dcd47129a68d41..8d729fb196d83e01e4652fb1f77f5cab7b57cc31 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -866,7 +866,6 @@ public final class Bukkit {
+@@ -870,7 +870,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2863,10 +2863,10 @@ index 6425151b7003a1376977717dca6172efa1864648..e23be80c0ee7d7979b7c62ebce97ed0b
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b..77f8b0889cd7039bf041fc052fba33b60aa77e17 100644
+index fa6ad07214d5e38866bf6bee9139c6c938e9f51a..57c9b560c77a56588870598acb543469040ceec1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1947,6 +1947,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1960,6 +1960,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2894,7 +2894,7 @@ index 3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b..77f8b0889cd7039bf041fc052fba33b6
           * Sends the component to the player
           *
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 7cf61228754527ddaa6b39b5f1426e0527cdaac9..9082e67324f810857db26bb89ecea7e9f866f80d 100644
+index d8b346fe0f9634218954fe818d53272a0896af9c..7545e3489474aab3f935095c6057ea2eac1bf84b 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -40,6 +40,7 @@ public interface UnsafeValues {
@@ -2905,7 +2905,7 @@ index 7cf61228754527ddaa6b39b5f1426e0527cdaac9..9082e67324f810857db26bb89ecea7e9
      Material toLegacy(Material material);
  
      Material fromLegacy(Material material);
-@@ -147,4 +148,12 @@ public interface UnsafeValues {
+@@ -151,4 +152,12 @@ public interface UnsafeValues {
          return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
      }
      // Paper end
@@ -3452,10 +3452,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c7d3d938534ac11fe420418655dae689c58fbe12..776a3ce9a6c106fbe96cc6399b9ee2cd81b10c76 100644
+index 5bcec42a91859002409cab9756999e5adc4c867f..3594b0eb4068c83c93efe948a8ef4ba217edce17 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2726,7 +2726,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2731,7 +2731,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          @Deprecated // Paper
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");

patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -7,10 +7,10 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b..336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744 100644
+index 6ecab28705afc0e3652677b516d8a5398e8b2666..db51751d2dc1ac419e8fac32466ad3a7727fa2fe 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -82,6 +82,20 @@ public final class Bukkit {
+@@ -83,6 +83,20 @@ public final class Bukkit {
          return server;
      }
  
@@ -32,10 +32,10 @@ index e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b..336c0fb1fcde9efb7cb8d15a9fad8c4c
       * Attempts to set the {@link Server} singleton.
       * <p>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 77f8b0889cd7039bf041fc052fba33b60aa77e17..09012ce27344c60730b9c5fcde85712a8e7a69fb 100644
+index f4b2ad91c7a46af5fc16f31369d155e4e3ab3aae..638e98416fdf7ac065abe058d625b1c924be5abb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -67,6 +67,18 @@ import org.jetbrains.annotations.Nullable;
+@@ -68,6 +68,18 @@ import org.jetbrains.annotations.Nullable;
   */
  public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
  

patches/api/0013-Player-affects-spawning-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 776a3ce9a6c106fbe96cc6399b9ee2cd81b10c76..966a5626eac9305c88b1fe35d12c5fc6e28348d4 100644
+index 3594b0eb4068c83c93efe948a8ef4ba217edce17..1ba2f706a62ee6962451305b1895654453b485cd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2578,6 +2578,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2583,6 +2583,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Deprecated // Paper
      public String getLocale();
  

patches/api/0014-Add-getTPS-method.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744..ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7 100644
+index d978c72cdbc10792f852a4ba372518073893d02b..5780003631beae773231afe3afc6b834bfe1f84d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2093,6 +2093,17 @@ public final class Bukkit {
+@@ -2108,6 +2108,17 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -27,10 +27,10 @@ index 336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744..ea5f1b4085fd2ec355c4c8036f3bc729
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 09012ce27344c60730b9c5fcde85712a8e7a69fb..e37649ce4b3981f2cff96b64ed3bd4093c015346 100644
+index 8949b8e29ae7f412481291630a5cb7b5b8809842..ba28d9f3213ca4b5f15178dc637bff37a8896edc 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1784,6 +1784,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1797,6 +1797,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  

patches/api/0015-Expose-server-build-information.patch

@@ -230,10 +230,10 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d7569d644b25 100644
+index 5780003631beae773231afe3afc6b834bfe1f84d..a005d5f8879262c763d8c4fbd09b9a99810d5e8c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -109,13 +109,26 @@ public final class Bukkit {
+@@ -110,13 +110,26 @@ public final class Bukkit {
          }
  
          Bukkit.server = server;
@@ -261,7 +261,7 @@ index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d756
       */
      @NotNull
      public static String getName() {
-@@ -126,6 +139,7 @@ public final class Bukkit {
+@@ -127,6 +140,7 @@ public final class Bukkit {
       * Gets the version string of this server implementation.
       *
       * @return version of this server implementation
@@ -269,7 +269,7 @@ index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d756
       */
      @NotNull
      public static String getVersion() {
-@@ -142,6 +156,20 @@ public final class Bukkit {
+@@ -143,6 +157,20 @@ public final class Bukkit {
          return server.getBukkitVersion();
      }
  
@@ -291,10 +291,10 @@ index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d756
       * Gets a view of all currently logged in players. This {@linkplain
       * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e37649ce4b3981f2cff96b64ed3bd4093c015346..7c646d1bb8b011c156b0688f9396bbcbba43d077 100644
+index ba28d9f3213ca4b5f15178dc637bff37a8896edc..8a07f21eeb04fb54032ce377a1478f60303e1824 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -119,6 +119,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -120,6 +120,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public String getBukkitVersion();
  
@@ -312,10 +312,10 @@ index e37649ce4b3981f2cff96b64ed3bd4093c015346..7c646d1bb8b011c156b0688f9396bbcb
       * Gets a view of all currently logged in players. This {@linkplain
       * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 9082e67324f810857db26bb89ecea7e9f866f80d..da997507b96908027c49dabc6daf7c787dcad95d 100644
+index 7545e3489474aab3f935095c6057ea2eac1bf84b..6def69b973a76a4cee5aee6431a6538e4c27377d 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -155,5 +155,12 @@ public interface UnsafeValues {
+@@ -159,5 +159,12 @@ public interface UnsafeValues {
       * @return name
       */
      String getTimingsServerName();

patches/api/0017-Add-PlayerLocaleChangeEvent.patch

@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Isaac Moore <rmsy@me.com>
-Date: Mon, 29 Feb 2016 18:02:25 -0600
-Subject: [PATCH] Add PlayerLocaleChangeEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..57f6c47e4e759abf0af9aa8962551225cc12246c
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
-@@ -0,0 +1,60 @@
-+package com.destroystokyo.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.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Called when the locale of the player is changed.
-+ *
-+ * @deprecated Replaced by {@link org.bukkit.event.player.PlayerLocaleChangeEvent} upstream
-+ */
-+@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+public class PlayerLocaleChangeEvent extends PlayerEvent {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    private final String oldLocale;
-+    private final String newLocale;
-+
-+    @ApiStatus.Internal
-+    public PlayerLocaleChangeEvent(final @NotNull Player player, final @Nullable String oldLocale, final @NotNull String newLocale) {
-+        super(player);
-+        this.oldLocale = oldLocale;
-+        this.newLocale = newLocale;
-+    }
-+
-+    /**
-+     * Gets the locale the player switched from.
-+     *
-+     * @return player's old locale
-+     */
-+    @Nullable
-+    public String getOldLocale() {
-+        return this.oldLocale;
-+    }
-+
-+    /**
-+     * Gets the locale the player is changed to.
-+     *
-+     * @return player's new locale
-+     */
-+    @NotNull
-+    public String getNewLocale() {
-+        return this.newLocale;
-+    }
-+
-+    @Override
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
-+    }
-+}

patches/api/0017-Add-view-distance-API.patch

@@ -79,10 +79,10 @@ index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff464
       * Gets all generated structures that intersect the chunk at the given
       * coordinates. <br>
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 966a5626eac9305c88b1fe35d12c5fc6e28348d4..b5179b6f8f65d39198c0b80e4be9aca17ca866da 100644
+index 1ba2f706a62ee6962451305b1895654453b485cd..7d530bd0e4d833da760d1cf82aba966b7fb480b1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2592,6 +2592,82 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2597,6 +2597,82 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);

patches/api/0019-Expose-server-CommandMap.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f4bf442b065e93b49a7e17658f73d7569d644b25..db217a9486e327b4340a54d65439055d86f363cc 100644
+index a005d5f8879262c763d8c4fbd09b9a99810d5e8c..26f3ac9c15ff554becfe8ea53a48f67b2de60ed6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2322,6 +2322,19 @@ public final class Bukkit {
+@@ -2337,6 +2337,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index f4bf442b065e93b49a7e17658f73d7569d644b25..db217a9486e327b4340a54d65439055d
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7c646d1bb8b011c156b0688f9396bbcbba43d077..69153de6847bb8740803e5f731a0586d41a0eed3 100644
+index 8a07f21eeb04fb54032ce377a1478f60303e1824..d78481bf17818415524f14417caf86d5684b2235 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1804,6 +1804,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1817,6 +1817,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public double[] getTPS();
      // Paper end
  

patches/api/0020-Add-PlayerInitialSpawnEvent.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Steve Anton <anxuiz.nx@gmail.com>
-Date: Mon, 29 Feb 2016 18:13:58 -0600
-Subject: [PATCH] Add PlayerInitialSpawnEvent
-
-For modifying a player's initial spawn location as they join the server
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..49e97ae79facceca5fc44c84c3d5f342d64cabc2
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
-@@ -0,0 +1,19 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import org.bukkit.Location;
-+import org.bukkit.entity.Player;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+import org.spigotmc.event.player.PlayerSpawnLocationEvent;
-+
-+/**
-+ * @deprecated Use {@link PlayerSpawnLocationEvent}, Duplicate API
-+ */
-+@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+public class PlayerInitialSpawnEvent extends PlayerSpawnLocationEvent {
-+
-+    @ApiStatus.Internal
-+    public PlayerInitialSpawnEvent(@NotNull Player player, @NotNull Location spawnLocation) {
-+        super(player, spawnLocation);
-+    }
-+}

patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index db217a9486e327b4340a54d65439055d86f363cc..25f506c344883d00a63ee2b5a998d3ff3ffd6cd5 100644
+index fe074fe9553f61bdd72b64830532a78415348781..4c5327da1468cb1f9af00a99e7e79f578c47ee2a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -471,6 +471,30 @@ public final class Bukkit {
+@@ -472,6 +472,30 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -41,10 +41,10 @@ index db217a9486e327b4340a54d65439055d86f363cc..25f506c344883d00a63ee2b5a998d3ff
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 69153de6847bb8740803e5f731a0586d41a0eed3..65d68716e1ff8277c534399621cf961ddf312509 100644
+index 9545da2adacaf0bd719c2baef929588cd1042d25..19b75704ed9eee0c929df417e1e5d0ea3718e2f8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -382,6 +382,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -383,6 +383,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Deprecated // Paper
      public int broadcastMessage(@NotNull String message);
  
@@ -76,10 +76,10 @@ index 69153de6847bb8740803e5f731a0586d41a0eed3..65d68716e1ff8277c534399621cf961d
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5d5d37e2ebbbe4d2641177c7d174059ba29bb688..881c75e84ef31390a3519549985af2711e2828b5 100644
+index 7d530bd0e4d833da760d1cf82aba966b7fb480b1..f9bacbfa223826b3b54525648080fda306a1ec36 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1216,6 +1216,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1214,6 +1214,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  

patches/api/0024-Player-Tab-List-and-Title-APIs.patch

@@ -432,10 +432,10 @@ index 0000000000000000000000000000000000000000..20a028450667edf102b59b6b50ac6e89
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 881c75e84ef31390a3519549985af2711e2828b5..fc8c807ae9793452bbf3fbab5e72d05676e6fa83 100644
+index f9bacbfa223826b3b54525648080fda306a1ec36..a0317801b5a41d523324c1482356f26935f6a330 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1250,6 +1250,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1248,6 +1248,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }

patches/api/0026-Complete-resource-pack-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fc8c807ae9793452bbf3fbab5e72d05676e6fa83..93ff1e91c41273aa1b1cffe7c15b546f3a44d6b7 100644
+index a0317801b5a41d523324c1482356f26935f6a330..47c792202e8cc6d97fcb5e9bed98d327ecc5ab2b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2207,6 +2207,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2212,6 +2212,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void setResourcePack(@NotNull UUID uuid, @NotNull String url, byte @Nullable [] hash, net.kyori.adventure.text.@Nullable Component prompt, boolean force);
      // Paper end
  

patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 25f506c344883d00a63ee2b5a998d3ff3ffd6cd5..8dc5b43e937405070d9bdbd914fcdec243e59983 100644
+index bd3fa2bcee24ab7e8f740722f55ed6294fdb294a..d9f84c4a5bc5609e7d9fd0970696a46a32f3f5ff 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2357,6 +2357,13 @@ public final class Bukkit {
+@@ -2372,6 +2372,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 25f506c344883d00a63ee2b5a998d3ff3ffd6cd5..8dc5b43e937405070d9bdbd914fcdec2
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 65d68716e1ff8277c534399621cf961ddf312509..47766c5312a402e3329a1d4bc5e5e0c05f2b007f 100644
+index 067eb3a5f5676f3b1b3f49a65df9c4054c48a1e7..990d0d02d1bd95886126efe08e8107322e3199d5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2065,4 +2065,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2078,4 +2078,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      Spigot spigot();
      // Spigot end

patches/api/0037-Arrow-pickup-rule-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index 9a0a1fa4b7a7e1e1174a75a388081b332d4bedbd..839e5b7df49f42b5fec7729997bef3370ba36d80 100644
+index 4d9938249684b7db01b78baf4eeeaa2e0638a963..493f81ba879d1eb29a32722da27e4ff7ce4c68a8 100644
 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java
 +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
-@@ -160,4 +160,38 @@ public interface AbstractArrow extends Projectile {
+@@ -186,4 +186,38 @@ public interface AbstractArrow extends Projectile {
           */
          CREATIVE_ONLY
      }

patches/api/0039-LootTable-API.patch

@@ -271,13 +271,13 @@ index b451191312e4fb19f2131c2d0a0c0337953f6c7c..db6affbc78106b2d93b41953b624a0bc
      /**
       * Gets the inventory of the chest block represented by this block state.
 diff --git a/src/main/java/org/bukkit/block/Crafter.java b/src/main/java/org/bukkit/block/Crafter.java
-index 05d6af1681351844a6673a6d0dfca2038dafa7b6..8b2a315ed5dd1c57ce60fc41fd5e83a6495028e6 100644
+index e004920ec1e13daaa2f0969a5cf97b6a7de25df9..8d2dd78fc588a6817dfede8040b9909a7d5bde67 100644
 --- a/src/main/java/org/bukkit/block/Crafter.java
 +++ b/src/main/java/org/bukkit/block/Crafter.java
-@@ -10,7 +10,7 @@ import org.jetbrains.annotations.ApiStatus;
+@@ -7,7 +7,7 @@ import org.jetbrains.annotations.ApiStatus;
+  * Represents a captured state of a crafter.
   */
  @ApiStatus.Experimental
- @MinecraftExperimental(Requires.UPDATE_1_21)
 -public interface Crafter extends Container, Lootable {
 +public interface Crafter extends Container, com.destroystokyo.paper.loottable.LootableBlockInventory { // Paper - LootTable API
  

patches/api/0042-Allow-Reloading-of-Command-Aliases.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8dc5b43e937405070d9bdbd914fcdec243e59983..fdf5b8c69e98e000f897aca73ef97fa03371bb7c 100644
+index d9f84c4a5bc5609e7d9fd0970696a46a32f3f5ff..47c7b0baae47ca263907b0dd70d75f37793517fc 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2364,6 +2364,15 @@ public final class Bukkit {
+@@ -2379,6 +2379,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 8dc5b43e937405070d9bdbd914fcdec243e59983..fdf5b8c69e98e000f897aca73ef97fa0
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 47766c5312a402e3329a1d4bc5e5e0c05f2b007f..08141d729809132ed36d6088f37543e792395768 100644
+index 990d0d02d1bd95886126efe08e8107322e3199d5..ced9203c81477c802983df2f03b4e4efc517519b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2067,4 +2067,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2080,4 +2080,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Spigot end
  
      void reloadPermissions(); // Paper

patches/api/0045-Add-String-based-Action-Bar-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6a7d63691fa3be09da0ade66cf07a41ae08d4190..252390260f62ee945c21267cd8717b7725158a21 100644
+index 47c792202e8cc6d97fcb5e9bed98d327ecc5ab2b..add0826af957c773975f840c28cf77afbab85a09 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1217,6 +1217,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1215,6 +1215,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -48,7 +48,7 @@ index 6a7d63691fa3be09da0ade66cf07a41ae08d4190..252390260f62ee945c21267cd8717b77
      /**
       * Sends the component to the player
       *
-@@ -1244,9 +1277,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1242,9 +1275,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *

patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 890ae536fdaff11055b72b1be0fbf3766a41812c..4dc687f16a8181876fb7b3e56b39a55ea5507408 100644
+index 0a3a66e04f8785874f10a76603bff46469543688..9885fd1adc1f93a80d650e6d42dfa3a0b084db9f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -49,6 +49,33 @@ import org.jetbrains.annotations.Nullable;

patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fdf5b8c69e98e000f897aca73ef97fa03371bb7c..fbddd654b4ba7b2613884fdd22f3e62ddfc078c8 100644
+index 47c7b0baae47ca263907b0dd70d75f37793517fc..72983c3ea04382570c4b52e879dab56702bae55a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2373,6 +2373,16 @@ public final class Bukkit {
+@@ -2388,6 +2388,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index fdf5b8c69e98e000f897aca73ef97fa03371bb7c..fbddd654b4ba7b2613884fdd22f3e62d
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 08141d729809132ed36d6088f37543e792395768..1f039a3609a5a1208af408b0565f07664558a23f 100644
+index ced9203c81477c802983df2f03b4e4efc517519b..0ba391e6a1e585f29930b4111421e99f6eb11b4a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2069,4 +2069,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2082,4 +2082,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper

patches/api/0053-Fix-upstream-javadocs.patch

@@ -49,10 +49,10 @@ index a04cde615f8c4bc593f8d9f8f6f1438008aaa707..548f6d28c28d74bed8b58ee828759093
       * @param target the target to remove from this list
       */
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fbddd654b4ba7b2613884fdd22f3e62ddfc078c8..53f56d95bdf484caed9effbedfe507f6745bb8c0 100644
+index 72983c3ea04382570c4b52e879dab56702bae55a..dec72e92fb9e489d1d04cdf60c2f1d34571f9410 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1534,6 +1534,8 @@ public final class Bukkit {
+@@ -1538,6 +1538,8 @@ public final class Bukkit {
  
      /**
       * Gets every player that has ever played on this server.
@@ -75,10 +75,10 @@ index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f814
       * @return temperature at given coordinate
       */
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 3d636cb7f275df053d202356c5e9fad5b1112867..4a06ed9c769acb2eb4c6f4b76c84dc2e63176010 100644
+index 62a8bb18855be13ed1c466b4be7afcd3c91dc7aa..de9fd0fadd6d16ffe883a618bf499214878f443d 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -209,7 +209,7 @@ public enum Particle implements Keyed {
+@@ -195,7 +195,7 @@ public enum Particle implements Keyed {
      }
  
      /**
@@ -127,10 +127,10 @@ index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc6
       * @param statePredicate The predicate which should get used to test if a block should be set or not.
       * @return true if the tree was created successfully, otherwise false
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1f039a3609a5a1208af408b0565f07664558a23f..b0734f8253ed540916db7bc75cd7dd24e86031c7 100644
+index 0ba391e6a1e585f29930b4111421e99f6eb11b4a..2f68b766267b53e98dee3054e0a69be8b9cdf70f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -580,13 +580,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -581,13 +581,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * </ul>
       * <p>
       * <b>Note:</b> If set to 0, {@link SpawnCategory} mobs spawning will be disabled.
@@ -145,7 +145,7 @@ index 1f039a3609a5a1208af408b0565f07664558a23f..b0734f8253ed540916db7bc75cd7dd24
       */
      public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
  
-@@ -1294,6 +1291,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1298,6 +1295,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
      /**
       * Gets every player that has ever played on this server.
@@ -185,6 +185,20 @@ index 9885fd1adc1f93a80d650e6d42dfa3a0b084db9f..c4f2f03ec31998d486dad1d45ef83df3
       * temporarily freezing while locating an unexplored structure.
       * <p>
       * The {@code radius} is not a rigid square radius. Each structure may alter
+diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
+index d66502c9df2592cd18694481e7e90a71a5c3a359..ee39c0b83e558681e8b006172d34c98e2c83cda2 100644
+--- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
++++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
+@@ -117,8 +117,7 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
+     }
+ 
+     /**
+-     * Get the {@link EquipmentSlot} this AttributeModifier is active on,
+-     * or null if this modifier is applicable for any slot.
++     * Get the {@link EquipmentSlotGroup} this AttributeModifier is active on.
+      *
+      * @return the slot
+      */
 diff --git a/src/main/java/org/bukkit/block/Bed.java b/src/main/java/org/bukkit/block/Bed.java
 index f9bd74f9ce6bd6650726e5a993f9b6e292cdc74d..f4c37ce1fe7aac3dde8485ee51fc8888ed56e79e 100644
 --- a/src/main/java/org/bukkit/block/Bed.java
@@ -402,7 +416,7 @@ index 4e1fb0974d061d5bb64899cac576318d2e6f8bf6..539b3527d0c66611e21712f29b90fba9
      public int getEntityId();
  
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index fffc478312566bc5c36dbacbdd86341d84d50054..8d97cf229ce1d14232d0342121b5db2230795a1d 100644
+index 274f3ccbc39d4d6ff0665abf334d526317275dd0..a7bfaa874cbd3fc8d24fffe2f7f14594b37fa18c 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -22,6 +22,11 @@ import org.jetbrains.annotations.Nullable;
@@ -459,10 +473,10 @@ index ae9eaaa8e38e1d9dfc459926c7fc51ddb89de84a..b2ec535bb1b0ce0c114ddd7638b90218
      @Override
      public int getConversionTime();
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddcec951ba31 100644
+index add0826af957c773975f840c28cf77afbab85a09..fea44ddd358b65681d13215244836c21fc88e0fd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -478,15 +478,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -476,15 +476,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Saves the players current location, health, inventory, motion, and
@@ -482,7 +496,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * <p>
       * Note: This will overwrite the players current inventory, health,
       * motion, etc, with the state from the saved dat file.
-@@ -823,7 +823,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -821,7 +821,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Plays an effect to just this player.
       *
@@ -491,7 +505,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * @param loc the location to play the effect at
       * @param effect the {@link Effect}
       * @param data a data bit needed for some effects
-@@ -1234,7 +1234,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1232,7 +1232,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -500,7 +514,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * @param message The message to send
       * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
       */
-@@ -1700,7 +1700,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1705,7 +1705,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see a player that was previously hidden. If
@@ -509,7 +523,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * remain hidden until the other plugin calls this method too.
       *
       * @param plugin Plugin that wants to show the player
-@@ -1727,7 +1727,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1732,7 +1732,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see an entity that was previously hidden. If
@@ -518,7 +532,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * remain hidden until the other plugin calls this method too.
       *
       * @param plugin Plugin that wants to show the entity
-@@ -1810,9 +1810,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1815,9 +1815,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     case this method will have no affect on them. Use the
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
@@ -528,7 +542,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * <li>The request is send with "null" as the hash. This might result
       *     in newer versions not loading the pack correctly.
       * </ul>
-@@ -1846,9 +1843,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1851,9 +1848,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     case this method will have no affect on them. Use the
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
@@ -538,7 +552,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * <li>The request is send with empty string as the hash. This might result
       *     in newer versions not loading the pack correctly.
       * </ul>
-@@ -1885,9 +1879,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1890,9 +1884,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     case this method will have no affect on them. Use the
       *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
       *     the player loaded the pack!
@@ -593,18 +607,18 @@ index af5110b4160979c39cc1e5de6fa3bd7957b21403..15a0a733b0e5804655b5957cbf208312
       * @param location the location to remove
       * @see #getExploredLocations()
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index 6bf3af3ed81b66f61e53105d3591165ea74dba0e..a91400cd8bb4c72d1f3200a17f6de025540fe09d 100644
+index 45dd54afa6d6f3d9895ef52f13076d3351036e4b..cfa0d4809f9bb4ac150251efa85ba4d1808ab1b2 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -202,7 +202,7 @@ public interface Villager extends AbstractVillager {
+@@ -228,7 +228,7 @@ public interface Villager extends AbstractVillager {
           */
-         NITWIT,
+         Profession NITWIT = getProfession("nitwit");
          /**
 -         * Sheperd profession. Wears a brown robe. Shepherds primarily trade for
 +         * Shepherd profession. Wears a brown robe. Shepherds primarily trade for
           * wool items, and shears.
           */
-         SHEPHERD,
+         Profession SHEPHERD = getProfession("shepherd");
 diff --git a/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java b/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
 index a0f6f1af304190b4c5db4b284d460f625eeb7801..7e21548cac8515c281ec86853e9272ab7695b24f 100644
 --- a/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
@@ -633,10 +647,10 @@ index a0f6f1af304190b4c5db4b284d460f625eeb7801..7e21548cac8515c281ec86853e9272ab
   * The Block is already broken as this event is called, so #getBlock() will be
   * AIR in most cases. Use #getBlockState() for more Information about the broken
 diff --git a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-index e534954457a9961a26dbec7ac035bec07e1d6694..a7c297364805c58ae16895055d8eae0484384b7d 100644
+index 1df172c0bb48de3b143179a3f0c63d6ecc30649e..254d549f956053af4264ca3a52d34a97ede4273d 100644
 --- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-@@ -13,6 +13,9 @@ import org.jetbrains.annotations.NotNull;
+@@ -14,6 +14,9 @@ import org.jetbrains.annotations.NotNull;
   * Note that due to the nature of explosions, {@link #getBlock()} will always be
   * an air block. {@link #getExplodedBlockState()} should be used to get
   * information about the block state that exploded.
@@ -646,14 +660,6 @@ index e534954457a9961a26dbec7ac035bec07e1d6694..a7c297364805c58ae16895055d8eae04
   */
  public class BlockExplodeEvent extends BlockEvent implements Cancellable {
      private static final HandlerList handlers = new HandlerList();
-@@ -29,6 +32,7 @@ public class BlockExplodeEvent extends BlockEvent implements Cancellable {
-         this.cancel = false;
-     }
- 
-+    @io.papermc.paper.annotation.DoNotUse // Paper
-     @Deprecated(forRemoval = true)
-     public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield) {
-         this(what, what.getState(), blocks, yield);
 diff --git a/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java b/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
 index 340fa397e68c024df380a28db21545a0c83d9fa6..79ac8a5db689cf9f8e2ff4cb7c06df6989128d10 100644
 --- a/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
@@ -707,10 +713,10 @@ index a37febd0d4dd5b733e9ee72628fdf9395fec4367..9cee218b9ee14688356f16b1f5851218
   */
  public class AreaEffectCloudApplyEvent extends EntityEvent implements Cancellable {
 diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-index e9de00e9e434d36117a672fa9fbfc7c52f284b67..4065432c884324b107d04f4ccd486085b0c440e7 100644
+index d3f93163fb3108f42e542c22e437c9cb8289f0e8..1e2bb345d19ebe03589d85bdab13021b6fa2ed98 100644
 --- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-@@ -154,11 +154,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
+@@ -158,11 +158,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
           */
          DROWNED,
          /**
@@ -751,10 +757,10 @@ index 573165ddf3368a96e1ffc6476eb27c9e29a6f86e..148c4aad384ae8e3b8b22d264a84bddf
       * @return the block state
       */
 diff --git a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
-index 10d0e18dfd423b108fe381e8142867eb10399359..099efafa14c10910e4ed04abb1823f0c1a96b6a6 100644
+index fc2158793aec67310bc8d06ac1f0bac39d2a5c3d..50161d313cfcc9e61441589685c3d0e1f057dd86 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
-@@ -9,7 +9,9 @@ import org.bukkit.event.HandlerList;
+@@ -10,7 +10,9 @@ import org.bukkit.event.HandlerList;
  import org.jetbrains.annotations.NotNull;
  
  /**
@@ -792,7 +798,7 @@ index 327876e0ad7dcfeb71d9d22afe1c04bcd71c3bf9..71d664dd89995f088c47d17b38547d53
   * <br>
   * Note that this event is currently only fired for four specific placements:
 diff --git a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
-index 01c5e8b71338fbb4b1605e45bf2a2e705188f6b5..c9f395064656dd0126410eb3c6e197baa450c063 100644
+index 31a5515c08c9454d52a0d946d103a2d526c15e48..d743cc5ee34fd7bc5db92f4b17fed9f3aa5ffbcc 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
 @@ -133,7 +133,7 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable
@@ -804,7 +810,7 @@ index 01c5e8b71338fbb4b1605e45bf2a2e705188f6b5..c9f395064656dd0126410eb3c6e197ba
           * type.
           */
          ADDED,
-@@ -238,7 +238,7 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable
+@@ -237,7 +237,7 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable
           */
          SPIDER_SPAWN,
          /**
@@ -1424,7 +1430,7 @@ index f1918027c3a8735b31566856218611656b56db20..476fe14faa39f02444cab8ad95d44010
       * @return the currently held item
       * @see #getItemInMainHand()
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 05f1acaac3a49c42f6cf544adb3ffec267c72700..9f9c67e935940833bbfe58e6bfa398e6c86980d5 100644
+index a601bc38e322e5810cf883708541e2d199f09ebb..d89068a37de1dcad0b82dee09cc7829109921a05 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -24,8 +24,6 @@ public class ShapedRecipe extends CraftingRecipe {
@@ -1558,10 +1564,28 @@ index cdbcc8dbab2456cc2bc1f3084cbb1ced1698b7f5..d528b066c2aaa3fb097931914ff2181f
      void setPower(int power) throws IllegalArgumentException;
  
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index bc065cc78b69d26ac07941b8485fabe256d6286c..fe0f8459a381c35e1e7a312a2f63d6e6eda088d6 100644
+index 014c1a0379e532a5c924694a8e0715eb0ba50ec2..10ca843e57c74dfa32d539acd174c8867dfd56ec 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -547,7 +547,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -540,7 +540,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+      * The returned component is a snapshot of its current state and does not
+      * reflect a live view of what is on an item. After changing any value on
+      * this component, it must be set with
+-     * {@link #setJukeboxPlayable(org.bukkit.inventory.meta.components.JukeboxComponent)}
++     * {@link #setJukeboxPlayable(org.bukkit.inventory.meta.components.JukeboxPlayableComponent)}
+      * to apply the changes.
+      *
+      * @return component
+@@ -549,7 +549,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+     JukeboxPlayableComponent getJukeboxPlayable();
+ 
+     /**
+-     * Sets the item tool.
++     * Sets the jukebox playable component.
+      *
+      * @param jukeboxPlayable new component
+      */
+@@ -576,7 +576,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Return an immutable copy of all {@link Attribute}s and their
       * {@link AttributeModifier}s for a given {@link EquipmentSlot}.<br>
@@ -1619,6 +1643,56 @@ index 43f0df04f3cdff7d7db73321a2886f3a737e3c9f..5c741228b2338a7c4de2fe736eb78951
   */
  public interface OminousBottleMeta extends ItemMeta {
  
+diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
+index 8c76716249e44ed8bf6be94c1f5c7b6d9bb35be2..68a0ed5f0ed25e98f4ab4d1e482ec2ccfda9cd3a 100644
+--- a/src/main/java/org/bukkit/plugin/Plugin.java
++++ b/src/main/java/org/bukkit/plugin/Plugin.java
+@@ -18,7 +18,7 @@ import org.jetbrains.annotations.Nullable;
+  */
+ public interface Plugin extends TabExecutor {
+     /**
+-     * Returns the folder that the plugin data's files are located in. The
++     * Returns the folder that the plugin data files are located in. The
+      * folder may not yet exist.
+      *
+      * @return The folder
+@@ -27,9 +27,9 @@ public interface Plugin extends TabExecutor {
+     public File getDataFolder();
+ 
+     /**
+-     * Returns the plugin.yaml file containing the details for this plugin
++     * Returns the plugin.yml file containing the details for this plugin
+      *
+-     * @return Contents of the plugin.yaml file
++     * @return Contents of the plugin.yml file
+      * @deprecated May be inaccurate due to different plugin implementations.
+      * @see Plugin#getPluginMeta()
+      */
+diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+index 2a14522c484febcd880d00197df4359a0020dddd..7f17337b9f0fb60fa1c91c47af496c03290d1b1c 100644
+--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
++++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+@@ -69,7 +69,7 @@ public abstract class JavaPlugin extends PluginBase {
+     }
+ 
+     /**
+-     * Returns the folder that the plugin data's files are located in. The
++     * Returns the folder that the plugin data files are located in. The
+      * folder may not yet exist.
+      *
+      * @return The folder.
+@@ -127,9 +127,9 @@ public abstract class JavaPlugin extends PluginBase {
+     }
+ 
+     /**
+-     * Returns the plugin.yaml file containing the details for this plugin
++     * Returns the plugin.yml file containing the details for this plugin
+      *
+-     * @return Contents of the plugin.yaml file
++     * @return Contents of the plugin.yml file
+      * @deprecated No longer applicable to all types of plugins
+      */
+     @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java b/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java
 index b84b37fe27d84574dc5897285f1d9a1437bd322c..281ae60a6be7e39aab4f27b4c7de3d49ada9a557 100644
 --- a/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java

patches/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sat, 21 Jan 2017 17:03:10 -0600
-Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check
-
-
-diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java
-index b1c08a7fc5856bcc29ee64d0a87b95a8ac940ddc..3ab5700b0b13fbfbf7c5b0b2c4a90bcc1e0a2d9c 100644
---- a/src/main/java/org/bukkit/WorldBorder.java
-+++ b/src/main/java/org/bukkit/WorldBorder.java
-@@ -162,4 +162,18 @@ public interface WorldBorder {
-      * @return The absolute maximum center coordinate of the WorldBorder
-      */
-     public double getMaxCenterCoordinate();
-+
-+    // Paper start
-+    /**
-+     * Checks if the location is within the boundaries of this border.
-+     * 
-+     * @param location specific location to check
-+     * @return true if the location is within the bounds of this border, false otherwise.
-+     * @deprecated use {@link #isInside(Location)} for an upstream compatible replacement
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    public default boolean isInBounds(@NotNull Location location) {
-+        return this.isInside(location);
-+    }
-+    // Paper end
- }

patches/api/0057-Basic-PlayerProfile-API.patch

@@ -327,10 +327,10 @@ index 0000000000000000000000000000000000000000..8f913a078dd692a9feafb98a6e6c9583
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 53f56d95bdf484caed9effbedfe507f6745bb8c0..44e833a2be716d378688fe35822bdf0904fbb22f 100644
+index dec72e92fb9e489d1d04cdf60c2f1d34571f9410..dcf6b2d04f9e1bc7466feda22069423d638fb4b3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2385,6 +2385,89 @@ public final class Bukkit {
+@@ -2400,6 +2400,89 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -421,10 +421,10 @@ index 53f56d95bdf484caed9effbedfe507f6745bb8c0..44e833a2be716d378688fe35822bdf09
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b0734f8253ed540916db7bc75cd7dd24e86031c7..aeb5399b1c5e90079b199a591f7986acdf111cba 100644
+index 2f68b766267b53e98dee3054e0a69be8b9cdf70f..7a1b80e8d02f23c5d246c3032e5ced909f10bd41 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2077,5 +2077,80 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2090,5 +2090,80 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();

patches/api/0059-Shoulder-Entities-Release-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 8d97cf229ce1d14232d0342121b5db2230795a1d..c426bdea5ef71a095cf2af9a8a83a162db3c05b7 100644
+index a7bfaa874cbd3fc8d24fffe2f7f14594b37fa18c..8cc6f8547380d567aef7910ef309193bd79ced09 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -329,6 +329,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -335,6 +335,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public int getExpToLevel();
  

patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index effad8017bff46e2651af01f1789cb8dd08a49d5..eecf458e1250ee9968630cf5c3c3287a1693e52e 100644
+index 258d7010d24c529c9bbc76cc26adf226c641ee58..4da053d427f3f9c5e7fc144408836ebef80026c6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,8 @@ java {
@@ -35,7 +35,7 @@ index effad8017bff46e2651af01f1789cb8dd08a49d5..eecf458e1250ee9968630cf5c3c3287a
  
      implementation("org.ow2.asm:asm:9.7")
      implementation("org.ow2.asm:asm-commons:9.7")
-@@ -137,6 +141,8 @@ tasks.withType<Javadoc> {
+@@ -138,6 +142,8 @@ tasks.withType<Javadoc> {
          "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
          "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
          "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",