update upstream

.github/workflows/build.yml

@@ -33,10 +33,10 @@ jobs:
       - name: Bundle
         run: ./gradlew createMojmapBundlerJar --info
       - name: Rename Artifact
-        run: mv build/libs/cheetah-1.21.3-bundler-1.21.3-R0.1-SNAPSHOT-mojmap.jar build/libs/cheetah-1.21.3.jar
+        run: mv build/libs/cheetah-1.21.4-bundler-1.21.4-R0.1-SNAPSHOT-mojmap.jar build/libs/cheetah-1.21.4.jar
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Cheetah-1.21.3
-          path: build/libs/cheetah-1.21.3.jar
+          name: Cheetah-1.21.4
+          path: build/libs/cheetah-1.21.4.jar
           if-no-files-found: error

README.md

@@ -1,4 +1,4 @@
-# GommeHD.net Cheetah 1.21.3
+# GommeHD.net Cheetah 1.21.4
 
 [![Patch and Build](https://github.com/gommehdnet/cheetah/actions/workflows/build.yml/badge.svg)](https://github.com/gommehdnet/cheetah/actions/workflows/build.yml)
 
@@ -10,7 +10,7 @@ This is a fork of Paper tailored for the use at GommeHD.net
 - On Windows, make sure that `git config core.longpaths true` is set for this project
 - Run `./gradlew applyPatches` to apply the patches
 - Run `./gradlew createMojmapBundlerJar` to create the final jar file
-- The final jar file can be found in `build/libs/cheetah-1.21.3-bundler-1.21.3-R0.1-SNAPSHOT-reobf.jar`
+- The final jar file can be found in `build/libs/cheetah-1.21.4-bundler-1.21.4-R0.1-SNAPSHOT-reobf.jar`
 
 ## How to use the API with Maven?
 Currently, it is not possible to add a dependency containing NMS code, the API, and dependencies to the classpath. The current solution is to use the cheetah API combined with the normal Spigot NMS. 
@@ -21,7 +21,7 @@ Thus, changes to the NMS code will not be reflected to plugins using it.
 <dependency>
   <groupId>net.gommehd.cheetah</groupId>
   <artifactId>cheetah-api</artifactId>
-  <version>1.21.3-R0.1-SNAPSHOT</version>
+  <version>1.21.4-R0.1-SNAPSHOT</version>
 </dependency>
 ```
 

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.7.5"
+    id("io.papermc.paperweight.patcher") version "1.7.7"
 }
 
 val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"

gradle.properties

@@ -1,8 +1,8 @@
 group=net.gommehd.cheetah
-version=1.21.3-R0.1-SNAPSHOT
+version=1.21.4-R0.1-SNAPSHOT
 
-mcVersion=1.21.3
-paperRef=da7138233f6392e791d790d1c3407414c855f9c2
+mcVersion=1.21.4
+paperRef=d4630f1223ba8cef0f9767d22f70999f1292cbcf
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/api/0006-ignore-javadoc-errors.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] ignore javadoc errors
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e29e5024fa693baae469d47fe77b57118f14627c..1701435967740b55563454eb2b1a61f10fedea05 100644
+index 571534b42cd9c33d6a7bb6fe3bf3a28e33f8e5de..8daeb74ae931c1400971912bce5f4623f643c078 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -160,6 +160,7 @@ tasks.jar {
+@@ -162,6 +162,7 @@ tasks.jar {
  }
 
  tasks.withType<Javadoc> {

patches/api/0007-temp-remove-javadoc-links.patch

@@ -5,27 +5,27 @@ Subject: [PATCH] temp remove javadoc links
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1701435967740b55563454eb2b1a61f10fedea05..b579f5f237dbb3f17a03ef3698c84b9450d08965 100644
+index 8daeb74ae931c1400971912bce5f4623f643c078..52b16fc3d87035232a21a4680d954732e2a5abbf 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -167,12 +167,12 @@ tasks.withType<Javadoc> {
+@@ -169,12 +169,12 @@ tasks.withType<Javadoc> {
      options.isDocFilesSubDirs = true
      options.links(
-         "https://guava.dev/releases/32.1.2-jre/api/docs/",
+         "https://guava.dev/releases/33.3.1-jre/api/docs/",
 -        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
 +        // "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", // Cheetah - temp remove javadoc links
 +        // "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations // Cheetah - temp remove javadoc links
          // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
          // Paper start - add missing javadoc links
--        "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
--        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
-+        // "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html", // Cheetah - temp remove javadoc links
-+        // "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", // Cheetah - temp remove javadoc links
+-        "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
+-        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
++        // "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html", // Cheetah - temp remove javadoc links
++        // "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0", // Cheetah - temp remove javadoc links
          "https://jspecify.dev/docs/api/",
          // Paper end
          // Paper start
-@@ -183,10 +183,10 @@ tasks.withType<Javadoc> {
+@@ -185,10 +185,10 @@ tasks.withType<Javadoc> {
          "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
          "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
          "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",

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 faf3e3fd72e8c915e7a4803dacbe1bb576c6663e..b13c4c5b1e5162103ab57fa6c4338096589af925 100644
+index 2da91ed6363c0851e4c459188f5e8ef5475e0c97..edbe0313184cd099c8b47d0d34af4dcaf6b3d516 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
@@ -14,10 +14,10 @@ index faf3e3fd72e8c915e7a4803dacbe1bb576c6663e..b13c4c5b1e5162103ab57fa6c4338096
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":cheetah-api")) // Cheetah - Build changes
+     implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency
      // Paper start
      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 {
+@@ -100,14 +100,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 faf3e3fd72e8c915e7a4803dacbe1bb576c6663e..b13c4c5b1e5162103ab57fa6c4338096
              "Build-Number" to (build ?: ""),
              "Build-Time" to Instant.now().toString(),
              "Git-Branch" to gitBranch, // Paper
-@@ -172,7 +172,7 @@ fun TaskContainer.registerRunTask(
+@@ -173,7 +173,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {

patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] added ProjectileAllowCollideWithPlayerEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 6c2d4d6f3a36ab452dfd3c33f66e54f152906639..6daf09689b6b880f5e341e1c6382183058569b06 100644
+index 9a7b56b653848974e1194eb4f6d40cb99a96ff57..c4b18f924f8d905a9ced0d0fd741b8f68276ddd2 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -435,7 +435,10 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -420,7 +420,10 @@ public abstract class Projectile extends Entity implements TraceableEntity {
              if (entity1 instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer) {
                  org.bukkit.entity.Player collided = (org.bukkit.entity.Player) entity.getBukkitEntity();
                  org.bukkit.entity.Player shooter = (org.bukkit.entity.Player) entity1.getBukkitEntity();

patches/server/0006-support-case-insensitive-commands.patch

@@ -8,10 +8,10 @@ Content-Transfer-Encoding: 8bit
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b5d5dbc50a7b8c40739a15f164ffd08fdc534f9c..6978078736baf5f5895122dff9f82d3b25ef1c60 100644
+index 84fa24880d02dc7ba1ec8bda3575be38447fd4b2..77532112a24b8c1ef59b43317548ebc7a28a5b1c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2369,10 +2369,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2429,10 +2429,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          return new SignedMessageChain.DecodeException(ServerGamePacketListenerImpl.INVALID_COMMAND_SIGNATURE);
      }
 

patches/server/0007-expose-constructor-for-player-info-update-packet.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] expose constructor for player info update packet
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
-index 9ccca41bf23efadba5329cc584bbcdcacbe09a92..58b9588f30b0fc5a8e813f582a8a6c39efcfbddd 100644
+index e2541a3886504b143f858a4e75ac4746d4d39e28..afa8c0283b5a08b96075f159e0808f0bea5362c9 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
-@@ -49,6 +49,13 @@ public class ClientboundPlayerInfoUpdatePacket implements Packet<ClientGamePacke
+@@ -50,6 +50,13 @@ public class ClientboundPlayerInfoUpdatePacket implements Packet<ClientGamePacke
      }
      // Paper end - Add Listing API for Player
 

patches/server/0010-return-false-when-the-allied-team-is-the-collide-rul.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] return false when the allied team is the collide rule team
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a15546e433ebba6c0de01bdaaef201a3d99a87b5..d84ecf85ce7fe82e18853959e076dd65c54e6dcb 100644
+index 1b547be0fe97119edf4f29666cfe0037e0c778e0..67811aa01d68f0798bb517d3a038ca9b4968b59c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3610,7 +3610,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3640,7 +3640,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
 
      public boolean isAlliedTo(@Nullable Team team) {

patches/server/0011-do-not-break-message-chain-if-proxy-cancels-a-chat-m.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] do not break message chain if proxy cancels a chat message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1e62ae228e77e6c1f7f1fa90a826fc6dd23c0a35..4105bd3926c06b2d0047db38f8e03c2dab38da3f 100644
+index 77532112a24b8c1ef59b43317548ebc7a28a5b1c..6413a615557ccd0fa074cb320c6330183e9da7ce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2172,12 +2172,23 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2232,12 +2232,23 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
 
      @Override
@@ -33,7 +33,7 @@ index 1e62ae228e77e6c1f7f1fa90a826fc6dd23c0a35..4105bd3926c06b2d0047db38f8e03c2d
          // CraftBukkit end
          Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(packet.lastSeenMessages());
 
-@@ -2192,6 +2203,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2252,6 +2263,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      return;
                  }
 
@@ -47,7 +47,7 @@ index 1e62ae228e77e6c1f7f1fa90a826fc6dd23c0a35..4105bd3926c06b2d0047db38f8e03c2d
                  CompletableFuture<FilteredText> completablefuture = this.filterTextPacket(playerchatmessage.signedContent()).thenApplyAsync(Function.identity(), this.server.chatExecutor); // CraftBukkit - async chat
                  CompletableFuture<Component> componentFuture = this.server.getChatDecorator().decorate(this.player, null, playerchatmessage.decoratedContent()); // Paper - Adventure
 
-@@ -2244,9 +2262,24 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2304,9 +2322,24 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
      @Override
      public void handleSignedChatCommand(ServerboundChatCommandSignedPacket packet) {

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 f36a075dbee2b96d01899e02460b1d8443e91749..8c00e16e070d90928282f653d2a88c09584989ba 100644
+index 96b4fbe4a4655777ff10b32e3257e2fac2aba12a..f33e915137d7f5de49b9a686b060d11595cad425 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2018,6 +2018,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2029,6 +2029,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
      }
 

patches/server/0015-Async-able-StructuresLocateEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Async-able StructuresLocateEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 488938c32a48437721a71d294c77468f00c035b9..2ca1dc25002a8717b4e1c597574eda29c7594273 100644
+index e0cb360ece042c4fc6aa0d10106923fe25288f5c..72c2272f393d2a4c8de524fdf53fd9c9f9cb945a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -131,7 +131,7 @@ public abstract class ChunkGenerator {
+@@ -132,7 +132,7 @@ public abstract class ChunkGenerator {
          final org.bukkit.Location origin = io.papermc.paper.util.MCUtil.toLocation(world, center);
          final List<org.bukkit.generator.structure.Structure> apiStructures = structures.stream().map(Holder::value).map(nms -> org.bukkit.craftbukkit.generator.structure.CraftStructure.minecraftToBukkit(nms)).toList();
          if (!apiStructures.isEmpty()) {

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

patches/server/0018-Fix-GLOBAL-1080-Paper-9350.patch

@@ -18,10 +18,10 @@ index cfeeddf2cb4ff50dbc29c6913e78ca1dee076790..960b28620ae4fc75e61be73eddcd4f1b
                  if (flag && !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Paper - only consider hits
                      flag = false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5a8f396d47577f087abb415c972fd4f51e50faba..9553c4ca501ab3414c4d60bc8fcc4529adff8f46 100644
+index fc7f7a34babd095a51b5321f600aef65a2a9d123..59bf64335563e0c995785df12196572ff075177e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1013,8 +1013,23 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -1010,8 +1010,23 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
 
          if (entity != this) {
              if (entity.isAlive()) {

patches/server/0020-fix-NaN-delta-movement.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] fix NaN delta movement
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-index a84dccc59f9dc5298b18f263dc779c30c9b7ddab..311813a2e78070eed895eeb793836fbdb5cdc76b 100644
+index 19ff16e1ba406584f3cdd760d0269a50980b0a26..00f3c8b9db31f85da190ab4554dbfeb6b1e442dd 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-@@ -97,6 +97,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -93,6 +93,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
                  this.igniteForSeconds(1.0F);
              }
 

settings.gradle.kts

@@ -5,6 +5,6 @@ pluginManagement {
     }
 }
 
-rootProject.name = "cheetah-1.21.3"
+rootProject.name = "cheetah-1.21.4"
 
 include("cheetah-api", "cheetah-server")