diff --git a/README.md b/README.md index e769dba..de7820c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@

DivineMC

Fork of Purpur compatible with Spigot plugins, offering the best performance for your server.

-

⚠️ 1.20.6 update will be released soon
[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/DivineMC/DivineMC/build.yml?logo=GoogleAnalytics&logoColor=ffffff&style=for-the-badge)](https://github.com/DivineMC/DivineMC/actions) diff --git a/build.gradle.kts b/build.gradle.kts index 3216751..3caa1ac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,7 @@ import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG plugins { java `maven-publish` - id("com.github.johnrengelman.shadow") version "8.1.1" apply false - id("io.papermc.paperweight.patcher") version "1.5.15" + id("io.papermc.paperweight.patcher") version "1.6.3" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" @@ -29,7 +28,7 @@ subprojects { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(21)) } } } @@ -37,7 +36,7 @@ subprojects { subprojects { tasks.withType().configureEach { options.encoding = "UTF-8" - options.release.set(17) + options.release.set(21) } tasks.withType { diff --git a/gradle.properties b/gradle.properties index 3f66ac9..ba80716 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = space.bxteam.divinemc -version = 1.20.4-R0.1-SNAPSHOT -purpurRef = d3971ad0ae3a36eaeded6969b034f81eb1a13d25 +version = 1.20.6-R0.1-SNAPSHOT +purpurRef = f9258cd522c14caea3ade7480b01e7e146aa8661 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0001-Divine-Configuration.patch b/patches/api/0001-Divine-Configuration.patch index 7bad93f..4a10da9 100644 --- a/patches/api/0001-Divine-Configuration.patch +++ b/patches/api/0001-Divine-Configuration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Divine Configuration diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c15b0b05870a469ea5d314c9fac6a57a045f463c..95795f7d8ea1834e255857945a8172998d93ff34 100644 +index 320422ff95773efa01e8205edcc5c6c9a84d5ecd..ec743558a4901513c1e2266c1058f65dcfc29d1a 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2247,6 +2247,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2269,6 +2269,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Purpur end diff --git a/patches/api/0003-Optimize-Paper-Event-Manager.patch b/patches/api/0003-Optimize-Paper-Event-Manager.patch index eaa8697..d8e8e66 100644 --- a/patches/api/0003-Optimize-Paper-Event-Manager.patch +++ b/patches/api/0003-Optimize-Paper-Event-Manager.patch @@ -97,10 +97,10 @@ index 3b3d9642a8d63798dc28f2f8df77f0466451cbff..9c43c51858b20ace8e32eb2d7f5a2fba } diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 90953bfc81168068a281be4d2d3942d5e7dd69ff..685d0c86a14c7a562a881f725add0fc5ac725f3f 100644 +index 7e4f7cb2afbc145e532285c793573ad107bc3033..86279f35af76fbffe233e6aba64e1b5dc2aa69c3 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -@@ -323,4 +323,11 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm +@@ -318,4 +318,11 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm } // Paper end diff --git a/patches/to-fix/0039-Async-Pathfinding.patch b/patches/removed/0039-Async-Pathfinding.patch similarity index 100% rename from patches/to-fix/0039-Async-Pathfinding.patch rename to patches/removed/0039-Async-Pathfinding.patch diff --git a/patches/to-fix/0040-C2ME-opts-math.patch b/patches/removed/0040-C2ME-opts-math.patch similarity index 100% rename from patches/to-fix/0040-C2ME-opts-math.patch rename to patches/removed/0040-C2ME-opts-math.patch diff --git a/patches/to-fix/0044-vmp-spawn_density_cap.patch b/patches/removed/0044-vmp-spawn_density_cap.patch similarity index 100% rename from patches/to-fix/0044-vmp-spawn_density_cap.patch rename to patches/removed/0044-vmp-spawn_density_cap.patch diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch index fd1f25c..d4b3a63 100644 --- a/patches/server/0001-Divine-Branding.patch +++ b/patches/server/0001-Divine-Branding.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index 32366253c04c493135f2b22d1940f83669104723..eb9275ef95b0caaa04a28278ff08f3fc94a99063 100644 +index 81996f00384674b29368e8bea944bdd14d631da3..edaf8212bdd0024e1af6bace01d5ad2d12c36965 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating +@@ -13,7 +13,7 @@ val alsoShade: Configuration by configurations.creating dependencies { // Purpur start @@ -17,7 +17,7 @@ index 32366253c04c493135f2b22d1940f83669104723..eb9275ef95b0caaa04a28278ff08f3fc implementation("io.papermc.paper:paper-mojangapi:${project.version}") { exclude("io.papermc.paper", "paper-api") } -@@ -94,7 +94,7 @@ tasks.jar { +@@ -87,7 +87,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -154,7 +154,7 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..05478a1ea04ec0396bc8c97090edef4a .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java -index 7f07ffab0835d45d4d170fe171d7fa996d5913d9..fde3e7ef352474566e7259555a5f8ffb2272e98b 100644 +index 8f74c2ec5252b6265549589310d742337c91cb2c..1f4c965531393dd81246de487bc86f6d6f73b723 100644 --- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java +++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java @@ -56,7 +56,7 @@ public class MinecraftServerGui extends JComponent { @@ -185,10 +185,10 @@ index 7f07ffab0835d45d4d170fe171d7fa996d5913d9..fde3e7ef352474566e7259555a5f8ffb servergui.runFinalizers(); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0a5867b01c1ebf21d9add1d4a2843d15b8e1acb7..1afacdb9fa77564ed55622c248e0579255ed1a07 100644 +index 19937ffa2c93cb75ea8dba58dd5a8214adc035fa..49188db90fb214d097a349591a5903aa1bc7c931 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper +@@ -268,7 +268,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { @@ -211,7 +211,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..7bbbdf2895776f12ebc153dc83f4d53b if (stream != null) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index efe25d3894f3ad000257c72d9a5e06ef22446d41..486f69a94f3a5dfd1b13a74fcf780ff8f9ab37ba 100644 +index de70bfdbdd7740fdf20dd063a7a623a9e96cef98..bcdd2bc6ffc91349ac75833bd3928e8ca7de7a0f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -231,7 +231,7 @@ public class PurpurConfig { @@ -224,7 +224,7 @@ index efe25d3894f3ad000257c72d9a5e06ef22446d41..486f69a94f3a5dfd1b13a74fcf780ff8 serverModName = getString("settings.server-mod-name", serverModName); } diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index f7296691cb4af7814de1520347b307ff209082e4..3de4a2d0e208d093143c68c3084ceb4a94069c7d 100644 +index a353eb9f45af7b7f9bfd92a4a89403335b841840..20775a8c668c44111104b149a532dfedf691f405 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -184,7 +184,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa diff --git a/patches/api/0004-Add-Higher-Java-Version-for-Pufferfish.patch b/patches/unapplied/api/0004-Add-Higher-Java-Version-for-Pufferfish.patch similarity index 100% rename from patches/api/0004-Add-Higher-Java-Version-for-Pufferfish.patch rename to patches/unapplied/api/0004-Add-Higher-Java-Version-for-Pufferfish.patch diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/unapplied/server/0002-Divine-Configuration.patch similarity index 100% rename from patches/server/0002-Divine-Configuration.patch rename to patches/unapplied/server/0002-Divine-Configuration.patch diff --git a/patches/server/0003-Fix-MC-98160-and-MC-105103.patch b/patches/unapplied/server/0003-Fix-MC-98160-and-MC-105103.patch similarity index 100% rename from patches/server/0003-Fix-MC-98160-and-MC-105103.patch rename to patches/unapplied/server/0003-Fix-MC-98160-and-MC-105103.patch diff --git a/patches/server/0004-Optimize-default-values-for-configs.patch b/patches/unapplied/server/0004-Optimize-default-values-for-configs.patch similarity index 100% rename from patches/server/0004-Optimize-default-values-for-configs.patch rename to patches/unapplied/server/0004-Optimize-default-values-for-configs.patch diff --git a/patches/server/0005-Add-missing-purpur-config-options.patch b/patches/unapplied/server/0005-Add-missing-purpur-config-options.patch similarity index 100% rename from patches/server/0005-Add-missing-purpur-config-options.patch rename to patches/unapplied/server/0005-Add-missing-purpur-config-options.patch diff --git a/patches/server/0006-Fix-MC-93826.patch b/patches/unapplied/server/0006-Fix-MC-93826.patch similarity index 100% rename from patches/server/0006-Fix-MC-93826.patch rename to patches/unapplied/server/0006-Fix-MC-93826.patch diff --git a/patches/server/0007-Fix-entity-serialization.patch b/patches/unapplied/server/0007-Fix-entity-serialization.patch similarity index 100% rename from patches/server/0007-Fix-entity-serialization.patch rename to patches/unapplied/server/0007-Fix-entity-serialization.patch diff --git a/patches/server/0008-Don-t-save-Fireworks.patch b/patches/unapplied/server/0008-Don-t-save-Fireworks.patch similarity index 100% rename from patches/server/0008-Don-t-save-Fireworks.patch rename to patches/unapplied/server/0008-Don-t-save-Fireworks.patch diff --git a/patches/server/0009-Remove-Spigot-tick-limiter.patch b/patches/unapplied/server/0009-Remove-Spigot-tick-limiter.patch similarity index 100% rename from patches/server/0009-Remove-Spigot-tick-limiter.patch rename to patches/unapplied/server/0009-Remove-Spigot-tick-limiter.patch diff --git a/patches/server/0010-Boat-Settings.patch b/patches/unapplied/server/0010-Boat-Settings.patch similarity index 100% rename from patches/server/0010-Boat-Settings.patch rename to patches/unapplied/server/0010-Boat-Settings.patch diff --git a/patches/server/0011-Fix-MC-110386.patch b/patches/unapplied/server/0011-Fix-MC-110386.patch similarity index 100% rename from patches/server/0011-Fix-MC-110386.patch rename to patches/unapplied/server/0011-Fix-MC-110386.patch diff --git a/patches/server/0012-Despawn-shulker-bullets-on-owner-death.patch b/patches/unapplied/server/0012-Despawn-shulker-bullets-on-owner-death.patch similarity index 100% rename from patches/server/0012-Despawn-shulker-bullets-on-owner-death.patch rename to patches/unapplied/server/0012-Despawn-shulker-bullets-on-owner-death.patch diff --git a/patches/server/0013-Fix-MC-31819.patch b/patches/unapplied/server/0013-Fix-MC-31819.patch similarity index 100% rename from patches/server/0013-Fix-MC-31819.patch rename to patches/unapplied/server/0013-Fix-MC-31819.patch diff --git a/patches/server/0014-Reduce-sensor-work.patch b/patches/unapplied/server/0014-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0014-Reduce-sensor-work.patch rename to patches/unapplied/server/0014-Reduce-sensor-work.patch diff --git a/patches/server/0015-Fix-MC-172801.patch b/patches/unapplied/server/0015-Fix-MC-172801.patch similarity index 100% rename from patches/server/0015-Fix-MC-172801.patch rename to patches/unapplied/server/0015-Fix-MC-172801.patch diff --git a/patches/server/0016-Fix-MC-2025.patch b/patches/unapplied/server/0016-Fix-MC-2025.patch similarity index 100% rename from patches/server/0016-Fix-MC-2025.patch rename to patches/unapplied/server/0016-Fix-MC-2025.patch diff --git a/patches/server/0017-Optimize-Paper-Event-Manager.patch b/patches/unapplied/server/0017-Optimize-Paper-Event-Manager.patch similarity index 100% rename from patches/server/0017-Optimize-Paper-Event-Manager.patch rename to patches/unapplied/server/0017-Optimize-Paper-Event-Manager.patch diff --git a/patches/server/0018-Fix-MC-65198.patch b/patches/unapplied/server/0018-Fix-MC-65198.patch similarity index 100% rename from patches/server/0018-Fix-MC-65198.patch rename to patches/unapplied/server/0018-Fix-MC-65198.patch diff --git a/patches/server/0019-Make-entity-goals-public.patch b/patches/unapplied/server/0019-Make-entity-goals-public.patch similarity index 100% rename from patches/server/0019-Make-entity-goals-public.patch rename to patches/unapplied/server/0019-Make-entity-goals-public.patch diff --git a/patches/server/0020-Fix-MC-7569.patch b/patches/unapplied/server/0020-Fix-MC-7569.patch similarity index 100% rename from patches/server/0020-Fix-MC-7569.patch rename to patches/unapplied/server/0020-Fix-MC-7569.patch diff --git a/patches/server/0021-Fix-MC-93018.patch b/patches/unapplied/server/0021-Fix-MC-93018.patch similarity index 100% rename from patches/server/0021-Fix-MC-93018.patch rename to patches/unapplied/server/0021-Fix-MC-93018.patch diff --git a/patches/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/unapplied/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 100% rename from patches/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/unapplied/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch diff --git a/patches/server/0023-Configurable-Chat-message-signatures.patch b/patches/unapplied/server/0023-Configurable-Chat-message-signatures.patch similarity index 100% rename from patches/server/0023-Configurable-Chat-message-signatures.patch rename to patches/unapplied/server/0023-Configurable-Chat-message-signatures.patch diff --git a/patches/server/0024-Optimize-CraftServer.getWorld-UUID.patch b/patches/unapplied/server/0024-Optimize-CraftServer.getWorld-UUID.patch similarity index 100% rename from patches/server/0024-Optimize-CraftServer.getWorld-UUID.patch rename to patches/unapplied/server/0024-Optimize-CraftServer.getWorld-UUID.patch diff --git a/patches/server/0025-Carpet-Fixes-RecipeManager-Optimize.patch b/patches/unapplied/server/0025-Carpet-Fixes-RecipeManager-Optimize.patch similarity index 100% rename from patches/server/0025-Carpet-Fixes-RecipeManager-Optimize.patch rename to patches/unapplied/server/0025-Carpet-Fixes-RecipeManager-Optimize.patch diff --git a/patches/server/0026-Carpet-Fixes-getBiome-Optimize.patch b/patches/unapplied/server/0026-Carpet-Fixes-getBiome-Optimize.patch similarity index 100% rename from patches/server/0026-Carpet-Fixes-getBiome-Optimize.patch rename to patches/unapplied/server/0026-Carpet-Fixes-getBiome-Optimize.patch diff --git a/patches/server/0027-lithium-ai.raid.patch b/patches/unapplied/server/0027-lithium-ai.raid.patch similarity index 100% rename from patches/server/0027-lithium-ai.raid.patch rename to patches/unapplied/server/0027-lithium-ai.raid.patch diff --git a/patches/server/0028-lithium-collections.goals.patch b/patches/unapplied/server/0028-lithium-collections.goals.patch similarity index 100% rename from patches/server/0028-lithium-collections.goals.patch rename to patches/unapplied/server/0028-lithium-collections.goals.patch diff --git a/patches/server/0029-lithium-collections.gamerules.patch b/patches/unapplied/server/0029-lithium-collections.gamerules.patch similarity index 100% rename from patches/server/0029-lithium-collections.gamerules.patch rename to patches/unapplied/server/0029-lithium-collections.gamerules.patch diff --git a/patches/server/0030-lithium-collections.attributes.patch b/patches/unapplied/server/0030-lithium-collections.attributes.patch similarity index 100% rename from patches/server/0030-lithium-collections.attributes.patch rename to patches/unapplied/server/0030-lithium-collections.attributes.patch diff --git a/patches/server/0031-lithium-collections.entity_by_type.patch b/patches/unapplied/server/0031-lithium-collections.entity_by_type.patch similarity index 100% rename from patches/server/0031-lithium-collections.entity_by_type.patch rename to patches/unapplied/server/0031-lithium-collections.entity_by_type.patch diff --git a/patches/server/0032-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch b/patches/unapplied/server/0032-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch similarity index 100% rename from patches/server/0032-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch rename to patches/unapplied/server/0032-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch diff --git a/patches/server/0033-Carpet-Fixes-Sheep-Optimization.patch b/patches/unapplied/server/0033-Carpet-Fixes-Sheep-Optimization.patch similarity index 100% rename from patches/server/0033-Carpet-Fixes-Sheep-Optimization.patch rename to patches/unapplied/server/0033-Carpet-Fixes-Sheep-Optimization.patch diff --git a/patches/server/0034-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch b/patches/unapplied/server/0034-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch similarity index 100% rename from patches/server/0034-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch rename to patches/unapplied/server/0034-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch diff --git a/patches/server/0035-Improve-biome-temperature-cache.patch b/patches/unapplied/server/0035-Improve-biome-temperature-cache.patch similarity index 100% rename from patches/server/0035-Improve-biome-temperature-cache.patch rename to patches/unapplied/server/0035-Improve-biome-temperature-cache.patch diff --git a/patches/server/0036-Suppress-errors-from-dirty-attributes.patch b/patches/unapplied/server/0036-Suppress-errors-from-dirty-attributes.patch similarity index 100% rename from patches/server/0036-Suppress-errors-from-dirty-attributes.patch rename to patches/unapplied/server/0036-Suppress-errors-from-dirty-attributes.patch diff --git a/patches/server/0037-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/unapplied/server/0037-vmp-skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0037-vmp-skip-entity-move-if-movement-is-zero.patch rename to patches/unapplied/server/0037-vmp-skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0038-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch b/patches/unapplied/server/0038-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch similarity index 100% rename from patches/server/0038-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch rename to patches/unapplied/server/0038-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch diff --git a/patches/server/0039-Fix-chat-signing.patch b/patches/unapplied/server/0039-Fix-chat-signing.patch similarity index 100% rename from patches/server/0039-Fix-chat-signing.patch rename to patches/unapplied/server/0039-Fix-chat-signing.patch diff --git a/patches/server/0040-Implement-Linear-region-format.patch b/patches/unapplied/server/0040-Implement-Linear-region-format.patch similarity index 100% rename from patches/server/0040-Implement-Linear-region-format.patch rename to patches/unapplied/server/0040-Implement-Linear-region-format.patch diff --git a/patches/server/0041-Snowball-and-Egg-knockback.patch b/patches/unapplied/server/0041-Snowball-and-Egg-knockback.patch similarity index 100% rename from patches/server/0041-Snowball-and-Egg-knockback.patch rename to patches/unapplied/server/0041-Snowball-and-Egg-knockback.patch diff --git a/patches/server/0042-lithium-precompute-shape-arrays.patch b/patches/unapplied/server/0042-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0042-lithium-precompute-shape-arrays.patch rename to patches/unapplied/server/0042-lithium-precompute-shape-arrays.patch