EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 27 Wiki Activity

Makes string list config values display their default value properly
Some checks failed
EpicKnarvik97/Stargate/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Kristian Knarvik
2022-01-26 05:09:34 +01:00
parent 404b4d0543
commit 7d41b75bac
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/knarcraft/stargate/command/CommandConfig.java
View File

@@ -3,10 +3,12 @@ package net.knarcraft.stargate.command;
import net.knarcraft.stargate.Stargate; import net.knarcraft.stargate.Stargate;
import net.knarcraft.stargate.config.ConfigOption; import net.knarcraft.stargate.config.ConfigOption;
import net.knarcraft.stargate.config.ConfigTag; import net.knarcraft.stargate.config.ConfigTag;
import net.knarcraft.stargate.config.OptionDataType;
import net.knarcraft.stargate.portal.Portal; import net.knarcraft.stargate.portal.Portal;
import net.knarcraft.stargate.portal.PortalRegistry; import net.knarcraft.stargate.portal.PortalRegistry;
import net.knarcraft.stargate.portal.PortalSignDrawer; import net.knarcraft.stargate.portal.PortalSignDrawer;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import org.apache.commons.lang.StringUtils;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -106,6 +108,11 @@ public class CommandConfig implements CommandExecutor {
Stargate.getStargateConfig().getConfigOptionsReference().put(selectedOption, value); Stargate.getStargateConfig().getConfigOptionsReference().put(selectedOption, value);
configuration.set(selectedOption.getConfigNode(), value); configuration.set(selectedOption.getConfigNode(), value);
} }
case STRING_LIST -> {
if (selectedOption == ConfigOption.PER_SIGN_COLORS) {
commandSender.sendMessage(ChatColor.RED + value);
}
}
default -> { default -> {
Stargate.getStargateConfig().getConfigOptionsReference().put(selectedOption, value); Stargate.getStargateConfig().getConfigOptionsReference().put(selectedOption, value);
configuration.set(selectedOption.getConfigNode(), value); configuration.set(selectedOption.getConfigNode(), value);
@@ -242,8 +249,13 @@ public class CommandConfig implements CommandExecutor {
* @return <p>A string describing the config option</p> * @return <p>A string describing the config option</p>
*/ */
private String getOptionDescription(ConfigOption option) { private String getOptionDescription(ConfigOption option) {
Object defaultValue = option.getDefaultValue();
String stringValue = String.valueOf(defaultValue);
if (option.getDataType() == OptionDataType.STRING_LIST) {
stringValue = "[" + StringUtils.join((String[]) defaultValue, ",") + "]";
}
return ChatColor.GOLD + option.getName() + ChatColor.WHITE + " - " + ChatColor.GREEN + option.getDescription() + return ChatColor.GOLD + option.getName() + ChatColor.WHITE + " - " + ChatColor.GREEN + option.getDescription() +
ChatColor.DARK_GRAY + " (Default: " + ChatColor.GRAY + option.getDefaultValue() + ChatColor.DARK_GRAY + ")"; ChatColor.DARK_GRAY + " (Default: " + ChatColor.GRAY + stringValue + ChatColor.DARK_GRAY + ")";
} }
} }

2
src/main/java/net/knarcraft/stargate/command/ConfigTabCompleter.java
View File

@@ -105,6 +105,8 @@ public class ConfigTabCompleter implements TabCompleter {
} }
} }
//TODO: What to do with per-sign colors?
return null; return null;
} }