8 Commits
11 changed files with 217 additions and 78 deletions

No files matched your search

+33
View File
@@ -2,6 +2,39 @@
本文件记录 Iridium 的重要变更。 本文件记录 Iridium 的重要变更。
## [26.9.8] - 2026-09-13
### Changed
- `!!share`:去掉「点击复制完整数据」,仅保留物品名 + 悬停预览(与 ShowIt 风格一致)
## [26.9.7] - 2026-09-13
### Fixed
- `!!share`:无 NBT 改名时,正文 fallback 改为 ID 美化名(如 `Time Twister Wireless`),不再直接显示 `kubejs:...`;语言键命中则显示正式本地化名
## [26.9.6] - 2026-09-13
### Fixed
- `!!share`:默认物品名改为客户端 `translate` 组件(如 `block.ae2.fluix_covered_cable`),本地化显示正式名;仅有 NBT 自定义名时仍显示改名
- `!!share`:提示音在玩家位置播放,避免 "sound is too far away"
## [26.9.5] - 2026-09-13
### Fixed
- `!!hat`(1.17+):改用副手缓冲做真正交换,避免复杂 NBT 重建失败导致原头盔消失;副手非空时拒绝并提示
- `!!share`:展示名优先取 `custom_name` / `display.Name` / translate,不再只显示物品 ID
## [26.9.4] - 2026-09-13
### Added
- 操作日志:`!!share` / `!!hat` / `!!head` / `!!c` 成功时写入 MCDR 控制台(`[Iridium] ...`)
## [26.9.3] - 2026-09-13
### Fixed
- `!!share` / `!!hat` / `!!head`:`info.version` 若为字符串时比较崩溃(`Cannot compare Version and str`)
- `!!c`:命令回调少绑定 `server` 导致 `do_calc() missing ... context`
## [26.9.2] - 2026-09-13 ## [26.9.2] - 2026-09-13
### Fixed ### Fixed
+2 -2
View File
@@ -4,7 +4,7 @@ MCDReforged 插件:物品展示 / 戴头 / 获取头颅 / 游戏内计算器 /
| | | | | |
|---|---| |---|---|
| 版本 | **26.9.2** | | 版本 | **26.9.8** |
| 作者 | 云镜之端/SKYMirror | | 作者 | 云镜之端/SKYMirror |
| 许可 | 保留所有权益(All Rights Reserved) | | 许可 | 保留所有权益(All Rights Reserved) |
| 前置 | MCDReforged `>= 2.6.0` | | 前置 | MCDReforged `>= 2.6.0` |
@@ -15,7 +15,7 @@ MCDReforged 插件:物品展示 / 戴头 / 获取头颅 / 游戏内计算器 /
| 功能 | 说明 | | 功能 | 说明 |
|------|------| |------|------|
| `!!share` | 展示主手物品:悬停看完整 NBT/组件,1.16+ 可点击复制,可选提示音 | | `!!share` | 展示主手物品:聊天栏显示物品名,悬停查看完整数据 |
| `!!hat` | 主手与头部装备互换 | | `!!hat` | 主手与头部装备互换 |
| `!!head [player]` | 给自己或指定玩家 **1 个** 头颅;有冷却 | | `!!head [player]` | 给自己或指定玩家 **1 个** 头颅;有冷却 |
| `!!c <表达式>` | 四则运算 + 括号:`+ - * / // % ** ^` | | `!!c <表达式>` | 四则运算 + 括号:`+ - * / // % ** ^` |
+3 -1
View File
@@ -92,6 +92,8 @@ def do_calc(server: PluginServerInterface, src: CommandSource, context: dict) ->
return return
out = _format_result(result) 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 # Private reply to avoid flooding public chat
src.reply( src.reply(
RTextList( RTextList(
@@ -106,7 +108,7 @@ def do_calc(server: PluginServerInterface, src: CommandSource, context: dict) ->
def register(server: PluginServerInterface) -> None: def register(server: PluginServerInterface) -> None:
builder = SimpleCommandBuilder() builder = SimpleCommandBuilder()
builder.command("!!c", lambda src: src.reply(RText(tr("calc_usage"), RColor.yellow))) builder.command("!!c", lambda src: src.reply(RText(tr("calc_usage"), RColor.yellow)))
builder.command("!!c <expression>", do_calc) builder.command("!!c <expression>", lambda src, ctx: do_calc(server, src, ctx))
builder.arg("expression", GreedyText) builder.arg("expression", GreedyText)
builder.register(server) builder.register(server)
server.register_help_message("!!c <expression>", tr("calc_help")) server.register_help_message("!!c <expression>", tr("calc_help"))
+44 -31
View File
@@ -258,52 +258,64 @@ def _extract_item_payload(payload: str, version: Version) -> Optional[str]:
def _do_swap(server: PluginServerInterface, src: CommandSource, player: str, version: Version) -> bool: def _do_swap(server: PluginServerInterface, src: CommandSource, player: str, version: Version) -> bool:
if not is_at_least(version, "1.13"): name = sanitize_name(player)
# Single entitydata dump contains both SelectedItem and head Inventory slot head_slot = _head_slot(version)
dump = rcon_query(server, _entitydata_query(player)) hand_slot = _hand_slot(version, 0)
if dump is None:
src.reply(RText(tr("hat_query_failed"), RColor.red)) # 1.17+: true swap via offhand buffer — no need to rebuild item NBT
return False if is_at_least(version, "1.17"):
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)) hand_raw = rcon_query(server, _selected_query(player, version))
if hand_raw is None: if hand_raw is None:
src.reply(RText(tr("hat_query_failed"), RColor.red)) src.reply(RText(tr("hat_query_failed"), RColor.red))
return False return False
hotbar_index = 0
hand = _extract_item_payload(hand_raw, version) hand = _extract_item_payload(hand_raw, version)
if hand is None or _is_air(hand): if hand is None or _is_air(hand):
src.reply(RText(tr("hand_is_empty"), RColor.red)) src.reply(RText(tr("hand_is_empty"), RColor.red))
return False 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)
head_slot = _head_slot(version) off_raw = rcon_query(server, f"data get entity {name} weapon.offhand")
hand_slot = _hand_slot(version, hotbar_index) off = None
name = sanitize_name(player) 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
if is_at_least(version, "1.17"): # 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}",
)
safe_execute( safe_execute(
server, server,
f"item replace entity {name} {head_slot} from entity {name} weapon.mainhand", f"item replace entity {name} {head_slot} from entity {name} weapon.mainhand",
) )
if head and not _is_air(head): safe_execute(
safe_execute(server, _replace_with(player, hand_slot, head, version)) server,
else: f"item replace entity {name} weapon.mainhand from entity {name} weapon.offhand",
safe_execute(server, f"item replace entity {name} {hand_slot} with air") )
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))
else: else:
safe_execute(server, _replace_with(player, head_slot, hand, version)) safe_execute(server, _replace_with(player, hand_slot, "minecraft:air", 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)) src.reply(RText(tr("hat_success"), RColor.green))
return True return True
@@ -329,6 +341,7 @@ def do_hat(server: PluginServerInterface, src: CommandSource) -> None:
if _do_swap(server, src, player, version): if _do_swap(server, src, player, version):
mark_cooldown(player, "hat") mark_cooldown(player, "hat")
server.logger.info(f"[Iridium] !!hat: {player} swapped hand/head gear")
def register(server: PluginServerInterface) -> None: def register(server: PluginServerInterface) -> None:
+1
View File
@@ -40,6 +40,7 @@ def do_head(server: PluginServerInterface, src: CommandSource, context: dict) ->
safe_execute(server, _give_head_command(player, safe_target, version)) safe_execute(server, _give_head_command(player, safe_target, version))
mark_cooldown(player, "head") 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)) src.reply(RText(tr("head_success", safe_target), RColor.green))
+80 -35
View File
@@ -44,10 +44,15 @@ def _query_command(player: str, version: Version) -> str:
return f"entitydata {name} {{}}" return f"entitydata {name} {{}}"
def _sound_command(version: Version) -> str: 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
if is_at_least(version, "1.9"): if is_at_least(version, "1.9"):
return "playsound minecraft:entity.arrow.hit_player master @a" return (
return "playsound random.successful_hit @a" 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"
def _is_air(snbt: Optional[str]) -> bool: def _is_air(snbt: Optional[str]) -> bool:
@@ -63,46 +68,82 @@ def _json_str(value: str) -> str:
return json.dumps(value, ensure_ascii=False)[1:-1] 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: def _build_tellraw(player: str, item_snbt: str, version: Version) -> str:
# Truncate pathological NBT (huge books etc.) so the command stays valid # Truncate pathological NBT (huge books etc.) so the command stays valid
if len(item_snbt) > MAX_SNBT_LEN: if len(item_snbt) > MAX_SNBT_LEN:
item_snbt = 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"): if is_at_least(version, "1.21.5"):
hover = '{"action":"show_item","contents":"' + snbt + '"}' hover = {"action": "show_item", "contents": item_snbt}
else: else:
hover = '{"action":"show_item","value":"' + snbt + '"}' hover = {"action": "show_item", "value": item_snbt}
if is_at_least(version, "1.16"): display = json.loads(_display_json(item_snbt))
click = '{"action":"copy_to_clipboard","value":"' + snbt + '"}' display["color"] = "aqua"
click_label = _json_str(tr("click_copy")) display["hoverEvent"] = hover
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"))
id_match = re.search(r'id\s*:\s*"([^"]+)"', item_snbt) payload = [
item_id = id_match.group(1) if id_match else "?" {"text": "[Iridium] ", "color": "gray"},
name_match = re.search(r'"text"\s*:\s*"([^"]+)"', item_snbt) {"text": sanitize_name(player) or player, "color": "yellow"},
display = name_match.group(1) if name_match else item_id {"text": f" {tr('share_showing')} "},
display_js = _json_str(display) display,
]
json_text = ( return "tellraw @a " + json.dumps(payload, ensure_ascii=False, separators=(",", ":"))
'[{"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( def _send_share(
@@ -117,7 +158,11 @@ def _send_share(
return False return False
safe_execute(server, _build_tellraw(player, item_snbt, version)) safe_execute(server, _build_tellraw(player, item_snbt, version))
if config.share_sound: if config.share_sound:
safe_execute(server, _sound_command(version)) 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)"
)
src.reply(RText(tr("share_done"), RColor.green)) src.reply(RText(tr("share_done"), RColor.green))
return True return True
+23 -8
View File
@@ -26,17 +26,28 @@ def tr(key: str, *args) -> str:
return si.tr(f"iridium.{key}", *args) 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]: def get_mc_version(server: PluginServerInterface) -> Optional[Version]:
"""Return the detected Minecraft server version, or None.""" """Return the detected Minecraft server version, or None."""
if config.force_version: if config.force_version:
try: forced = _as_version(config.force_version)
return Version(config.force_version) if forced is not None:
except Exception: return forced
server.logger.warning(tr("bad_force_version", config.force_version)) server.logger.warning(tr("bad_force_version", config.force_version))
info = server.get_server_information() info = server.get_server_information()
if info is None or info.version is None: if info is None:
return None return None
return info.version return _as_version(info.version)
def require_version(server: PluginServerInterface, src: CommandSource) -> Optional[Version]: def require_version(server: PluginServerInterface, src: CommandSource) -> Optional[Version]:
@@ -46,5 +57,9 @@ def require_version(server: PluginServerInterface, src: CommandSource) -> Option
return version return version
def is_at_least(version: Version, target: str) -> bool: def is_at_least(version, target: str) -> bool:
return version >= Version(target) left = _as_version(version)
right = _as_version(target)
if left is None or right is None:
return False
return left >= right
+1
View File
@@ -19,6 +19,7 @@ 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_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_need_rcon: '!!hat requires RCON enabled to read and swap item data'
iridium.hat_query_failed: 'Failed to query player 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: 'Get one player head (optional player name, cooldown {0}s)'
iridium.head_help_short: 'Get one player head (optional player name)' iridium.head_help_short: 'Get one player head (optional player name)'
iridium.head_success: 'You received a head of {0}' iridium.head_success: 'You received a head of {0}'
+1
View File
@@ -19,6 +19,7 @@ iridium.hat_success: '已交换手上物品与头部装备'
iridium.hat_unsupported_version: '当前版本 {0} 不支持 !!hat(需要 Minecraft 1.8+)' iridium.hat_unsupported_version: '当前版本 {0} 不支持 !!hat(需要 Minecraft 1.8+)'
iridium.hat_need_rcon: '!!hat 需要启用 RCON 才能读取并交换物品数据' iridium.hat_need_rcon: '!!hat 需要启用 RCON 才能读取并交换物品数据'
iridium.hat_query_failed: '读取玩家物品数据失败' iridium.hat_query_failed: '读取玩家物品数据失败'
iridium.hat_offhand_busy: '副手有物品,无法安全交换;请先清空副手再使用 !!hat'
iridium.head_help: '获取一个玩家头颅(可指定玩家名,冷却 {0} 秒)' iridium.head_help: '获取一个玩家头颅(可指定玩家名,冷却 {0} 秒)'
iridium.head_help_short: '获取一个玩家头颅(可指定玩家名)' iridium.head_help_short: '获取一个玩家头颅(可指定玩家名)'
iridium.head_success: '已给予你 {0} 的头颅' iridium.head_success: '已给予你 {0} 的头颅'
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"id": "iridium", "id": "iridium",
"version": "26.9.2", "version": "26.9.8",
"name": "Iridium", "name": "Iridium",
"description": { "description": {
"zh_cn": "物品展示 / 戴头 / 获取头颅 / 游戏内计算器 / 进服 MOTD", "zh_cn": "物品展示 / 戴头 / 获取头颅 / 游戏内计算器 / 进服 MOTD",
+28
View File
@@ -227,6 +227,18 @@ def test_sanitize_name_and_cmd():
assert sanitize_cmd("a\r\nb") == "a b" 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(): def test_share_query_sanitizes_player():
from mcdreforged.api.all import Version from mcdreforged.api.all import Version
@@ -239,6 +251,22 @@ def test_share_query_sanitizes_player():
assert "Badname" in tr 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
if __name__ == "__main__": if __name__ == "__main__":
fns = [v for k, v in sorted(globals().items()) if k.startswith("test_") and callable(v)] fns = [v for k, v in sorted(globals().items()) if k.startswith("test_") and callable(v)]
failed = 0 failed = 0