Add "dependency not loaded" message

This commit is contained in:
Frank van der Heijden 2020-06-21 11:47:24 +02:00
parent 166df139d7
commit ac6de28b68
No known key found for this signature in database
GPG key ID: 26DA56488D314D11
3 changed files with 17 additions and 1 deletions

View file

@ -22,6 +22,7 @@ public class Messenger {
"file_changed", "&cAccessing the jar file while %action%ing &4%what%&c went wrong, please load the plugin manually!", "file_changed", "&cAccessing the jar file while %action%ing &4%what%&c went wrong, please load the plugin manually!",
"invalid_description", "&cAn error occurred while %action%ing &4%what%&c, plugin doesn't have a valid description!", "invalid_description", "&cAn error occurred while %action%ing &4%what%&c, plugin doesn't have a valid description!",
"invalid_plugin", "&cAn error occurred while %action%ing &4%what%&c, plugin is invalid!", "invalid_plugin", "&cAn error occurred while %action%ing &4%what%&c, plugin is invalid!",
"unknown_dependency", "&cAn error occurred while %action%ing &4%what%&c, plugin has a dependeny which is not loaded: &4%arg%",
"update", Defaults.of( "update", Defaults.of(
"available", "&8&m------------=&r&8[ &b&lServerUtils Update&r &8]&m=--------------\n" "available", "&8&m------------=&r&8[ &b&lServerUtils Update&r &8]&m=--------------\n"
+ " &3Current version: &b%old%\n" + " &3Current version: &b%old%\n"

View file

@ -33,6 +33,8 @@ public class PluginManager {
plugin = Bukkit.getPluginManager().loadPlugin(file); plugin = Bukkit.getPluginManager().loadPlugin(file);
} catch (InvalidDescriptionException ex) { } catch (InvalidDescriptionException ex) {
return new LoadResult(Result.INVALID_DESCRIPTION); return new LoadResult(Result.INVALID_DESCRIPTION);
} catch (UnknownDependencyException ex) {
return new LoadResult(Result.UNKNOWN_DEPENDENCY.arg(ex.getMessage()));
} catch (InvalidPluginException ex) { } catch (InvalidPluginException ex) {
if (ex.getCause() instanceof IllegalArgumentException) { if (ex.getCause() instanceof IllegalArgumentException) {
IllegalArgumentException e = (IllegalArgumentException) ex.getCause(); IllegalArgumentException e = (IllegalArgumentException) ex.getCause();

View file

@ -12,12 +12,25 @@ public enum Result {
FILE_CHANGED, FILE_CHANGED,
INVALID_DESCRIPTION, INVALID_DESCRIPTION,
INVALID_PLUGIN, INVALID_PLUGIN,
UNKNOWN_DEPENDENCY,
ERROR, ERROR,
SUCCESS; SUCCESS;
private String arg;
Result() {
this.arg = "";
}
public Result arg(String arg) {
this.arg = arg;
return this;
}
public void sendTo(CommandSender sender, String action, String what) { public void sendTo(CommandSender sender, String action, String what) {
Messenger.sendMessage(sender, "serverutils." + this.name().toLowerCase(), Messenger.sendMessage(sender, "serverutils." + this.name().toLowerCase(),
"%action%", action, "%action%", action,
"%what%", what); "%what%", what,
"%arg%", arg);
} }
} }