From a697b179e7dff3af7904a2fec7bd19aac7432bfe Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Thu, 17 Jul 2025 00:37:28 +0800 Subject: [PATCH] Update Upstream(Luminol) --- build.gradle.kts | 18 ++++++++++-------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 1 + 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fc12cf3..d3ec68c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { java // TODO java launcher tasks - id("io.papermc.paperweight.patcher") version "2.0.0-beta.17" + id("moe.luminolmc.hyacinthusweight.patcher") version "+" // Automatically pulls the latest } paperweight { @@ -41,6 +41,7 @@ paperweight { } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" +val menthaMavenPublicUrl = "https://repo.menthamc.com/repository/maven-public/"; subprojects { apply(plugin = "java-library") @@ -55,6 +56,7 @@ subprojects { repositories { mavenCentral() maven(paperMavenPublicUrl) + maven(menthaMavenPublicUrl) } dependencies { @@ -65,15 +67,15 @@ subprojects { isPreserveFileTimestamps = false isReproducibleFileOrder = true } - tasks.withType { + tasks.withType().configureEach { options.encoding = Charsets.UTF_8.name() options.release = 21 options.isFork = true } - tasks.withType { + tasks.withType().configureEach { options.encoding = Charsets.UTF_8.name() } - tasks.withType { + tasks.withType().configureEach { filteringCharset = Charsets.UTF_8.name() } tasks.withType { @@ -89,14 +91,14 @@ subprojects { maven("https://repo.menthamc.com/repository/maven-snapshots/") { name = "MenthaMC" credentials(PasswordCredentials::class) { - username = System.getenv("MAVEN_REPO_USER") - password = System.getenv("MAVEN_REPO_PASSWORD") + username = System.getenv("PRIVATE_MAVEN_REPO_USERNAME") + password = System.getenv("PRIVATE_MAVEN_REPO_PASSWORD") } } } } - tasks.withType { + tasks.withType().configureEach { options { (this as StandardJavadocDocletOptions).apply { addStringOption("-add-modules", "jdk.incubator.vector") @@ -104,4 +106,4 @@ subprojects { } } } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index abeb266..4e018a1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=fun.bm.lophine version=1.21.7-R0.1-SNAPSHOT mcVersion=1.21.7 -luminolRef=2a2fd3b68f3b2229dbed85108e0c4c41528ff324 +luminolRef=1cb5d158eaa29ff188ae9f09091d7fe6814df3dc org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..002b867 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index fabe33d..f36b677 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,6 +3,7 @@ pluginManagement { gradlePluginPortal() mavenLocal() maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.menthamc.com/repository/maven-public/") } }