Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-27 11:38:03 +01:00
Code Issues Projects Releases Wiki Activity

Added support for player name only

Browse Source
This commit is contained in:
themode 2021-01-09 03:31:24 +01:00
parent d0bf6d9f0d
commit 9aaecceb01
3 changed files with 60 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentEntity.java
View File

@ -22,8 +22,6 @@ import java.util.List;
*/
public class ArgumentEntity extends Argument<EntityFinder> {
private static final int SUCCESS = 0;
public static final int INVALID_SYNTAX = -2;
public static final int ONLY_SINGLE_ENTITY_ERROR = -3;
public static final int ONLY_PLAYERS_ERROR = -4;
@ -69,7 +67,9 @@ public class ArgumentEntity extends Argument<EntityFinder> {
// Check for raw player name
if (input.length() <= 16) {
if (CONNECTION_MANAGER.getPlayer(input) != null) {
// TODO success
return new EntityFinder()
.setTargetSelector(EntityFinder.TargetSelector.ALL_PLAYERS)
.setName(input, EntityFinder.ToggleableType.INCLUDE);
}
}

77
src/main/java/net/minestom/server/utils/entity/EntityFinder.java
View File

@ -30,12 +30,13 @@ public class EntityFinder {
// Position
private Position startPosition = new Position();
private OptionalDouble dx, dy, dz;
private Float dx, dy, dz;
private IntRange distance;
// By traits
private OptionalInt limit;
private Integer limit;
private final ToggleableMap<EntityType> entityTypes = new ToggleableMap<>();
private final ToggleableMap<String> names = new ToggleableMap<>();
// Players specific
private final ToggleableMap<GameMode> gameModes = new ToggleableMap<>();
@ -62,7 +63,7 @@ public class EntityFinder {
}
public EntityFinder setLimit(int limit) {
this.limit = OptionalInt.of(limit);
this.limit = limit;
return this;
}
@ -76,15 +77,20 @@ public class EntityFinder {
return this;
}
public EntityFinder setName(@NotNull String name, @NotNull ToggleableType toggleableType) {
this.names.put(name, toggleableType.getValue());
return this;
}
public EntityFinder setGameMode(@NotNull GameMode gameMode, @NotNull ToggleableType toggleableType) {
this.gameModes.put(gameMode, toggleableType.getValue());
return this;
}
public EntityFinder setDifference(double dx, double dy, double dz) {
this.dx = OptionalDouble.of(dx);
this.dy = OptionalDouble.of(dy);
this.dz = OptionalDouble.of(dz);
public EntityFinder setDifference(float dx, float dy, float dz) {
this.dx = dx;
this.dy = dy;
this.dz = dz;
return this;
}
@ -112,22 +118,22 @@ public class EntityFinder {
}
// Diff X/Y/Z
if (dx.isPresent() || dy.isPresent() || dz.isPresent()) {
if (dx != null || dy != null || dz != null) {
result = result.stream().filter(entity -> {
final Position entityPosition = entity.getPosition();
if (dx.isPresent() && !MathUtils.isBetweenUnordered(
if (dx != null && !MathUtils.isBetweenUnordered(
entityPosition.getX(),
startPosition.getX(), (float) dx.getAsDouble()))
startPosition.getX(), dx))
return false;
if (dy.isPresent() && !MathUtils.isBetweenUnordered(
if (dy != null && !MathUtils.isBetweenUnordered(
entityPosition.getY(),
startPosition.getY(), (float) dy.getAsDouble()))
startPosition.getY(), dy))
return false;
if (dz.isPresent() && !MathUtils.isBetweenUnordered(
if (dz != null && !MathUtils.isBetweenUnordered(
entityPosition.getZ(),
startPosition.getZ(), (float) dz.getAsDouble()))
startPosition.getZ(), dz))
return false;
return true;
@ -136,14 +142,9 @@ public class EntityFinder {
// Entity type
if (!entityTypes.isEmpty()) {
final EntityType requirement = entityTypes.requirement;
result = result.stream().filter(entity -> {
final EntityType entityType = entity.getEntityType();
// true if the entity type has not been mentioned or if is accepted
return (!entityTypes.containsKey(entityType) && requirement == null) ||
Objects.equals(requirement, entityType) ||
entityTypes.getBoolean(entityType);
}).collect(Collectors.toList());
result = result.stream().filter(entity ->
filterToggleableMap(entity, entity.getEntityType(), entityTypes))
.collect(Collectors.toList());
}
// GameMode
@ -152,12 +153,7 @@ public class EntityFinder {
result = result.stream().filter(entity -> {
if (!(entity instanceof Player))
return false;
final GameMode gameMode = ((Player) entity).getGameMode();
// true if the entity type has not been mentioned or if is accepted
return (!gameModes.containsKey(gameMode) && requirement == null) ||
Objects.equals(requirement, gameMode) ||
gameModes.getBoolean(gameMode);
return filterToggleableMap(entity, ((Player) entity).getGameMode(), gameModes);
}).collect(Collectors.toList());
}
@ -174,9 +170,19 @@ public class EntityFinder {
}).collect(Collectors.toList());
}
// Name
if (!names.isEmpty()) {
// TODO entity name
result = result.stream().filter(entity -> {
if (!(entity instanceof Player))
return false;
return filterToggleableMap(entity, ((Player) entity).getUsername(), names);
}).collect(Collectors.toList());
}
// Sort & limit
if (entitySort != EntitySort.ARBITRARY || limit.isPresent()) {
if (entitySort != EntitySort.ARBITRARY || limit != null) {
result = result.stream()
.sorted((ent1, ent2) -> {
switch (entitySort) {
@ -195,7 +201,7 @@ public class EntityFinder {
}
return 1;
})
.limit(limit.isPresent() ? limit.getAsInt() : Integer.MAX_VALUE)
.limit(limit != null ? limit : Integer.MAX_VALUE)
.collect(Collectors.toList());
if (entitySort == EntitySort.RANDOM) {
@ -267,4 +273,15 @@ public class EntityFinder {
}
throw new IllegalStateException("Weird thing happened");
}
private static <T> boolean filterToggleableMap(@NotNull Entity entity, @NotNull T value, @NotNull ToggleableMap<T> map) {
if (!(entity instanceof Player))
return false;
final T requirement = map.requirement;
// true if the entity type has not been mentioned or if is accepted
return (!map.containsKey(value) && requirement == null) ||
Objects.equals(requirement, value) ||
map.getBoolean(value);
}
}

17
src/test/java/demo/commands/EntitySelectorCommand.java
View File

@ -3,10 +3,13 @@ package demo.commands;
import net.minestom.server.command.CommandSender;
import net.minestom.server.command.builder.Arguments;
import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.arguments.Argument;
import net.minestom.server.command.builder.arguments.ArgumentType;
import net.minestom.server.command.builder.arguments.minecraft.ArgumentEntity;
import net.minestom.server.utils.entity.EntityFinder;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.Player;
import net.minestom.server.instance.Instance;
import java.util.List;
public class EntitySelectorCommand extends Command {
@ -15,17 +18,17 @@ public class EntitySelectorCommand extends Command {
setDefaultExecutor((sender, args) -> System.out.println("DEFAULT"));
Argument test = ArgumentType.String("test");
ArgumentEntity argumentEntity = ArgumentType.Entities("entities");
ArgumentEntity argumentEntity = ArgumentType.Entities("entities").onlyPlayers(true);
setArgumentCallback((sender, exception) -> exception.printStackTrace(), argumentEntity);
addSyntax(this::executor, test);
addSyntax(this::executor, argumentEntity);
}
private void executor(CommandSender commandSender, Arguments arguments) {
System.out.println("test "+arguments.getString("test"));
Instance instance = commandSender.asPlayer().getInstance();
List<Entity> entities = arguments.getEntities("entities").find(instance, null);
System.out.println("test " + ((Player) entities.get(0)).getUsername());
}
}