diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java index 96333ae..36558b4 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java @@ -11,6 +11,7 @@ import cn.hamster3.mc.plugin.core.bukkit.listener.CallbackListener; import cn.hamster3.mc.plugin.core.bukkit.listener.DebugListener; import cn.hamster3.mc.plugin.core.bukkit.page.handler.PageHandler; import cn.hamster3.mc.plugin.core.bukkit.page.listener.PageListener; +import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import org.bukkit.Bukkit; @@ -35,6 +36,8 @@ public class HamsterCorePlugin extends JavaPlugin { long start = System.currentTimeMillis(); Logger logger = getLogger(); logger.info("仓鼠核心正在初始化"); + logger.info("Minecraft 版本: " + CoreBukkitUtils.getMCVersion()); + logger.info("nms 版本: " + CoreBukkitUtils.getNMSVersion()); instance = this; saveDefaultConfig(); reloadConfig(); diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreInfoCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreInfoCommand.java index cef7a37..bd0999f 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreInfoCommand.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreInfoCommand.java @@ -1,8 +1,11 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore.sub; +import cn.hamster3.mc.plugin.core.bukkit.HamsterCorePlugin; import cn.hamster3.mc.plugin.core.bukkit.command.ChildCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -51,24 +54,31 @@ public class LoreInfoCommand extends ChildCommand { CoreMessage.COMMAND_LORE_HAND_EMPTY.show(player); return true; } - sender.sendMessage("§a物品名称:" + CoreBukkitUtils.getItemNameComponent(stack)); + + HamsterCorePlugin.getInstance().getAudienceProvider().sender(sender).sendMessage( + Component.text("物品名称: ") + .color(NamedTextColor.GREEN) + .append(CoreBukkitUtils.getItemNameComponent(stack)) + ); ItemMeta meta = stack.getItemMeta(); if (meta == null) { sender.sendMessage("§a物品自定义模型 ID: 无"); sender.sendMessage("§a物品 lore: 无"); return true; } - if (meta.hasCustomModelData()) { - sender.sendMessage("§a物品自定义模型 ID: " + meta.getCustomModelData()); - } else { - sender.sendMessage("§a物品自定义模型 ID: 无"); + if (Integer.parseInt(CoreBukkitUtils.getMCVersion().split("\\.")[1]) >= 13) { + if (meta.hasCustomModelData()) { + sender.sendMessage("§a物品自定义模型 ID: " + meta.getCustomModelData()); + } else { + sender.sendMessage("§a物品自定义模型 ID: 无"); + } } List lore = meta.getLore(); if (lore != null) { sender.sendMessage("§a物品 lore: "); for (int i = 0; i < lore.size(); i++) { String s = lore.get(i); - sender.sendMessage("§a" + (i + 1) + ". §f" + s); + sender.sendMessage(" §a" + (i + 1) + ". §f" + s); } } else { sender.sendMessage("§a物品 lore: 无"); diff --git a/core-bukkit/src/main/resources/plugin.yml b/core-bukkit/src/main/resources/plugin.yml index 9fd5f73..b3ac4f0 100644 --- a/core-bukkit/src/main/resources/plugin.yml +++ b/core-bukkit/src/main/resources/plugin.yml @@ -18,7 +18,7 @@ loadbefore: commands: hamster-core: - aliases: [ hcore, core ] + aliases: [ hcore ] description: 仓鼠核心调试指令 permission: hamster.core.admin permission-message: §c你没有这个权限