From bc166a9fb6b885646f86b9da133baf86684d8a3a Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Sun, 16 Nov 2025 21:22:06 +0800 Subject: [PATCH] [ci skip] refactor code --- gradle.properties | 2 +- .../0003-Add-config-to-enable-raytracing-tracker.patch | 6 +++--- .../minecraft-patches/features/0023-Leaves-Fakeplayer.patch | 6 +++--- ...eplay-Mod-API.patch => 0032-Leaves-Replay-Mod-API.patch} | 0 ...eplay-Mod-API.patch => 0006-Leaves-Replay-Mod-API.patch} | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename lophine-server/minecraft-patches/features/{0031-Leaves-Replay-Mod-API.patch => 0032-Leaves-Replay-Mod-API.patch} (100%) rename lophine-server/paper-patches/features/{0005-Leaves-Replay-Mod-API.patch => 0006-Leaves-Replay-Mod-API.patch} (100%) diff --git a/gradle.properties b/gradle.properties index 4021eea..15f7aa3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ mcVersion=1.21.8 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=fc15c32debe0d87631bf5ecf69de4cfeba119a6c +luminolRef=c8e0bd216976003493e1b02093ece9465ed7452a org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-raytracing-tracker.patch index 4d83769..69e15b5 100644 --- a/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-raytracing-tracker.patch +++ b/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-raytracing-tracker.patch @@ -18,10 +18,10 @@ index 6868b915bf3deb85783a638d4441a15fea6da2dc..70740381c6501c1a518c52b24381edd1 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 ea177b8ad7ebb25e3e2967c8ff3d36dc3dda6a1d..861684a36e3277c31842f30c82ffd9d85e2fe3f8 100644 +index 38092dcc3dedc6c855e5598126be47f892223547..a8b6e89035579557b59a20ddbe9b32943e6b7164 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -146,7 +146,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter; +@@ -147,7 +147,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter; import org.jetbrains.annotations.Contract; import org.slf4j.Logger; @@ -30,7 +30,7 @@ index ea177b8ad7ebb25e3e2967c8ff3d36dc3dda6a1d..861684a36e3277c31842f30c82ffd9d8 // CraftBukkit start private static final int CURRENT_LEVEL = 2; public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first snapTo -@@ -6462,4 +6462,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -6463,4 +6463,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // Paper end - Expose entity id counter public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG diff --git a/lophine-server/minecraft-patches/features/0023-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0023-Leaves-Fakeplayer.patch index 5dc39a2..ca334ec 100644 --- a/lophine-server/minecraft-patches/features/0023-Leaves-Fakeplayer.patch +++ b/lophine-server/minecraft-patches/features/0023-Leaves-Fakeplayer.patch @@ -539,10 +539,10 @@ index 52fd730998535ea071bfc99b7cc2c254b9b656d7..0abf6f0265fcb916f2c2c76fb1313bd1 for (WaypointTransmitter waypointTransmitter : this.waypoints) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 861684a36e3277c31842f30c82ffd9d85e2fe3f8..da1b004c1f66437534f3180b6d3f3a054b7c6945 100644 +index a8b6e89035579557b59a20ddbe9b32943e6b7164..477241699752567df7695d33fa629fb1d5109e0a 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -1224,7 +1224,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1225,7 +1225,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess BlockPos onPosLegacy = this.getOnPosLegacy(); BlockState blockState = this.level().getBlockState(onPosLegacy); @@ -551,7 +551,7 @@ index 861684a36e3277c31842f30c82ffd9d85e2fe3f8..da1b004c1f66437534f3180b6d3f3a05 this.checkFallDamage(vec3.y, this.onGround(), blockState, onPosLegacy); } -@@ -1538,7 +1538,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1539,7 +1539,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } // Paper start - optimise collisions diff --git a/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch b/lophine-server/minecraft-patches/features/0032-Leaves-Replay-Mod-API.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch rename to lophine-server/minecraft-patches/features/0032-Leaves-Replay-Mod-API.patch diff --git a/lophine-server/paper-patches/features/0005-Leaves-Replay-Mod-API.patch b/lophine-server/paper-patches/features/0006-Leaves-Replay-Mod-API.patch similarity index 100% rename from lophine-server/paper-patches/features/0005-Leaves-Replay-Mod-API.patch rename to lophine-server/paper-patches/features/0006-Leaves-Replay-Mod-API.patch