Fix issues and drop 1.17.1 to 1.18.1 support

This commit is contained in:
2023-07-15 22:27:28 -05:00
parent c5aa6510d9
commit 0190098656
20 changed files with 91 additions and 572 deletions
+61 -28
View File
@@ -1,23 +1,17 @@
import xyz.jpenilla.runpaper.task.RunServer
plugins {
id("java")
id("com.github.johnrengelman.shadow") version "8.1.1"
id("io.papermc.paperweight.userdev") version "1.5.5" apply false
id("xyz.jpenilla.run-paper") version "2.1.0" apply false
id("io.papermc.paperweight.userdev") version "1.5.5"
id("xyz.jpenilla.run-paper") version "2.1.0"
id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
}
group = "dev.plex"
version = "2.1"
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
}
subprojects {
apply(plugin = "java")
apply(plugin = "com.github.johnrengelman.shadow")
apply(plugin = "io.papermc.paperweight.userdev")
apply(plugin = "xyz.jpenilla.run-paper")
version = "2.2"
allprojects {
repositories {
mavenCentral()
@@ -27,16 +21,24 @@ subprojects {
maven {
url = uri("https://maven.playpro.com/")
content {
includeGroup("net.coreprotect")
}
}
}
}
subprojects {
apply(plugin = "java")
apply(plugin = "com.github.johnrengelman.shadow")
apply(plugin = "io.papermc.paperweight.userdev")
dependencies {
if (project.name != "shared") {
implementation(project(":shared"))
}
compileOnly("net.coreprotect:coreprotect:21.3")
}
tasks {
assemble {
dependsOn("reobfJar")
@@ -44,11 +46,44 @@ subprojects {
}
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
}
bukkit {
name = "ItemizerX"
version = rootProject.version.toString()
description = "A new way to edit your items"
authors = listOf("Focusvity", "Telesphoreo")
main = "dev.plex.itemizerx.ItemizerX"
apiVersion = "1.17"
foliaSupported = true
softDepend = listOf("CoreProtect")
commands {
register("itemizer") {
description = "The main command for ItemizerX"
aliases = listOf("ii", "it")
usage = "/<command>"
}
}
}
// Adapted from PlotSquared
val supportedVersions = listOf("1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20", "1.20.1")
tasks {
shadowJar {
archiveBaseName.set("ItemizerX")
archiveClassifier.set("")
archiveVersion.set("")
supportedVersions.forEach {
register<RunServer>("runServer-$it") {
minecraftVersion(it)
pluginJars(layout.buildDirectory.file("libs/ItemizerX-${rootProject.version}.jar"))
jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
group = "run paper"
runDirectory.set(file("run-$it"))
}
}
assemble {
dependsOn("shadowJar")
dependsOn("reobfJar")
}
compileJava {
@@ -56,23 +91,21 @@ tasks {
options.release.set(17)
}
assemble {
dependsOn("shadowJar")
}
jar {
enabled = false
shadowJar {
relocate("org.bstats", "dev.plex")
}
}
dependencies {
implementation(project(path = ":core", configuration = "shadow"))
paperDevBundle("1.20.1-R0.1-SNAPSHOT")
compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
compileOnly("net.coreprotect:coreprotect:21.3")
implementation("org.bstats:bstats-base:3.0.2")
implementation("org.bstats:bstats-bukkit:3.0.2")
implementation(project(path = ":shared", configuration = "shadow"))
implementation(project(path = ":v1_20_R1", configuration = "shadow"))
implementation(project(path = ":v1_19_R3", configuration = "shadow"))
implementation(project(path = ":v1_19_R2", configuration = "shadow"))
implementation(project(path = ":v1_19_R1", configuration = "shadow"))
implementation(project(path = ":v1_18_R2", configuration = "shadow"))
implementation(project(path = ":v1_18_R1", configuration = "shadow"))
implementation(project(path = ":v1_17_R1", configuration = "shadow"))
}