From fc4a8645fa9b585977ab573355cafc65eacaaa0d Mon Sep 17 00:00:00 2001 From: ThisTestUser Date: Sun, 22 Sep 2024 10:58:57 -0400 Subject: [PATCH] Code formatting fixes Not all formatting issues were fixed --- .../api/agent/legacyagent/LegacyAgent.java | 48 +- .../tplus/api/event/BotFallDamageEvent.java | 4 +- .../nuggetmc/tplus/api/utils/BotUtils.java | 8 +- .../main/java/net/nuggetmc/tplus/bot/Bot.java | 6 +- .../tplus/command/CommandInstance.java | 10 +- .../tplus/command/commands/AICommand.java | 2 +- .../tplus/command/commands/BotCommand.java | 2 +- .../commands/BotEnvironmentCommand.java | 636 +++++++++--------- .../net/nuggetmc/tplus/utils/Debugger.java | 34 +- 9 files changed, 375 insertions(+), 375 deletions(-) diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java index e9c657e..edc19a3 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java @@ -56,7 +56,7 @@ public class LegacyAgent extends Agent { private double regionWeightX; private double regionWeightY; private double regionWeightZ; - + public static final Set CUSTOM_MOB_LIST = new HashSet<>(); public static String customListMode = "custom"; @@ -1469,7 +1469,7 @@ public class LegacyAgent extends Agent { break; } - + case NEAREST_RAIDER: { for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) { boolean raider = entity instanceof Raider || (entity instanceof Vex vex && vex.getSummoner() instanceof Raider); @@ -1536,17 +1536,17 @@ public class LegacyAgent extends Agent { break; } - + case CUSTOM_LIST: { for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) { if (customListMode.equals("custom") && CUSTOM_MOB_LIST.contains(entity.getType()) && validateCloserEntity(entity, loc, result)) { result = entity; } } - + break; } - + case PLAYER: { if (bot.getTargetPlayer() != null) { Player player = Bukkit.getPlayer(bot.getTargetPlayer()); @@ -1554,7 +1554,7 @@ public class LegacyAgent extends Agent { result = player; } } - + break; } } @@ -1563,28 +1563,28 @@ public class LegacyAgent extends Agent { if (event.isCancelled()) return null; return event.getTarget(); } - + private boolean validateCloserEntity(LivingEntity entity, Location loc, LivingEntity result) { - double regionDistEntity = getWeightedRegionDist(entity.getLocation()); - if (regionDistEntity == Double.MAX_VALUE) - return false; - double regionDistResult = result == null ? 0 : getWeightedRegionDist(result.getLocation()); - return loc.getWorld() == entity.getWorld() && !entity.isDead() - && (result == null || (loc.distanceSquared(entity.getLocation()) + regionDistEntity) < (loc.distanceSquared(result.getLocation())) + regionDistResult); + double regionDistEntity = getWeightedRegionDist(entity.getLocation()); + if (regionDistEntity == Double.MAX_VALUE) + return false; + double regionDistResult = result == null ? 0 : getWeightedRegionDist(result.getLocation()); + return loc.getWorld() == entity.getWorld() && !entity.isDead() + && (result == null || (loc.distanceSquared(entity.getLocation()) + regionDistEntity) < (loc.distanceSquared(result.getLocation())) + regionDistResult); } - + private double getWeightedRegionDist(Location loc) { - if (region == null) - return 0; - double diffX = Math.max(0, Math.abs(region.getCenterX() - loc.getX()) - region.getWidthX() * 0.5); - double diffY = Math.max(0, Math.abs(region.getCenterY() - loc.getY()) - region.getHeight() * 0.5); - double diffZ = Math.max(0, Math.abs(region.getCenterZ() - loc.getZ()) - region.getWidthZ() * 0.5); - if (regionWeightX == 0 && regionWeightY == 0 && regionWeightZ == 0) - if (diffX > 0 || diffY > 0 || diffZ > 0) - return Double.MAX_VALUE; - return diffX * diffX * regionWeightX + diffY * diffY * regionWeightY + diffZ * diffZ * regionWeightZ; + if (region == null) + return 0; + double diffX = Math.max(0, Math.abs(region.getCenterX() - loc.getX()) - region.getWidthX() * 0.5); + double diffY = Math.max(0, Math.abs(region.getCenterY() - loc.getY()) - region.getHeight() * 0.5); + double diffZ = Math.max(0, Math.abs(region.getCenterZ() - loc.getZ()) - region.getWidthZ() * 0.5); + if (regionWeightX == 0 && regionWeightY == 0 && regionWeightZ == 0) + if (diffX > 0 || diffY > 0 || diffZ > 0) + return Double.MAX_VALUE; + return diffX * diffX * regionWeightX + diffY * diffY * regionWeightY + diffZ * diffZ * regionWeightZ; } - + @Override public void stopAllTasks() { super.stopAllTasks(); diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotFallDamageEvent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotFallDamageEvent.java index a294fdf..233a275 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotFallDamageEvent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotFallDamageEvent.java @@ -21,9 +21,9 @@ public class BotFallDamageEvent { public Terminator getBot() { return bot; } - + public List getStandingOn() { - return standingOn; + return standingOn; } public boolean isCancelled() { diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/BotUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/BotUtils.java index 85cfce6..e9ce524 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/BotUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/BotUtils.java @@ -34,12 +34,12 @@ public class BotUtils { return randomSteveUUID(); } - + public static boolean overlaps(BoundingBox playerBox, BoundingBox blockBox) { - return playerBox.overlaps(blockBox); + return playerBox.overlaps(blockBox); } - + public static double getHorizSqDist(Location blockLoc, Location pLoc) { - return NumberConversions.square(blockLoc.getX() + 0.5 - pLoc.getX()) + NumberConversions.square(blockLoc.getZ() + 0.5 - pLoc.getZ()); + return NumberConversions.square(blockLoc.getX() + 0.5 - pLoc.getX()) + NumberConversions.square(blockLoc.getZ() + 0.5 - pLoc.getZ()); } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java index 23710c7..d7a5e10 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java @@ -95,7 +95,7 @@ public class Bot extends ServerPlayer implements Terminator { // Magma fix - In case a mod causes the Bukkit entity to be created too early try { - getClass().getMethod("resetBukkitEntity").invoke(this); + getClass().getMethod("resetBukkitEntity").invoke(this); } catch (ReflectiveOperationException e) {} //this.entityData.set(new EntityDataAccessor<>(16, EntityDataSerializers.BYTE), (byte) 0xFF); @@ -124,11 +124,11 @@ public class Bot extends ServerPlayer implements Terminator { bot.getBukkitEntity().setNoDamageTicks(0); if (addPlayerList) { Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().connection.send( - ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(bot)))); + ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(bot)))); nmsWorld.addNewPlayer(bot); } else { Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().connection.send( - new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, bot))); + new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, bot))); nmsWorld.addFreshEntity(bot); } bot.renderAll(); diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java index 21d691f..3a98937 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java @@ -62,7 +62,7 @@ public abstract class CommandInstance extends BukkitCommand { protected void addMethod(String name, CommandMethod method) { methods.put(name, method); } - + protected void addAlias(String alias, String name) { aliasesToNames.put(alias, name); } @@ -237,9 +237,9 @@ public abstract class CommandInstance extends BukkitCommand { if (args.length == 1) { List result = methods.keySet().stream().filter(c -> !c.isEmpty() && c.contains(args[0])).collect(Collectors.toList()); if (result.isEmpty()) { - // Add aliases also - methods.forEach((s, m) -> result.addAll(m.getAliases())); - return result.stream().filter(c -> c.contains(args[0])).collect(Collectors.toList()); + // Add aliases also + methods.forEach((s, m) -> result.addAll(m.getAliases())); + return result.stream().filter(c -> c.contains(args[0])).collect(Collectors.toList()); } return result; } @@ -247,7 +247,7 @@ public abstract class CommandInstance extends BukkitCommand { if (args.length > 1) { CommandMethod commandMethod = methods.get(args[0]); if (commandMethod == null) - commandMethod = methods.values().stream().filter(m -> m.getAliases().contains(args[0])).findFirst().orElse(null); + commandMethod = methods.values().stream().filter(m -> m.getAliases().contains(args[0])).findFirst().orElse(null); if (commandMethod == null) return new ArrayList<>(); Method autofiller = commandMethod.getAutofiller(); diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java index 79c5c6c..1554c41 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java @@ -188,6 +188,6 @@ public class AICommand extends CommandInstance implements AIManager { @Autofill public List infoAutofill(CommandSender sender, String[] args) { - return args.length == 2 ? manager.fetchNames() : new ArrayList<>(); + return args.length == 2 ? manager.fetchNames() : new ArrayList<>(); } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java index 7f4daa8..3ab07a1 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java @@ -536,7 +536,7 @@ public class BotCommand extends CommandInstance { @Autofill public List debugAutofill(CommandSender sender, String[] args) { - return args.length == 2 ? new ArrayList<>(Debugger.AUTOFILL_METHODS) : new ArrayList<>(); + return args.length == 2 ? new ArrayList<>(Debugger.AUTOFILL_METHODS) : new ArrayList<>(); } private double parseDoubleOrRelative(String pos, Location loc, int type) { diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotEnvironmentCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotEnvironmentCommand.java index a5d3011..91aaaf0 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotEnvironmentCommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotEnvironmentCommand.java @@ -34,397 +34,397 @@ import net.nuggetmc.tplus.command.annotation.OptArg; public class BotEnvironmentCommand extends CommandInstance { - private static final Set LOADED_MODS = new HashSet<>(); - private static boolean loaded; - + private static final Set LOADED_MODS = new HashSet<>(); + private static boolean loaded; + public BotEnvironmentCommand(CommandHandler handler, String name, String description, String... aliases) { super(handler, name, description, aliases); } - + @Command public void root(CommandSender sender, List args) { commandHandler.sendRootInfo(this, sender); } - + @Command( - name = "help", - desc = "Help for /botenvironment.", - autofill = "autofill" + name = "help", + desc = "Help for /botenvironment.", + autofill = "autofill" ) public void help(CommandSender sender, List args) { - if (args.size() > 0 && args.get(0).equals("blocks")) { - sender.sendMessage(ChatUtils.LINE); - sender.sendMessage("If you are running this plugin on a Magma server, keep in mind that blocks added by mods are not considered solid."); - sender.sendMessage("You must manually add solid blocks added by mods with " + ChatColor.YELLOW + "/botenvironment addSolid " + ChatColor.RESET + "."); - sender.sendMessage("The material name is the mod ID and the block name concatted with a \"_\", converted to uppercase."); - sender.sendMessage("For example, if mod \"examplemod\" adds a block \"custom_block\", the material name is EXAMPLEMOD_CUSTOM_BLOCK."); - sender.sendMessage("Additionally, you may use " + ChatColor.YELLOW + "/botenvironment addSolidGroup " + ChatColor.RESET + ", where modid is the uppercase MODID plus a \"_\""); - sender.sendMessage(ChatUtils.LINE); - } else if (args.size() > 0 && args.get(0).equals("mobs")) { - sender.sendMessage(ChatUtils.LINE); - sender.sendMessage("The custom mob list is a user-defined list of mobs."); - sender.sendMessage("Use " + ChatColor.YELLOW + "/botenvironment addCustomMob " + ChatColor.RESET + " to add mob types to the list."); - sender.sendMessage("The list can be used in the CUSTOM_LIST targeting option, and can also be appended to the hostile, raider, or mob targeting options."); - sender.sendMessage("When appending, the mobs predefined as well as the mobs in the custom list will be considered."); - sender.sendMessage("Use " + ChatColor.YELLOW + "/botenvironment mobListType" + ChatColor.RESET + " to change the behavior of the custom mob list."); - sender.sendMessage(ChatUtils.LINE); - } else { - sender.sendMessage("Do " + ChatColor.YELLOW + "/botenvironment help blocks " + ChatColor.RESET + "for more information on adding solid blocks."); - sender.sendMessage("Do " + ChatColor.YELLOW + "/botenvironment help mobs " + ChatColor.RESET + "for more information on creating a custom mob list."); - } + if (args.size() > 0 && args.get(0).equals("blocks")) { + sender.sendMessage(ChatUtils.LINE); + sender.sendMessage("If you are running this plugin on a Magma server, keep in mind that blocks added by mods are not considered solid."); + sender.sendMessage("You must manually add solid blocks added by mods with " + ChatColor.YELLOW + "/botenvironment addSolid " + ChatColor.RESET + "."); + sender.sendMessage("The material name is the mod ID and the block name concatted with a \"_\", converted to uppercase."); + sender.sendMessage("For example, if mod \"examplemod\" adds a block \"custom_block\", the material name is EXAMPLEMOD_CUSTOM_BLOCK."); + sender.sendMessage("Additionally, you may use " + ChatColor.YELLOW + "/botenvironment addSolidGroup " + ChatColor.RESET + ", where modid is the uppercase MODID plus a \"_\""); + sender.sendMessage(ChatUtils.LINE); + } else if (args.size() > 0 && args.get(0).equals("mobs")) { + sender.sendMessage(ChatUtils.LINE); + sender.sendMessage("The custom mob list is a user-defined list of mobs."); + sender.sendMessage("Use " + ChatColor.YELLOW + "/botenvironment addCustomMob " + ChatColor.RESET + " to add mob types to the list."); + sender.sendMessage("The list can be used in the CUSTOM_LIST targeting option, and can also be appended to the hostile, raider, or mob targeting options."); + sender.sendMessage("When appending, the mobs predefined as well as the mobs in the custom list will be considered."); + sender.sendMessage("Use " + ChatColor.YELLOW + "/botenvironment mobListType" + ChatColor.RESET + " to change the behavior of the custom mob list."); + sender.sendMessage(ChatUtils.LINE); + } else { + sender.sendMessage("Do " + ChatColor.YELLOW + "/botenvironment help blocks " + ChatColor.RESET + "for more information on adding solid blocks."); + sender.sendMessage("Do " + ChatColor.YELLOW + "/botenvironment help mobs " + ChatColor.RESET + "for more information on creating a custom mob list."); + } } - + @Command( name = "getMaterial", desc = "Prints out the current material at the specified location.", aliases = {"getmat", "getMat", "getmaterial"} ) public void getMaterial(Player sender, @Arg("x") String x, @Arg("y") String y, @Arg("z") String z) { - Location loc = sender.getLocation().clone(); - try { - loc.setX(parseDoubleOrRelative(x, loc, 0)); - loc.setY(parseDoubleOrRelative(y, loc, 1)); - loc.setZ(parseDoubleOrRelative(z, loc, 2)); + Location loc = sender.getLocation().clone(); + try { + loc.setX(parseDoubleOrRelative(x, loc, 0)); + loc.setY(parseDoubleOrRelative(y, loc, 1)); + loc.setZ(parseDoubleOrRelative(z, loc, 2)); } catch (NumberFormatException e) { - sender.sendMessage("A valid location must be provided!"); - return; + sender.sendMessage("A valid location must be provided!"); + return; } - if (!isLocationLoaded(loc)) { - sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is not loaded.", - loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - return; - } - if (Math.abs(loc.getX() - sender.getLocation().getX()) > 250 || Math.abs(loc.getZ() - sender.getLocation().getZ()) > 250) { - sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is too far away.", - loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - return; - } - Material mat = loc.getBlock().getType(); - sender.sendMessage(String.format("Material at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + ": " + ChatColor.GREEN + "%s" + ChatColor.RESET, - loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), mat.name())); + if (!isLocationLoaded(loc)) { + sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is not loaded.", + loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + return; + } + if (Math.abs(loc.getX() - sender.getLocation().getX()) > 250 || Math.abs(loc.getZ() - sender.getLocation().getZ()) > 250) { + sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is too far away.", + loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + return; + } + Material mat = loc.getBlock().getType(); + sender.sendMessage(String.format("Material at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + ": " + ChatColor.GREEN + "%s" + ChatColor.RESET, + loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), mat.name())); } - + @Command( - name = "addSolidGroup", - desc = "Adds every block starting with a prefix to the list of solid materials.", - aliases = {"addsolidgroup"}, - autofill = "autofill" + name = "addSolidGroup", + desc = "Adds every block starting with a prefix to the list of solid materials.", + aliases = {"addsolidgroup"}, + autofill = "autofill" ) public void addSolidGroup(CommandSender sender, @Arg("prefix") String prefix, @OptArg("includeNonSolid") boolean includeNonSolid) { - try { - Field byName = Material.class.getDeclaredField("BY_NAME"); - byName.setAccessible(true); - Map map = (Map) byName.get(null); - Map materialsToBlocks = new HashMap<>(); - if (!includeNonSolid) { - // Build material -> block map using ForgeRegistries - Object blocksRegistry = Class.forName("net.minecraftforge.registries.ForgeRegistries").getDeclaredField("BLOCKS").get(null); - Set, Block>> blockSet = (Set, Block>>) Class.forName("net.minecraftforge.registries.IForgeRegistry").getMethod("getEntries").invoke(blocksRegistry); - - for (Entry, Block> entry : blockSet) { - String result = (String) Class.forName("org.magmafoundation.magma.util.ResourceLocationUtil").getMethod("standardize", ResourceLocation.class).invoke(null, entry.getKey().location()); - Material material = Material.getMaterial(result); - if (material != null) - materialsToBlocks.put(material, entry.getValue()); - } - } - int added = 0; - for (Entry entry : map.entrySet()) { - boolean valid = entry.getValue().isBlock() && entry.getKey().startsWith(prefix); - if (valid && !includeNonSolid) - if (!materialsToBlocks.containsKey(entry.getValue())) { - sender.sendMessage("Warning: The material " + ChatColor.GREEN + entry.getValue().name() + ChatColor.RESET - + " was not found in the Forge registries, this should not happen!"); - } else { - // Check if block is solid - Block block = materialsToBlocks.get(entry.getValue()); - valid = block.defaultBlockState().blocksMotion(); - } - if (valid && LegacyMats.SOLID_MATERIALS.add(entry.getValue())) - added++; - } - sender.sendMessage("Successfully added " + ChatColor.BLUE + added + ChatColor.RESET + " materials with prefix " + ChatColor.GREEN + prefix + ChatColor.RESET); - } catch(ReflectiveOperationException e) { - sender.sendMessage("This command only works on Magma servers!"); - } + try { + Field byName = Material.class.getDeclaredField("BY_NAME"); + byName.setAccessible(true); + Map map = (Map) byName.get(null); + Map materialsToBlocks = new HashMap<>(); + if (!includeNonSolid) { + // Build material -> block map using ForgeRegistries + Object blocksRegistry = Class.forName("net.minecraftforge.registries.ForgeRegistries").getDeclaredField("BLOCKS").get(null); + Set, Block>> blockSet = (Set, Block>>) Class.forName("net.minecraftforge.registries.IForgeRegistry").getMethod("getEntries").invoke(blocksRegistry); + + for (Entry, Block> entry : blockSet) { + String result = (String) Class.forName("org.magmafoundation.magma.util.ResourceLocationUtil").getMethod("standardize", ResourceLocation.class).invoke(null, entry.getKey().location()); + Material material = Material.getMaterial(result); + if (material != null) + materialsToBlocks.put(material, entry.getValue()); + } + } + int added = 0; + for (Entry entry : map.entrySet()) { + boolean valid = entry.getValue().isBlock() && entry.getKey().startsWith(prefix); + if (valid && !includeNonSolid) + if (!materialsToBlocks.containsKey(entry.getValue())) { + sender.sendMessage("Warning: The material " + ChatColor.GREEN + entry.getValue().name() + ChatColor.RESET + + " was not found in the Forge registries, this should not happen!"); + } else { + // Check if block is solid + Block block = materialsToBlocks.get(entry.getValue()); + valid = block.defaultBlockState().blocksMotion(); + } + if (valid && LegacyMats.SOLID_MATERIALS.add(entry.getValue())) + added++; + } + sender.sendMessage("Successfully added " + ChatColor.BLUE + added + ChatColor.RESET + " materials with prefix " + ChatColor.GREEN + prefix + ChatColor.RESET); + } catch(ReflectiveOperationException e) { + sender.sendMessage("This command only works on Magma servers!"); + } } - + @Command( - name = "addSolid", - desc = "Adds a material to the list of solid materials.", - aliases = {"addsolid"}, - autofill = "autofill" + name = "addSolid", + desc = "Adds a material to the list of solid materials.", + aliases = {"addsolid"}, + autofill = "autofill" ) public void addSolid(CommandSender sender, List args) { - Material mat; - if (args.size() == 1) - mat = Material.getMaterial(args.get(0)); - else if (args.size() == 3) { - if (!(sender instanceof Player)) { - sender.sendMessage("You must be a player to specify coordinates!"); - return; - } - Location loc = ((Player)sender).getLocation().clone(); - try { - loc.setX(parseDoubleOrRelative(args.get(0), loc, 0)); - loc.setY(parseDoubleOrRelative(args.get(1), loc, 1)); - loc.setZ(parseDoubleOrRelative(args.get(2), loc, 2)); - } catch (NumberFormatException e) { - sender.sendMessage("A valid location must be provided! " + ChatColor.YELLOW + "/bot addSolid " + ChatColor.RESET); - return; - } - if (!isLocationLoaded(loc)) { - sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is not loaded.", - loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - return; - } - if (Math.abs(loc.getX() - ((Player)sender).getLocation().getX()) > 250 || Math.abs(loc.getZ() - ((Player)sender).getLocation().getZ()) > 250) { - sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is too far away.", - loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - return; - } - mat = loc.getBlock().getType(); - } else { - sender.sendMessage("Invalid syntax!"); - sender.sendMessage("To specify a material: " + ChatColor.YELLOW + "/bot addSolid " + ChatColor.RESET); - sender.sendMessage("To specify a location containing a material: " + ChatColor.YELLOW + "/bot addSolid " + ChatColor.RESET); - return; - } - if (mat == null) { - sender.sendMessage("The material you specified does not exist!"); - return; - } - if (LegacyMats.SOLID_MATERIALS.add(mat)) - sender.sendMessage("Successfully added " + ChatColor.BLUE + mat.name() + ChatColor.RESET + " to the list."); - else - sender.sendMessage(ChatColor.BLUE + mat.name() + ChatColor.RESET + " already exists in the list!"); + Material mat; + if (args.size() == 1) + mat = Material.getMaterial(args.get(0)); + else if (args.size() == 3) { + if (!(sender instanceof Player)) { + sender.sendMessage("You must be a player to specify coordinates!"); + return; + } + Location loc = ((Player)sender).getLocation().clone(); + try { + loc.setX(parseDoubleOrRelative(args.get(0), loc, 0)); + loc.setY(parseDoubleOrRelative(args.get(1), loc, 1)); + loc.setZ(parseDoubleOrRelative(args.get(2), loc, 2)); + } catch (NumberFormatException e) { + sender.sendMessage("A valid location must be provided! " + ChatColor.YELLOW + "/bot addSolid " + ChatColor.RESET); + return; + } + if (!isLocationLoaded(loc)) { + sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is not loaded.", + loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + return; + } + if (Math.abs(loc.getX() - ((Player)sender).getLocation().getX()) > 250 || Math.abs(loc.getZ() - ((Player)sender).getLocation().getZ()) > 250) { + sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is too far away.", + loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + return; + } + mat = loc.getBlock().getType(); + } else { + sender.sendMessage("Invalid syntax!"); + sender.sendMessage("To specify a material: " + ChatColor.YELLOW + "/bot addSolid " + ChatColor.RESET); + sender.sendMessage("To specify a location containing a material: " + ChatColor.YELLOW + "/bot addSolid " + ChatColor.RESET); + return; + } + if (mat == null) { + sender.sendMessage("The material you specified does not exist!"); + return; + } + if (LegacyMats.SOLID_MATERIALS.add(mat)) + sender.sendMessage("Successfully added " + ChatColor.BLUE + mat.name() + ChatColor.RESET + " to the list."); + else + sender.sendMessage(ChatColor.BLUE + mat.name() + ChatColor.RESET + " already exists in the list!"); } - + @Command( - name = "removeSolid", - desc = "Removes a material from the list of solid materials.", - aliases = {"removesolid"}, - autofill = "autofill" + name = "removeSolid", + desc = "Removes a material from the list of solid materials.", + aliases = {"removesolid"}, + autofill = "autofill" ) public void removeSolid(CommandSender sender, List args) { - Material mat; - if (args.size() == 1) - mat = Material.getMaterial(args.get(0)); - else if (args.size() == 3) { - if (!(sender instanceof Player)) { - sender.sendMessage("You must be a player to specify coordinates!"); - return; - } - Location loc = ((Player)sender).getLocation().clone(); - try { - loc.setX(parseDoubleOrRelative(args.get(0), loc, 0)); - loc.setY(parseDoubleOrRelative(args.get(1), loc, 1)); - loc.setZ(parseDoubleOrRelative(args.get(2), loc, 2)); - } catch (NumberFormatException e) { - sender.sendMessage("A valid location must be provided! " + ChatColor.YELLOW + "/bot removeSolid " + ChatColor.RESET); - return; - } - if (!isLocationLoaded(loc)) { - sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is not loaded.", - loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - return; - } - if (Math.abs(loc.getX() - ((Player)sender).getLocation().getX()) > 250 || Math.abs(loc.getZ() - ((Player)sender).getLocation().getZ()) > 250) { - sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is too far away.", - loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - return; - } - mat = loc.getBlock().getType(); - } else { - sender.sendMessage("Invalid syntax!"); - sender.sendMessage("To specify a material: " + ChatColor.YELLOW + "/bot removeSolid " + ChatColor.RESET); - sender.sendMessage("To specify a location containing a material: " + ChatColor.YELLOW + "/bot removeSolid " + ChatColor.RESET); - return; - } - if (mat == null) { - sender.sendMessage("The material you specified does not exist!"); - return; - } - if (LegacyMats.SOLID_MATERIALS.remove(mat)) - sender.sendMessage("Successfully removed " + ChatColor.BLUE + mat.name() + ChatColor.RESET + " from the list."); - else - sender.sendMessage(ChatColor.BLUE + mat.name() + ChatColor.RESET + " does not exist in the list!"); + Material mat; + if (args.size() == 1) + mat = Material.getMaterial(args.get(0)); + else if (args.size() == 3) { + if (!(sender instanceof Player)) { + sender.sendMessage("You must be a player to specify coordinates!"); + return; + } + Location loc = ((Player)sender).getLocation().clone(); + try { + loc.setX(parseDoubleOrRelative(args.get(0), loc, 0)); + loc.setY(parseDoubleOrRelative(args.get(1), loc, 1)); + loc.setZ(parseDoubleOrRelative(args.get(2), loc, 2)); + } catch (NumberFormatException e) { + sender.sendMessage("A valid location must be provided! " + ChatColor.YELLOW + "/bot removeSolid " + ChatColor.RESET); + return; + } + if (!isLocationLoaded(loc)) { + sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is not loaded.", + loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + return; + } + if (Math.abs(loc.getX() - ((Player)sender).getLocation().getX()) > 250 || Math.abs(loc.getZ() - ((Player)sender).getLocation().getZ()) > 250) { + sender.sendMessage(String.format("The location at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + " is too far away.", + loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + return; + } + mat = loc.getBlock().getType(); + } else { + sender.sendMessage("Invalid syntax!"); + sender.sendMessage("To specify a material: " + ChatColor.YELLOW + "/bot removeSolid " + ChatColor.RESET); + sender.sendMessage("To specify a location containing a material: " + ChatColor.YELLOW + "/bot removeSolid " + ChatColor.RESET); + return; + } + if (mat == null) { + sender.sendMessage("The material you specified does not exist!"); + return; + } + if (LegacyMats.SOLID_MATERIALS.remove(mat)) + sender.sendMessage("Successfully removed " + ChatColor.BLUE + mat.name() + ChatColor.RESET + " from the list."); + else + sender.sendMessage(ChatColor.BLUE + mat.name() + ChatColor.RESET + " does not exist in the list!"); } - + @Command( - name = "listSolids", - desc = "Displays the list of solid materials manually added.", - aliases = {"listsolids"} + name = "listSolids", + desc = "Displays the list of solid materials manually added.", + aliases = {"listsolids"} ) public void listSolids(CommandSender sender) { - sender.sendMessage(ChatUtils.LINE); - for (Material mat : LegacyMats.SOLID_MATERIALS) - sender.sendMessage(ChatColor.GREEN + mat.name() + ChatColor.RESET); - sender.sendMessage("Total items: " + ChatColor.BLUE + LegacyMats.SOLID_MATERIALS.size() + ChatColor.RESET); - sender.sendMessage(ChatUtils.LINE); + sender.sendMessage(ChatUtils.LINE); + for (Material mat : LegacyMats.SOLID_MATERIALS) + sender.sendMessage(ChatColor.GREEN + mat.name() + ChatColor.RESET); + sender.sendMessage("Total items: " + ChatColor.BLUE + LegacyMats.SOLID_MATERIALS.size() + ChatColor.RESET); + sender.sendMessage(ChatUtils.LINE); } - + @Command( - name = "clearSolids", - desc = "Clears the list of solid materials manually added.", - aliases = {"clearsolids"} + name = "clearSolids", + desc = "Clears the list of solid materials manually added.", + aliases = {"clearsolids"} ) public void clearSolids(CommandSender sender) { - int size = LegacyMats.SOLID_MATERIALS.size(); - LegacyMats.SOLID_MATERIALS.clear(); - sender.sendMessage("Removed all " + ChatColor.BLUE + size + ChatColor.RESET + " item(s) from the list."); + int size = LegacyMats.SOLID_MATERIALS.size(); + LegacyMats.SOLID_MATERIALS.clear(); + sender.sendMessage("Removed all " + ChatColor.BLUE + size + ChatColor.RESET + " item(s) from the list."); } - + @Command( - name = "addCustomMob", - desc = "Adds a mob to the custom list.", - aliases = {"addcustommob"}, - autofill = "autofill" + name = "addCustomMob", + desc = "Adds a mob to the custom list.", + aliases = {"addcustommob"}, + autofill = "autofill" ) public void addCustomMob(CommandSender sender, @Arg("mobName") String mobName) { - EntityType type = EntityType.fromName(mobName); - if (type == null) { - sender.sendMessage("The entity type you specified does not exist!"); - return; - } - if (LegacyAgent.CUSTOM_MOB_LIST.add(type)) - sender.sendMessage("Successfully added " + ChatColor.BLUE + type.name() + ChatColor.RESET + " to the list."); - else - sender.sendMessage(ChatColor.BLUE + type.name() + ChatColor.RESET + " already exists in the list!"); + EntityType type = EntityType.fromName(mobName); + if (type == null) { + sender.sendMessage("The entity type you specified does not exist!"); + return; + } + if (LegacyAgent.CUSTOM_MOB_LIST.add(type)) + sender.sendMessage("Successfully added " + ChatColor.BLUE + type.name() + ChatColor.RESET + " to the list."); + else + sender.sendMessage(ChatColor.BLUE + type.name() + ChatColor.RESET + " already exists in the list!"); } - + @Command( - name = "removeCustomMob", - desc = "Removes a mob from the custom list.", - aliases = {"removecustommob"}, - autofill = "autofill" + name = "removeCustomMob", + desc = "Removes a mob from the custom list.", + aliases = {"removecustommob"}, + autofill = "autofill" ) public void removeCustomMob(CommandSender sender, @Arg("mobName") String mobName) { - EntityType type = EntityType.fromName(mobName); - if (type == null) { - sender.sendMessage("The entity type you specified does not exist!"); - return; - } - if (LegacyAgent.CUSTOM_MOB_LIST.remove(type)) - sender.sendMessage("Successfully removed " + ChatColor.BLUE + type.name() + ChatColor.RESET + " from the list."); - else - sender.sendMessage(ChatColor.BLUE + type.name() + ChatColor.RESET + " does not exist in the list!"); + EntityType type = EntityType.fromName(mobName); + if (type == null) { + sender.sendMessage("The entity type you specified does not exist!"); + return; + } + if (LegacyAgent.CUSTOM_MOB_LIST.remove(type)) + sender.sendMessage("Successfully removed " + ChatColor.BLUE + type.name() + ChatColor.RESET + " from the list."); + else + sender.sendMessage(ChatColor.BLUE + type.name() + ChatColor.RESET + " does not exist in the list!"); } - + @Command( - name = "listCustomMobs", - desc = "Displays the custom list of mobs.", - aliases = {"listcustommobs"} + name = "listCustomMobs", + desc = "Displays the custom list of mobs.", + aliases = {"listcustommobs"} ) public void listCustomMobs(CommandSender sender) { - sender.sendMessage(ChatUtils.LINE); - for (EntityType type : LegacyAgent.CUSTOM_MOB_LIST) - sender.sendMessage(ChatColor.GREEN + type.name() + ChatColor.RESET); - sender.sendMessage("Total items: " + ChatColor.BLUE + LegacyAgent.CUSTOM_MOB_LIST.size() + ChatColor.RESET); - sender.sendMessage(ChatUtils.LINE); + sender.sendMessage(ChatUtils.LINE); + for (EntityType type : LegacyAgent.CUSTOM_MOB_LIST) + sender.sendMessage(ChatColor.GREEN + type.name() + ChatColor.RESET); + sender.sendMessage("Total items: " + ChatColor.BLUE + LegacyAgent.CUSTOM_MOB_LIST.size() + ChatColor.RESET); + sender.sendMessage(ChatUtils.LINE); } - + @Command( - name = "clearCustomMobs", - desc = "Clears the custom list of mobs.", - aliases = {"clearcustommobs"} + name = "clearCustomMobs", + desc = "Clears the custom list of mobs.", + aliases = {"clearcustommobs"} ) public void clearCustomMobs(CommandSender sender) { - int size = LegacyAgent.CUSTOM_MOB_LIST.size(); - LegacyAgent.CUSTOM_MOB_LIST.clear(); - sender.sendMessage("Removed all " + ChatColor.BLUE + size + ChatColor.RESET + " item(s) from the list."); + int size = LegacyAgent.CUSTOM_MOB_LIST.size(); + LegacyAgent.CUSTOM_MOB_LIST.clear(); + sender.sendMessage("Removed all " + ChatColor.BLUE + size + ChatColor.RESET + " item(s) from the list."); } - + @Command( - name = "mobListType", - desc = "Changes the behavior of the custom mob list.", - aliases = {"moblisttype"}, - autofill = "autofill" + name = "mobListType", + desc = "Changes the behavior of the custom mob list.", + aliases = {"moblisttype"}, + autofill = "autofill" ) public void mobListType(CommandSender sender, List args) { - if (args.isEmpty()) { - sender.sendMessage("The custom mob list type is " + ChatColor.BLUE + LegacyAgent.customListMode + ChatColor.RESET + "."); - } else if (args.size() > 0 && (args.get(0).equals("hostile") || args.get(0).equals("raider") - || args.get(0).equals("mob") || args.get(0).equals("custom"))) { - LegacyAgent.customListMode = args.get(0); - sender.sendMessage( - "Successfully set the custom mob list type to " + ChatColor.BLUE + args.get(0) + ChatColor.RESET + "."); - } else - sender.sendMessage("Usage: " + ChatColor.YELLOW + "/botenvironment mobListType (hostile|raider|mob|custom)" + ChatColor.RESET); + if (args.isEmpty()) { + sender.sendMessage("The custom mob list type is " + ChatColor.BLUE + LegacyAgent.customListMode + ChatColor.RESET + "."); + } else if (args.size() > 0 && (args.get(0).equals("hostile") || args.get(0).equals("raider") + || args.get(0).equals("mob") || args.get(0).equals("custom"))) { + LegacyAgent.customListMode = args.get(0); + sender.sendMessage( + "Successfully set the custom mob list type to " + ChatColor.BLUE + args.get(0) + ChatColor.RESET + "."); + } else + sender.sendMessage("Usage: " + ChatColor.YELLOW + "/botenvironment mobListType (hostile|raider|mob|custom)" + ChatColor.RESET); } - + @Autofill public List autofill(CommandSender sender, String[] args) { List output = new ArrayList<>(); if (args.length == 2) { - if (args[0].equals("help")) { - output.add("blocks"); - output.add("mobs"); - } else if (matches(args[0], "addSolidGroup")) { - output.addAll(getLoadedMods()); - } else if (matches(args[0], "addSolid") || matches(args[0], "removeSolid")) { - for (Material mat : Material.values()) - if (!mat.isLegacy()) - output.add(mat.name()); - } else if (matches(args[0], "addCustomMob") || matches(args[0], "removeCustomMob")) { - for (EntityType type : EntityType.values()) - if (type != EntityType.UNKNOWN) - output.add(type.name()); - } else if (matches(args[0], "mobListType")) { - output.add("hostile"); - output.add("raider"); - output.add("mob"); - output.add("custom"); - } + if (args[0].equals("help")) { + output.add("blocks"); + output.add("mobs"); + } else if (matches(args[0], "addSolidGroup")) { + output.addAll(getLoadedMods()); + } else if (matches(args[0], "addSolid") || matches(args[0], "removeSolid")) { + for (Material mat : Material.values()) + if (!mat.isLegacy()) + output.add(mat.name()); + } else if (matches(args[0], "addCustomMob") || matches(args[0], "removeCustomMob")) { + for (EntityType type : EntityType.values()) + if (type != EntityType.UNKNOWN) + output.add(type.name()); + } else if (matches(args[0], "mobListType")) { + output.add("hostile"); + output.add("raider"); + output.add("mob"); + output.add("custom"); + } } return output; } - + private boolean matches(String input, String check) { - return input.equals(check) || input.equals(check.toLowerCase(Locale.ENGLISH)); + return input.equals(check) || input.equals(check.toLowerCase(Locale.ENGLISH)); } - + private double parseDoubleOrRelative(String pos, Location loc, int type) { - if (loc == null || pos.length() == 0 || pos.charAt(0) != '~') - return Double.parseDouble(pos); - double relative = pos.length() == 1 ? 0 : Double.parseDouble(pos.substring(1)); - switch (type) { - case 0: - return relative + Math.round(loc.getX() * 1000) / 1000D; - case 1: - return relative + Math.round(loc.getY() * 1000) / 1000D; - case 2: - return relative + Math.round(loc.getZ() * 1000) / 1000D; - default: - return 0; - } + if (loc == null || pos.length() == 0 || pos.charAt(0) != '~') + return Double.parseDouble(pos); + double relative = pos.length() == 1 ? 0 : Double.parseDouble(pos.substring(1)); + switch (type) { + case 0: + return relative + Math.round(loc.getX() * 1000) / 1000D; + case 1: + return relative + Math.round(loc.getY() * 1000) / 1000D; + case 2: + return relative + Math.round(loc.getZ() * 1000) / 1000D; + default: + return 0; + } } - + private boolean isLocationLoaded(Location loc) { - return loc.getWorld().isChunkLoaded(Location.locToBlock(loc.getX()) >> 4, Location.locToBlock(loc.getZ()) >> 4); + return loc.getWorld().isChunkLoaded(Location.locToBlock(loc.getX()) >> 4, Location.locToBlock(loc.getZ()) >> 4); } - + private static Set getLoadedMods() { - if (!loaded) { - try { - Object blocksRegistry = Class.forName("net.minecraftforge.registries.ForgeRegistries").getDeclaredField("BLOCKS").get(null); - Set, Block>> blockSet = (Set, Block>>) Class.forName("net.minecraftforge.registries.IForgeRegistry").getMethod("getEntries").invoke(blocksRegistry); - for (Entry, Block> entry : blockSet) { - String namespace = entry.getKey().location().getNamespace(); - if (!namespace.equals(NamespacedKey.MINECRAFT)) - LOADED_MODS.add(namespace.toUpperCase() + "_"); - } - - Object itemsRegistry = Class.forName("net.minecraftforge.registries.ForgeRegistries").getDeclaredField("ITEMS").get(null); - Set, Item>> itemSet = (Set, Item>>) Class.forName("net.minecraftforge.registries.IForgeRegistry").getMethod("getEntries").invoke(itemsRegistry); - for (Entry, Item> entry : itemSet) { - String namespace = entry.getKey().location().getNamespace(); - if (!namespace.equals(NamespacedKey.MINECRAFT)) - LOADED_MODS.add(namespace.toUpperCase() + "_"); - } - } catch (ReflectiveOperationException e) {} - loaded = true; - } - return LOADED_MODS; + if (!loaded) { + try { + Object blocksRegistry = Class.forName("net.minecraftforge.registries.ForgeRegistries").getDeclaredField("BLOCKS").get(null); + Set, Block>> blockSet = (Set, Block>>) Class.forName("net.minecraftforge.registries.IForgeRegistry").getMethod("getEntries").invoke(blocksRegistry); + for (Entry, Block> entry : blockSet) { + String namespace = entry.getKey().location().getNamespace(); + if (!namespace.equals(NamespacedKey.MINECRAFT)) + LOADED_MODS.add(namespace.toUpperCase() + "_"); + } + + Object itemsRegistry = Class.forName("net.minecraftforge.registries.ForgeRegistries").getDeclaredField("ITEMS").get(null); + Set, Item>> itemSet = (Set, Item>>) Class.forName("net.minecraftforge.registries.IForgeRegistry").getMethod("getEntries").invoke(itemsRegistry); + for (Entry, Item> entry : itemSet) { + String namespace = entry.getKey().location().getNamespace(); + if (!namespace.equals(NamespacedKey.MINECRAFT)) + LOADED_MODS.add(namespace.toUpperCase() + "_"); + } + } catch (ReflectiveOperationException e) {} + loaded = true; + } + return LOADED_MODS; } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java index 8c8ebba..000985a 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java @@ -35,18 +35,18 @@ public class Debugger { public static final Set AUTOFILL_METHODS = new HashSet<>(); static { - for (Method method : Debugger.class.getDeclaredMethods()) { - if (!method.getName().equals("print") && !method.getName().equals("execute") && !method.getName().equals("buildObjects") - && !method.getName().startsWith("lambda$")) { - String autofill = method.getName() + "("; - for (Parameter par : method.getParameters()) { - autofill += par.getType().getSimpleName() + ","; - } - autofill = method.getParameters().length > 0 ? autofill.substring(0, autofill.length() - 1) : autofill; - autofill += ")"; - AUTOFILL_METHODS.add(autofill); - } - } + for (Method method : Debugger.class.getDeclaredMethods()) { + if (!method.getName().equals("print") && !method.getName().equals("execute") && !method.getName().equals("buildObjects") + && !method.getName().startsWith("lambda$")) { + String autofill = method.getName() + "("; + for (Parameter par : method.getParameters()) { + autofill += par.getType().getSimpleName() + ","; + } + autofill = method.getParameters().length > 0 ? autofill.substring(0, autofill.length() - 1) : autofill; + autofill += ")"; + AUTOFILL_METHODS.add(autofill); + } + } } public Debugger(CommandSender sender) { @@ -478,7 +478,7 @@ public class Debugger { print("The Bot Agent is now " + (b ? ChatColor.RED + "DISABLED" : ChatColor.GREEN + "ENABLED") + ChatColor.RESET + "."); } - + public void printSurroundingMobs(double dist) { if (!(sender instanceof Player)) { print("You must be a player to call this."); @@ -488,10 +488,10 @@ public class Debugger { Player player = (Player) sender; double distSq = Math.pow(dist, 2); for (Entity en : player.getWorld().getEntities()) { - Location loc = en.getLocation(); - if (loc.distanceSquared(player.getLocation()) < distSq) - print(String.format("Entity at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + ": Type " + ChatColor.GREEN + "%s" + ChatColor.RESET, - loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), en.getType().toString())); + Location loc = en.getLocation(); + if (loc.distanceSquared(player.getLocation()) < distSq) + print(String.format("Entity at " + ChatColor.BLUE + "(%d, %d, %d)" + ChatColor.RESET + ": Type " + ChatColor.GREEN + "%s" + ChatColor.RESET, + loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), en.getType().toString())); } } }