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

Fixes reforge-able items and displaying color formatting codes

Browse Source
This commit is contained in:
Kristian Knarvik
2022-10-02 21:03:17 +02:00
parent a6e9163dbd
commit f058f4eec8
6 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,8 @@ import net.knarcraft.blacksmith.config.SettingValueType;
import net.knarcraft.blacksmith.manager.ItemType;
import net.knarcraft.blacksmith.manager.Message;
import net.knarcraft.blacksmith.util.InputParsingHelper;
import net.knarcraft.blacksmith.util.MessageFormatter;
import net.knarcraft.blacksmith.util.TypeValidationHelper;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.command.Command;
@@ -67,17 +67,20 @@ public class BlackSmithConfigCommand implements CommandExecutor {
if (args.length == 1) {
//TODO: See if there's a way to remove this duplication
String rawValue;
String correctCommandName;
if (detectedGlobalSetting != null) {
displaySuccessMessage(sender, Message.getCurrentValueMessage(detectedGlobalSetting.getCommandName(),
MessageFormatter.escapeColorCodes(String.valueOf(settings.getRawValue(detectedGlobalSetting)))));
return true;
rawValue = String.valueOf(settings.getRawValue(detectedGlobalSetting));
correctCommandName = detectedGlobalSetting.getCommandName();
} else if (detectedNPCSetting != null) {
displaySuccessMessage(sender, Message.getCurrentValueMessage(detectedNPCSetting.getCommandName(),
MessageFormatter.escapeColorCodes(String.valueOf(settings.getRawValue(detectedNPCSetting)))));
return true;
rawValue = String.valueOf(settings.getRawValue(detectedNPCSetting));
correctCommandName = detectedNPCSetting.getCommandName();
} else {
return false;
}
displaySuccessMessage(sender, Message.getCurrentValueMessage(correctCommandName, rawValue));
sender.sendMessage("Raw value: " + rawValue.replace(ChatColor.COLOR_CHAR, '&'));
return true;
} else if (args.length == 2 && isSpecialCase(commandName)) {
if (displaySpecialCaseValue(args[1], sender, detectedGlobalSetting, settings)) {
return true;

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

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