LOG:
[DEBUG] Patching: paper-server/build.gradle.kts
[WARN] Hunk 0: FAILURE: @@ -21,8 +21,19 @@
[WARN] Hunk 1: FAILURE: @@ -105,7 +116,20 @@
[WARN] Hunk 2: FAILURE: @@ -123,7 +147,8 @@
i am not able to patch paper-server. please help.
build.gradle.kts.patch
build.gradle.kts.patch.rej:
++++ REJECTED HUNK: 1
@@ -21,8 +21,19 @@
// macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
// gitFilePatches = true
+ val fork = forks.register("ApproximasterSmartServer2004") {
+ upstream.patchDir("paperServer") {
+ upstreamPath = "paper-server"
+ excludes = setOf("src/minecraft", "patches", "build.gradle.kts")
+ patchesDir = rootDirectory.dir("Smart-Server/paper-patches")
+ outputDir = rootDirectory.dir("paper-server")
+ }
+ }
+
+ activeFork = fork
+
paper {
- reobfMappingsPatch = layout.projectDirectory.file("../build-data/reobf-mappings-patch.tiny")
+ paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
}
spigot {
++++ END HUNK
++++ REJECTED HUNK: 2
@@ -105,7 +116,20 @@
}
}
-val log4jPlugins = sourceSets.create("log4jPlugins")
+sourceSets {
+ main {
+ java { srcDir("../paper-server/src/main/java") }
+ resources { srcDir("../paper-server/src/main/resources") }
+ }
+ test {
+ java { srcDir("../paper-server/src/test/java") }
+ resources { srcDir("../paper-server/src/test/resources") }
+ }
+}
+
+val log4jPlugins = sourceSets.create("log4jPlugins") {
+ java { srcDir("../paper-server/src/log4jPlugins/java") }
+}
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
extendsFrom(configurations.compileClasspath.get())
}
++++ END HUNK
++++ REJECTED HUNK: 3
@@ -123,7 +147,8 @@
}
dependencies {
- implementation(project(":paper-api"))
+ implementation(project(":Smart-BukkitAPI"))
+ // Sponge API Soon
implementation("ca.spottedleaf:concurrentutil:0.0.2")
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
++++ END HUNK
LOG:
i am not able to patch paper-server. please help.
build.gradle.kts.patch
build.gradle.kts.patch.rej: