From c9d954d1c017e1ffb14d1af6bd9403fc19e248bd Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 19 Jan 2024 22:30:26 -0600 Subject: [PATCH] reformat --- .../dev/plex/command/impl/EntityWipeCMD.java | 75 +++++++++++++------ .../dev/plex/command/impl/MobPurgeCMD.java | 68 ++++++++++------- 2 files changed, 93 insertions(+), 50 deletions(-) diff --git a/server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java b/server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java index 93f570e..1f556f5 100644 --- a/server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java +++ b/server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java @@ -20,9 +20,11 @@ import java.util.*; @CommandPermissions(permission = "plex.entitywipe", source = RequiredCommandSource.ANY) @CommandParameters(name = "entitywipe", description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/ [entity] [radius]", aliases = "ew,rd") -public class EntityWipeCMD extends PlexCommand { +public class EntityWipeCMD extends PlexCommand +{ @Override - protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, @NotNull String[] args) { + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, @NotNull String[] args) + { List entityBlacklist = plugin.config.getStringList("entitywipe_list"); List entityWhitelist = new LinkedList<>(Arrays.asList(args)); @@ -34,7 +36,8 @@ public class EntityWipeCMD extends PlexCommand { PlexLog.debug("using blacklist: " + useBlacklist); PlexLog.debug("radius specified: " + radiusSpecified); - if (radiusSpecified) { + if (radiusSpecified) + { radius = parseInt(sender, args[entityWhitelist.size() - 1]); // get the args length as the size of the list radius *= radius; entityWhitelist.remove(entityWhitelist.size() - 1); // remove the radius from the list @@ -46,7 +49,8 @@ public class EntityWipeCMD extends PlexCommand { entityWhitelist.removeIf(name -> { boolean res = Arrays.stream(entityTypes).noneMatch(entityType -> name.equalsIgnoreCase(entityType.name())); - if (res) { + if (res) + { sender.sendMessage(messageComponent("invalidEntityType", name)); } return res; @@ -54,15 +58,21 @@ public class EntityWipeCMD extends PlexCommand { HashMap entityCounts = new HashMap<>(); - for (World world : Bukkit.getWorlds()) { - for (Entity entity : world.getEntities()) { - if (entity.getType() != EntityType.PLAYER) { + for (World world : Bukkit.getWorlds()) + { + for (Entity entity : world.getEntities()) + { + if (entity.getType() != EntityType.PLAYER) + { String type = entity.getType().name(); - if (useBlacklist ? entityBlacklist.stream().noneMatch(entityName -> entityName.equalsIgnoreCase(type)) : entityWhitelist.stream().anyMatch(entityName -> entityName.equalsIgnoreCase(type))) { - if (radius > 0) { + if (useBlacklist ? entityBlacklist.stream().noneMatch(entityName -> entityName.equalsIgnoreCase(type)) : entityWhitelist.stream().anyMatch(entityName -> entityName.equalsIgnoreCase(type))) + { + if (radius > 0) + { PlexLog.debug("we got here, radius is > 0"); - if (playerSender != null && entity.getWorld() == playerSender.getWorld() && playerSender.getLocation().distanceSquared(entity.getLocation()) > radius) { + if (playerSender != null && entity.getWorld() == playerSender.getWorld() && playerSender.getLocation().distanceSquared(entity.getLocation()) > radius) + { PlexLog.debug("continuing"); continue; } @@ -78,10 +88,14 @@ public class EntityWipeCMD extends PlexCommand { int entityCount = entityCounts.values().stream().mapToInt(a -> a).sum(); - if (useBlacklist) { + if (useBlacklist) + { PlexUtils.broadcast(messageComponent("removedEntities", sender.getName(), entityCount)); - } else { - if (entityCount == 0) { + } + else + { + if (entityCount == 0) + { sender.sendMessage(messageComponent("noRemovedEntities")); return null; } @@ -92,11 +106,15 @@ public class EntityWipeCMD extends PlexCommand { return null; } - public @NotNull List tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException { + public @NotNull List tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException + { List entities = new ArrayList<>(); - for (World world : Bukkit.getWorlds()) { - for (Entity entity : world.getEntities()) { - if (entity.getType() != EntityType.PLAYER) { + for (World world : Bukkit.getWorlds()) + { + for (Entity entity : world.getEntities()) + { + if (entity.getType() != EntityType.PLAYER) + { entities.add(entity.getType().name()); } } @@ -104,22 +122,31 @@ public class EntityWipeCMD extends PlexCommand { return entities.stream().toList(); } - private Integer parseInt(CommandSender sender, String string) { - try { + private Integer parseInt(CommandSender sender, String string) + { + try + { return Integer.parseInt(string); - } catch (NumberFormatException ex) { + } + catch (NumberFormatException ex) + { sender.sendMessage(mmString("" + string + " is not a valid number!")); } return null; } - private boolean isNumeric(String string) { - if (string == null) { + private boolean isNumeric(String string) + { + if (string == null) + { return false; } - try { + try + { int num = Integer.parseInt(string); - } catch (NumberFormatException nfe) { + } + catch (NumberFormatException nfe) + { return false; } return true; diff --git a/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java b/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java index 3159d2d..cca36fb 100644 --- a/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java +++ b/server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java @@ -24,39 +24,49 @@ import java.util.Collections; import java.util.List; @CommandPermissions(permission = "plex.mobpurge", source = RequiredCommandSource.ANY) -@CommandParameters(name = "mobpurge", description = "Purge all mobs.", usage = "/ ", aliases = "mp") -public class MobPurgeCMD extends PlexCommand { - - public static final List MOB_TYPES = new ArrayList<>(); +@CommandParameters(name = "mobpurge", description = "Purge all mobs.", usage = "/ [mob]", aliases = "mp") +public class MobPurgeCMD extends PlexCommand +{ + private final List MOB_TYPES = new ArrayList<>(); @Override - protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, @NotNull String[] args) { + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, @NotNull String[] args) + { EntityType type = null; String mobName = null; - if (args.length > 0) { - try { + if (args.length > 0) + { + try + { type = EntityType.valueOf(args[0].toUpperCase()); - } catch (Exception e) { + } + catch (Exception e) + { PlexLog.debug("A genius tried and failed removing the following invalid mob: " + args[0].toUpperCase()); send(sender, messageComponent("notAValidMob")); return null; } - if (!MOB_TYPES.contains(type)) { + if (!MOB_TYPES.contains(type)) + { PlexLog.debug(Arrays.deepToString(MOB_TYPES.toArray())); PlexLog.debug("A genius tried to remove a mob that doesn't exist: " + args[0].toUpperCase()); sender.sendMessage(messageComponent("notAValidMobButValidEntity")); return null; } } - if (type != null) { + if (type != null) + { mobName = WordUtils.capitalizeFully(type.name().replace("_", " ")); PlexLog.debug("The args aren't null so the mob is: " + mobName); } int count = purgeMobs(type); - if (type != null) { + if (type != null) + { PlexUtils.broadcast(messageComponent("removedEntitiesOfTypes", sender.getName(), count, mobName)); PlexLog.debug("All " + count + " of " + mobName + " were removed"); - } else { + } + else + { PlexUtils.broadcast(messageComponent("removedMobs", sender.getName(), count)); PlexLog.debug("All " + count + " valid mobs were removed"); } @@ -64,18 +74,22 @@ public class MobPurgeCMD extends PlexCommand { return null; } - public static String multipleS(int count) { + private String multipleS(int count) + { return (count == 1 ? "" : "s"); } - // Removes the mobs. - - public int purgeMobs(EntityType type) { + private int purgeMobs(EntityType type) + { int removed = 0; - for (World world : Bukkit.getWorlds()) { - for (Entity entity : world.getLivingEntities()) { - if (entity instanceof LivingEntity && !(entity instanceof Player)) { - if (type != null && !entity.getType().equals(type)) { + for (World world : Bukkit.getWorlds()) + { + for (Entity entity : world.getLivingEntities()) + { + if (entity instanceof LivingEntity && !(entity instanceof Player)) + { + if (type != null && !entity.getType().equals(type)) + { continue; } entity.remove(); @@ -86,19 +100,21 @@ public class MobPurgeCMD extends PlexCommand { return removed; } - // Adds a tab completion for /mp so players stop complaining we (mostly me) nuked all their mobs because a filter for some reason was never added by the REAL plex devs. Go figure. -Alco_Rs11 - - public static List getAllMobs() { + private List getAllMobs() + { List mobs = new ArrayList<>(); Arrays.stream(EntityType.values()).filter(EntityType::isAlive).filter(EntityType::isSpawnable).forEach(MOB_TYPES::add); - for (EntityType entityType : MOB_TYPES) { + for (EntityType entityType : MOB_TYPES) + { mobs.add(entityType.name()); } return mobs; } - public @NotNull List tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException { - if (args.length == 1) { + public @NotNull List tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException + { + if (args.length == 1) + { return getAllMobs(); } return Collections.emptyList();