this is important...

This commit is contained in:
granny
2025-06-23 20:53:00 -07:00
parent 4a5974cf33
commit 3893bba083

View File

@@ -1,6 +1,6 @@
--- a/paper-server/build.gradle.kts --- a/paper-server/build.gradle.kts
+++ b/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts
@@ -4,6 +_,7 @@ @@ -5,6 +_,7 @@
import paper.libs.com.google.gson.annotations.SerializedName import paper.libs.com.google.gson.annotations.SerializedName
import java.time.Instant import java.time.Instant
import kotlin.io.path.readText import kotlin.io.path.readText
@@ -8,7 +8,7 @@
plugins { plugins {
`java-library` `java-library`
@@ -24,6 +_,18 @@ @@ -26,6 +_,18 @@
minecraftVersion = providers.gradleProperty("mcVersion") minecraftVersion = providers.gradleProperty("mcVersion")
gitFilePatches = false gitFilePatches = false
@@ -27,7 +27,7 @@
spigot { spigot {
enabled = true enabled = true
buildDataRef = "281ac0de7a76d808753ede97d11b034bc801b63d" buildDataRef = "281ac0de7a76d808753ede97d11b034bc801b63d"
@@ -105,7 +_,21 @@ @@ -107,7 +_,21 @@
} }
} }
@@ -50,7 +50,7 @@
configurations.named(log4jPlugins.compileClasspathConfigurationName) { configurations.named(log4jPlugins.compileClasspathConfigurationName) {
extendsFrom(configurations.compileClasspath.get()) extendsFrom(configurations.compileClasspath.get())
} }
@@ -127,7 +_,7 @@ @@ -129,7 +_,7 @@
} }
dependencies { dependencies {
@@ -59,7 +59,7 @@
implementation("ca.spottedleaf:concurrentutil:0.0.3") 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-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 implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
@@ -155,6 +_,10 @@ @@ -157,6 +_,10 @@
implementation("org.spongepowered:configurate-yaml:4.2.0-20250225.064233-199") implementation("org.spongepowered:configurate-yaml:4.2.0-20250225.064233-199")
implementation("org.spongepowered:configurate-core:4.2.0-20250225.064233-204") // Pinned dependency of above pinned yaml snapshot. implementation("org.spongepowered:configurate-core:4.2.0-20250225.064233-204") // Pinned dependency of above pinned yaml snapshot.
@@ -70,7 +70,7 @@
// Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed // Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed
runtimeOnly("commons-lang:commons-lang:2.6") runtimeOnly("commons-lang:commons-lang:2.6")
runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0") runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0")
@@ -203,14 +_,14 @@ @@ -205,14 +_,14 @@
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -90,7 +90,7 @@
"Build-Number" to (build ?: ""), "Build-Number" to (build ?: ""),
"Build-Time" to buildTime.toString(), "Build-Time" to buildTime.toString(),
"Git-Branch" to gitBranch, "Git-Branch" to gitBranch,
@@ -269,7 +_,7 @@ @@ -271,7 +_,7 @@
jvmArgumentProviders.add(provider) jvmArgumentProviders.add(provider)
} }
@@ -99,7 +99,7 @@
idea { idea {
module { module {
generatedSourceDirs.add(generatedDir.toFile()) generatedSourceDirs.add(generatedDir.toFile())
@@ -372,3 +_,43 @@ @@ -374,6 +_,46 @@
classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip }) classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip })
mainClass.set(null as String?) mainClass.set(null as String?)
} }
@@ -143,3 +143,6 @@
+// +//
+// return files.size +// return files.size
+// } +// }
fill {
project("paper")