5 files changed, 32 insertions, 12 deletions

diff --git a/src/GameState.cpp b/src/GameState.cpp
index 50a9004..89743e4 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -7,6 +7,7 @@
 #include "Event.hpp"
 #include "Packet.hpp"
 #include "Game.hpp"
+#include "Plugin.hpp"
 
 void GameState::Update(double deltaTime) {
 	OPTICK_EVENT();
@@ -168,7 +169,7 @@ void GameState::UpdatePacket(std::shared_ptr<Packet> ptr) {
 		case ChatMessageCB: {
 			auto packet = std::static_pointer_cast<PacketChatMessageCB>(ptr);
 			LOG(INFO) << "Message (" << int(packet->Position) << "): " << packet->JsonData.ToPlainText();
-			PUSH_EVENT("ChatMessageReceived", std::make_tuple(packet->JsonData, packet->Position));
+			PluginSystem::CallOnChatMessage(packet->JsonData, packet->Position);
 			break;
 		}
 
diff --git a/src/Plugin.cpp b/src/Plugin.cpp
index 64fc00b..98df8c3 100644
--- a/src/Plugin.cpp
+++ b/src/Plugin.cpp
@@ -12,6 +12,7 @@
 #include "AssetManager.hpp"
 #include "Settings.hpp"
 #include "DebugInfo.hpp"
+#include "Chat.hpp"
 
 
 struct Plugin {
@@ -23,6 +24,7 @@ struct Plugin {
 	const std::function<void(std::string)> onChangeState;
 	const std::function<void(double)> onTick;
 	const std::function<BlockInfo(Vector)> onRequestBlockInfo;
+	const std::function<void(Chat, int)> onChatMessage;
 };
 
 
@@ -42,6 +44,7 @@ namespace PluginApi {
 				plugin["onChangeState"].get_or(std::function<void(std::string)>()),
 				plugin["onTick"].get_or(std::function<void(double)>()),
 				plugin["onRequestBlockInfo"].get_or(std::function<BlockInfo(Vector)>()),
+				plugin["onChatMessage"].get_or(std::function<void(Chat, int)>()),
 		};
 		plugins.push_back(nativePlugin);
 		LOG(INFO)<<"Loading plugin " << (!nativePlugin.displayName.empty() ? nativePlugin.displayName : nativePlugin.name);
@@ -128,6 +131,10 @@ namespace PluginApi {
 			return 0;
 		}
 	}
+
+	void SendChatMessage(const std::string& msg) {
+		PUSH_EVENT("SendChatMessage", msg);
+	}
 }
 
 int LoadFileRequire(lua_State* L) {
@@ -265,6 +272,9 @@ void PluginSystem::Init() {
 		"GetDeltaS", &LoopExecutionTimeController::GetDeltaS,
 		"GetRealDeltaS", &LoopExecutionTimeController::GetRealDeltaS);
 
+	lua.new_usertype<Chat>("Chat",
+		"ToPlainText", &Chat::ToPlainText);
+
 	sol::table apiTable = lua["AC"].get_or_create<sol::table>();
 	sol::table apiSettings = lua["AC"]["Settings"].get_or_create<sol::table>();
 
@@ -293,6 +303,7 @@ void PluginSystem::Init() {
 	apiTable["GetTime"] = GetTime;
 	apiTable["GetBlockInfo"] = GetBlockInfo;
 	apiTable["GetDebugValue"] = PluginApi::GetDebugValue;
+	apiTable["SendChatMessage"] = PluginApi::SendChatMessage;
 }
 
 lua_State* PluginSystem::GetLuaState() {
@@ -356,3 +367,17 @@ BlockInfo PluginSystem::RequestBlockInfo(Vector blockPos) {
 	}
 	return ret;
 }
+
+void PluginSystem::CallOnChatMessage(const Chat& chat, int position) {
+	OPTICK_EVENT();
+	for (Plugin& plugin : plugins) {
+		if (plugin.onRequestBlockInfo && plugin.errors < 10)
+			try {
+				plugin.onChatMessage(chat, position);
+			}
+			catch (sol::error& e) {
+				LOG(ERROR) << e.what();
+				plugin.errors++;
+			}
+	}
+}
diff --git a/src/Plugin.hpp b/src/Plugin.hpp
index 7af27a4..13b126e 100644
--- a/src/Plugin.hpp
+++ b/src/Plugin.hpp
@@ -6,6 +6,7 @@
 
 class BlockInfo;
 struct lua_State;
+class Chat;
 
 namespace PluginSystem {
 	void Init();
@@ -19,4 +20,6 @@ namespace PluginSystem {
 	void CallOnTick(double deltaTime);
 
 	BlockInfo RequestBlockInfo(Vector blockPos);
+
+	void CallOnChatMessage(const Chat& chat, int position);
 }
\ No newline at end of file
diff --git a/src/Render.cpp b/src/Render.cpp
index a76bba7..3bf1e6b 100644
--- a/src/Render.cpp
+++ b/src/Render.cpp
@@ -29,7 +29,8 @@ const std::map<SDL_Keycode, Rml::Input::KeyIdentifier> keyMapping = {
     {SDLK_RIGHT, Rml::Input::KI_RIGHT},
     {SDLK_UP, Rml::Input::KI_UP},
     {SDLK_DOWN, Rml::Input::KI_DOWN},
-    {SDLK_TAB, Rml::Input::KI_TAB}
+    {SDLK_TAB, Rml::Input::KI_TAB},
+    {SDLK_RETURN, Rml::Input::KI_RETURN}
 };
 
 inline int ConvertKeymodsSdlToRml(unsigned short keyMods) {
@@ -288,9 +289,6 @@ void Render::HandleEvents() {
                         if (state == State::Playing) {
                             SetState(State::Chat);
                         }
-                        else if (state == State::Chat) {
-                            SetState(State::Playing);
-                        }
                         break;
                     }
 
@@ -477,12 +475,6 @@ void Render::InitEvents() {
         SetState(State::Loading);
     });
 
-    listener.RegisterHandler("ChatMessageReceived", [this](const Event& eventData) {
-        auto data = eventData.get<std::tuple<Chat, unsigned char>>();
-        std::string msg = "(" + std::to_string((int)std::get<1>(data)) + ") " + (std::get<0>(data).ToPlainText());
-        chatMessages.push_back(msg);
-    });
-
     listener.RegisterHandler("StateUpdated", [this](const Event& eventData) {
         switch (GetState()) {
             case State::Playing:
diff --git a/src/Render.hpp b/src/Render.hpp
index 4f993c3..b8963c7 100644
--- a/src/Render.hpp
+++ b/src/Render.hpp
@@ -37,7 +37,6 @@ class Render {
     float sensetivity = 0.1f;
     bool isWireframe = false;	
 	std::unique_ptr<Framebuffer> framebuffer;
-    std::vector<std::string> chatMessages;
 	EventListener listener;
     std::string stateString;
 	std::unique_ptr<RmlRenderInterface> rmlRender;