1 Commits
Author SHA1 Message Date
SKYMirror d5ba9743ed release: Iridium 26.9.1
MCDR plugin: item share, hat, player head, calculator, join MOTD.
All rights reserved. Author: 云镜之端/SKYMirror
2026-09-13 02:32:54 +08:00
18 changed files with 176 additions and 793 deletions

No files matched your search

+15 -115
View File
@@ -1,120 +1,20 @@
# Changelog / 更新日志
# Changelog
本文件记录 Iridium 的重要变更。
This file records notable changes to Iridium.
---
## [26.9.14] - 2026-09-14
### 修复 / Fixed
- 删除 `config/iridium.json` 后重载可正确重新生成(多路径探测 + 写入失败日志)
- Deleting `config/iridium.json` then reloading correctly recreates the file (multi-path probe + write-failure logs)
### 变更 / Changed
- `motd_start_day` 默认为配置生成当天(YYYY-MM-DD),不再为空
- `motd_start_day` defaults to the config creation date (`YYYY-MM-DD`), no longer empty
- 去掉 MOTD 标题「服务器信息」/「Server Info」
- Removed the MOTD header title (`服务器信息` / `Server Info`)
- 默认 QQ 群增加可点击链接 `https://skymirror.top/qq`
- Default QQ group line is now a clickable link to `https://skymirror.top/qq`
- 进服命令提示文案去掉「已启用 Iridium」
- Join tip header no longer says “Iridium is enabled”
### 新增 / Added
- 英文文档 `README_en.md`
- English documentation `README_en.md`
---
## [26.9.13] - 2026-09-13
### 新增 / Added
- 首次启动自动生成带中文注释的 `config/iridium.json`
- On first load, generate a commented `config/iridium.json`
- 配置文件支持 `//` 行注释
- Config file supports `//` line comments
### 变更 / Changed
- 提交信息改为中文
- Commit messages rewritten in Chinese
- 清理历史 Release,仅保留当前版本
- Cleaned old Releases; keep only the current version
---
## [26.9.8] - 2026-09-13
### 变更 / Changed
- `!!share`:去掉「点击复制完整数据」,仅保留物品名 + 悬停预览
- `!!share`: removed the copy-to-clipboard button; name + hover only
---
## [26.9.7] - 2026-09-13
### 修复 / Fixed
- `!!share`:无 NBT 改名时 fallback 为 ID 美化名(如 `Time Twister Wireless`)
- `!!share`: humanized ID fallback when the item has no NBT custom name
---
## [26.9.6] - 2026-09-13
### 修复 / Fixed
- `!!share`:使用客户端 `translate` 组件显示本地化名
- `!!share`: use client `translate` component for localized names
- `!!share`:提示音在玩家位置播放
- `!!share`: play sound at the player to avoid “too far away”
---
## [26.9.5] - 2026-09-13
### 修复 / Fixed
- `!!hat`(1.17+):副手缓冲交换,避免复杂 NBT 重建失败导致物品消失
- `!!hat` (1.17+): offhand-buffer swap so complex NBT cannot wipe items
- `!!share`:优先显示自定义名 / translate
- `!!share`: prefer custom name / translate over raw item id
---
## [26.9.4] - 2026-09-13
### 新增 / Added
- 操作日志写入 MCDR 控制台
- Command operations logged to the MCDR console
---
## [26.9.3] - 2026-09-13
### 修复 / Fixed
- 版本比较在 `str` / `Version` 之间崩溃
- Version comparison crash between `str` and `Version`
- `!!c` 回调缺少 `server` 绑定
- `!!c` callback missing `server` binding
---
## [26.9.2] - 2026-09-13
### 修复 / Fixed
- 语言文件 YAML 因值中冒号未加引号而解析失败
- Language YAML failed when values contained unquoted colons
- 进服事件名:`PLAYER_JOIN` → `PLAYER_JOINED`
- Join event name: `PLAYER_JOIN` → `PLAYER_JOINED`
---
本文件记录 Iridium 的重要变更。
## [26.9.1] - 2026-09-13
### 新增 / Added
- `!!share` / `!!hat` / `!!head` / `!!c`、进服 MOTD 与命令提示
- `!!share` / `!!hat` / `!!head` / `!!c`, join MOTD and command tips
- 按 Minecraft 版本分支;不支持的功能会提示
- Minecraft-version branching with clear prompts when unsupported
### Added
- `!!share`:展示主手物品(悬停完整数据,1.16+ 点击复制,可选提示音)
- `!!hat`:主手物品与头部装备互换(需 RCON)
- `!!head [player]`:获取一个玩家头颅,支持冷却与权限
- `!!c <expression>`:游戏内四则运算计算器(AST 白名单,零依赖)
- 进服 MOTD:开服天数、自定义文案、可点击链接、`§` 颜色
- 进服命令提示(可点击填入聊天框)
- 按 Minecraft 版本分支;不支持的功能会明确提示
### 安全 / Security
- 玩家名清洗、命令去换行、tellraw 转义、链接仅 http(s)
- Name sanitization, newline stripping, tellraw escaping, http(s)-only links
### Security
- 玩家名统一清洗为 `[A-Za-z0-9_]` 并限长后再拼进 `/give`、`data get`、`item replace`
- 控制台命令去除换行,防止拆成多行二次执行
- tellraw 对物品 SNBT 做 JSON 转义与长度截断
- MOTD 链接仅允许 `http://` / `https://`
+5 -5
View File
@@ -4,7 +4,7 @@ MCDReforged 插件:物品展示 / 戴头 / 获取头颅 / 游戏内计算器 /
| | |
|---|---|
| 版本 | **26.9.14** |
| 版本 | **26.9.1** |
| 作者 | 云镜之端/SKYMirror |
| 许可 | 保留所有权益(All Rights Reserved) |
| 前置 | MCDReforged `>= 2.6.0` |
@@ -15,7 +15,7 @@ MCDReforged 插件:物品展示 / 戴头 / 获取头颅 / 游戏内计算器 /
| 功能 | 说明 |
|------|------|
| `!!share` | 展示主手物品:聊天栏显示物品名,悬停查看完整数据 |
| `!!share` | 展示主手物品:悬停看完整 NBT/组件,1.16+ 可点击复制,可选提示音 |
| `!!hat` | 主手与头部装备互换 |
| `!!head [player]` | 给自己或指定玩家 **1 个** 头颅;有冷却 |
| `!!c <表达式>` | 四则运算 + 括号:`+ - * / // % ** ^` |
@@ -91,12 +91,12 @@ rcon.password=your_password
"join_tip": true,
"join_tip_delay_seconds": 1.5,
"motd_enabled": true,
"motd_start_day": "2026-09-14",
"motd_start_day": "",
"motd_lines": [
"§6欢迎 §e{player}§6 加入服务器!",
"§7服务器已开服 §b{days}§7 天",
"§7官网: {link:§b点击打开官网|https://www.skymirror.top}",
"§7QQ群: {link:§f985402607|https://skymirror.top/qq}"
"§7QQ群: §f985402607"
]
}
```
@@ -111,7 +111,7 @@ rcon.password=your_password
| `join_tip` | `true` | 进服是否提示可用命令 |
| `join_tip_delay_seconds` | `1.5` | 进服消息延迟;`0` 立即 |
| `motd_enabled` | `true` | 是否发送 MOTD |
| `motd_start_day` | 生成配置当天 | 开服日期 `YYYY-MM-DD`(当天算第 1 天);可改成真实开服日 |
| `motd_start_day` | `""` | 开服日期 `YYYY-MM-DD`(当天算第 1 天);留空不显示天数 |
| `motd_lines` | 见上 | MOTD 文本行 |
修改配置后执行 `!!MCDR reload plugin` 生效。
-95
View File
@@ -1,95 +0,0 @@
# Iridium
MCDReforged plugin: item share / wear on head / player head / calculator / join MOTD.
| | |
|---|---|
| Version | **26.9.14** |
| Author | 云镜之端/SKYMirror |
| License | All Rights Reserved |
| Requires | MCDReforged `>= 2.6.0` |
| Minecraft | **1.7.10+** (feature-gated by version) |
| Python deps | None |
## Features
| Command | Description |
|---------|-------------|
| `!!share` | Share held item: name in chat, hover for full data |
| `!!hat` | Swap main-hand item with head slot |
| `!!head [player]` | Get **one** player head (default: yourself); cooldown |
| `!!c <expression>` | In-game calculator: `+ - * / // % ** ^` |
| Join MOTD | Uptime days, custom lines, clickable links, `§` colors |
| Join tips | Command list; click fills chat |
### Version support
| Feature | 1.7.10 | 1.8–1.12 | 1.13–1.16 | 1.17–1.20.4 | 1.20.5+ |
|---------|:------:|:--------:|:---------:|:-----------:|:-------:|
| `!!c` | ✅ | ✅ | ✅ | ✅ | ✅ |
| `!!head` | ✅ | ✅ | ✅ | ✅ | ✅ profile |
| `!!share` | ❌ | ✅ entitydata | ✅ data get | ✅ | ✅ |
| `!!hat` | ❌ | ✅ RCON | ✅ RCON | ✅ RCON | ✅ RCON |
| MOTD / tips | ✅ | ✅ | ✅ | ✅ | ✅ |
## Install
1. Download `Iridium.mcdr`
2. Put it in MCDR `plugins/`
3. `!!MCDR reload plugin` or restart MCDR
### RCON (required for `!!hat`)
```properties
enable-rcon=true
rcon.port=25575
rcon.password=your_password
```
## Config
Path: `config/iridium.json` (auto-created with comments on first load)
| Field | Default | Description |
|------|---------|-------------|
| `permission` | `1` | Min permission for commands |
| `head_cooldown_seconds` | `60` | `!!head` cooldown; `0` = none |
| `hat_cooldown_seconds` | `3` | `!!hat` cooldown; `0` = none |
| `share_sound` | `true` | Sound on `!!share` |
| `force_version` | `""` | Force MC version; empty = auto |
| `join_tip` | `true` | Command tips on join |
| `join_tip_delay_seconds` | `1.5` | Join message delay |
| `motd_enabled` | `true` | Send join MOTD |
| `motd_start_day` | today | Server start date `YYYY-MM-DD` (day 1 = that date) |
| `motd_lines` | see file | MOTD lines with placeholders |
Default `motd_lines` (QQ group is clickable):
```text
§6Welcome §e{player}§6 !
§7Server has been open for §b{days}§7 days
§7Website: {link:§bOpen website|https://www.skymirror.top}
§7QQ: {link:§f985402607|https://skymirror.top/qq}
```
### MOTD placeholders
| Token | Meaning |
|-------|---------|
| `{player}` | Joining player |
| `{days}` / `{day}` | Days since `motd_start_day` |
| `{online}` | Online count or `?` |
| `{link:text\|https://url}` | Clickable link |
| `{link:https://url}` | Clickable URL |
| `§` | Vanilla color/style codes |
## Security
- Calculator: AST whitelist, no arbitrary Python
- Player names sanitized to `[A-Za-z0-9_]` before game commands
- Newlines stripped from console commands
- MOTD links limited to `http(s)` only
## Copyright
Copyright (c) 2026 云镜之端/SKYMirror. All Rights Reserved. See `LICENSE`.
-23
View File
@@ -1,23 +0,0 @@
## Plugin
- ID: `iridium`
- Name: Iridium
- Repository: https://github.com/HzSKYMirror/Iridium
- Release: https://github.com/HzSKYMirror/Iridium/releases/tag/v26.9.13
- Labels: `tool`
## Summary
- `!!share`:展示主手物品(悬停完整数据)
- `!!hat`:主手与头部装备互换(需 RCON)
- `!!head [player]`:获取一个玩家头颅
- `!!c <expression>`:游戏内四则运算
- 进服 MOTD 与命令提示
面向 Minecraft 1.7.10+,按版本分支;需要 MCDR >= 2.6.0。
打包插件为 `.mcdr`,GitHub Release 已附带成品。
---
- [x] 我已阅读并检查,此 PR 符合 [贡献指南](https://github.com/MCDReforged/PluginCatalogue/blob/master/CONTRIBUTING_zh_cn.md) 中的要求
I have read and checked that my PR meets the requirements in the [Contributing Guidelines](https://github.com/MCDReforged/PluginCatalogue/blob/master/CONTRIBUTING.md)
-97
View File
@@ -1,97 +0,0 @@
# 提交到 MCDReforged 官方插件库
官方库:https://github.com/MCDReforged/PluginCatalogue
贡献指南:https://github.com/MCDReforged/PluginCatalogue/blob/master/CONTRIBUTING_zh_cn.md
## 当前进度
仓库:https://github.com/HzSKYMirror/Iridium
| 步骤 | 状态 |
|------|------|
| 公开 GitHub 仓库 | 已创建(当前可能仍为空,需推送) |
| `plugin_info.json` | 已写好(`catalogue/plugin_info.json`) |
| GitHub Release + `.mcdr` 附件 | **待完成** |
| 官方库 PR | **待完成** |
## 硬性前提
1. **公开 GitHub 仓库**(官方脚本只认 GitHub,不认 git.skymirror.top)
2. **GitHub Release 标签正确,附件为 `.mcdr`**
建议 Tag:`v26.9.1`;附件:`Iridium.mcdr`
3. **根目录有 `README.md`**(已有)
4. **许可**:官方强烈建议 OSI 开源许可;专有许可可提但审阅更慢,且提交即授权社区从 GitHub Releases 下载使用
5. **一个 PR 只加一个插件**
## 提交步骤
### 1. 推送源码到 GitHub
```bash
cd /Users/l3126596029/Code/MCDR_plg/Iridium
git remote add github https://github.com/HzSKYMirror/Iridium.git
git push -u github main
```
### 2. 在 GitHub 发 Release
- Tag:`v26.9.1`
- 附件:本地执行 `./pack.sh` 得到的 `Iridium.mcdr`
### 3. 向官方库提 PR
1. Fork https://github.com/MCDReforged/PluginCatalogue
2. 新建文件:`plugins/iridium/plugin_info.json`
内容直接使用本仓库 `catalogue/plugin_info.json`
3. 向 `MCDReforged/PluginCatalogue` 的 `master` 发起 Pull Request
### PR 标题
```text
Add plugin: iridium
```
### PR 描述
```markdown
## Plugin
- ID: `iridium`
- Name: Iridium
- Repository: https://github.com/HzSKYMirror/Iridium
- Release: https://github.com/HzSKYMirror/Iridium/releases/tag/v26.9.1
- Labels: `tool`
## Summary
物品展示(!!share)、戴头(!!hat)、获取玩家头颅(!!head)、
游戏内计算器(!!c)、进服 MOTD 与命令提示。
面向 Minecraft 1.7.10+,按版本分支;需要 MCDR >= 2.6.0。
打包插件为 `.mcdr`,Release 已附带成品。
## Checklist
- [x] Packaged plugin (.mcdr) with a release
- [x] README.md in repository root
- [x] plugin_id consistent (`iridium`)
- [x] One plugin per PR
```
## 可选优化
| 项 | 建议 |
|----|------|
| 许可 | 改为 MIT / Apache-2.0 更易过审 |
| 英文 README | 可另加 `README_en.md` 并写入 introduction |
| label | `tool`(官方标签:information / tool / management / api / handler) |
## 本地校验(可选)
官方脚本需 Python >= 3.11:
```bash
cd PluginCatalogue/scripts
pip3 install -r requirements.txt
python3 main.py check --help
```
-17
View File
@@ -1,17 +0,0 @@
{
"id": "iridium",
"authors": [
{
"name": "云镜之端/SKYMirror",
"link": "https://github.com/HzSKYMirror"
}
],
"repository": "https://github.com/HzSKYMirror/Iridium",
"branch": "main",
"related_path": ".",
"labels": ["tool"],
"introduction": {
"zh_cn": "README.md",
"en_us": "README_en.md"
}
}
+6 -2
View File
@@ -10,12 +10,16 @@ import iridium.hat as hat
import iridium.head as head
import iridium.join_tip as join_tip
import iridium.share as share
from iridium.config import Config, apply_config, load_config
from iridium.config import CONFIG_FILE, Config, apply_config
from iridium.version_util import tr
def on_load(server: PluginServerInterface, prev_module) -> None:
loaded = load_config(server)
loaded = server.load_config_simple(
CONFIG_FILE,
target_class=Config,
in_data_folder=False,
)
apply_config(loaded)
server.logger.info(tr("loaded"))
+1 -3
View File
@@ -92,8 +92,6 @@ def do_calc(server: PluginServerInterface, src: CommandSource, context: dict) ->
return
out = _format_result(result)
who = src.get_info().player if src.is_player else "console"
server.logger.info(f"[Iridium] !!c: {who} {expression} = {out}")
# Private reply to avoid flooding public chat
src.reply(
RTextList(
@@ -108,7 +106,7 @@ def do_calc(server: PluginServerInterface, src: CommandSource, context: dict) ->
def register(server: PluginServerInterface) -> None:
builder = SimpleCommandBuilder()
builder.command("!!c", lambda src: src.reply(RText(tr("calc_usage"), RColor.yellow)))
builder.command("!!c <expression>", lambda src, ctx: do_calc(server, src, ctx))
builder.command("!!c <expression>", do_calc)
builder.arg("expression", GreedyText)
builder.register(server)
server.register_help_message("!!c <expression>", tr("calc_help"))
+4 -174
View File
@@ -1,15 +1,8 @@
import json
from datetime import date
from pathlib import Path
from typing import List, Optional
from typing import List
from mcdreforged.api.all import *
def _today() -> str:
return date.today().strftime("%Y-%m-%d")
class Config(Serializable):
# 使用 !!share / !!hat / !!head / !!c 所需的最低权限等级
permission: int = 1
@@ -27,8 +20,8 @@ class Config(Serializable):
join_tip_delay_seconds: float = 1.5
# 是否发送进服 MOTD(开服天数 + 自定义行)
motd_enabled: bool = True
# 开服日期,格式 YYYY-MM-DD;默认为配置生成当天(当天算第 1 天)
motd_start_day: str = _today()
# 开服日期,格式 YYYY-MM-DD,用于计算开服天数;留空则不显示天数
motd_start_day: str = ""
# MOTD 文本行。支持:
# {player} 玩家名
# {days} 开服天数
@@ -40,64 +33,12 @@ class Config(Serializable):
"§6欢迎 §e{player}§6 加入服务器!",
"§7服务器已开服 §b{days}§7 天",
"§7官网: {link:§b点击打开官网|https://www.skymirror.top}",
"§7QQ群: {link:§f985402607|https://skymirror.top/qq}",
"§7QQ群: §f985402607",
]
CONFIG_FILE = "config/iridium.json"
def build_default_config_text() -> str:
"""带注释的默认配置;开服日期为生成当天。"""
today = _today()
return f"""{{
// 使用 !!share / !!hat / !!head / !!c 所需的最低权限等级
// 0=控制台 1=普通玩家 2=OP/管理员
"permission": 1,
// !!head 冷却时间(秒),0 表示不限制
"head_cooldown_seconds": 60,
// !!hat 冷却时间(秒),0 表示不限制
"hat_cooldown_seconds": 3,
// !!share 是否播放提示音
"share_sound": true,
// 强制指定 Minecraft 版本(如 "1.12.2"、"1.20.1")
// 留空则自动检测;检测失败时可手动填写
"force_version": "",
// 玩家进服时是否提示可用命令
"join_tip": true,
// 进服消息延迟(秒),0 为立即发送
"join_tip_delay_seconds": 1.5,
// 是否发送进服 MOTD(开服天数 + 自定义文案)
"motd_enabled": true,
// 开服日期,格式 YYYY-MM-DD(当天算第 1 天)
// 默认为本配置文件生成当天,可自行修改为真实开服日
"motd_start_day": "{today}",
// MOTD 文本行
// 占位符: {{player}} 玩家名 {{days}} 开服天数 {{online}} 在线人数
// 链接: {{link:显示文字|https://url}} 或 {{link:https://url}}
// 颜色: 支持原版 § 颜色代码
"motd_lines": [
"§6欢迎 §e{{player}}§6 加入服务器!",
"§7服务器已开服 §b{{days}}§7 天",
"§7官网: {{link:§b点击打开官网|https://www.skymirror.top}}",
"§7QQ群: {{link:§f985402607|https://skymirror.top/qq}}"
]
}}
"""
# 兼容旧引用
DEFAULT_CONFIG_TEXT = build_default_config_text()
# 模块级单例;on_load 时原地更新字段,避免各模块持有过期引用
config = Config()
@@ -113,114 +54,3 @@ def apply_config(new_cfg: Config) -> None:
config.motd_enabled = new_cfg.motd_enabled
config.motd_start_day = new_cfg.motd_start_day
config.motd_lines = list(new_cfg.motd_lines)
def _strip_json_comments(text: str) -> str:
"""Remove // line comments outside of strings."""
out = []
i = 0
n = len(text)
in_string = False
while i < n:
c = text[i]
if in_string:
out.append(c)
if c == "\\" and i + 1 < n:
out.append(text[i + 1])
i += 2
continue
if c == '"':
in_string = False
i += 1
continue
if c == '"':
in_string = True
out.append(c)
i += 1
continue
if c == "/" and i + 1 < n and text[i + 1] == "/":
while i < n and text[i] != "\n":
i += 1
continue
out.append(c)
i += 1
return "".join(out)
def _candidate_paths(server: PluginServerInterface) -> List[Path]:
"""Possible config file locations, best first."""
paths: List[Path] = []
seen = set()
def add(p: Path) -> None:
try:
rp = p.expanduser().resolve()
except Exception:
rp = p
key = str(rp)
if key not in seen:
seen.add(key)
paths.append(rp)
try:
wd = server.get_mcdr_config().get("working_directory")
if wd:
add(Path(wd) / CONFIG_FILE)
except Exception:
pass
try:
add(Path.cwd() / CONFIG_FILE)
except Exception:
pass
# Fallback: next to CWD if MCDR launched from elsewhere
add(Path.cwd() / "config" / "iridium.json")
return paths
def config_path(server: PluginServerInterface) -> Path:
"""Prefer an existing file; else the first writable candidate."""
candidates = _candidate_paths(server)
for p in candidates:
if p.is_file():
return p
return candidates[0]
def ensure_config_file(server: PluginServerInterface) -> Path:
"""Create commented default config if missing. Always returns absolute path."""
path = config_path(server)
try:
path.parent.mkdir(parents=True, exist_ok=True)
except Exception as e:
server.logger.error(f"无法创建配置目录 {path.parent}: {e}")
return path
if not path.is_file():
try:
path.write_text(build_default_config_text(), encoding="utf-8")
server.logger.info(f"已生成配置文件: {path}")
except Exception as e:
server.logger.error(f"写入配置文件失败 {path}: {e}")
return path
def load_config(server: PluginServerInterface) -> Config:
"""Load config; recreate a commented default whenever the file is missing."""
path = ensure_config_file(server)
if not path.is_file():
server.logger.warning(f"配置文件不存在且无法创建,使用内存默认值: {path}")
return Config()
try:
raw = path.read_text(encoding="utf-8")
except Exception as e:
server.logger.error(f"读取配置失败 {path}: {e},使用默认值")
return Config()
try:
data = json.loads(_strip_json_comments(raw))
except json.JSONDecodeError as e:
server.logger.error(f"配置文件 JSON 解析失败 {path}: {e},使用默认值")
return Config()
try:
return Config.deserialize(data)
except Exception as e:
server.logger.error(f"配置反序列化失败 {path}: {e},使用默认值")
return Config()
+31 -44
View File
@@ -258,64 +258,52 @@ def _extract_item_payload(payload: str, version: Version) -> Optional[str]:
def _do_swap(server: PluginServerInterface, src: CommandSource, player: str, version: Version) -> bool:
name = sanitize_name(player)
head_slot = _head_slot(version)
hand_slot = _hand_slot(version, 0)
# 1.17+: true swap via offhand buffer — no need to rebuild item NBT
if is_at_least(version, "1.17"):
if not is_at_least(version, "1.13"):
# Single entitydata dump contains both SelectedItem and head Inventory slot
dump = rcon_query(server, _entitydata_query(player))
if dump is None:
src.reply(RText(tr("hat_query_failed"), RColor.red))
return False
hotbar_index = _extract_selected_slot(dump)
hand = _extract_item_payload(dump, version)
if hand is None or _is_air(hand):
src.reply(RText(tr("hand_is_empty"), RColor.red))
return False
head = _extract_head_item(dump, version)
else:
hand_raw = rcon_query(server, _selected_query(player, version))
if hand_raw is None:
src.reply(RText(tr("hat_query_failed"), RColor.red))
return False
hotbar_index = 0
hand = _extract_item_payload(hand_raw, version)
if hand is None or _is_air(hand):
src.reply(RText(tr("hand_is_empty"), RColor.red))
return False
head = None
head_raw = rcon_query(server, _head_query(player, version))
if head_raw is not None:
head = _extract_head_item(head_raw, version)
off_raw = rcon_query(server, f"data get entity {name} weapon.offhand")
off = None
if off_raw is not None:
off = _extract_item_payload(off_raw, version)
if off and not _is_air(off):
src.reply(RText(tr("hat_offhand_busy"), RColor.red))
return False
head_slot = _head_slot(version)
hand_slot = _hand_slot(version, hotbar_index)
name = sanitize_name(player)
# 1) save head -> offhand 2) hand -> head 3) offhand -> hand 4) clear offhand
safe_execute(
server,
f"item replace entity {name} weapon.offhand from entity {name} {head_slot}",
)
if is_at_least(version, "1.17"):
safe_execute(
server,
f"item replace entity {name} {head_slot} from entity {name} weapon.mainhand",
)
safe_execute(
server,
f"item replace entity {name} weapon.mainhand from entity {name} weapon.offhand",
)
safe_execute(server, f"item replace entity {name} weapon.offhand with air")
src.reply(RText(tr("hat_success"), RColor.green))
return True
# 1.8–1.16: rebuild via parsed SNBT
dump = rcon_query(server, _entitydata_query(player))
if dump is None:
src.reply(RText(tr("hat_query_failed"), RColor.red))
return False
hotbar_index = _extract_selected_slot(dump)
hand_slot = _hand_slot(version, hotbar_index)
hand = _extract_item_payload(dump, version)
if hand is None or _is_air(hand):
src.reply(RText(tr("hand_is_empty"), RColor.red))
return False
head = _extract_head_item(dump, version)
safe_execute(server, _replace_with(player, head_slot, hand, version))
if head and not _is_air(head):
safe_execute(server, _replace_with(player, hand_slot, head, version))
if head and not _is_air(head):
safe_execute(server, _replace_with(player, hand_slot, head, version))
else:
safe_execute(server, f"item replace entity {name} {hand_slot} with air")
else:
safe_execute(server, _replace_with(player, hand_slot, "minecraft:air", version))
safe_execute(server, _replace_with(player, head_slot, hand, version))
if head and not _is_air(head):
safe_execute(server, _replace_with(player, hand_slot, head, version))
else:
safe_execute(server, _replace_with(player, hand_slot, "minecraft:air", version))
src.reply(RText(tr("hat_success"), RColor.green))
return True
@@ -341,7 +329,6 @@ def do_hat(server: PluginServerInterface, src: CommandSource) -> None:
if _do_swap(server, src, player, version):
mark_cooldown(player, "hat")
server.logger.info(f"[Iridium] !!hat: {player} swapped hand/head gear")
def register(server: PluginServerInterface) -> None:
-1
View File
@@ -40,7 +40,6 @@ def do_head(server: PluginServerInterface, src: CommandSource, context: dict) ->
safe_execute(server, _give_head_command(player, safe_target, version))
mark_cooldown(player, "head")
server.logger.info(f"[Iridium] !!head: {player} -> head of {safe_target}")
src.reply(RText(tr("head_success", safe_target), RColor.green))
+6 -6
View File
@@ -175,10 +175,11 @@ def build_motd(player: str, server: ServerInterface) -> Optional[RTextList]:
lines = list(config.motd_lines or [])
if not lines:
return None
parts: List[RText] = []
for i, line in enumerate(lines):
if i:
parts.append(RText("\n"))
parts: List[RText] = [
RText(tr("motd_header"), RColor.gold, styles=[RStyle.bold])
]
for line in lines:
parts.append(RText("\n"))
parts.extend(render_motd_line(line, player, server))
# Only auto-append the day footer when no line already uses {days}/{day}
days = server_days()
@@ -238,5 +239,4 @@ def on_player_joined(server: PluginServerInterface, player: str, info: Info) ->
def register(server: PluginServerInterface) -> None:
# MCDR event name is PLAYER_JOINED (not PLAYER_JOIN)
server.register_event_listener(MCDRPluginEvents.PLAYER_JOINED, on_player_joined)
server.register_event_listener(MCDRPluginEvents.PLAYER_JOIN, on_player_joined)
+35 -80
View File
@@ -44,15 +44,10 @@ def _query_command(player: str, version: Version) -> str:
return f"entitydata {name} {{}}"
def _sound_command(player: str, version: Version) -> str:
name = sanitize_name(player)
# Play at the player so @a nearby can hear; default command origin is often too far
def _sound_command(version: Version) -> str:
if is_at_least(version, "1.9"):
return (
f"execute at {name} run playsound minecraft:entity.arrow.hit_player "
f"master @a ~ ~ ~ 64 1"
)
return f"execute at {name} run playsound random.successful_hit @a ~ ~ ~ 64 1"
return "playsound minecraft:entity.arrow.hit_player master @a"
return "playsound random.successful_hit @a"
def _is_air(snbt: Optional[str]) -> bool:
@@ -68,82 +63,46 @@ def _json_str(value: str) -> str:
return json.dumps(value, ensure_ascii=False)[1:-1]
def _item_id(item_snbt: str) -> str:
m = re.search(r'id\s*:\s*"([^"]+)"', item_snbt)
return m.group(1) if m else "?"
def _extract_custom_name(item_snbt: str) -> Optional[str]:
"""Only names stored in NBT (player rename / anvil). Registry names are not here."""
m = re.search(r'"text"\s*:\s*"([^"]+)"', item_snbt)
if m and m.group(1).strip():
return _strip_mc_codes(m.group(1).strip())
m = re.search(r'["\']?(?:Name|custom_name)["\']?\s*:\s*"([^"]+)"', item_snbt)
if m and m.group(1).strip():
return _strip_mc_codes(m.group(1).strip())
m = re.search(r"['\"]?(?:Name|custom_name)['\"]?\s*:\s*'([^']+)'", item_snbt)
if m and m.group(1).strip():
return _strip_mc_codes(m.group(1).strip())
return None
def _humanize_id(item_id: str) -> str:
"""kubejs:time_twister_wireless -> Time Twister Wireless"""
path = item_id.split(":", 1)[-1]
parts = [p for p in path.replace("-", "_").split("_") if p]
if not parts:
return item_id
return " ".join(p[:1].upper() + p[1:] for p in parts)
def _translate_key(item_id: str) -> str:
"""Guess client language key from item id (best-effort)."""
if ":" not in item_id:
return f"item.minecraft.{item_id}"
ns, path = item_id.split(":", 1)
if ns == "minecraft":
return f"item.minecraft.{path}"
return f"item.{ns}.{path}"
def _display_json(item_snbt: str) -> str:
"""JSON text component: custom name if any, else client translate + humanized fallback."""
custom = _extract_custom_name(item_snbt)
if custom:
return '{"text":"' + _json_str(custom) + '"}'
item_id = _item_id(item_snbt)
key = _translate_key(item_id)
pretty = _humanize_id(item_id)
return (
'{"translate":"' + _json_str(key) + '","fallback":"' + _json_str(pretty) + '"}'
)
def _strip_mc_codes(text: str) -> str:
return re.sub(r"§[0-9a-fk-orA-FK-OR]", "", text)
def _build_tellraw(player: str, item_snbt: str, version: Version) -> str:
# Truncate pathological NBT (huge books etc.) so the command stays valid
if len(item_snbt) > MAX_SNBT_LEN:
item_snbt = item_snbt[:MAX_SNBT_LEN] + "..."
snbt = _json_str(item_snbt)
player_js = _json_str(sanitize_name(player) or player)
if is_at_least(version, "1.21.5"):
hover = {"action": "show_item", "contents": item_snbt}
hover = '{"action":"show_item","contents":"' + snbt + '"}'
else:
hover = {"action": "show_item", "value": item_snbt}
hover = '{"action":"show_item","value":"' + snbt + '"}'
display = json.loads(_display_json(item_snbt))
display["color"] = "aqua"
display["hoverEvent"] = hover
if is_at_least(version, "1.16"):
click = '{"action":"copy_to_clipboard","value":"' + snbt + '"}'
click_label = _json_str(tr("click_copy"))
else:
# pre-1.16 has no copy_to_clipboard; suggest the version-appropriate query cmd
safe_player = sanitize_name(player)
if is_at_least(version, "1.13"):
suggest = f"/data get entity {safe_player} SelectedItem"
else:
suggest = f"/entitydata {safe_player} {{}}"
click = '{"action":"suggest_command","value":"' + _json_str(suggest) + '"}'
click_label = _json_str(tr("click_suggest"))
payload = [
{"text": "[Iridium] ", "color": "gray"},
{"text": sanitize_name(player) or player, "color": "yellow"},
{"text": f" {tr('share_showing')} "},
display,
]
return "tellraw @a " + json.dumps(payload, ensure_ascii=False, separators=(",", ":"))
id_match = re.search(r'id\s*:\s*"([^"]+)"', item_snbt)
item_id = id_match.group(1) if id_match else "?"
name_match = re.search(r'"text"\s*:\s*"([^"]+)"', item_snbt)
display = name_match.group(1) if name_match else item_id
display_js = _json_str(display)
json_text = (
'[{"text":"[Iridium] ","color":"gray"},'
'{"text":"' + player_js + '","color":"yellow"},'
'{"text":" ' + _json_str(tr("share_showing")) + ' "},'
'{"text":"' + display_js + '","color":"aqua","hoverEvent":' + hover + "},"
'{"text":" [' + click_label + ']","color":"aqua","bold":true,'
'"underlined":true,"hoverEvent":' + hover + ',"clickEvent":' + click + "}]"
)
return f"tellraw @a {json_text}"
def _send_share(
@@ -158,11 +117,7 @@ def _send_share(
return False
safe_execute(server, _build_tellraw(player, item_snbt, version))
if config.share_sound:
safe_execute(server, _sound_command(player, version))
server.logger.info(
f"[Iridium] !!share: {player} shared item id={_item_id(item_snbt)} "
f"({len(item_snbt)} chars)"
)
safe_execute(server, _sound_command(version))
src.reply(RText(tr("share_done"), RColor.green))
return True
+8 -23
View File
@@ -26,28 +26,17 @@ def tr(key: str, *args) -> str:
return si.tr(f"iridium.{key}", *args)
def _as_version(value) -> Optional[Version]:
if value is None:
return None
if isinstance(value, Version):
return value
try:
return Version(str(value))
except Exception:
return None
def get_mc_version(server: PluginServerInterface) -> Optional[Version]:
"""Return the detected Minecraft server version, or None."""
if config.force_version:
forced = _as_version(config.force_version)
if forced is not None:
return forced
server.logger.warning(tr("bad_force_version", config.force_version))
try:
return Version(config.force_version)
except Exception:
server.logger.warning(tr("bad_force_version", config.force_version))
info = server.get_server_information()
if info is None:
if info is None or info.version is None:
return None
return _as_version(info.version)
return info.version
def require_version(server: PluginServerInterface, src: CommandSource) -> Optional[Version]:
@@ -57,9 +46,5 @@ def require_version(server: PluginServerInterface, src: CommandSource) -> Option
return version
def is_at_least(version, target: str) -> bool:
left = _as_version(version)
right = _as_version(target)
if left is None or right is None:
return False
return left >= right
def is_at_least(version: Version, target: str) -> bool:
return version >= Version(target)
+32 -32
View File
@@ -1,32 +1,32 @@
iridium.loaded: 'Iridium loaded'
iridium.unloaded: 'Iridium unloaded'
iridium.version_mode: 'Version detection mode: {0}'
iridium.bad_force_version: 'Invalid force_version in config: {0}'
iridium.version_unknown: 'Unable to detect Minecraft version. Wait for VersionDetector, or set force_version in config'
iridium.player_only: 'This command can only be used by a player in-game'
iridium.required_permission: 'Insufficient permission, requires level {0}'
iridium.on_cooldown: 'Cooldown, wait {0}s'
iridium.hand_is_empty: 'No usable item in hand'
iridium.share_help: 'Show the item in your main hand (hover to view)'
iridium.share_done: 'Item shared to chat'
iridium.share_unsupported_version: 'Version {0} cannot read held item (needs Minecraft 1.8+)'
iridium.share_timeout: 'Timed out reading held item, try again later'
iridium.click_copy: 'click to copy data'
iridium.click_suggest: 'click for data command'
iridium.share_showing: 'is showing'
iridium.hat_help: 'Swap the item in your hand with your head slot'
iridium.hat_success: 'Swapped hand item with head equipment'
iridium.hat_unsupported_version: 'Version {0} does not support !!hat (needs Minecraft 1.8+)'
iridium.hat_need_rcon: '!!hat requires RCON enabled to read and swap item data'
iridium.hat_query_failed: 'Failed to query player item data'
iridium.hat_offhand_busy: 'Off-hand is occupied; clear it before using !!hat'
iridium.head_help: 'Get one player head (optional player name, cooldown {0}s)'
iridium.head_help_short: 'Get one player head (optional player name)'
iridium.head_success: 'You received a head of {0}'
iridium.calc_help: 'Evaluate an expression, e.g. !!c 1+2*(3-1)'
iridium.calc_usage: 'Usage: !!c <expression>, e.g. !!c 1+2*(3-1)'
iridium.calc_error: 'Cannot calculate {0}: {1}'
iridium.calc_div_zero: 'Division by zero'
iridium.join_tip_header: 'Available commands: (click to fill chat)'
iridium.join_tip_click: 'click to fill chat'
iridium.motd_days: 'Day {0} since server start'
iridium.loaded: Iridium loaded
iridium.unloaded: Iridium unloaded
iridium.version_mode: Version detection mode: {0}
iridium.bad_force_version: Invalid force_version in config: {0}
iridium.version_unknown: Unable to detect Minecraft version. Wait for VersionDetector, or set force_version in config
iridium.player_only: This command can only be used by a player in-game
iridium.required_permission: Insufficient permission, requires level {0}
iridium.on_cooldown: Cooldown, wait {0}s
iridium.hand_is_empty: No usable item in hand
iridium.share_help: Show the item in your main hand (hover to view)
iridium.share_done: Item shared to chat
iridium.share_unsupported_version: Version {0} cannot read held item (needs Minecraft 1.8+)
iridium.share_timeout: Timed out reading held item, try again later
iridium.click_copy: click to copy data
iridium.click_suggest: click for data command
iridium.share_showing: is showing
iridium.hat_help: Swap the item in your hand with your head slot
iridium.hat_success: Swapped hand item with head equipment
iridium.hat_unsupported_version: Version {0} does not support !!hat (needs Minecraft 1.8+)
iridium.hat_need_rcon: !!hat requires RCON enabled to read and swap item data
iridium.hat_query_failed: Failed to query player item data
iridium.head_help: Get one player head (optional player name, cooldown {0}s)
iridium.head_help_short: Get one player head (optional player name)
iridium.head_success: You received a head of {0}
iridium.calc_help: Evaluate an expression, e.g. !!c 1+2*(3-1)
iridium.calc_usage: Usage: !!c <expression>, e.g. !!c 1+2*(3-1)
iridium.calc_error: Cannot calculate {0}: {1}
iridium.calc_div_zero: Division by zero
iridium.join_tip_header: Iridium is enabled. Available commands: (click to fill chat)
iridium.join_tip_click: click to fill chat
iridium.motd_header: Server Info
iridium.motd_days: Day {0} since server start
+32 -32
View File
@@ -1,32 +1,32 @@
iridium.loaded: 'Iridium 已加载'
iridium.unloaded: 'Iridium 已卸载'
iridium.version_mode: '版本检测模式: {0}'
iridium.bad_force_version: '配置 force_version 无效: {0}'
iridium.version_unknown: '无法检测 Minecraft 版本,请等待服务器完成 VersionDetector,或在配置中设置 force_version'
iridium.player_only: '该命令只能由玩家在游戏内使用'
iridium.required_permission: '权限不足,需要权限等级 {0}'
iridium.on_cooldown: '冷却中,请再等待 {0} 秒'
iridium.hand_is_empty: '手上没有可处理的物品'
iridium.share_help: '展示手上物品的完整信息(悬停查看)'
iridium.share_done: '已在聊天栏展示物品'
iridium.share_unsupported_version: '当前版本 {0} 无法读取手持物品(需要 Minecraft 1.8+)'
iridium.share_timeout: '读取手持物品超时,请稍后再试'
iridium.click_copy: '点击复制完整数据'
iridium.click_suggest: '点击获取完整数据命令'
iridium.share_showing: '正在展示'
iridium.hat_help: '将手上物品与头部装备互换'
iridium.hat_success: '已交换手上物品与头部装备'
iridium.hat_unsupported_version: '当前版本 {0} 不支持 !!hat(需要 Minecraft 1.8+)'
iridium.hat_need_rcon: '!!hat 需要启用 RCON 才能读取并交换物品数据'
iridium.hat_query_failed: '读取玩家物品数据失败'
iridium.hat_offhand_busy: '副手有物品,无法安全交换;请先清空副手再使用 !!hat'
iridium.head_help: '获取一个玩家头颅(可指定玩家名,冷却 {0} 秒)'
iridium.head_help_short: '获取一个玩家头颅(可指定玩家名)'
iridium.head_success: '已给予你 {0} 的头颅'
iridium.calc_help: '计算表达式,例如 !!c 1+2*(3-1)'
iridium.calc_usage: '用法: !!c <表达式>,例如 !!c 1+2*(3-1)'
iridium.calc_error: '无法计算 {0}: {1}'
iridium.calc_div_zero: '除数不能为 0'
iridium.join_tip_header: '可用命令:(点击命令可填入聊天框)'
iridium.join_tip_click: '点击填入聊天栏'
iridium.motd_days: '开服第 {0} 天'
iridium.loaded: Iridium 已加载
iridium.unloaded: Iridium 已卸载
iridium.version_mode: 版本检测模式: {0}
iridium.bad_force_version: 配置 force_version 无效: {0}
iridium.version_unknown: 无法检测 Minecraft 版本,请等待服务器完成 VersionDetector,或在配置中设置 force_version
iridium.player_only: 该命令只能由玩家在游戏内使用
iridium.required_permission: 权限不足,需要权限等级 {0}
iridium.on_cooldown: 冷却中,请再等待 {0} 秒
iridium.hand_is_empty: 手上没有可处理的物品
iridium.share_help: 展示手上物品的完整信息(悬停查看)
iridium.share_done: 已在聊天栏展示物品
iridium.share_unsupported_version: 当前版本 {0} 无法读取手持物品(需要 Minecraft 1.8+)
iridium.share_timeout: 读取手持物品超时,请稍后再试
iridium.click_copy: 点击复制完整数据
iridium.click_suggest: 点击获取完整数据命令
iridium.share_showing: 正在展示
iridium.hat_help: 将手上物品与头部装备互换
iridium.hat_success: 已交换手上物品与头部装备
iridium.hat_unsupported_version: 当前版本 {0} 不支持 !!hat(需要 Minecraft 1.8+)
iridium.hat_need_rcon: !!hat 需要启用 RCON 才能读取并交换物品数据
iridium.hat_query_failed: 读取玩家物品数据失败
iridium.head_help: 获取一个玩家头颅(可指定玩家名,冷却 {0} 秒)
iridium.head_help_short: 获取一个玩家头颅(可指定玩家名)
iridium.head_success: 已给予你 {0} 的头颅
iridium.calc_help: 计算表达式,例如 !!c 1+2*(3-1)
iridium.calc_usage: 用法: !!c <表达式>,例如 !!c 1+2*(3-1)
iridium.calc_error: 无法计算 {0}: {1}
iridium.calc_div_zero: 除数不能为 0
iridium.join_tip_header: 本服已启用 Iridium,可用命令:(点击命令可填入聊天框)
iridium.join_tip_click: 点击填入聊天栏
iridium.motd_header: 服务器信息
iridium.motd_days: 开服第 {0} 天
+1 -1
View File
@@ -1,6 +1,6 @@
{
"id": "iridium",
"version": "26.9.14",
"version": "26.9.1",
"name": "Iridium",
"description": {
"zh_cn": "物品展示 / 戴头 / 获取头颅 / 游戏内计算器 / 进服 MOTD",
-43
View File
@@ -227,18 +227,6 @@ def test_sanitize_name_and_cmd():
assert sanitize_cmd("a\r\nb") == "a b"
def test_is_at_least_accepts_str():
from mcdreforged.api.all import Version
from iridium.version_util import is_at_least
assert is_at_least(Version("1.20.1"), "1.8") is True
assert is_at_least("1.20.1", "1.8") is True
assert is_at_least("1.7.10", "1.13") is False
assert is_at_least("1.12.2", "1.13") is False
assert is_at_least("not-a-version", "1.8") is False
def test_share_query_sanitizes_player():
from mcdreforged.api.all import Version
@@ -251,37 +239,6 @@ def test_share_query_sanitizes_player():
assert "Badname" in tr
def test_extract_display_name():
from iridium.share import _display_json, _humanize_id, _item_id, _translate_key
assert _item_id('{id:"minecraft:stone",Count:1b}') == "minecraft:stone"
assert _translate_key("minecraft:diamond") == "item.minecraft.diamond"
assert _translate_key("kubejs:time_twister_wireless") == "item.kubejs.time_twister_wireless"
assert _humanize_id("kubejs:time_twister_wireless") == "Time Twister Wireless"
assert _humanize_id("minecraft:fluix_covered_cable") == "Fluix Covered Cable"
assert '"text"' in _display_json('{id:"minecraft:diamond",tag:{display:{Name:"Shiny"}}}')
disp = _display_json('{id:"kubejs:time_twister_wireless",Count:1b}')
assert '"translate"' in disp
assert "Time Twister Wireless" in disp
assert "fallback" in disp
assert "kubejs:time_twister_wireless" not in disp
def test_strip_json_comments():
import json
from datetime import date
from iridium.config import build_default_config_text, _strip_json_comments
text = build_default_config_text()
parsed = json.loads(_strip_json_comments(text))
assert parsed["permission"] == 1
assert "skymirror.top" in parsed["motd_lines"][2]
assert parsed["motd_start_day"] == date.today().strftime("%Y-%m-%d")
# comment-looking text inside string is kept
assert json.loads(_strip_json_comments('{"a": "http://x"}'))["a"] == "http://x"
if __name__ == "__main__":
fns = [v for k, v in sorted(globals().items()) if k.startswith("test_") and callable(v)]
failed = 0