diff --git a/patches/unapplied/api/API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/unapplied/api/API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/api/API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/unapplied/api/API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/unapplied/api/API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/api/API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/unapplied/api/Ability-to-apply-mending-to-XP-API.patch b/patches/api/Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/unapplied/api/Ability-to-apply-mending-to-XP-API.patch
rename to patches/api/Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/unapplied/api/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/api/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/unapplied/api/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/api/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/unapplied/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/unapplied/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/api/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/unapplied/api/Add-API-for-item-entity-health.patch b/patches/api/Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/unapplied/api/Add-API-for-item-entity-health.patch
rename to patches/api/Add-API-for-item-entity-health.patch
diff --git a/patches/unapplied/api/Add-API-for-quit-reason.patch b/patches/api/Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/unapplied/api/Add-API-for-quit-reason.patch
rename to patches/api/Add-API-for-quit-reason.patch
diff --git a/patches/unapplied/api/Add-API-for-resetting-a-single-score.patch b/patches/api/Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/unapplied/api/Add-API-for-resetting-a-single-score.patch
rename to patches/api/Add-API-for-resetting-a-single-score.patch
diff --git a/patches/unapplied/api/Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/api/Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from patches/unapplied/api/Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/api/Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/unapplied/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/unapplied/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/api/Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/unapplied/api/Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
similarity index 100%
rename from patches/unapplied/api/Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
rename to patches/api/Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/unapplied/api/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/unapplied/api/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/api/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/unapplied/api/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/api/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/unapplied/api/Add-ArmorStand-Item-Meta.patch b/patches/api/Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/unapplied/api/Add-ArmorStand-Item-Meta.patch
rename to patches/api/Add-ArmorStand-Item-Meta.patch
diff --git a/patches/unapplied/api/Add-Ban-Methods-to-Player-Objects.patch b/patches/api/Add-Ban-Methods-to-Player-Objects.patch
similarity index 100%
rename from patches/unapplied/api/Add-Ban-Methods-to-Player-Objects.patch
rename to patches/api/Add-Ban-Methods-to-Player-Objects.patch
diff --git a/patches/unapplied/api/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/api/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
similarity index 100%
rename from patches/unapplied/api/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
rename to patches/api/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
diff --git a/patches/unapplied/api/Add-BeaconEffectEvent.patch b/patches/api/Add-BeaconEffectEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-BeaconEffectEvent.patch
rename to patches/api/Add-BeaconEffectEvent.patch
diff --git a/patches/unapplied/api/Add-BellRevealRaiderEvent.patch b/patches/api/Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-BellRevealRaiderEvent.patch
rename to patches/api/Add-BellRevealRaiderEvent.patch
diff --git a/patches/unapplied/api/Add-BellRingEvent.patch b/patches/api/Add-BellRingEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-BellRingEvent.patch
rename to patches/api/Add-BellRingEvent.patch
diff --git a/patches/unapplied/api/Add-Block-isValidTool.patch b/patches/api/Add-Block-isValidTool.patch
similarity index 100%
rename from patches/unapplied/api/Add-Block-isValidTool.patch
rename to patches/api/Add-Block-isValidTool.patch
diff --git a/patches/unapplied/api/Add-BlockBreakBlockEvent.patch b/patches/api/Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-BlockBreakBlockEvent.patch
rename to patches/api/Add-BlockBreakBlockEvent.patch
diff --git a/patches/unapplied/api/Add-BlockFailedDispenseEvent.patch b/patches/api/Add-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-BlockFailedDispenseEvent.patch
rename to patches/api/Add-BlockFailedDispenseEvent.patch
diff --git a/patches/unapplied/api/Add-BlockLockCheckEvent.patch b/patches/api/Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-BlockLockCheckEvent.patch
rename to patches/api/Add-BlockLockCheckEvent.patch
diff --git a/patches/unapplied/api/Add-BlockPreDispenseEvent.patch b/patches/api/Add-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-BlockPreDispenseEvent.patch
rename to patches/api/Add-BlockPreDispenseEvent.patch
diff --git a/patches/unapplied/api/Add-BlockSoundGroup-interface.patch b/patches/api/Add-BlockSoundGroup-interface.patch
similarity index 100%
rename from patches/unapplied/api/Add-BlockSoundGroup-interface.patch
rename to patches/api/Add-BlockSoundGroup-interface.patch
diff --git a/patches/unapplied/api/Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/api/Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/unapplied/api/Add-Destroy-Speed-API.patch b/patches/api/Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-Destroy-Speed-API.patch
rename to patches/api/Add-Destroy-Speed-API.patch
diff --git a/patches/unapplied/api/Add-ElderGuardianAppearanceEvent.patch b/patches/api/Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-ElderGuardianAppearanceEvent.patch
rename to patches/api/Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/unapplied/api/Add-Entity-Body-Yaw-API.patch b/patches/api/Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-Entity-Body-Yaw-API.patch
rename to patches/api/Add-Entity-Body-Yaw-API.patch
diff --git a/patches/unapplied/api/Add-EntityBlockStorage-clearEntities.patch b/patches/api/Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/unapplied/api/Add-EntityBlockStorage-clearEntities.patch
rename to patches/api/Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/unapplied/api/Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/unapplied/api/Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/api/Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/unapplied/api/Add-EntityFertilizeEggEvent.patch b/patches/api/Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-EntityFertilizeEggEvent.patch
rename to patches/api/Add-EntityFertilizeEggEvent.patch
diff --git a/patches/unapplied/api/Add-EntityInsideBlockEvent.patch b/patches/api/Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-EntityInsideBlockEvent.patch
rename to patches/api/Add-EntityInsideBlockEvent.patch
diff --git a/patches/unapplied/api/Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/api/Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
similarity index 100%
rename from patches/unapplied/api/Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
rename to patches/api/Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
diff --git a/patches/unapplied/api/Add-EntityLoadCrossbowEvent.patch b/patches/api/Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-EntityLoadCrossbowEvent.patch
rename to patches/api/Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/unapplied/api/Add-EntityPortalReadyEvent.patch b/patches/api/Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-EntityPortalReadyEvent.patch
rename to patches/api/Add-EntityPortalReadyEvent.patch
diff --git a/patches/unapplied/api/Add-EntityTeleportEndGatewayEvent.patch b/patches/api/Add-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-EntityTeleportEndGatewayEvent.patch
rename to patches/api/Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/unapplied/api/Add-EntityZapEvent.patch b/patches/api/Add-EntityZapEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-EntityZapEvent.patch
rename to patches/api/Add-EntityZapEvent.patch
diff --git a/patches/unapplied/api/Add-EquipmentSlot-convenience-methods.patch b/patches/api/Add-EquipmentSlot-convenience-methods.patch
similarity index 100%
rename from patches/unapplied/api/Add-EquipmentSlot-convenience-methods.patch
rename to patches/api/Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/unapplied/api/Add-FastUtil-to-Bukkit.patch b/patches/api/Add-FastUtil-to-Bukkit.patch
similarity index 100%
rename from patches/unapplied/api/Add-FastUtil-to-Bukkit.patch
rename to patches/api/Add-FastUtil-to-Bukkit.patch
diff --git a/patches/unapplied/api/Add-GS4-Query-event.patch b/patches/api/Add-GS4-Query-event.patch
similarity index 100%
rename from patches/unapplied/api/Add-GS4-Query-event.patch
rename to patches/api/Add-GS4-Query-event.patch
diff --git a/patches/unapplied/api/Add-GameEvent-tags.patch b/patches/api/Add-GameEvent-tags.patch
similarity index 64%
rename from patches/unapplied/api/Add-GameEvent-tags.patch
rename to patches/api/Add-GameEvent-tags.patch
index a06718de7f..1739f32046 100644
--- a/patches/unapplied/api/Add-GameEvent-tags.patch
+++ b/patches/api/Add-GameEvent-tags.patch
@@ -9,10 +9,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
 @@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed {
+      * Vanilla tag representing entities which are dismounted when underwater.
       */
-     @Deprecated(forRemoval = true)
-     Tag<EntityType> SKELETONS = ENTITY_TYPES_SKELETONS;
-+
+     Tag<EntityType> ENTITY_TYPES_DISMOUNTS_UNDERWATER = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("dismounts_underwater"), EntityType.class);
++    // Paper start
 +    String REGISTRY_GAME_EVENTS = "game_events";
 +
 +    /**
@@ -24,6 +24,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * Tag for game events that are ignored if the entity is sneaking
 +     */
 +    Tag<GameEvent> GAME_EVENT_IGNORE_VIBRATIONS_SNEAKING = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("ignore_vibrations_sneaking"), GameEvent.class);
-     // Paper end
++
++    /**
++     * Tag for game events that an allay can listen to
++     */
++    Tag<GameEvent> GAME_EVENT_ALLAY_CAN_LISTEN = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("allay_can_listen"), GameEvent.class);
++    // Paper end
  
      /**
+      * Returns whether or not this tag has an entry for the specified item.
diff --git a/patches/unapplied/api/Add-Git-information-to-version-command-on-startup.patch b/patches/api/Add-Git-information-to-version-command-on-startup.patch
similarity index 100%
rename from patches/unapplied/api/Add-Git-information-to-version-command-on-startup.patch
rename to patches/api/Add-Git-information-to-version-command-on-startup.patch
diff --git a/patches/unapplied/api/Add-Heightmap-API.patch b/patches/api/Add-Heightmap-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-Heightmap-API.patch
rename to patches/api/Add-Heightmap-API.patch
diff --git a/patches/unapplied/api/Add-ItemFactory-getSpawnEgg-API.patch b/patches/api/Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/api/Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/unapplied/api/Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/Add-ItemStack-Recipe-API-helper-methods.patch
similarity index 100%
rename from patches/unapplied/api/Add-ItemStack-Recipe-API-helper-methods.patch
rename to patches/api/Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/unapplied/api/Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/Add-ItemStackRecipeChoice-Draft-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-ItemStackRecipeChoice-Draft-API.patch
rename to patches/api/Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/unapplied/api/Add-LivingEntity-clearActiveItem.patch b/patches/api/Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/unapplied/api/Add-LivingEntity-clearActiveItem.patch
rename to patches/api/Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/unapplied/api/Add-LivingEntity-getTargetEntity.patch b/patches/api/Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/unapplied/api/Add-LivingEntity-getTargetEntity.patch
rename to patches/api/Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/unapplied/api/Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
similarity index 100%
rename from patches/unapplied/api/Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
rename to patches/api/Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/unapplied/api/Add-Material-Tags.patch b/patches/api/Add-Material-Tags.patch
similarity index 100%
rename from patches/unapplied/api/Add-Material-Tags.patch
rename to patches/api/Add-Material-Tags.patch
diff --git a/patches/unapplied/api/Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/api/Add-MetadataStoreBase.removeAll-Plugin.patch
similarity index 100%
rename from patches/unapplied/api/Add-MetadataStoreBase.removeAll-Plugin.patch
rename to patches/api/Add-MetadataStoreBase.removeAll-Plugin.patch
diff --git a/patches/unapplied/api/Add-Mob-Goal-API.patch b/patches/api/Add-Mob-Goal-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-Mob-Goal-API.patch
rename to patches/api/Add-Mob-Goal-API.patch
diff --git a/patches/unapplied/api/Add-Mob-lookAt-API.patch b/patches/api/Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-Mob-lookAt-API.patch
rename to patches/api/Add-Mob-lookAt-API.patch
diff --git a/patches/unapplied/api/Add-More-Creeper-API.patch b/patches/api/Add-More-Creeper-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-More-Creeper-API.patch
rename to patches/api/Add-More-Creeper-API.patch
diff --git a/patches/unapplied/api/Add-Moving-Piston-API.patch b/patches/api/Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-Moving-Piston-API.patch
rename to patches/api/Add-Moving-Piston-API.patch
diff --git a/patches/unapplied/api/Add-NamespacedKey-biome-methods.patch b/patches/api/Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/unapplied/api/Add-NamespacedKey-biome-methods.patch
rename to patches/api/Add-NamespacedKey-biome-methods.patch
diff --git a/patches/unapplied/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/unapplied/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/unapplied/api/Add-PaperRegistry.patch b/patches/api/Add-PaperRegistry.patch
similarity index 100%
rename from patches/unapplied/api/Add-PaperRegistry.patch
rename to patches/api/Add-PaperRegistry.patch
diff --git a/patches/unapplied/api/Add-PhantomPreSpawnEvent.patch b/patches/api/Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PhantomPreSpawnEvent.patch
rename to patches/api/Add-PhantomPreSpawnEvent.patch
diff --git a/patches/unapplied/api/Add-Player-Client-Options-API.patch b/patches/api/Add-Player-Client-Options-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-Player-Client-Options-API.patch
rename to patches/api/Add-Player-Client-Options-API.patch
diff --git a/patches/unapplied/api/Add-Player-Warden-Warning-API.patch b/patches/api/Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-Player-Warden-Warning-API.patch
rename to patches/api/Add-Player-Warden-Warning-API.patch
diff --git a/patches/unapplied/api/Add-Player-getFishHook.patch b/patches/api/Add-Player-getFishHook.patch
similarity index 100%
rename from patches/unapplied/api/Add-Player-getFishHook.patch
rename to patches/api/Add-Player-getFishHook.patch
diff --git a/patches/unapplied/api/Add-PlayerArmorChangeEvent.patch b/patches/api/Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerArmorChangeEvent.patch
rename to patches/api/Add-PlayerArmorChangeEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/api/Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerConnectionCloseEvent.patch b/patches/api/Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerConnectionCloseEvent.patch
rename to patches/api/Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/api/Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerInitialSpawnEvent.patch b/patches/api/Add-PlayerInitialSpawnEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerInitialSpawnEvent.patch
rename to patches/api/Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerInventorySlotChangeEvent.patch b/patches/api/Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerInventorySlotChangeEvent.patch
rename to patches/api/Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerItemCooldownEvent.patch b/patches/api/Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerItemCooldownEvent.patch
rename to patches/api/Add-PlayerItemCooldownEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerItemFrameChangeEvent.patch b/patches/api/Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerItemFrameChangeEvent.patch
rename to patches/api/Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerJumpEvent.patch b/patches/api/Add-PlayerJumpEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerJumpEvent.patch
rename to patches/api/Add-PlayerJumpEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerKickEvent-causes.patch b/patches/api/Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerKickEvent-causes.patch
rename to patches/api/Add-PlayerKickEvent-causes.patch
diff --git a/patches/unapplied/api/Add-PlayerLocaleChangeEvent.patch b/patches/api/Add-PlayerLocaleChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerLocaleChangeEvent.patch
rename to patches/api/Add-PlayerLocaleChangeEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerPostRespawnEvent.patch b/patches/api/Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerPostRespawnEvent.patch
rename to patches/api/Add-PlayerPostRespawnEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerSetSpawnEvent.patch b/patches/api/Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerSetSpawnEvent.patch
rename to patches/api/Add-PlayerSetSpawnEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerShearBlockEvent.patch b/patches/api/Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerShearBlockEvent.patch
rename to patches/api/Add-PlayerShearBlockEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/Add-PlayerSignCommandPreprocessEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerSignCommandPreprocessEvent.patch
rename to patches/api/Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerStopUsingItemEvent.patch b/patches/api/Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerStopUsingItemEvent.patch
rename to patches/api/Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/unapplied/api/Add-PlayerUseUnknownEntityEvent.patch b/patches/api/Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerUseUnknownEntityEvent.patch
rename to patches/api/Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/unapplied/api/Add-Position.patch b/patches/api/Add-Position.patch
similarity index 100%
rename from patches/unapplied/api/Add-Position.patch
rename to patches/api/Add-Position.patch
diff --git a/patches/unapplied/api/Add-PrePlayerAttackEntityEvent.patch b/patches/api/Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PrePlayerAttackEntityEvent.patch
rename to patches/api/Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/unapplied/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
rename to patches/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/unapplied/api/Add-ProjectileCollideEvent.patch b/patches/api/Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-ProjectileCollideEvent.patch
rename to patches/api/Add-ProjectileCollideEvent.patch
diff --git a/patches/unapplied/api/Add-PufferFishStateChangeEvent.patch b/patches/api/Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PufferFishStateChangeEvent.patch
rename to patches/api/Add-PufferFishStateChangeEvent.patch
diff --git a/patches/unapplied/api/Add-Raw-Byte-Entity-Serialization.patch b/patches/api/Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/unapplied/api/Add-Raw-Byte-Entity-Serialization.patch
rename to patches/api/Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/unapplied/api/Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/unapplied/api/Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/api/Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/unapplied/api/Add-Sneaking-API-for-Entities.patch b/patches/api/Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/unapplied/api/Add-Sneaking-API-for-Entities.patch
rename to patches/api/Add-Sneaking-API-for-Entities.patch
diff --git a/patches/unapplied/api/Add-String-based-Action-Bar-API.patch b/patches/api/Add-String-based-Action-Bar-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-String-based-Action-Bar-API.patch
rename to patches/api/Add-String-based-Action-Bar-API.patch
diff --git a/patches/unapplied/api/Add-StructuresLocateEvent.patch b/patches/api/Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-StructuresLocateEvent.patch
rename to patches/api/Add-StructuresLocateEvent.patch
diff --git a/patches/unapplied/api/Add-TNTPrimeEvent.patch b/patches/api/Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-TNTPrimeEvent.patch
rename to patches/api/Add-TNTPrimeEvent.patch
diff --git a/patches/unapplied/api/Add-TameableDeathMessageEvent.patch b/patches/api/Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-TameableDeathMessageEvent.patch
rename to patches/api/Add-TameableDeathMessageEvent.patch
diff --git a/patches/unapplied/api/Add-TargetHitEvent-API.patch b/patches/api/Add-TargetHitEvent-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-TargetHitEvent-API.patch
rename to patches/api/Add-TargetHitEvent-API.patch
diff --git a/patches/unapplied/api/Add-ThrownEggHatchEvent.patch b/patches/api/Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-ThrownEggHatchEvent.patch
rename to patches/api/Add-ThrownEggHatchEvent.patch
diff --git a/patches/unapplied/api/Add-Tick-TemporalUnit.patch b/patches/api/Add-Tick-TemporalUnit.patch
similarity index 100%
rename from patches/unapplied/api/Add-Tick-TemporalUnit.patch
rename to patches/api/Add-Tick-TemporalUnit.patch
diff --git a/patches/unapplied/api/Add-UnknownCommandEvent.patch b/patches/api/Add-UnknownCommandEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-UnknownCommandEvent.patch
rename to patches/api/Add-UnknownCommandEvent.patch
diff --git a/patches/unapplied/api/Add-WardenAngerChangeEvent.patch b/patches/api/Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-WardenAngerChangeEvent.patch
rename to patches/api/Add-WardenAngerChangeEvent.patch
diff --git a/patches/unapplied/api/Add-WaterBottleSplashEvent.patch b/patches/api/Add-WaterBottleSplashEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-WaterBottleSplashEvent.patch
rename to patches/api/Add-WaterBottleSplashEvent.patch
diff --git a/patches/unapplied/api/Add-WhitelistToggleEvent.patch b/patches/api/Add-WhitelistToggleEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-WhitelistToggleEvent.patch
rename to patches/api/Add-WhitelistToggleEvent.patch
diff --git a/patches/unapplied/api/Add-World.getEntity-UUID-API.patch b/patches/api/Add-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-World.getEntity-UUID-API.patch
rename to patches/api/Add-World.getEntity-UUID-API.patch
diff --git a/patches/unapplied/api/Add-a-call-helper-to-Event.patch b/patches/api/Add-a-call-helper-to-Event.patch
similarity index 100%
rename from patches/unapplied/api/Add-a-call-helper-to-Event.patch
rename to patches/api/Add-a-call-helper-to-Event.patch
diff --git a/patches/unapplied/api/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/unapplied/api/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/api/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/unapplied/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/unapplied/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/unapplied/api/Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/unapplied/api/Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/api/Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/unapplied/api/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/unapplied/api/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/api/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/unapplied/api/Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/api/Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/unapplied/api/Add-basic-Datapack-API.patch b/patches/api/Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-basic-Datapack-API.patch
rename to patches/api/Add-basic-Datapack-API.patch
diff --git a/patches/unapplied/api/Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/unapplied/api/Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/api/Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/unapplied/api/Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/unapplied/api/Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/api/Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/unapplied/api/Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/Add-command-to-reload-permissions.yml-and-require-co.patch
similarity index 100%
rename from patches/unapplied/api/Add-command-to-reload-permissions.yml-and-require-co.patch
rename to patches/api/Add-command-to-reload-permissions.yml-and-require-co.patch
diff --git a/patches/unapplied/api/Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from patches/unapplied/api/Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/api/Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/unapplied/api/Add-critical-damage-API.patch b/patches/api/Add-critical-damage-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-critical-damage-API.patch
rename to patches/api/Add-critical-damage-API.patch
diff --git a/patches/unapplied/api/Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/unapplied/api/Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/api/Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/unapplied/api/Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/api/Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/unapplied/api/Add-enchantWithLevels-API.patch b/patches/api/Add-enchantWithLevels-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-enchantWithLevels-API.patch
rename to patches/api/Add-enchantWithLevels-API.patch
diff --git a/patches/unapplied/api/Add-entity-knockback-API.patch b/patches/api/Add-entity-knockback-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-entity-knockback-API.patch
rename to patches/api/Add-entity-knockback-API.patch
diff --git a/patches/unapplied/api/Add-entity-liquid-API.patch b/patches/api/Add-entity-liquid-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-entity-liquid-API.patch
rename to patches/api/Add-entity-liquid-API.patch
diff --git a/patches/unapplied/api/Add-exception-reporting-event.patch b/patches/api/Add-exception-reporting-event.patch
similarity index 100%
rename from patches/unapplied/api/Add-exception-reporting-event.patch
rename to patches/api/Add-exception-reporting-event.patch
diff --git a/patches/unapplied/api/Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/api/Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/api/Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/unapplied/api/Add-extended-PaperServerListPingEvent.patch b/patches/api/Add-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-extended-PaperServerListPingEvent.patch
rename to patches/api/Add-extended-PaperServerListPingEvent.patch
diff --git a/patches/unapplied/api/Add-getComputedBiome-API.patch b/patches/api/Add-getComputedBiome-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-getComputedBiome-API.patch
rename to patches/api/Add-getComputedBiome-API.patch
diff --git a/patches/unapplied/api/Add-getDrops-to-BlockState.patch b/patches/api/Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/unapplied/api/Add-getDrops-to-BlockState.patch
rename to patches/api/Add-getDrops-to-BlockState.patch
diff --git a/patches/unapplied/api/Add-getI18NDisplayName-API.patch b/patches/api/Add-getI18NDisplayName-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-getI18NDisplayName-API.patch
rename to patches/api/Add-getI18NDisplayName-API.patch
diff --git a/patches/unapplied/api/Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/unapplied/api/Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/api/Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/unapplied/api/Add-getNearbyXXX-methods-to-Location.patch b/patches/api/Add-getNearbyXXX-methods-to-Location.patch
similarity index 100%
rename from patches/unapplied/api/Add-getNearbyXXX-methods-to-Location.patch
rename to patches/api/Add-getNearbyXXX-methods-to-Location.patch
diff --git a/patches/unapplied/api/Add-getOfflinePlayerIfCached-String.patch b/patches/api/Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/unapplied/api/Add-getOfflinePlayerIfCached-String.patch
rename to patches/api/Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/unapplied/api/Add-getTPS-method.patch b/patches/api/Add-getTPS-method.patch
similarity index 100%
rename from patches/unapplied/api/Add-getTPS-method.patch
rename to patches/api/Add-getTPS-method.patch
diff --git a/patches/unapplied/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/unapplied/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/unapplied/api/Add-helpers-for-left-right-click-to-Action.patch b/patches/api/Add-helpers-for-left-right-click-to-Action.patch
similarity index 100%
rename from patches/unapplied/api/Add-helpers-for-left-right-click-to-Action.patch
rename to patches/api/Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/unapplied/api/Add-ignore-discounts-API.patch b/patches/api/Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-ignore-discounts-API.patch
rename to patches/api/Add-ignore-discounts-API.patch
diff --git a/patches/unapplied/api/Add-isCollidable-methods-to-various-places.patch b/patches/api/Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/unapplied/api/Add-isCollidable-methods-to-various-places.patch
rename to patches/api/Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/unapplied/api/Add-item-slot-convenience-methods.patch b/patches/api/Add-item-slot-convenience-methods.patch
similarity index 100%
rename from patches/unapplied/api/Add-item-slot-convenience-methods.patch
rename to patches/api/Add-item-slot-convenience-methods.patch
diff --git a/patches/unapplied/api/Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/api/Add-legacy-ping-support-to-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-legacy-ping-support-to-PaperServerListPingEvent.patch
rename to patches/api/Add-legacy-ping-support-to-PaperServerListPingEvent.patch
diff --git a/patches/unapplied/api/Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/Add-method-isTickingWorlds-to-Bukkit.patch
similarity index 100%
rename from patches/unapplied/api/Add-method-isTickingWorlds-to-Bukkit.patch
rename to patches/api/Add-method-isTickingWorlds-to-Bukkit.patch
diff --git a/patches/unapplied/api/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 100%
rename from patches/unapplied/api/Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to patches/api/Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/unapplied/api/Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/unapplied/api/Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/api/Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/unapplied/api/Add-methods-to-get-translation-keys.patch b/patches/api/Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/unapplied/api/Add-methods-to-get-translation-keys.patch
rename to patches/api/Add-methods-to-get-translation-keys.patch
diff --git a/patches/unapplied/api/Add-missing-Fluid-type.patch b/patches/api/Add-missing-Fluid-type.patch
similarity index 100%
rename from patches/unapplied/api/Add-missing-Fluid-type.patch
rename to patches/api/Add-missing-Fluid-type.patch
diff --git a/patches/unapplied/api/Add-missing-block-data-mins-and-maxes.patch b/patches/api/Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/unapplied/api/Add-missing-block-data-mins-and-maxes.patch
rename to patches/api/Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/unapplied/api/Add-missing-effects.patch b/patches/api/Add-missing-effects.patch
similarity index 100%
rename from patches/unapplied/api/Add-missing-effects.patch
rename to patches/api/Add-missing-effects.patch
diff --git a/patches/unapplied/api/Add-missing-isFuel-Material-entries.patch b/patches/api/Add-missing-isFuel-Material-entries.patch
similarity index 100%
rename from patches/unapplied/api/Add-missing-isFuel-Material-entries.patch
rename to patches/api/Add-missing-isFuel-Material-entries.patch
diff --git a/patches/unapplied/api/Add-missing-team-sidebar-display-slots.patch b/patches/api/Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/unapplied/api/Add-missing-team-sidebar-display-slots.patch
rename to patches/api/Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/unapplied/api/Add-moon-phase-API.patch b/patches/api/Add-moon-phase-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-moon-phase-API.patch
rename to patches/api/Add-moon-phase-API.patch
diff --git a/patches/unapplied/api/Add-more-Campfire-API.patch b/patches/api/Add-more-Campfire-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-more-Campfire-API.patch
rename to patches/api/Add-more-Campfire-API.patch
diff --git a/patches/unapplied/api/Add-more-Evoker-API.patch b/patches/api/Add-more-Evoker-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-more-Evoker-API.patch
rename to patches/api/Add-more-Evoker-API.patch
diff --git a/patches/unapplied/api/Add-more-LimitedRegion-API.patch b/patches/api/Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-more-LimitedRegion-API.patch
rename to patches/api/Add-more-LimitedRegion-API.patch
diff --git a/patches/unapplied/api/Add-more-WanderingTrader-API.patch b/patches/api/Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-more-WanderingTrader-API.patch
rename to patches/api/Add-more-WanderingTrader-API.patch
diff --git a/patches/unapplied/api/Add-more-Witch-API.patch b/patches/api/Add-more-Witch-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-more-Witch-API.patch
rename to patches/api/Add-more-Witch-API.patch
diff --git a/patches/unapplied/api/Add-more-Zombie-API.patch b/patches/api/Add-more-Zombie-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-more-Zombie-API.patch
rename to patches/api/Add-more-Zombie-API.patch
diff --git a/patches/unapplied/api/Add-more-advancement-API.patch b/patches/api/Add-more-advancement-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-more-advancement-API.patch
rename to patches/api/Add-more-advancement-API.patch
diff --git a/patches/unapplied/api/Add-more-line-of-sight-methods.patch b/patches/api/Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/unapplied/api/Add-more-line-of-sight-methods.patch
rename to patches/api/Add-more-line-of-sight-methods.patch
diff --git a/patches/unapplied/api/Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/unapplied/api/Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/api/Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/unapplied/api/Add-openSign-method-to-HumanEntity.patch b/patches/api/Add-openSign-method-to-HumanEntity.patch
similarity index 100%
rename from patches/unapplied/api/Add-openSign-method-to-HumanEntity.patch
rename to patches/api/Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/unapplied/api/Add-paper-dumplisteners-command.patch b/patches/api/Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/unapplied/api/Add-paper-dumplisteners-command.patch
rename to patches/api/Add-paper-dumplisteners-command.patch
diff --git a/patches/unapplied/api/Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/unapplied/api/Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/api/Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/unapplied/api/Add-player-health-update-API.patch b/patches/api/Add-player-health-update-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-player-health-update-API.patch
rename to patches/api/Add-player-health-update-API.patch
diff --git a/patches/unapplied/api/Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/api/Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/unapplied/api/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/api/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/unapplied/api/Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/unapplied/api/Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/api/Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/unapplied/api/Add-recipe-to-cook-events.patch b/patches/api/Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/unapplied/api/Add-recipe-to-cook-events.patch
rename to patches/api/Add-recipe-to-cook-events.patch
diff --git a/patches/unapplied/api/Add-sendOpLevel-API.patch b/patches/api/Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-sendOpLevel-API.patch
rename to patches/api/Add-sendOpLevel-API.patch
diff --git a/patches/unapplied/api/Add-sender-name-to-commands.yml-replacement.patch b/patches/api/Add-sender-name-to-commands.yml-replacement.patch
similarity index 100%
rename from patches/unapplied/api/Add-sender-name-to-commands.yml-replacement.patch
rename to patches/api/Add-sender-name-to-commands.yml-replacement.patch
diff --git a/patches/unapplied/api/Add-setMaxPlayers-API.patch b/patches/api/Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-setMaxPlayers-API.patch
rename to patches/api/Add-setMaxPlayers-API.patch
diff --git a/patches/unapplied/api/Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/unapplied/api/Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/api/Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/unapplied/api/Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/Add-source-block-constructor-and-getChangedBlockData.patch
similarity index 100%
rename from patches/unapplied/api/Add-source-block-constructor-and-getChangedBlockData.patch
rename to patches/api/Add-source-block-constructor-and-getChangedBlockData.patch
diff --git a/patches/unapplied/api/Add-source-to-PlayerExpChangeEvent.patch b/patches/api/Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-source-to-PlayerExpChangeEvent.patch
rename to patches/api/Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/unapplied/api/Add-spectator-target-events.patch b/patches/api/Add-spectator-target-events.patch
similarity index 100%
rename from patches/unapplied/api/Add-spectator-target-events.patch
rename to patches/api/Add-spectator-target-events.patch
diff --git a/patches/unapplied/api/Add-sun-related-API.patch b/patches/api/Add-sun-related-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-sun-related-API.patch
rename to patches/api/Add-sun-related-API.patch
diff --git a/patches/unapplied/api/Add-tick-times-API.patch b/patches/api/Add-tick-times-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-tick-times-API.patch
rename to patches/api/Add-tick-times-API.patch
diff --git a/patches/unapplied/api/Add-view-distance-API.patch b/patches/api/Add-view-distance-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-view-distance-API.patch
rename to patches/api/Add-view-distance-API.patch
diff --git a/patches/unapplied/api/Add-villager-reputation-API.patch b/patches/api/Add-villager-reputation-API.patch
similarity index 100%
rename from patches/unapplied/api/Add-villager-reputation-API.patch
rename to patches/api/Add-villager-reputation-API.patch
diff --git a/patches/unapplied/api/Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/api/Add-workaround-for-plugins-modifying-the-parent-of-t.patch
similarity index 100%
rename from patches/unapplied/api/Add-workaround-for-plugins-modifying-the-parent-of-t.patch
rename to patches/api/Add-workaround-for-plugins-modifying-the-parent-of-t.patch
diff --git a/patches/unapplied/api/Add-worldborder-events.patch b/patches/api/Add-worldborder-events.patch
similarity index 100%
rename from patches/unapplied/api/Add-worldborder-events.patch
rename to patches/api/Add-worldborder-events.patch
diff --git a/patches/unapplied/api/Added-EntityDamageItemEvent.patch b/patches/api/Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-EntityDamageItemEvent.patch
rename to patches/api/Added-EntityDamageItemEvent.patch
diff --git a/patches/unapplied/api/Added-EntityToggleSitEvent.patch b/patches/api/Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-EntityToggleSitEvent.patch
rename to patches/api/Added-EntityToggleSitEvent.patch
diff --git a/patches/unapplied/api/Added-PlayerBedFailEnterEvent.patch b/patches/api/Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-PlayerBedFailEnterEvent.patch
rename to patches/api/Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/unapplied/api/Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/Added-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-PlayerChangeBeaconEffectEvent.patch
rename to patches/api/Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/unapplied/api/Added-PlayerDeepSleepEvent.patch b/patches/api/Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-PlayerDeepSleepEvent.patch
rename to patches/api/Added-PlayerDeepSleepEvent.patch
diff --git a/patches/unapplied/api/Added-PlayerLecternPageChangeEvent.patch b/patches/api/Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-PlayerLecternPageChangeEvent.patch
rename to patches/api/Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/unapplied/api/Added-PlayerLoomPatternSelectEvent.patch b/patches/api/Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-PlayerLoomPatternSelectEvent.patch
rename to patches/api/Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/unapplied/api/Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/api/Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/unapplied/api/Added-PlayerTradeEvent.patch b/patches/api/Added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-PlayerTradeEvent.patch
rename to patches/api/Added-PlayerTradeEvent.patch
diff --git a/patches/unapplied/api/Added-ServerResourcesReloadedEvent.patch b/patches/api/Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-ServerResourcesReloadedEvent.patch
rename to patches/api/Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/unapplied/api/Added-WorldGameRuleChangeEvent.patch b/patches/api/Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-WorldGameRuleChangeEvent.patch
rename to patches/api/Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/unapplied/api/Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/unapplied/api/Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/api/Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/unapplied/api/Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/unapplied/api/Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/api/Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/Added-missing-vanilla-tags.patch b/patches/api/Added-missing-vanilla-tags.patch
new file mode 100644
index 0000000000..9431f51974
--- /dev/null
+++ b/patches/api/Added-missing-vanilla-tags.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Sun, 3 Jan 2021 20:03:40 -0800
+Subject: [PATCH] Added missing vanilla tags
+
+
+diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/Tag.java
++++ b/src/main/java/org/bukkit/Tag.java
+@@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed {
+      * Vanilla item tag representing all chest boat items.
+      */
+     Tag<Material> ITEMS_CHEST_BOATS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("chest_boats"), Material.class);
++    // Paper start
++    /**
++     * Vanilla item tag representing all non-flammable wood items.
++     */
++    Tag<Material> ITEMS_NON_FLAMMABLE_WOOD = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("non_flammable_wood"), Material.class);
++    // Paper end
+     /**
+      * Vanilla item tag representing all fish items.
+      */
diff --git a/patches/unapplied/api/Additional-Block-Material-API-s.patch b/patches/api/Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/unapplied/api/Additional-Block-Material-API-s.patch
rename to patches/api/Additional-Block-Material-API-s.patch
diff --git a/patches/unapplied/api/Additional-world.getNearbyEntities-API-s.patch b/patches/api/Additional-world.getNearbyEntities-API-s.patch
similarity index 100%
rename from patches/unapplied/api/Additional-world.getNearbyEntities-API-s.patch
rename to patches/api/Additional-world.getNearbyEntities-API-s.patch
diff --git a/patches/unapplied/api/Adds-PlayerArmSwingEvent.patch b/patches/api/Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/unapplied/api/Adds-PlayerArmSwingEvent.patch
rename to patches/api/Adds-PlayerArmSwingEvent.patch
diff --git a/patches/unapplied/api/Adventure.patch b/patches/api/Adventure.patch
similarity index 99%
rename from patches/unapplied/api/Adventure.patch
rename to patches/api/Adventure.patch
index e3ac71fb6e..5fe7c45ad3 100644
--- a/patches/unapplied/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -34,8 +34,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    api("net.md-5:bungeecord-chat:1.16-R0.4")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper
      api("org.yaml:snakeyaml:1.33")
+     api("org.joml:joml:1.10.5")
      // Paper start
-     api("com.googlecode.json-simple:json-simple:1.1.1") {
+@@ -0,0 +0,0 @@ dependencies {
          isTransitive = false // includes junit
      }
      api("it.unimi.dsi:fastutil:8.5.6")
diff --git a/patches/unapplied/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch
similarity index 100%
rename from patches/unapplied/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch
rename to patches/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch
diff --git a/patches/unapplied/api/Allow-Reloading-of-Command-Aliases.patch b/patches/api/Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from patches/unapplied/api/Allow-Reloading-of-Command-Aliases.patch
rename to patches/api/Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/unapplied/api/Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/unapplied/api/Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/api/Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/unapplied/api/Allow-changing-bed-s-occupied-property.patch b/patches/api/Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/unapplied/api/Allow-changing-bed-s-occupied-property.patch
rename to patches/api/Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/unapplied/api/Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/unapplied/api/Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/api/Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/unapplied/api/Allow-disabling-armour-stand-ticking.patch b/patches/api/Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/unapplied/api/Allow-disabling-armour-stand-ticking.patch
rename to patches/api/Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/unapplied/api/Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch
similarity index 100%
rename from patches/unapplied/api/Allow-plugins-to-use-SLF4J-for-logging.patch
rename to patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch
diff --git a/patches/unapplied/api/Allow-setting-the-vex-s-summoner.patch b/patches/api/Allow-setting-the-vex-s-summoner.patch
similarity index 100%
rename from patches/unapplied/api/Allow-setting-the-vex-s-summoner.patch
rename to patches/api/Allow-setting-the-vex-s-summoner.patch
diff --git a/patches/unapplied/api/Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/Allow-to-change-the-podium-of-the-EnderDragon.patch
similarity index 100%
rename from patches/unapplied/api/Allow-to-change-the-podium-of-the-EnderDragon.patch
rename to patches/api/Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/unapplied/api/Also-load-resources-from-LibraryLoader.patch b/patches/api/Also-load-resources-from-LibraryLoader.patch
similarity index 100%
rename from patches/unapplied/api/Also-load-resources-from-LibraryLoader.patch
rename to patches/api/Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/unapplied/api/Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
similarity index 100%
rename from patches/unapplied/api/Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
rename to patches/api/Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/unapplied/api/AnvilDamageEvent.patch b/patches/api/AnvilDamageEvent.patch
similarity index 100%
rename from patches/unapplied/api/AnvilDamageEvent.patch
rename to patches/api/AnvilDamageEvent.patch
diff --git a/patches/unapplied/api/Arrow-pickup-rule-API.patch b/patches/api/Arrow-pickup-rule-API.patch
similarity index 100%
rename from patches/unapplied/api/Arrow-pickup-rule-API.patch
rename to patches/api/Arrow-pickup-rule-API.patch
diff --git a/patches/unapplied/api/Async-Chunks-API.patch b/patches/api/Async-Chunks-API.patch
similarity index 100%
rename from patches/unapplied/api/Async-Chunks-API.patch
rename to patches/api/Async-Chunks-API.patch
diff --git a/patches/unapplied/api/AsyncTabCompleteEvent.patch b/patches/api/AsyncTabCompleteEvent.patch
similarity index 100%
rename from patches/unapplied/api/AsyncTabCompleteEvent.patch
rename to patches/api/AsyncTabCompleteEvent.patch
diff --git a/patches/unapplied/api/Attributes-API-for-item-defaults.patch b/patches/api/Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/unapplied/api/Attributes-API-for-item-defaults.patch
rename to patches/api/Attributes-API-for-item-defaults.patch
diff --git a/patches/unapplied/api/Basic-PlayerProfile-API.patch b/patches/api/Basic-PlayerProfile-API.patch
similarity index 100%
rename from patches/unapplied/api/Basic-PlayerProfile-API.patch
rename to patches/api/Basic-PlayerProfile-API.patch
diff --git a/patches/unapplied/api/Beacon-API-custom-effect-ranges.patch b/patches/api/Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/unapplied/api/Beacon-API-custom-effect-ranges.patch
rename to patches/api/Beacon-API-custom-effect-ranges.patch
diff --git a/patches/unapplied/api/Block-Ticking-API.patch b/patches/api/Block-Ticking-API.patch
similarity index 100%
rename from patches/unapplied/api/Block-Ticking-API.patch
rename to patches/api/Block-Ticking-API.patch
diff --git a/patches/unapplied/api/BlockDestroyEvent.patch b/patches/api/BlockDestroyEvent.patch
similarity index 100%
rename from patches/unapplied/api/BlockDestroyEvent.patch
rename to patches/api/BlockDestroyEvent.patch
diff --git a/patches/unapplied/api/Brand-support.patch b/patches/api/Brand-support.patch
similarity index 100%
rename from patches/unapplied/api/Brand-support.patch
rename to patches/api/Brand-support.patch
diff --git a/patches/unapplied/api/Bucketable-API.patch b/patches/api/Bucketable-API.patch
similarity index 100%
rename from patches/unapplied/api/Bucketable-API.patch
rename to patches/api/Bucketable-API.patch
diff --git a/patches/unapplied/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch
similarity index 98%
rename from patches/unapplied/api/Build-system-changes.patch
rename to patches/api/Build-system-changes.patch
index 25648025b6..0a8309e9e0 100644
--- a/patches/unapplied/api/Build-system-changes.patch
+++ b/patches/api/Build-system-changes.patch
@@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -0,0 +0,0 @@ dependencies {
-     api("com.google.code.gson:gson:2.10")
      api("net.md-5:bungeecord-chat:1.16-R0.4")
      api("org.yaml:snakeyaml:1.33")
+     api("org.joml:joml:1.10.5")
 +    // Paper start
 +    api("com.googlecode.json-simple:json-simple:1.1.1") {
 +        isTransitive = false // includes junit
diff --git a/patches/unapplied/api/Cache-the-result-of-Material-isBlock.patch b/patches/api/Cache-the-result-of-Material-isBlock.patch
similarity index 100%
rename from patches/unapplied/api/Cache-the-result-of-Material-isBlock.patch
rename to patches/api/Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/unapplied/api/Change-EnderEye-target-without-changing-other-things.patch b/patches/api/Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/unapplied/api/Change-EnderEye-target-without-changing-other-things.patch
rename to patches/api/Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/unapplied/api/Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 100%
rename from patches/unapplied/api/Change-the-reserved-channel-check-to-be-sensible.patch
rename to patches/api/Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/unapplied/api/Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
similarity index 100%
rename from patches/unapplied/api/Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
rename to patches/api/Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
diff --git a/patches/unapplied/api/Collision-API.patch b/patches/api/Collision-API.patch
similarity index 100%
rename from patches/unapplied/api/Collision-API.patch
rename to patches/api/Collision-API.patch
diff --git a/patches/unapplied/api/Complete-resource-pack-API.patch b/patches/api/Complete-resource-pack-API.patch
similarity index 100%
rename from patches/unapplied/api/Complete-resource-pack-API.patch
rename to patches/api/Complete-resource-pack-API.patch
diff --git a/patches/unapplied/api/Configurable-sculk-sensor-listener-range.patch b/patches/api/Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/unapplied/api/Configurable-sculk-sensor-listener-range.patch
rename to patches/api/Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/unapplied/api/Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/unapplied/api/Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/api/Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/unapplied/api/Custom-Chat-Completion-Suggestions-API.patch b/patches/api/Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/unapplied/api/Custom-Chat-Completion-Suggestions-API.patch
rename to patches/api/Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/unapplied/api/Custom-Potion-Mixes.patch b/patches/api/Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/unapplied/api/Custom-Potion-Mixes.patch
rename to patches/api/Custom-Potion-Mixes.patch
diff --git a/patches/unapplied/api/Custom-replacement-for-eaten-items.patch b/patches/api/Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from patches/unapplied/api/Custom-replacement-for-eaten-items.patch
rename to patches/api/Custom-replacement-for-eaten-items.patch
diff --git a/patches/unapplied/api/Display-warning-on-deprecated-recipe-API.patch b/patches/api/Display-warning-on-deprecated-recipe-API.patch
similarity index 100%
rename from patches/unapplied/api/Display-warning-on-deprecated-recipe-API.patch
rename to patches/api/Display-warning-on-deprecated-recipe-API.patch
diff --git a/patches/unapplied/api/Dolphin-API.patch b/patches/api/Dolphin-API.patch
similarity index 100%
rename from patches/unapplied/api/Dolphin-API.patch
rename to patches/api/Dolphin-API.patch
diff --git a/patches/unapplied/api/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
similarity index 100%
rename from patches/unapplied/api/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
rename to patches/api/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/patches/unapplied/api/Elder-Guardian-appearance-API.patch b/patches/api/Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/unapplied/api/Elder-Guardian-appearance-API.patch
rename to patches/api/Elder-Guardian-appearance-API.patch
diff --git a/patches/unapplied/api/Enable-multi-release-plugin-jars.patch b/patches/api/Enable-multi-release-plugin-jars.patch
similarity index 100%
rename from patches/unapplied/api/Enable-multi-release-plugin-jars.patch
rename to patches/api/Enable-multi-release-plugin-jars.patch
diff --git a/patches/unapplied/api/EnderDragon-Events.patch b/patches/api/EnderDragon-Events.patch
similarity index 100%
rename from patches/unapplied/api/EnderDragon-Events.patch
rename to patches/api/EnderDragon-Events.patch
diff --git a/patches/unapplied/api/Enderman.teleportRandomly.patch b/patches/api/Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/unapplied/api/Enderman.teleportRandomly.patch
rename to patches/api/Enderman.teleportRandomly.patch
diff --git a/patches/unapplied/api/EndermanAttackPlayerEvent.patch b/patches/api/EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/unapplied/api/EndermanAttackPlayerEvent.patch
rename to patches/api/EndermanAttackPlayerEvent.patch
diff --git a/patches/unapplied/api/EndermanEscapeEvent.patch b/patches/api/EndermanEscapeEvent.patch
similarity index 100%
rename from patches/unapplied/api/EndermanEscapeEvent.patch
rename to patches/api/EndermanEscapeEvent.patch
diff --git a/patches/unapplied/api/Entity-AddTo-RemoveFrom-World-Events.patch b/patches/api/Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from patches/unapplied/api/Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/api/Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/unapplied/api/Entity-Jump-API.patch b/patches/api/Entity-Jump-API.patch
similarity index 100%
rename from patches/unapplied/api/Entity-Jump-API.patch
rename to patches/api/Entity-Jump-API.patch
diff --git a/patches/unapplied/api/Entity-Origin-API.patch b/patches/api/Entity-Origin-API.patch
similarity index 100%
rename from patches/unapplied/api/Entity-Origin-API.patch
rename to patches/api/Entity-Origin-API.patch
diff --git a/patches/unapplied/api/Entity-fromMobSpawner.patch b/patches/api/Entity-fromMobSpawner.patch
similarity index 100%
rename from patches/unapplied/api/Entity-fromMobSpawner.patch
rename to patches/api/Entity-fromMobSpawner.patch
diff --git a/patches/unapplied/api/Entity-getChunk-API.patch b/patches/api/Entity-getChunk-API.patch
similarity index 100%
rename from patches/unapplied/api/Entity-getChunk-API.patch
rename to patches/api/Entity-getChunk-API.patch
diff --git a/patches/unapplied/api/Entity-getEntitySpawnReason.patch b/patches/api/Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/unapplied/api/Entity-getEntitySpawnReason.patch
rename to patches/api/Entity-getEntitySpawnReason.patch
diff --git a/patches/unapplied/api/Entity-isTicking.patch b/patches/api/Entity-isTicking.patch
similarity index 100%
rename from patches/unapplied/api/Entity-isTicking.patch
rename to patches/api/Entity-isTicking.patch
diff --git a/patches/unapplied/api/Entity-powdered-snow-API.patch b/patches/api/Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/unapplied/api/Entity-powdered-snow-API.patch
rename to patches/api/Entity-powdered-snow-API.patch
diff --git a/patches/unapplied/api/EntityMoveEvent.patch b/patches/api/EntityMoveEvent.patch
similarity index 100%
rename from patches/unapplied/api/EntityMoveEvent.patch
rename to patches/api/EntityMoveEvent.patch
diff --git a/patches/unapplied/api/EntityPathfindEvent.patch b/patches/api/EntityPathfindEvent.patch
similarity index 100%
rename from patches/unapplied/api/EntityPathfindEvent.patch
rename to patches/api/EntityPathfindEvent.patch
diff --git a/patches/unapplied/api/EntityRegainHealthEvent-isFastRegen-API.patch b/patches/api/EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from patches/unapplied/api/EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/api/EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/unapplied/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 100%
rename from patches/unapplied/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to patches/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
diff --git a/patches/unapplied/api/EntityTransformedEvent.patch b/patches/api/EntityTransformedEvent.patch
similarity index 100%
rename from patches/unapplied/api/EntityTransformedEvent.patch
rename to patches/api/EntityTransformedEvent.patch
diff --git a/patches/unapplied/api/Expand-ArmorStand-API.patch b/patches/api/Expand-ArmorStand-API.patch
similarity index 100%
rename from patches/unapplied/api/Expand-ArmorStand-API.patch
rename to patches/api/Expand-ArmorStand-API.patch
diff --git a/patches/unapplied/api/Expand-Explosions-API.patch b/patches/api/Expand-Explosions-API.patch
similarity index 100%
rename from patches/unapplied/api/Expand-Explosions-API.patch
rename to patches/api/Expand-Explosions-API.patch
diff --git a/patches/unapplied/api/Expand-Location-Manipulation-API.patch b/patches/api/Expand-Location-Manipulation-API.patch
similarity index 100%
rename from patches/unapplied/api/Expand-Location-Manipulation-API.patch
rename to patches/api/Expand-Location-Manipulation-API.patch
diff --git a/patches/unapplied/api/Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from patches/unapplied/api/Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/api/Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/unapplied/api/Expand-world-key-API.patch b/patches/api/Expand-world-key-API.patch
similarity index 100%
rename from patches/unapplied/api/Expand-world-key-API.patch
rename to patches/api/Expand-world-key-API.patch
diff --git a/patches/unapplied/api/ExperienceOrbMergeEvent.patch b/patches/api/ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/unapplied/api/ExperienceOrbMergeEvent.patch
rename to patches/api/ExperienceOrbMergeEvent.patch
diff --git a/patches/unapplied/api/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/api/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/unapplied/api/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/api/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/unapplied/api/Expose-LivingEntity-hurt-direction.patch b/patches/api/Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/unapplied/api/Expose-LivingEntity-hurt-direction.patch
rename to patches/api/Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/unapplied/api/Expose-MinecraftServer-isRunning.patch b/patches/api/Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/unapplied/api/Expose-MinecraftServer-isRunning.patch
rename to patches/api/Expose-MinecraftServer-isRunning.patch
diff --git a/patches/unapplied/api/Expose-Tracked-Players.patch b/patches/api/Expose-Tracked-Players.patch
similarity index 100%
rename from patches/unapplied/api/Expose-Tracked-Players.patch
rename to patches/api/Expose-Tracked-Players.patch
diff --git a/patches/unapplied/api/Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/Expose-WorldBorder-isInBounds-Location-check.patch
similarity index 100%
rename from patches/unapplied/api/Expose-WorldBorder-isInBounds-Location-check.patch
rename to patches/api/Expose-WorldBorder-isInBounds-Location-check.patch
diff --git a/patches/unapplied/api/Expose-attack-cooldown-methods-for-Player.patch b/patches/api/Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/unapplied/api/Expose-attack-cooldown-methods-for-Player.patch
rename to patches/api/Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/unapplied/api/Expose-client-protocol-version-and-virtual-host.patch b/patches/api/Expose-client-protocol-version-and-virtual-host.patch
similarity index 100%
rename from patches/unapplied/api/Expose-client-protocol-version-and-virtual-host.patch
rename to patches/api/Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/unapplied/api/Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
similarity index 100%
rename from patches/unapplied/api/Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
rename to patches/api/Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/unapplied/api/Expose-furnace-minecart-push-values.patch b/patches/api/Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/unapplied/api/Expose-furnace-minecart-push-values.patch
rename to patches/api/Expose-furnace-minecart-push-values.patch
diff --git a/patches/unapplied/api/Expose-game-version.patch b/patches/api/Expose-game-version.patch
similarity index 100%
rename from patches/unapplied/api/Expose-game-version.patch
rename to patches/api/Expose-game-version.patch
diff --git a/patches/unapplied/api/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/unapplied/api/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/api/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/unapplied/api/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/unapplied/api/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/api/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/unapplied/api/Expose-protocol-version.patch b/patches/api/Expose-protocol-version.patch
similarity index 100%
rename from patches/unapplied/api/Expose-protocol-version.patch
rename to patches/api/Expose-protocol-version.patch
diff --git a/patches/unapplied/api/Expose-server-CommandMap.patch b/patches/api/Expose-server-CommandMap.patch
similarity index 100%
rename from patches/unapplied/api/Expose-server-CommandMap.patch
rename to patches/api/Expose-server-CommandMap.patch
diff --git a/patches/unapplied/api/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/unapplied/api/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/api/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/unapplied/api/Expose-the-internal-current-tick.patch b/patches/api/Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/unapplied/api/Expose-the-internal-current-tick.patch
rename to patches/api/Expose-the-internal-current-tick.patch
diff --git a/patches/unapplied/api/Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/unapplied/api/Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/api/Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/unapplied/api/FallingBlock-auto-expire-setting.patch b/patches/api/FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/unapplied/api/FallingBlock-auto-expire-setting.patch
rename to patches/api/FallingBlock-auto-expire-setting.patch
diff --git a/patches/unapplied/api/Fill-Profile-Property-Events.patch b/patches/api/Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/unapplied/api/Fill-Profile-Property-Events.patch
rename to patches/api/Fill-Profile-Property-Events.patch
diff --git a/patches/unapplied/api/Fireworks-API-s.patch b/patches/api/Fireworks-API-s.patch
similarity index 100%
rename from patches/unapplied/api/Fireworks-API-s.patch
rename to patches/api/Fireworks-API-s.patch
diff --git a/patches/unapplied/api/Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
similarity index 100%
rename from patches/unapplied/api/Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
rename to patches/api/Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/unapplied/api/Fix-NotePlayEvent.patch b/patches/api/Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/unapplied/api/Fix-NotePlayEvent.patch
rename to patches/api/Fix-NotePlayEvent.patch
diff --git a/patches/unapplied/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
similarity index 100%
rename from patches/unapplied/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
rename to patches/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/patches/unapplied/api/Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/api/Fix-ServerListPingEvent-flagging-as-Async.patch
similarity index 100%
rename from patches/unapplied/api/Fix-ServerListPingEvent-flagging-as-Async.patch
rename to patches/api/Fix-ServerListPingEvent-flagging-as-Async.patch
diff --git a/patches/unapplied/api/Fix-Spigot-annotation-mistakes.patch b/patches/api/Fix-Spigot-annotation-mistakes.patch
similarity index 100%
rename from patches/unapplied/api/Fix-Spigot-annotation-mistakes.patch
rename to patches/api/Fix-Spigot-annotation-mistakes.patch
diff --git a/patches/unapplied/api/Fix-issues-with-mob-conversion.patch b/patches/api/Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/unapplied/api/Fix-issues-with-mob-conversion.patch
rename to patches/api/Fix-issues-with-mob-conversion.patch
diff --git a/patches/unapplied/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch
similarity index 100%
rename from patches/unapplied/api/Fix-upstream-javadocs.patch
rename to patches/api/Fix-upstream-javadocs.patch
diff --git a/patches/unapplied/api/Flying-Fall-Damage-API.patch b/patches/api/Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/unapplied/api/Flying-Fall-Damage-API.patch
rename to patches/api/Flying-Fall-Damage-API.patch
diff --git a/patches/unapplied/api/Freeze-Tick-Lock-API.patch b/patches/api/Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/unapplied/api/Freeze-Tick-Lock-API.patch
rename to patches/api/Freeze-Tick-Lock-API.patch
diff --git a/patches/unapplied/api/Friction-API.patch b/patches/api/Friction-API.patch
similarity index 100%
rename from patches/unapplied/api/Friction-API.patch
rename to patches/api/Friction-API.patch
diff --git a/patches/unapplied/api/Furnace-RecipesUsed-API.patch b/patches/api/Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/unapplied/api/Furnace-RecipesUsed-API.patch
rename to patches/api/Furnace-RecipesUsed-API.patch
diff --git a/patches/unapplied/api/Get-entity-default-attributes.patch b/patches/api/Get-entity-default-attributes.patch
similarity index 100%
rename from patches/unapplied/api/Get-entity-default-attributes.patch
rename to patches/api/Get-entity-default-attributes.patch
diff --git a/patches/unapplied/api/Goat-ram-API.patch b/patches/api/Goat-ram-API.patch
similarity index 100%
rename from patches/unapplied/api/Goat-ram-API.patch
rename to patches/api/Goat-ram-API.patch
diff --git a/patches/unapplied/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 98%
rename from patches/unapplied/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to patches/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index c824642001..337afe052a 100644
--- a/patches/unapplied/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -120,5 +120,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      /**
-      * Forces an update of the player's entire inventory.
-      *
+      * Add custom chat completion suggestions shown to the player while typing a
+      * message.
diff --git a/patches/unapplied/api/Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/api/Handle-plugin-prefixes-in-implementation-logging-con.patch
similarity index 100%
rename from patches/unapplied/api/Handle-plugin-prefixes-in-implementation-logging-con.patch
rename to patches/api/Handle-plugin-prefixes-in-implementation-logging-con.patch
diff --git a/patches/unapplied/api/IllegalPacketEvent.patch b/patches/api/IllegalPacketEvent.patch
similarity index 100%
rename from patches/unapplied/api/IllegalPacketEvent.patch
rename to patches/api/IllegalPacketEvent.patch
diff --git a/patches/unapplied/api/Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/unapplied/api/Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/api/Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/unapplied/api/Implement-regenerateChunk.patch b/patches/api/Implement-regenerateChunk.patch
similarity index 100%
rename from patches/unapplied/api/Implement-regenerateChunk.patch
rename to patches/api/Implement-regenerateChunk.patch
diff --git a/patches/unapplied/api/Improve-Arrow-API.patch b/patches/api/Improve-Arrow-API.patch
similarity index 100%
rename from patches/unapplied/api/Improve-Arrow-API.patch
rename to patches/api/Improve-Arrow-API.patch
diff --git a/patches/unapplied/api/Improve-Block-breakNaturally-API.patch b/patches/api/Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/unapplied/api/Improve-Block-breakNaturally-API.patch
rename to patches/api/Improve-Block-breakNaturally-API.patch
diff --git a/patches/unapplied/api/Improve-PortalEvents.patch b/patches/api/Improve-PortalEvents.patch
similarity index 100%
rename from patches/unapplied/api/Improve-PortalEvents.patch
rename to patches/api/Improve-PortalEvents.patch
diff --git a/patches/unapplied/api/Improve-death-events.patch b/patches/api/Improve-death-events.patch
similarity index 100%
rename from patches/unapplied/api/Improve-death-events.patch
rename to patches/api/Improve-death-events.patch
diff --git a/patches/unapplied/api/Improve-scoreboard-entries.patch b/patches/api/Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/unapplied/api/Improve-scoreboard-entries.patch
rename to patches/api/Improve-scoreboard-entries.patch
diff --git a/patches/unapplied/api/Improve-the-Saddle-API-for-Horses.patch b/patches/api/Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/unapplied/api/Improve-the-Saddle-API-for-Horses.patch
rename to patches/api/Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/unapplied/api/Increase-custom-payload-channel-message-size.patch b/patches/api/Increase-custom-payload-channel-message-size.patch
similarity index 100%
rename from patches/unapplied/api/Increase-custom-payload-channel-message-size.patch
rename to patches/api/Increase-custom-payload-channel-message-size.patch
diff --git a/patches/unapplied/api/Introduce-beacon-activation-deactivation-events.patch b/patches/api/Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/unapplied/api/Introduce-beacon-activation-deactivation-events.patch
rename to patches/api/Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/unapplied/api/Inventory-close.patch b/patches/api/Inventory-close.patch
similarity index 100%
rename from patches/unapplied/api/Inventory-close.patch
rename to patches/api/Inventory-close.patch
diff --git a/patches/unapplied/api/Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/unapplied/api/Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/api/Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/unapplied/api/Inventory-removeItemAnySlot.patch b/patches/api/Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/unapplied/api/Inventory-removeItemAnySlot.patch
rename to patches/api/Inventory-removeItemAnySlot.patch
diff --git a/patches/unapplied/api/InventoryCloseEvent-Reason-API.patch b/patches/api/InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from patches/unapplied/api/InventoryCloseEvent-Reason-API.patch
rename to patches/api/InventoryCloseEvent-Reason-API.patch
diff --git a/patches/unapplied/api/Item-Rarity-API.patch b/patches/api/Item-Rarity-API.patch
similarity index 100%
rename from patches/unapplied/api/Item-Rarity-API.patch
rename to patches/api/Item-Rarity-API.patch
diff --git a/patches/unapplied/api/Item-canEntityPickup.patch b/patches/api/Item-canEntityPickup.patch
similarity index 100%
rename from patches/unapplied/api/Item-canEntityPickup.patch
rename to patches/api/Item-canEntityPickup.patch
diff --git a/patches/unapplied/api/Item-no-age-no-player-pickup.patch b/patches/api/Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/unapplied/api/Item-no-age-no-player-pickup.patch
rename to patches/api/Item-no-age-no-player-pickup.patch
diff --git a/patches/unapplied/api/ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/ItemStack-API-additions-for-quantity-flags-lore.patch
similarity index 100%
rename from patches/unapplied/api/ItemStack-API-additions-for-quantity-flags-lore.patch
rename to patches/api/ItemStack-API-additions-for-quantity-flags-lore.patch
diff --git a/patches/unapplied/api/ItemStack-damage-API.patch b/patches/api/ItemStack-damage-API.patch
similarity index 100%
rename from patches/unapplied/api/ItemStack-damage-API.patch
rename to patches/api/ItemStack-damage-API.patch
diff --git a/patches/unapplied/api/ItemStack-editMeta.patch b/patches/api/ItemStack-editMeta.patch
similarity index 100%
rename from patches/unapplied/api/ItemStack-editMeta.patch
rename to patches/api/ItemStack-editMeta.patch
diff --git a/patches/unapplied/api/ItemStack-getMaxItemUseDuration.patch b/patches/api/ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/unapplied/api/ItemStack-getMaxItemUseDuration.patch
rename to patches/api/ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/unapplied/api/ItemStack-repair-check-API.patch b/patches/api/ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/unapplied/api/ItemStack-repair-check-API.patch
rename to patches/api/ItemStack-repair-check-API.patch
diff --git a/patches/unapplied/api/Keyed-Cat-Type.patch b/patches/api/Keyed-Cat-Type.patch
similarity index 100%
rename from patches/unapplied/api/Keyed-Cat-Type.patch
rename to patches/api/Keyed-Cat-Type.patch
diff --git a/patches/unapplied/api/Left-handed-API.patch b/patches/api/Left-handed-API.patch
similarity index 100%
rename from patches/unapplied/api/Left-handed-API.patch
rename to patches/api/Left-handed-API.patch
diff --git a/patches/unapplied/api/LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/unapplied/api/LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/api/LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/unapplied/api/LivingEntity-setKiller.patch b/patches/api/LivingEntity-setKiller.patch
similarity index 100%
rename from patches/unapplied/api/LivingEntity-setKiller.patch
rename to patches/api/LivingEntity-setKiller.patch
diff --git a/patches/unapplied/api/Location.isChunkLoaded-API.patch b/patches/api/Location.isChunkLoaded-API.patch
similarity index 100%
rename from patches/unapplied/api/Location.isChunkLoaded-API.patch
rename to patches/api/Location.isChunkLoaded-API.patch
diff --git a/patches/unapplied/api/Location.toBlockLocation-toCenterLocation.patch b/patches/api/Location.toBlockLocation-toCenterLocation.patch
similarity index 100%
rename from patches/unapplied/api/Location.toBlockLocation-toCenterLocation.patch
rename to patches/api/Location.toBlockLocation-toCenterLocation.patch
diff --git a/patches/unapplied/api/LootTable-API.patch b/patches/api/LootTable-API.patch
similarity index 100%
rename from patches/unapplied/api/LootTable-API.patch
rename to patches/api/LootTable-API.patch
diff --git a/patches/unapplied/api/Make-EntityUnleashEvent-cancellable.patch b/patches/api/Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/unapplied/api/Make-EntityUnleashEvent-cancellable.patch
rename to patches/api/Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/unapplied/api/Make-shield-blocking-delay-configurable.patch b/patches/api/Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/unapplied/api/Make-shield-blocking-delay-configurable.patch
rename to patches/api/Make-shield-blocking-delay-configurable.patch
diff --git a/patches/unapplied/api/Make-the-default-permission-message-configurable.patch b/patches/api/Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/unapplied/api/Make-the-default-permission-message-configurable.patch
rename to patches/api/Make-the-default-permission-message-configurable.patch
diff --git a/patches/unapplied/api/Mark-experimental-api-as-such.patch b/patches/api/Mark-experimental-api-as-such.patch
similarity index 96%
rename from patches/unapplied/api/Mark-experimental-api-as-such.patch
rename to patches/api/Mark-experimental-api-as-such.patch
index f9f5871cac..b0c51e2eb4 100644
--- a/patches/unapplied/api/Mark-experimental-api-as-such.patch
+++ b/patches/api/Mark-experimental-api-as-such.patch
@@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-     ACACIA_PLANKS(31312),
+     CHERRY_PLANKS(8354),
      DARK_OAK_PLANKS(20869),
      MANGROVE_PLANKS(7078),
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
@@ -55,8 +55,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
      CHISELED_BOOKSHELF(8099, ChiseledBookshelf.class),
-     MOSSY_COBBLESTONE(21900),
-     OBSIDIAN(32723),
+     /**
+      * BlockData: {@link DecoratedPot}
 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      /**
       * BlockData: {@link Fence}
@@ -165,6 +165,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      /**
       * BlockData: {@link HangingSign}
       */
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
+     CHERRY_HANGING_SIGN(5088, 16, HangingSign.class),
+     /**
+      * BlockData: {@link HangingSign}
+      */
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
      DARK_OAK_HANGING_SIGN(23360, 16, HangingSign.class),
      /**
@@ -242,6 +247,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      /**
       * BlockData: {@link WallHangingSign}
       */
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
+     CHERRY_WALL_HANGING_SIGN(10953, WallHangingSign.class),
+     /**
+      * BlockData: {@link WallHangingSign}
+      */
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
      JUNGLE_WALL_HANGING_SIGN(16691, WallHangingSign.class),
      /**
@@ -407,7 +417,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/Boat.java
 +++ b/src/main/java/org/bukkit/entity/Boat.java
 @@ -0,0 +0,0 @@ public interface Boat extends Vehicle {
-         ACACIA(Material.ACACIA_PLANKS),
+         CHERRY(Material.CHERRY_PLANKS),
          DARK_OAK(Material.DARK_OAK_PLANKS),
          MANGROVE(Material.MANGROVE_PLANKS),
 +        @org.jetbrains.annotations.ApiStatus.Experimental // Paper
@@ -436,8 +446,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      WARDEN("warden", Warden.class, -1),
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
      CAMEL("camel", Camel.class, -1),
-     /**
-      * A fishing line and bobber.
+     BLOCK_DISPLAY("block_display", BlockDisplay.class, -1),
+     INTERACTION("interaction", Interaction.class, -1),
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
@@ -448,8 +458,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
      CHISELED_BOOKSHELF(6, "Chiseled Bookshelf"),
-     ;
- 
+     /**
+      * The new smithing inventory, with 3 CRAFTING slots and 1 RESULT slot.
 diff --git a/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java b/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java
diff --git a/patches/unapplied/api/Material-API-additions.patch b/patches/api/Material-API-additions.patch
similarity index 100%
rename from patches/unapplied/api/Material-API-additions.patch
rename to patches/api/Material-API-additions.patch
diff --git a/patches/unapplied/api/Misc-Utils.patch b/patches/api/Misc-Utils.patch
similarity index 100%
rename from patches/unapplied/api/Misc-Utils.patch
rename to patches/api/Misc-Utils.patch
diff --git a/patches/unapplied/api/Missing-Entity-Behavior-API.patch b/patches/api/Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/unapplied/api/Missing-Entity-Behavior-API.patch
rename to patches/api/Missing-Entity-Behavior-API.patch
diff --git a/patches/unapplied/api/Mob-Pathfinding-API.patch b/patches/api/Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/unapplied/api/Mob-Pathfinding-API.patch
rename to patches/api/Mob-Pathfinding-API.patch
diff --git a/patches/unapplied/api/Mob-Spawner-API-Enhancements.patch b/patches/api/Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/unapplied/api/Mob-Spawner-API-Enhancements.patch
rename to patches/api/Mob-Spawner-API-Enhancements.patch
diff --git a/patches/unapplied/api/More-CommandBlock-API.patch b/patches/api/More-CommandBlock-API.patch
similarity index 100%
rename from patches/unapplied/api/More-CommandBlock-API.patch
rename to patches/api/More-CommandBlock-API.patch
diff --git a/patches/unapplied/api/More-Enchantment-API.patch b/patches/api/More-Enchantment-API.patch
similarity index 100%
rename from patches/unapplied/api/More-Enchantment-API.patch
rename to patches/api/More-Enchantment-API.patch
diff --git a/patches/unapplied/api/More-Lidded-Block-API.patch b/patches/api/More-Lidded-Block-API.patch
similarity index 100%
rename from patches/unapplied/api/More-Lidded-Block-API.patch
rename to patches/api/More-Lidded-Block-API.patch
diff --git a/patches/unapplied/api/More-PotionEffectType-API.patch b/patches/api/More-PotionEffectType-API.patch
similarity index 100%
rename from patches/unapplied/api/More-PotionEffectType-API.patch
rename to patches/api/More-PotionEffectType-API.patch
diff --git a/patches/unapplied/api/More-Projectile-API.patch b/patches/api/More-Projectile-API.patch
similarity index 100%
rename from patches/unapplied/api/More-Projectile-API.patch
rename to patches/api/More-Projectile-API.patch
diff --git a/patches/unapplied/api/More-Teleport-API.patch b/patches/api/More-Teleport-API.patch
similarity index 100%
rename from patches/unapplied/api/More-Teleport-API.patch
rename to patches/api/More-Teleport-API.patch
diff --git a/patches/unapplied/api/More-World-API.patch b/patches/api/More-World-API.patch
similarity index 100%
rename from patches/unapplied/api/More-World-API.patch
rename to patches/api/More-World-API.patch
diff --git a/patches/unapplied/api/More-lightning-API.patch b/patches/api/More-lightning-API.patch
similarity index 100%
rename from patches/unapplied/api/More-lightning-API.patch
rename to patches/api/More-lightning-API.patch
diff --git a/patches/unapplied/api/More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/unapplied/api/More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/api/More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/unapplied/api/Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/Move-VehicleCollisionEvent-HandlerList-up.patch
similarity index 100%
rename from patches/unapplied/api/Move-VehicleCollisionEvent-HandlerList-up.patch
rename to patches/api/Move-VehicleCollisionEvent-HandlerList-up.patch
diff --git a/patches/unapplied/api/Multi-Block-Change-API.patch b/patches/api/Multi-Block-Change-API.patch
similarity index 100%
rename from patches/unapplied/api/Multi-Block-Change-API.patch
rename to patches/api/Multi-Block-Change-API.patch
diff --git a/patches/unapplied/api/Multiple-Entries-with-Scoreboards.patch b/patches/api/Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/unapplied/api/Multiple-Entries-with-Scoreboards.patch
rename to patches/api/Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/unapplied/api/Nameable-Banner-API.patch b/patches/api/Nameable-Banner-API.patch
similarity index 100%
rename from patches/unapplied/api/Nameable-Banner-API.patch
rename to patches/api/Nameable-Banner-API.patch
diff --git a/patches/unapplied/api/Optimize-Hoppers.patch b/patches/api/Optimize-Hoppers.patch
similarity index 100%
rename from patches/unapplied/api/Optimize-Hoppers.patch
rename to patches/api/Optimize-Hoppers.patch
diff --git a/patches/unapplied/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/unapplied/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/unapplied/api/Paper-Plugins.patch b/patches/api/Paper-Plugins.patch
similarity index 100%
rename from patches/unapplied/api/Paper-Plugins.patch
rename to patches/api/Paper-Plugins.patch
diff --git a/patches/unapplied/api/Paper-Utils.patch b/patches/api/Paper-Utils.patch
similarity index 100%
rename from patches/unapplied/api/Paper-Utils.patch
rename to patches/api/Paper-Utils.patch
diff --git a/patches/unapplied/api/Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/Performance-Concurrency-Improvements-to-Permissions.patch
similarity index 100%
rename from patches/unapplied/api/Performance-Concurrency-Improvements-to-Permissions.patch
rename to patches/api/Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/unapplied/api/Player-Chunk-Load-Unload-Events.patch b/patches/api/Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/unapplied/api/Player-Chunk-Load-Unload-Events.patch
rename to patches/api/Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/unapplied/api/Player-Entity-Tracking-Events.patch b/patches/api/Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/unapplied/api/Player-Entity-Tracking-Events.patch
rename to patches/api/Player-Entity-Tracking-Events.patch
diff --git a/patches/unapplied/api/Player-Tab-List-and-Title-APIs.patch b/patches/api/Player-Tab-List-and-Title-APIs.patch
similarity index 100%
rename from patches/unapplied/api/Player-Tab-List-and-Title-APIs.patch
rename to patches/api/Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/unapplied/api/Player-affects-spawning-API.patch b/patches/api/Player-affects-spawning-API.patch
similarity index 100%
rename from patches/unapplied/api/Player-affects-spawning-API.patch
rename to patches/api/Player-affects-spawning-API.patch
diff --git a/patches/unapplied/api/Player-elytra-boost-API.patch b/patches/api/Player-elytra-boost-API.patch
similarity index 100%
rename from patches/unapplied/api/Player-elytra-boost-API.patch
rename to patches/api/Player-elytra-boost-API.patch
diff --git a/patches/unapplied/api/Player.setPlayerProfile-API.patch b/patches/api/Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/unapplied/api/Player.setPlayerProfile-API.patch
rename to patches/api/Player.setPlayerProfile-API.patch
diff --git a/patches/unapplied/api/PlayerAdvancementCriterionGrantEvent.patch b/patches/api/PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/unapplied/api/PlayerAdvancementCriterionGrantEvent.patch
rename to patches/api/PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/unapplied/api/PlayerAttemptPickupItemEvent.patch b/patches/api/PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/unapplied/api/PlayerAttemptPickupItemEvent.patch
rename to patches/api/PlayerAttemptPickupItemEvent.patch
diff --git a/patches/unapplied/api/PlayerDeathEvent-getItemsToKeep.patch b/patches/api/PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/unapplied/api/PlayerDeathEvent-getItemsToKeep.patch
rename to patches/api/PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/unapplied/api/PlayerDeathEvent-shouldDropExperience.patch b/patches/api/PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/unapplied/api/PlayerDeathEvent-shouldDropExperience.patch
rename to patches/api/PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/unapplied/api/PlayerElytraBoostEvent.patch b/patches/api/PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/unapplied/api/PlayerElytraBoostEvent.patch
rename to patches/api/PlayerElytraBoostEvent.patch
diff --git a/patches/unapplied/api/PlayerLaunchProjectileEvent.patch b/patches/api/PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/unapplied/api/PlayerLaunchProjectileEvent.patch
rename to patches/api/PlayerLaunchProjectileEvent.patch
diff --git a/patches/unapplied/api/PlayerMoveEvent-Improvements.patch b/patches/api/PlayerMoveEvent-Improvements.patch
similarity index 100%
rename from patches/unapplied/api/PlayerMoveEvent-Improvements.patch
rename to patches/api/PlayerMoveEvent-Improvements.patch
diff --git a/patches/unapplied/api/PlayerNaturallySpawnCreaturesEvent.patch b/patches/api/PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from patches/unapplied/api/PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/api/PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/unapplied/api/PlayerPickupExperienceEvent.patch b/patches/api/PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/unapplied/api/PlayerPickupExperienceEvent.patch
rename to patches/api/PlayerPickupExperienceEvent.patch
diff --git a/patches/unapplied/api/PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/api/PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/unapplied/api/PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/api/PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/unapplied/api/PlayerReadyArrowEvent.patch b/patches/api/PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/unapplied/api/PlayerReadyArrowEvent.patch
rename to patches/api/PlayerReadyArrowEvent.patch
diff --git a/patches/unapplied/api/PlayerTeleportEndGatewayEvent.patch b/patches/api/PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/unapplied/api/PlayerTeleportEndGatewayEvent.patch
rename to patches/api/PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/unapplied/api/Potential-bed-API.patch b/patches/api/Potential-bed-API.patch
similarity index 100%
rename from patches/unapplied/api/Potential-bed-API.patch
rename to patches/api/Potential-bed-API.patch
diff --git a/patches/unapplied/api/PotionEffect-clone-methods.patch b/patches/api/PotionEffect-clone-methods.patch
similarity index 100%
rename from patches/unapplied/api/PotionEffect-clone-methods.patch
rename to patches/api/PotionEffect-clone-methods.patch
diff --git a/patches/unapplied/api/PreCreatureSpawnEvent.patch b/patches/api/PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/unapplied/api/PreCreatureSpawnEvent.patch
rename to patches/api/PreCreatureSpawnEvent.patch
diff --git a/patches/unapplied/api/PreSpawnerSpawnEvent.patch b/patches/api/PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/unapplied/api/PreSpawnerSpawnEvent.patch
rename to patches/api/PreSpawnerSpawnEvent.patch
diff --git a/patches/unapplied/api/Profile-Lookup-Events.patch b/patches/api/Profile-Lookup-Events.patch
similarity index 100%
rename from patches/unapplied/api/Profile-Lookup-Events.patch
rename to patches/api/Profile-Lookup-Events.patch
diff --git a/patches/unapplied/api/ProfileWhitelistVerifyEvent.patch b/patches/api/ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from patches/unapplied/api/ProfileWhitelistVerifyEvent.patch
rename to patches/api/ProfileWhitelistVerifyEvent.patch
diff --git a/patches/unapplied/api/Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/Provide-Chunk-Coordinates-as-a-Long-API.patch
similarity index 100%
rename from patches/unapplied/api/Provide-Chunk-Coordinates-as-a-Long-API.patch
rename to patches/api/Provide-Chunk-Coordinates-as-a-Long-API.patch
diff --git a/patches/unapplied/api/Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from patches/unapplied/api/Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/api/Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/unapplied/api/RangedEntity-API.patch b/patches/api/RangedEntity-API.patch
similarity index 100%
rename from patches/unapplied/api/RangedEntity-API.patch
rename to patches/api/RangedEntity-API.patch
diff --git a/patches/unapplied/api/Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/api/Reduce-thread-synchronization-in-MetadataStoreBase.patch
similarity index 100%
rename from patches/unapplied/api/Reduce-thread-synchronization-in-MetadataStoreBase.patch
rename to patches/api/Reduce-thread-synchronization-in-MetadataStoreBase.patch
diff --git a/patches/unapplied/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
similarity index 100%
rename from patches/unapplied/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
rename to patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/unapplied/api/Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/unapplied/api/Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/api/Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/unapplied/api/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/unapplied/api/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/api/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/unapplied/api/Server-Tick-Events.patch b/patches/api/Server-Tick-Events.patch
similarity index 100%
rename from patches/unapplied/api/Server-Tick-Events.patch
rename to patches/api/Server-Tick-Events.patch
diff --git a/patches/unapplied/api/Shoulder-Entities-Release-API.patch b/patches/api/Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/unapplied/api/Shoulder-Entities-Release-API.patch
rename to patches/api/Shoulder-Entities-Release-API.patch
diff --git a/patches/unapplied/api/SkeletonHorse-Additions.patch b/patches/api/SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/unapplied/api/SkeletonHorse-Additions.patch
rename to patches/api/SkeletonHorse-Additions.patch
diff --git a/patches/unapplied/api/Slime-Pathfinder-Events.patch b/patches/api/Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/unapplied/api/Slime-Pathfinder-Events.patch
rename to patches/api/Slime-Pathfinder-Events.patch
diff --git a/patches/unapplied/api/Spawn-Reason-API.patch b/patches/api/Spawn-Reason-API.patch
similarity index 100%
rename from patches/unapplied/api/Spawn-Reason-API.patch
rename to patches/api/Spawn-Reason-API.patch
diff --git a/patches/unapplied/api/Stinger-API.patch b/patches/api/Stinger-API.patch
similarity index 100%
rename from patches/unapplied/api/Stinger-API.patch
rename to patches/api/Stinger-API.patch
diff --git a/patches/unapplied/api/Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 100%
rename from patches/unapplied/api/Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to patches/api/Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/unapplied/api/Support-components-in-ItemMeta.patch b/patches/api/Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/unapplied/api/Support-components-in-ItemMeta.patch
rename to patches/api/Support-components-in-ItemMeta.patch
diff --git a/patches/unapplied/api/Support-hex-colors-in-getLastColors.patch b/patches/api/Support-hex-colors-in-getLastColors.patch
similarity index 100%
rename from patches/unapplied/api/Support-hex-colors-in-getLastColors.patch
rename to patches/api/Support-hex-colors-in-getLastColors.patch
diff --git a/patches/unapplied/api/System-prop-for-default-config-comment-parsing.patch b/patches/api/System-prop-for-default-config-comment-parsing.patch
similarity index 100%
rename from patches/unapplied/api/System-prop-for-default-config-comment-parsing.patch
rename to patches/api/System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/unapplied/api/Tameable-getOwnerUniqueId-API.patch b/patches/api/Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/unapplied/api/Tameable-getOwnerUniqueId-API.patch
rename to patches/api/Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/unapplied/api/Test-changes.patch b/patches/api/Test-changes.patch
similarity index 100%
rename from patches/unapplied/api/Test-changes.patch
rename to patches/api/Test-changes.patch
diff --git a/patches/unapplied/api/Timings-v2.patch b/patches/api/Timings-v2.patch
similarity index 100%
rename from patches/unapplied/api/Timings-v2.patch
rename to patches/api/Timings-v2.patch
diff --git a/patches/unapplied/api/Turtle-API.patch b/patches/api/Turtle-API.patch
similarity index 100%
rename from patches/unapplied/api/Turtle-API.patch
rename to patches/api/Turtle-API.patch
diff --git a/patches/unapplied/api/Use-ASM-for-event-executors.patch b/patches/api/Use-ASM-for-event-executors.patch
similarity index 100%
rename from patches/unapplied/api/Use-ASM-for-event-executors.patch
rename to patches/api/Use-ASM-for-event-executors.patch
diff --git a/patches/unapplied/api/Version-Command-2.0.patch b/patches/api/Version-Command-2.0.patch
similarity index 100%
rename from patches/unapplied/api/Version-Command-2.0.patch
rename to patches/api/Version-Command-2.0.patch
diff --git a/patches/unapplied/api/Villager-Restocks-API.patch b/patches/api/Villager-Restocks-API.patch
similarity index 100%
rename from patches/unapplied/api/Villager-Restocks-API.patch
rename to patches/api/Villager-Restocks-API.patch
diff --git a/patches/unapplied/api/Villager-resetOffers.patch b/patches/api/Villager-resetOffers.patch
similarity index 100%
rename from patches/unapplied/api/Villager-resetOffers.patch
rename to patches/api/Villager-resetOffers.patch
diff --git a/patches/unapplied/api/Warn-on-strange-EventHandler-return-types.patch b/patches/api/Warn-on-strange-EventHandler-return-types.patch
similarity index 100%
rename from patches/unapplied/api/Warn-on-strange-EventHandler-return-types.patch
rename to patches/api/Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/unapplied/api/Win-Screen-API.patch b/patches/api/Win-Screen-API.patch
similarity index 100%
rename from patches/unapplied/api/Win-Screen-API.patch
rename to patches/api/Win-Screen-API.patch
diff --git a/patches/unapplied/api/WitchConsumePotionEvent.patch b/patches/api/WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/unapplied/api/WitchConsumePotionEvent.patch
rename to patches/api/WitchConsumePotionEvent.patch
diff --git a/patches/unapplied/api/WitchReadyPotionEvent.patch b/patches/api/WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/unapplied/api/WitchReadyPotionEvent.patch
rename to patches/api/WitchReadyPotionEvent.patch
diff --git a/patches/unapplied/api/WitchThrowPotionEvent.patch b/patches/api/WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/unapplied/api/WitchThrowPotionEvent.patch
rename to patches/api/WitchThrowPotionEvent.patch
diff --git a/patches/unapplied/api/WorldCreator-keepSpawnLoaded.patch b/patches/api/WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/unapplied/api/WorldCreator-keepSpawnLoaded.patch
rename to patches/api/WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/unapplied/api/Zombie-API-breaking-doors.patch b/patches/api/Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/unapplied/api/Zombie-API-breaking-doors.patch
rename to patches/api/Zombie-API-breaking-doors.patch
diff --git a/patches/unapplied/api/add-DragonEggFormEvent.patch b/patches/api/add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/unapplied/api/add-DragonEggFormEvent.patch
rename to patches/api/add-DragonEggFormEvent.patch
diff --git a/patches/unapplied/api/add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/unapplied/api/add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/api/add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/unapplied/api/add-back-EntityPortalExitEvent.patch b/patches/api/add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/unapplied/api/add-back-EntityPortalExitEvent.patch
rename to patches/api/add-back-EntityPortalExitEvent.patch
diff --git a/patches/unapplied/api/add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/unapplied/api/add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/api/add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/unapplied/api/add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/unapplied/api/add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/api/add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/unapplied/api/add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/unapplied/api/add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/api/add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/unapplied/api/add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/unapplied/api/add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/api/add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/unapplied/api/added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/added-2-new-TargetReasons-for-1.16-mob-behavior.patch
similarity index 100%
rename from patches/unapplied/api/added-2-new-TargetReasons-for-1.16-mob-behavior.patch
rename to patches/api/added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/unapplied/api/added-PlayerNameEntityEvent.patch b/patches/api/added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/unapplied/api/added-PlayerNameEntityEvent.patch
rename to patches/api/added-PlayerNameEntityEvent.patch
diff --git a/patches/unapplied/api/additions-to-PlayerGameModeChangeEvent.patch b/patches/api/additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/unapplied/api/additions-to-PlayerGameModeChangeEvent.patch
rename to patches/api/additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/unapplied/api/ensureServerConversions-API.patch b/patches/api/ensureServerConversions-API.patch
similarity index 100%
rename from patches/unapplied/api/ensureServerConversions-API.patch
rename to patches/api/ensureServerConversions-API.patch
diff --git a/patches/unapplied/api/fix-Instruments.patch b/patches/api/fix-Instruments.patch
similarity index 100%
rename from patches/unapplied/api/fix-Instruments.patch
rename to patches/api/fix-Instruments.patch
diff --git a/patches/unapplied/api/fix-empty-array-elements-in-command-arguments.patch b/patches/api/fix-empty-array-elements-in-command-arguments.patch
similarity index 100%
rename from patches/unapplied/api/fix-empty-array-elements-in-command-arguments.patch
rename to patches/api/fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/unapplied/api/getPlayerUniqueId-API.patch b/patches/api/getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/unapplied/api/getPlayerUniqueId-API.patch
rename to patches/api/getPlayerUniqueId-API.patch
diff --git a/patches/unapplied/api/isChunkGenerated-API.patch b/patches/api/isChunkGenerated-API.patch
similarity index 100%
rename from patches/unapplied/api/isChunkGenerated-API.patch
rename to patches/api/isChunkGenerated-API.patch
diff --git a/patches/unapplied/api/living-entity-allow-attribute-registration.patch b/patches/api/living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/unapplied/api/living-entity-allow-attribute-registration.patch
rename to patches/api/living-entity-allow-attribute-registration.patch
diff --git a/patches/unapplied/api/Added-missing-vanilla-tags.patch b/patches/unapplied/api/Added-missing-vanilla-tags.patch
deleted file mode 100644
index 232221f2e8..0000000000
--- a/patches/unapplied/api/Added-missing-vanilla-tags.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 20:03:40 -0800
-Subject: [PATCH] Added missing vanilla tags
-
-
-diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/Tag.java
-+++ b/src/main/java/org/bukkit/Tag.java
-@@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed {
-      * Vanilla item tag representing all chest boat items.
-      */
-     Tag<Material> ITEMS_CHEST_BOATS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("chest_boats"), Material.class);
-+    // Paper start
-+    /**
-+     * Vanilla item tag representing all non-flammable wood items.
-+     */
-+    Tag<Material> ITEMS_NON_FLAMMABLE_WOOD = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("non_flammable_wood"), Material.class);
-+    // Paper end
-     /**
-      * Vanilla item tag representing all fish items.
-      */
-@@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed {
-      * Vanilla tag representing entities which can be eaten by frogs.
-      */
-     Tag<EntityType> ENTITY_TYPES_FROG_FOOD = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("frog_food"), EntityType.class);
-+    // Paper start
-+    /**
-+     * Key for the built-in entity registry
-+     * @deprecated use {@link #REGISTRY_ENTITY_TYPES}
-+     */
-+    @Deprecated(forRemoval = true)
-+    String REGISTRY_ENTITIES = REGISTRY_ENTITY_TYPES;
-+    /**
-+     * Vanilla entity tag representing arrow entities.
-+     * @deprecated use {@link #ENTITY_TYPES_ARROWS}
-+     */
-+    @Deprecated(forRemoval = true)
-+    Tag<EntityType> ARROWS = ENTITY_TYPES_ARROWS;
-+    /**
-+     * Vanilla entity tag representing entities that live in beehives
-+     * @deprecated use {@link #ENTITY_TYPES_BEEHIVE_INHABITORS}
-+     */
-+    @Deprecated(forRemoval = true)
-+    Tag<EntityType> BEEHIVE_INHABITORS = ENTITY_TYPES_BEEHIVE_INHABITORS;
-+    /**
-+     * Vanilla entity tag representing projectiles that impact
-+     * @deprecated use {@link #ENTITY_TYPES_IMPACT_PROJECTILES}
-+     */
-+    @Deprecated(forRemoval = true)
-+    Tag<EntityType> IMPACT_PROJECTILES = ENTITY_TYPES_IMPACT_PROJECTILES;
-+    /**
-+     * Vanilla entity tag for village raiders
-+     * @deprecated use {@link #ENTITY_TYPES_RAIDERS}
-+     */
-+    @Deprecated(forRemoval = true)
-+    Tag<EntityType> RAIDERS = ENTITY_TYPES_RAIDERS;
-+    /**
-+     * Vanilla entity tag for skeleton types
-+     * @deprecated use {@link #ENTITY_TYPES_SKELETONS}
-+     */
-+    @Deprecated(forRemoval = true)
-+    Tag<EntityType> SKELETONS = ENTITY_TYPES_SKELETONS;
-+    // Paper end
- 
-     /**
-      * Returns whether or not this tag has an entry for the specified item.