1.21.11

.github/workflows/build.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     env:
       BUILD_NUMBER: ${{ github.run_number }}
-      MINECRAFT_VERSION: 1.21.10
+      MINECRAFT_VERSION: 1.21.11
 
     # Only run on PRs if the source branch is on someone else's repo
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}

README.md

@@ -1,16 +1,16 @@
-# GommeHD.net Cheetah 1.21.10
+# GommeHD.net Cheetah 1.21.11
 
 [![Patch and Build](https://github.com/gommehdnet/cheetah/actions/workflows/build.yml/badge.svg)](https://github.com/gommehdnet/cheetah/actions/workflows/build.yml)
 
 This is a fork of Paper tailored for the use at GommeHD.net
 
 ## How to build
 - Clone this repository
-- Open a shell (e.g. using Git Bash on Windows)
+- Open a shell (e.g., using Git Bash on Windows)
 - On Windows, make sure that `git config core.longpaths true` is set for this project
 - Run `./gradlew applyAllPatches` to apply the patches
 - Run `./gradlew createMojmapBundlerJar` to create the final jar file
-- The final jar file can be found in `cheetah-server/build/libs/cheetah-bundler-1.21.10-R0.1-SNAPSHOT-mojmap.jar`
+- The final jar file can be found in `cheetah-server/build/libs/cheetah-bundler-1.21.11-R0.1-SNAPSHOT-mojmap.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.10-R0.1-SNAPSHOT</version>
+  <version>1.21.11-R0.1-SNAPSHOT</version>
 </dependency>
 ```
 

build.gradle.kts

@@ -45,10 +45,6 @@ subprojects {
         maven(paperMavenPublicUrl)
     }
 
-    tasks.withType<AbstractArchiveTask>().configureEach {
-        isPreserveFileTimestamps = false
-        isReproducibleFileOrder = true
-    }
     tasks.withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
         options.release = 21

cheetah-api/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -89,7 +_,7 @@
+@@ -91,7 +_,7 @@
      testRuntimeOnly("org.junit.platform:junit-platform-launcher")
  }
 
@@ -9,7 +9,7 @@
  idea {
      module {
          generatedSourceDirs.add(generatedDir.toFile())
-@@ -99,6 +_,18 @@
+@@ -101,6 +_,18 @@
      main {
          java {
              srcDir(generatedDir)
@@ -28,7 +28,7 @@
          }
      }
  }
-@@ -165,7 +_,7 @@
+@@ -183,7 +_,7 @@
 
  tasks.withType<Javadoc>().configureEach {
      val options = options as StandardJavadocDocletOptions
@@ -37,7 +37,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -198,11 +_,11 @@
+@@ -217,11 +_,11 @@
      }
 
      // workaround for https://github.com/gradle/gradle/issues/4046

cheetah-api/paper-patches/files/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java.patch

@@ -1,14 +1,14 @@
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-@@ -31,6 +_,7 @@
+@@ -34,6 +_,7 @@
      private final InetAddress rawAddress;
      private final String hostname;
      private final boolean transferred;
 +    private boolean skipLog; // Cheetah - Allow skipping log messages for canceled login events
      private Result result;
      private Component message;
      private PlayerProfile profile;
-@@ -324,6 +_,16 @@
+@@ -327,6 +_,16 @@
      public static HandlerList getHandlerList() {
          return HANDLER_LIST;
      }

cheetah-api/src/main/java/io/papermc/paper/event/entity/EntityLungeEvent.java

@@ -0,0 +1,69 @@
+package io.papermc.paper.event.entity;
+
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Called when a living entity tries to lunge with a spear
+ */
+@NullMarked
+public class EntityLungeEvent extends EntityEvent implements Cancellable {
+
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    private int lungePower;
+    private boolean cancelled;
+
+    @ApiStatus.Internal
+    public EntityLungeEvent(final LivingEntity entity, int lungePower) {
+        super(entity);
+        this.lungePower = lungePower;
+    }
+
+    /**
+     * Gets the lunge power, which when initially passed, matches the enchantment level of the item, but can be higher.
+     *
+     * @return the lunge power
+     */
+    public int getLungePower() {
+        return lungePower;
+    }
+
+    /**
+     * Sets the lunge power. This commonly matches the enchantment level of the item, and can be set higher.
+     * <p>
+     * If set higher than 3, the power of the lunge will continue to scale like normal, as if the max enchantment
+     * level is higher.
+     * @param lungePower the new lunge power
+     */
+    public void setLungePower(final int lungePower) {
+        this.lungePower = lungePower;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    /**
+     * Set whether to cancel the lunge. If cancelled, the living entity will not lunge forward.
+     * @param cancel {@code true} if you wish to cancel this event
+     */
+    @Override
+    public void setCancelled(final boolean cancel) {
+        this.cancelled = cancel;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+}

cheetah-server/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -23,6 +_,17 @@
+@@ -22,6 +_,17 @@
      minecraftVersion = providers.gradleProperty("mcVersion")
      gitFilePatches = false
 
@@ -17,7 +17,7 @@
 +
      spigot {
          enabled = true
-         buildDataRef = "42d18d4c4653ffc549778dbe223f6994a031d69e"
+         buildDataRef = "17f77cee7117ab9d6175f088ae8962bfd04e61a9"
 @@ -104,7 +_,20 @@
      }
  }
@@ -46,10 +46,10 @@
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":cheetah-api"))
-     implementation("ca.spottedleaf:concurrentutil:0.0.7")
+     implementation("ca.spottedleaf:concurrentutil:0.0.8")
      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
-@@ -197,14 +_,14 @@
+@@ -198,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -69,7 +69,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -263,7 +_,7 @@
+@@ -264,7 +_,7 @@
      jvmArgumentProviders.add(provider)
  }
 

cheetah-server/minecraft-patches/sources/net/minecraft/advancements/AdvancementRewards.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/advancements/AdvancementRewards.java
 +++ b/net/minecraft/advancements/AdvancementRewards.java
-@@ -36,7 +_,7 @@
+@@ -37,7 +_,7 @@
      public static final AdvancementRewards EMPTY = new AdvancementRewards(0, List.of(), List.of(), Optional.empty());
 
      public void grant(ServerPlayer player) {
@@ -9,7 +9,7 @@
          ServerLevel serverLevel = player.level();
          MinecraftServer server = serverLevel.getServer();
          LootParams lootParams = new LootParams.Builder(serverLevel)
-@@ -45,36 +_,65 @@
+@@ -46,36 +_,65 @@
              .create(LootContextParamSets.ADVANCEMENT_REWARD);
          boolean flag = false;
 
@@ -39,7 +39,7 @@
 +
 +        net.gommehd.cheetah.event.entity.PlayerAdvancementRewardsGrantEvent event = new net.gommehd.cheetah.event.entity.PlayerAdvancementRewardsGrantEvent(
 +            player.getBukkitEntity(),
-+            recipes.stream().map(recipe -> org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(recipe.location())).collect(java.util.stream.Collectors.toList()),
++            recipes.stream().map(recipe -> org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(recipe.identifier())).collect(java.util.stream.Collectors.toList()),
 +            rewards.stream().map(org.bukkit.craftbukkit.inventory.CraftItemStack::asCraftMirror).collect(java.util.stream.Collectors.toList()),
 +            this.experience
 +        );

cheetah-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch

@@ -1,6 +1,14 @@
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
-@@ -212,7 +_,7 @@
+@@ -62,6 +_,7 @@
+     public static final Marker PACKET_MARKER = Util.make(MarkerFactory.getMarker("NETWORK_PACKETS"), marker -> marker.add(ROOT_MARKER));
+     public static final Marker PACKET_RECEIVED_MARKER = Util.make(MarkerFactory.getMarker("PACKET_RECEIVED"), marker -> marker.add(PACKET_MARKER));
+     public static final Marker PACKET_SENT_MARKER = Util.make(MarkerFactory.getMarker("PACKET_SENT"), marker -> marker.add(PACKET_MARKER));
++    private static final net.gommehd.cheetah.network.packet.PacketProcessor PACKET_PROCESSOR = new net.gommehd.cheetah.network.packet.DefaultPacketProcessor(); // Cheetah - Packet listener api
+     private static final ProtocolInfo<ServerHandshakePacketListener> INITIAL_PROTOCOL = HandshakeProtocols.SERVERBOUND;
+     private final PacketFlow receiving;
+     private volatile boolean sendLoginDisconnect = true;
+@@ -188,7 +_,7 @@
 
                      if (player != null) player.quitReason = org.bukkit.event.player.PlayerQuitEvent.QuitReason.ERRONEOUS_STATE; // Paper - Add API for quit reason
                      if (flag) {
@@ -9,3 +17,52 @@
                          boolean doesDisconnectExist = this.packetListener.protocol() != ConnectionProtocol.STATUS && this.packetListener.protocol() != ConnectionProtocol.HANDSHAKING; // Paper
                          if (this.getSending() == PacketFlow.CLIENTBOUND && doesDisconnectExist) { // Paper
                              Packet<?> packet = (Packet<?>)(this.sendLoginDisconnect
+@@ -285,6 +_,13 @@
+     }
+
+     private static <T extends PacketListener> void genericsFtw(Packet<T> packet, PacketListener listener) {
++        // Cheetah start - Packet listener api
++        Connection connection = net.gommehd.cheetah.network.packet.ConnectionHelper.getCurrentConnection(listener);
++        packet = PACKET_PROCESSOR.processInbound(packet, connection);
++        if (packet == null) {
++            return; // Packet was cancelled
++        }
++        // Cheetah end - Packet listener api
+         packet.handle((T)listener);
+     }
+
+@@ -444,11 +_,24 @@
+     }
+
+     private void sendPacket(Packet<?> packet, @Nullable ChannelFutureListener sendListener, boolean flush) {
++        // Cheetah start - Packet listener api
++        packet = PACKET_PROCESSOR.processOutbound(packet, this);
++        if (packet == null) {
++            // Packet was cancelled - handle cleanup
++            if (sendListener != null) {
++                io.netty.channel.ChannelFuture completedFuture = this.channel.newSucceededFuture();
++                completedFuture.addListener(sendListener);
++            }
++            return;
++        }
++        final Packet<?> finalPacket = packet;
++        // Cheetah end - Packet listener api
++
+         this.sentPackets++;
+         if (this.channel.eventLoop().inEventLoop()) {
+-            this.doSendPacket(packet, sendListener, flush);
++            this.doSendPacket(finalPacket, sendListener, flush); // Cheetah - Packet listener api
+         } else {
+-            this.channel.eventLoop().execute(() -> this.doSendPacket(packet, sendListener, flush));
++            this.channel.eventLoop().execute(() -> this.doSendPacket(finalPacket, sendListener, flush)); // Cheetah - Packet listener api
+         }
+     }
+
+@@ -477,6 +_,7 @@
+         }
+         } catch (final Exception e) {
+             LOGGER.error("NetworkException: {}", player, e);
++            PACKET_PROCESSOR.notifyError(packet, e, this); // Cheetah - Packet listener api
+             this.disconnect(Component.translatable("disconnect.genericReason", "Internal Exception: " + e.getMessage()));
+             packet.onPacketDispatchFinish(player, null);
+         }

cheetah-server/minecraft-patches/sources/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java.patch

@@ -13,7 +13,7 @@
      public static class BlockEntityInfo {
          public static final StreamCodec<RegistryFriendlyByteBuf, ClientboundLevelChunkPacketData.BlockEntityInfo> STREAM_CODEC = StreamCodec.ofMember(
              ClientboundLevelChunkPacketData.BlockEntityInfo::write, ClientboundLevelChunkPacketData.BlockEntityInfo::new
-@@ -186,6 +_,25 @@
+@@ -185,6 +_,25 @@
              ByteBufCodecs.registry(Registries.BLOCK_ENTITY_TYPE).encode(buffer, this.type);
              buffer.writeNbt(this.tag);
          }

cheetah-server/minecraft-patches/sources/net/minecraft/network/protocol/game/ClientboundRotateHeadPacket.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/network/protocol/game/ClientboundRotateHeadPacket.java
 +++ b/net/minecraft/network/protocol/game/ClientboundRotateHeadPacket.java
-@@ -20,6 +_,13 @@
+@@ -21,6 +_,13 @@
          this.yHeadRot = yHeadRot;
      }