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

Removes nodeName and uses commandName instead

Browse Source
This commit is contained in:
Kristian Knarvik 2022-10-18 11:56:54 +02:00
parent 154c17b2c6
commit 8326da5425
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import java.util.Arrays;
import static net.knarcraft.blacksmith.formatting.StringFormatter.displayErrorMessage; import static net.knarcraft.blacksmith.formatting.StringFormatter.displayErrorMessage;
import static net.knarcraft.blacksmith.formatting.StringFormatter.displaySuccessMessage; import static net.knarcraft.blacksmith.formatting.StringFormatter.displaySuccessMessage;
import static net.knarcraft.blacksmith.formatting.TranslatableMessage.getValueChangedMessage;
/** /**
* The command used for changing global configuration options * The command used for changing global configuration options
@ -98,7 +99,7 @@ public class BlackSmithConfigCommand implements CommandExecutor {
String newValue = args[1]; String newValue = args[1];
if (detectedGlobalSetting != null) { if (detectedGlobalSetting != null) {
settings.changeValue(detectedGlobalSetting, newValue); settings.changeValue(detectedGlobalSetting, newValue);
displaySuccessMessage(sender, TranslatableMessage.getValueChangedMessage(detectedGlobalSetting.getCommandName(), newValue)); displaySuccessMessage(sender, getValueChangedMessage(detectedGlobalSetting.getCommandName(), newValue));
return true; return true;
} else if (detectedNPCSetting != null) { } else if (detectedNPCSetting != null) {
//This makes sure all arguments are treated as a sentence //This makes sure all arguments are treated as a sentence
@ -106,7 +107,7 @@ public class BlackSmithConfigCommand implements CommandExecutor {
newValue = String.join(" ", Arrays.asList(args).subList(1, args.length)); newValue = String.join(" ", Arrays.asList(args).subList(1, args.length));
} }
settings.changeValue(detectedNPCSetting, newValue); settings.changeValue(detectedNPCSetting, newValue);
displaySuccessMessage(sender, TranslatableMessage.getValueChangedMessage(detectedNPCSetting.getNodeName(), newValue)); displaySuccessMessage(sender, getValueChangedMessage(detectedNPCSetting.getCommandName(), newValue));
return true; return true;
} else { } else {
return false; return false;

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

@ -85,7 +85,7 @@ public class BlackSmithEditCommand implements CommandExecutor {
//Change the setting //Change the setting
blacksmithTrait.getSettings().changeSetting(npcSetting, newValue); blacksmithTrait.getSettings().changeSetting(npcSetting, newValue);
displaySuccessMessage(sender, getValueChangedMessage(npcSetting.getNodeName(), String.valueOf(newValue))); displaySuccessMessage(sender, getValueChangedMessage(npcSetting.getCommandName(), String.valueOf(newValue)));
//Save the changes immediately to prevent data loss on server crash //Save the changes immediately to prevent data loss on server crash
CitizensAPI.getNPCRegistry().saveToStore(); CitizensAPI.getNPCRegistry().saveToStore();
} }

16
src/main/java/net/knarcraft/blacksmith/config/NPCSetting.java
View File

@ -131,7 +131,6 @@ public enum NPCSetting {
private final String childPath; private final String childPath;
private final Object value; private final Object value;
private final String commandName; private final String commandName;
private final String nodeName;
private final SettingValueType valueType; private final SettingValueType valueType;
/** /**
@ -146,14 +145,8 @@ public enum NPCSetting {
this.path = "defaults." + path; this.path = "defaults." + path;
this.value = value; this.value = value;
this.valueType = valueType; this.valueType = valueType;
String[] pathParts = path.split("\\.");
this.childPath = path; this.childPath = path;
this.commandName = commandName; this.commandName = commandName;
if (pathParts.length > 0) {
this.nodeName = pathParts[pathParts.length - 1];
} else {
this.nodeName = "";
}
} }
/** /**
@ -192,15 +185,6 @@ public enum NPCSetting {
return commandName; return commandName;
} }
/**
* Gets the name of this configuration node
*
* @return <p>The name of this configuration node</p>
*/
public String getNodeName() {
return nodeName;
}
/** /**
* Gets the value type for this setting * Gets the value type for this setting
* *