update upstream

gommehdnet · Nov 21, 2024 · 3a1deb2 · 3a1deb2
1 parent 6ce3a83
commit 3a1deb2
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.7.4"
+    id("io.papermc.paperweight.patcher") version "1.7.5"
 }
 
 val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.gommehd.cheetah
 version=1.21.3-R0.1-SNAPSHOT
 
 mcVersion=1.21.3
-paperRef=661839e0334b68600bfcf58507c932f5743b7d90
+paperRef=c28d89d625c60243c52857e0c7e6398b73602156
 
 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 c209eb393670fd8d6c97ca65a801c8032b582a35..9444b68e3a7fb9b81254198147c81124197ea97f 100644
+index faf3e3fd72e8c915e7a4803dacbe1bb576c6663e..b13c4c5b1e5162103ab57fa6c4338096589af925 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
@@ -15,9 +15,9 @@ index c209eb393670fd8d6c97ca65a801c8032b582a35..9444b68e3a7fb9b81254198147c81124
 -    implementation(project(":paper-api"))
 +    implementation(project(":cheetah-api")) // Cheetah - Build changes
      // Paper start
-     implementation("org.jline:jline-terminal-jansi:3.21.0")
-     implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -98,14 +98,14 @@ tasks.jar {
+     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
+@@ -99,14 +99,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 c209eb393670fd8d6c97ca65a801c8032b582a35..9444b68e3a7fb9b81254198147c81124
              "Build-Number" to (build ?: ""),
              "Build-Time" to Instant.now().toString(),
              "Git-Branch" to gitBranch, // Paper
-@@ -171,7 +171,7 @@ fun TaskContainer.registerRunTask(
+@@ -172,7 +172,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {

diff --git a/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch b/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch
@@ -21,10 +21,10 @@ index 6c2d4d6f3a36ab452dfd3c33f66e54f152906639..6daf09689b6b880f5e341e1c63821830
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index deba03eb37012c638e08e20cd1c98e9db190c790..d6348437f84e1802124a08463df6aa7b843b3263 100644
+index e37aaf77f94b97b736cc20ef070cefdff0400188..37eacb6f0ebe1bf32e47d8e61562ad3a973dd534 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1473,7 +1473,10 @@ public class CraftEventFactory {
+@@ -1479,7 +1479,10 @@ public class CraftEventFactory {
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
 
          if (projectile.getShooter() instanceof Player && collided instanceof Player) {
@@ -36,7 +36,7 @@ index deba03eb37012c638e08e20cd1c98e9db190c790..d6348437f84e1802124a08463df6aa7b
                  event.setCancelled(true);
                  return event;
              }
-@@ -1484,6 +1487,15 @@ public class CraftEventFactory {
+@@ -1490,6 +1493,15 @@ public class CraftEventFactory {
      }
      // Paper end
 

diff --git a/patches/server/0013-Added-VillagerGiveGiftToHeroEvent.patch b/patches/server/0013-Added-VillagerGiveGiftToHeroEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added VillagerGiveGiftToHeroEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9c61225a728a2ca91a1c71dead75fc7cd93668b6..670408b6b87f496674c2f347497c587b065ca6b8 100644
+index f36a075dbee2b96d01899e02460b1d8443e91749..8c00e16e070d90928282f653d2a88c09584989ba 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2012,6 +2012,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2018,6 +2018,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
      }
 

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 9444b68e3a7fb9b81254198147c81124197ea97f..e80435efc6e0f73aea6c58d77e3c6b3dc156981d 100644
+index b13c4c5b1e5162103ab57fa6c4338096589af925..dd5646d1362594498cd931b7386d4ee314a3b216 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -124,6 +124,12 @@ tasks.compileTestJava {
+@@ -125,6 +125,12 @@ tasks.compileTestJava {
  }
  // Paper end