diff --git a/README.md b/README.md index b38eedd..a346343 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,13 @@ # Lophine -

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

+

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

-[![License](https://img.shields.io/github/license/LuminolMC/LightingLuminol?style=flat-square)](LICENSE.md) -[![Issues](https://img.shields.io/github/issues/LuminolMC/LightingLuminol?style=flat-square)](https://github.com/LuminolMC/LightingLuminol/issues) -![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/LightingLuminol?style=flat-square) -![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/LightingLuminol/total?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) +![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LuminolMC/Lophine?style=flat-square) +![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/Lophine/total?style=flat-square) [English](./README_EN.md) | **中文** @@ -84,10 +85,10 @@ Temporarily use Luminol's. ## 请给我们一个 ⭐Star! > 你的每一个免费的 ⭐Star 就是我们每一个前进的动力。 - + - - - Star历史表 + + + Star历史表 diff --git a/README_EN.md b/README_EN.md index 03382fe..241f9be 100644 --- a/README_EN.md +++ b/README_EN.md @@ -4,10 +4,11 @@

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

-[![License](https://img.shields.io/github/license/LuminolMC/LightingLuminol?style=flat-square)](LICENSE.md) -[![Issues](https://img.shields.io/github/issues/LuminolMC/LightingLuminol?style=flat-square)](https://github.com/LuminolMC/Luminol/issues) -![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/LightingLuminol?style=flat-square) -![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/LightingLuminol/total?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) +![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LuminolMC/Lophine?style=flat-square) +![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/Lophine/total?style=flat-square) **English** | [中文](./README.md) @@ -81,10 +82,10 @@ Thanks [LegacyLands](https://github.com/LegacyLands) for sponsoring this project ![legacy-lands-logo](public/image/legacy-lands-logo.png) ## Please ⭐star us! - + - - - Star History Chart + + + Star History Chart diff --git a/gradle.properties b/gradle.properties index 5d20908..3c11892 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.earthme.lophine version=1.21.5-R0.1-SNAPSHOT mcVersion=1.21.5 -luminolRef=9e3360efa0de1f3a6b34812aed6c16f497516513 +luminolRef=07f2fcd4051f140a32ff491bbe0c64dfb5c2aabf org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-Raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-Raytracing-tracker.patch index 06fc2a6..caa0ab2 100644 --- a/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-Raytracing-tracker.patch +++ b/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-Raytracing-tracker.patch @@ -18,7 +18,7 @@ index ee53f78396f4377d3e5c2998826f231208066ef6..607091ecbd4a7261f2c0d839ee4dd1d2 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 14e58b4093b4eafb989f9b1d498579bd25ab6c1e..2e906ba62380ed3999ed5747a88073b313b60bae 100644 +index 0814ad6820b08a856f7bd261e96143568e772ac4..b7ef7df56e94b6af9398d0a4768747a35ac6f4fd 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -140,7 +140,7 @@ import net.minecraft.world.scores.ScoreHolder; @@ -30,7 +30,7 @@ index 14e58b4093b4eafb989f9b1d498579bd25ab6c1e..2e906ba62380ed3999ed5747a88073b3 // CraftBukkit start private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger(); private static final int CURRENT_LEVEL = 2; -@@ -6102,4 +6102,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -6107,4 +6107,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/src/build.gradle.kts.patch b/lophine-server/src/build.gradle.kts.patch deleted file mode 100644 index 3c0f676..0000000 --- a/lophine-server/src/build.gradle.kts.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/luminol-server/build.gradle.kts -+++ b/luminol-server/build.gradle.kts -@@ -54,7 +_,23 @@ - } - } - -- activeFork = luminol -+ val lophine = forks.register("lophine") { -+ forks = luminol -+ upstream.patchRepo("paperServer") { -+ upstreamRepo = luminol.patchedRepo("paperServer") -+ patchesDir = rootDirectory.dir("lophine-server/paper-patches") -+ outputDir = rootDirectory.dir("paper-server") -+ } -+ -+ upstream.patchDir("luminolServer") { -+ upstreamPath = "luminol-server" -+ excludes = setOf("src/minecraft", "paper-patches", "minecraft-patches", "build.gradle.kts", "build.gradle.kts.patch") -+ patchesDir = rootDirectory.dir("lophine-server/luminol-patches") -+ outputDir = rootDirectory.dir("luminol-server") -+ } -+ } -+ -+ activeFork = lophine - - spigot { - buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc" -@@ -142,12 +_,16 @@ - resources { srcDir("../paper-server/src/main/resources") } - java { srcDir("../folia-server/src/main/java") } - resources { srcDir("../folia-server/src/main/resources") } -+ java { srcDir("../luminol-server/src/main/java") } -+ resources { srcDir("../luminol-server/src/main/resources") } - } - test { - java { srcDir("../paper-server/src/test/java") } - resources { srcDir("../paper-server/src/test/resources") } - java { srcDir("../folia-server/src/test/java") } - resources { srcDir("../folia-server/src/test/resources") } -+ java { srcDir("../luminol-server/src/main/java") } -+ resources { srcDir("../luminol-server/src/main/resources") } - } - } - val log4jPlugins = sourceSets.create("log4jPlugins") { -@@ -174,7 +_,7 @@ - } - - dependencies { -- implementation(project(":luminol-api")) // Luminol -+ implementation(project(":lophine-api")) // Lophine - implementation("com.electronwill.night-config:toml:3.8.2") // Luminol - Night config - // Abomination start - implementation("com.github.luben:zstd-jni:1.5.4-1") -@@ -264,14 +_,14 @@ - val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() - attributes( - "Main-Class" to "org.bukkit.craftbukkit.Main", -- "Implementation-Title" to "Luminol", -+ "Implementation-Title" to "Lophine", - "Implementation-Version" to implementationVersion, - "Implementation-Vendor" to date, -- "Specification-Title" to "Luminol", -+ "Specification-Title" to "Lophine", - "Specification-Version" to project.version, - "Specification-Vendor" to "Luminol Team", -- "Brand-Id" to "luminolmc:luminol", -- "Brand-Name" to "Luminol", -+ "Brand-Id" to "luminolmc:lophine", -+ "Brand-Name" to "Lophine", - "Build-Number" to (build ?: ""), - "Build-Time" to buildTime.toString(), - "Git-Branch" to gitBranch, diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index 07b9a75..92ca5d2 100644 --- a/scripts/SetENV.sh +++ b/scripts/SetENV.sh @@ -2,7 +2,7 @@ prop() { grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//' } -project_id="Lophine" +project_id="lophine" project_id_b="Lophine" commitid=$(git log --pretty='%h' -1)