From 3989ca955f43538ebab2d3b1af6ffc35ef148f77 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Mon, 26 Aug 2024 08:55:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/功能请求.md | 2 +- .github/ISSUE_TEMPLATE/报告bug.md | 12 +++-- .github/workflows/main.yml | 46 +++++++++---------- README.md | 30 +++++++----- .../cn/lunadeer/dominion/commands/Group.java | 2 +- .../cn/lunadeer/dominion/commands/Member.java | 2 +- .../lunadeer/dominion/commands/Migration.java | 2 +- .../lunadeer/dominion/commands/Template.java | 4 +- .../lunadeer/dominion/dtos/DominionDTO.java | 2 +- .../cn/lunadeer/dominion/dtos/GroupDTO.java | 2 +- .../dominion/managers/GroupLimit.java | 2 +- .../lunadeer/dominion/tuis/AllDominion.java | 2 +- .../dominion/tuis/dominion/DominionList.java | 2 +- resource/logo.svg | 22 ++++++++- 14 files changed, 80 insertions(+), 52 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/功能请求.md b/.github/ISSUE_TEMPLATE/功能请求.md index 18eada3..e205a3c 100644 --- a/.github/ISSUE_TEMPLATE/功能请求.md +++ b/.github/ISSUE_TEMPLATE/功能请求.md @@ -1,6 +1,6 @@ --- name: 功能请求 -about: Suggest an idea for this project +about: 提交一个新功能请求 title: '' labels: 新需求 assignees: '' diff --git a/.github/ISSUE_TEMPLATE/报告bug.md b/.github/ISSUE_TEMPLATE/报告bug.md index b134c43..1d51ce9 100644 --- a/.github/ISSUE_TEMPLATE/报告bug.md +++ b/.github/ISSUE_TEMPLATE/报告bug.md @@ -1,6 +1,6 @@ --- name: 报告BUG -about: Create a report to help us improve +about: 提交一个BUG报告 title: '' labels: bug, 疑问/待复现 assignees: '' @@ -12,6 +12,7 @@ A clear and concise description of what the bug is. **复现方式** Steps to reproduce the behavior: + 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' @@ -24,10 +25,11 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **运行环境:** - - 服务器系统：win, linux - - 服务端核心：（如：Paper、Spigot） - - 服务端版本： - - 插件版本： + +- 服务器系统：win, linux +- 服务端核心：（如：Paper、Spigot） +- 服务端版本： +- 插件版本： **补充信息** Add any other context about the problem here. diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3576fd8..bf62757 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,29 +7,29 @@ on: jobs: build: -# 配置权限 + # 配置权限 permissions: write-all runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up JDK 21 - uses: actions/setup-java@v3 - with: - java-version: '21' - distribution: 'zulu' - cache: gradle - - name: "Build with Gradle" - run: ./gradlew buildPlugin - - name: "Copy jar to staging" - run: mkdir staging && cp build/libs/*.jar staging/ - - name: "Build & test" - run: | - TAG=$(echo $GITHUB_REF | sed 's/refs\/tags\///') - echo "done!" - - uses: "marvinpinto/action-automatic-releases@latest" - with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "${{ steps.build.outputs.TAG }}" - prerelease: false - files: | - staging/*.jar + - uses: actions/checkout@v3 + - name: Set up JDK 21 + uses: actions/setup-java@v3 + with: + java-version: '21' + distribution: 'zulu' + cache: gradle + - name: "Build with Gradle" + run: ./gradlew buildPlugin + - name: "Copy jar to staging" + run: mkdir staging && cp build/libs/*.jar staging/ + - name: "Build & test" + run: | + TAG=$(echo $GITHUB_REF | sed 's/refs\/tags\///') + echo "done!" + - uses: "marvinpinto/action-automatic-releases@latest" + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "${{ steps.build.outputs.TAG }}" + prerelease: false + files: | + staging/*.jar diff --git a/README.md b/README.md index 0369d98..4a3aa11 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,26 @@ -### [开源地址](https://github.com/ColdeZhang/Dominion) | [文档地址](https://ssl.lunadeer.cn:14448/doc/23/) -### [下载页面](https://github.com/ColdeZhang/Dominion/releases/latest) | [镜像地址](https://ssl.lunadeer.cn:14446/mirror/Dominion/releases) +[![GitHub Repository](https://img.shields.io/badge/GitHub-开源地址-blue?logo=github)](https://github.com/ColdeZhang/Dominion) +[![bStats](https://img.shields.io/badge/bStats-Statistics-eacd76?logo=google-analytics)](https://bstats.org/plugin/bukkit/Dominion/21445) +[![Hangar](https://img.shields.io/badge/Hangar-Project-bacac6?logo=paper)](https://hangar.papermc.io/zhangyuheng/Dominion) -### [统计页面](https://bstats.org/plugin/bukkit/Dominion/21445) | [Hangar](https://hangar.papermc.io/zhangyuheng/Dominion) +[![Documentation](https://img.shields.io/badge/在线文档-点击跳转-70f3ff?logo=readthedocs)](https://ssl.lunadeer.cn:14448/doc/23/) +[![Latest Build](https://img.shields.io/github/v/release/ColdeZhang/Dominion?label=%E6%9C%80%E6%96%B0%E6%9E%84%E5%BB%BA%E4%B8%8B%E8%BD%BD&logo=github&color=0aa344)](https://github.com/ColdeZhang/Dominion/releases/latest) +[![Latest Build](https://img.shields.io/github/v/release/ColdeZhang/Dominion?label=%E5%A4%87%E7%94%A8%E4%B8%8B%E8%BD%BD%E5%9C%B0%E5%9D%80&logo=gitea&color=0aa344)](https://ssl.lunadeer.cn:14446/mirror/Dominion/releases) +--- + ## 简介 -鉴于 Residence 插件的作者项目较多，维护压力大，无法及时跟进新版本以及适配Folia核心。故开发此插件，旨在平替纯净版生存服Residence的使用（支持从 Res 迁移数据）。 +鉴于 Residence 插件的作者项目较多，维护压力大，无法及时跟进新版本以及适配Folia核心。故开发此插件，旨在平替纯净版生存服Residence的使用（支持从 +Res 迁移数据）。 -**请注意，本插件目前处于中期测试稳定阶段，绝大多数bug或漏洞已被修复，目前已具备完全可用性。但不排除仍然存在某些问题，如果遇到任何 BUG 欢迎及时发送邮件或添加QQ群告知，感激不尽。** +**请注意，本插件目前处于中期测试稳定阶段，绝大多数bug或漏洞已被修复，目前已具备完全可用性。但不排除仍然存在某些问题，如果遇到任何 +BUG 欢迎及时发送邮件或添加QQ群告知，感激不尽。** ## 说明 @@ -64,18 +71,17 @@ - 1.20.1+ (Bukkit、Spigot、Paper、Folia) -> 需要使用 Java21 运行你的服务端，如果你还在使用 Java17 可以放心替换为 Java21，理论上 1.20.1+ 版本的服务端核心可以直接升级到 Java21 启动。 - -## TODO - -- WebUI +> 需要使用 Java21 运行你的服务端，如果你还在使用 Java17 可以放心替换为 Java21，理论上 1.20.1+ 版本的服务端核心可以直接升级到 +> Java21 启动。 ## 建议与反馈 -Mail: [zhangyuheng@lunadeer.cn](mailto:zhangyuheng@lunadeer.cn) +GitHub Issues: [地址](https://github.com/ColdeZhang/Dominion/issues) QQ群：309428300 ## 统计 -![bstats](https://bstats.org/signatures/bukkit/Dominion.svg) +
+ +
diff --git a/core/src/main/java/cn/lunadeer/dominion/commands/Group.java b/core/src/main/java/cn/lunadeer/dominion/commands/Group.java index 35568db..6601977 100644 --- a/core/src/main/java/cn/lunadeer/dominion/commands/Group.java +++ b/core/src/main/java/cn/lunadeer/dominion/commands/Group.java @@ -16,8 +16,8 @@ import java.util.Collections; import java.util.List; import static cn.lunadeer.dominion.Commands.boolOptions; -import static cn.lunadeer.dominion.utils.CommandUtils.hasPermission; import static cn.lunadeer.dominion.commands.Helper.*; +import static cn.lunadeer.dominion.utils.CommandUtils.hasPermission; import static cn.lunadeer.dominion.utils.TuiUtils.getPage; public class Group { diff --git a/core/src/main/java/cn/lunadeer/dominion/commands/Member.java b/core/src/main/java/cn/lunadeer/dominion/commands/Member.java index a12e355..091a457 100644 --- a/core/src/main/java/cn/lunadeer/dominion/commands/Member.java +++ b/core/src/main/java/cn/lunadeer/dominion/commands/Member.java @@ -17,8 +17,8 @@ import java.util.List; import static cn.lunadeer.dominion.Commands.boolOptions; import static cn.lunadeer.dominion.Commands.playerNames; -import static cn.lunadeer.dominion.utils.CommandUtils.hasPermission; import static cn.lunadeer.dominion.commands.Helper.*; +import static cn.lunadeer.dominion.utils.CommandUtils.hasPermission; public class Member { diff --git a/core/src/main/java/cn/lunadeer/dominion/commands/Migration.java b/core/src/main/java/cn/lunadeer/dominion/commands/Migration.java index 7287958..91a4d22 100644 --- a/core/src/main/java/cn/lunadeer/dominion/commands/Migration.java +++ b/core/src/main/java/cn/lunadeer/dominion/commands/Migration.java @@ -52,7 +52,7 @@ public class Migration { return; } create(player, resNode, ""); - if (args.length == 3 ) { + if (args.length == 3) { int parentId = Integer.parseInt(args[2]); String[] newArgs = new String[2]; newArgs[0] = "migrate_list"; diff --git a/core/src/main/java/cn/lunadeer/dominion/commands/Template.java b/core/src/main/java/cn/lunadeer/dominion/commands/Template.java index 6b599e8..b6737dd 100644 --- a/core/src/main/java/cn/lunadeer/dominion/commands/Template.java +++ b/core/src/main/java/cn/lunadeer/dominion/commands/Template.java @@ -15,10 +15,10 @@ import java.util.Collections; import java.util.List; import static cn.lunadeer.dominion.Commands.boolOptions; -import static cn.lunadeer.dominion.utils.CommandUtils.hasPermission; -import static cn.lunadeer.dominion.utils.CommandUtils.playerOnly; import static cn.lunadeer.dominion.commands.Helper.allTemplates; import static cn.lunadeer.dominion.commands.Helper.playerPrivileges; +import static cn.lunadeer.dominion.utils.CommandUtils.hasPermission; +import static cn.lunadeer.dominion.utils.CommandUtils.playerOnly; import static cn.lunadeer.dominion.utils.TuiUtils.getPage; public class Template { diff --git a/core/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java b/core/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java index c44d732..058d158 100644 --- a/core/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java +++ b/core/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java @@ -91,7 +91,7 @@ public class DominionDTO { return dominions.getFirst(); } - public static List selectByParentId(World world, Integer parentId){ + public static List selectByParentId(World world, Integer parentId) { return selectByParentId(world.getUID(), parentId); } diff --git a/core/src/main/java/cn/lunadeer/dominion/dtos/GroupDTO.java b/core/src/main/java/cn/lunadeer/dominion/dtos/GroupDTO.java index 0ad5cd6..816a40b 100644 --- a/core/src/main/java/cn/lunadeer/dominion/dtos/GroupDTO.java +++ b/core/src/main/java/cn/lunadeer/dominion/dtos/GroupDTO.java @@ -48,7 +48,7 @@ public class GroupDTO { } public String getNameColoredBukkit() { - String with_pre_suf = "&#ffffff" + + String with_pre_suf = "&#ffffff" + Dominion.config.getGroupTitlePrefix() + (String) name_colored.value + "&#ffffff" + diff --git a/core/src/main/java/cn/lunadeer/dominion/managers/GroupLimit.java b/core/src/main/java/cn/lunadeer/dominion/managers/GroupLimit.java index 1f736b8..712502e 100644 --- a/core/src/main/java/cn/lunadeer/dominion/managers/GroupLimit.java +++ b/core/src/main/java/cn/lunadeer/dominion/managers/GroupLimit.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; public class GroupLimit { - private final YamlConfiguration config; + private final YamlConfiguration config; private final File file_path; private Integer min_y; private Integer max_y; diff --git a/core/src/main/java/cn/lunadeer/dominion/tuis/AllDominion.java b/core/src/main/java/cn/lunadeer/dominion/tuis/AllDominion.java index ccdfef6..9398080 100644 --- a/core/src/main/java/cn/lunadeer/dominion/tuis/AllDominion.java +++ b/core/src/main/java/cn/lunadeer/dominion/tuis/AllDominion.java @@ -10,10 +10,10 @@ import org.bukkit.entity.Player; import java.util.List; +import static cn.lunadeer.dominion.tuis.dominion.DominionList.BuildTreeLines; import static cn.lunadeer.dominion.utils.CommandUtils.playerOnly; import static cn.lunadeer.dominion.utils.TuiUtils.getPage; import static cn.lunadeer.dominion.utils.TuiUtils.notOp; -import static cn.lunadeer.dominion.tuis.dominion.DominionList.BuildTreeLines; public class AllDominion { diff --git a/core/src/main/java/cn/lunadeer/dominion/tuis/dominion/DominionList.java b/core/src/main/java/cn/lunadeer/dominion/tuis/dominion/DominionList.java index a3d30e8..3955fbe 100644 --- a/core/src/main/java/cn/lunadeer/dominion/tuis/dominion/DominionList.java +++ b/core/src/main/java/cn/lunadeer/dominion/tuis/dominion/DominionList.java @@ -14,8 +14,8 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.List; -import static cn.lunadeer.dominion.utils.CommandUtils.playerOnly; import static cn.lunadeer.dominion.commands.Helper.playerAdminDominions; +import static cn.lunadeer.dominion.utils.CommandUtils.playerOnly; import static cn.lunadeer.dominion.utils.TuiUtils.getPage; public class DominionList { diff --git a/resource/logo.svg b/resource/logo.svg index 36fbb46..2c9e3d0 100644 --- a/resource/logo.svg +++ b/resource/logo.svg @@ -1 +1,21 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + \ No newline at end of file