From 65ed8d4da6c46dd005479cf73026b17b85a1bbeb Mon Sep 17 00:00:00 2001 From: Evenprime Date: Sat, 18 Jun 2011 18:15:05 +0200 Subject: [PATCH] No longer replace the nice [keywords] with their e.g. ugly %3$.1f counterparts in the config file. --- .../bukkit/nocheat/checks/MovingCheck.java | 13 +++++++++++-- .../bukkit/nocheat/checks/SpeedhackCheck.java | 3 ++- .../nocheat/config/NoCheatConfiguration.java | 18 +++++------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java index 2abb9ebb..eda8ee9c 100644 --- a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java +++ b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java @@ -720,8 +720,17 @@ public class MovingCheck extends Check { waterElevators = config.getBooleanValue("moving.waterelevators"); - logMessage = config.getStringValue("moving.logmessage"); - summaryMessage = config.getStringValue("moving.summarymessage"); + logMessage = config.getStringValue("moving.logmessage"). + replace("[player]", "%1$s"). + replace("[world]", "%2$s"). + replace("[from]", "(%4$.1f, %5$.1f, %6$.1f)"). + replace("[to]", "(%7$.1f, %8$.1f, %9$.1f)"). + replace("[distance]", "(%10$.1f, %11$.1f, %12$.1f)"); + + summaryMessage = config.getStringValue("moving.summarymessage"). + replace("[timeframe]", "%2$d"). + replace("[player]", "%1$s"). + replace("[violations]", "(%3$d,%4$d,%5$d)"); actions = new Action[3][]; diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java index 100a78d2..4c2e53f9 100644 --- a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java +++ b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java @@ -172,7 +172,8 @@ public class SpeedhackCheck extends Check { limits[1] = config.getIntegerValue("speedhack.limits.med"); limits[2] = config.getIntegerValue("speedhack.limits.high"); - logMessage = config.getStringValue("speedhack.logmessage"); + logMessage = config.getStringValue("speedhack.logmessage"). + replace("[player]", "%1$s").replace("[events]", "%2$d").replace("[limit]", "%3$d"); actions = new Action[3][]; diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java index aa11d3b1..617f499b 100644 --- a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java +++ b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java @@ -62,7 +62,7 @@ public class NoCheatConfiguration { try { yamlContent = (Map) SimpleYaml.read(configurationFile); } catch (Exception e) { - e.printStackTrace(); + System.out.println("Couldn't use existing nocheat.yml, creating a new file."); yamlContent = new HashMap(); } @@ -114,8 +114,7 @@ public class NoCheatConfiguration { root.add(speedhackNode); speedhackNode.add(new LongStringOption("logmessage", speedhackNode.getFullIdentifier(), - SimpleYaml.getString("speedhack.logmessage", "[player] sent [events] move events, but only [limit] were allowed. Speedhack?", yamlContent). - replace("[player]", "%1$s").replace("[events]", "%2$d").replace("[limit]", "%3$d"))); + SimpleYaml.getString("speedhack.logmessage", "[player] sent [events] move events, but only [limit] were allowed. Speedhack?", yamlContent))); speedhackNode.add(new BooleanOption("checkops", speedhackNode.getFullIdentifier(), SimpleYaml.getBoolean("speedhack.checkops", false, yamlContent))); @@ -153,18 +152,11 @@ public class NoCheatConfiguration { root.add(movingNode); movingNode.add(new LongStringOption("logmessage", movingNode.getFullIdentifier(), - SimpleYaml.getString("moving.logmessage", "Moving violation: [player] from [world] [from] to [to] distance [distance]", yamlContent). - replace("[player]", "%1$s"). - replace("[world]", "%2$s"). - replace("[from]", "(%4$.1f, %5$.1f, %6$.1f)"). - replace("[to]", "(%7$.1f, %8$.1f, %9$.1f)"). - replace("[distance]", "(%10$.1f, %11$.1f, %12$.1f)"))); + SimpleYaml.getString("moving.logmessage", "Moving violation: [player] from [world] [from] to [to] distance [distance]", yamlContent))); movingNode.add(new LongStringOption("summarymessage", movingNode.getFullIdentifier(), - SimpleYaml.getString("moving.summarymessage", "Moving summary of last ~[timeframe] seconds: [player] total Violations: [violations]", yamlContent). - replace("[timeframe]", "%2$d"). - replace("[player]", "%1$s"). - replace("[violations]", "(%3$d,%4$d,%5$d)"))); + SimpleYaml.getString("moving.summarymessage", "Moving summary of last ~[timeframe] seconds: [player] total Violations: [violations]", yamlContent))); + movingNode.add(new BooleanOption("allowflying", movingNode.getFullIdentifier(), SimpleYaml.getBoolean("moving.allowflying", false, yamlContent))); movingNode.add(new BooleanOption("allowfakesneak", movingNode.getFullIdentifier(),