diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 3cf6fad9..9c5a0f8a 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -59,6 +59,8 @@ body: multiple: false options: - "Latest Build (GitHub Actions)" + - "2.3.4" + - "2.3.4-compat" - "2.3.3" - "2.3.3-compat" - "1.20.5-2.3.2" diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d44e01f..21d6257f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,42 +1,55 @@ # Changelog 更新日志 -## Discord-MC-Chat 2.3.3 for Minecraft 1.19.4+ - 2024/6/15 +## Discord-MC-Chat 2.3.4 for Minecraft 1.19.4+ - 2024/7/11 -Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21. +DMCC will support the [Placeholder API](https://placeholders.pb4.eu/) in the next release. -Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5. +`botPlayingStatus` and `botListeningStatus` have been renamed to `botPlayingActivity` and `botListeningActivity`. Please modify them before restarting the server to avoid losing any existing changes. -从 Minecraft 1.20.5（快照 24w14a）开始，游戏要求 Java 21。 +In addition, the check for updates feature has been fixed. You will be able to receive update notifications for future new versions when using version 2.3.4. -因此，为了保证多版本兼容性，无论游戏版本是否晚于 Minecraft 1.20.5，DMCC 现在都要求 Fabric Loader 版本 >=0.15.10 且 Java 版本 >=21。 +DMCC 将在下一个版本中支持 [Placeholder API](https://placeholders.pb4.eu/)。 -## New Features 新特性 +`botPlayingStatus` 和 `botListeningStatus` 已被重命名为 `botPlayingActivity` 和 `botListeningActivity`。请在重新启动服务器之前进行修改，以免丢失现有的更改。 -- Italian translation (#229) - 意大利语翻译 +此外，检查更新的功能已经修复。在使用 2.3.4 版本时，你将能够接收到未来新版本的更新推送。 -- Spanish translation (#232) - 西班牙语翻译 +## New Features 新特性 -- Compatible with version 1.21 (#237) - 兼容 1.21 版本 +- Add the ability to display server status in the bot's Discord online status (#95) + 添加在机器人的 Discord 在线状态中显示服务器状态的功能 ## Changes 更改 -- Fix special characters in emojis / emotes not being escaped (#227) - 修复表情中的特殊字符没有被转义 +- Improved detection logic for dynamic-created DMCC Webhooks (#233) + 改进 DMCC Webhook 动态创建的检测逻辑 + +- Fix number of players in bot activity does not decrease when player leaves the game (#235) + 修复机器人活动状态中的玩家数量在玩家离开游戏时不会减少 + +- Fix DMCC update notifications never being sent (#231, #234 and #239) + 修复 DMCC 更新通知从未发送 + +- Fix exception when the world/stats folder does not exist (#38) + 修复 world/stats 文件夹不存在时报错 + +- No longer delays checking for updates by an hour (#52) + 不再延迟一小时开始检查更新 + +- Fix exception when /stats command message exceeds 2000 characters (#212) + 修复 /stats 命令消息超过 2000 个字符时报错 + +- Rename botPlayingStatus and botListeningStatus -> botPlayingActivity and botListeningActivity (#95) + 重命名 botPlayingStatus 和 botListeningStatus -> botPlayingActivity 和 botListeningActivity ## Removed 移除 -- Move 1.19.1 - 1.19.3 versions to Compat update channel - 将 1.19.1 - 1.19.3 版本移至 Compat 更新通道 +N/A ## Contributors 贡献者 - @Xujiayao -- @Lucadecastle -- @BroxyZF ## Detailed Information 详细信息 -https://github.com/Xujiayao/Discord-MC-Chat/compare/1.20.5-2.3.2...2.3.3 \ No newline at end of file +https://github.com/Xujiayao/Discord-MC-Chat/compare/2.3.3...2.3.4 \ No newline at end of file diff --git a/CHANGELOG_COMPAT.md b/CHANGELOG_COMPAT.md index cfa34916..2d8a6a39 100644 --- a/CHANGELOG_COMPAT.md +++ b/CHANGELOG_COMPAT.md @@ -1,30 +1,46 @@ # Changelog 更新日志 -## Discord-MC-Chat 2.3.3-compat for Minecraft 1.14.4+ - 2024/6/15 +## Discord-MC-Chat 2.3.4-compat for Minecraft 1.14.4+ - 2024/7/11 -Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21. +DMCC will support the [Placeholder API](https://placeholders.pb4.eu/) in the next release. -Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5. +`botPlayingStatus` and `botListeningStatus` have been renamed to `botPlayingActivity` and `botListeningActivity`. Please modify them before restarting the server to avoid losing any existing changes. -从 Minecraft 1.20.5（快照 24w14a）开始，游戏要求 Java 21。 +In addition, the check for updates feature has been fixed. You will be able to receive update notifications for future new versions when using version 2.3.4. -因此，为了保证多版本兼容性，无论游戏版本是否晚于 Minecraft 1.20.5，DMCC 现在都要求 Fabric Loader 版本 >=0.15.10 且 Java 版本 >=21。 +DMCC 将在下一个版本中支持 [Placeholder API](https://placeholders.pb4.eu/)。 -## New Features 新特性 +`botPlayingStatus` 和 `botListeningStatus` 已被重命名为 `botPlayingActivity` 和 `botListeningActivity`。请在重新启动服务器之前进行修改，以免丢失现有的更改。 -- Move 1.19.1 - 1.19.3 versions to Compat update channel - 将 1.19.1 - 1.19.3 版本移至 Compat 更新通道 +此外，检查更新的功能已经修复。在使用 2.3.4 版本时，你将能够接收到未来新版本的更新推送。 -- Italian translation (#229) - 意大利语翻译 +## New Features 新特性 -- Spanish translation (#232) - 西班牙语翻译 +- Add the ability to display server status in the bot's Discord online status (#95) + 添加在机器人的 Discord 在线状态中显示服务器状态的功能 ## Changes 更改 -- Fix special characters in emojis / emotes not being escaped (#227) - 修复表情中的特殊字符没有被转义 +- Improved detection logic for dynamic-created DMCC Webhooks (#233) + 改进 DMCC Webhook 动态创建的检测逻辑 + +- Fix number of players in bot activity does not decrease when player leaves the game (#235) + 修复机器人活动状态中的玩家数量在玩家离开游戏时不会减少 + +- Fix DMCC update notifications never being sent (#231, #234 and #239) + 修复 DMCC 更新通知从未发送 + +- Fix exception when the world/stats folder does not exist (#38) + 修复 world/stats 文件夹不存在时报错 + +- No longer delays checking for updates by an hour (#52) + 不再延迟一小时开始检查更新 + +- Fix exception when /stats command message exceeds 2000 characters (#212) + 修复 /stats 命令消息超过 2000 个字符时报错 + +- Rename botPlayingStatus and botListeningStatus -> botPlayingActivity and botListeningActivity (#95) + 重命名 botPlayingStatus 和 botListeningStatus -> botPlayingActivity 和 botListeningActivity ## Removed 移除 @@ -33,9 +49,7 @@ N/A ## Contributors 贡献者 - @Xujiayao -- @Lucadecastle -- @BroxyZF ## Detailed Information 详细信息 -https://github.com/Xujiayao/Discord-MC-Chat/compare/2.3.2-compat...2.3.3-compat \ No newline at end of file +https://github.com/Xujiayao/Discord-MC-Chat/compare/2.3.3-compat...2.3.4-compat \ No newline at end of file diff --git a/README.md b/README.md index a5d23207..7685cefb 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,8 @@ For translation contributions, language files are located in the `/wrapper/src/m - Minecraft <> Discord cross server chat - Support disabling Discord and in-game chat broadcasts - Support displaying server status using Discord channel topic feature - - Support displaying server player count in bot activity status + - Support displaying server status in bot's Discord online status + - Support displaying server player count in bot's Discord activity status - Support Discord Webhook feature - Dynamic-created DMCC Webhook - Customizable Webhook Avatar API diff --git a/README_CN.md b/README_CN.md index 2a437704..09a68f12 100644 --- a/README_CN.md +++ b/README_CN.md @@ -61,7 +61,8 @@ Discord-MC-Chat (DMCC), formerly known as MC-Discord-Chat and MCDiscordChat (MCD - Minecraft <> Discord 跨服聊天 - 支持禁用 Discord 和游戏内聊天广播 - 支持使用 Discord 频道主题功能显示服务器状态 - - 支持使用机器人活动状态显示服务器玩家数 + - 支持使用机器人 Discord 在线状态中显示服务器状态 + - 支持使用机器人 Discord 活动状态显示服务器玩家数 - 支持 Discord Webhook 功能 - 动态创建 DMCC Webhook - 可自定义 Webhook 玩家头像 API diff --git a/gradle.properties b/gradle.properties index c00bea15..02d5a86a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx8G org.gradle.parallel=true # Mod Properties -mod_version=2.3.3 +mod_version=2.3.4 maven_group=com.xujiayao.discord_mc_chat archives_base_name=Discord-MC-Chat diff --git a/update/version.json b/update/version.json index 980b1ec3..25a73d67 100644 --- a/update/version.json +++ b/update/version.json @@ -1,4 +1,4 @@ { - "version": "2.3.3", - "changelog": "\n\n> Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21.\n> \n> Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5." + "version": "2.3.4", + "changelog": "\n\n> DMCC will support the [Placeholder API](https://placeholders.pb4.eu/) in the next release.\n> \n> `botPlayingStatus` and `botListeningStatus` have been renamed to `botPlayingActivity` and `botListeningActivity`. Please modify them before restarting the server to avoid losing any existing changes.\n> \n> In addition, the check for updates feature has been fixed. You will be able to receive update notifications for future new versions when using version 2.3.4." } \ No newline at end of file diff --git a/update/versions.json b/update/versions.json index 9c822121..2d175b5d 100644 --- a/update/versions.json +++ b/update/versions.json @@ -1,8 +1,8 @@ { "versions": [ { - "version": "2.3.3", - "changelog": "\n\n> Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21.\n> \n> Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5.", + "version": "2.3.4", + "changelog": "\n\n> DMCC will support the [Placeholder API](https://placeholders.pb4.eu/) in the next release.\n> \n> `botPlayingStatus` and `botListeningStatus` have been renamed to `botPlayingActivity` and `botListeningActivity`. Please modify them before restarting the server to avoid losing any existing changes.\n> \n> In addition, the check for updates feature has been fixed. You will be able to receive update notifications for future new versions when using version 2.3.4.", "minecraft_dependency": [ "~1.19.4", "1.20", @@ -15,8 +15,8 @@ ] }, { - "version": "2.3.3-compat", - "changelog": "\n\n> Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21.\n> \n> Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5.", + "version": "2.3.4-compat", + "changelog": "\n\n> DMCC will support the [Placeholder API](https://placeholders.pb4.eu/) in the next release.\n> \n> `botPlayingStatus` and `botListeningStatus` have been renamed to `botPlayingActivity` and `botListeningActivity`. Please modify them before restarting the server to avoid losing any existing changes.\n> \n> In addition, the check for updates feature has been fixed. You will be able to receive update notifications for future new versions when using version 2.3.4.", "minecraft_dependency": [ "~1.14.4", "~1.15.2",