diff --git a/build.gradle.kts b/build.gradle.kts index dd2324a..a0547b7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG plugins { java `maven-publish` - id("io.papermc.paperweight.patcher") version "1.7.1" + id("io.papermc.paperweight.patcher") version "1.7.2-SNAPSHOT" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" @@ -18,40 +18,34 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.10.2:fat") + remapper("net.fabricmc:tiny-remapper:0.10.3:fat") decompiler("org.vineflower:vineflower:1.10.1") paperclip("io.papermc:paperclip:3.0.3") } -subprojects { +allprojects { apply(plugin = "java") + apply(plugin = "maven-publish") java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion = JavaLanguageVersion.of(21) } } } subprojects { - tasks.withType().configureEach { - options.encoding = "UTF-8" + tasks.withType { + options.encoding = Charsets.UTF_8.name() options.release.set(21) } - tasks.withType { options.encoding = Charsets.UTF_8.name() } - tasks.withType { filteringCharset = Charsets.UTF_8.name() } - tasks.withType { - minHeapSize = "2g" - maxHeapSize = "2g" - } - repositories { mavenCentral() maven(paperMavenPublicUrl) @@ -61,7 +55,6 @@ subprojects { maven("https://repo.md-5.net/content/repositories/releases/") maven("https://hub.spigotmc.org/nexus/content/groups/public/") maven("https://jitpack.io") - maven("https://oss.sonatype.org/content/repositories/snapshots/") } } @@ -76,7 +69,8 @@ paperweight { ref.set(providers.gradleProperty("purpurRef")) withStandardPatcher { - baseName("Purpur") + apiSourceDirPath.set("Purpur-API") + serverSourceDirPath.set("Purpur-Server") apiPatchDir.set(layout.projectDirectory.dir("patches/api")) apiOutputDir.set(layout.projectDirectory.dir("DivineMC-API")) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5851d69..bc6c6f3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,7 +10,7 @@ pluginManagement { rootProject.name = "DivineMC" -for (name in listOf("DivineMC-API", "DivineMC-Server")) { +for (name in listOf("DivineMC-API", "DivineMC-Server", "paper-api-generator")) { val projName = name.lowercase(Locale.ENGLISH) include(projName) findProject(":$projName")!!.projectDir = file(name)