Updated VeniceEXT code to support the new architecture changes.

Author: OrfeasZ

ext/Client/chat.lua ext/Client/__init__.luaext/Client/chat.lua renamed to ext/Client/__init__.lua

@@ -1,14 +1,27 @@
-function OnLoaded()
+local AdvancedChatHooks = require 'hooks'
+local AdvancedChatMessages = require 'messages'
+
+class 'AdvancedChat'
+
+function AdvancedChat:__init()
+	-- Subscribe to events.
+	self.m_ExtensionLoadedEvent = Events:Subscribe('ExtensionLoaded', self, self.OnLoaded)
+	self.m_ChatMessageEvent = Events:Subscribe('AC:SendChatMessage', self, self.OnSendChatMessage)
+
+	-- Initialize the other components.
+	self.m_Hooks = AdvancedChatHooks()
+	self.m_Messages = AdvancedChatMessages()
+end
+
+function AdvancedChat:OnLoaded()
 	-- Initialize our custom WebUI package.
 	WebUI:Init()
 
 	-- Show our custom WebUI package.
 	WebUI:Show()
-
-	return true
 end
 
-function OnSendChatMessage(p_Contents)
+function AdvancedChat:OnSendChatMessage(p_Contents)
 	-- Get the target of the message and the message itself.
 	local s_Target = p_Contents:match("^([a-z]+):.*$")
 	local s_Message = p_Contents:match("^[a-z]+:(.*)$")
@@ -19,35 +32,34 @@ function OnSendChatMessage(p_Contents)
 
 	-- Ignore if the message is empty.
 	if s_Message:len() == 0 then
-		return true
+		return
 	end
 
 	-- Get the local player.
 	local s_LocalPlayer = PlayerManager:GetLocalPlayer()
 
 	-- We can't send a message if we don't have an active player.
 	if s_LocalPlayer == nil then
-		return true
+		return
 	end
 
 	-- Dispatch message based on the specified target.
 	if s_Target == 'all' then
 		ChatManager:SendMessage(s_Message)
-		return true
+		return
 	end
 
 	if s_Target == 'team' then
 		ChatManager:SendMessage(s_Message, s_LocalPlayer.teamID)
-		return true
+		return
 	end
 
 	if s_Target == 'sqd' then
 		ChatManager:SendMessage(s_Message, s_LocalPlayer.teamID, s_LocalPlayer.squadID)
-		return true
+		return
 	end
 
-	return true
+	return
 end
 
-Events:Subscribe('ExtensionLoaded', OnLoaded)
-Events:Subscribe('AC:SendChatMessage', OnSendChatMessage)
+g_AdvancedChat = AdvancedChat()

ext/Client/hooks.lua

@@ -15,7 +15,7 @@ end
 function AdvancedChatHooks:OnCreateChatMessage(p_Hook, p_Message, p_Channel, p_Player, p_RecipientMask, p_SenderIsDead)
 	-- A new chat message is being created; filter it in order to
 	-- prevent the game from rendering it.
-	
+
 	return UITextMessageType.Last
 end
 
@@ -67,4 +67,4 @@ function AdvancedChatHooks:OnDisableMouse()
 	WebUI:DisableMouse()
 end
 
-local hooks = AdvancedChatHooks()
+return AdvancedChatHooks

ext/Client/messages.lua

@@ -1,20 +1,31 @@
-function OnEngineMessage(p_Message)
+class 'AdvancedChatMessages'
+
+function AdvancedChatMessages:__init()
+	-- Subscribe to events.
+	self.m_EngineMessageEvent = Events:Subscribe('Engine:Message', self, self.OnEngineMessage)
+end
+
+function AdvancedChatMessages:OnEngineMessage(p_Message)
+	if p_Message == nil then
+		return
+	end
+
 	-- We only care about UIHudChatMessages.
 	if p_Message.category ~= MessageCategory.UI or p_Message.type ~= MessageType.UIHudChatMessage then
-		return true
+		return
 	end
 
 	-- Get the message, process it and pass it to our custom 
 	-- WebUI package for rendering.
 	local s_Message = UIHudChatMessage(p_Message)
-
+	
 	if s_Message.channel == ChatChannelType.Admin then
 		-- This is a workaround because many RCON tools prepend
 		-- "Admin: " to admin messages.
 		local s_String = s_Message.string:gsub("^Admin: ", '')
 
 		WebUI:ExecuteJS(string.format('AdvancedChat.trigger("message:all", "Admin", %s);', WebUI:QuoteString(s_String)))
-		return true
+		return
 	end
 
 	-- Get the player sending the message, and our local player.
@@ -23,41 +34,41 @@ function OnEngineMessage(p_Message)
 
 	-- Players not found; cancel.
 	if s_OtherPlayer == nil or s_LocalPlayer == nil then
-		return true
+		return
 	end
 
 	-- Player is a spectator.
 	if s_OtherPlayer.teamID == 0 then
 		WebUI:ExecuteJS(string.format('AdvancedChat.trigger("message:spectator", %s, %s);', WebUI:QuoteString(s_OtherPlayer.name), WebUI:QuoteString(s_Message.string)))
-		return true
+		return
 	end
 
 	-- Player is on a different team; display enemy message.
 	if (s_LocalPlayer.teamID == 0 and s_OtherPlayer.teamID == 2) or (s_LocalPlayer.teamID ~= 0 and s_OtherPlayer.teamID ~= s_LocalPlayer.teamID) then
 		WebUI:ExecuteJS(string.format('AdvancedChat.trigger("message:enemy", %s, %s);', WebUI:QuoteString(s_OtherPlayer.name), WebUI:QuoteString(s_Message.string)))
-		return true
+		return
 	end
 
 	-- Player is in the same team.
 	-- Display global message.
 	if s_Message.channel == ChatChannelType.SayAll and s_LocalPlayer.teamID ~= 0 then
 		WebUI:ExecuteJS(string.format('AdvancedChat.trigger("message:all", %s, %s);', WebUI:QuoteString(s_OtherPlayer.name), WebUI:QuoteString(s_Message.string)))
-		return true
+		return
 	end
 
 	-- Display team message.
 	if s_Message.channel == ChatChannelType.Team or s_LocalPlayer.teamID == 0 then
 		WebUI:ExecuteJS(string.format('AdvancedChat.trigger("message:team", %s, %s);', WebUI:QuoteString(s_OtherPlayer.name), WebUI:QuoteString(s_Message.string)))
-		return true
+		return
 	end
 
 	-- Display squad message.
 	if s_Message.channel == ChatChannelType.Squad or s_Message.channel == ChatChannelType.SquadLeader then
 		WebUI:ExecuteJS(string.format('AdvancedChat.trigger("message:squad", %s, %s);', WebUI:QuoteString(s_OtherPlayer.name), WebUI:QuoteString(s_Message.string)))
-		return true
+		return
 	end
 
-	return true
+	return
 end
 
-Events:Subscribe('Engine:Message', OnEngineMessage)
+return AdvancedChatMessages