Tidy patches

.github/workflows/build_1.21.4.yml

@@ -40,9 +40,9 @@ jobs:
         if: github.event_name != 'pull_request'
         continue-on-error: true
         run: |
-          ./gradlew publish -PpublishDevBundle=true
+          ./gradlew generateDevelopmentBundle publish -PpublishDevBundle=true
       - name: Upload Artifact
-        uses: "actions/upload-artifact@v4"
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ env.project_id_b }} CI Artifacts"
           path: "luminol-server/build/libs/*-paperclip-*-mojmap.jar"
@@ -51,7 +51,7 @@ jobs:
         run: sh scripts/SetENV.sh
       - name: Create Release
         if: github.event_name != 'pull_request'
-        uses: ncipollo/release-action@v1.16.0
+        uses: ncipollo/release-action@v1
         with:
           tag: ${{ env.tag }}
           name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}

luminol-server/minecraft-patches/features/0019-Add-config-to-enable-tick-command.patch

@@ -114,7 +114,7 @@ index cfb37f2e428605965a37dc1eb83f302fe1bd6299..8f7b28e5688252207ad8ce9f3fb6f9c3
          TitleCommand.register(this.dispatcher, context);
          //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 330af9f4de1c72387326816065350e71fe546efe..e62e8b9af7ad3e4454702ac86ad2b27973eba66f 100644
+index ed00a29daccfee1d631bef27c0a3a4ae83140018..56f5568848d0f20b4d706c07dc8114594e0b5337 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -267,7 +267,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

luminol-server/minecraft-patches/features/0022-Force-disable-builtin-spark-plugin.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Force disable builtin spark plugin
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index ed00a29daccfee1d631bef27c0a3a4ae83140018..330af9f4de1c72387326816065350e71fe546efe 100644
+index 56f5568848d0f20b4d706c07dc8114594e0b5337..e62e8b9af7ad3e4454702ac86ad2b27973eba66f 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -783,8 +783,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

luminol-server/minecraft-patches/features/0053-Portal-Behavior-Modifiers.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] Portal Behavior Modifiers
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2ea6160492cb23e96271dfbfd3bd35fe03109d6a..2871980e53a66bdacf7c00e7045ad01d68a972d3 100644
+index 2ea6160492cb23e96271dfbfd3bd35fe03109d6a..36bddc5f5a05044b995e0b87f2c9105a6acfe8fd 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -3304,7 +3304,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-             this.setPortalCooldown();
+@@ -1149,7 +1149,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         //Luminol end
+         try {
+         // Paper end - detailed watchdog information
+-        if (this.noPhysics) {
++        if (this.noPhysics || this.portalProcess != null) { // Luminol - Entity portal-teleport speed fix
+             this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
          } else {
-             if (this.portalProcess == null || !this.portalProcess.isSamePortal(portal)) {
--                this.portalProcess = new PortalProcessor(portal, pos.immutable());
-+                this.portalProcess = new PortalProcessor(portal, pos.immutable(), this.getDeltaMovement()); // Luminol - Entity portal-teleport speed fix
-             } else if (!this.portalProcess.isInsidePortalThisTick()) {
-                 this.portalProcess.updateEntryPosition(pos.immutable());
-                 this.portalProcess.setAsInsidePortalThisTick(true);
+             this.wasOnFire = this.isOnFire();
 @@ -3829,20 +3829,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
              EntityTreeNode curr;
@@ -73,43 +73,6 @@ index 2ea6160492cb23e96271dfbfd3bd35fe03109d6a..2871980e53a66bdacf7c00e7045ad01d
                      // Kaiiju start - vanilla end teleportation
                      /*if (teleportComplete != null) {
                          teleportComplete.accept(teleported);
-diff --git a/net/minecraft/world/entity/PortalProcessor.java b/net/minecraft/world/entity/PortalProcessor.java
-index 46d989aef0eceebd98bfd93999153319de77a8a0..6e9171fa0c636439bd96401ea9e5fe80ffdc8bdd 100644
---- a/net/minecraft/world/entity/PortalProcessor.java
-+++ b/net/minecraft/world/entity/PortalProcessor.java
-@@ -9,12 +9,14 @@ import net.minecraft.world.level.portal.TeleportTransition;
- public class PortalProcessor {
-     private final Portal portal;
-     private BlockPos entryPosition;
-+    private net.minecraft.world.phys.Vec3 speedVec3; // Luminol - Entity portal-teleport speed fix
-     private int portalTime;
-     private boolean insidePortalThisTick;
- 
--    public PortalProcessor(Portal portal, BlockPos entryPosition) {
-+    public PortalProcessor(Portal portal, BlockPos entryPosition, net.minecraft.world.phys.Vec3 speedVec3) { // Luminol - Entity portal-teleport speed fix
-         this.portal = portal;
-         this.entryPosition = entryPosition;
-+        this.speedVec3 = speedVec3; // Luminol - Entity portal-teleport speed fix
-         this.insidePortalThisTick = true;
-     }
- 
-@@ -35,7 +37,15 @@ public class PortalProcessor {
- 
-     // Folia start - region threading
-     public boolean portalAsync(ServerLevel sourceWorld, Entity portalTarget) {
--        return this.portal.portalAsync(sourceWorld, portalTarget, this.entryPosition);
-+        // Luminol start - Entity portal-teleport speed fix
-+        net.minecraft.world.phys.Vec3 oldSpeed = portalTarget.getDeltaMovement();
-+        portalTarget.setDeltaMovement(this.speedVec3);
-+        boolean flag = this.portal.portalAsync(sourceWorld, portalTarget, this.entryPosition);
-+        if (!flag) {
-+            portalTarget.setDeltaMovement(oldSpeed);
-+        }
-+        return flag;
-+        // Luminol end - Entity portal-teleport speed fix
-     }
-     // Folia end - region threading
- 
 diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
 index 88570bb4aa02896545805d7721c45cf9599befea..bbf9748a36404139356db606dbb3b0cc13c66b50 100644
 --- a/net/minecraft/world/entity/item/PrimedTnt.java

luminol-server/minecraft-patches/features/0057-Raytracing-tracker-experiment.patch

@@ -19,7 +19,7 @@ index 7eff847790394aecd058e7a61905da86163b4c6e..9099457f55a2829297ac1db8a69a98ff
                      double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1);
                      if (rangeY != -1) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2871980e53a66bdacf7c00e7045ad01d68a972d3..2005f769d21de40621beb913446e816b87a03c3a 100644
+index 36bddc5f5a05044b995e0b87f2c9105a6acfe8fd..07774ab130c951bcfb0030afaee740eeda81b0fe 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -135,7 +135,7 @@ import net.minecraft.world.scores.ScoreHolder;