From d3814d01d1074e5d7a9dece4ccd5d5e250a9ae49 Mon Sep 17 00:00:00 2001 From: Badbird5907 <50347938+Badbird5907@users.noreply.github.com> Date: Fri, 15 Mar 2024 16:41:41 -0400 Subject: [PATCH] API Updates --- .../net/nuggetmc/tplus/api/BotManager.java | 2 ++ .../nuggetmc/tplus/bot/BotManagerImpl.java | 21 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/BotManager.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/BotManager.java index c224a11..23c9c47 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/BotManager.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/BotManager.java @@ -21,6 +21,8 @@ public interface BotManager { List fetchNames(); + Terminator createBot(Location loc, String name, String skin, String signature); + void createBots(CommandSender sender, String name, String skinName, int n, Location location); void createBots(CommandSender sender, String name, String skinName, int n, NeuralNetwork network, Location location); diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java index 7ddf144..bbbe01a 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java @@ -88,6 +88,11 @@ public class BotManagerImpl implements BotManager, Listener { }).collect(Collectors.toList()); } + @Override + public Terminator createBot(Location loc, String name, String skin, String sig) { + return Bot.createBot(loc, name, new String[]{skin, sig}); + } + @Override public Agent getAgent() { return agent; @@ -104,10 +109,12 @@ public class BotManagerImpl implements BotManager, Listener { if (n < 1) n = 1; - sender.sendMessage("Creating " + (n == 1 ? "new bot" : ChatColor.RED + numberFormat.format(n) + ChatColor.RESET + " new bots") - + " with name " + ChatColor.GREEN + name.replace("%", ChatColor.LIGHT_PURPLE + "%" + ChatColor.RESET) - + (skinName == null ? "" : ChatColor.RESET + " and skin " + ChatColor.GREEN + skinName) - + ChatColor.RESET + "..."); + if (sender != null) { + sender.sendMessage("Creating " + (n == 1 ? "new bot" : ChatColor.RED + numberFormat.format(n) + ChatColor.RESET + " new bots") + + " with name " + ChatColor.GREEN + name.replace("%", ChatColor.LIGHT_PURPLE + "%" + ChatColor.RESET) + + (skinName == null ? "" : ChatColor.RESET + " and skin " + ChatColor.GREEN + skinName) + + ChatColor.RESET + "..."); + } skinName = skinName == null ? name : skinName; @@ -118,12 +125,14 @@ public class BotManagerImpl implements BotManager, Listener { createBots(player.getLocation(), name, MojangAPI.getSkin(skinName), n, network); else { Location l = new Location(Bukkit.getWorlds().get(0), 0, 0, 0); - sender.sendMessage(ChatColor.RED + "No location specified, defaulting to " + l + "."); + if (sender != null) + sender.sendMessage(ChatColor.RED + "No location specified, defaulting to " + l + "."); createBots(l, name, MojangAPI.getSkin(skinName), n, network); } } - sender.sendMessage("Process completed (" + ChatColor.RED + ((System.currentTimeMillis() - timestamp) / 1000D) + "s" + ChatColor.RESET + ")."); + if (sender != null) + sender.sendMessage("Process completed (" + ChatColor.RED + ((System.currentTimeMillis() - timestamp) / 1000D) + "s" + ChatColor.RESET + ")."); } @Override