Updated Upstream (Folia)

gradle.properties

@@ -2,7 +2,7 @@ group = me.earthme.luminol
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
 
-foliaRef=306dc07ce666235401f8f4ac2c8e1fae0b60a69e
+foliaRef=290f78994a0c15f69b0d719a9d005ef2e1c51b9e
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

luminol-server/minecraft-patches/features/0018-Try-fixing-folia-off-region-POI-accessing-issue.patch

@@ -27,22 +27,6 @@ index 3614551856c594f3c0cfee984fcf03fad672b007..d97aa31ddffc19f7ca2cd556d5ec3373
                  DebugPackets.sendPoiTicketCountPacket(level, blockPos);
              }
          });
-diff --git a/net/minecraft/world/entity/ai/behavior/YieldJobSite.java b/net/minecraft/world/entity/ai/behavior/YieldJobSite.java
-index 37ad79e201e36a1a9520219e3faa4dcffa7b4dfd..d301614a254ea7a453a226272ab1c3aa0117fbfa 100644
---- a/net/minecraft/world/entity/ai/behavior/YieldJobSite.java
-+++ b/net/minecraft/world/entity/ai/behavior/YieldJobSite.java
-@@ -33,7 +33,10 @@ public class YieldJobSite {
-                         } else if (villager.getVillagerData().getProfession() != VillagerProfession.NONE) {
-                             return false;
-                         } else {
--                            BlockPos blockPos = instance.<GlobalPos>get(potentialJobSite).pos();
-+                            final GlobalPos globalPos = instance.<GlobalPos>get(potentialJobSite); //Luminol - Try fixing off main POI accessing
-+                            final net.minecraft.server.level.ServerLevel targetLevel = net.minecraft.server.MinecraftServer.getServer().getLevel(globalPos.dimension()); //Luminol - Try fixing off main POI accessing
-+                            BlockPos blockPos = globalPos.pos(); //Luminol - Try fixing off main POI accessing
-+                            if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(targetLevel, blockPos) && me.earthme.luminol.config.modules.fixes.FoliaPOIAccessOffRegionFixConfig.enabled) return true; //Luminol - Try fixing off main POI accessing
-                             Optional<Holder<PoiType>> type = level.getPoiManager().getType(blockPos);
-                             if (type.isEmpty()) {
-                                 return true;
 diff --git a/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/net/minecraft/world/entity/ai/village/poi/PoiManager.java
 index c10810bf00d75f459c3c6a9415c1e09f0519d50e..3adafa43367cd6648ecbccb92ba5bd509740d5a4 100644
 --- a/net/minecraft/world/entity/ai/village/poi/PoiManager.java

luminol-server/minecraft-patches/features/0019-Try-fixing-folia-315.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Sun, 12 Jan 2025 10:58:43 +0800
-Subject: [PATCH] Try fixing folia #315
-
-Might be useful to https://github.com/PaperMC/Folia/issues/315
-
-diff --git a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-index 12e563b04e6afcd227f3ef6cbdfcedf59be9509e..e76bc2c0c72e40267649e260da9bed750a450612 100644
---- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-+++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -43,7 +43,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
-         return Items.ENDER_PEARL;
-     }
- 
--    @Override
-+    /*@Override // Luminol - Try fixing folia #315
-     protected void setOwnerThroughUUID(UUID uuid) {
-         this.deregisterFromCurrentOwner();
-         super.setOwnerThroughUUID(uuid);
-@@ -56,6 +56,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
-         super.setOwner(owner);
-         this.registerToCurrentOwner();
-     }
-+    */ // Luminol - Try fixing folia #315
- 
-     private void deregisterFromCurrentOwner() {
-         if (this.getOwner() instanceof ServerPlayer serverPlayer) {
-@@ -342,7 +343,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
-     @Override
-     public void onRemoval(Entity.RemovalReason reason) {
-         if (reason != Entity.RemovalReason.UNLOADED_WITH_PLAYER) {
--            this.deregisterFromCurrentOwner();
-+            // this.deregisterFromCurrentOwner(); // Luminol - Try fixing folia #315
-         }
- 
-         super.onRemoval(reason);

luminol-server/minecraft-patches/features/0024-Kaiiju-Entity-tick-and-removal-limiter.patch

@@ -17,7 +17,7 @@ index c6e487a4c14e6b82533881d01f32349b9ae28728..2c747cb8a724cd25c9d724908f92b320
      // block ticking
      private final ObjectLinkedOpenHashSet<BlockEventData> blockEvents = new ObjectLinkedOpenHashSet<>();
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 0cc5607080f79f9e9b65606a3e16fd4961368b02..4c7b0582c7989138ada14e31dc76b8310c7c6f40 100644
+index d34ad333b6ea3855a24a58fcd80ccf19b2bbf41c..ad121d609bcc1d9b53a1a20d4e25cf9dfa480fb8 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -808,6 +808,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe

luminol-server/minecraft-patches/features/0025-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch

@@ -66,7 +66,7 @@ index ff71466ec0848d16121e351e30c31bb419af8b99..330af9f4de1c72387326816065350e71
              this.lastServerStatus = nanos;
              this.status = this.buildServerStatus();
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 4c7b0582c7989138ada14e31dc76b8310c7c6f40..0eece9a417aa28de36be2c932eed7434bbb8b961 100644
+index ad121d609bcc1d9b53a1a20d4e25cf9dfa480fb8..887a12b0b33a24f77e3dc118688f9e5b14d6f62f 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1347,6 +1347,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -252,10 +252,10 @@ index eaa77200d6bc33faeefdc2d07b73ee7ddcd3afe8..5ff6973a033033ce1562762bb6f57268
          // CraftBukkit start
          return this.startSleepInBed(bedPos, false);
 diff --git a/net/minecraft/world/entity/projectile/Projectile.java b/net/minecraft/world/entity/projectile/Projectile.java
-index 20f8aed59ac953cac3029115f35e496f9784bec4..d54d96c354cd12e8300c7ddb65d92cd202d5ae48 100644
+index abfe6765faec49d4b8897608582d738c7b09522d..6e1de9252ac1236e0c5196e2511c72c0d7eb3502 100644
 --- a/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/net/minecraft/world/entity/projectile/Projectile.java
-@@ -513,4 +513,11 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -516,4 +516,11 @@ public abstract class Projectile extends Entity implements TraceableEntity {
      public interface ProjectileFactory<T extends Projectile> {
          T create(ServerLevel level, LivingEntity owner, ItemStack spawnedFrom);
      }

luminol-server/minecraft-patches/features/0033-Sparkly-Paper-Optimize-canSee-checks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Sparkly Paper Optimize canSee checks
 
 
 diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
-index 65b9a49e84d9bde75c249651e974d57bc1a43277..20203ae554751920fd4a490190b9593015437f0f 100644
+index 4bdb05948e9102304364f3681ce353f1cf2a0aee..af0df21e19c372f23fcac263dc56270867d5ca8c 100644
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
-@@ -1223,7 +1223,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1224,7 +1224,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  }
                  // Folia end - region threading
                  // CraftBukkit start - respect vanish API

luminol-server/minecraft-patches/features/0034-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MrHua269 <wangxyper@163.com>
 Date: Sun, 12 Jan 2025 15:37:25 +0800
-Subject: [PATCH] SparklyPaper Skip "distanceToSqr" call in 
+Subject: [PATCH] SparklyPaper Skip "distanceToSqr" call in
  "ServerEntity#sendChanges" if the delta movement hasn't changed
 
 

luminol-server/paper-patches/features/0019-Force-disable-builtin-spark-plugin.patch

@@ -18,10 +18,10 @@ index a0b84535a9d3833d4df692b85b272f145559dd80..c2ba46408b5ad727d7a17f21d47b2898
              return;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f07330f3795dcd1162f9fc7aec8dd0f124f4daf2..cf4740f436fbcff73604ec7459001f2de15a45fe 100644
+index 20bcfeef39746d547ef17ccf2b66d44ce1e6e354..e4d7dc84132284af599c2c8d5fe1e63943ab2e0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -312,7 +312,7 @@ public final class CraftServer implements Server {
+@@ -313,7 +313,7 @@ public final class CraftServer implements Server {
      public static Exception excessiveVelEx; // Paper - Velocity warnings
      private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
      private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
@@ -30,7 +30,7 @@ index f07330f3795dcd1162f9fc7aec8dd0f124f4daf2..cf4740f436fbcff73604ec7459001f2d
  
      // Paper start - Folia region threading API
      private final io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler(); // Folia - region threading
-@@ -490,7 +490,7 @@ public final class CraftServer implements Server {
+@@ -491,7 +491,7 @@ public final class CraftServer implements Server {
          }
          this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -39,7 +39,7 @@ index f07330f3795dcd1162f9fc7aec8dd0f124f4daf2..cf4740f436fbcff73604ec7459001f2d
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -1154,7 +1154,7 @@ public final class CraftServer implements Server {
+@@ -1155,7 +1155,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -48,7 +48,7 @@ index f07330f3795dcd1162f9fc7aec8dd0f124f4daf2..cf4740f436fbcff73604ec7459001f2d
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -1183,7 +1183,7 @@ public final class CraftServer implements Server {
+@@ -1184,7 +1184,7 @@ public final class CraftServer implements Server {
          this.loadPlugins();
          this.enablePlugins(PluginLoadOrder.STARTUP);
          this.enablePlugins(PluginLoadOrder.POSTWORLD);

luminol-server/paper-patches/features/0033-FoliaPR-Add-TPS-From-Region.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] FoliaPR Add TPS From Region
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cf4740f436fbcff73604ec7459001f2de15a45fe..dc8d811c1ae01f5382612ad00b917e2b2ad2b460 100644
+index e4d7dc84132284af599c2c8d5fe1e63943ab2e0f..4d39ecd36f9b6caa7696ea1571201cce61f761d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3123,6 +3123,42 @@ public final class CraftServer implements Server {
+@@ -3129,6 +3129,42 @@ public final class CraftServer implements Server {
          };
      }