From daedaa2315a12a75b5f29a585b164e584df23059 Mon Sep 17 00:00:00 2001 From: Bacteriawa Date: Fri, 23 May 2025 23:03:39 +0800 Subject: [PATCH] update 1.21.5 --- .../{build_1.21.4.yml => build_1.21.5.yml} | 6 ++--- build.gradle.kts | 2 +- gradle.properties | 6 ++--- gradlew | 6 ++--- gradlew.bat | 4 +-- luminol-api/build.gradle.kts.patch | 14 +++++----- luminol-server/build.gradle.kts.patch | 27 +++++++++---------- 7 files changed, 31 insertions(+), 34 deletions(-) rename .github/workflows/{build_1.21.4.yml => build_1.21.5.yml} (95%) diff --git a/.github/workflows/build_1.21.4.yml b/.github/workflows/build_1.21.5.yml similarity index 95% rename from .github/workflows/build_1.21.4.yml rename to .github/workflows/build_1.21.5.yml index edf044d..00083f0 100644 --- a/.github/workflows/build_1.21.4.yml +++ b/.github/workflows/build_1.21.5.yml @@ -1,10 +1,10 @@ -name: Luminol CI - dev/1.21.4-hardfork +name: Luminol CI - dev/1.21.5 on: push: - branches: [ "dev/1.21.4-hardfork" ] + branches: [ "dev/1.21.5" ] pull_request: - branches: [ "dev/1.21.4-hardfork" ] + branches: [ "dev/1.21.5" ] permissions: write-all diff --git a/build.gradle.kts b/build.gradle.kts index cb6fa68..edf8f61 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.14" + id("io.papermc.paperweight.patcher") version "2.0.0-beta.17" } paperweight { diff --git a/gradle.properties b/gradle.properties index bc35375..764bfa5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group = me.earthme.luminol -version=1.21.4-R0.1-SNAPSHOT -mcVersion=1.21.4 +version=1.21.5-R0.1-SNAPSHOT +mcVersion=1.21.5 -foliaRef=f69d1c974daa7646b869d4c11dcc86915eec96a8 +foliaRef=c299a7e8e7f12ff02f3cba19fd4797be0792caa8 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/gradlew b/gradlew index f3b75f3..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..db3a6ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/luminol-api/build.gradle.kts.patch b/luminol-api/build.gradle.kts.patch index 29d7e1f..d1ee7dd 100644 --- a/luminol-api/build.gradle.kts.patch +++ b/luminol-api/build.gradle.kts.patch @@ -1,16 +1,16 @@ --- a/folia-api/build.gradle.kts +++ b/folia-api/build.gradle.kts -@@ -54,6 +_,7 @@ +@@ -51,6 +_,7 @@ api("org.apache.logging.log4j:log4j-api:$log4jVersion") api("org.slf4j:slf4j-api:$slf4jVersion") api("com.mojang:brigadier:1.3.10") + api("io.sentry:sentry:8.0.0-rc.2") // Pufferfish // Deprecate bungeecord-chat in favor of adventure - api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") { -@@ -104,17 +_,21 @@ + api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") { +@@ -101,17 +_,21 @@ java { - srcDir(generatedApiPath) + srcDir(generatedDir) srcDir(file("../paper-api/src/main/java")) + srcDir(file("../folia-api/src/main/java")) } @@ -30,9 +30,9 @@ } } } -@@ -258,3 +_,10 @@ - tasks.check { - dependsOn(scanJarForOldGeneratedCode) +@@ -257,3 +_,10 @@ + dependsOn(scanJarForOldGeneratedCode) + } } + +// Pufferfish Start diff --git a/luminol-server/build.gradle.kts.patch b/luminol-server/build.gradle.kts.patch index c5ae4d0..d2f4b36 100644 --- a/luminol-server/build.gradle.kts.patch +++ b/luminol-server/build.gradle.kts.patch @@ -1,17 +1,14 @@ --- a/folia-server/build.gradle.kts +++ b/folia-server/build.gradle.kts -@@ -20,8 +_,9 @@ - minecraftVersion = providers.gradleProperty("mcVersion") - // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java") - // gitFilePatches = true -- -+ +@@ -29,6 +_,7 @@ + //} + val fork = forks.register("folia") { + rootDirectory = upstreamsDirectory().map { it.dir("folia") } upstream.patchDir("paperServer") { upstreamPath = "paper-server" excludes = setOf("src/minecraft", "patches", "build.gradle.kts") -@@ -30,7 +_,23 @@ +@@ -37,7 +_,23 @@ } } @@ -35,10 +32,10 @@ + activeFork = luminol spigot { - buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42" -@@ -116,10 +_,14 @@ + buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc" +@@ -123,10 +_,14 @@ main { - java { srcDir("../paper-server/src/main/java") } + java { srcDir("../paper-server/src/main/java"); srcDir("../paper-server/src/generated/java") } resources { srcDir("../paper-server/src/main/resources") } + java { srcDir("../folia-server/src/main/java") } + resources { srcDir("../folia-server/src/main/resources") } @@ -50,8 +47,8 @@ + resources { srcDir("../folia-server/src/test/resources") } } } - -@@ -143,7 +_,14 @@ + val log4jPlugins = sourceSets.create("log4jPlugins") { +@@ -153,7 +_,14 @@ } dependencies { @@ -67,8 +64,8 @@ implementation("ca.spottedleaf:concurrentutil:0.0.3") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 -@@ -201,26 +_,33 @@ - implementation("me.lucko:spark-paper:1.10.119-20241121.092015-1") +@@ -217,26 +_,33 @@ + implementation("me.lucko:spark-paper:1.10.133-20250413.112336-1") } +// Pufferfish Start @@ -107,7 +104,7 @@ "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, -@@ -351,3 +_,10 @@ +@@ -393,3 +_,10 @@ classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip }) mainClass.set(null as String?) }