Adds a preset command which can be used to see available presets Adds preset filters which can be used to specify item sub-categories within a preset Removes SWORD_SMITH and RANGED_SMITH, as those are replaced by the RANGED and SWORD filters Adds a list of usable filters for each preset
This commit is contained in:
@@ -7,7 +7,6 @@ import net.knarcraft.blacksmith.config.NPCSetting;
|
||||
import net.knarcraft.blacksmith.config.SettingValueType;
|
||||
import net.knarcraft.blacksmith.formatting.ItemType;
|
||||
import net.knarcraft.blacksmith.formatting.TranslatableMessage;
|
||||
import net.knarcraft.blacksmith.formatting.Translator;
|
||||
import net.knarcraft.blacksmith.util.InputParsingHelper;
|
||||
import net.knarcraft.blacksmith.util.TypeValidationHelper;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
@@ -44,8 +43,7 @@ public class BlackSmithConfigCommand implements CommandExecutor {
|
||||
|
||||
//Changing reforge-able items' default isn't recommended
|
||||
if (commandName.equalsIgnoreCase(NPCSetting.REFORGE_ABLE_ITEMS.getCommandName())) {
|
||||
displayErrorMessage(sender,
|
||||
Translator.getTranslatedMessage(TranslatableMessage.DEFAULT_REFORGE_ABLE_ITEMS_UNCHANGEABLE));
|
||||
displayErrorMessage(sender, TranslatableMessage.DEFAULT_REFORGE_ABLE_ITEMS_UNCHANGEABLE);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -7,7 +7,6 @@ import net.knarcraft.blacksmith.config.NPCSetting;
|
||||
import net.knarcraft.blacksmith.config.SettingValueType;
|
||||
import net.knarcraft.blacksmith.formatting.StringFormatter;
|
||||
import net.knarcraft.blacksmith.formatting.TranslatableMessage;
|
||||
import net.knarcraft.blacksmith.formatting.Translator;
|
||||
import net.knarcraft.blacksmith.trait.BlacksmithTrait;
|
||||
import net.knarcraft.blacksmith.util.TypeValidationHelper;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
@@ -30,8 +29,7 @@ public class BlackSmithEditCommand implements CommandExecutor {
|
||||
@NotNull String[] args) {
|
||||
NPC npc = CitizensAPI.getDefaultNPCSelector().getSelected(sender);
|
||||
if (npc == null || !npc.hasTrait(BlacksmithTrait.class)) {
|
||||
StringFormatter.displayErrorMessage(sender,
|
||||
Translator.getTranslatedMessage(TranslatableMessage.NO_NPC_SELECTED));
|
||||
StringFormatter.displayErrorMessage(sender, TranslatableMessage.NO_NPC_SELECTED);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@@ -0,0 +1,65 @@
|
||||
package net.knarcraft.blacksmith.command;
|
||||
|
||||
import net.knarcraft.blacksmith.config.SmithPreset;
|
||||
import net.knarcraft.blacksmith.config.SmithPresetFilter;
|
||||
import net.knarcraft.blacksmith.formatting.StringFormatter;
|
||||
import net.knarcraft.blacksmith.formatting.TranslatableMessage;
|
||||
import net.knarcraft.blacksmith.formatting.Translator;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static net.knarcraft.blacksmith.formatting.StringFormatter.displayErrorMessage;
|
||||
import static net.knarcraft.blacksmith.formatting.StringFormatter.displaySuccessMessage;
|
||||
|
||||
/**
|
||||
* The command for displaying which materials are contained in a preset
|
||||
*/
|
||||
public class PresetCommand implements CommandExecutor {
|
||||
|
||||
@Override
|
||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label,
|
||||
@NotNull String[] args) {
|
||||
if (args.length < 1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
String presetName = args[0].toUpperCase().replace('-', '_');
|
||||
List<Material> includedMaterials;
|
||||
|
||||
try {
|
||||
//Display the preset with the filter applied
|
||||
if (presetName.contains(":")) {
|
||||
String[] parts = presetName.split(":");
|
||||
SmithPreset smithPreset = SmithPreset.valueOf(parts[0]);
|
||||
SmithPresetFilter filter = SmithPresetFilter.valueOf(parts[1]);
|
||||
|
||||
if (!smithPreset.supportsFilter(filter)) {
|
||||
displayErrorMessage(sender, TranslatableMessage.INVALID_FILTER_FOR_PRESET);
|
||||
return false;
|
||||
}
|
||||
includedMaterials = smithPreset.getFilteredMaterials(filter);
|
||||
} else {
|
||||
includedMaterials = SmithPreset.valueOf(presetName).getMaterials();
|
||||
}
|
||||
} catch (IllegalArgumentException exception) {
|
||||
displayErrorMessage(sender, TranslatableMessage.INVALID_PRESET_OR_FILTER);
|
||||
return false;
|
||||
}
|
||||
|
||||
//Convert materials to strings before output
|
||||
List<String> materialNames = new ArrayList<>();
|
||||
for (Material material : includedMaterials) {
|
||||
materialNames.add(material.name());
|
||||
}
|
||||
displaySuccessMessage(sender, StringFormatter.replacePlaceholder(Translator.getTranslatedMessage(
|
||||
TranslatableMessage.PRESET_MATERIALS), "{materials}", String.join(", ", materialNames)));
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
@@ -0,0 +1,60 @@
|
||||
package net.knarcraft.blacksmith.command;
|
||||
|
||||
import net.knarcraft.blacksmith.config.SmithPreset;
|
||||
import net.knarcraft.blacksmith.config.SmithPresetFilter;
|
||||
import net.knarcraft.blacksmith.util.TabCompletionHelper;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.TabCompleter;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* The tab-completer for the preset command
|
||||
*/
|
||||
public class PresetTabCompleter implements TabCompleter {
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label,
|
||||
@NotNull String[] args) {
|
||||
//Only one argument is expected
|
||||
if (args.length > 1) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
//If no preset has been fully matched, tab-complete for presets.
|
||||
//If a preset has been fully matched, tab-complete for applicable filters
|
||||
|
||||
String input = args[0].toUpperCase().replace('-', '_');
|
||||
|
||||
List<String> completions = new ArrayList<>();
|
||||
String filterString = "";
|
||||
|
||||
if (input.contains(":")) {
|
||||
String[] parts = input.split(":");
|
||||
input = parts[0];
|
||||
filterString = parts.length > 1 ? parts[1] : "";
|
||||
}
|
||||
|
||||
//Add tab-completions for all supported filters
|
||||
try {
|
||||
List<SmithPresetFilter> filters = SmithPreset.valueOf(input).getSupportedFilters();
|
||||
for (SmithPresetFilter filter : filters) {
|
||||
if (filterString.isEmpty() || filter.name().contains(filterString)) {
|
||||
completions.add(input + ":" + filter.name());
|
||||
}
|
||||
}
|
||||
} catch (IllegalArgumentException ignored) {
|
||||
/* An illegal argument exception here simply means that the user has typed an unrecognized smith preset.
|
||||
This can be safely ignored, as it simply means no filter tab-completions are necessary. */
|
||||
}
|
||||
|
||||
//Adds all default completions
|
||||
completions.addAll(TabCompletionHelper.filterMatchingContains(SmithPreset.getPresetNames(), input));
|
||||
return completions;
|
||||
}
|
||||
|
||||
}
|
@@ -2,7 +2,6 @@ package net.knarcraft.blacksmith.command;
|
||||
|
||||
import net.knarcraft.blacksmith.BlacksmithPlugin;
|
||||
import net.knarcraft.blacksmith.formatting.TranslatableMessage;
|
||||
import net.knarcraft.blacksmith.formatting.Translator;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.TabExecutor;
|
||||
@@ -23,7 +22,7 @@ public class ReloadCommand implements TabExecutor {
|
||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label,
|
||||
@NotNull String[] args) {
|
||||
BlacksmithPlugin.getInstance().reload();
|
||||
displaySuccessMessage(sender, Translator.getTranslatedMessage(TranslatableMessage.PLUGIN_RELOADED));
|
||||
displaySuccessMessage(sender, TranslatableMessage.PLUGIN_RELOADED);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user