Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-05 10:20:11 +01:00
Code Issues Projects Releases Wiki Activity

Simplify navigator interface

Browse Source
This commit is contained in:
fullwall 2022-07-28 15:36:16 +08:00
parent 7b3c0c8126
commit e9d197eab0
1 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
View File

@ -251,7 +251,7 @@ public class CitizensNavigator implements Navigator, Runnable {
@Override @Override
public void setTarget(Entity target, boolean aggressive) { public void setTarget(Entity target, boolean aggressive) {
setTarget(target, aggressive, new Function<NavigatorParameters, PathStrategy>() { setTarget(new Function<NavigatorParameters, PathStrategy>() {
@Override @Override
public PathStrategy apply(NavigatorParameters params) { public PathStrategy apply(NavigatorParameters params) {
return new MCTargetStrategy(npc, target, aggressive, params); return new MCTargetStrategy(npc, target, aggressive, params);
@ -260,13 +260,9 @@ public class CitizensNavigator implements Navigator, Runnable {
} }
@Override @Override
public void setTarget(Entity target, boolean aggressive, Function<NavigatorParameters, PathStrategy> strategy) { public void setTarget(Function<NavigatorParameters, PathStrategy> strategy) {
if (!npc.isSpawned()) if (!npc.isSpawned())
throw new IllegalStateException("npc is not spawned"); throw new IllegalStateException("npc is not spawned");
if (target == null) {
cancelNavigation();
return;
}
switchParams(); switchParams();
switchStrategyTo(strategy.apply(localParams)); switchStrategyTo(strategy.apply(localParams));
} }
@ -275,7 +271,11 @@ public class CitizensNavigator implements Navigator, Runnable {
public void setTarget(Iterable<Vector> path) { public void setTarget(Iterable<Vector> path) {
if (!npc.isSpawned()) if (!npc.isSpawned())
throw new IllegalStateException("npc is not spawned"); throw new IllegalStateException("npc is not spawned");
setTarget(path, new Function<NavigatorParameters, PathStrategy>() { if (Iterables.size(path) == 0) {
cancelNavigation();
return;
}
setTarget(new Function<NavigatorParameters, PathStrategy>() {
@Override @Override
public PathStrategy apply(NavigatorParameters params) { public PathStrategy apply(NavigatorParameters params) {
if (npc.isFlyable()) { if (npc.isFlyable()) {
@ -290,24 +290,12 @@ public class CitizensNavigator implements Navigator, Runnable {
}); });
} }
@Override
public void setTarget(Iterable<Vector> path, Function<NavigatorParameters, PathStrategy> strategy) {
if (!npc.isSpawned())
throw new IllegalStateException("npc is not spawned");
if (path == null || Iterables.size(path) == 0) {
cancelNavigation();
return;
}
switchParams();
switchStrategyTo(strategy.apply(localParams));
}
@Override @Override
public void setTarget(Location targetIn) { public void setTarget(Location targetIn) {
if (!npc.isSpawned()) if (!npc.isSpawned())
throw new IllegalStateException("npc is not spawned"); throw new IllegalStateException("npc is not spawned");
final Location target = targetIn.clone(); final Location target = targetIn.clone();
setTarget(target, new Function<NavigatorParameters, PathStrategy>() { setTarget(new Function<NavigatorParameters, PathStrategy>() {
@Override @Override
public PathStrategy apply(NavigatorParameters params) { public PathStrategy apply(NavigatorParameters params) {
if (npc.isFlyable()) { if (npc.isFlyable()) {
@ -322,19 +310,6 @@ public class CitizensNavigator implements Navigator, Runnable {
}); });
} }
@Override
public void setTarget(Location target, Function<NavigatorParameters, PathStrategy> strategy) {
if (!npc.isSpawned())
throw new IllegalStateException("npc is not spawned");
if (target == null) {
cancelNavigation();
return;
}
target = target.clone();
switchParams();
switchStrategyTo(strategy.apply(localParams));
}
private void stopNavigating() { private void stopNavigating() {
if (executing != null) { if (executing != null) {
executing.stop(); executing.stop();
@ -504,5 +479,6 @@ public class CitizensNavigator implements Navigator, Runnable {
private static final Location STATIONARY_LOCATION = new Location(null, 0, 0, 0); private static final Location STATIONARY_LOCATION = new Location(null, 0, 0, 0);
private static boolean SUPPORT_CHUNK_TICKETS = true; private static boolean SUPPORT_CHUNK_TICKETS = true;
private static int UNINITIALISED_SPEED = Integer.MIN_VALUE; private static int UNINITIALISED_SPEED = Integer.MIN_VALUE;
} }