From 7421e566705aca76ecdbbb235813ec7f9defb075 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sat, 10 Jul 2021 18:03:40 -0300 Subject: [PATCH] customized failed rules behaviour --- src/main/java/carpet/settings/ParsedRule.java | 2 +- src/main/java/carpet/settings/Validator.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/carpet/settings/ParsedRule.java b/src/main/java/carpet/settings/ParsedRule.java index ceec2686..7ec3bff6 100644 --- a/src/main/java/carpet/settings/ParsedRule.java +++ b/src/main/java/carpet/settings/ParsedRule.java @@ -163,7 +163,7 @@ public final class ParsedRule implements Comparable { { if (source != null) { - Messenger.m(source, "r Wrong value for " + name + ": " + stringValue); + validator.notifyFailure(source, this, stringValue); if (validator.description() != null) Messenger.m(source, "r " + validator.description()); } diff --git a/src/main/java/carpet/settings/Validator.java b/src/main/java/carpet/settings/Validator.java index 3afa6dd4..951af824 100644 --- a/src/main/java/carpet/settings/Validator.java +++ b/src/main/java/carpet/settings/Validator.java @@ -16,6 +16,10 @@ public abstract class Validator */ public abstract T validate(ServerCommandSource source, ParsedRule currentRule, T newValue, String string); public String description() {return null;} + public void notifyFailure(ServerCommandSource source, ParsedRule currentRule, String providedValue) + { + Messenger.m(source, "r Wrong value for " + currentRule.name + ": " + providedValue); + } public static class _COMMAND extends Validator {