apply first basic patches

2025-12-19 14:59:25 +00:00 · 2025-10-10 01:56:03 +03:00
parent ca44c9e3c5
commit ebc9c017cf
124 changed files with 458 additions and 448 deletions
--- a/divinemc-api/build.gradle.kts.patch
+++ b/divinemc-api/build.gradle.kts.patch
@@ -1,8 +1,8 @@
 --- a/purpur-api/build.gradle.kts
 +++ b/purpur-api/build.gradle.kts
-@@ -13,8 +_,8 @@
- // Keep in sync with paper-server adventure-text-serializer-ansi dep
- val adventureVersion = "4.24.0"
+@@ -12,8 +_,8 @@
+ val annotationsVersion = "26.0.2"
+ val adventureVersion = "4.25.0"
 val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
 -val slf4jVersion = "2.0.16"
 -val log4jVersion = "2.24.1"
@@ -11,7 +11,7 @@
 
 val apiAndDocs: Configuration by configurations.creating {
     attributes {
-@@ -41,9 +_,9 @@
+@@ -40,9 +_,9 @@
 
 dependencies {
     // api dependencies are listed transitively to API consumers
@@ -24,7 +24,7 @@
     api("org.joml:joml:1.10.8") {
         isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
     }
-@@ -51,6 +_,7 @@
+@@ -50,6 +_,7 @@
     api("org.apache.logging.log4j:log4j-api:$log4jVersion")
     api("org.slf4j:slf4j-api:$slf4jVersion")
     api("com.mojang:brigadier:1.3.10")
@@ -32,7 +32,7 @@
 
     // Deprecate bungeecord-chat in favor of adventure
     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") {
-@@ -65,9 +_,11 @@
+@@ -64,9 +_,11 @@
     apiAndDocs("net.kyori:adventure-text-serializer-plain")
     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
 
@@ -47,7 +47,7 @@
 
     // Annotations - Slowly migrate to jspecify
     val annotations = "org.jetbrains:annotations:$annotationsVersion"
-@@ -83,11 +_,13 @@
+@@ -82,11 +_,13 @@
     // Test dependencies
     testImplementation("org.apache.commons:commons-lang3:3.17.0")
     testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
@@ -64,7 +64,7 @@
 }
 
 val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
-@@ -101,17 +_,21 @@
+@@ -100,17 +_,21 @@
         java {
             srcDir(generatedDir)
             srcDir(file("../paper-api/src/main/java"))
@@ -86,7 +86,7 @@
         }
     }
 }
-@@ -159,6 +_,16 @@
+@@ -158,6 +_,16 @@
     }
 }
 
@@ -103,7 +103,7 @@
 tasks.jar {
     from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
         into("META-INF/maven/${project.group}/${project.name}")
-@@ -177,14 +_,13 @@
+@@ -176,14 +_,13 @@
 val services = objects.newInstance<Services>()
 
 tasks.withType<Javadoc>().configureEach {
@@ -114,22 +114,22 @@
     options.isDocFilesSubDirs = true
     options.links(
 -        "https://guava.dev/releases/33.3.1-jre/api/docs/",
-        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
+-        //"https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 +        "https://guava.dev/releases/33.4.0-jre/api/docs/", // DivineMC - Bump dependencies
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/2.3/", // DivineMC - Bump dependencies
-         "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
-         "https://javadoc.io/doc/org.joml/joml/1.10.8/",
-         "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
-@@ -198,7 +_,7 @@
+         //"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
+         //"https://javadoc.io/doc/org.joml/joml/1.10.8/",
+         //"https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
+@@ -197,7 +_,7 @@
         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
-         "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
+         //"https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
         "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
-        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
+-        //"https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
 +        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.22", // DivineMC - Bump dependencies
     )
     options.tags("apiNote:a:API Note:")
 
-@@ -222,6 +_,9 @@
+@@ -221,6 +_,9 @@
             into("build/docs/javadoc")
         }
     }
--- a/divinemc-api/paper-patches/features/0002-Delete-Timings.patch
+++ b/divinemc-api/paper-patches/features/0002-Delete-Timings.patch
@@ -736,10 +736,10 @@ index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..00000000000000000000000000000000
 -}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 deleted file mode 100644
-index c8287776ad585d04fb4fa3290cd73d7097035ea0..0000000000000000000000000000000000000000
+index 143fb3623a3fcf4be2d30dafb330584cb61ffe50..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/TimingHistory.java
 +++ /dev/null
-@@ -1,357 +0,0 @@
+@@ -1,356 +0,0 @@
 -/*
 - * This file is licensed under the MIT License (MIT).
 - *
@@ -793,8 +793,7 @@ index c8287776ad585d04fb4fa3290cd73d7097035ea0..00000000000000000000000000000000
 -import static co.aikar.util.JSONUtil.*;
 -
 -/**
- * Internal.
- *
+- * @hidden
 - * @deprecated Timings will be removed in the future
 - */
 -@Deprecated(forRemoval = true)
@@ -2378,7 +2377,7 @@ index 5753b9bce89db2ac378ec41f1b61907cc2e23335..00000000000000000000000000000000
 -}
 diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
 deleted file mode 100644
-index 1786eeb5cbeaad75602c9c5649bbcd9b2af5cf81..0000000000000000000000000000000000000000
+index 207b6853a0cb0185492b62c0c5d9602d48b7959c..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/util/LoadingMap.java
 +++ /dev/null
@@ -1,369 +0,0 @@
@@ -2466,9 +2465,9 @@ index 1786eeb5cbeaad75602c9c5649bbcd9b2af5cf81..00000000000000000000000000000000
 -    /**
 -     * Creates a LoadingMap with an auto instantiating loader.
 -     *
-     * Will auto construct class of of Value when not found
+-     * Will auto construct class of Value when not found
 -     *
-     * Since this uses Reflection, It is more effecient to define your own static loader
+-     * Since this uses Reflection, It is more efficient to define your own static loader
 -     * than using this helper, but if performance is not critical, this is easier.
 -     *
 -     * @param backingMap Actual map being used.
@@ -2486,9 +2485,9 @@ index 1786eeb5cbeaad75602c9c5649bbcd9b2af5cf81..00000000000000000000000000000000
 -    /**
 -     * Creates a LoadingMap with an auto instantiating loader.
 -     *
-     * Will auto construct class of of Value when not found
+-     * Will auto construct class of Value when not found
 -     *
-     * Since this uses Reflection, It is more effecient to define your own static loader
+-     * Since this uses Reflection, It is more efficient to define your own static loader
 -     * than using this helper, but if performance is not critical, this is easier.
 -     *
 -     * @param backingMap Actual map being used.
@@ -2870,7 +2869,7 @@ index 3e61a926620a67daec3af54b72a1b911eaef2ed4..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 27a7c69f23084e821d945d5e97e51a94ddd94e58..d645ee8470a2dd9f7b8eff2b7ff2211aba9c342f 100644
+index e387ba67f0b6cde8ee2be7acba8f791792802ad4..06402e9d811b62ea59c67ecbffe9272c73f2040d 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
@@ -32,16 +32,6 @@ public abstract class Command {
--- a/divinemc-api/paper-patches/features/0009-Smooth-teleport-API.patch
+++ b/divinemc-api/paper-patches/features/0009-Smooth-teleport-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Smooth teleport API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 078cb0b4ff04bdae006af913d8b4ecd68fe30637..3b0998aefa32244bd03abdd668cc614f930802f1 100644
+index b221735602f669ef984b44d73605095460316753..8f627547e05242314f34b876fda0b4121ef3e32f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -4051,4 +4051,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -4122,4 +4122,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
         sendDeathScreen(message);
     }
     // Purpur end
--- a/divinemc-api/paper-patches/features/0010-Vectorized-map-color-conversion.patch
+++ b/divinemc-api/paper-patches/features/0010-Vectorized-map-color-conversion.patch
@@ -13,7 +13,7 @@ This patch does not add any API that should be used by plugins. Any
 classes and methods added by this patch should NOT be used in plugins.

 diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index 204860b32b4958a2804b2e5bc82f5be099e461f3..b3933fea40c5902f545fa0230b818d2ef3c2a675 100644
+index 477b8cd1820259bc3726fed7674402a9e705e681..849edf46647cac386338382388291ac442918e85 100644
 --- a/src/main/java/org/bukkit/map/MapPalette.java
 +++ b/src/main/java/org/bukkit/map/MapPalette.java
@@ -35,7 +35,7 @@ public final class MapPalette {
@@ -23,9 +23,9 @@ index 204860b32b4958a2804b2e5bc82f5be099e461f3..b3933fea40c5902f545fa0230b818d2e
 -    static final Color[] colors = {
 +    public static final Color[] colors = { // DivineMC - Vectorized map color conversion - package -> public
         // Start generate - MapPalette#colors
-         // @GeneratedFrom 1.21.8
         new Color(0x00000000, true),
-@@ -395,9 +395,15 @@ public final class MapPalette {
+         new Color(0x00000000, true),
+@@ -394,9 +394,15 @@ public final class MapPalette {
         temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth());
 
         byte[] result = new byte[temp.getWidth() * temp.getHeight()];