Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-04 07:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Implement pathfinding range methods in Navigator, make default range setting of 25F

Browse Source
This commit is contained in:
fullwall 2012-07-28 11:04:32 +08:00
parent bb812f699e
commit 585de19c25
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/citizensnpcs/Settings.java
View File

@ -52,6 +52,7 @@ public class Settings {
DATABASE_USERNAME("storage.database.username", ""),
DEBUG_MODE("general.debug-mode", false),
DEFAULT_LOOK_CLOSE("npc.default.look-close", false),
DEFAULT_PATHFINDING_RANGE("npc.pathing.default-pathfinding-range", 25F),
DEFAULT_RANDOM_TALKER("npc.default.random-talker", true),
DEFAULT_TALK_CLOSE("npc.default.talk-close", false),
DEFAULT_TEXT("npc.default.text.0", "Hi, I'm <npc>!") {
@ -90,6 +91,10 @@ public class Settings {
return (Double) value;
}
public float asFloat() {
return (Float) value;
}
public int asInt() {
return Integer.parseInt(value.toString());
}

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

@ -3,6 +3,7 @@ package net.citizensnpcs.npc.ai;
import java.lang.reflect.Field;
import java.util.Map;
import net.citizensnpcs.Settings.Setting;
import net.citizensnpcs.api.ai.EntityTarget;
import net.citizensnpcs.api.ai.Navigator;
import net.citizensnpcs.api.ai.TargetType;
@ -10,7 +11,9 @@ import net.citizensnpcs.api.ai.event.NavigationBeginEvent;
import net.citizensnpcs.api.ai.event.NavigationCancelEvent;
import net.citizensnpcs.api.ai.event.NavigationReplaceEvent;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.util.Messaging;
import net.minecraft.server.EntityLiving;
import net.minecraft.server.Navigation;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@ -22,6 +25,7 @@ import com.google.common.collect.Maps;
public class CitizensNavigator implements Navigator {
private PathStrategy executing;
private final CitizensNPC npc;
private float pathfindingRange = Setting.DEFAULT_PATHFINDING_RANGE.asFloat();
private float speed = -1;
public CitizensNavigator(CitizensNPC npc) {
@ -41,6 +45,11 @@ public class CitizensNavigator implements Navigator {
return executing instanceof EntityTarget ? (EntityTarget) executing : null;
}
@Override
public float getPathfindingRange() {
return pathfindingRange;
}
@Override
public float getSpeed() {
return speed;
@ -83,6 +92,12 @@ public class CitizensNavigator implements Navigator {
public void onSpawn() {
if (speed == -1)
this.speed = getSpeedFor(npc.getHandle());
updatePathfindingRange();
}
@Override
public void setPathfindingRange(float newRange) {
pathfindingRange = newRange;
}
@Override
@ -123,8 +138,21 @@ public class CitizensNavigator implements Navigator {
}
}
private void updatePathfindingRange() {
if (PATHFINDING_RANGE == null)
return;
Navigation navigation = npc.getHandle().al();
try {
PATHFINDING_RANGE.set(navigation, pathfindingRange);
} catch (Exception ex) {
Messaging.logF("Could not update pathfinding range: %s.", ex.getMessage());
}
}
private static final float DEFAULT_SPEED = 0.7F;
private static final Map<EntityType, Float> MOVEMENT_SPEEDS = Maps.newEnumMap(EntityType.class);
private static Field PATHFINDING_RANGE;
private static Field SPEED_FIELD;
static {
MOVEMENT_SPEEDS.put(EntityType.IRON_GOLEM, 0.15F);
@ -139,8 +167,12 @@ public class CitizensNavigator implements Navigator {
try {
SPEED_FIELD = EntityLiving.class.getDeclaredField("bb");
SPEED_FIELD.setAccessible(true);
PATHFINDING_RANGE = Navigation.class.getDeclaredField("e");
PATHFINDING_RANGE.setAccessible(true);
} catch (Exception ex) {
ex.printStackTrace();
PATHFINDING_RANGE = null;
SPEED_FIELD = null;
}
}
}