Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-02 13:31:43 +01:00
Code Issues Projects Releases Wiki Activity

Modernise LookClose a little

Browse Source
This commit is contained in:
fullwall 2018-03-09 20:07:08 +08:00
parent 407430daa5
commit fc9f813f18
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/src/main/java/net/citizensnpcs/trait/LookClose.java
View File

@ -17,6 +17,7 @@ import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.command.CommandConfigurable; import net.citizensnpcs.api.command.CommandConfigurable;
import net.citizensnpcs.api.command.CommandContext; import net.citizensnpcs.api.command.CommandContext;
import net.citizensnpcs.api.exception.NPCLoadException; import net.citizensnpcs.api.exception.NPCLoadException;
import net.citizensnpcs.api.persistence.Persist;
import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.Trait;
import net.citizensnpcs.api.trait.TraitName; import net.citizensnpcs.api.trait.TraitName;
import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.api.util.DataKey;
@ -24,9 +25,11 @@ import net.citizensnpcs.util.Util;
@TraitName("lookclose") @TraitName("lookclose")
public class LookClose extends Trait implements Toggleable, CommandConfigurable { public class LookClose extends Trait implements Toggleable, CommandConfigurable {
@Persist("enabled")
private boolean enabled = Setting.DEFAULT_LOOK_CLOSE.asBoolean(); private boolean enabled = Setting.DEFAULT_LOOK_CLOSE.asBoolean();
private Player lookingAt; private Player lookingAt;
private double range = Setting.DEFAULT_LOOK_CLOSE_RANGE.asDouble(); private double range = Setting.DEFAULT_LOOK_CLOSE_RANGE.asDouble();
@Persist("realisticlooking")
private boolean realisticLooking = Setting.DEFAULT_REALISTIC_LOOKING.asBoolean(); private boolean realisticLooking = Setting.DEFAULT_REALISTIC_LOOKING.asBoolean();
public LookClose() { public LookClose() {
@ -40,8 +43,7 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
@Override @Override
public void configure(CommandContext args) { public void configure(CommandContext args) {
range = args.getFlagDouble("range", range); range = args.getFlagDouble("range", args.getFlagDouble("r", range));
range = args.getFlagDouble("r", range);
realisticLooking = args.hasFlag('r'); realisticLooking = args.hasFlag('r');
} }
@ -81,9 +83,7 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
@Override @Override
public void load(DataKey key) throws NPCLoadException { public void load(DataKey key) throws NPCLoadException {
enabled = key.getBoolean("enabled", true);
range = key.getDouble("range", range); range = key.getDouble("range", range);
realisticLooking = key.getBoolean("realisticlooking", key.getBoolean("realistic-looking"));
} }
public void lookClose(boolean lookClose) { public void lookClose(boolean lookClose) {
@ -110,9 +110,7 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
@Override @Override
public void save(DataKey key) { public void save(DataKey key) {
key.setBoolean("enabled", enabled);
key.setDouble("range", range); key.setDouble("range", range);
key.setBoolean("realisticlooking", realisticLooking);
} }
public void setRange(int range) { public void setRange(int range) {