JUFS/Tplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add CustomListMode enum

Browse Source
This commit is contained in:
ThisTestUser
2024-09-25 18:07:27 -04:00
parent 77b9915b39
commit dbfdef89ac
3 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/CustomListMode.java Normal file
View File

@@ -0,0 +1,28 @@
package net.nuggetmc.tplus.api.agent.legacyagent;
import java.util.Arrays;
import java.util.stream.Collectors;
public enum CustomListMode {
HOSTILE,
RAIDER,
MOB,
CUSTOM;
public static boolean isValid(String name) {
return from(name) != null;
}
public static CustomListMode from(String name) {
for (CustomListMode mode : values()) {
if (mode.name().equalsIgnoreCase(name)) {
return mode;
}
}
return null;
}
public static String listModes() {
return Arrays.stream(values()).map(e -> e.name().toLowerCase()).collect(Collectors.joining("|"));
}
}

10
TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java
View File

@@ -58,7 +58,7 @@ public class LegacyAgent extends Agent {
private double regionWeightZ;
public static final Set<EntityType> CUSTOM_MOB_LIST = new HashSet<>();
public static String customListMode = "custom";
public static CustomListMode customListMode = CustomListMode.CUSTOM;
public LegacyAgent(BotManager manager, Plugin plugin) {
super(manager, plugin);
@@ -1462,7 +1462,7 @@ public class LegacyAgent extends Agent {
case NEAREST_HOSTILE: {
for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) {
if ((entity instanceof Monster || (customListMode.equals("hostile") && CUSTOM_MOB_LIST.contains(entity.getType()))) && validateCloserEntity(entity, loc, result)) {
if ((entity instanceof Monster || (customListMode == CustomListMode.HOSTILE && CUSTOM_MOB_LIST.contains(entity.getType()))) && validateCloserEntity(entity, loc, result)) {
result = entity;
}
}
@@ -1473,7 +1473,7 @@ public class LegacyAgent extends Agent {
case NEAREST_RAIDER: {
for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) {
boolean raider = entity instanceof Raider || (entity instanceof Vex vex && vex.getSummoner() instanceof Raider);
if ((raider || (customListMode.equals("raider") && CUSTOM_MOB_LIST.contains(entity.getType()))) && validateCloserEntity(entity, loc, result)) {
if ((raider || (customListMode == CustomListMode.RAIDER && CUSTOM_MOB_LIST.contains(entity.getType()))) && validateCloserEntity(entity, loc, result)) {
result = entity;
}
}
@@ -1483,7 +1483,7 @@ public class LegacyAgent extends Agent {
case NEAREST_MOB: {
for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) {
if ((entity instanceof Mob || (customListMode.equals("mob") && CUSTOM_MOB_LIST.contains(entity.getType()))) && validateCloserEntity(entity, loc, result)) {
if ((entity instanceof Mob || (customListMode == CustomListMode.MOB && CUSTOM_MOB_LIST.contains(entity.getType()))) && validateCloserEntity(entity, loc, result)) {
result = entity;
}
}
@@ -1539,7 +1539,7 @@ public class LegacyAgent extends Agent {
case CUSTOM_LIST: {
for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) {
if (customListMode.equals("custom") && CUSTOM_MOB_LIST.contains(entity.getType()) && validateCloserEntity(entity, loc, result)) {
if (customListMode == CustomListMode.CUSTOM && CUSTOM_MOB_LIST.contains(entity.getType()) && validateCloserEntity(entity, loc, result)) {
result = entity;
}
}