From 050fec6f0030163d9bed129700f3342efa118db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=87=E8=A1=A1?= Date: Mon, 21 Nov 2022 21:50:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 优化了挂机玩家的检测方式 - 增加了挂机配置 - 新增 status 用于查看当前状态 --- README.md | 8 ++ pom.xml | 2 +- src/main/java/deercloud/livebot/Commands.java | 47 ++++++++++- .../java/deercloud/livebot/ConfigManager.java | 12 +++ src/main/java/deercloud/livebot/LiveBot.java | 1 + src/main/java/deercloud/livebot/WorkFunc.java | 84 ++++++++++++------- src/main/resources/config.yml | 4 +- 7 files changed, 126 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index de944e1..4bfc0c8 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,10 @@ `/livebot stop` 停止自动跟随。 +`/livebot setAFKTime ` 设置挂机判断时间。 + +`/livebot status` 查看当前状态。 + ### 玩家指令 `/livebot away` 让自己不被跟随。 @@ -70,4 +74,8 @@ Setting: CanBeMoved: true # 是否在聊天栏公告自己的状态 (未实装) IsNagging: true + # 是否跳过挂机玩家 + SkipAFK: true + # 挂机判断时间（单位：秒） + AFKTime: 60 ``` diff --git a/pom.xml b/pom.xml index 4554d59..eba46a3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ deercloud LiveBot - 1.2 + 1.3 jar LiveBot diff --git a/src/main/java/deercloud/livebot/Commands.java b/src/main/java/deercloud/livebot/Commands.java index 87e0a3d..7a74b56 100644 --- a/src/main/java/deercloud/livebot/Commands.java +++ b/src/main/java/deercloud/livebot/Commands.java @@ -139,10 +139,53 @@ public class Commands implements TabExecutor { } else { updateSkipAFK(sender, args); } + } else if (Objects.equals(args[0], "setAfkTime")) { + if (sender instanceof Player) { + Player player = (Player) sender; + if (player.isOp()) { + if (Integer.parseInt(args[1]) <= 10) { + player.sendMessage(ChatColor.RED + "时间间隔不能小于10秒。"); + } else { + m_config_manager.setAfkTime(Integer.parseInt(args[1])); + player.sendMessage("挂机判断时间" + args[1]); + m_work_func.restart(); + } + } else { + player.sendMessage(ChatColor.RED + "你没有权限执行此命令。"); + } + } else { + m_config_manager.setAfkTime(Integer.parseInt(args[1])); + sender.sendMessage("挂机判断时间" + args[1]); + m_work_func.restart(); + } + } else if (Objects.equals(args[0], "status")) { + if (sender instanceof Player) { + Player player = (Player) sender; + if (player.isOp()) { + printStatus(sender); + } else { + player.sendMessage(ChatColor.RED + "你没有权限执行此命令。"); + } + } else { + printStatus(sender); + } } return true; } + public void printStatus(CommandSender sender) { + sender.sendMessage(ChatColor.GREEN + "===================="); + sender.sendMessage(ChatColor.GREEN + "| LiveBot 状态报告"); + sender.sendMessage(ChatColor.GREEN + "| 当前被直播玩家：" + ChatColor.YELLOW + m_work_func.getCurrentPlayerName()); + sender.sendMessage(ChatColor.GREEN + "| 机器人名：" + ChatColor.YELLOW + m_config_manager.getBotName()); + sender.sendMessage(ChatColor.GREEN + "| 聚焦时间：" + ChatColor.YELLOW + m_config_manager.getFocusTime()); + sender.sendMessage(ChatColor.GREEN + "| 切换方式：" + ChatColor.YELLOW + m_config_manager.getChangePattern()); + sender.sendMessage(ChatColor.GREEN + "| 玩家是否可以拒绝：" + ChatColor.YELLOW + m_config_manager.getCanBeMoved()); + sender.sendMessage(ChatColor.GREEN + "| 是否跳过挂机玩家：" + ChatColor.YELLOW + m_config_manager.getSkipAFK()); + sender.sendMessage(ChatColor.GREEN + "| 挂机判断时间：" + ChatColor.YELLOW + m_config_manager.getAFKTime()); + sender.sendMessage(ChatColor.GREEN + "===================="); + } + private void updateSkipAFK(CommandSender sender, String[] args) { if (Objects.equals(args[1], "true")) { m_config_manager.setSkipAFK(true); @@ -170,7 +213,7 @@ public class Commands implements TabExecutor { @Override public List onTabComplete(org.bukkit.command.CommandSender sender, org.bukkit.command.Command cmd, String label, String[] args) { if (args.length == 1) { - return Arrays.asList("reload", "setBot", "away", "setTime", "setPattern", "setCanBeMoved", "stop", "start", "skipAFK"); + return Arrays.asList("reload", "setBot", "away", "setTime", "setPattern", "setCanBeMoved", "stop", "start", "skipAFK", "setAfkTime", "status"); } else if (args.length == 2) { if (Objects.equals(args[0], "setBot")) { ArrayList playerList = new ArrayList<>(Bukkit.getOnlinePlayers()); @@ -180,7 +223,7 @@ public class Commands implements TabExecutor { playerNames.add(player.getName()); } return playerNames; - } else if (Objects.equals(args[0], "setTime")) { + } else if (Objects.equals(args[0], "setTime") || Objects.equals(args[0], "setAfkTime")) { return Collections.singletonList("请输入时间(单位秒)"); } else if (Objects.equals(args[0], "setPattern")) { return Arrays.asList("ORDER", "RANDOM"); diff --git a/src/main/java/deercloud/livebot/ConfigManager.java b/src/main/java/deercloud/livebot/ConfigManager.java index a090f42..b6fb9e7 100644 --- a/src/main/java/deercloud/livebot/ConfigManager.java +++ b/src/main/java/deercloud/livebot/ConfigManager.java @@ -33,6 +33,7 @@ public class ConfigManager { m_can_be_moved = m_config_file.getBoolean("Setting.CanBeMoved", true); m_is_nagging = m_config_file.getBoolean("Setting.IsNagging", true); m_skip_afk = m_config_file.getBoolean("Setting.SkipAFK", true); + m_afk_time = m_config_file.getInt("Setting.AFKTime", 60); m_logger.info("配置文件当前内容"); m_logger.info(" - 直播机器人名称 ：" + m_bot_name); m_logger.info(" - 切换频率 ：" + m_focus_time + "秒"); @@ -50,6 +51,7 @@ public class ConfigManager { private boolean m_can_be_moved; private boolean m_is_nagging; private boolean m_skip_afk; + private int m_afk_time; @@ -113,6 +115,16 @@ public class ConfigManager { m_plugin.saveConfig(); } + public int getAFKTime() { + return m_afk_time; + } + + public void setAfkTime (int time) { + m_afk_time = time; + m_config_file.set("Setting.AFKTime", time); + m_plugin.saveConfig(); + } + } diff --git a/src/main/java/deercloud/livebot/LiveBot.java b/src/main/java/deercloud/livebot/LiveBot.java index afb82eb..bb72d20 100644 --- a/src/main/java/deercloud/livebot/LiveBot.java +++ b/src/main/java/deercloud/livebot/LiveBot.java @@ -22,6 +22,7 @@ public final class LiveBot extends JavaPlugin { Objects.requireNonNull(Bukkit.getPluginCommand("livebot")).setExecutor(new Commands()); Objects.requireNonNull(Bukkit.getPluginCommand("livebot")).setTabCompleter(new Commands()); + m_work_func.reFindBot(); getLogger().info("LiveBot启动完成。"); } diff --git a/src/main/java/deercloud/livebot/WorkFunc.java b/src/main/java/deercloud/livebot/WorkFunc.java index 2e00ff9..98a6b65 100644 --- a/src/main/java/deercloud/livebot/WorkFunc.java +++ b/src/main/java/deercloud/livebot/WorkFunc.java @@ -20,7 +20,7 @@ public class WorkFunc { m_logger = m_plugin.getLogger(); } - private class task extends BukkitRunnable { + private class mainTask extends BukkitRunnable { @Override public void run() { if (!is_running) { @@ -34,25 +34,43 @@ public class WorkFunc { m_logger.info("准备切换玩家视角。"); Player player = getNext(); - if (player == null) { + int total_players = m_players.size(); + if (player == null || total_players == 0) { m_logger.info("没有玩家，本次切换跳过。"); - player = getNext(); + return; } - if (player.isDead()) { - m_logger.info("玩家" + player.getName() + "已经死亡，跳过此玩家。"); - player = getNext(); - } - if (isAFK(player) && m_config_manager.getSkipAFK()) { - m_logger.info("玩家" + player.getName() + "可能在挂机，跳过此玩家。"); - player = getNext(); + int counter = 0; + while (counter < total_players) { + counter++; + if (player.isDead()) { + m_logger.info("玩家" + player.getName() + "已经死亡，跳过此玩家。"); + player = getNext(); + continue; + } + if (isAFK(player) && m_config_manager.getSkipAFK()) { + m_logger.info("玩家" + player.getName() + "可能在挂机，跳过此玩家。"); + player = getNext(); + continue; + } + break; } m_logger.info("切换到玩家：" + player.getName()); - m_bot.setSpectatorTarget(Bukkit.getPlayer(player.getName())); + m_bot.setGameMode(GameMode.SPECTATOR); + m_bot.setSpectatorTarget(player); m_current_player_name = player.getName(); player.sendMessage(ChatColor.GOLD + "你被直播机器人选中了，如果不想被直播可以使用/livebot away 在本次登录不再被选中。被直播有助于给服务器增加人气哦～"); - } - }; + } + + private class updateLocationTask extends BukkitRunnable { + @Override + public void run() { + for (Map.Entry entry : m_players.entrySet()) { + Player player = entry.getKey(); + m_players.put(player, player.getLocation()); + } + } + } private boolean isAFK(Player player) { @@ -61,7 +79,7 @@ public class WorkFunc { m_logger.warning("玩家" + player.getName() + "不在玩家列表中，无法判断是否在挂机。"); return true; } - Location location_2 = m_players.put(player, player.getLocation()); + Location location_2 = m_players.get(player); if (location_2 == null) { m_logger.warning("玩家" + player.getName() + "上一次位置为空，无法判断是否在挂机。"); return true; @@ -75,15 +93,15 @@ public class WorkFunc { if (m_index >= m_players.size()) { m_index = 0; } - return get_m_players(m_index); + return get_m_player(m_index); } else if (m_config_manager.getChangePattern().equals("RANDOM")) { int random_index = (int) (Math.random() * m_players.size()); - return get_m_players(random_index); + return get_m_player(random_index); } return null; } - private Player get_m_players(int index) { + private Player get_m_player(int index) { int i = 0; for (Map.Entry entry : m_players.entrySet()) { if (i == index) { @@ -97,21 +115,19 @@ public class WorkFunc { public void start(long delay,long time) { if (!is_running) { is_running = true; - m_task = new task(); - m_task.runTaskTimer(m_plugin,20L*delay,20L*time); + m_mainTask = new mainTask(); + m_updateLocationTask = new updateLocationTask(); + m_mainTask.runTaskTimer(m_plugin,20L*delay,20L*time); + m_updateLocationTask.runTaskTimer(m_plugin,20L*delay,m_config_manager.getAFKTime()*20L); return; } m_logger.info("直播机器人已经在运行了。"); } public void reFindBot(){ - m_logger.info("重新寻找直播机器人。"); + m_logger.info("正在寻找直播机器人。"); botOffline(); - m_players.clear(); - ArrayList players = new ArrayList<>(Bukkit.getOnlinePlayers()); - for (Player player : players) { - m_players.put(player, player.getLocation()); - } + updatePlayerList(); // 获取对应名字的玩家 Player bot = Bukkit.getPlayer(m_config_manager.getBotName()); if (bot == null) { @@ -125,6 +141,15 @@ public class WorkFunc { } } + public void updatePlayerList(){ + m_logger.info("更新玩家列表。"); + m_players.clear(); + ArrayList players = new ArrayList<>(Bukkit.getOnlinePlayers()); + for (Player player : players) { + m_players.put(player, player.getLocation()); + } + } + public void restart() { m_logger.info("重启序列。"); stop(); @@ -135,8 +160,10 @@ public class WorkFunc { if (is_running) { m_index = 0; is_running = false; - m_task.cancel(); - m_task = null; + m_mainTask.cancel(); + m_updateLocationTask.cancel(); + m_mainTask = null; + m_updateLocationTask = null; m_logger.warning("序列停止。"); return; } @@ -152,7 +179,8 @@ public class WorkFunc { private final Map m_players = new HashMap<>(); private boolean m_is_bot_online = false; private int m_index = 0; - private task m_task = null; + private mainTask m_mainTask = null; + private updateLocationTask m_updateLocationTask = null; private final LiveBot m_plugin; private final ConfigManager m_config_manager; private final Logger m_logger; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index f60c5c7..6eb5a23 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -11,4 +11,6 @@ Setting: # 是否在聊天栏公告自己的状态 IsNagging: true # 是否跳过挂机玩家 - SkipAFK: true \ No newline at end of file + SkipAFK: true + # 挂机判断时间（单位：秒） + AFKTime: 60 \ No newline at end of file