From 0eebea7a21a962c5c0ced6fa898c35e44dd9aaf2 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Sun, 20 Jul 2025 12:53:28 +0800 Subject: [PATCH] Update Upstream(Luminol) --- .github/workflows/build.yml | 6 +++--- gradle.properties | 2 +- lophine-server/build.gradle.kts.patch | 13 +++++++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27f9aff..2e47cfd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,15 +34,15 @@ jobs: run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI" - name: Apply All Patches - run: ./gradlew applyAllPatches + run: ./gradlew --refresh-dependencies applyAllPatches - name: CreateMojmapPaperclipJar - run: ./gradlew createMojmapPaperclipJar + run: ./gradlew --refresh-dependencies createMojmapPaperclipJar - name: Publish to repo if: github.event_name != 'pull_request' && false # do not push to any repo continue-on-error: true - run: ./gradlew generateDevelopmentBundle publish -PpublishDevBundle=true + run: ./gradlew --refresh-dependencies generateDevelopmentBundle publish -PpublishDevBundle=true env: PRIVATE_MAVEN_REPO_PASSWORD: ${{ secrets.PRIVATE_MAVEN_REPO_PASSWORD }} PRIVATE_MAVEN_REPO_USERNAME: ${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }} diff --git a/gradle.properties b/gradle.properties index 4cf272c..2d5693e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ mcVersion=1.21.8 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=5ec3986e676e309dd9a406693f1e396c941c18f0 +luminolRef=6dddf1aaed3c7d27c4bbb2fc81e5649aa2aaac84 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/build.gradle.kts.patch b/lophine-server/build.gradle.kts.patch index a0fca51..df611d3 100644 --- a/lophine-server/build.gradle.kts.patch +++ b/lophine-server/build.gradle.kts.patch @@ -51,7 +51,7 @@ // Luminol start - Dependenices insert implementation("com.electronwill.night-config:toml:3.8.2") // Night config implementation("com.github.luben:zstd-jni:1.5.4-1") -@@ -264,14 +_,14 @@ +@@ -267,14 +_,14 @@ val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -62,7 +62,7 @@ - "Specification-Title" to "Luminol", + "Specification-Title" to "Lophine", "Specification-Version" to project.version, - "Specification-Vendor" to "Luminol Team", + "Specification-Vendor" to "LuminolMC org", - "Brand-Id" to "luminolmc:luminol", - "Brand-Name" to "Luminol", + "Brand-Id" to "luminolmc:lophine", @@ -70,3 +70,12 @@ "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, +@@ -438,7 +_,7 @@ + } + + fill { +- project("luminol") ++ project("lophine") + versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") }) + version(paperweight.minecraftVersion) +