diff --git a/README.md b/README.md index 1e7b52f..1bc97c4 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@

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

+![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) [![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=flat-square)](https://github.com/LuminolMC/Lophine/issues) ![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=flat-square) @@ -17,6 +18,8 @@ - 支持部分Bukkit插件 - 可配置的原版特性 - Tpsbar 支持 +- 针对folia bug的一些修复 +- linear和b_linear(linear的重新实现)存档格式支持 - 对单线程区域性能的优化 - 更多有用的功能 diff --git a/README_EN.md b/README_EN.md index 381f061..5626ead 100644 --- a/README_EN.md +++ b/README_EN.md @@ -5,6 +5,7 @@

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

+![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) [![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=flat-square)](https://github.com/LuminolMC/Lophine/issues) ![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=flat-square) @@ -18,6 +19,8 @@ more function for survival-usable circuit on folia - Supported some Bukkit plugin - Configurable vanilla features - Tpsbar support +- Useful fixes of bugs of folia +- Linear and BufferedLinear(AKA. b_linear)(a reimplementation of linear) region format support - Useful optimizations to improve the performance of single threaded region - More functions diff --git a/gradle.properties b/gradle.properties index 402f2ac..6ce826f 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=31b05a36d905ef9ffeacf236af8566935c63d83b +luminolRef=8c71468b47e5179226a5035e0f0e7a1a06f7cc1e org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0016-Paper-Fix-quick-craft.patch b/lophine-server/minecraft-patches/features/0016-Paper-Fix-quick-craft.patch deleted file mode 100644 index 2ba9235..0000000 --- a/lophine-server/minecraft-patches/features/0016-Paper-Fix-quick-craft.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Helvetica Volubi -Date: Sat, 26 Jul 2025 13:40:28 +0800 -Subject: [PATCH] Paper: Fix quick craft - -Co-authored by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> -As a part of : Paper (https://github.com/PaperMC/Paper/pull/11831/files#diff-3991edc9191addaab9f9701589f8fb4a05001c6f3c9ce1f51d22001f8de805ca) -Licensed under: MIT (https://github.com/PaperMC/Paper/blob/main/licenses/MIT.md) - -diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 5369a6597e48ed9f0d8f7f0b9685ce4950df4fe5..919628d93add71d9b30cae29587a0049cce6973d 100644 ---- a/net/minecraft/world/entity/LivingEntity.java -+++ b/net/minecraft/world/entity/LivingEntity.java -@@ -4012,11 +4012,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin - return null; - } else { - double d = this.getEyeY() - 0.3F; -- // Paper start -- final ItemStack tmp = stack.copy(); -- stack.setCount(0); -- stack = tmp; -- // Paper end - ItemEntity itemEntity = new ItemEntity(this.level(), this.getX(), d, this.getZ(), stack); - itemEntity.setPickUpDelay(40); - if (includeThrower) { diff --git a/lophine-server/minecraft-patches/features/0017-Purpur-Barrels-and-enderchests-6-rows.patch b/lophine-server/minecraft-patches/features/0016-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0017-Purpur-Barrels-and-enderchests-6-rows.patch rename to lophine-server/minecraft-patches/features/0016-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/lophine-server/minecraft-patches/features/0018-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0017-Spawn-invulnerable-time.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0018-Spawn-invulnerable-time.patch rename to lophine-server/minecraft-patches/features/0017-Spawn-invulnerable-time.patch diff --git a/lophine-server/minecraft-patches/features/0019-Old-Explosion-Damage-Calculator.patch b/lophine-server/minecraft-patches/features/0018-Old-Explosion-Damage-Calculator.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0019-Old-Explosion-Damage-Calculator.patch rename to lophine-server/minecraft-patches/features/0018-Old-Explosion-Damage-Calculator.patch diff --git a/lophine-server/minecraft-patches/features/0020-Old-zombie-reinforcement.patch b/lophine-server/minecraft-patches/features/0019-Old-zombie-reinforcement.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0020-Old-zombie-reinforcement.patch rename to lophine-server/minecraft-patches/features/0019-Old-zombie-reinforcement.patch diff --git a/lophine-server/minecraft-patches/features/0021-I18n-support.patch b/lophine-server/minecraft-patches/features/0020-I18n-support.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0021-I18n-support.patch rename to lophine-server/minecraft-patches/features/0020-I18n-support.patch diff --git a/lophine-server/minecraft-patches/features/0022-Disable-some-check-for-operators.patch b/lophine-server/minecraft-patches/features/0021-Disable-some-check-for-operators.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0022-Disable-some-check-for-operators.patch rename to lophine-server/minecraft-patches/features/0021-Disable-some-check-for-operators.patch index 2c7838d..4e08ba8 100644 --- a/lophine-server/minecraft-patches/features/0022-Disable-some-check-for-operators.patch +++ b/lophine-server/minecraft-patches/features/0021-Disable-some-check-for-operators.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable some check for operators diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a684f5edf420d9655046de872c54e0c1a89103cf..105675bef05408bd5baf1b6129c0392065bbe79d 100644 +index 4b215dc69887df9382bde4cfa2f37afadfe1bcb2..3ce1e5a7d7095c15250b94d032587f584119824d 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -367,7 +367,7 @@ public class ServerGamePacketListenerImpl