From 5e0a3d7ad07a8ab1dc6f606fb4dbabdb0cc87c29 Mon Sep 17 00:00:00 2001 From: Jake Potrebic <jake.m.potrebic@gmail.com> Date: Sat, 16 Sep 2023 16:35:39 -0700 Subject: [PATCH] [ci skip] Add missing javadoc links (#9497) --- patches/api/Adventure.patch | 6 +++++- patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch | 2 +- patches/api/Build-system-changes.patch | 5 +++++ patches/api/Paper-Plugins.patch | 8 ++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index 9745dcfcbf..6b22fc9cf8 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -55,8 +55,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations - "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", ++ // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat + // Paper start - add missing javadoc links + "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html", + "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10", + // Paper end + // Paper start -+ // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // don't link to bungee chat + "https://jd.advntr.dev/api/$adventureVersion/", + "https://jd.advntr.dev/text-minimessage/$adventureVersion/", + "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/", diff --git a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch index 1b51fdba9e..44861fa9f8 100644 --- a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch @@ -42,8 +42,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/", + "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/", // Paper end + "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper ) - options.tags("apiNote:a:API Note:") diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch index d8ee311541..d841e8fe79 100644 --- a/patches/api/Build-system-changes.patch +++ b/patches/api/Build-system-changes.patch @@ -44,8 +44,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/", + "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", ++ // Paper start - add missing javadoc links ++ "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html", ++ "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10", ++ // Paper end ) options.tags("apiNote:a:API Note:") + @@ -0,0 +0,0 @@ tasks.withType<Javadoc> { } } diff --git a/patches/api/Paper-Plugins.patch b/patches/api/Paper-Plugins.patch index 8cf55aa0c1..171692d54c 100644 --- a/patches/api/Paper-Plugins.patch +++ b/patches/api/Paper-Plugins.patch @@ -17,6 +17,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper +@@ -0,0 +0,0 @@ tasks.withType<Javadoc> { + "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 + ) + options.tags("apiNote:a:API Note:") + diff --git a/src/main/java/io/papermc/paper/plugin/PermissionManager.java b/src/main/java/io/papermc/paper/plugin/PermissionManager.java new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000