Merge pull request #88 from Suisuroru/ss/portal-speed-fix

Entity portal-teleport speed fix

.github/workflows/build_1.21.4.yml

@@ -41,7 +41,7 @@ jobs:
         uses: "actions/upload-artifact@v4"
         with:
           name: "${{ env.project_id_b }} CI Artifacts"
-          path: "luminol-server/build/libs/*-paperclip.jar"
+          path: "luminol-server/build/libs/*-paperclip-*-mojmap.jar"
       - name: SetENV
         if: github.event_name != 'pull_request'
         run: sh scripts/SetENV.sh

luminol-server/minecraft-patches/features/0053-Leaves-Fix-SculkCatalyst-exp-skip.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: violetc <58360096+s-yh-china@users.noreply.github.com>
 Date: Sun, 6 Apr 2025 10:42:45 +0800
-Subject: [PATCH] Fix SculkCatalyst exp skip
+Subject: [PATCH] Leaves Fix SculkCatalyst exp skip
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java

luminol-server/minecraft-patches/features/0055-Add-afterPortalLogic-to-process-some-logics.patch

@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 27 Apr 2025 14:26:01 +0800
+Subject: [PATCH] Add afterPortalLogic to process some logics
+
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index ceca76a5791e319dd7cc4048c9860b1df065b95a..065e74d29eee35e07a0d5db8850dc6f93a9729c0 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -4545,6 +4545,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+     }
+ 
++    // Luminol start - Add afterPortalLogic
++    protected void afterPortalLogic() {
++
++    }
++    // Luminol end - Add afterPortalLogic
++
+     protected boolean portalToAsync(ServerLevel destination, BlockPos portalPos, boolean takePassengers,
+                                     PortalType type, java.util.function.Consumer<Entity> teleportComplete) {
+         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async");
+@@ -4628,6 +4634,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+                         info.postTeleportTransition().onTransition(teleported);
+                     }
+ 
++                    teleported.afterPortalLogic(); // Luminol - Add afterPortalLogic
++
+                     // Kaiiju start - vanilla end teleportation
+                     /*if (teleportComplete != null) {
+                         teleportComplete.accept(teleported);
+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
++++ b/net/minecraft/world/entity/item/PrimedTnt.java
+@@ -251,4 +251,10 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+         return !this.level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
+     }
+     // Paper end - Option to prevent TNT from moving in water
++
++    // Luminol start - Add afterPortalLogic
++    protected void afterPortalLogic() {
++        this.setUsedPortal(true);
++    }
++    // Luminol start - Add afterPortalLogic
+ }

luminol-server/minecraft-patches/features/0056-Entity-portal-teleport-speed-fix.patch

@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 28 Apr 2025 11:53:13 +0800
+Subject: [PATCH] Entity portal-teleport speed fix
+
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 065e74d29eee35e07a0d5db8850dc6f93a9729c0..920b7a3e6def4ac0078a1e543d7c17f5d4955fc5 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();
+         } 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);
+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
+