Update upstream (#28)

gommehdnet · Oct 28, 2024 · 4210fd7 · 4210fd7
1 parent 7b352ff
commit 4210fd7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.gommehd.cheetah
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=57c75a4b67a8b3b3c607126130b7503658b5e98a
+paperRef=d348cb88a9fe8d19e46102c8b9febe18f746d46b
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 568d0b65bb5010e0ab365cb47b624720807a1f63..e5918caf0ccb480d45a28d2249f497735ae961f8 100644
+index de0474b8dce58cb419c00b7614d7dd66be832a02..0f5adb7190734a8c48a50f07714a70b9d422fa29 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -17,7 +17,7 @@ index 568d0b65bb5010e0ab365cb47b624720807a1f63..e5918caf0ccb480d45a28d2249f49773
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -84,14 +84,14 @@ tasks.jar {
+@@ -85,14 +85,14 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -37,7 +37,7 @@ index 568d0b65bb5010e0ab365cb47b624720807a1f63..e5918caf0ccb480d45a28d2249f49773
              "Build-Number" to (build ?: ""),
              "Build-Time" to Instant.now().toString(),
              "Git-Branch" to gitBranch, // Paper
-@@ -148,7 +148,7 @@ fun TaskContainer.registerRunTask(
+@@ -153,7 +153,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {

diff --git a/patches/server/0017-ignore-javadoc-errors.patch b/patches/server/0017-ignore-javadoc-errors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ignore javadoc errors
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e5918caf0ccb480d45a28d2249f497735ae961f8..0f441fda9a10ac72a17948c6bce28138ad23cd37 100644
+index 0f5adb7190734a8c48a50f07714a70b9d422fa29..ebad9821f37000174168918b105c7a04ac36a60a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -110,6 +110,12 @@ tasks.compileTestJava {
+@@ -111,6 +111,12 @@ tasks.compileTestJava {
  }
  // Paper end