fix: Update PaperMC groupId and repository URL

Fixes #60

Author: osipxd

CHANGELOG.md

@@ -12,6 +12,8 @@
 
 ### Fixed
 
+- Fix PaperMC repository URL
+- Fix group ID for PaperMC 1.17+
 - Fix compatibility with new versions of Shadow plugin
 
 ### Housekeeping

README.md

@@ -167,7 +167,7 @@ dependencies {
 ----------------|-------------------------------------------------------------------
  spigot         | https://hub.spigotmc.org/nexus/content/repositories/snapshots/
  sk98q          | https://maven.sk89q.com/repo/
- papermc        | https://papermc.io/repo/repository/maven-public/
+ papermc        | https://repo.papermc.io/repository/maven-public/
  dmulloy2       | https://repo.dmulloy2.net/nexus/repository/public/
  md5            | https://repo.md-5.net/content/groups/public/
  jitpack        | https://jitpack.io/
@@ -176,14 +176,14 @@ dependencies {
  codemc         | https://repo.codemc.org/repository/maven-public/
 
 #### Dependencies:
-Some dependencies also applies repo needed for them.
-
- Name        | Signature                                     | Applies repo
--------------|-----------------------------------------------|---------------
- spigot      | org.spigotmc:spigot:$apiVersion               | mavenLocal
- spigotApi   | org.spigotmc:spigot-api:$apiVersion           | spigot
- bukkitApi   | org.bukkit:bukkit:$apiVersion                 | spigot
- paperApi    | com.destroystokyo.paper:paper-api:$apiVersion | destroystokyo
+Some dependencies also add a repository needed for them.
+
+ Name        | Signature                              | Adds repository
+-------------|----------------------------------------|-----------------
+ spigot      | org.spigotmc:spigot:$apiVersion        | mavenLocal
+ spigotApi   | org.spigotmc:spigot-api:$apiVersion    | spigot
+ bukkitApi   | org.bukkit:bukkit:$apiVersion          | spigot
+ paperApi    | io.papermc.paper:paper-api:$apiVersion | papermc
 
  **Note:** `$apiVersion` - is `${version}-R0.1-SNAPSHOT` (where `$version` is `bukkit.version`)
 

src/main/kotlin/dependencies/Dependencies.kt

@@ -12,12 +12,14 @@ import org.gradle.kotlin.dsl.closureOf
 import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.maven
 import ru.endlesscode.bukkitgradle.bukkit
+import ru.endlesscode.bukkitgradle.meta.util.MinecraftVersion
+import ru.endlesscode.bukkitgradle.meta.util.parsedApiVersion
 
 internal object Dependencies {
 
     const val URL_SPIGOT = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/"
     const val URL_SK89Q = "https://maven.sk89q.com/repo/"
-    const val URL_PAPERMC = "https://papermc.io/repo/repository/maven-public/"
+    const val URL_PAPERMC = "https://repo.papermc.io/repository/maven-public/"
     const val URL_DMULLOY2 = "https://repo.dmulloy2.net/nexus/repository/public/"
     const val URL_MD5 = "https://repo.md-5.net/content/groups/public/"
     const val URL_JITPACK = "https://jitpack.io/"
@@ -56,7 +58,7 @@ internal object Dependencies {
         depExtra["spigot"] = depClosureOf { depHandler.api("org.spigotmc", "spigot", "mavenLocal") }
         depExtra["spigotApi"] = depClosureOf { depHandler.api("org.spigotmc", "spigot-api", "spigot") }
         depExtra["bukkitApi"] = depClosureOf { depHandler.api("org.bukkit", "bukkit", "spigot") }
-        depExtra["paperApi"] = depClosureOf { depHandler.api("com.destroystokyo.paper", "paper-api", "papermc") }
+        depExtra["paperApi"] = depClosureOf { depHandler.api(resolvePaperGroupId(), "paper-api", "papermc") }
     }
 
     fun RepositoryHandler.addRepo(
@@ -88,5 +90,10 @@ internal object Dependencies {
         return "$groupId:$artifactId:$version"
     }
 
+    internal fun resolvePaperGroupId(): String {
+        val useNewGroup = project.bukkit.parsedApiVersion >= MinecraftVersion.V1_17_0
+        return if (useNewGroup) "io.papermc.paper" else "com.destroystokyo.paper"
+    }
+
     private fun depClosureOf(body: () -> String) = KotlinClosure0(body)
 }

src/main/kotlin/dependencies/DependenciesExtensions.kt

@@ -14,6 +14,7 @@ import ru.endlesscode.bukkitgradle.dependencies.Dependencies.URL_SK89Q
 import ru.endlesscode.bukkitgradle.dependencies.Dependencies.URL_SPIGOT
 import ru.endlesscode.bukkitgradle.dependencies.Dependencies.addRepo
 import ru.endlesscode.bukkitgradle.dependencies.Dependencies.api
+import ru.endlesscode.bukkitgradle.dependencies.Dependencies.resolvePaperGroupId
 
 public fun RepositoryHandler.spigot(configure: MavenArtifactRepository.() -> Unit = {}) {
     addRepo("Spigot", URL_SPIGOT, configure)
@@ -61,4 +62,4 @@ public val DependencyHandler.bukkitApi: String
     get() = api("org.bukkit", "bukkit", "spigot")
 
 public val DependencyHandler.paperApi: String
-    get() = api("com.destroystokyo.paper", "paper-api", "papermc")
+    get() = api(resolvePaperGroupId(), "paper-api", "papermc")

src/main/kotlin/meta/util/MinecraftVersion.kt

@@ -24,6 +24,7 @@ internal value class MinecraftVersion(private val value: Int) : Comparable<Minec
         val V1_12_0 = MinecraftVersion(1_12_00)
         val V1_13_0 = MinecraftVersion(1_13_00)
         val V1_16_5 = MinecraftVersion(1_16_05)
+        val V1_17_0 = MinecraftVersion(1_17_00)
         val V1_17_1 = MinecraftVersion(1_17_01)
         val V1_20_5 = MinecraftVersion(1_20_05)
     }

src/test/groovy/ru/endlesscode/bukkitgradle/BukkitGradlePluginSpec.groovy

@@ -13,7 +13,7 @@ class BukkitGradlePluginSpec extends PluginSpecification {
     }
 
     def "when initialized - should set default JVM toolchain"(String apiVersion, int jvmVersion) {
-        when: "apiVersion is set to $apiVersion"
+        when: "apiVersion is set"
         project.bukkit.apiVersion = apiVersion
 
         then: "JVM toolchain version should be"
@@ -45,6 +45,22 @@ class BukkitGradlePluginSpec extends PluginSpecification {
         dependency == 'org.bukkit:bukkit:1.16.4-R0.1-SNAPSHOT'
     }
 
+    def "when using paper extension - should add paper dependency"(String apiVersion, String groupId) {
+        when: "apiVersion is set"
+        project.bukkit.apiVersion = apiVersion
+
+        and: "use paperApi extension"
+        String dependency = project.dependencies.paperApi()
+
+        then: "returns paper dependency with right groupId"
+        dependency == "$groupId:paper-api:$apiVersion-R0.1-SNAPSHOT"
+
+        where:
+        apiVersion | groupId
+        "1.16.5"   | "com.destroystokyo.paper"
+        "1.17"     | "io.papermc.paper"
+    }
+
     def "when use bukkit extension - and bukkit version set - should return bukkit with specified version"() {
         given: "api version specified"
         project.bukkit.apiVersion = "1.7.10"