diff --git a/LICENSE.md b/LICENSE.md index 72a928b..28601af 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -3,11 +3,11 @@ Lophine inherits its licensing from the included upstream projects. Lophine从上游继承了许可证。 As such, Lophine is licensed under the -[GNU General Public License version 3](licenses/GPL.md); as it inherits it from Luminol, -who in turn inherits it from the original Folia, Paper, Spigot, Bukkit and CraftBukkit projects. +[GNU General Public License version 3](licenses/GPL.md); as it inherits it from Folia, +who in turn inherits it from the original Paper, Spigot, Bukkit and CraftBukkit projects. 因此，Lophine中应当遵守[GNU通用公共许可证-第3版](licenses/GPL.md)； -因为Lophine从上游Luminol继承了它，而Luminol又从其上游的Folia、Paper、Spigot、Bukkit和Craftbukkit项目中继承了它。 +因为Lophine从上游Folia继承了它，而Folia又从其上游的Paper、Spigot、Bukkit和Craftbukkit项目中继承了它。 Any author who is _not_ listed below should be presumed to have released their work under the original [GPL](licenses/GPL.md) license. diff --git a/README.md b/README.md index ea7621d..26f25ed 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # Lophine - *Lophine 是一个基于Luminol的分支，具有许多有用的优化和可配置的原版特性，目标是在Folia上实现更多生电的内容（请注意，完整生电请使用Fabric）* + *Lophine 是一个基于Folia的分支，具有许多有用的优化和可配置的原版特性，目标是在Folia上实现更多生电的内容（请注意，完整生电请使用Fabric）* ![Created At](https://img.shields.io/github/created-at/LophineLabs/Lophine?style=for-the-badge&color=blue) [![License](https://img.shields.io/github/license/LophineLabs/Lophine?style=for-the-badge&color=green)](LICENSE.md) diff --git a/README_EN.md b/README_EN.md index eb18f65..0c12fe6 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 (Please note that Fabric should be used for complete survival-usable)* + *Lophine is a Folia fork with many useful optimizations and configurable vanilla features, aims to provide 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/LophineLabs/Lophine?style=for-the-badge&color=blue) [![License](https://img.shields.io/github/license/LophineLabs/Lophine?style=for-the-badge&color=green)](LICENSE.md) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index bdcb3fd..531d172 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -41,7 +41,7 @@ Lophine 使用和 Folia 一样的补丁系统，并为了针对不同部分的 1. 将你的仓库 clone 到本地； 2. 在你的 IDE 或 终端 内执行 Gradle 的 `applyAllPatches` 任务，如果是在终端内，你可以执行 `./gradlew applyAllPatches`； -3. 在执行操作后，仓库根目录下应该存在以下目录对： `lophine-api` 和 `lophine-server` ， `luminol-api` 和 `luminol-server` ， `folia-api` 和 `folia-server` ， 以及 `paper-api` 和 `paper-server`（下文称作 `*-api` 和 `*-server` ）； +3. 在执行操作后，仓库根目录下应该存在以下目录对： `lophine-api` 和 `lophine-server` , `folia-api` 和 `folia-server` ， 以及 `paper-api` 和 `paper-server`（下文称作 `*-api` 和 `*-server` ）； 4. 进入 仓库根目录下的 `*-api` 和 `*-server` 文件夹进行修改。 以下为对上述各个文件夹的简单描述，详细描述可以参考[这里](https://github.com/Toffikk/paperweight-examples/blob/18241979c88068d5b061d95ad69c98ecb201c246/README.md)： @@ -49,14 +49,12 @@ Lophine 使用和 Folia 一样的补丁系统，并为了针对不同部分的 1. API部分 - `lophine-api` ：对新增API的修改 -- `luminol-api` ：对luminol-API的修改应当在此文件夹下进行 - `folia-api` ：对folia-API的修改应当在此文件夹下进行 - `paper-api` ：对paper-API/spigot-API/bukkit-API的修改应该在此文件夹下进行 2. Server部分 - `lophine-server` ：对Minecraft原版服务器的修改和新增文件应当在此文件夹下进行 -- `luminol-server` ：对luminol-server的修改应当在此文件夹下进行 - `folia-server` ：对folia-Server的修改应当在此文件夹下进行 - `paper-server` ：对于paper对服务器逻辑的修改应当在此文件夹下进行 @@ -64,7 +62,7 @@ Lophine 使用和 Folia 一样的补丁系统，并为了针对不同部分的 - 在应用补丁前，基点将会指向未被更改的源码 - 在基点后的每一个提交都是一个补丁 -- 只有在 Luminol 最后一个提交后的提交才会被视为 lophine 补丁 +- 只有在 Folia 最后一个提交后的提交才会被视为 lophine 补丁 ## 增加补丁 diff --git a/docs/CONTRIBUTING_EN.md b/docs/CONTRIBUTING_EN.md index e31b2e0..0364c06 100644 --- a/docs/CONTRIBUTING_EN.md +++ b/docs/CONTRIBUTING_EN.md @@ -44,7 +44,7 @@ If you have forked the main repository, then you should follow the steps below: 1. Clone your repository to local 2. Run Gradle's `applyAllPatches` task in your IDE or terminal (You can run `./gradlew applyAllPatches` directly in terminal.) -3. After performing the operation, the following directory pairs should exist in the root directory of the warehouse: `lophine-api` and `lophine-server` , `luminol-api` and `luminol-server` , `folia-api` and `folia-server` , `paper-api` and `paper-server` (Referred to `*-api` and `*-server` as below) +3. After performing the operation, the following directory pairs should exist in the root directory of the warehouse: `lophine-api` and `lophine-server` , `folia-api` and `folia-server` , `paper-api` and `paper-server` (Referred to `*-api` and `*-server` as below) 4. Enter `*-api` and `*-server` directory to carry out modifications. The following is the simple description of the aforementioned folders, detailed description can be referred to [here](https://github.com/Toffikk/paperweight-examples/blob/18241979c88068d5b061d95ad69c98ecb201c246/README.md): @@ -52,14 +52,12 @@ The following is the simple description of the aforementioned folders, detailed 1. API part - `lophine-api` : Modifications to the new API -- `luminol-api` : Modifications to Luminol API should be carried out in this folder - `folia-api` : Modifications to Folia API should be carried out in this folder - `paper-api` : Modifications to Paper API/Spigot API/Bukkit API should be carried out in this folder 2. Server part - `lophine-server` : Changes and new files to the Minecraft vanilla server should be made in this folder -- `luminol-server` : Changes to luminol-server should be made in this folder - `folia-server` : Changes to folia-server should be made in this folder - `paper-server` : Modifications to the server logic for paper should be made in this folder @@ -67,7 +65,7 @@ BTW, `*-api` and `*-server` and are not normal git repositories. - Before applying patches, the base will point to unmodified source code. - Every commit after the base is a patch. -- Only commits after the last commit of Luminol will be considered as Lophine patches. +- Only commits after the last commit of Folia will be considered as Lophine patches. ## Adding new patches diff --git a/lophine-server/build.gradle.kts.patch b/lophine-server/build.gradle.kts.patch index f7a26a7..f1948be 100644 --- a/lophine-server/build.gradle.kts.patch +++ b/lophine-server/build.gradle.kts.patch @@ -128,7 +128,7 @@ "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, -@@ -213,6 +_,20 @@ +@@ -214,6 +_,20 @@ } } } diff --git a/public/image/legacy-lands-logo.png b/public/image/legacy-lands-logo.png deleted file mode 100644 index 76f9d7c..0000000 Binary files a/public/image/legacy-lands-logo.png and /dev/null differ