mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
fix build.gradle patch
This commit is contained in:
@@ -1,12 +1,19 @@
|
||||
--- a/paper-server/build.gradle.kts
|
||||
+++ b/paper-server/build.gradle.kts
|
||||
@@ -19,7 +_,17 @@
|
||||
@@ -18,11 +_,21 @@
|
||||
|
||||
paperweight {
|
||||
minecraftVersion = providers.gradleProperty("mcVersion")
|
||||
// macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
|
||||
- // gitFilePatches = true
|
||||
- gitFilePatches = false
|
||||
-
|
||||
- updatingMinecraft {
|
||||
- oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365"
|
||||
+ gitFilePatches = true
|
||||
+
|
||||
+ //updatingMinecraft {
|
||||
+ // oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365"
|
||||
+ //}
|
||||
+
|
||||
+ val purpur = forks.register("purpur") {
|
||||
+ upstream.patchDir("paperServer") {
|
||||
+ upstreamPath = "paper-server"
|
||||
@@ -14,16 +21,17 @@
|
||||
+ patchesDir = rootDirectory.dir("purpur-server/paper-patches")
|
||||
+ outputDir = rootDirectory.dir("paper-server")
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
+ activeFork = purpur
|
||||
|
||||
spigot {
|
||||
buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
|
||||
@@ -101,7 +_,20 @@
|
||||
@@ -104,7 +_,21 @@
|
||||
}
|
||||
}
|
||||
|
||||
-val log4jPlugins = sourceSets.create("log4jPlugins")
|
||||
+
|
||||
+sourceSets {
|
||||
+ main {
|
||||
+ java { srcDir("../paper-server/src/main/java") }
|
||||
@@ -41,7 +49,7 @@
|
||||
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
|
||||
extendsFrom(configurations.compileClasspath.get())
|
||||
}
|
||||
@@ -119,7 +_,7 @@
|
||||
@@ -122,7 +_,7 @@
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -50,7 +58,7 @@
|
||||
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
|
||||
@@ -150,6 +_,10 @@
|
||||
@@ -153,6 +_,10 @@
|
||||
runtimeOnly("com.mysql:mysql-connector-j:9.1.0")
|
||||
runtimeOnly("com.lmax:disruptor:3.4.4")
|
||||
|
||||
@@ -61,23 +69,23 @@
|
||||
runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
|
||||
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
||||
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
||||
@@ -189,14 +_,14 @@
|
||||
@@ -192,14 +_,14 @@
|
||||
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
|
||||
attributes(
|
||||
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
||||
- "Implementation-Title" to "Paper",
|
||||
+ "Implementation-Title" to "Purpur", // Purpur
|
||||
+ "Implementation-Title" to "Purpur",
|
||||
"Implementation-Version" to implementationVersion,
|
||||
"Implementation-Vendor" to date,
|
||||
- "Specification-Title" to "Paper",
|
||||
+ "Specification-Title" to "Purpur", // Purpur
|
||||
+ "Specification-Title" to "Purpur",
|
||||
"Specification-Version" to project.version,
|
||||
- "Specification-Vendor" to "Paper Team",
|
||||
- "Brand-Id" to "papermc:paper",
|
||||
- "Brand-Name" to "Paper",
|
||||
+ "Specification-Vendor" to "Purpur Team", // Purpur
|
||||
+ "Brand-Id" to "purpurmc:purpur", // Purpur
|
||||
+ "Brand-Name" to "Purpur", // Purpur
|
||||
+ "Specification-Vendor" to "Purpur Team",
|
||||
+ "Brand-Id" to "purpurmc:purpur",
|
||||
+ "Brand-Name" to "Purpur",
|
||||
"Build-Number" to (build ?: ""),
|
||||
"Build-Time" to buildTime.toString(),
|
||||
"Git-Branch" to gitBranch,
|
||||
|
||||
Reference in New Issue
Block a user