Update upstream (1.21.11)

gradle.properties

@@ -1,8 +1,9 @@
 group=com.froobworld.nabulus
-version=1.21.10-R0.1-SNAPSHOT
+version=1.21.11-R0.1-SNAPSHOT
 
-mcVersion=1.21.10
-paperRef=610f1d2177f9e6320503e3dad6c42a93a6e48d56
+mcVersion=1.21.11
+paperRef=cd445fdb26d7b159f5c2726acee5db113a3bbff9
+apiVersion=1.21.11
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

nabulus-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 @@
+@@ -216,11 +_,11 @@
      }
 
      // workaround for https://github.com/gradle/gradle/issues/4046

nabulus-server/build.gradle.kts.patch

@@ -1,23 +1,23 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -43,6 +_,16 @@
-         "org.bukkit.craftbukkit",
-         "org.spigotmc",
-     )
-+
+@@ -19,6 +_,16 @@
+ }
+
+ paperweight {
 +    val fork = forks.register("nabulus") {
 +        upstream.patchDir("paperServer") {
 +            upstreamPath = "paper-server"
 +            excludes = setOf("src/minecraft", "patches", "build.gradle.kts")
 +            patchesDir = rootDirectory.dir("nabulus-server/paper-patches")
 +            outputDir = rootDirectory.dir("paper-server")
 +        }
-+     }
-+     activeFork = fork
- }
++    }
++    activeFork = fork
++
+     minecraftVersion = providers.gradleProperty("mcVersion")
+     gitFilePatches = false
 
- tasks.generateDevelopmentBundle {
-@@ -107,7 +_,20 @@
+@@ -104,7 +_,20 @@
      }
  }
 
@@ -39,16 +39,16 @@
  configurations.named(log4jPlugins.compileClasspathConfigurationName) {
      extendsFrom(configurations.compileClasspath.get())
  }
-@@ -130,7 +_,7 @@
+@@ -127,7 +_,7 @@
  }
 
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":nabulus-api"))
-     implementation("ca.spottedleaf:concurrentutil:0.0.5")
+     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
-@@ -207,7 +_,7 @@
+@@ -205,7 +_,7 @@
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Paper Team",
              "Brand-Id" to "papermc:paper",
@@ -57,7 +57,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -266,7 +_,7 @@
+@@ -264,7 +_,7 @@
      jvmArgumentProviders.add(provider)
  }
 

nabulus-server/minecraft-patches/features/0002-Show-hidden-players-in-playerlist-and-tab-suggestion.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Show hidden players in playerlist and tab suggestions
 
 
 diff --git a/net/minecraft/commands/CommandSourceStack.java b/net/minecraft/commands/CommandSourceStack.java
-index 6ead209287ab021b8245fa5c3b7f18ca7d9c66b3..8dd4c5afdab3f71c21b3b765a09a1b90f870c871 100644
+index 566304106fd4f1c677a56e7c66282d1570e7b974..3b91b9c4a1c293a33942e7b233875880b7212c39 100644
 --- a/net/minecraft/commands/CommandSourceStack.java
 +++ b/net/minecraft/commands/CommandSourceStack.java
-@@ -580,7 +580,7 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
+@@ -562,7 +562,7 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
 
      @Override
      public Collection<String> getOnlinePlayerNames() {
@@ -31,10 +31,10 @@ index e7c778a7f292fd0749cbd5e6586ad1b93ac7f29e..dac56a9c4e3ccacc0178878897e0a36b
          final List<ServerPlayer> players = playersTemp;
          // CraftBukkit end
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index a07568d90380f572a9eae68bc3fc1a60a9f69565..1e77e0904d3625db5a4092818d96aa7fe40a5875 100644
+index 9a3cc199963d1e593218c6c294c6fedb5b45d0c4..321c855fb9c75995b46cf875943b25d0b2539ee4 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -253,7 +253,7 @@ public abstract class PlayerList {
+@@ -259,7 +259,7 @@ public abstract class PlayerList {
          for (int i = 0; i < this.players.size(); ++i) {
              ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
 
@@ -43,7 +43,7 @@ index a07568d90380f572a9eae68bc3fc1a60a9f69565..1e77e0904d3625db5a4092818d96aa7f
                  // Paper start - Add Listing API for Player
                  if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) {
                      // Paper end - Add Listing API for Player
-@@ -266,7 +266,7 @@ public abstract class PlayerList {
+@@ -272,7 +272,7 @@ public abstract class PlayerList {
              }
 
              if (entityplayer1 == player || !bukkitPlayer.canSee(entityplayer1.getBukkitEntity())) { // Paper - Use single player info update packet on join; Don't include joining player
@@ -52,7 +52,7 @@ index a07568d90380f572a9eae68bc3fc1a60a9f69565..1e77e0904d3625db5a4092818d96aa7f
              }
 
              onlinePlayers.add(entityplayer1); // Paper - Use single player info update packet on join
-@@ -512,6 +512,7 @@ public abstract class PlayerList {
+@@ -519,6 +519,7 @@ public abstract class PlayerList {
              if (otherPlayer.getBukkitEntity().canSee(player.getBukkitEntity())) {
                  otherPlayer.connection.send(packet);
              } else {

nabulus-server/minecraft-patches/features/0003-Use-system-messages-for-player-chat-until-Velocity-s.patch

@@ -6,14 +6,14 @@ Subject: [PATCH] Use system messages for player chat until Velocity support
 
 
 diff --git a/net/minecraft/network/chat/OutgoingChatMessage.java b/net/minecraft/network/chat/OutgoingChatMessage.java
-index 4635182c73f28f63ba84982cb6bcb422221b738e..19d87c84ebd788ff6ed09dfd1b45ddc8a9f8be64 100644
+index 30b26c6def2f6cb8d742ae3eeb9a7c2cd672991c..e9fceb53da485e61e01f707316378cfbc36870b1 100644
 --- a/net/minecraft/network/chat/OutgoingChatMessage.java
 +++ b/net/minecraft/network/chat/OutgoingChatMessage.java
-@@ -27,6 +27,7 @@ public interface OutgoingChatMessage {
-         }
-         public void sendToPlayer(ServerPlayer player, boolean filtered, ChatType.Bound boundType, @javax.annotation.Nullable Component unsigned) {
-             player.connection.sendDisguisedChatMessage(unsigned != null ? unsigned : this.content, boundType);
-+            player.connection.sendDisguisedChatMessage(this.content, boundType); // Nabulus
+@@ -28,6 +28,7 @@ public interface OutgoingChatMessage {
+         @Override
+         public void sendToPlayer(ServerPlayer player, boolean filtered, ChatType.Bound boundChatType, @javax.annotation.Nullable Component unsigned) {
+             player.connection.sendDisguisedChatMessage(unsigned != null ? unsigned : this.content, boundChatType);
++            player.connection.sendDisguisedChatMessage(this.content, boundChatType); // Nabulus
              // Paper end
          }
      }

nabulus-server/minecraft-patches/features/0004-Add-silent-chest-flag-to-players.patch

@@ -5,25 +5,25 @@ Subject: [PATCH] Add silent chest flag to players
 
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 90483699b3f2efe9945c849adfdd38422e3a3458..20e353108830666ed707bbe78f0ab940ccccc115 100644
+index 6f49b5e5888a6296b929e465a5ef87dc49bd4516..a67c766b13d707dd8da023adacf0976bc4b8e86a 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -287,6 +287,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
-     public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
+@@ -291,6 +291,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
      public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
+     public int invulnerableDuration = LivingEntity.INVULNERABLE_DURATION; // Paper - configurable invulnerable duration
      // CraftBukkit end
 +    public boolean silentChests = false; // Nabulus
 
-     protected LivingEntity(EntityType<? extends LivingEntity> entityType, Level level) {
-         super(entityType, level);
+     protected LivingEntity(EntityType<? extends LivingEntity> type, Level level) {
+         super(type, level);
 diff --git a/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java b/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java
-index 03c6c7b28c1903bc1ccbcebf478528db98a1a510..5f72c6746e641da141c43c29d4fbf047eb80b646 100644
+index 4f3b6a32fe4e791aab05aa9e553ec935e3cd5e6b..a3c921042ebfc0760f09a33ff1dfc409aeef48a0 100644
 --- a/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java
 +++ b/net/minecraft/world/level/block/entity/ContainerOpenersCounter.java
 @@ -40,6 +40,7 @@ public abstract class ContainerOpenersCounter {
      public abstract boolean isOwnContainer(Player player);
 
-     public void incrementOpeners(LivingEntity entity, Level level, BlockPos pos, BlockState state, double maxInteractionRange) {
+     public void incrementOpeners(LivingEntity entity, Level level, BlockPos pos, BlockState state, double interactionRange) {
 +        if (entity.silentChests) return; // Nabulus
          int oldPower = Math.max(0, Math.min(15, this.openCount)); // CraftBukkit - Get power before new viewer is added
          int i = this.openCount++;
@@ -46,10 +46,10 @@ index 03c6c7b28c1903bc1ccbcebf478528db98a1a510..5f72c6746e641da141c43c29d4fbf047
              .map(entity -> (ContainerUser)entity)
              .collect(Collectors.toList());
 diff --git a/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java b/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
-index e2a2811464ff7455e513944b7565f9f226a5ed34..4b2a3339bedcf526adb382552d260bf0ad20337f 100644
+index 61b99c895c0e248f0e7c4c634644dcff54a964d9..4ff769502875277965390f7385bf28d3384899e8 100644
 --- a/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
-@@ -202,7 +202,7 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
+@@ -201,7 +201,7 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
 
      @Override
      public void startOpen(ContainerUser user) {
@@ -58,7 +58,7 @@ index e2a2811464ff7455e513944b7565f9f226a5ed34..4b2a3339bedcf526adb382552d260bf0
              if (this.openCount < 0) {
                  this.openCount = 0;
              }
-@@ -220,7 +220,7 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
+@@ -219,7 +219,7 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
 
      @Override
      public void stopOpen(ContainerUser user) {

nabulus-server/minecraft-patches/features/0005-Throttle-spawn-attempts-after-consistent-failures.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Throttle spawn attempts after consistent failures
 
 
 diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
-index 6198d6d4952088f1fef28e84f65f22e702b4435d..6e49d23bc2bcef749473d61a7ca63f9e7170c0e8 100644
+index 4e5078495037078922ab6350a500acdabe177ca5..3effd44ed96d94afd883371da7a922700f9f598d 100644
 --- a/net/minecraft/world/level/NaturalSpawner.java
 +++ b/net/minecraft/world/level/NaturalSpawner.java
-@@ -158,6 +158,11 @@ public final class NaturalSpawner {
+@@ -159,6 +159,11 @@ public final class NaturalSpawner {
          profilerFiller.push("spawner");
 
          for (MobCategory mobCategory : categories) {
@@ -20,7 +20,7 @@ index 6198d6d4952088f1fef28e84f65f22e702b4435d..6e49d23bc2bcef749473d61a7ca63f9e
              // Paper start - Optional per player mob spawns
              final boolean canSpawn;
              int maxSpawns = Integer.MAX_VALUE;
-@@ -186,8 +191,17 @@ public final class NaturalSpawner {
+@@ -187,8 +192,17 @@ public final class NaturalSpawner {
                  canSpawn = spawnState.canSpawnForCategoryLocal(mobCategory, chunk.getPos());
              }
              if (canSpawn) {
@@ -39,19 +39,19 @@ index 6198d6d4952088f1fef28e84f65f22e702b4435d..6e49d23bc2bcef749473d61a7ca63f9e
                  // Paper end - Optional per player mob spawns
              }
          }
-@@ -587,6 +601,7 @@ public final class NaturalSpawner {
-         @Nullable
-         private EntityType<?> lastCheckedType;
+@@ -582,6 +596,7 @@ public final class NaturalSpawner {
+         private @Nullable BlockPos lastCheckedPos;
+         private @Nullable EntityType<?> lastCheckedType;
          private double lastCharge;
 +        public final boolean attemptFailedChunks = Entity.SHARED_RANDOM.nextInt(10) == 0; // Nabulus
 
          SpawnState(
              int spawnableChunkCount,
 diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index 4dcec2e8a3120a3dfa078e8cf6857ba99ca01a2d..ed730bde2a155c4d6a049fa9a9956d518552bfc9 100644
+index 3acc1374a7ef968d88e9f566ce7b812fb8d580af..b04a7f3183608056f1cb5e2d622bbd02c8f5a0a9 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -94,6 +94,7 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
+@@ -93,6 +93,7 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
      private final Int2ObjectMap<GameEventListenerRegistry> gameEventListenerRegistrySections;
      private final LevelChunkTicks<Block> blockTicks;
      private final LevelChunkTicks<Fluid> fluidTicks;

nabulus-server/minecraft-patches/features/0008-Allow-players-to-hide-wither-boss-bar.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow players to hide wither boss bar
 
 
 diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 787b74c5aa02afc4ba95fa1cdaf6cc21b6554b56..953fb6f1851815d0d7397d5d3a1cb6e09bdf20de 100644
+index 86b6b94c3e63bb52917fe0f708d24aa813f433c7..f30b7a7d4a1d93c3332030c786b49b7f169689b5 100644
 --- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -79,6 +79,21 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -80,6 +80,21 @@ public class WitherBoss extends Monster implements RangedAttackMob {
      private static final TargetingConditions.Selector LIVING_ENTITY_SELECTOR = (entity, level) -> !entity.getType().is(EntityTypeTags.WITHER_FRIENDS)
          && entity.attackable();
      private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0).selector(LIVING_ENTITY_SELECTOR);
@@ -28,17 +28,17 @@ index 787b74c5aa02afc4ba95fa1cdaf6cc21b6554b56..953fb6f1851815d0d7397d5d3a1cb6e0
 +    }
 +    // Nabulus end
 
-     public WitherBoss(EntityType<? extends WitherBoss> entityType, Level level) {
-         super(entityType, level);
-@@ -133,6 +148,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+     public WitherBoss(EntityType<? extends WitherBoss> type, Level level) {
+         super(type, level);
+@@ -134,6 +149,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
      @Override
      public void setCustomName(@Nullable Component name) {
          super.setCustomName(name);
 +        updateBossBar(); // Nabulus
          this.bossEvent.setName(this.getDisplayName());
      }
 
-@@ -403,7 +419,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -404,7 +420,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
      @Override
      public void startSeenByPlayer(ServerPlayer player) {
          super.startSeenByPlayer(player);