diff --git a/src/main/java/net/frankheijden/serverutils/config/Messenger.java b/src/main/java/net/frankheijden/serverutils/config/Messenger.java index 019b987..57fe9a6 100644 --- a/src/main/java/net/frankheijden/serverutils/config/Messenger.java +++ b/src/main/java/net/frankheijden/serverutils/config/Messenger.java @@ -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!", "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!", + "unknown_dependency", "&cAn error occurred while %action%ing &4%what%&c, plugin has a dependeny which is not loaded: &4%arg%", "update", Defaults.of( "available", "&8&m------------=&r&8[ &b&lServerUtils Update&r &8]&m=--------------\n" + " &3Current version: &b%old%\n" diff --git a/src/main/java/net/frankheijden/serverutils/managers/PluginManager.java b/src/main/java/net/frankheijden/serverutils/managers/PluginManager.java index 8b26f5c..b62d7b9 100644 --- a/src/main/java/net/frankheijden/serverutils/managers/PluginManager.java +++ b/src/main/java/net/frankheijden/serverutils/managers/PluginManager.java @@ -33,6 +33,8 @@ public class PluginManager { plugin = Bukkit.getPluginManager().loadPlugin(file); } catch (InvalidDescriptionException ex) { return new LoadResult(Result.INVALID_DESCRIPTION); + } catch (UnknownDependencyException ex) { + return new LoadResult(Result.UNKNOWN_DEPENDENCY.arg(ex.getMessage())); } catch (InvalidPluginException ex) { if (ex.getCause() instanceof IllegalArgumentException) { IllegalArgumentException e = (IllegalArgumentException) ex.getCause(); diff --git a/src/main/java/net/frankheijden/serverutils/managers/Result.java b/src/main/java/net/frankheijden/serverutils/managers/Result.java index 0216cc5..c9b7e15 100644 --- a/src/main/java/net/frankheijden/serverutils/managers/Result.java +++ b/src/main/java/net/frankheijden/serverutils/managers/Result.java @@ -12,12 +12,25 @@ public enum Result { FILE_CHANGED, INVALID_DESCRIPTION, INVALID_PLUGIN, + UNKNOWN_DEPENDENCY, ERROR, 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) { Messenger.sendMessage(sender, "serverutils." + this.name().toLowerCase(), "%action%", action, - "%what%", what); + "%what%", what, + "%arg%", arg); } }