From d99d84a8aa5ef8b8d4b91e6cbf22f3cbb453f919 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sun, 28 Apr 2024 02:05:52 +0200 Subject: [PATCH] Temporarily comment out adventure jd links --- patches/api/0006-Adventure.patch | 14 +++++++------- patches/api/0008-Use-ASM-for-event-executors.patch | 2 +- patches/api/0009-Paper-Plugins.patch | 6 +++--- ...70-Allow-plugins-to-use-SLF4J-for-logging.patch | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch index 771be7112c..8219ab4a68 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -8,7 +8,7 @@ Co-authored-by: Jake Potrebic Co-authored-by: Yannick Lamprecht diff --git a/build.gradle.kts b/build.gradle.kts -index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..c23ee26662657baa496d6048b9a8ba39b4998e72 100644 +index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..106d4d5756dc579c446699106f52462085ea9a52 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,12 +11,28 @@ java { @@ -66,12 +66,12 @@ index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..c23ee26662657baa496d6048b9a8ba39 "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", // Paper end + // Paper start -+ "https://jd.advntr.dev/api/$adventureVersion/", -+ "https://jd.advntr.dev/text-minimessage/$adventureVersion/", -+ "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/", -+ "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/", -+ "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", -+ "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", ++ //"https://jd.advntr.dev/api/$adventureVersion/", ++ //"https://jd.advntr.dev/text-minimessage/$adventureVersion/", ++ //"https://jd.advntr.dev/text-serializer-gson/$adventureVersion/", ++ //"https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/", ++ //"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", ++ //"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", + // Paper end ) options.tags("apiNote:a:API Note:") diff --git a/patches/api/0008-Use-ASM-for-event-executors.patch b/patches/api/0008-Use-ASM-for-event-executors.patch index ad414bc491..df38da57a2 100644 --- a/patches/api/0008-Use-ASM-for-event-executors.patch +++ b/patches/api/0008-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index c23ee26662657baa496d6048b9a8ba39b4998e72..759294705e0f53c18ce2825b5f6c715a65f23d90 100644 +index 106d4d5756dc579c446699106f52462085ea9a52..d6252c1ff21c92bf0d232d5bfdf828d1d2ce38c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,6 +47,9 @@ dependencies { diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch index 02b5c3f2e8..7344dee5ae 100644 --- a/patches/api/0009-Paper-Plugins.patch +++ b/patches/api/0009-Paper-Plugins.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins diff --git a/build.gradle.kts b/build.gradle.kts -index 759294705e0f53c18ce2825b5f6c715a65f23d90..7627eac76bc0e17413df26fdf49e94605be979e5 100644 +index d6252c1ff21c92bf0d232d5bfdf828d1d2ce38c0..5ccdd695948d1d36173b0a4516cfe8494dd01b06 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,7 +52,7 @@ dependencies { @@ -18,8 +18,8 @@ index 759294705e0f53c18ce2825b5f6c715a65f23d90..7627eac76bc0e17413df26fdf49e9460 compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") @@ -138,6 +138,7 @@ tasks.withType { - "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", - "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", + //"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", + //"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", // Paper end + "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper ) diff --git a/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch index 3de3963d54..27f1a2d6b1 100644 --- a/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/build.gradle.kts b/build.gradle.kts -index 7627eac76bc0e17413df26fdf49e94605be979e5..44c7abd676d7730837172473244729fa9298ffb1 100644 +index 5ccdd695948d1d36173b0a4516cfe8494dd01b06..65e67b8726f1e19a6bcb1fe2f448e4ab68df11d1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,8 @@ java { @@ -36,9 +36,9 @@ index 7627eac76bc0e17413df26fdf49e94605be979e5..44c7abd676d7730837172473244729fa implementation("org.ow2.asm:asm:9.7") implementation("org.ow2.asm:asm-commons:9.7") @@ -137,6 +141,8 @@ tasks.withType { - "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/", - "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", - "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", + //"https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/", + //"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", + //"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", + "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/", + "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/", // Paper end