Plexus
/
Plex
mirror of https://github.com/plexusorg/Plex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed /mp and it now has the ability to purge one or all mobs + tab completion. (#79) 

* Added a tab completion to /mp because our genius Plex devs forgot to. Its shitty but works lmao

* Rewrote /mp to actually work with or without args so now specific or all mobs can be purged, instead of just all mobs being purged. Why the REAL plex developers didn't include this (yet they did for /rd) defies any sort of logic.

* Tweaked the command a bit. It works as it should now.

* Tweaked the command a bit. It works as it should now.
This commit is contained in:
Alco_Rs11 2024-01-19 23:29:00 -05:00 committed by GitHub
parent f34df4f296
commit b168029df1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 106 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java
View File

@ -20,11 +20,9 @@ import java.util.*;
@CommandPermissions(permission = "plex.entitywipe", source = RequiredCommandSource.ANY) @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 = "/<command> [entity] [radius]", aliases = "ew,rd") @CommandParameters(name = "entitywipe", description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command> [entity] [radius]", aliases = "ew,rd")
public class EntityWipeCMD extends PlexCommand public class EntityWipeCMD extends PlexCommand {
{
@Override @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<String> entityBlacklist = plugin.config.getStringList("entitywipe_list"); List<String> entityBlacklist = plugin.config.getStringList("entitywipe_list");
List<String> entityWhitelist = new LinkedList<>(Arrays.asList(args)); List<String> entityWhitelist = new LinkedList<>(Arrays.asList(args));
@ -36,8 +34,7 @@ public class EntityWipeCMD extends PlexCommand
PlexLog.debug("using blacklist: " + useBlacklist); PlexLog.debug("using blacklist: " + useBlacklist);
PlexLog.debug("radius specified: " + radiusSpecified); 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 = parseInt(sender, args[entityWhitelist.size() - 1]); // get the args length as the size of the list
radius *= radius; radius *= radius;
entityWhitelist.remove(entityWhitelist.size() - 1); // remove the radius from the list entityWhitelist.remove(entityWhitelist.size() - 1); // remove the radius from the list
@ -49,8 +46,7 @@ public class EntityWipeCMD extends PlexCommand
entityWhitelist.removeIf(name -> entityWhitelist.removeIf(name ->
{ {
boolean res = Arrays.stream(entityTypes).noneMatch(entityType -> name.equalsIgnoreCase(entityType.name())); boolean res = Arrays.stream(entityTypes).noneMatch(entityType -> name.equalsIgnoreCase(entityType.name()));
if (res) if (res) {
{
sender.sendMessage(messageComponent("invalidEntityType", name)); sender.sendMessage(messageComponent("invalidEntityType", name));
} }
return res; return res;
@ -58,21 +54,15 @@ public class EntityWipeCMD extends PlexCommand
HashMap<String, Integer> entityCounts = new HashMap<>(); HashMap<String, Integer> entityCounts = new HashMap<>();
for (World world : Bukkit.getWorlds()) for (World world : Bukkit.getWorlds()) {
{ for (Entity entity : world.getEntities()) {
for (Entity entity : world.getEntities()) if (entity.getType() != EntityType.PLAYER) {
{
if (entity.getType() != EntityType.PLAYER)
{
String type = entity.getType().name(); String type = entity.getType().name();
if (useBlacklist ? entityBlacklist.stream().noneMatch(entityName -> entityName.equalsIgnoreCase(type)) : entityWhitelist.stream().anyMatch(entityName -> entityName.equalsIgnoreCase(type))) if (useBlacklist ? entityBlacklist.stream().noneMatch(entityName -> entityName.equalsIgnoreCase(type)) : entityWhitelist.stream().anyMatch(entityName -> entityName.equalsIgnoreCase(type))) {
{ if (radius > 0) {
if (radius > 0)
{
PlexLog.debug("we got here, radius is > 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"); PlexLog.debug("continuing");
continue; continue;
} }
@ -88,14 +78,10 @@ public class EntityWipeCMD extends PlexCommand
int entityCount = entityCounts.values().stream().mapToInt(a -> a).sum(); int entityCount = entityCounts.values().stream().mapToInt(a -> a).sum();
if (useBlacklist) if (useBlacklist) {
{
PlexUtils.broadcast(messageComponent("removedEntities", sender.getName(), entityCount)); PlexUtils.broadcast(messageComponent("removedEntities", sender.getName(), entityCount));
} } else {
else if (entityCount == 0) {
{
if (entityCount == 0)
{
sender.sendMessage(messageComponent("noRemovedEntities")); sender.sendMessage(messageComponent("noRemovedEntities"));
return null; return null;
} }
@ -106,15 +92,11 @@ public class EntityWipeCMD extends PlexCommand
return null; return null;
} }
public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
{
List<String> entities = new ArrayList<>(); List<String> entities = new ArrayList<>();
for (World world : Bukkit.getWorlds()) for (World world : Bukkit.getWorlds()) {
{ for (Entity entity : world.getEntities()) {
for (Entity entity : world.getEntities()) if (entity.getType() != EntityType.PLAYER) {
{
if (entity.getType() != EntityType.PLAYER)
{
entities.add(entity.getType().name()); entities.add(entity.getType().name());
} }
} }
@ -122,31 +104,22 @@ public class EntityWipeCMD extends PlexCommand
return entities.stream().toList(); return entities.stream().toList();
} }
private Integer parseInt(CommandSender sender, String string) private Integer parseInt(CommandSender sender, String string) {
{ try {
try
{
return Integer.parseInt(string); return Integer.parseInt(string);
} } catch (NumberFormatException ex) {
catch (NumberFormatException ex)
{
sender.sendMessage(mmString("<red>" + string + "<red> is not a valid number!")); sender.sendMessage(mmString("<red>" + string + "<red> is not a valid number!"));
} }
return null; return null;
} }
private boolean isNumeric(String string) private boolean isNumeric(String string) {
{ if (string == null) {
if (string == null)
{
return false; return false;
} }
try try {
{
int num = Integer.parseInt(string); int num = Integer.parseInt(string);
} } catch (NumberFormatException nfe) {
catch (NumberFormatException nfe)
{
return false; return false;
} }
return true; return true;

101
server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java
View File

@ -4,50 +4,103 @@ import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.source.RequiredCommandSource; import dev.plex.command.source.RequiredCommandSource;
import dev.plex.util.PlexLog;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.apache.commons.lang3.text.WordUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Mob; import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.HashMap; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@CommandPermissions(permission = "plex.mobpurge", source = RequiredCommandSource.ANY) @CommandPermissions(permission = "plex.mobpurge", source = RequiredCommandSource.ANY)
@CommandParameters(name = "mobpurge", description = "Purge all mobs.", usage = "/<command>", aliases = "mp") @CommandParameters(name = "mobpurge", description = "Purge all mobs.", usage = "/<command> <mob>", aliases = "mp")
public class MobPurgeCMD extends PlexCommand public class MobPurgeCMD extends PlexCommand {
{
public static final List<EntityType> MOB_TYPES = new ArrayList<>();
@Override @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;
HashMap<String, Integer> entityCounts = new HashMap<>(); String mobName = null;
if (args.length > 0) {
try {
type = EntityType.valueOf(args[0].toUpperCase());
} 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)) {
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) {
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) {
PlexUtils.broadcast(messageComponent("removedEntitiesOfTypes", sender.getName(), count, mobName));
PlexLog.debug("All " + count + " of " + mobName + " were removed");
} else {
PlexUtils.broadcast(messageComponent("removedMobs", sender.getName(), count));
PlexLog.debug("All " + count + " valid mobs were removed");
}
sender.sendMessage(messageComponent("amountOfMobsRemoved", count, (type != null ? mobName : "mob") + multipleS(count)));
return null;
}
for (World world : Bukkit.getWorlds()) public static String multipleS(int count) {
{ return (count == 1 ? "" : "s");
for (Entity entity : world.getEntities()) }
{
if (entity instanceof Mob) // Removes the mobs.
{
String type = entity.getType().name(); public 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)) {
continue;
}
entity.remove(); entity.remove();
removed++;
entityCounts.put(type, entityCounts.getOrDefault(type, 0) + 1);
} }
} }
} }
return removed;
}
int entityCount = entityCounts.values().stream().mapToInt(a -> a).sum(); // 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
PlexUtils.broadcast(messageComponent("removedMobs", sender.getName(), entityCount)); public static List<String> getAllMobs() {
List<String> mobs = new ArrayList<>();
Arrays.stream(EntityType.values()).filter(EntityType::isAlive).filter(EntityType::isSpawnable).forEach(MOB_TYPES::add);
for (EntityType entityType : MOB_TYPES) {
mobs.add(entityType.name());
}
return mobs;
}
/*entityCounts.forEach((entityName, numRemoved) -> { public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
sender.sendMessage(messageComponent("removedEntitiesOfType", sender.getName(), numRemoved, entityName)); if (args.length == 1) {
});*/ return getAllMobs();
return null; }
return Collections.emptyList();
} }
} }

5
server/src/main/resources/messages.yml
View File

@ -160,6 +160,11 @@ removedEntitiesOfType: "<gray>Removed {1} {2}"
# 0 - Entity type that is invalid # 0 - Entity type that is invalid
invalidEntityType: "<gray>Notice: Entity type {0} is invalid!" invalidEntityType: "<gray>Notice: Entity type {0} is invalid!"
noRemovedEntities: "<gray>No entities were removed." noRemovedEntities: "<gray>No entities were removed."
# 0 - Number of mobs removed
# 1 - Type of mob removed
amountOfMobsRemoved: "<gray>{0} {1} removed."
notAValidMob: "<red>That is not a valid mob."
notAValidMobButValidEntity: "<red>That is a valid entity, but is not a valid mob."
# 0 - The command sender # 0 - The command sender
# 1 - Number of mobs removed # 1 - Number of mobs removed
removedMobs: "<red>{0} - Removed {1} mobs" removedMobs: "<red>{0} - Removed {1} mobs"