EpicKnarvik97/Blacksmith
1
0
Fork 0
Code Issues Pull Requests Projects Releases 8 Wiki Activity

Restricts raw value output to messages

Browse Source
This commit is contained in:
Kristian Knarvik
2022-10-03 12:15:18 +02:00
parent 7bf9e062a2
commit 9ffd788e29
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/knarcraft/blacksmith/command/BlackSmithConfigCommand.java
View File

@@ -69,17 +69,23 @@ public class BlackSmithConfigCommand implements CommandExecutor {
//TODO: See if there's a way to remove this duplication //TODO: See if there's a way to remove this duplication
String rawValue; String rawValue;
String correctCommandName; String correctCommandName;
boolean printRawValue = false;
if (detectedGlobalSetting != null) { if (detectedGlobalSetting != null) {
rawValue = String.valueOf(settings.getRawValue(detectedGlobalSetting)); rawValue = String.valueOf(settings.getRawValue(detectedGlobalSetting));
correctCommandName = detectedGlobalSetting.getCommandName(); correctCommandName = detectedGlobalSetting.getCommandName();
} else if (detectedNPCSetting != null) { } else if (detectedNPCSetting != null) {
rawValue = String.valueOf(settings.getRawValue(detectedNPCSetting)); rawValue = String.valueOf(settings.getRawValue(detectedNPCSetting));
correctCommandName = detectedNPCSetting.getCommandName(); correctCommandName = detectedNPCSetting.getCommandName();
if (detectedNPCSetting.getPath().startsWith("defaults.messages")) {
printRawValue = true;
}
} else { } else {
return false; return false;
} }
displaySuccessMessage(sender, Message.getCurrentValueMessage(correctCommandName, rawValue)); displaySuccessMessage(sender, Message.getCurrentValueMessage(correctCommandName, rawValue));
if (printRawValue) {
sender.sendMessage("Raw value: " + rawValue.replace(ChatColor.COLOR_CHAR, '&')); sender.sendMessage("Raw value: " + rawValue.replace(ChatColor.COLOR_CHAR, '&'));
}
return true; return true;
} else if (args.length == 2 && isSpecialCase(commandName)) { } else if (args.length == 2 && isSpecialCase(commandName)) {
if (displaySpecialCaseValue(args[1], sender, detectedGlobalSetting, settings)) { if (displaySpecialCaseValue(args[1], sender, detectedGlobalSetting, settings)) {

2
src/main/java/net/knarcraft/blacksmith/command/BlackSmithEditCommand.java
View File

@@ -60,7 +60,9 @@ public class BlackSmithEditCommand implements CommandExecutor {
//Display the current value of the setting //Display the current value of the setting
String rawValue = String.valueOf(blacksmithTrait.getSettings().getRawValue(npcSetting)); String rawValue = String.valueOf(blacksmithTrait.getSettings().getRawValue(npcSetting));
displaySuccessMessage(sender, Message.getCurrentValueMessage(npcSetting.getCommandName(), rawValue)); displaySuccessMessage(sender, Message.getCurrentValueMessage(npcSetting.getCommandName(), rawValue));
if (npcSetting.getPath().startsWith("defaults.messages")) {
sender.sendMessage("Raw value: " + rawValue.replace(ChatColor.COLOR_CHAR, '&')); sender.sendMessage("Raw value: " + rawValue.replace(ChatColor.COLOR_CHAR, '&'));
}
return true; return true;
} else { } else {
boolean isValidType = TypeValidationHelper.isValid(npcSetting.getValueType(), newValue, sender); boolean isValidType = TypeValidationHelper.isValid(npcSetting.getValueType(), newValue, sender);