From 95952b3056f4929af5c73964a46e0c1df47d9a7c Mon Sep 17 00:00:00 2001 From: granny Date: Wed, 28 May 2025 19:53:01 -0700 Subject: [PATCH] api patches \o/ --- gradle.properties | 6 +++--- .../0001-Rebrand.patch | 0 .../0002-Purpur-config-files.patch | 0 .../paper/entity/ai/VanillaGoal.java.patch | 0 .../aikar/timings/TimedEventExecutor.java.patch | 0 .../main/java/co/aikar/timings/Timing.java.patch | 0 .../java/co/aikar/timings/Timings.java.patch | 0 .../co/aikar/timings/TimingsCommand.java.patch | 0 .../paper/util/VersionFetcher.java.patch | 0 .../src/main/java/org/bukkit/Bukkit.java.patch | 0 .../main/java/org/bukkit/ChatColor.java.patch | 0 .../src/main/java/org/bukkit/Material.java.patch | 0 .../java/org/bukkit/OfflinePlayer.java.patch | 0 .../src/main/java/org/bukkit/Server.java.patch | 0 .../src/main/java/org/bukkit/World.java.patch | 0 .../bukkit/block/EntityBlockStorage.java.patch | 0 .../bukkit/command/SimpleCommandMap.java.patch | 0 .../command/defaults/VersionCommand.java.patch | 0 .../enchantments/EnchantmentTarget.java.patch | 0 .../java/org/bukkit/entity/Endermite.java.patch | 0 .../java/org/bukkit/entity/Entity.java.patch | 0 .../java/org/bukkit/entity/IronGolem.java.patch | 0 .../main/java/org/bukkit/entity/Item.java.patch | 0 .../org/bukkit/entity/LivingEntity.java.patch | 0 .../main/java/org/bukkit/entity/Llama.java.patch | 0 .../java/org/bukkit/entity/Player.java.patch | 0 .../java/org/bukkit/entity/Snowman.java.patch | 0 .../java/org/bukkit/entity/Villager.java.patch | 0 .../java/org/bukkit/entity/Wither.java.patch | 0 .../main/java/org/bukkit/entity/Wolf.java.patch | 0 .../event/entity/EntityDamageEvent.java.patch | 0 .../entity/EntityPotionEffectEvent.java.patch | 0 .../event/inventory/InventoryType.java.patch | 0 .../bukkit/inventory/AnvilInventory.java.patch | 0 .../org/bukkit/inventory/ItemStack.java.patch | 0 .../org/bukkit/inventory/RecipeChoice.java.patch | 0 .../bukkit/inventory/view/AnvilView.java.patch | 0 .../java/org/bukkit/map/MapRenderer.java.patch | 0 .../permissions/PermissibleBase.java.patch | 0 .../plugin/java/JavaPluginLoader.java.patch | 0 .../bukkit/plugin/java/LibraryLoader.java.patch | 0 .../permissions/CommandPermissions.java.patch | 0 .../permissions/DefaultPermissions.java.patch | 0 .../org/spigotmc/CustomTimingsHandler.java.patch | 0 purpur-server/build.gradle.kts.patch | 16 +++++++++------- 45 files changed, 12 insertions(+), 10 deletions(-) rename purpur-api/paper-patches/{unapplied-features => features}/0001-Rebrand.patch (100%) rename purpur-api/paper-patches/{unapplied-features => features}/0002-Purpur-config-files.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/co/aikar/timings/TimedEventExecutor.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/co/aikar/timings/Timing.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/co/aikar/timings/Timings.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/co/aikar/timings/TimingsCommand.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/Bukkit.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/ChatColor.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/Material.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/OfflinePlayer.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/Server.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/World.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/block/EntityBlockStorage.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/command/SimpleCommandMap.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/Endermite.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/Entity.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/IronGolem.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/Item.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/LivingEntity.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/Llama.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/Player.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/Snowman.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/Villager.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/Wither.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/entity/Wolf.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/event/inventory/InventoryType.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/inventory/AnvilInventory.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/inventory/ItemStack.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/inventory/RecipeChoice.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/inventory/view/AnvilView.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/map/MapRenderer.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/permissions/PermissibleBase.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/util/permissions/CommandPermissions.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java.patch (100%) rename purpur-api/paper-patches/{unapplied-files => files}/src/main/java/org/spigotmc/CustomTimingsHandler.java.patch (100%) diff --git a/gradle.properties b/gradle.properties index b1bdc18d1..87538ed74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group = org.purpurmc.purpur -version = 1.21.5-R0.1-SNAPSHOT +version = 1.21.6-R0.1-SNAPSHOT -mcVersion = 1.21.5 -paperCommit = 47650100837178e2852bdb50d8c9c6f0cc0bb2e0 +mcVersion = 1.21.6-pre1 +paperCommit = 0795cbed2563d0ba693a8eec8754cffa62b52756 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-api/paper-patches/unapplied-features/0001-Rebrand.patch b/purpur-api/paper-patches/features/0001-Rebrand.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-features/0001-Rebrand.patch rename to purpur-api/paper-patches/features/0001-Rebrand.patch diff --git a/purpur-api/paper-patches/unapplied-features/0002-Purpur-config-files.patch b/purpur-api/paper-patches/features/0002-Purpur-config-files.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-features/0002-Purpur-config-files.patch rename to purpur-api/paper-patches/features/0002-Purpur-config-files.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch b/purpur-api/paper-patches/files/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch rename to purpur-api/paper-patches/files/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/co/aikar/timings/TimedEventExecutor.java.patch b/purpur-api/paper-patches/files/src/main/java/co/aikar/timings/TimedEventExecutor.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/co/aikar/timings/TimedEventExecutor.java.patch rename to purpur-api/paper-patches/files/src/main/java/co/aikar/timings/TimedEventExecutor.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/co/aikar/timings/Timing.java.patch b/purpur-api/paper-patches/files/src/main/java/co/aikar/timings/Timing.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/co/aikar/timings/Timing.java.patch rename to purpur-api/paper-patches/files/src/main/java/co/aikar/timings/Timing.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/co/aikar/timings/Timings.java.patch b/purpur-api/paper-patches/files/src/main/java/co/aikar/timings/Timings.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/co/aikar/timings/Timings.java.patch rename to purpur-api/paper-patches/files/src/main/java/co/aikar/timings/Timings.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/co/aikar/timings/TimingsCommand.java.patch b/purpur-api/paper-patches/files/src/main/java/co/aikar/timings/TimingsCommand.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/co/aikar/timings/TimingsCommand.java.patch rename to purpur-api/paper-patches/files/src/main/java/co/aikar/timings/TimingsCommand.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch b/purpur-api/paper-patches/files/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch rename to purpur-api/paper-patches/files/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/Bukkit.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/Bukkit.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/ChatColor.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/ChatColor.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/ChatColor.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/ChatColor.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/Material.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/Material.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/OfflinePlayer.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/OfflinePlayer.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/OfflinePlayer.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/OfflinePlayer.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/Server.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/Server.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/World.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/World.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/block/EntityBlockStorage.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/block/EntityBlockStorage.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/block/EntityBlockStorage.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/block/EntityBlockStorage.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/command/SimpleCommandMap.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/command/SimpleCommandMap.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/command/SimpleCommandMap.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/command/SimpleCommandMap.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Endermite.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Endermite.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Endermite.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Endermite.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Entity.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Entity.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/IronGolem.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/IronGolem.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/IronGolem.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/IronGolem.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Item.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Item.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Item.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Item.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/LivingEntity.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/LivingEntity.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/LivingEntity.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/LivingEntity.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Llama.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Llama.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Llama.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Llama.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Player.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Player.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Snowman.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Snowman.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Snowman.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Snowman.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Villager.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Villager.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Wither.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wither.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Wither.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wither.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Wolf.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/entity/Wolf.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/event/inventory/InventoryType.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/event/inventory/InventoryType.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/event/inventory/InventoryType.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/event/inventory/InventoryType.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/inventory/AnvilInventory.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/AnvilInventory.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/inventory/AnvilInventory.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/AnvilInventory.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/inventory/ItemStack.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/inventory/ItemStack.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/inventory/RecipeChoice.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/RecipeChoice.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/inventory/RecipeChoice.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/RecipeChoice.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/inventory/view/AnvilView.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/view/AnvilView.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/inventory/view/AnvilView.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/view/AnvilView.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/map/MapRenderer.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/map/MapRenderer.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/map/MapRenderer.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/map/MapRenderer.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/permissions/PermissibleBase.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/permissions/PermissibleBase.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/permissions/PermissibleBase.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/permissions/PermissibleBase.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/util/permissions/CommandPermissions.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/util/permissions/CommandPermissions.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/util/permissions/CommandPermissions.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/util/permissions/CommandPermissions.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java.patch diff --git a/purpur-api/paper-patches/unapplied-files/src/main/java/org/spigotmc/CustomTimingsHandler.java.patch b/purpur-api/paper-patches/files/src/main/java/org/spigotmc/CustomTimingsHandler.java.patch similarity index 100% rename from purpur-api/paper-patches/unapplied-files/src/main/java/org/spigotmc/CustomTimingsHandler.java.patch rename to purpur-api/paper-patches/files/src/main/java/org/spigotmc/CustomTimingsHandler.java.patch diff --git a/purpur-server/build.gradle.kts.patch b/purpur-server/build.gradle.kts.patch index 6e782f80d..2dfb47467 100644 --- a/purpur-server/build.gradle.kts.patch +++ b/purpur-server/build.gradle.kts.patch @@ -11,7 +11,7 @@ plugins { `java-library` -@@ -20,6 +_,46 @@ +@@ -20,13 +_,65 @@ testRuntimeOnly("org.junit.platform:junit-platform-launcher") } @@ -58,10 +58,13 @@ paperweight { minecraftVersion = providers.gradleProperty("mcVersion") gitFilePatches = false -@@ -28,6 +_,18 @@ - // oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365" - //} +- updatingMinecraft { +- oldPaperCommit = "a033e3b9ef78cfe85be807ac3fd1dd956274d4db" ++ //updatingMinecraft { ++ // oldPaperCommit = "a033e3b9ef78cfe85be807ac3fd1dd956274d4db" ++ //} ++ + // Purpur start - Rebrand + val purpur = forks.register("purpur") { + upstream.patchDir("paperServer") { @@ -70,13 +73,12 @@ + patchesDir = rootDirectory.dir("purpur-server/paper-patches") + outputDir = rootDirectory.dir("paper-server") + } -+ } + } + activeFork = purpur + // Purpur end - Rebrand -+ + spigot { buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc" - packageVersion = "v1_21_R4" // also needs to be updated in MappingEnvironment @@ -108,7 +_,21 @@ } }