From 04bedd5dfc87f1e4530e3d17c9c6b5252e59e508 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Wed, 22 Jul 2026 00:55:10 +0800 Subject: [PATCH] [ci skip] update some information --- .github/workflows/build.yml | 6 ++-- README.md | 28 +++++++++---------- README_EN.md | 28 +++++++++---------- .../features/0001-Rebrand-to-Lophine.patch | 2 +- lophine-server/build.gradle.kts.patch | 9 +++--- .../features/0001-Rebrand-to-Lophine.patch | 24 ++++++++-------- 6 files changed, 46 insertions(+), 51 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef7407c..85c6022 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: run: chmod +x gradlew - name: Configure Git User Details - run: git config --global user.email "ci@lophinecraft.com" && git config --global user.name "LophineCraftCI" + run: git config --global user.email "ci@lophinelabs.com" && git config --global user.name "LophinelabsCI" - name: Apply All Patches run: ./gradlew --refresh-dependencies applyAllPatches @@ -124,7 +124,7 @@ jobs: tag: ${{ env.tag }} name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}${{ env.release_count }} body: | - 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LophineCraft/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LophineCraft/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }}) + 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LophineLabs/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LophineLabs/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }}) This release is automatically compiled by GitHub Actions ### Branch Info > ${{ github.ref_name }} @@ -143,7 +143,7 @@ jobs: tag: ${{ env.tag }} name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}${{ env.release_count }} body: | - 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LophineCraft/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LophineCraft/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }}) + 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LophineLabs/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LophineLabs/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }}) This release is automatically compiled by GitHub Actions ### Comments > ${{ inputs.comments }} diff --git a/README.md b/README.md index e9e8454..ea7621d 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,15 @@ *Lophine 是一个基于Luminol的分支，具有许多有用的优化和可配置的原版特性，目标是在Folia上实现更多生电的内容（请注意，完整生电请使用Fabric）* - ![Created At](https://img.shields.io/github/created-at/LophineCraft/Lophine?style=for-the-badge&color=blue) - [![License](https://img.shields.io/github/license/LophineCraft/Lophine?style=for-the-badge&color=green)](LICENSE.md) - [![Issues](https://img.shields.io/github/issues/LophineCraft/Lophine?style=for-the-badge&color=orange)](https://github.com/LophineCraft/Lophine/issues) + ![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) + [![Issues](https://img.shields.io/github/issues/LophineLabs/Lophine?style=for-the-badge&color=orange)](https://github.com/LophineLabs/Lophine/issues) - ![Commit Activity](https://img.shields.io/github/commit-activity/w/LophineCraft/Lophine?style=for-the-badge&color=purple) - ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LophineCraft/Lophine?style=for-the-badge&color=yellow) - ![GitHub all releases](https://img.shields.io/github/downloads/LophineCraft/Lophine/total?style=for-the-badge&color=red) + ![Commit Activity](https://img.shields.io/github/commit-activity/w/LophineLabs/Lophine?style=for-the-badge&color=purple) + ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LophineLabs/Lophine?style=for-the-badge&color=yellow) + ![GitHub all releases](https://img.shields.io/github/downloads/LophineLabs/Lophine/total?style=for-the-badge&color=red) - ![Repo contributors](https://img.shields.io/github/contributors/LophineCraft/Lophine?style=for-the-badge&color=brightgreen) + ![Repo contributors](https://img.shields.io/github/contributors/LophineLabs/Lophine?style=for-the-badge&color=brightgreen) [English](./README_EN.md) | **中文** @@ -32,7 +32,7 @@ ## 📥 下载 ### 稳定版本 -所有发布版本都可以在 [Releases](https://github.com/LophineCraft/Lophine/releases) 页面找到。 +所有发布版本都可以在 [Releases](https://github.com/LophineLabs/Lophine/releases) 页面找到。 ### 开发版本 如果您想体验最新功能，可以通过以下步骤自行构建。 @@ -41,7 +41,7 @@ ```bash # 克隆项目 -git clone https://github.com/LophineCraft/Lophine.git +git clone https://github.com/LophineLabs/Lophine.git cd Lophine # 应用补丁并构建 Paperclip JAR @@ -91,15 +91,13 @@ dependencies { ### 加入我们的社区 -- **QQ群**: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=QML5kIVsniPi1PlZvnjHQT_02EHsZ5Jc&authKey=%2FTCJsZC7JFQ9sxAroPCKuYnlV57Z5fyqp36ewXZk3Sn4iJ9p4MB1JKdc%2FFcX3HOM&noverify=0&group_code=1015048616) -- **QQ频道**: [点击加入](https://pd.qq.com/s/eq9krf9j) -- **Telegram**: [点击加入](https://t.me/LuminolMinecraft) -- **Discord**: [点击加入](https://discord.gg/Qd7m3V6eDx) +- **QQ群**: [1020403749](https://qm.qq.com/cgi-bin/qm/qr?k=y_MA9UaN7PM9e9J1LIs9Eea3LK8C0h6J&jump_from=webapi&authKey=ap5f8MlbeezXYtnmpnT5ZOFljDuOyV6OAb2PIcViQ+Ilr60Ycq63FDDTsJOZDYtj) +- **Discord**: [点击加入](https://discord.gg/UXSgPZczcy) ### 获取帮助 -- 📋 [提交 Issue](https://github.com/LophineCraft/Lophine/issues) -- 💬 [GitHub Discussions](https://github.com/LophineCraft/Lophine/discussions) +- 📋 [提交 Issue](https://github.com/LophineLabs/Lophine/issues) +- 💬 [GitHub Discussions](https://github.com/LophineLabs/Lophine/discussions) - 📖 [项目文档](./docs/) ## 🐛 问题反馈 diff --git a/README_EN.md b/README_EN.md index 7396485..eb18f65 100644 --- a/README_EN.md +++ b/README_EN.md @@ -5,15 +5,15 @@ *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)* - ![Created At](https://img.shields.io/github/created-at/LophineCraft/Lophine?style=for-the-badge&color=blue) - [![License](https://img.shields.io/github/license/LophineCraft/Lophine?style=for-the-badge&color=green)](LICENSE.md) - [![Issues](https://img.shields.io/github/issues/LophineCraft/Lophine?style=for-the-badge&color=orange)](https://github.com/LophineCraft/Lophine/issues) + ![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) + [![Issues](https://img.shields.io/github/issues/LophineLabs/Lophine?style=for-the-badge&color=orange)](https://github.com/LophineLabs/Lophine/issues) - ![Commit Activity](https://img.shields.io/github/commit-activity/w/LophineCraft/Lophine?style=for-the-badge&color=purple) - ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LophineCraft/Lophine?style=for-the-badge&color=yellow) - ![GitHub all releases](https://img.shields.io/github/downloads/LophineCraft/Lophine/total?style=for-the-badge&color=red) + ![Commit Activity](https://img.shields.io/github/commit-activity/w/LophineLabs/Lophine?style=for-the-badge&color=purple) + ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LophineLabs/Lophine?style=for-the-badge&color=yellow) + ![GitHub all releases](https://img.shields.io/github/downloads/LophineLabs/Lophine/total?style=for-the-badge&color=red) - ![Repo contributors](https://img.shields.io/github/contributors/LophineCraft/Lophine?style=for-the-badge&color=brightgreen) + ![Repo contributors](https://img.shields.io/github/contributors/LophineLabs/Lophine?style=for-the-badge&color=brightgreen) **English** | [中文](./README.md) @@ -32,7 +32,7 @@ ## 📥 Download ### Stable Releases -All release versions can be found on the [Releases](https://github.com/LophineCraft/Lophine/releases) page. +All release versions can be found on the [Releases](https://github.com/LophineLabs/Lophine/releases) page. ### Development Builds If you want to experience the latest features, you can build it yourself following the steps below. @@ -41,7 +41,7 @@ If you want to experience the latest features, you can build it yourself followi ```bash # Clone the project -git clone https://github.com/LophineCraft/Lophine.git +git clone https://github.com/LophineLabs/Lophine.git cd Lophine # Apply patches and build Paperclip JAR @@ -92,15 +92,13 @@ dependencies { ### Join Our Community -- **QQ Group**: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=QML5kIVsniPi1PlZvnjHQT_02EHsZ5Jc&authKey=%2FTCJsZC7JFQ9sxAroPCKuYnlV57Z5fyqp36ewXZk3Sn4iJ9p4MB1JKdc%2FFcX3HOM&noverify=0&group_code=1015048616) -- **QQ Channel**: [Join Here](https://pd.qq.com/s/eq9krf9j) -- **Telegram**: [Join Here](https://t.me/LuminolMinecraft) -- **Discord**: [Join Here](https://discord.gg/Qd7m3V6eDx) +- **QQ Group**: [1020403749](https://qm.qq.com/cgi-bin/qm/qr?k=y_MA9UaN7PM9e9J1LIs9Eea3LK8C0h6J&jump_from=webapi&authKey=ap5f8MlbeezXYtnmpnT5ZOFljDuOyV6OAb2PIcViQ+Ilr60Ycq63FDDTsJOZDYtj) +- **Discord**: [Join Here](https://discord.gg/UXSgPZczcy) ### Get Help -- 📋 [Submit Issues](https://github.com/LophineCraft/Lophine/issues) -- 💬 [GitHub Discussions](https://github.com/LophineCraft/Lophine/discussions) +- 📋 [Submit Issues](https://github.com/LophineLabs/Lophine/issues) +- 💬 [GitHub Discussions](https://github.com/LophineLabs/Lophine/discussions) - 📖 [Project Documentation](./docs/) ## 🐛 Bug Reports diff --git a/lophine-api/paper-patches/features/0001-Rebrand-to-Lophine.patch b/lophine-api/paper-patches/features/0001-Rebrand-to-Lophine.patch index 75cf780..d3d8a79 100644 --- a/lophine-api/paper-patches/features/0001-Rebrand-to-Lophine.patch +++ b/lophine-api/paper-patches/features/0001-Rebrand-to-Lophine.patch @@ -20,7 +20,7 @@ index 652ff54e7c50412503725d628bfe72ed03059790..273bd3f354281c7ddbe2a3719be063b1 + /** + * The brand id for Lophine. + */ -+ Key BRAND_LOPHINE_ID = Key.key("luminolmc", "lophine"); ++ Key BRAND_LOPHINE_ID = Key.key("lophinelabs", "lophine"); + // Lophine end + /** diff --git a/lophine-server/build.gradle.kts.patch b/lophine-server/build.gradle.kts.patch index 8471439..f7a26a7 100644 --- a/lophine-server/build.gradle.kts.patch +++ b/lophine-server/build.gradle.kts.patch @@ -100,7 +100,7 @@ implementation("ca.spottedleaf:leafpile:1.0.0") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 -@@ -189,21 +_,22 @@ +@@ -189,21 +_,21 @@ val git = Git(rootProject.layout.projectDirectory.path) val mcVersion = rootProject.providers.gradleProperty("mcVersion").get() val build = System.getenv("BUILD_NUMBER") ?: null @@ -122,14 +122,13 @@ - "Specification-Vendor" to "Paper Team", - "Brand-Id" to "papermc:folia", - "Brand-Name" to "Folia", -+ // TODO Later - rebrand org name -+ "Specification-Vendor" to "LuminoLMC", // Lophine - Rebrand -+ "Brand-Id" to "luminolmc:lophine", // Lophine - Rebrand ++ "Specification-Vendor" to "LophineLabs", // Lophine - Rebrand ++ "Brand-Id" to "lophinelabs:lophine", // Lophine - Rebrand + "Brand-Name" to "Lophine", // Lophine - Rebrand "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, -@@ -214,6 +_,20 @@ +@@ -213,6 +_,20 @@ } } } diff --git a/lophine-server/paper-patches/features/0001-Rebrand-to-Lophine.patch b/lophine-server/paper-patches/features/0001-Rebrand-to-Lophine.patch index 89854a6..9dbdd9a 100644 --- a/lophine-server/paper-patches/features/0001-Rebrand-to-Lophine.patch +++ b/lophine-server/paper-patches/features/0001-Rebrand-to-Lophine.patch @@ -8,7 +8,7 @@ Helvetica Volubi bdlvl diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 08745a35b1ce8cc56d970472088de3cd17b9e43a..6eaa4e9bd1ecbfa531313ce1f470d55edf31b467 100644 +index 08745a35b1ce8cc56d970472088de3cd17b9e43a..ce97076bd642bff22c9fc10212e19f81327d7c5a 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -593,7 +593,7 @@ public class Metrics { @@ -16,7 +16,7 @@ index 08745a35b1ce8cc56d970472088de3cd17b9e43a..6eaa4e9bd1ecbfa531313ce1f470d55e // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { - Metrics metrics = new Metrics("Folia", serverUUID, logFailedRequests, Bukkit.getLogger()); // Folia - we have our own bstats page -+ Metrics metrics = new Metrics("Lophine", serverUUID, logFailedRequests, Bukkit.getLogger()); // Folia - we have our own bstats page // Luminol // Lophine ++ Metrics metrics = new Metrics("Lophine", serverUUID, logFailedRequests, Bukkit.getLogger()); // Folia - we have our own bstats page // Lophine metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); @@ -25,17 +25,17 @@ index 08745a35b1ce8cc56d970472088de3cd17b9e43a..6eaa4e9bd1ecbfa531313ce1f470d55e if (implVersion != null) { final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1); - paperVersion = "git-Folia-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Folia - we have our own bstats page -+ paperVersion = "git-Lophine-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Folia - we have our own bstats page // Luminol - Rebrand to Luminol // Lophine - Rebrand to Lophine ++ paperVersion = "git-Lophine-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Folia - we have our own bstats page // Lophine - Rebrand to Lophine } else { paperVersion = "unknown"; } - metrics.addCustomChart(new Metrics.SimplePie("folia_version", () -> paperVersion)); // Folia - we have our own bstats page -+ metrics.addCustomChart(new Metrics.SimplePie("lophine_version", () -> paperVersion)); // Folia - we have our own bstats page // Luminol // Lophine ++ metrics.addCustomChart(new Metrics.SimplePie("lophine_version", () -> paperVersion)); // Folia - we have our own bstats page // Lophine metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 30815c8970b1f1c88a3c7bb5fd36efd915f1687d..62e5fcc1845d1240a1b97cdf252c94b75e81d4ab 100644 +index 30815c8970b1f1c88a3c7bb5fd36efd915f1687d..37ca11405d4f77e3acf7fc3c175d1f9ced8f0f20 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -40,8 +40,8 @@ public class PaperVersionFetcher implements VersionFetcher { @@ -44,8 +44,8 @@ index 30815c8970b1f1c88a3c7bb5fd36efd915f1687d..62e5fcc1845d1240a1b97cdf252c94b7 private static final int DISTANCE_UNKNOWN = -2; - private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/folia"; // Folia - private static final String REPOSITORY = "PaperMC/Folia"; // Folia -+ private static final String DOWNLOAD_PAGE = "https://github.com/LophineCraft/Lophine"; // Luminol // Lophine -+ private static final String REPOSITORY = "LophineCraft/Lophine"; // Luminol // Lophine ++ private static final String DOWNLOAD_PAGE = "https://github.com/LophineLabs/Lophine"; // Lophine ++ private static final String REPOSITORY = "LophineLabs/Lophine"; // Lophine private static final ServerBuildInfo BUILD_INFO = ServerBuildInfo.buildInfo(); private static final String USER_AGENT = BUILD_INFO.brandName() + "/" + BUILD_INFO.asString(VERSION_SIMPLE) + " (https://papermc.io)"; private static final Gson GSON = new Gson(); @@ -54,7 +54,7 @@ index 30815c8970b1f1c88a3c7bb5fd36efd915f1687d..62e5fcc1845d1240a1b97cdf252c94b7 } else { final Optional apiResult = fetchMinecraftVersionList(); - if (buildNumber.isPresent()) { -+ if (buildNumber.isPresent() && false) { // Luminol ++ if (buildNumber.isPresent() && false) { distance = fetchDistanceFromSiteApi(buildNumber.getAsInt()); } else { final Optional gitBranch = BUILD_INFO.gitBranch(); @@ -68,7 +68,7 @@ index 30815c8970b1f1c88a3c7bb5fd36efd915f1687d..62e5fcc1845d1240a1b97cdf252c94b7 } else { final Optional gitBranch = PaperVersionFetcher.BUILD_INFO.gitBranch(); diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java -index 10a0be7a4db1a51579d113d279af7a9effe7f438..dbdfceab299ccae83302af261e190b8111f13e25 100644 +index 10a0be7a4db1a51579d113d279af7a9effe7f438..883cb95cb4ef72e40af7073f76fc2f3219a51127 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java @@ -31,6 +31,7 @@ public record ServerBuildInfoImpl( @@ -96,12 +96,12 @@ index 10a0be7a4db1a51579d113d279af7a9effe7f438..dbdfceab299ccae83302af261e190b81 @Override public boolean isBrandCompatible(final @NotNull Key brandId) { - return brandId.equals(this.brandId); -+ return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_FOLIA_ID) || brandId.equals(BRAND_LOPHINE_ID); // Luminol // Lophine ++ return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_FOLIA_ID) || brandId.equals(BRAND_LOPHINE_ID); // Lophine } @Override diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 5607f4cc8ca2f620461eb5e97d01d9db0d6b2303..2572eeff745d7b6eb68023a1e39ded79239264e8 100644 +index 5607f4cc8ca2f620461eb5e97d01d9db0d6b2303..f5462b42c8231a5cf58a24e5fc5dc77bd550eb0a 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -80,9 +80,10 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre @@ -110,7 +110,7 @@ index 5607f4cc8ca2f620461eb5e97d01d9db0d6b2303..2572eeff745d7b6eb68023a1e39ded79 logger.log(Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes"); - logger.log(Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues"); + logger.log(Level.SEVERE, "DO NOT REPORT THIS TO PAPER!"); -+ logger.log(Level.SEVERE, "If you are unsure or still think this is a Luminol bug, please report this to https://github.com/LophineCraft/Lophine/issues"); ++ logger.log(Level.SEVERE, "If you are unsure or still think this is a Lophine bug, please report this to https://github.com/LophineLabs/Lophine/issues"); logger.log(Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports"); - logger.log(Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion()); + logger.log(Level.SEVERE, "Server version: " + Bukkit.getServer().getVersion());