diff --git a/src/core/lua/Plugin.java b/src/core/lua/Plugin.java index 86a959a..640d2eb 100644 --- a/src/core/lua/Plugin.java +++ b/src/core/lua/Plugin.java @@ -44,17 +44,17 @@ public class Plugin } catch (IOException e) { - PluginLog.Error(e.getMessage()); + PluginLog.error(e.getMessage()); } } - public List Run(String args, PluginUser user) + public List run(String args, PluginUser user) { try { List outputs = new Vector(); - LuaValue res = func_plugin.call(LuaValue.valueOf(args), user.AsLua()); + LuaValue res = func_plugin.call(LuaValue.valueOf(args), user.asLua()); if(!res.isnil()) { @@ -87,7 +87,7 @@ public class Plugin } catch(Exception e) { - PluginLog.Error("Failed to run plugin from file " + filepath); + PluginLog.error("Failed to run plugin from file " + filepath); } return null; diff --git a/src/core/lua/PluginLog.java b/src/core/lua/PluginLog.java index 8b084c7..b5e16fb 100644 --- a/src/core/lua/PluginLog.java +++ b/src/core/lua/PluginLog.java @@ -5,7 +5,7 @@ import utils.LogFilter; public class PluginLog { - public static void Log(String s) { GlobalLog.Log(LogFilter.Plugin, s); } - public static void Warn(String s) { GlobalLog.Warn(LogFilter.Plugin, s); } - public static void Error(String s) { GlobalLog.Error(LogFilter.Plugin, s); } + public static void log(String s) { GlobalLog.Log(LogFilter.Plugin, s); } + public static void warn(String s) { GlobalLog.Warn(LogFilter.Plugin, s); } + public static void error(String s) { GlobalLog.Error(LogFilter.Plugin, s); } } diff --git a/src/core/lua/PluginManager.java b/src/core/lua/PluginManager.java index 984728e..f77203c 100644 --- a/src/core/lua/PluginManager.java +++ b/src/core/lua/PluginManager.java @@ -12,14 +12,11 @@ import dataStructures.KittyUser; // Reads in, handles, and manipulates plugins. Plugins are loaded in the order they appear in the folder. public class PluginManager { + // Variables public final String pluginFolder; public ArrayList plugins; - - public void AddPlugin(Path path) - { - plugins.add(new Plugin(path)); - } + // Constructor public PluginManager(String folder) { this.pluginFolder = folder; @@ -29,30 +26,35 @@ public class PluginManager { try (Stream paths = Files.walk(Paths.get(this.pluginFolder))) { - paths.filter(Files::isRegularFile).forEach((path)->{ AddPlugin(path); }); + paths.filter(Files::isRegularFile).forEach((path)->{ addPlugin(path); }); } } catch(Exception e) { - PluginLog.Error(e.getMessage()); + PluginLog.error(e.getMessage()); } } + public void addPlugin(Path path) + { + plugins.add(new Plugin(path)); + } + // Runs all plugins, returning when it gets a non-nill result. If there // are mutliple strings returned in the list, it is because the plugin // that was run returned multiple strings. Since plugins don't stack, it // will never indicate that multiple // Otherwise, returns null. - public List RunAll(String input, KittyUser user) + public List runAll(String input, KittyUser user) { for(int i = 0; i < plugins.size(); ++i) { Plugin plugin = plugins.get(i); - List out = plugin.Run(input, new PluginUser(user)); + List out = plugin.run(input, new PluginUser(user)); if(out != null) { - PluginLog.Log("Executed plugin at " + plugin.filepath); + PluginLog.log("Executed plugin at " + plugin.filepath); return out; } } @@ -60,9 +62,10 @@ public class PluginManager return null; } - public void PrintAll() + // Dumps the contents of all plugins for debug + public void printAll() { for(int i = 0; i < plugins.size(); ++i) - PluginLog.Log(plugins.get(i).contents.toString()); + PluginLog.log(plugins.get(i).contents.toString()); } } diff --git a/src/core/lua/PluginStructure.java b/src/core/lua/PluginStructure.java index 989d46d..ca70848 100644 --- a/src/core/lua/PluginStructure.java +++ b/src/core/lua/PluginStructure.java @@ -5,7 +5,7 @@ import org.luaj.vm2.lib.jse.CoerceJavaToLua; public class PluginStructure { - public LuaValue AsLua() + public LuaValue asLua() { return CoerceJavaToLua.coerce(this); } diff --git a/src/main/Main.java b/src/main/Main.java index 2e9dfbc..3701297 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -94,7 +94,7 @@ public class Main extends ListenerAdapter // Run plugins right before invoking the commands but after all other setup. if(commandManager.InvokeOnNewThread(guild, channel, user, input, response) == false) { - List pluginOutput = pluginManager.RunAll(input.message, user); + List pluginOutput = pluginManager.runAll(input.message, user); if(pluginOutput != null && pluginOutput.size() > 0) {