diff --git a/README.md b/README.md index 3fb976a..d97e969 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Lophine -

Lophine 是一个基于Luminol的分支,具有许多有用的优化和可配置的原版特性,目标是在Folia上实现更多生电的实现

+

Lophine 是一个基于Luminol的分支,具有许多有用的优化和可配置的原版特性,目标是在Folia上实现更多生电的内容(请注意,完整生电请使用Fabric)

![Created At](https://img.shields.io/github/created-at/LuminolMC/Lophine?style=flat-square) [![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=flat-square)](LICENSE.md) diff --git a/README_EN.md b/README_EN.md index 72ec0f2..5b860b3 100644 --- a/README_EN.md +++ b/README_EN.md @@ -3,7 +3,7 @@ # Lophine

Lophine is a Luminol fork with many useful optimizations and configurable vanilla features, aims to provide -more function for survival-usable circuit on folia

+more function for survival-usable circuit on folia (Please note that Fabric should be used for complete survival-usable) ![Created At](https://img.shields.io/github/created-at/LuminolMC/Lophine?style=flat-square) [![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=flat-square)](LICENSE.md) diff --git a/gradle.properties b/gradle.properties index 92ff3d8..976bc00 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=750a7acb9c0076c069b9abc1919f7695665f1abf +luminolRef=339614a31138427888df80ea45295d1452ac44b6 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0002-Add-config-to-disable-end-crystal-check.patch b/lophine-server/minecraft-patches/features/0002-Add-config-to-disable-end-crystal-check.patch deleted file mode 100644 index ba75e06..0000000 --- a/lophine-server/minecraft-patches/features/0002-Add-config-to-disable-end-crystal-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Helvetica Volubi -Date: Wed, 21 May 2025 13:04:00 +0800 -Subject: [PATCH] Add config to disable end crystal check - - -diff --git a/net/minecraft/world/level/dimension/end/EndDragonFight.java b/net/minecraft/world/level/dimension/end/EndDragonFight.java -index 4fa8371c212dcc02b8cf5fd267b736e1cf3f50c1..3f1520bdd5ef708824712ea62974fedb35067f23 100644 ---- a/net/minecraft/world/level/dimension/end/EndDragonFight.java -+++ b/net/minecraft/world/level/dimension/end/EndDragonFight.java -@@ -547,6 +547,8 @@ public class EndDragonFight { - - blockPos = this.portalLocation; - } -+ // Luminol start - Disable end crystal check -+ if (!fun.bm.lophine.config.modules.fixes.DisableEndCrystalCheckConfig.disableCheck) { - // Paper start - Perf: Do crystal-portal proximity check before entity lookup - if (placedEndCrystalPos != null) { - // The end crystal must be 0 or 1 higher than the portal origin -@@ -562,6 +564,7 @@ public class EndDragonFight { - } - } - // Paper end - Perf: Do crystal-portal proximity check before entity lookup -+ } // Luminol end - Disable end crystal check - - - List list = Lists.newArrayList(); diff --git a/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-cross-region-damage-trace.patch b/lophine-server/minecraft-patches/features/0002-Add-config-to-enable-cross-region-damage-trace.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0003-Add-config-to-enable-cross-region-damage-trace.patch rename to lophine-server/minecraft-patches/features/0002-Add-config-to-enable-cross-region-damage-trace.patch diff --git a/lophine-server/minecraft-patches/features/0004-Add-config-to-enable-datapack-command.patch b/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-datapack-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0004-Add-config-to-enable-datapack-command.patch rename to lophine-server/minecraft-patches/features/0003-Add-config-to-enable-datapack-command.patch diff --git a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0004-Add-config-to-enable-raytracing-tracker.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0005-Add-config-to-enable-raytracing-tracker.patch rename to lophine-server/minecraft-patches/features/0004-Add-config-to-enable-raytracing-tracker.patch diff --git a/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-tick-command.patch b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-tick-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0006-Add-config-to-enable-tick-command.patch rename to lophine-server/minecraft-patches/features/0005-Add-config-to-enable-tick-command.patch diff --git a/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-unsafe-waypoint-bar.patch b/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-unsafe-waypoint-bar.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0007-Add-config-to-enable-unsafe-waypoint-bar.patch rename to lophine-server/minecraft-patches/features/0006-Add-config-to-enable-unsafe-waypoint-bar.patch diff --git a/lophine-server/minecraft-patches/features/0008-Leaves-Base-Protocol-Core.patch b/lophine-server/minecraft-patches/features/0007-Leaves-Base-Protocol-Core.patch similarity index 99% rename from lophine-server/minecraft-patches/features/0008-Leaves-Base-Protocol-Core.patch rename to lophine-server/minecraft-patches/features/0007-Leaves-Base-Protocol-Core.patch index 4c76e56..6f348e9 100644 --- a/lophine-server/minecraft-patches/features/0008-Leaves-Base-Protocol-Core.patch +++ b/lophine-server/minecraft-patches/features/0007-Leaves-Base-Protocol-Core.patch @@ -88,7 +88,7 @@ index a0f1db50adf5163a671d3d9e9df7adb7de4250c6..af13707933af14171447d5ab6faacb64 public int getSpawnProtectionRadius() { return 16; diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d14c7a64d 100644 +index 8150b16c196edcb226be9268ea6e0012e44517fa..c54bf0429c0ca3a35a730658c7b1b3ddc776bf9e 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -57,6 +57,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack diff --git a/lophine-server/minecraft-patches/features/0009-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0008-Leaves-Item-overstack-util.patch similarity index 99% rename from lophine-server/minecraft-patches/features/0009-Leaves-Item-overstack-util.patch rename to lophine-server/minecraft-patches/features/0008-Leaves-Item-overstack-util.patch index 792371b..da31d99 100644 --- a/lophine-server/minecraft-patches/features/0009-Leaves-Item-overstack-util.patch +++ b/lophine-server/minecraft-patches/features/0008-Leaves-Item-overstack-util.patch @@ -446,7 +446,7 @@ index 10b2cc20bbf3b70e4e09dbbe14b90506e6366158..1535bb8cec8692e8d26eaff090288f1b } diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 2f8128a11e316a6ee6b283f9a411096e582c03b7..5b93eeba6c03738011551ce18332cebe9e278a8e 100644 +index b78d23ab22a74db2e16707424ed14f5760edf5b4..486181bf59f0863a7b60749a0b75b5ac79e2e470 100644 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -145,7 +145,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/lophine-server/minecraft-patches/features/0010-Leaves-Old-Explosion-Damage-Calculator.patch b/lophine-server/minecraft-patches/features/0009-Leaves-Old-Explosion-Damage-Calculator.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0010-Leaves-Old-Explosion-Damage-Calculator.patch rename to lophine-server/minecraft-patches/features/0009-Leaves-Old-Explosion-Damage-Calculator.patch diff --git a/lophine-server/minecraft-patches/features/0011-Leaves-Old-raid-behavior.patch b/lophine-server/minecraft-patches/features/0010-Leaves-Old-raid-behavior.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0011-Leaves-Old-raid-behavior.patch rename to lophine-server/minecraft-patches/features/0010-Leaves-Old-raid-behavior.patch diff --git a/lophine-server/minecraft-patches/features/0012-Leaves-Redstone-Shears-Wrench.patch b/lophine-server/minecraft-patches/features/0011-Leaves-Redstone-Shears-Wrench.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0012-Leaves-Redstone-Shears-Wrench.patch rename to lophine-server/minecraft-patches/features/0011-Leaves-Redstone-Shears-Wrench.patch diff --git a/lophine-server/minecraft-patches/features/0013-Leaves-Servux-Protocol.patch b/lophine-server/minecraft-patches/features/0012-Leaves-Servux-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0013-Leaves-Servux-Protocol.patch rename to lophine-server/minecraft-patches/features/0012-Leaves-Servux-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0014-Purpur-Barrels-and-enderchests-6-rows.patch b/lophine-server/minecraft-patches/features/0013-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0014-Purpur-Barrels-and-enderchests-6-rows.patch rename to lophine-server/minecraft-patches/features/0013-Purpur-Barrels-and-enderchests-6-rows.patch index 977803c..1002b35 100644 --- a/lophine-server/minecraft-patches/features/0014-Purpur-Barrels-and-enderchests-6-rows.patch +++ b/lophine-server/minecraft-patches/features/0013-Purpur-Barrels-and-enderchests-6-rows.patch @@ -70,10 +70,10 @@ index 0fffa384f928ab84451331380968fb4650eafe26..d84a10396395939149da88bcb01be59e return new ChestMenu(MenuType.GENERIC_9x6, containerId, playerInventory, container, 6); } diff --git a/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/net/minecraft/world/inventory/PlayerEnderChestContainer.java -index beb74bc8398de8b48f41af7daef14d624826310e..5dd6e89931d397b8afdb84024ed46b0d06dcf347 100644 +index 51148b7b95c93a9e25da70ac9275c63f1458d84c..b6bceae1ec26685af485bfe9d846f7584d5012cd 100644 --- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java +++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java -@@ -25,11 +25,18 @@ public class PlayerEnderChestContainer extends SimpleContainer { +@@ -26,11 +26,18 @@ public class PlayerEnderChestContainer extends SimpleContainer { } public PlayerEnderChestContainer(Player owner) { diff --git a/lophine-server/minecraft-patches/features/0015-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch b/lophine-server/minecraft-patches/features/0014-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0015-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch rename to lophine-server/minecraft-patches/features/0014-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch diff --git a/lophine-server/minecraft-patches/features/0016-Disable-some-check-for-operators.patch b/lophine-server/minecraft-patches/features/0015-Disable-some-check-for-operators.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0016-Disable-some-check-for-operators.patch rename to lophine-server/minecraft-patches/features/0015-Disable-some-check-for-operators.patch diff --git a/lophine-server/minecraft-patches/features/0017-I18n-support.patch b/lophine-server/minecraft-patches/features/0016-I18n-support.patch similarity index 96% rename from lophine-server/minecraft-patches/features/0017-I18n-support.patch rename to lophine-server/minecraft-patches/features/0016-I18n-support.patch index 070dac5..e360c16 100644 --- a/lophine-server/minecraft-patches/features/0017-I18n-support.patch +++ b/lophine-server/minecraft-patches/features/0016-I18n-support.patch @@ -31,7 +31,7 @@ index cf72cb8b418239b56c755486b03a321672e16bc3..b69c06607ca900beeebf4892a978442d String awtException = io.papermc.paper.util.ServerEnvironment.awtDependencyCheck(); if (awtException != null) { diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index c6c6432c2efeb7b95c2894b188cd966321ae3186..1cd9af71ee66df5f277748c0a5a59a30bd57accc 100644 +index ec07d916ff52f5a866218c2fa4d632b83675faf2..eabaae86e4951046db5d1bae9abb92f1bece100f 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -172,6 +172,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/lophine-server/minecraft-patches/features/0018-Old-zombie-reinforcement.patch b/lophine-server/minecraft-patches/features/0017-Old-zombie-reinforcement.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0018-Old-zombie-reinforcement.patch rename to lophine-server/minecraft-patches/features/0017-Old-zombie-reinforcement.patch diff --git a/lophine-server/minecraft-patches/features/0019-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0018-Spawn-invulnerable-time.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0019-Spawn-invulnerable-time.patch rename to lophine-server/minecraft-patches/features/0018-Spawn-invulnerable-time.patch diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/fixes/DisableEndCrystalCheckConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/fixes/DisableEndCrystalCheckConfig.java deleted file mode 100644 index 0116a9f..0000000 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/fixes/DisableEndCrystalCheckConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package fun.bm.lophine.config.modules.fixes; - -import me.earthme.luminol.config.EnumConfigCategory; -import me.earthme.luminol.config.IConfigModule; -import me.earthme.luminol.config.flags.ConfigInfo; -import me.earthme.luminol.config.flags.TransformedConfig; - -public class DisableEndCrystalCheckConfig implements IConfigModule { - @TransformedConfig(name = "disable_end_crystal_check", category = {"misc", "end_crystal"}) - @ConfigInfo(baseName = "disable_end_crystal_check", comments = - """ - Disable paper's End Crystal position check. - It reverts to vanilla respawn dragon logic.""") - public static boolean disableCheck = false; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.FIXES; - } - - @Override - public String getBaseName() { - return "end_crystal"; - } -} \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java index a668e6f..8d65f9a 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java @@ -6,6 +6,8 @@ import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; public class RemovedConfig implements IConfigModule { + @TransformedConfig(name = "disable_end_crystal_check", category = {"fixes", "end_crystal"}, transform = false) + @TransformedConfig(name = "disable_end_crystal_check", category = {"misc", "end_crystal"}, transform = false) @TransformedConfig(name = "allow_skip_cooldown", category = {"misc", "revert_raid_changes"}, transform = false) @TransformedConfig(name = "bad_omen_infinite", category = {"misc", "revert_raid_changes"}, transform = false) @TransformedConfig(name = "skip_height_check", category = {"misc", "revert_raid_changes"}, transform = false)