diff --git a/patches/api/0002-Add-pufferfish-added-classes-to-junit-exemptions.patch b/patches/api/0002-Add-pufferfish-added-classes-to-junit-exemptions.patch new file mode 100644 index 000000000..5b3f8e57d --- /dev/null +++ b/patches/api/0002-Add-pufferfish-added-classes-to-junit-exemptions.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath +Date: Tue, 4 Jan 2022 23:05:41 -0600 +Subject: [PATCH] Add pufferfish added classes to junit exemptions + + +diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java +index bbe81f7a420f913ffdcad913a3c43ff41ead41f5..49de298146814fdf238929e10270ac6717dd73bd 100644 +--- a/src/test/java/org/bukkit/AnnotationTest.java ++++ b/src/test/java/org/bukkit/AnnotationTest.java +@@ -47,6 +47,10 @@ public class AnnotationTest { + "org/bukkit/plugin/java/PluginClassLoader", + // Generic functional interface + "org/bukkit/util/Consumer", ++ // Purpur start ++ "gg/pufferfish/pufferfish/sentry/SentryContext", ++ "gg/pufferfish/pufferfish/sentry/SentryContext$State", ++ // Purpur end + // Paper start + "io/papermc/paper/util/TransformingRandomAccessList", + "io/papermc/paper/util/TransformingRandomAccessList$TransformedListIterator", diff --git a/patches/api/0002-Build-System-Changes.patch b/patches/api/0003-Build-System-Changes.patch similarity index 100% rename from patches/api/0002-Build-System-Changes.patch rename to patches/api/0003-Build-System-Changes.patch diff --git a/patches/api/0003-Purpur-config-files.patch b/patches/api/0004-Purpur-config-files.patch similarity index 100% rename from patches/api/0003-Purpur-config-files.patch rename to patches/api/0004-Purpur-config-files.patch diff --git a/patches/api/0004-Purpur-client-support.patch b/patches/api/0005-Purpur-client-support.patch similarity index 100% rename from patches/api/0004-Purpur-client-support.patch rename to patches/api/0005-Purpur-client-support.patch diff --git a/patches/api/0005-Default-permissions.patch b/patches/api/0006-Default-permissions.patch similarity index 100% rename from patches/api/0005-Default-permissions.patch rename to patches/api/0006-Default-permissions.patch diff --git a/patches/api/0006-Ridables.patch b/patches/api/0007-Ridables.patch similarity index 100% rename from patches/api/0006-Ridables.patch rename to patches/api/0007-Ridables.patch diff --git a/patches/api/0007-Allow-inventory-resizing.patch b/patches/api/0008-Allow-inventory-resizing.patch similarity index 100% rename from patches/api/0007-Allow-inventory-resizing.patch rename to patches/api/0008-Allow-inventory-resizing.patch diff --git a/patches/api/0008-Llama-API.patch b/patches/api/0009-Llama-API.patch similarity index 100% rename from patches/api/0008-Llama-API.patch rename to patches/api/0009-Llama-API.patch diff --git a/patches/api/0009-AFK-API.patch b/patches/api/0010-AFK-API.patch similarity index 100% rename from patches/api/0009-AFK-API.patch rename to patches/api/0010-AFK-API.patch diff --git a/patches/api/0010-Bring-back-server-name.patch b/patches/api/0011-Bring-back-server-name.patch similarity index 100% rename from patches/api/0010-Bring-back-server-name.patch rename to patches/api/0011-Bring-back-server-name.patch diff --git a/patches/api/0011-ExecuteCommandEvent.patch b/patches/api/0012-ExecuteCommandEvent.patch similarity index 100% rename from patches/api/0011-ExecuteCommandEvent.patch rename to patches/api/0012-ExecuteCommandEvent.patch diff --git a/patches/api/0012-LivingEntity-safeFallDistance.patch b/patches/api/0013-LivingEntity-safeFallDistance.patch similarity index 100% rename from patches/api/0012-LivingEntity-safeFallDistance.patch rename to patches/api/0013-LivingEntity-safeFallDistance.patch diff --git a/patches/api/0013-Lagging-threshold.patch b/patches/api/0014-Lagging-threshold.patch similarity index 100% rename from patches/api/0013-Lagging-threshold.patch rename to patches/api/0014-Lagging-threshold.patch diff --git a/patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 100% rename from patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch diff --git a/patches/api/0015-EMC-MonsterEggSpawnEvent.patch b/patches/api/0016-EMC-MonsterEggSpawnEvent.patch similarity index 100% rename from patches/api/0015-EMC-MonsterEggSpawnEvent.patch rename to patches/api/0016-EMC-MonsterEggSpawnEvent.patch diff --git a/patches/api/0016-Player-invulnerabilities.patch b/patches/api/0017-Player-invulnerabilities.patch similarity index 100% rename from patches/api/0016-Player-invulnerabilities.patch rename to patches/api/0017-Player-invulnerabilities.patch diff --git a/patches/api/0017-Anvil-API.patch b/patches/api/0018-Anvil-API.patch similarity index 100% rename from patches/api/0017-Anvil-API.patch rename to patches/api/0018-Anvil-API.patch diff --git a/patches/api/0018-ItemStack-convenience-methods.patch b/patches/api/0019-ItemStack-convenience-methods.patch similarity index 100% rename from patches/api/0018-ItemStack-convenience-methods.patch rename to patches/api/0019-ItemStack-convenience-methods.patch diff --git a/patches/api/0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0020-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from patches/api/0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/api/0020-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/patches/api/0020-ChatColor-conveniences.patch b/patches/api/0021-ChatColor-conveniences.patch similarity index 100% rename from patches/api/0020-ChatColor-conveniences.patch rename to patches/api/0021-ChatColor-conveniences.patch diff --git a/patches/api/0021-LivingEntity-broadcastItemBreak.patch b/patches/api/0022-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/api/0021-LivingEntity-broadcastItemBreak.patch rename to patches/api/0022-LivingEntity-broadcastItemBreak.patch diff --git a/patches/api/0022-Item-entity-immunities.patch b/patches/api/0023-Item-entity-immunities.patch similarity index 100% rename from patches/api/0022-Item-entity-immunities.patch rename to patches/api/0023-Item-entity-immunities.patch diff --git a/patches/api/0023-Spigot-Improve-output-of-plugins-command.patch b/patches/api/0024-Spigot-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/api/0023-Spigot-Improve-output-of-plugins-command.patch rename to patches/api/0024-Spigot-Improve-output-of-plugins-command.patch diff --git a/patches/api/0024-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/api/0025-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/api/0024-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/api/0025-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/api/0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0026-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/api/0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/api/0026-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/api/0026-Alphabetize-in-game-plugins-list.patch b/patches/api/0027-Alphabetize-in-game-plugins-list.patch similarity index 100% rename from patches/api/0026-Alphabetize-in-game-plugins-list.patch rename to patches/api/0027-Alphabetize-in-game-plugins-list.patch diff --git a/patches/api/0027-Rabid-Wolf-API.patch b/patches/api/0028-Rabid-Wolf-API.patch similarity index 100% rename from patches/api/0027-Rabid-Wolf-API.patch rename to patches/api/0028-Rabid-Wolf-API.patch diff --git a/patches/api/0028-PlayerBookTooLargeEvent.patch b/patches/api/0029-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/api/0028-PlayerBookTooLargeEvent.patch rename to patches/api/0029-PlayerBookTooLargeEvent.patch diff --git a/patches/api/0029-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0030-Full-netherite-armor-grants-fire-resistance.patch similarity index 100% rename from patches/api/0029-Full-netherite-armor-grants-fire-resistance.patch rename to patches/api/0030-Full-netherite-armor-grants-fire-resistance.patch diff --git a/patches/api/0030-Add-EntityTeleportHinderedEvent.patch b/patches/api/0031-Add-EntityTeleportHinderedEvent.patch similarity index 100% rename from patches/api/0030-Add-EntityTeleportHinderedEvent.patch rename to patches/api/0031-Add-EntityTeleportHinderedEvent.patch diff --git a/patches/api/0031-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0032-Add-enchantment-target-for-bows-and-crossbows.patch similarity index 100% rename from patches/api/0031-Add-enchantment-target-for-bows-and-crossbows.patch rename to patches/api/0032-Add-enchantment-target-for-bows-and-crossbows.patch diff --git a/patches/api/0032-Iron-golem-poppy-calms-anger.patch b/patches/api/0033-Iron-golem-poppy-calms-anger.patch similarity index 100% rename from patches/api/0032-Iron-golem-poppy-calms-anger.patch rename to patches/api/0033-Iron-golem-poppy-calms-anger.patch diff --git a/patches/api/0033-API-for-any-mob-to-burn-daylight.patch b/patches/api/0034-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/api/0033-API-for-any-mob-to-burn-daylight.patch rename to patches/api/0034-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/api/0034-Flying-Fall-Damage-API.patch b/patches/api/0035-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/api/0034-Flying-Fall-Damage-API.patch rename to patches/api/0035-Flying-Fall-Damage-API.patch diff --git a/patches/api/0035-Add-back-player-spawned-endermite-API.patch b/patches/api/0036-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/api/0035-Add-back-player-spawned-endermite-API.patch rename to patches/api/0036-Add-back-player-spawned-endermite-API.patch diff --git a/patches/api/0036-Fix-default-permission-system.patch b/patches/api/0037-Fix-default-permission-system.patch similarity index 100% rename from patches/api/0036-Fix-default-permission-system.patch rename to patches/api/0037-Fix-default-permission-system.patch diff --git a/patches/api/0037-Summoner-API.patch b/patches/api/0038-Summoner-API.patch similarity index 100% rename from patches/api/0037-Summoner-API.patch rename to patches/api/0038-Summoner-API.patch diff --git a/patches/api/0038-Clean-up-version-command-output.patch b/patches/api/0039-Clean-up-version-command-output.patch similarity index 100% rename from patches/api/0038-Clean-up-version-command-output.patch rename to patches/api/0039-Clean-up-version-command-output.patch diff --git a/patches/api/0039-Extended-OfflinePlayer-API.patch b/patches/api/0040-Extended-OfflinePlayer-API.patch similarity index 100% rename from patches/api/0039-Extended-OfflinePlayer-API.patch rename to patches/api/0040-Extended-OfflinePlayer-API.patch diff --git a/patches/api/0040-Added-the-ability-to-add-combustible-items.patch b/patches/api/0041-Added-the-ability-to-add-combustible-items.patch similarity index 100% rename from patches/api/0040-Added-the-ability-to-add-combustible-items.patch rename to patches/api/0041-Added-the-ability-to-add-combustible-items.patch diff --git a/patches/api/0041-Potion-NamespacedKey.patch b/patches/api/0042-Potion-NamespacedKey.patch similarity index 100% rename from patches/api/0041-Potion-NamespacedKey.patch rename to patches/api/0042-Potion-NamespacedKey.patch diff --git a/patches/api/0042-Grindstone-API.patch b/patches/api/0043-Grindstone-API.patch similarity index 100% rename from patches/api/0042-Grindstone-API.patch rename to patches/api/0043-Grindstone-API.patch diff --git a/patches/api/0043-Shears-can-have-looting-enchantment.patch b/patches/api/0044-Shears-can-have-looting-enchantment.patch similarity index 100% rename from patches/api/0043-Shears-can-have-looting-enchantment.patch rename to patches/api/0044-Shears-can-have-looting-enchantment.patch diff --git a/patches/api/0044-Lobotomize-stuck-villagers.patch b/patches/api/0045-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/api/0044-Lobotomize-stuck-villagers.patch rename to patches/api/0045-Lobotomize-stuck-villagers.patch