+ Added lua user and stats

src/commands/CommandStats.java

@@ -26,13 +26,17 @@ public class CommandStats extends Command
 		String out = "```\n";
 		Stats stats = Stats.instance;
 		
+		long seen = stats.GetMessagesSeen();
+		long processed = stats.GetCommandsProcessed();
+		
 		out += "----- [General] -----\n";
-		out += " Messages observed: " + stats.GetMessagesSeen() + "\n";
+		out += " Messages observed: " + seen + "\n";
-		out += "Commands processed: " + stats.GetCommandsProcessed() + "\n";
+		out += "Commands processed: " + processed + "\n";
+		out += "  Command invoke %: " + ((int)((processed / (float)seen) * 1000)) / 10.0f + "%\n";
 		out += "   KittyBot uptime: " + stats.GetFormattedUptime() + "\n";
 		out += "\n";
 		out += "----- [Health] -----\n";
-		out += "      SMT cores: " + stats.GetCPUAvailable() + "\n";
+		out += " SMT cores: " + stats.GetCPUAvailable() + "\n";
 		
 		// If CPU load works on this OS, list it.
 		double CPULoad = stats.GetSystemCPULoad();
@@ -46,20 +50,20 @@ public class CommandStats extends Command
 		Integer timed_waiting = data.states.get(Thread.State.TIMED_WAITING);
 		Integer waiting = data.states.get(Thread.State.WAITING);
 		
-		out += "  Child threads:"
+		out += "   Threads:"
-			+ " run: " + (runnable == null ? 0 : runnable)
+			+ " run-" + (runnable == null ? 0 : runnable)
-			+ " block: " + (blocked == null ? 0 : blocked)
+			+ " block-" + (blocked == null ? 0 : blocked)
-			+ " sleep: " + (timed_waiting == null ? 0 : timed_waiting)
+			+ " sleep-" + (timed_waiting == null ? 0 : timed_waiting)
-			+ " wait: " + (waiting == null ? 0 : waiting)
+			+ " wait-" + (waiting == null ? 0 : waiting)
-			+ " term: " + (terminated == null ? 0 : terminated)
+			+ " term-" + (terminated == null ? 0 : terminated)
 			+ "\n";
 		
 		Integer guildCount = stats.GetGuildCount();
 		Integer userCount = stats.GetUserCount();
 		
-		out += "\n----- [Counts] -----\n"
+		out += "\n----- [Cache] -----\n"
-			+ "Guilds: " + guildCount + "\n"
+			+ "Cached Guilds: " + guildCount + "\n"
-			+ " Users: " + userCount;
+			+ " Cached Users: " + userCount;
 		out += "\n```";
 		
 		res.Call(out);

src/core/lua/Plugin.java

@@ -8,6 +8,7 @@ import java.util.stream.Stream;
 
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.lib.jse.CoerceJavaToLua;
 import org.luaj.vm2.lib.jse.JsePlatform;
 
 // To promote flexibility, plugins are lua file with predefined callbacks.
@@ -47,11 +48,11 @@ public class Plugin
 		}
 	}
 	
-	public String Run(String args)
+	public String Run(String args, PluginUser user)
 	{
 		try
 		{
-			LuaValue res = func_plugin.call(LuaValue.valueOf(args));
+			LuaValue res = func_plugin.call(LuaValue.valueOf(args), user.AsLua());
 			
 			if(!res.isnil())
 				return res.toString();

src/core/lua/PluginManager.java

@@ -6,6 +6,8 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.stream.Stream;
 
+import dataStructures.KittyUser;
+
 // Reads in, handles, and manipulates plugins. Plugins are loaded in the order they appear in the folder.
 public class PluginManager
 {
@@ -37,12 +39,12 @@ public class PluginManager
 	
 	// Runs all plugins, returning when it gets a non-nill result.
 	// Otherwise, returns null.
-	public String RunAll(String input)
+	public String RunAll(String input, KittyUser user)
 	{
 		for(int i = 0; i < plugins.size(); ++i)
 		{
 			Plugin plugin = plugins.get(i);
-			String out = plugin.Run(input);
+			String out = plugin.Run(input, new PluginUser(user));
 			
 			if(out != null)
 			{

src/core/lua/PluginStructure.java

@@ -0,0 +1,12 @@
+package core.lua;
+
+import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.lib.jse.CoerceJavaToLua;
+
+public class PluginStructure
+{
+	public LuaValue AsLua()
+	{
+		return CoerceJavaToLua.coerce(this);
+	}
+}

src/core/lua/PluginUser.java

@@ -0,0 +1,13 @@
+package core.lua;
+
+import dataStructures.KittyUser;
+
+public class PluginUser extends PluginStructure
+{
+	public String name;
+	
+	public PluginUser(KittyUser user)
+	{
+		this.name = user.name;
+	}
+}

src/main/Main.java

@@ -3,6 +3,7 @@ package main;
 import javax.security.auth.login.LoginException;
 import core.*;
 import core.lua.PluginManager;
+import core.lua.PluginUser;
 import dataStructures.KittyChannel;
 import dataStructures.KittyGuild;
 import dataStructures.KittyRole;
@@ -52,7 +53,7 @@ public class Main extends ListenerAdapter
 
 	@Override
 	public void onGuildMessageReceived(GuildMessageReceivedEvent event)
-	{	
+	{
 		// Tweak the event as necessary
 		if(!PreProcessSetup(event))
 			return;
@@ -71,19 +72,16 @@ public class Main extends ListenerAdapter
 			return;
 				
 		// Track beans!
-		user.ChangeBeans(1);		
+		user.ChangeBeans(1);
 		
 		// RP logging system
 		RPManager.instance.addLine(channel, user, input);
 		
-		// 
-		
-		
 		// Attempt to spin up a command. If the command doesn't exist.
 		// Run plugins right before invoking the commands but after all other setup.
 		if(commandManager.InvokeOnNewThread(guild, channel, user, input, response) == false)
 		{
-			String pluginOutput = pluginManager.RunAll(input.message);
+			String pluginOutput = pluginManager.RunAll(input.message, user);
 			
 			if(pluginOutput != null)
 				response.Call(pluginOutput);