diff options
author | David Panić <david@panic.tk> | 2019-04-17 19:59:35 +0200 |
---|---|---|
committer | David Panić <david@panic.tk> | 2019-04-17 19:59:35 +0200 |
commit | 2bc14973af851f4c589eb139ef4c2e029edb2f26 (patch) | |
tree | 09477a1d8c621881238bc29d99f9bb2339715304 | |
parent | 30e33a4e58d4277af3e3deaa6efc99b4f79e38d3 (diff) | |
parent | 7d3e2a04b2d7603e446cb898633a203d7bcba4d7 (diff) |
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | build.gradle | 12 | ||||
-rw-r--r-- | src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.cmd | 12 | ||||
-rw-r--r-- | src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.java | 16 | ||||
-rw-r--r-- | src/main/resources/plugin.yml | 6 |
5 files changed, 41 insertions, 6 deletions
@@ -123,6 +123,7 @@ hs_err_pid* ### Gradle ### .gradle build/ +bin/ # Ignore Gradle GUI config gradle-app.setting diff --git a/build.gradle b/build.gradle index 5d62467..a1ece9c 100644 --- a/build.gradle +++ b/build.gradle @@ -36,4 +36,16 @@ jar { task sourceJar(type: Jar, dependsOn: classes) { classifier 'sources' from sourceSets.main.allSource +} + +sourceSets { + main { + resources { + srcDir 'src/main/java' + include '**/*.cmd' + + srcDir 'src/main/resources' + include '**/*.yml' + } + } }
\ No newline at end of file diff --git a/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.cmd b/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.cmd index 4e06bd0..69dd38d 100644 --- a/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.cmd +++ b/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.cmd @@ -4,11 +4,23 @@ command modules { perm moduleloader.modules.list; run list; } + -v { + help Lists all modules and their versions. Color indicates status: §aENABLED §cDISABLED; + perm moduleloader.modules.list; + run listversions; + } + + list { help Lists all modules. Color indicates status: §aENABLED §cDISABLED; perm moduleloader.modules.list; run list; } + list -v { + help Lists all modules and their versions. Color indicates status: §aENABLED §cDISABLED; + perm moduleloader.modules.list; + run listversions; + } load [string:name...] { help (Re)-Loads a module. WARNING: Handle with care! This has direct affect on code being executed. This command will temporarily halt the main thread until the class loading operation was completed.; perm moduleloader.modules.admin; diff --git a/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.java b/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.java index bdf8091..ec478a0 100644 --- a/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.java +++ b/src/main/java/com/redstoner/coremods/moduleLoader/ModuleLoader.java @@ -561,15 +561,25 @@ public final class ModuleLoader implements CoreModule { return Main.plugin; } + @Command (hook = "list", async = AsyncType.ALWAYS) + public boolean listModulesCommand(CommandSender sender) { + return listModules(sender, false); + } + + @Command (hook = "listversions", async = AsyncType.ALWAYS) + public boolean listModulesVerionsCommand(CommandSender sender) { + return listModules(sender, true); + } + /** * This method lists all modules to the specified CommandSender. The modules will be color coded correspondingly to their enabled status. * * @param sender The person to send the info to, usually the issuer of the command or the console sender. + * @param showVersions Should we show the versions directly in chat. * * @return true. */ - @Command (hook = "list", async = AsyncType.ALWAYS) - public boolean listModulesCommand(CommandSender sender) { + public boolean listModules(CommandSender sender, boolean showVersions) { boolean hasCategorys = hasCategories(); Message m = new Message(sender, null); ModuleInfo ml_info = moduleInfos.get(instance); @@ -587,7 +597,7 @@ public final class ModuleLoader implements CoreModule { for (Module mod : mods) { ModuleInfo info = moduleInfos.get(mod); - m.appendTextHover((modules.get(mod) ? "§a" : "§c") + info.getDisplayName(), info.getModuleInfoHover()); + m.appendTextHover((modules.get(mod) ? "§a" : "§c") + info.getDisplayName() + (showVersions ? " &e" + info.getVersion() : ""), info.getModuleInfoHover()); if (curModule != mods.size()) m.appendText("&7, "); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 404bd2b..fc576a8 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ModuleLoader
-version: 5.2.1
-authors: [pepich1851]
+version: 5.2.2
+authors: [pepich1851, psrcek, LogalDeveloper, Minenash]
main: com.redstoner.misc.Main
-softdepend: [Vault]
\ No newline at end of file +softdepend: [Vault]
|