pull bukkit versions to Versions.kt

This commit is contained in:
dfsek 2022-06-16 23:58:25 -07:00
parent cacfd66cf7
commit 5df016e43e
3 changed files with 6 additions and 5 deletions

View File

@ -29,8 +29,10 @@ object Versions {
} }
object Bukkit { object Bukkit {
const val paper = "1.18-R0.1-SNAPSHOT" const val paper = "1.18.2-R0.1-SNAPSHOT"
const val paperLib = "1.0.5" const val paperLib = "1.0.5"
const val minecraft = "1.19"
const val reflectionRemapper = "0.1.0-SNAPSHOT"
} }
object Sponge { object Sponge {

View File

@ -8,7 +8,6 @@ plugins {
id("xyz.jpenilla.run-paper") version "1.0.6" id("xyz.jpenilla.run-paper") version "1.0.6"
} }
val mcVersion = "1.18.2"
val testDir = "target/server" val testDir = "target/server"
val testMem = "3G" val testMem = "3G"
@ -24,7 +23,7 @@ dependencies {
shaded(project(":platforms:bukkit:common")) shaded(project(":platforms:bukkit:common"))
shaded(project(":platforms:bukkit:nms:v1_18_R2", configuration = "reobf")) shaded(project(":platforms:bukkit:nms:v1_18_R2", configuration = "reobf"))
shaded(project(":platforms:bukkit:nms:v1_19_R1", configuration = "reobf")) shaded(project(":platforms:bukkit:nms:v1_19_R1", configuration = "reobf"))
shaded("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT") shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
} }
val throttleCoreCount = 0 val throttleCoreCount = 0
@ -45,7 +44,7 @@ if(throttleCoreCount > 0) {
fun downloadPaperclip(url: String, dir: String) { fun downloadPaperclip(url: String, dir: String) {
val clip = URL(url.replace("%version%", mcVersion)) val clip = URL(url.replace("%version%", Versions.Bukkit.minecraft))
val clipReadableByteChannel = Channels.newChannel(clip.openStream()) val clipReadableByteChannel = Channels.newChannel(clip.openStream())
val clipFile = file("$testDir/$dir/paperclip.jar") val clipFile = file("$testDir/$dir/paperclip.jar")
val clipOutputStream = clipFile.outputStream() val clipOutputStream = clipFile.outputStream()

View File

@ -9,7 +9,7 @@ dependencies {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
} }
compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT") compileOnly("io.papermc.paper:paper-api:${Versions.Bukkit.paper}")
shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib) shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
shadedApi("com.google.guava:guava:30.0-jre") shadedApi("com.google.guava:guava:30.0-jre")