[ci-skip] starting update 1.20.6

README.md

@@ -3,7 +3,6 @@
 <div align="center">
   <h1>DivineMC</h1>
   <h3>Fork of Purpur compatible with Spigot plugins, offering the best performance for your server.</h3>
-  <h3>⚠️ 1.20.6 update will be released soon
   <br>
   
   [![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)

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<JavaCompile>().configureEach {
         options.encoding = "UTF-8"
-        options.release.set(17)
+        options.release.set(21)
     }
 
     tasks.withType<Javadoc> {

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

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
  

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

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