Merge branch 'v2.1'

.gitignore

@@ -1,3 +1,4 @@
 *.cfg
 /cache/
 /resources/\[local\]/
+/db/

resources/[gameplay]/[examples]/money-fountain-example-map/fxmanifest.lua

@@ -0,0 +1,6 @@
+fx_version 'cerulean'
+game 'gta5'
+
+map 'map.lua'
+
+dependency 'money-fountain'

resources/[gameplay]/[examples]/money-fountain-example-map/map.lua

@@ -0,0 +1,4 @@
+money_fountain 'test_fountain' {
+    vector3(97.334, -973.621, 29.36),
+    amount = 75
+}

resources/[gameplay]/[examples]/money-fountain/client.lua

@@ -0,0 +1,101 @@
+-- add text entries for all the help types we have
+AddTextEntry('FOUNTAIN_HELP', 'This fountain currently contains $~1~.~n~Press ~INPUT_PICKUP~ to obtain $~1~.~n~Press ~INPUT_DETONATE~ to place $~1~.')
+AddTextEntry('FOUNTAIN_HELP_DRAINED', 'This fountain currently contains $~1~.~n~Press ~INPUT_DETONATE~ to place $~1~.')
+AddTextEntry('FOUNTAIN_HELP_BROKE', 'This fountain currently contains $~1~.~n~Press ~INPUT_PICKUP~ to obtain $~1~.')
+AddTextEntry('FOUNTAIN_HELP_BROKE_N_DRAINED', 'This fountain currently contains $~1~.')
+AddTextEntry('FOUNTAIN_HELP_INUSE', 'This fountain currently contains $~1~.~n~You can use it again in ~a~.')
+
+-- upvalue aliases so that we will be fast if far away
+local Wait = Wait
+local GetEntityCoords = GetEntityCoords
+local PlayerPedId = PlayerPedId
+
+-- timer, don't tick as frequently if we're far from any money fountain
+local relevanceTimer = 500
+
+CreateThread(function()
+    local pressing = false
+
+    while true do
+        Wait(relevanceTimer)
+
+        local coords = GetEntityCoords(PlayerPedId())
+
+        for _, data in pairs(moneyFountains) do
+            -- if we're near this fountain
+            local dist = #(coords - data.coords)
+
+            -- near enough to draw
+            if dist < 40 then
+                -- ensure per-frame tick
+                relevanceTimer = 0
+
+                DrawMarker(29, data.coords.x, data.coords.y, data.coords.z, 0, 0, 0, 0.0, 0, 0, 1.0, 1.0, 1.0, 0, 150, 0, 120, false, true, 2, false, nil, nil, false)
+            else
+                -- put the relevance timer back to the way it was
+                relevanceTimer = 500
+            end
+
+            -- near enough to use
+            if dist < 1 then
+                -- are we able to use it? if not, display appropriate help
+                local player = LocalPlayer
+                local nextUse = player.state['fountain_nextUse']
+
+                -- GetNetworkTime is synced for everyone
+                if nextUse and nextUse >= GetNetworkTime() then
+                    BeginTextCommandDisplayHelp('FOUNTAIN_HELP_INUSE')
+                    AddTextComponentInteger(GlobalState['fountain_' .. data.id])
+                    AddTextComponentSubstringTime(math.tointeger(nextUse - GetNetworkTime()), 2 | 4) -- seconds (2), minutes (4)
+                    EndTextCommandDisplayHelp(0, false, false, 1000)
+                else
+                    -- handle inputs for pickup/place
+                    if not pressing then
+                        if IsControlPressed(0, 38 --[[ INPUT_PICKUP ]]) then
+                            TriggerServerEvent('money_fountain:tryPickup', data.id)
+                            pressing = true
+                        elseif IsControlPressed(0, 47 --[[ INPUT_DETONATE ]]) then
+                            TriggerServerEvent('money_fountain:tryPlace', data.id)
+                            pressing = true
+                        end
+                    else
+                        if not IsControlPressed(0, 38 --[[ INPUT_PICKUP ]]) and 
+                           not IsControlPressed(0, 47 --[[ INPUT_DETONATE ]]) then
+                            pressing = false
+                        end
+                    end
+
+                    -- decide the appropriate help message
+                    local youCanSpend = (player.state['money_cash'] or 0) >= data.amount
+                    local fountainCanSpend = GlobalState['fountain_' .. data.id] >= data.amount
+
+                    local helpName
+
+                    if youCanSpend and fountainCanSpend then
+                        helpName = 'FOUNTAIN_HELP'
+                    elseif youCanSpend and not fountainCanSpend then
+                        helpName = 'FOUNTAIN_HELP_DRAINED'
+                    elseif not youCanSpend and fountainCanSpend then
+                        helpName = 'FOUNTAIN_HELP_BROKE'
+                    else
+                        helpName = 'FOUNTAIN_HELP_BROKE_N_DRAINED'
+                    end
+
+                    -- and print it
+                    BeginTextCommandDisplayHelp(helpName)
+                    AddTextComponentInteger(GlobalState['fountain_' .. data.id])
+
+                    if fountainCanSpend then
+                        AddTextComponentInteger(data.amount)
+                    end
+
+                    if youCanSpend then
+                        AddTextComponentInteger(data.amount)
+                    end
+
+                    EndTextCommandDisplayHelp(0, false, false, 1000)
+                end
+            end
+        end
+    end
+end)

resources/[gameplay]/[examples]/money-fountain/fxmanifest.lua

@@ -0,0 +1,18 @@
+version '1.0.0'
+description 'An example money system client containing a money fountain.'
+author 'Cfx.re <pr@fivem.net>'
+
+fx_version 'bodacious'
+game 'gta5'
+
+client_script 'client.lua'
+server_script 'server.lua'
+
+shared_script 'mapdata.lua'
+
+dependencies {
+    'mapmanager',
+    'money'
+}
+
+lua54 'yes'

resources/[gameplay]/[examples]/money-fountain/mapdata.lua

@@ -0,0 +1,28 @@
+-- define the money fountain list (SHARED SCRIPT)
+moneyFountains = {}
+
+-- index to know what to remove
+local fountainIdx = 1
+
+AddEventHandler('getMapDirectives', function(add)
+    -- add a 'money_fountain' map directive
+    add('money_fountain', function(state, name)
+        return function(data)
+            local coords = data[1]
+            local amount = data.amount or 100
+
+            local idx = fountainIdx
+            fountainIdx += 1
+
+            moneyFountains[idx] = {
+                id = name,
+                coords = coords,
+                amount = amount
+            }
+
+            state.add('idx', idx)
+        end
+    end, function(state)
+        moneyFountains[state.idx] = nil
+    end)
+end)

resources/[gameplay]/[examples]/money-fountain/server.lua

@@ -0,0 +1,107 @@
+-- track down what we've added to global state
+local sentState = {}
+
+-- money system
+local ms = exports['money']
+
+-- get the fountain content from storage
+local function getMoneyForId(fountainId)
+    return GetResourceKvpInt(('money:%s'):format(fountainId)) / 100.0
+end
+
+-- set the fountain content in storage + state
+local function setMoneyForId(fountainId, money)
+    GlobalState['fountain_' .. fountainId] = math.tointeger(money)
+
+    return SetResourceKvpInt(('money:%s'):format(fountainId), math.tointeger(money * 100.0))
+end
+
+-- get the nearest fountain to the player + ID
+local function getMoneyFountain(id, source)
+    local coords = GetEntityCoords(GetPlayerPed(source))
+
+    for _, v in pairs(moneyFountains) do
+        if v.id == id then
+            if #(v.coords - coords) < 2.5 then
+                return v
+            end
+        end
+    end
+
+    return nil
+end
+
+-- generic function for events
+local function handleFountainStuff(source, id, pickup)
+    -- if near the fountain we specify
+    local fountain = getMoneyFountain(id, source)
+
+    if fountain then
+        -- and we can actually use the fountain already
+        local player = Player(source)
+
+        local nextUse = player.state['fountain_nextUse']
+        if not nextUse then
+            nextUse = 0
+        end
+
+        -- GetGameTimer ~ GetNetworkTime on client
+        if nextUse <= GetGameTimer() then
+            -- not rate limited
+            local success = false
+            local money = getMoneyForId(fountain.id)
+
+            -- decide the op
+            if pickup then
+                -- if the fountain is rich enough to get the per-use amount
+                if money >= fountain.amount then
+                    -- give the player money
+                    if ms:addMoney(source, 'cash', fountain.amount) then
+                        money -= fountain.amount
+                        success = true
+                    end
+                end
+            else
+                -- if the player is rich enough
+                if ms:removeMoney(source, 'cash', fountain.amount) then
+                    -- add to the fountain
+                    money += fountain.amount
+                    success = true
+                end
+            end
+
+            -- save it and set the player's cooldown
+            if success then
+                setMoneyForId(fountain.id, money)
+                player.state['fountain_nextUse'] = GetGameTimer() + GetConvarInt('moneyFountain_cooldown', 5000)
+            end
+        end
+    end
+end
+
+-- event for picking up fountain->player
+RegisterNetEvent('money_fountain:tryPickup')
+AddEventHandler('money_fountain:tryPickup', function(id)
+    handleFountainStuff(source, id, true)
+end)
+
+-- event for donating player->fountain
+RegisterNetEvent('money_fountain:tryPlace')
+AddEventHandler('money_fountain:tryPlace', function(id)
+    handleFountainStuff(source, id, false)
+end)
+
+-- listener: if a new fountain is added, set its current money in state
+CreateThread(function()
+    while true do
+        Wait(500)
+
+        for _, fountain in pairs(moneyFountains) do
+            if not sentState[fountain.id] then
+                GlobalState['fountain_' .. fountain.id] = math.tointeger(getMoneyForId(fountain.id))
+
+                sentState[fountain.id] = true
+            end
+        end
+    end
+end)

resources/[gameplay]/[examples]/money/client.lua

@@ -0,0 +1,30 @@
+local moneyTypes = {
+    cash = `MP0_WALLET_BALANCE`,
+    bank = `BANK_BALANCE`,
+}
+
+RegisterNetEvent('money:displayUpdate')
+
+AddEventHandler('money:displayUpdate', function(type, money)
+    local stat = moneyTypes[type]
+    if not stat then return end
+    StatSetInt(stat, math.floor(money))
+end)
+
+TriggerServerEvent('money:requestDisplay')
+
+CreateThread(function()
+    while true do
+        Wait(0)
+
+        if IsControlJustPressed(0, 20) then
+            SetMultiplayerBankCash()
+            SetMultiplayerWalletCash()
+
+            Wait(4350)
+
+            RemoveMultiplayerBankCash()
+            RemoveMultiplayerWalletCash()
+        end
+    end
+end)

resources/[gameplay]/[examples]/money/fxmanifest.lua

@@ -0,0 +1,12 @@
+version '1.0.0'
+description 'An example money system using KVS.'
+author 'Cfx.re <pr@fivem.net>'
+
+fx_version 'bodacious'
+game 'gta5'
+
+client_script 'client.lua'
+server_script 'server.lua'
+
+--dependency 'cfx.re/playerData.v1alpha1'
+lua54 'yes'

resources/[gameplay]/[examples]/money/server.lua

@@ -0,0 +1,119 @@
+local playerData = exports['cfx.re/playerData.v1alpha1']
+
+local validMoneyTypes = {
+    bank = true,
+    cash = true,
+}
+
+local function getMoneyForId(playerId, moneyType)
+    return GetResourceKvpInt(('money:%s:%s'):format(playerId, moneyType)) / 100.0
+end
+
+local function setMoneyForId(playerId, moneyType, money)
+    local s = playerData:getPlayerById(playerId)
+
+    TriggerEvent('money:updated', {
+        dbId = playerId,
+        source = s,
+        moneyType = moneyType,
+        money = money
+    })
+
+    return SetResourceKvpInt(('money:%s:%s'):format(playerId, moneyType), math.tointeger(money * 100.0))
+end
+
+local function addMoneyForId(playerId, moneyType, amount)
+    local curMoney = getMoneyForId(playerId, moneyType)
+    curMoney += amount
+
+    if curMoney >= 0 then
+        setMoneyForId(playerId, moneyType, curMoney)
+        return true, curMoney
+    end
+
+    return false, 0
+end
+
+exports('addMoney', function(playerIdx, moneyType, amount)
+    amount = tonumber(amount)
+
+    if amount <= 0 or amount > (1 << 30) then
+        return false
+    end
+
+    if not validMoneyTypes[moneyType] then
+        return false
+    end
+
+    local playerId = playerData:getPlayerId(playerIdx)
+    local success, money = addMoneyForId(playerId, moneyType, amount)
+
+    if success then
+        Player(playerIdx).state['money_' .. moneyType] = money
+    end
+
+    return true
+end)
+
+exports('removeMoney', function(playerIdx, moneyType, amount)
+    amount = tonumber(amount)
+
+    if amount <= 0 or amount > (1 << 30) then
+        return false
+    end
+
+    if not validMoneyTypes[moneyType] then
+        return false
+    end
+
+    local playerId = playerData:getPlayerId(playerIdx)
+    local success, money = addMoneyForId(playerId, moneyType, -amount)
+
+    if success then
+        Player(playerIdx).state['money_' .. moneyType] = money
+    end
+
+    return success
+end)
+
+exports('getMoney', function(playerIdx, moneyType)
+    local playerId = playerData:getPlayerId(playerIdx)
+    return getMoneyForId(playerId, moneyType)
+end)
+
+-- player display bits
+AddEventHandler('money:updated', function(data)
+    if data.source then
+        TriggerClientEvent('money:displayUpdate', data.source, data.moneyType, data.money)
+    end
+end)
+
+RegisterNetEvent('money:requestDisplay')
+
+AddEventHandler('money:requestDisplay', function()
+    local source = source
+    local playerId = playerData:getPlayerId(source)
+
+    for type, _ in pairs(validMoneyTypes) do
+        local amount = getMoneyForId(playerId, type)
+        TriggerClientEvent('money:displayUpdate', source, type, amount)
+
+        Player(source).state['money_' .. type] = amount
+    end
+end)
+
+RegisterCommand('earn', function(source, args)
+    local type = args[1]
+    local amount = tonumber(args[2])
+
+    exports['money']:addMoney(source, type, amount)
+end, true)
+
+RegisterCommand('spend', function(source, args)
+    local type = args[1]
+    local amount = tonumber(args[2])
+
+    if not exports['money']:removeMoney(source, type, amount) then
+        print('you are broke??')
+    end
+end, true)

resources/[gameplay]/[examples]/ped-money-drops/client.lua

@@ -0,0 +1,41 @@
+AddEventHandler('gameEventTriggered', function(eventName, args)
+    if eventName == 'CEventNetworkEntityDamage' then
+        local victim = args[1]
+        local culprit = args[2]
+        local isDead = args[4] == 1
+
+        if isDead then
+            local origCoords = GetEntityCoords(victim)
+            local pickup = CreatePickupRotate(`PICKUP_MONEY_VARIABLE`, origCoords.x, origCoords.y, origCoords.z - 0.7, 0.0, 0.0, 0.0, 512, 0, false, 0)
+            local netId = PedToNet(victim)
+
+            local undoStuff = { false }
+
+            CreateThread(function()
+                local self = PlayerPedId()
+
+                while not undoStuff[1] do
+                    Wait(50)
+
+                    if #(GetEntityCoords(self) - origCoords) < 2.5 and HasPickupBeenCollected(pickup) then
+                        TriggerServerEvent('money:tryPickup', netId)
+
+                        RemovePickup(pickup)
+                        break
+                    end
+                end
+
+                undoStuff[1] = true
+            end)
+
+            SetTimeout(15000, function()
+                if not undoStuff[1] then
+                    RemovePickup(pickup)
+                    undoStuff[1] = true
+                end
+            end)
+
+            TriggerServerEvent('money:allowPickupNear', netId)
+        end
+    end
+end)

resources/[gameplay]/[examples]/ped-money-drops/fxmanifest.lua

@@ -0,0 +1,11 @@
+version '1.0.0'
+description 'An example money system client.'
+author 'Cfx.re <pr@fivem.net>'
+
+fx_version 'bodacious'
+game 'gta5'
+
+client_script 'client.lua'
+server_script 'server.lua'
+
+lua54 'yes'

resources/[gameplay]/[examples]/ped-money-drops/server.lua

@@ -0,0 +1,42 @@
+local safePositions = {}
+
+RegisterNetEvent('money:allowPickupNear')
+
+AddEventHandler('money:allowPickupNear', function(pedId)
+    local entity = NetworkGetEntityFromNetworkId(pedId)
+
+    Wait(250)
+
+    if not DoesEntityExist(entity) then
+        return
+    end
+
+    if GetEntityHealth(entity) > 100 then
+        return
+    end
+
+    local coords = GetEntityCoords(entity)
+    safePositions[pedId] = coords
+end)
+
+RegisterNetEvent('money:tryPickup')
+
+AddEventHandler('money:tryPickup', function(entity)
+    if not safePositions[entity] then
+        return
+    end
+
+    local source = source
+    local playerPed = GetPlayerPed(source)
+    local coords = GetEntityCoords(playerPed)
+
+    if #(safePositions[entity] - coords) < 2.5 then
+        exports['money']:addMoney(source, 'cash', 40)
+    end
+
+    safePositions[entity] = nil
+end)
+
+AddEventHandler('entityRemoved', function(entity)
+    safePositions[entity] = nil
+end)

resources/[gameplay]/chat-theme-gtao/style.css

@@ -85,7 +85,9 @@
 }
 
 .chat-input > div {
-    background-color: rgba(0, 0, 0, .6);
+    background-color: rgba(0, 0, 0, .6) !important;
+    border: calc(0.28vh / 2) solid rgba(180, 180, 180, .6);
+    outline: calc(0.28vh / 2) solid rgba(0, 0, 0, .8); /* to replace margin-background */
     padding: calc(0.28vh / 2);
 }
 
@@ -93,6 +95,19 @@
     margin: 0;
     margin-left: 0.7%;
     margin-top: -0.1%;
+    line-height: 2.8vh;
+}
+
+.chat-input .prefix.any {
+    opacity: 0.8;
+}
+
+.chat-input .prefix.any:before {
+    content: '[';
+}
+
+.chat-input .prefix.any:after {
+    content: ']';
 }
 
 .chat-input > div + div {
@@ -110,9 +125,7 @@
 
 textarea {
     background: transparent;
-    border: calc(0.28vh / 2) solid rgba(180, 180, 180, .6);
+    padding: 0.5vh;
-    padding: calc(0.28vh / 2);
-    padding-left: calc(3.5% + (0.28vh / 2));
 }
 
 @media screen and (min-aspect-ratio: 21/9) {

resources/[gameplay]/chat/.gitignore

@@ -0,0 +1,4 @@
+node_modules/
+.yarn.installed
+yarn-error.log
+dist/

resources/[gameplay]/chat/cl_chat.lua

@@ -2,7 +2,6 @@ local isRDR = not TerraingridActivate and true or false
 
 local chatInputActive = false
 local chatInputActivating = false
-local chatHidden = true
 local chatLoaded = false
 
 RegisterNetEvent('chatMessage')
@@ -10,6 +9,8 @@ RegisterNetEvent('chat:addTemplate')
 RegisterNetEvent('chat:addMessage')
 RegisterNetEvent('chat:addSuggestion')
 RegisterNetEvent('chat:addSuggestions')
+RegisterNetEvent('chat:addMode')
+RegisterNetEvent('chat:removeMode')
 RegisterNetEvent('chat:removeSuggestion')
 RegisterNetEvent('chat:clear')
 
@@ -42,19 +43,31 @@ AddEventHandler('__cfx_internal:serverPrint', function(msg)
     message = {
       templateId = 'print',
       multiline = true,
-      args = { msg }
+      args = { msg },
+      mode = '_global'
     }
   })
 end)
 
-AddEventHandler('chat:addMessage', function(message)
+-- addMessage
+local addMessage = function(message)
+  if type(message) == 'string' then
+    message = {
+      args = { message }
+    }
+  end
+
   SendNUIMessage({
     type = 'ON_MESSAGE',
     message = message
   })
-end)
+end
 
-AddEventHandler('chat:addSuggestion', function(name, help, params)
+exports('addMessage', addMessage)
+AddEventHandler('chat:addMessage', addMessage)
+
+-- addSuggestion
+local addSuggestion = function(name, help, params)
   SendNUIMessage({
     type = 'ON_SUGGESTION_ADD',
     suggestion = {
@@ -63,7 +76,10 @@ AddEventHandler('chat:addSuggestion', function(name, help, params)
       params = params or nil
     }
   })
-end)
+end
+
+exports('addSuggestion', addSuggestion)
+AddEventHandler('chat:addSuggestion', addSuggestion)
 
 AddEventHandler('chat:addSuggestions', function(suggestions)
   for _, suggestion in ipairs(suggestions) do
@@ -81,6 +97,20 @@ AddEventHandler('chat:removeSuggestion', function(name)
   })
 end)
 
+AddEventHandler('chat:addMode', function(mode)
+  SendNUIMessage({
+    type = 'ON_MODE_ADD',
+    mode = mode
+  })
+end)
+
+AddEventHandler('chat:removeMode', function(name)
+  SendNUIMessage({
+    type = 'ON_MODE_REMOVE',
+    name = name
+  })
+end)
+
 AddEventHandler('chat:addTemplate', function(id, html)
   SendNUIMessage({
     type = 'ON_TEMPLATE_ADD',
@@ -110,7 +140,7 @@ RegisterNUICallback('chatResult', function(data, cb)
     if data.message:sub(1, 1) == '/' then
       ExecuteCommand(data.message:sub(2))
     else
-      TriggerServerEvent('_chat:messageEntered', GetPlayerName(id), { r, g, b }, data.message)
+      TriggerServerEvent('_chat:messageEntered', GetPlayerName(id), { r, g, b }, data.message, data.mode)
     end
   end
 
@@ -124,7 +154,7 @@ local function refreshCommands()
     local suggestions = {}
 
     for _, command in ipairs(registeredCommands) do
-        if IsAceAllowed(('command.%s'):format(command.name)) then
+        if IsAceAllowed(('command.%s'):format(command.name)) and command.name ~= 'toggleChat' then
             table.insert(suggestions, {
                 name = '/' .. command.name,
                 help = ''
@@ -178,7 +208,7 @@ AddEventHandler('onClientResourceStop', function(resName)
 end)
 
 RegisterNUICallback('loaded', function(data, cb)
-  TriggerServerEvent('chat:init');
+  TriggerServerEvent('chat:init')
 
   refreshCommands()
   refreshThemes()
@@ -188,10 +218,43 @@ RegisterNUICallback('loaded', function(data, cb)
   cb('ok')
 end)
 
+local CHAT_HIDE_STATES = {
+  SHOW_WHEN_ACTIVE = 0,
+  ALWAYS_SHOW = 1,
+  ALWAYS_HIDE = 2
+}
+
+local kvpEntry = GetResourceKvpString('hideState')
+local chatHideState = kvpEntry and tonumber(kvpEntry) or CHAT_HIDE_STATES.SHOW_WHEN_ACTIVE
+local isFirstHide = true
+
+if not isRDR then
+  if RegisterKeyMapping then
+    RegisterKeyMapping('toggleChat', 'Toggle chat', 'keyboard', 'l')
+  end
+
+  RegisterCommand('toggleChat', function()
+    if chatHideState == CHAT_HIDE_STATES.SHOW_WHEN_ACTIVE then
+      chatHideState = CHAT_HIDE_STATES.ALWAYS_SHOW
+    elseif chatHideState == CHAT_HIDE_STATES.ALWAYS_SHOW then
+      chatHideState = CHAT_HIDE_STATES.ALWAYS_HIDE
+    elseif chatHideState == CHAT_HIDE_STATES.ALWAYS_HIDE then
+      chatHideState = CHAT_HIDE_STATES.SHOW_WHEN_ACTIVE
+    end
+
+    isFirstHide = false
+
+    SetResourceKvp('hideState', tostring(chatHideState))
+  end, false)
+end
+
 Citizen.CreateThread(function()
   SetTextChatEnabled(false)
   SetNuiFocus(false)
 
+  local lastChatHideState = -1
+  local origChatHideState = -1
+
   while true do
     Wait(0)
 
@@ -215,19 +278,30 @@ Citizen.CreateThread(function()
     end
 
     if chatLoaded then
-      local shouldBeHidden = false
+      local forceHide = IsScreenFadedOut() or IsPauseMenuActive()
+      local wasForceHide = false
 
-      if IsScreenFadedOut() or IsPauseMenuActive() then
+      if chatHideState ~= CHAT_HIDE_STATES.ALWAYS_HIDE then
-        shouldBeHidden = true
+        if forceHide then
+          origChatHideState = chatHideState
+          chatHideState = CHAT_HIDE_STATES.ALWAYS_HIDE
+        end
+      elseif not forceHide and origChatHideState ~= -1 then
+        chatHideState = origChatHideState
+        origChatHideState = -1
+        wasForceHide = true
       end
 
-      if (shouldBeHidden and not chatHidden) or (not shouldBeHidden and chatHidden) then
+      if chatHideState ~= lastChatHideState then
-        chatHidden = shouldBeHidden
+        lastChatHideState = chatHideState
 
         SendNUIMessage({
           type = 'ON_SCREEN_STATE_CHANGE',
-          shouldHide = shouldBeHidden
+          hideState = chatHideState,
+          fromUserInteraction = not forceHide and not isFirstHide and not wasForceHide
         })
+
+        isFirstHide = false
       end
     end
   end

resources/[gameplay]/chat/fxmanifest.lua

@@ -1,30 +1,24 @@
 description 'chat management stuff'
 
-ui_page 'html/index.html'
+ui_page 'dist/ui.html'
 
 client_script 'cl_chat.lua'
 server_script 'sv_chat.lua'
 
 files {
-    'html/index.html',
+  'dist/ui.html',
-    'html/index.css',
+  'dist/index.css',
-    'html/config.default.js',
+  'html/vendor/*.css',
-    'html/config.js',
+  'html/vendor/fonts/*.woff2',
-    'html/App.js',
+}
-    'html/Message.js',
-    'html/Suggestions.js',
-    'html/vendor/vue.2.3.3.min.js',
-    'html/vendor/flexboxgrid.6.3.1.min.css',
-    'html/vendor/animate.3.5.2.min.css',
-    'html/vendor/latofonts.css',
-    'html/vendor/fonts/LatoRegular.woff2',
-    'html/vendor/fonts/LatoRegular2.woff2',
-    'html/vendor/fonts/LatoLight2.woff2',
-    'html/vendor/fonts/LatoLight.woff2',
-    'html/vendor/fonts/LatoBold.woff2',
-    'html/vendor/fonts/LatoBold2.woff2',
-  }
 
 fx_version 'adamant'
 games { 'rdr3', 'gta5' }
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
+
+dependencies {
+  'yarn',
+  'webpack'
+}
+
+webpack_config 'webpack.config.js'

resources/[gameplay]/chat/html/App.js

@@ -1,255 +0,0 @@
-window.APP = {
-  template: '#app_template',
-  name: 'app',
-  data() {
-    return {
-      style: CONFIG.style,
-      showInput: false,
-      showWindow: false,
-      shouldHide: true,
-      backingSuggestions: [],
-      removedSuggestions: [],
-      templates: CONFIG.templates,
-      message: '',
-      messages: [],
-      oldMessages: [],
-      oldMessagesIndex: -1,
-      tplBackups: [],
-      msgTplBackups: []
-    };
-  },
-  destroyed() {
-    clearInterval(this.focusTimer);
-    window.removeEventListener('message', this.listener);
-  },
-  mounted() {
-    post('http://chat/loaded', JSON.stringify({}));
-    this.listener = window.addEventListener('message', (event) => {
-      const item = event.data || event.detail; //'detail' is for debuging via browsers
-      if (this[item.type]) {
-        this[item.type](item);
-      }
-    });
-  },
-  watch: {
-    messages() {
-      if (this.showWindowTimer) {
-        clearTimeout(this.showWindowTimer);
-      }
-      this.showWindow = true;
-      this.resetShowWindowTimer();
-
-      const messagesObj = this.$refs.messages;
-      this.$nextTick(() => {
-        messagesObj.scrollTop = messagesObj.scrollHeight;
-      });
-    },
-  },
-  computed: {
-    suggestions() {
-      return this.backingSuggestions.filter((el) => this.removedSuggestions.indexOf(el.name) <= -1);
-    },
-  },
-  methods: {
-    ON_SCREEN_STATE_CHANGE({ shouldHide }) {
-      this.shouldHide = shouldHide;
-    },
-    ON_OPEN() {
-      this.showInput = true;
-      this.showWindow = true;
-      if (this.showWindowTimer) {
-        clearTimeout(this.showWindowTimer);
-      }
-      this.focusTimer = setInterval(() => {
-        if (this.$refs.input) {
-          this.$refs.input.focus();
-        } else {
-          clearInterval(this.focusTimer);
-        }
-      }, 100);
-    },
-    ON_MESSAGE({ message }) {
-      this.messages.push(message);
-    },
-    ON_CLEAR() {
-      this.messages = [];
-      this.oldMessages = [];
-      this.oldMessagesIndex = -1;
-    },
-    ON_SUGGESTION_ADD({ suggestion }) {
-      const duplicateSuggestion = this.backingSuggestions.find(a => a.name == suggestion.name);
-      if (duplicateSuggestion) {
-        if(suggestion.help || suggestion.params) {
-          duplicateSuggestion.help = suggestion.help || "";
-          duplicateSuggestion.params = suggestion.params || [];
-        }
-        return;
-      }
-      if (!suggestion.params) {
-        suggestion.params = []; //TODO Move somewhere else
-      }
-      this.backingSuggestions.push(suggestion);
-    },
-    ON_SUGGESTION_REMOVE({ name }) {
-      if(this.removedSuggestions.indexOf(name) <= -1) {
-        this.removedSuggestions.push(name);
-      }
-    },
-    ON_TEMPLATE_ADD({ template }) {
-      if (this.templates[template.id]) {
-        this.warn(`Tried to add duplicate template '${template.id}'`)
-      } else {
-        this.templates[template.id] = template.html;
-      }
-    },
-    ON_UPDATE_THEMES({ themes }) {
-      this.removeThemes();
-
-      this.setThemes(themes);
-    },
-    removeThemes() {
-      for (let i = 0; i < document.styleSheets.length; i++) {
-        const styleSheet = document.styleSheets[i];
-        const node = styleSheet.ownerNode;
-        
-        if (node.getAttribute('data-theme')) {
-          node.parentNode.removeChild(node);
-        }
-      }
-
-      this.tplBackups.reverse();
-
-      for (const [ elem, oldData ] of this.tplBackups) {
-        elem.innerText = oldData;
-      }
-
-      this.tplBackups = [];
-
-      this.msgTplBackups.reverse();
-
-      for (const [ id, oldData ] of this.msgTplBackups) {
-        this.templates[id] = oldData;
-      }
-
-      this.msgTplBackups = [];
-    },
-    setThemes(themes) {
-      for (const [ id, data ] of Object.entries(themes)) {
-        if (data.style) {
-          const style = document.createElement('style');
-          style.type = 'text/css';
-          style.setAttribute('data-theme', id);
-          style.appendChild(document.createTextNode(data.style));
-
-          document.head.appendChild(style);
-        }
-        
-        if (data.styleSheet) {
-          const link = document.createElement('link');
-          link.rel = 'stylesheet';
-          link.type = 'text/css';
-          link.href = data.baseUrl + data.styleSheet;
-          link.setAttribute('data-theme', id);
-
-          document.head.appendChild(link);
-        }
-
-        if (data.templates) {
-          for (const [ tplId, tpl ] of Object.entries(data.templates)) {
-            const elem = document.getElementById(tplId);
-
-            if (elem) {
-              this.tplBackups.push([ elem, elem.innerText ]);
-              elem.innerText = tpl;
-            }
-          }
-        }
-
-        if (data.script) {
-          const script = document.createElement('script');
-          script.type = 'text/javascript';
-          script.src = data.baseUrl + data.script;
-
-          document.head.appendChild(script);
-        }
-
-        if (data.msgTemplates) {
-          for (const [ tplId, tpl ] of Object.entries(data.msgTemplates)) {
-            this.msgTplBackups.push([ tplId, this.templates[tplId] ]);
-            this.templates[tplId] = tpl;
-          }
-        }
-      }
-    },
-    warn(msg) {
-      this.messages.push({
-        args: [msg],
-        template: '^3<b>CHAT-WARN</b>: ^0{0}',
-      });
-    },
-    clearShowWindowTimer() {
-      clearTimeout(this.showWindowTimer);
-    },
-    resetShowWindowTimer() {
-      this.clearShowWindowTimer();
-      this.showWindowTimer = setTimeout(() => {
-        if (!this.showInput) {
-          this.showWindow = false;
-        }
-      }, CONFIG.fadeTimeout);
-    },
-    keyUp() {
-      this.resize();
-    },
-    keyDown(e) {
-      if (e.which === 38 || e.which === 40) {
-        e.preventDefault();
-        this.moveOldMessageIndex(e.which === 38);
-      } else if (e.which == 33) {
-        var buf = document.getElementsByClassName('chat-messages')[0];
-        buf.scrollTop = buf.scrollTop - 100;
-      } else if (e.which == 34) {
-        var buf = document.getElementsByClassName('chat-messages')[0];
-        buf.scrollTop = buf.scrollTop + 100;
-      }
-    },
-    moveOldMessageIndex(up) {
-      if (up && this.oldMessages.length > this.oldMessagesIndex + 1) {
-        this.oldMessagesIndex += 1;
-        this.message = this.oldMessages[this.oldMessagesIndex];
-      } else if (!up && this.oldMessagesIndex - 1 >= 0) {
-        this.oldMessagesIndex -= 1;
-        this.message = this.oldMessages[this.oldMessagesIndex];
-      } else if (!up && this.oldMessagesIndex - 1 === -1) {
-        this.oldMessagesIndex = -1;
-        this.message = '';
-      }
-    },
-    resize() {
-      const input = this.$refs.input;
-      input.style.height = '5px';
-      input.style.height = `${input.scrollHeight + 2}px`;
-    },
-    send(e) {
-      if(this.message !== '') {
-        post('http://chat/chatResult', JSON.stringify({
-          message: this.message,
-        }));
-        this.oldMessages.unshift(this.message);
-        this.oldMessagesIndex = -1;
-        this.hideInput();
-      } else {
-        this.hideInput(true);
-      }
-    },
-    hideInput(canceled = false) {
-      if (canceled) {
-        post('http://chat/chatResult', JSON.stringify({ canceled }));
-      }
-      this.message = '';
-      this.showInput = false;
-      clearInterval(this.focusTimer);
-      this.resetShowWindowTimer();
-    },
-  },
-};

resources/[gameplay]/chat/html/App.ts

@@ -0,0 +1,463 @@
+import { post } from './utils';
+import CONFIG from './config';
+import Vue from 'vue';
+
+import Suggestions from './Suggestions.vue';
+import MessageV from './Message.vue';
+import { Suggestion } from './Suggestions';
+
+export interface Message {
+  args: string[];
+  template: string;
+  params?: { [key: string]: string };
+  multiline?: boolean;
+  color?: [ number, number, number ];
+  templateId?: number;
+  mode?: string;
+  modeData?: Mode;
+
+  id?: string;
+}
+
+export interface ThemeData {
+  style: string;
+  styleSheet: string;
+  baseUrl: string;
+  script: string;
+  templates: { [id: string]: string }; // not supported rn
+  msgTemplates: { [id: string]: string };
+
+}
+
+export interface Mode {
+  name: string;
+  displayName: string;
+  color: string;
+  hidden?: boolean;
+  isChannel?: boolean;
+  isGlobal?: boolean;
+}
+
+enum ChatHideStates {
+  ShowWhenActive = 0,
+  AlwaysShow = 1,
+  AlwaysHide = 2,
+}
+
+const defaultMode: Mode = {
+  name: 'all',
+  displayName: 'All',
+  color: '#fff'
+};
+
+const globalMode: Mode = {
+  name: '_global',
+  displayName: 'All',
+  color: '#fff',
+  isGlobal: true,
+  hidden: true
+};
+
+export default Vue.extend({
+  template: "#app_template",
+  name: "app",
+  components: {
+    Suggestions,
+    MessageV
+  },
+  data() {
+    return {
+      style: CONFIG.style,
+      showInput: false,
+      showWindow: false,
+      showHideState: false,
+      hideState: ChatHideStates.ShowWhenActive,
+      backingSuggestions: [] as Suggestion[],
+      removedSuggestions: [] as string[],
+      templates: { ...CONFIG.templates } as { [ key: string ]: string },
+      message: "",
+      messages: [] as Message[],
+      oldMessages: [] as string[],
+      oldMessagesIndex: -1,
+      tplBackups: [] as unknown as [ HTMLElement, string ][],
+      msgTplBackups: [] as unknown as [ string, string ][],
+      focusTimer: 0,
+      showWindowTimer: 0,
+      showHideStateTimer: 0,
+      listener: (event: MessageEvent) => {},
+      modes: [defaultMode, globalMode] as Mode[],
+      modeIdx: 0,
+    };
+  },
+  destroyed() {
+    clearInterval(this.focusTimer);
+    window.removeEventListener("message", this.listener);
+  },
+  mounted() {
+    post("http://chat/loaded", JSON.stringify({}));
+
+    this.listener = (event: MessageEvent) => {
+      const item: any = event.data || (<any>event).detail; //'detail' is for debugging via browsers
+
+      if (!item || !item.type) {
+        return;
+      }
+
+      const typeRef = item.type as
+        'ON_OPEN' | 'ON_SCREEN_STATE_CHANGE' | 'ON_MESSAGE' | 'ON_CLEAR' | 'ON_SUGGESTION_ADD' |
+        'ON_SUGGESTION_REMOVE' | 'ON_TEMPLATE_ADD' | 'ON_UPDATE_THEMES' | 'ON_MODE_ADD' | 'ON_MODE_REMOVE';
+
+      if (this[typeRef]) {
+        this[typeRef](item);
+      }
+    };
+
+    window.addEventListener("message", this.listener);
+  },
+  watch: {
+    messages() {
+      if (this.hideState !== ChatHideStates.AlwaysHide) {
+        if (this.showWindowTimer) {
+          clearTimeout(this.showWindowTimer);
+        }
+        this.showWindow = true;
+        this.resetShowWindowTimer();
+      }
+
+      const messagesObj = this.$refs.messages as HTMLDivElement;
+      this.$nextTick(() => {
+        messagesObj.scrollTop = messagesObj.scrollHeight;
+      });
+    }
+  },
+  computed: {
+    filteredMessages(): Message[] {
+      return this.messages.filter(
+        // show messages that are
+        // - (if the current mode is a channel) global, or in the current mode
+        // - (if the message is a channel) in the current mode
+        el => (el.modeData?.isChannel || this.modes[this.modeIdx].isChannel) ?
+          (el.mode === this.modes[this.modeIdx].name || el.modeData?.isGlobal) :
+          true
+      );
+    },
+
+    suggestions(): Suggestion[] {
+      return this.backingSuggestions.filter(
+        el => this.removedSuggestions.indexOf(el.name) <= -1
+      );
+    },
+
+    hideAnimated(): boolean {
+      return this.hideState !== ChatHideStates.AlwaysHide;
+    },
+
+    modeIdxGet(): number {
+      return (this.modeIdx >= this.modes.length) ? (this.modes.length - 1) : this.modeIdx;
+    },
+
+    modePrefix(): string {
+      if (this.modes.length === 2) {
+        return `➤`;
+      }
+
+      return this.modes[this.modeIdxGet].displayName;
+    },
+
+    modeColor(): string {
+      return this.modes[this.modeIdxGet].color;
+    },
+
+    hideStateString(): string {
+      // TODO: localization
+      switch (this.hideState) {
+        case ChatHideStates.AlwaysShow:
+          return 'Visible';
+        case ChatHideStates.AlwaysHide:
+          return 'Hidden';
+        case ChatHideStates.ShowWhenActive:
+          return 'When active';
+      }
+    }
+  },
+  methods: {
+    ON_SCREEN_STATE_CHANGE({ hideState, fromUserInteraction }: { hideState: ChatHideStates, fromUserInteraction: boolean }) {
+      this.hideState = hideState;
+
+      if (this.hideState === ChatHideStates.AlwaysHide) {
+        if (!this.showInput) {
+          this.showWindow = false;
+        }
+      } else if (this.hideState === ChatHideStates.AlwaysShow) {
+        this.showWindow = true;
+        if (this.showWindowTimer) {
+          clearTimeout(this.showWindowTimer);
+        }
+      } else {
+        this.resetShowWindowTimer();
+      }
+
+      if (fromUserInteraction) {
+        this.showHideState = true;
+
+        if (this.showHideStateTimer) {
+          clearTimeout(this.showHideStateTimer);
+        }
+
+        this.showHideStateTimer = window.setTimeout(() => {
+          this.showHideState = false;
+        }, 1500);
+      }
+    },
+    ON_OPEN() {
+      this.showInput = true;
+      this.showWindow = true;
+      if (this.showWindowTimer) {
+        clearTimeout(this.showWindowTimer);
+      }
+      this.focusTimer = window.setInterval(() => {
+        if (this.$refs.input) {
+          (this.$refs.input as HTMLInputElement).focus();
+        } else {
+          clearInterval(this.focusTimer);
+        }
+      }, 100);
+    },
+    ON_MESSAGE({ message }: { message: Message }) {
+      message.id = `${new Date().getTime()}${Math.random()}`;
+      message.modeData = this.modes.find(mode => mode.name === message.mode);
+      this.messages.push(message);
+    },
+    ON_CLEAR() {
+      this.messages = [];
+      this.oldMessages = [];
+      this.oldMessagesIndex = -1;
+    },
+    ON_SUGGESTION_ADD({ suggestion }: { suggestion: Suggestion }) {
+      const duplicateSuggestion = this.backingSuggestions.find(
+        a => a.name == suggestion.name
+      );
+      if (duplicateSuggestion) {
+        if (suggestion.help || suggestion.params) {
+          duplicateSuggestion.help = suggestion.help || "";
+          duplicateSuggestion.params = suggestion.params || [];
+        }
+        return;
+      }
+      if (!suggestion.params) {
+        suggestion.params = []; //TODO Move somewhere else
+      }
+      this.backingSuggestions.push(suggestion);
+    },
+    ON_SUGGESTION_REMOVE({ name }: { name: string }) {
+      if (this.removedSuggestions.indexOf(name) <= -1) {
+        this.removedSuggestions.push(name);
+      }
+    },
+    ON_MODE_ADD({ mode }: { mode: Mode }) {
+      this.modes = [
+        ...this.modes.filter(a => a.name !== mode.name),
+        mode
+      ];
+    },
+    ON_MODE_REMOVE({ name }: { name: string }) {
+      this.modes = this.modes.filter(a => a.name !== name);
+
+      if (this.modes.length === 0) {
+        this.modes = [defaultMode];
+      }
+    },
+    ON_TEMPLATE_ADD({ template }: { template: { id: string, html: string }}) {
+      if (this.templates[template.id]) {
+        this.warn(`Tried to add duplicate template '${template.id}'`);
+      } else {
+        this.templates[template.id] = template.html;
+      }
+    },
+    ON_UPDATE_THEMES({ themes }: { themes: { [key: string]: ThemeData } }) {
+      this.removeThemes();
+
+      this.setThemes(themes);
+    },
+    removeThemes() {
+      for (let i = 0; i < document.styleSheets.length; i++) {
+        const styleSheet = document.styleSheets[i];
+        const node = styleSheet.ownerNode as Element;
+
+        if (node.getAttribute("data-theme")) {
+          node.parentNode?.removeChild(node);
+        }
+      }
+
+      this.tplBackups.reverse();
+
+      for (const [elem, oldData] of this.tplBackups) {
+        elem.innerText = oldData;
+      }
+
+      this.tplBackups = [];
+
+      this.msgTplBackups.reverse();
+
+      for (const [id, oldData] of this.msgTplBackups) {
+        this.templates[id] = oldData;
+      }
+
+      this.msgTplBackups = [];
+    },
+    setThemes(themes: { [key: string]: ThemeData }) {
+      for (const [id, data] of Object.entries(themes)) {
+        if (data.style) {
+          const style = document.createElement("style");
+          style.type = "text/css";
+          style.setAttribute("data-theme", id);
+          style.appendChild(document.createTextNode(data.style));
+
+          document.head.appendChild(style);
+        }
+
+        if (data.styleSheet) {
+          const link = document.createElement("link");
+          link.rel = "stylesheet";
+          link.type = "text/css";
+          link.href = data.baseUrl + data.styleSheet;
+          link.setAttribute("data-theme", id);
+
+          document.head.appendChild(link);
+        }
+
+        if (data.templates) {
+          for (const [tplId, tpl] of Object.entries(data.templates)) {
+            const elem = document.getElementById(tplId);
+
+            if (elem) {
+              this.tplBackups.push([elem, elem.innerText]);
+              elem.innerText = tpl;
+            }
+          }
+        }
+
+        if (data.script) {
+          const script = document.createElement("script");
+          script.type = "text/javascript";
+          script.src = data.baseUrl + data.script;
+
+          document.head.appendChild(script);
+        }
+
+        if (data.msgTemplates) {
+          for (const [tplId, tpl] of Object.entries(data.msgTemplates)) {
+            this.msgTplBackups.push([tplId, this.templates[tplId]]);
+            this.templates[tplId] = tpl;
+          }
+        }
+      }
+    },
+    warn(msg: string) {
+      this.messages.push({
+        args: [msg],
+        template: "^3<b>CHAT-WARN</b>: ^0{0}"
+      });
+    },
+    clearShowWindowTimer() {
+      clearTimeout(this.showWindowTimer);
+    },
+    resetShowWindowTimer() {
+      this.clearShowWindowTimer();
+      this.showWindowTimer = window.setTimeout(() => {
+        if (this.hideState !== ChatHideStates.AlwaysShow && !this.showInput) {
+          this.showWindow = false;
+        }
+      }, CONFIG.fadeTimeout);
+    },
+    keyUp() {
+      this.resize();
+    },
+    keyDown(e: KeyboardEvent) {
+      if (e.which === 38 || e.which === 40) {
+        e.preventDefault();
+        this.moveOldMessageIndex(e.which === 38);
+      } else if (e.which == 33) {
+        var buf = document.getElementsByClassName("chat-messages")[0];
+        buf.scrollTop = buf.scrollTop - 100;
+      } else if (e.which == 34) {
+        var buf = document.getElementsByClassName("chat-messages")[0];
+        buf.scrollTop = buf.scrollTop + 100;
+      } else if (e.which === 9) { // tab
+        if (e.shiftKey || e.altKey) {
+          do {
+            --this.modeIdx;
+
+            if (this.modeIdx < 0) {
+              this.modeIdx = this.modes.length - 1;
+            }
+          } while (this.modes[this.modeIdx].hidden);
+        } else {
+          do {
+            this.modeIdx = (this.modeIdx + 1) % this.modes.length;
+          } while (this.modes[this.modeIdx].hidden);
+        }
+      }
+
+      this.resize();
+    },
+    moveOldMessageIndex(up: boolean) {
+      if (up && this.oldMessages.length > this.oldMessagesIndex + 1) {
+        this.oldMessagesIndex += 1;
+        this.message = this.oldMessages[this.oldMessagesIndex];
+      } else if (!up && this.oldMessagesIndex - 1 >= 0) {
+        this.oldMessagesIndex -= 1;
+        this.message = this.oldMessages[this.oldMessagesIndex];
+      } else if (!up && this.oldMessagesIndex - 1 === -1) {
+        this.oldMessagesIndex = -1;
+        this.message = "";
+      }
+    },
+    resize() {
+      const input = this.$refs.input as HTMLInputElement;
+
+      // scrollHeight includes padding, but content-box excludes padding
+      // remove padding before setting height on the element
+      const style = getComputedStyle(input);
+      const paddingRemove = parseFloat(style.paddingBottom) + parseFloat(style.paddingTop);
+
+      input.style.height = "5px";
+      input.style.height = `${input.scrollHeight - paddingRemove}px`;
+    },
+    send() {
+      if (this.message !== "") {
+        post(
+          "http://chat/chatResult",
+          JSON.stringify({
+            message: this.message,
+            mode: this.modes[this.modeIdxGet].name
+          })
+        );
+        this.oldMessages.unshift(this.message);
+        this.oldMessagesIndex = -1;
+        this.hideInput();
+      } else {
+        this.hideInput(true);
+      }
+    },
+    hideInput(canceled = false) {
+      setTimeout(() => {
+        const input = this.$refs.input as HTMLInputElement;
+        delete input.style.height;
+      }, 50);
+
+      if (canceled) {
+        post("http://chat/chatResult", JSON.stringify({ canceled }));
+      }
+      this.message = "";
+      this.showInput = false;
+      clearInterval(this.focusTimer);
+
+      if (this.hideState !== ChatHideStates.AlwaysHide) {
+        this.resetShowWindowTimer();
+      } else {
+        this.showWindow = false;
+      }
+    }
+  }
+});

resources/[gameplay]/chat/html/App.vue

@@ -0,0 +1,44 @@
+<template>
+    <div id="app">
+      <div class="chat-window" :style="this.style" :class="{
+          'animated': !showWindow && hideAnimated,
+          'hidden': !showWindow
+        }">
+        <div class="chat-messages" ref="messages">
+          <message v-for="msg in filteredMessages"
+                   :templates="templates"
+                   :multiline="msg.multiline"
+                   :args="msg.args"
+                   :params="msg.params"
+                   :color="msg.color"
+                   :template="msg.template"
+                   :template-id="msg.templateId"
+                   :key="msg.id">
+          </message>
+        </div>
+      </div>
+      <div class="chat-input">
+        <div v-show="showInput" class="input">
+          <span class="prefix" :class="{ any: modes.length > 1 }" :style="{ color: modeColor }">{{modePrefix}}</span>
+          <textarea v-model="message"
+                    ref="input"
+                    type="text"
+                    autofocus
+                    spellcheck="false"
+                    rows="1"
+                    @keyup.esc="hideInput"
+                    @keyup="keyUp"
+                    @keydown="keyDown"
+                    @keypress.enter.prevent="send">
+          </textarea>
+        </div>
+        <suggestions :message="message" :suggestions="suggestions">
+        </suggestions>
+        <div class="chat-hide-state" v-show="showHideState">
+          {{hideStateString}}
+        </div>
+      </div>
+    </div>
+</template>
+
+<script lang="ts" src="./App.ts"></script>

resources/[gameplay]/chat/html/Message.ts

@@ -1,42 +1,48 @@
-Vue.component('message', {
+import CONFIG from './config';
-  template: '#message_template',
+import Vue, { PropType } from 'vue';
+
+export default Vue.component('message', {
   data() {
     return {};
   },
   computed: {
-    textEscaped() {
+    textEscaped(): string {
       let s = this.template ? this.template : this.templates[this.templateId];
 
-      if (this.template) {
-        //We disable templateId since we are using a direct raw template
-        this.templateId = -1;
-      }
-
       //This hack is required to preserve backwards compatability
-      if (this.templateId == CONFIG.defaultTemplateId
+      if (!this.template && this.templateId == CONFIG.defaultTemplateId
           && this.args.length == 1) {
         s = this.templates[CONFIG.defaultAltTemplateId] //Swap out default template :/
       }
 
+      s = s.replace(`@default`, this.templates[this.templateId]);
+
       s = s.replace(/{(\d+)}/g, (match, number) => {
-        const argEscaped = this.args[number] != undefined ? this.escape(this.args[number]) : match
+        const argEscaped = this.args[number] != undefined ? this.escape(this.args[number]) : match;
         if (number == 0 && this.color) {
           //color is deprecated, use templates or ^1 etc.
           return this.colorizeOld(argEscaped);
         }
         return argEscaped;
       });
+
+      // format variant args
+      s = s.replace(/\{\{([a-zA-Z0-9_\-]+?)\}\}/g, (match, id) => {
+        const argEscaped = this.params[id] != undefined ? this.escape(this.params[id]) : match;
+        return argEscaped;
+      });
+
       return this.colorize(s);
     },
   },
   methods: {
-    colorizeOld(str) {
+    colorizeOld(str: string): string {
       return `<span style="color: rgb(${this.color[0]}, ${this.color[1]}, ${this.color[2]})">${str}</span>`
     },
-    colorize(str) {
+    colorize(str: string): string {
-      let s = "<span>" + (str.replace(/\^([0-9])/g, (str, color) => `</span><span class="color-${color}">`)) + "</span>";
+      let s = "<span>" + colorTrans(str) + "</span>";
 
-      const styleDict = {
+      const styleDict: {[ key: string ]: string} = {
         '*': 'font-weight: bold;',
         '_': 'text-decoration: underline;',
         '~': 'text-decoration: line-through;',
@@ -49,8 +55,15 @@ Vue.component('message', {
         s = s.replace(styleRegex, (str, style, inner) => `<em style="${styleDict[style]}">${inner}</em>`)
       }
       return s.replace(/<span[^>]*><\/span[^>]*>/g, '');
+
+      function colorTrans(str: string) {
+        return str
+          .replace(/\^([0-9])/g, (str, color) => `</span><span class="color-${color}">`)
+          .replace(/\^#([0-9A-F]{3,6})/gi, (str, color) => `</span><span class="color" style="color: #${color}">`)
+          .replace(/~([a-z])~/g, (str, color) => `</span><span class="gameColor-${color}">`);
+      }
     },
-    escape(unsafe) {
+    escape(unsafe: string): string {
       return String(unsafe)
        .replace(/&/g, '&amp;')
        .replace(/</g, '&lt;')
@@ -61,10 +74,13 @@ Vue.component('message', {
   },
   props: {
     templates: {
-      type: Object,
+      type: Object as PropType<{ [key: string]: string }>,
     },
     args: {
-      type: Array,
+      type: Array as PropType<string[]>,
+    },
+    params: {
+      type: Object as PropType<{ [ key: string]: string }>,
     },
     template: {
       type: String,
@@ -79,8 +95,8 @@ Vue.component('message', {
       default: false,
     },
     color: { //deprecated
-      type: Array,
+      type: Array as PropType<number[]>,
-      default: false,
+      default: null,
     },
   },
 });

resources/[gameplay]/chat/html/Message.vue

@@ -0,0 +1,7 @@
+<template>
+    <div class="msg" :class="{ multiline }">
+      <span v-html="textEscaped"></span>
+    </div>
+</template>
+
+<script lang="ts" src="./Message.ts"></script>

resources/[gameplay]/chat/html/Suggestions.ts

@@ -1,11 +1,29 @@
-Vue.component('suggestions', {
+import CONFIG from './config';
-  template: '#suggestions_template',
+import Vue, { PropType } from 'vue';
-  props: ['message', 'suggestions'],
+
+export interface Suggestion {
+  name: string;
+  help: string;
+  params: string[];
+
+  disabled: boolean;
+}
+
+export default Vue.component('suggestions', {
+  props: {
+    message: {
+      type: String
+    },
+    
+    suggestions: {
+      type: Array as PropType<Suggestion[]>
+    }
+  },
   data() {
     return {};
   },
   computed: {
-    currentSuggestions() {
+    currentSuggestions(): Suggestion[] {
       if (this.message === '') {
         return [];
       }
@@ -34,6 +52,7 @@ Vue.component('suggestions', {
           const regex = new RegExp(`${s.name} (?:\\w+ ){${index}}(?:${wType}*)$`, 'g');
 
           // eslint-disable-next-line no-param-reassign
+          // @ts-ignore
           p.disabled = this.message.match(regex) == null;
         });
       });

resources/[gameplay]/chat/html/Suggestions.vue

@@ -0,0 +1,29 @@
+<template>
+    <div class="suggestions-wrap" v-show="currentSuggestions.length > 0">
+        <ul class="suggestions">
+        <li class="suggestion" v-for="s in currentSuggestions" :key="s.name">
+            <p>
+            <span :class="{ 'disabled': s.disabled }">
+                {{s.name}}
+            </span>
+            <span class="param"
+                    v-for="p in s.params"
+                    :class="{ 'disabled': p.disabled }"
+                    :key="p.name">
+                [{{p.name}}]
+            </span>
+            </p>
+            <small class="help">
+            <template v-if="!s.disabled">
+                {{s.help}}
+            </template>
+            <template v-for="p in s.params" v-if="!p.disabled">
+                {{p.help}}
+            </template>
+            </small>
+        </li>
+        </ul>
+    </div>
+</template>
+
+<script lang="ts" src="./Suggestions.ts"></script>

resources/[gameplay]/chat/html/config.ts

@@ -1,6 +1,4 @@
-// DO NOT EDIT THIS FILE
+export default {
-// Copy it to `config.js` and edit it
-window.CONFIG = {
   defaultTemplateId: 'default', //This is the default template for 2 args1
   defaultAltTemplateId: 'defaultAlt', //This one for 1 arg
   templates: { //You can add static templates here
@@ -13,7 +11,7 @@ window.CONFIG = {
   suggestionLimit: 5,
   style: {
     background: 'rgba(52, 73, 94, 0.7)',
-    width: '38%',
+    width: '38vw',
     height: '22%',
   }
 };

resources/[gameplay]/chat/html/index.css

@@ -8,6 +8,14 @@
 .color-8{color: #cc0000;}
 .color-9{color: #cc0068;}
 
+.gameColor-w{color: #ffffff;}
+.gameColor-r{color: #ff4444;}
+.gameColor-g{color: #99cc00;}
+.gameColor-y{color: #ffbb33;}
+.gameColor-b{color: #33b5e5;}
+
+/* todo: more game colors */
+
 * {
   font-family: 'Lato', sans-serif;
   margin: 0;
@@ -63,26 +71,47 @@ em {
   box-sizing: border-box;
 }
 
+.chat-input > div.input {
+  position: relative;
+  display: flex;
+  align-items: stretch;
+  width: 100%;
+  background-color: rgba(44, 62, 80, 1.0);
+}
+
+.chat-hide-state {
+  text-transform: uppercase;
+  margin-left: 0.05vw;
+  font-size: 1.65vh;
+}
+
 .prefix {
   font-size: 1.8vh;
-  position: absolute;
+  /*position: absolute;
-  margin-top: 0.5%;
+  top: 0%;*/
-  left: 0.208%;
+  height: 100%;
+  vertical-align: middle;
+  line-height: calc(1vh + 1vh + 1.85vh);
+  padding-left: 0.5vh;
+  text-transform: uppercase;
+  font-weight: bold;
+  display: inline-block;
 }
 
 textarea {
   font-size: 1.65vh;
+  line-height: 1.85vh;
   display: block;
-  box-sizing: border-box;
+  box-sizing: content-box;
-  padding: 1%;
+  padding: 1vh;
-  padding-left: 3.5%;
+  padding-left: 0.5vh;
   color: white;
-  background-color: rgba(44, 62, 80, 1.0);
-  width: 100%;
   border-width: 0;
   height: 3.15%;
   overflow: hidden;
   text-overflow: ellipsis;
+  flex: 1;
+  background-color: transparent;
 }
 
 textarea:focus, input:focus {
@@ -123,5 +152,9 @@ textarea:focus, input:focus {
 }
 
 .hidden {
-  display: none;
+  opacity: 0;
+}
+
+.hidden.animated {
+  transition: opacity 1s;
 }

resources/[gameplay]/chat/html/index.d.ts

@@ -0,0 +1,4 @@
+declare module '*.vue' {
+    import Vue from 'vue'
+    export default Vue
+}

resources/[gameplay]/chat/html/index.html

@@ -3,115 +3,12 @@
 <head>
   <meta charset="utf-8">
   <title></title>
-  <link href="vendor/latofonts.css" rel="stylesheet">
+  <link href="/html/vendor/latofonts.css" rel="stylesheet">
-  <link href="vendor/flexboxgrid.6.3.1.min.css" rel="stylesheet"></link>
+  <link href="/html/vendor/flexboxgrid.6.3.1.min.css" rel="stylesheet"></link>
-  <link href="vendor/animate.3.5.2.min.css" rel="stylesheet"></link>
+  <link href="/html/vendor/animate.3.5.2.min.css" rel="stylesheet"></link>
   <link href="index.css" rel="stylesheet"></link>
-
-  <script src="vendor/vue.2.3.3.min.js" type="text/javascript"></script>
-  <script src="config.default.js" type="text/javascript"></script>
-  <script src="config.js" type="text/javascript"></script>
 </head>
 <body>
   <div id="app"></div>
-
-  <!-- App Template -->
-  <script type="text/x-template" id="app_template">
-    <div id="app">
-      <div class="chat-window" :style="this.style" :class="{ 'fadeOut animated': !showWindow, 'hidden': shouldHide }">
-        <div class="chat-messages" ref="messages">
-          <message v-for="msg in messages"
-                   :templates="templates"
-                   :multiline="msg.multiline"
-                   :args="msg.args"
-                   :color="msg.color"
-                   :template="msg.template"
-                   :template-id="msg.templateId"
-                   :key="msg">
-          </message>
-        </div>
-      </div>
-      <div class="chat-input" v-show="showInput">
-        <div>
-          <span class="prefix">➤</span>
-          <textarea v-model="message"
-                    ref="input"
-                    type="text"
-                    autofocus
-                    spellcheck="false"
-                    @keyup.esc="hideInput"
-                    @keyup="keyUp"
-                    @keydown="keyDown"
-                    @keypress.enter.prevent="send">
-          </textarea>
-        </div>
-        <suggestions :message="message" :suggestions="suggestions">
-        </suggestions>
-      </div>
-    </div>
-  </script>
-
-  <!-- Message Template -->
-  <script type="text/x-template" id="message_template">
-    <div class="msg" :class="{ multiline }">
-      <span v-html="textEscaped"></span>
-    </div>
-  </script>
-
-  <!-- Suggestions Template -->
-  <script type="text/x-template" id="suggestions_template">
-    <div class="suggestions-wrap" v-show="currentSuggestions.length > 0">
-      <ul class="suggestions">
-        <li class="suggestion" v-for="s in currentSuggestions">
-          <p>
-            <span :class="{ 'disabled': s.disabled }">
-              {{s.name}}
-            </span>
-            <span class="param"
-                  v-for="(p, index) in s.params"
-                  :class="{ 'disabled': p.disabled }">
-              [{{p.name}}]
-            </span>
-          </p>
-          <small class="help">
-            <template v-if="!s.disabled">
-              {{s.help}}
-            </template>
-            <template v-for="p in s.params" v-if="!p.disabled">
-              {{p.help}}
-            </template>
-          </small>
-        </li>
-      </ul>
-    </div>
-  </script>
-
-  <!-- Scripts -->
-  <script type="text/javascript" src="./Suggestions.js"></script>
-  <script type="text/javascript" src="./Message.js"></script>
-  <script type="text/javascript" src="./App.js"></script>
-
-  <!-- Main Entry -->
-  <script type="text/javascript">
-  window.post = (url, data) => {
-    var request = new XMLHttpRequest();
-    request.open('POST', url, true);
-    request.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
-    request.send(data);
-  }
-
-  const instance = new Vue({
-    el: '#app',
-    render: h => h(APP),
-  });
-
-  window.emulate = (type, detail = {}) => {
-    detail.type = type;
-    window.dispatchEvent(new CustomEvent('message', {
-      detail,
-    }));
-  };
-  </script>
-
 </body>
 </html>

resources/[gameplay]/chat/html/main.ts

@@ -0,0 +1,7 @@
+import Vue from 'vue';
+import App from './App.vue';
+
+const instance = new Vue({
+    el: '#app',
+    render: h => h(App),
+});

resources/[gameplay]/chat/html/tsconfig.json

@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "outDir": "./",
+        "module": "es6",
+        "strict": true,
+        "moduleResolution": "node",
+        "target": "es6",
+        "allowJs": true,
+        "lib": [
+            "es2017",
+            "dom"
+        ]
+    },
+    "include": [
+        "./**/*"
+    ],
+    "exclude": []
+}

resources/[gameplay]/chat/html/utils.ts

@@ -0,0 +1,31 @@
+export function post(url: string, data: any) {
+    var request = new XMLHttpRequest();
+    request.open('POST', url, true);
+    request.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+    request.send(data);
+}
+
+function emulate(type: string, detail = {}) {
+    const detailRef = {
+        type,
+        ...detail
+    };
+
+    window.dispatchEvent(new CustomEvent('message', {
+        detail: detailRef
+    }));
+}
+
+(window as any)['emulate'] = emulate;
+
+(window as any)['demo'] = () => {
+    emulate('ON_MESSAGE', {
+        message: {
+            args: [ 'me', 'hello!' ]
+        }
+    })
+
+    emulate('ON_SCREEN_STATE_CHANGE', {
+        shouldHide: false
+    });
+};

resources/[gameplay]/chat/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "chat",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "@types/vue": "^2.0.0",
+    "copy-webpack-plugin": "^5.1.1",
+    "css-loader": "^3.4.2",
+    "html-webpack-inline-source-plugin": "^0.0.10",
+    "html-webpack-plugin": "^3.2.0",
+    "ts-loader": "^6.2.1",
+    "typescript": "^3.8.3",
+    "vue": "^2.6.11",
+    "vue-loader": "^15.9.0",
+    "vue-template-compiler": "^2.6.11",
+    "webpack": "4"
+  },
+  "devDependencies": {
+    "command-line-args": "^5.1.1",
+    "webpack-cli": "^3.3.11",
+    "webpack-dev-server": "^3.10.3"
+  }
+}

resources/[gameplay]/chat/sv_chat.lua

@@ -7,43 +7,238 @@ RegisterServerEvent('_chat:messageEntered')
 RegisterServerEvent('chat:clear')
 RegisterServerEvent('__cfx_internal:commandFallback')
 
-AddEventHandler('_chat:messageEntered', function(author, color, message)
+-- this is a built-in event, but somehow needs to be registered
+RegisterNetEvent('playerJoining')
+
+exports('addMessage', function(target, message)
+    if not message then
+        message = target
+        target = -1
+    end
+
+    if not target or not message then return end
+
+    TriggerClientEvent('chat:addMessage', target, message)
+end)
+
+local hooks = {}
+local hookIdx = 1
+
+exports('registerMessageHook', function(hook)
+    local resource = GetInvokingResource()
+    hooks[hookIdx + 1] = {
+        fn = hook,
+        resource = resource
+    }
+
+    hookIdx = hookIdx + 1
+end)
+
+local modes = {}
+
+local function getMatchingPlayers(seObject)
+    local players = GetPlayers()
+    local retval = {}
+
+    for _, v in ipairs(players) do
+        if IsPlayerAceAllowed(v, seObject) then
+            retval[#retval + 1] = v
+        end
+    end
+
+    return retval
+end
+
+exports('registerMode', function(modeData)
+    if not modeData.name or not modeData.displayName or not modeData.cb then
+        return false
+    end
+
+    local resource = GetInvokingResource()
+
+    modes[modeData.name] = modeData
+    modes[modeData.name].resource = resource
+
+    local clObj = {
+        name = modeData.name,
+        displayName = modeData.displayName,
+        color = modeData.color or '#fff',
+        isChannel = modeData.isChannel,
+        isGlobal = modeData.isGlobal,
+    }
+
+    if not modeData.seObject then
+        TriggerClientEvent('chat:addMode', -1, clObj)
+    else
+        for _, v in ipairs(getMatchingPlayers(modeData.seObject)) do
+            TriggerClientEvent('chat:addMode', v, clObj)
+        end
+    end
+
+    return true
+end)
+
+local function unregisterHooks(resource)
+    local toRemove = {}
+
+    for k, v in pairs(hooks) do
+        if v.resource == resource then
+            table.insert(toRemove, k)
+        end
+    end
+
+    for _, v in ipairs(toRemove) do
+        hooks[v] = nil
+    end
+
+    toRemove = {}
+
+    for k, v in pairs(modes) do
+        if v.resource == resource then
+            table.insert(toRemove, k)
+        end
+    end
+
+    for _, v in ipairs(toRemove) do
+        TriggerClientEvent('chat:removeMode', -1, {
+            name = v
+        })
+
+        modes[v] = nil
+    end
+end
+
+local function routeMessage(source, author, message, mode, fromConsole)
+    if source >= 1 then
+        author = GetPlayerName(source)
+    end
+
+    local outMessage = {
+        color = { 255, 255, 255 },
+        multiline = true,
+        args = { message },
+        mode = mode
+    }
+
+    if author ~= "" then
+        outMessage.args = { author, message }
+    end
+
+    if mode and modes[mode] then
+        local modeData = modes[mode]
+
+        if modeData.seObject and not IsPlayerAceAllowed(source, modeData.seObject) then
+            return
+        end
+    end
+
+    local messageCanceled = false
+    local routingTarget = -1
+
+    local hookRef = {
+        updateMessage = function(t)
+            -- shallow merge
+            for k, v in pairs(t) do
+                if k == 'template' then
+                    outMessage['template'] = v:gsub('%{%}', outMessage['template'] or '@default')
+                elseif k == 'params' then
+                    if not outMessage.params then
+                        outMessage.params = {}
+                    end
+
+                    for pk, pv in pairs(v) do
+                        outMessage.params[pk] = pv
+                    end
+                else
+                    outMessage[k] = v
+                end
+            end
+        end,
+
+        cancel = function()
+            messageCanceled = true
+        end,
+
+        setSeObject = function(object)
+            routingTarget = getMatchingPlayers(object)
+        end,
+
+        setRouting = function(target)
+            routingTarget = target
+        end
+    }
+
+    for _, hook in pairs(hooks) do
+        if hook.fn then
+            hook.fn(source, outMessage, hookRef)
+        end
+    end
+
+    if modes[mode] then
+        local m = modes[mode]
+
+        m.cb(source, outMessage, hookRef)
+    end
+
+    if messageCanceled then
+        return
+    end
+
+    TriggerEvent('chatMessage', source, #outMessage.args > 1 and outMessage.args[1] or '', outMessage.args[#outMessage.args])
+
+    if not WasEventCanceled() then
+        if type(routingTarget) ~= 'table' then
+            TriggerClientEvent('chat:addMessage', routingTarget, outMessage)
+        else
+            for _, id in ipairs(routingTarget) do
+                TriggerClientEvent('chat:addMessage', id, outMessage)
+            end
+        end
+    end
+
+    if not fromConsole then
+        print(author .. '^7' .. (modes[mode] and (' (' .. modes[mode].displayName .. ')') or '') .. ': ' .. message .. '^7')
+    end
+end
+
+AddEventHandler('_chat:messageEntered', function(author, color, message, mode)
     if not message or not author then
         return
     end
 
-    TriggerEvent('chatMessage', source, author, message)
+    local source = source
 
-    if not WasEventCanceled() then
+    routeMessage(source, author, message, mode)
-        TriggerClientEvent('chatMessage', -1, author,  { 255, 255, 255 }, message)
-    end
-
-    print(author .. '^7: ' .. message .. '^7')
 end)
 
 AddEventHandler('__cfx_internal:commandFallback', function(command)
     local name = GetPlayerName(source)
 
-    TriggerEvent('chatMessage', source, name, '/' .. command)
+    -- route the message as if it were a /command
-
+    routeMessage(source, name, '/' .. command, nil, true)
-    if not WasEventCanceled() then
-        TriggerClientEvent('chatMessage', -1, name, { 255, 255, 255 }, '/' .. command) 
-    end
 
     CancelEvent()
 end)
 
 -- player join messages
-AddEventHandler('chat:init', function()
+AddEventHandler('playerJoining', function()
+    if GetConvarInt('chat_showJoins', 1) == 0 then
+        return
+    end
+
     TriggerClientEvent('chatMessage', -1, '', { 255, 255, 255 }, '^2* ' .. GetPlayerName(source) .. ' joined.')
 end)
 
 AddEventHandler('playerDropped', function(reason)
+    if GetConvarInt('chat_showQuits', 1) == 0 then
+        return
+    end
+
     TriggerClientEvent('chatMessage', -1, '', { 255, 255, 255 }, '^2* ' .. GetPlayerName(source) ..' left (' .. reason .. ')')
 end)
 
 RegisterCommand('say', function(source, args, rawCommand)
-    TriggerClientEvent('chatMessage', -1, (source == 0) and 'console' or GetPlayerName(source), { 255, 255, 255 }, rawCommand:sub(5))
+    routeMessage(source, (source == 0) and 'console' or GetPlayerName(source), rawCommand:sub(5), nil, true)
 end)
 
 -- command suggestions for clients
@@ -67,7 +262,22 @@ local function refreshCommands(player)
 end
 
 AddEventHandler('chat:init', function()
+    local source = source
     refreshCommands(source)
+
+    for _, modeData in pairs(modes) do
+        local clObj = {
+            name = modeData.name,
+            displayName = modeData.displayName,
+            color = modeData.color or '#fff',
+            isChannel = modeData.isChannel,
+            isGlobal = modeData.isGlobal,
+        }
+
+        if not modeData.seObject or IsPlayerAceAllowed(source, modeData.seObject) then
+            TriggerClientEvent('chat:addMode', source, clObj)
+        end
+    end
 end)
 
 AddEventHandler('onServerResourceStart', function(resName)
@@ -77,3 +287,7 @@ AddEventHandler('onServerResourceStart', function(resName)
         refreshCommands(player)
     end
 end)
+
+AddEventHandler('onResourceStop', function(resName)
+    unregisterHooks(resName)
+end)

resources/[gameplay]/chat/webpack.config.js

@@ -0,0 +1,45 @@
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin');
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
+const CopyPlugin = require('copy-webpack-plugin');
+
+module.exports = {
+    mode: 'production',
+    entry: './html/main.ts',
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                loader: 'ts-loader',
+                exclude: /node_modules/,
+                options: {
+                  appendTsSuffixTo: [/\.vue$/],
+                }
+            },
+            {
+                test: /\.vue$/,
+                loader: 'vue-loader'
+            },
+        ]
+    },
+    plugins: [
+        new VueLoaderPlugin(),
+        new HtmlWebpackPlugin({
+            inlineSource: '.(js|css)$',
+            template: './html/index.html',
+            filename: 'ui.html'
+        }),
+        new HtmlWebpackInlineSourcePlugin(),
+        new CopyPlugin([
+            { from: 'html/index.css', to: 'index.css' }
+        ]),
+    ],
+    resolve: {
+        extensions: [ '.ts', '.js' ]
+    },
+	output: {
+		filename: 'chat.js',
+		path: __dirname + '/dist/'
+    },
+    //devtool: 'inline-source-map'
+};

resources/[gameplay]/player-data/fxmanifest.lua

@@ -0,0 +1,12 @@
+version '1.0.0'
+description 'A basic resource for storing player identifiers.'
+author 'Cfx.re <pr@fivem.net>'
+
+fx_version 'bodacious'
+game 'common'
+
+server_script 'server.lua'
+
+provides {
+    'cfx.re/playerData.v1alpha1'
+}

resources/[gameplay]/player-data/server.lua

@@ -0,0 +1,222 @@
+--- player-data is a basic resource to showcase player identifier storage
+--
+-- it works in a fairly simple way: a set of identifiers is assigned to an account ID, and said
+-- account ID is then returned/added as state bag
+--
+-- it also implements the `cfx.re/playerData.v1alpha1` spec, which is exposed through the following:
+-- - getPlayerId(source: string)
+-- - getPlayerById(dbId: string)
+-- - getPlayerIdFromIdentifier(identifier: string)
+-- - setting `cfx.re/playerData@id` state bag field on the player
+
+-- identifiers that we'll ignore (e.g. IP) as they're low-trust/high-variance
+local identifierBlocklist = {
+    ip = true
+}
+
+-- function to check if the identifier is blocked
+local function isIdentifierBlocked(identifier)
+    -- Lua pattern to correctly split
+    local idType = identifier:match('([^:]+):')
+
+    -- ensure it's a boolean
+    return identifierBlocklist[idType] or false
+end
+
+-- our database schema, in hierarchical KVS syntax:
+-- player:
+--     <id>:
+--         identifier:
+--             <identifier>: 'true'
+-- identifier:
+--     <identifier>: <playerId>
+
+-- list of player indices to data
+local players = {}
+
+-- list of player DBIDs to player indices
+local playersById = {}
+
+-- a sequence field using KVS
+local function incrementId()
+    local nextId = GetResourceKvpInt('nextId')
+    nextId = nextId + 1
+    SetResourceKvpInt('nextId', nextId)
+
+    return nextId
+end
+
+-- gets the ID tied to an identifier in the schema, or nil
+local function getPlayerIdFromIdentifier(identifier)
+    local str = GetResourceKvpString(('identifier:%s'):format(identifier))
+
+    if not str then
+        return nil
+    end
+
+    return msgpack.unpack(str).id
+end
+
+-- stores the identifier + adds to a logging list
+local function setPlayerIdFromIdentifier(identifier, id)
+    local str = ('identifier:%s'):format(identifier)
+    SetResourceKvp(str, msgpack.pack({ id = id }))
+    SetResourceKvp(('player:%s:identifier:%s'):format(id, identifier), 'true')
+end
+
+-- stores any new identifiers for this player ID
+local function storeIdentifiers(playerIdx, newId)
+    for _, identifier in ipairs(GetPlayerIdentifiers(playerIdx)) do
+        if not isIdentifierBlocked(identifier) then
+            -- TODO: check if the player already has an identifier of this type
+            setPlayerIdFromIdentifier(identifier, newId)
+        end
+    end
+end
+
+-- registers a new player (increments sequence, stores data, returns ID)
+local function registerPlayer(playerIdx)
+    local newId = incrementId()
+    storeIdentifiers(playerIdx, newId)
+
+    return newId
+end
+
+-- initializes a player's data set
+local function setupPlayer(playerIdx)
+    -- try getting the oldest-known identity from all the player's identifiers
+    local defaultId = 0xFFFFFFFFFF
+    local lowestId = defaultId
+
+    for _, identifier in ipairs(GetPlayerIdentifiers(playerIdx)) do
+        if not isIdentifierBlocked(identifier) then
+            local dbId = getPlayerIdFromIdentifier(identifier)
+
+            if dbId then
+                if dbId < lowestId then
+                    lowestId = dbId
+                end
+            end
+        end
+    end
+
+    -- if this is the default ID, register. if not, update
+    local playerId
+
+    if lowestId == defaultId then
+        playerId = registerPlayer(playerIdx)
+    else
+        storeIdentifiers(playerIdx, lowestId)
+        playerId = lowestId
+    end
+
+    -- add state bag field
+    if Player then
+        Player(playerIdx).state['cfx.re/playerData@id'] = playerId
+    end
+
+    -- and add to our caching tables
+    players[playerIdx] = {
+        dbId = playerId
+    }
+
+    playersById[tostring(playerId)] = playerIdx
+end
+
+-- we want to add a player pretty early
+AddEventHandler('playerConnecting', function()
+    local playerIdx = tostring(source)
+    setupPlayer(playerIdx)
+end)
+
+-- and migrate them to a 'joining' ID where possible
+RegisterNetEvent('playerJoining')
+
+AddEventHandler('playerJoining', function(oldIdx)
+    -- resource restart race condition
+    local oldPlayer = players[tostring(oldIdx)]
+
+    if oldPlayer then
+        players[tostring(source)] = oldPlayer
+        players[tostring(oldIdx)] = nil
+    else
+        setupPlayer(tostring(source))
+    end
+end)
+
+-- remove them if they're dropped
+AddEventHandler('playerDropped', function()
+    local player = players[tostring(source)]
+
+    if player then
+        playersById[tostring(player.dbId)] = nil
+    end
+
+    players[tostring(source)] = nil
+end)
+
+-- and when the resource is restarted, set up all players that are on right now
+for _, player in ipairs(GetPlayers()) do
+    setupPlayer(player)
+end
+
+-- also a quick command to get the current state
+RegisterCommand('playerData', function(source, args)
+    if not args[1] then
+        print('Usage:')
+        print('\tplayerData getId <dbId>: gets identifiers for ID')
+        print('\tplayerData getIdentifier <identifier>: gets ID for identifier')
+
+        return
+    end
+
+    if args[1] == 'getId' then
+        local prefix = ('player:%s:identifier:'):format(args[2])
+        local handle = StartFindKvp(prefix)
+        local key
+
+        repeat
+            key = FindKvp(handle)
+
+            if key then
+                print('result:', key:sub(#prefix + 1))
+            end
+        until not key
+
+        EndFindKvp(handle)
+    elseif args[1] == 'getIdentifier' then
+        print('result:', getPlayerIdFromIdentifier(args[2]))
+    end
+end, true)
+
+-- COMPATIBILITY for server versions that don't export provide
+local function getExportEventName(resource, name)
+	return string.format('__cfx_export_%s_%s', resource, name)
+end
+
+function AddExport(name, fn)
+    if not Citizen.Traits or not Citizen.Traits.ProvidesExports then
+        AddEventHandler(getExportEventName('cfx.re/playerData.v1alpha1', name), function(setCB)
+            setCB(fn)
+        end)
+    end
+
+    exports(name, fn)
+end
+
+-- exports
+AddExport('getPlayerIdFromIdentifier', getPlayerIdFromIdentifier)
+
+AddExport('getPlayerId', function(playerIdx)
+    local player = players[tostring(playerIdx)]
+
+    if not player then
+        return nil
+    end
+
+    return player.dbId
+end)
+
+AddExport('getPlayerById', function(playerId)
+    return playersById[tostring(playerId)]
+end)

resources/[managers]/mapmanager/mapmanager_shared.lua

@@ -37,7 +37,8 @@ function parseMap(file, owningResource)
 
     local env = {
         math = math, pairs = pairs, ipairs = ipairs, next = next, tonumber = tonumber, tostring = tostring,
-        type = type, table = table, string = string, _G = env
+        type = type, table = table, string = string, _G = env,
+        vector3 = vector3, quat = quat, vec = vec, vector2 = vector2
     }
 
     TriggerEvent('getMapDirectives', function(key, cb, undocb)

resources/[system]/[builders]/webpack/.gitignore

@@ -1,2 +1,2 @@
-yarn.lock
+.yarn.installed
 node_modules/

resources/[system]/[builders]/webpack/webpack_builder.js

@@ -4,7 +4,11 @@ const workerFarm = require('worker-farm');
 const async = require('async');
 let buildingInProgress = false;
 let currentBuildingModule = '';
-let currentBuildingScript = '';
+
+// some modules will not like the custom stack trace logic
+const ops = Error.prepareStackTrace;
+Error.prepareStackTrace = undefined;
+
 const webpackBuildTask = {
     shouldBuild(resourceName) {
         const numMetaData = GetNumResourceMetadata(resourceName, 'webpack_config');
@@ -71,11 +75,13 @@ const webpackBuildTask = {
         let buildWebpack = async () => {
             let error = null;
             const configs = [];
+            const promises = [];
             const numMetaData = GetNumResourceMetadata(resourceName, 'webpack_config');
 
             for (let i = 0; i < numMetaData; i++) {
                 configs.push(GetResourceMetadata(resourceName, 'webpack_config', i));
             }
+
             for (const configName of configs) {
                 const configPath = GetResourcePath(resourceName) + '/' + configName;
 
@@ -94,53 +100,62 @@ const webpackBuildTask = {
                     const resourcePath = path.resolve(GetResourcePath(resourceName));
 
                     while (buildingInProgress) {
-                        console.log(`webpack is busy by another process: we are waiting to compile  ${resourceName} (${configName})`);
+                        console.log(`webpack is busy: we are waiting to compile ${resourceName} (${configName})`);
                         await sleep(3000);
                     }
+
                     buildingInProgress = true;
                     currentBuildingModule = resourceName;
-                    currentBuildingScript = configName;
-                    workers({
-                        configPath,
-                        resourcePath,
-                        cachePath
-                    }, (err, outp) => {
-                        workerFarm.end(workers);
 
-                        if (err) {
+                    promises.push(new Promise((resolve, reject) => {
-                            console.error(err.stack || err);
+                        workers({
-                            if (err.details) {
+                            configPath,
-                                console.error(err.details);
+                            resourcePath,
+                            cachePath
+                        }, (err, outp) => {
+                            workerFarm.end(workers);
+
+                            if (err) {
+                                console.error(err.stack || err);
+                                if (err.details) {
+                                    console.error(err.details);
+                                }
+
+                                buildingInProgress = false;
+                                currentBuildingModule = '';
+                                currentBuildingScript = '';
+                                reject("worker farm webpack errored out");
+                                return;
                             }
 
-                            buildingInProgress = false;
+                            if (outp.errors) {
-                            currentBuildingModule = '';
+                                for (const error of outp.errors) {
-                            currentBuildingScript = '';
+                                    console.log(error);
-                            error = "worker farm webpack errored out";
+                                }
-                            console.error("worker farm webpack errored out");
+                                buildingInProgress = false;
-                            return;
+                                currentBuildingModule = '';
-                        }
+                                currentBuildingScript = '';
-
+                                reject("webpack got an error");
-                        if (outp.errors) {
+                                return;
-                            for (const error of outp.errors) {
-                                console.log(error);
                             }
-                            buildingInProgress = false;
-                            currentBuildingModule = '';
-                            currentBuildingScript = '';
-                            error = "webpack got an error";
-                            console.error("webpack got an error");
-                            return;
-                        }
 
-                        console.log(`${resourceName}: built ${configName}`);
+                            console.log(`${resourceName}: built ${configName}`);
 
-                        buildingInProgress = false;
+                            resolve();
-                        currentBuildingModule = '';
+                        });
-                        currentBuildingScript = '';
+                    }));
-                    });
                 }
             }
+
+            try {
+                await Promise.all(promises);
+            } catch (e) {
+                error = e.toString();
+            }
+
+            buildingInProgress = false;
+            currentBuildingModule = '';
+
             if (error) {
                 cb(false, error);
             } else cb(true);

resources/[system]/[builders]/yarn/yarn_builder.js

@@ -12,7 +12,7 @@ const yarnBuildTask = {
 			const resourcePath = GetResourcePath(resourceName);
 			
 			const packageJson = path.resolve(resourcePath, 'package.json');
-			const yarnLock = path.resolve(resourcePath, 'yarn.lock');
+			const yarnLock = path.resolve(resourcePath, '.yarn.installed');
 			
 			const packageStat = fs.statSync(packageJson);
 			
@@ -23,7 +23,7 @@ const yarnBuildTask = {
 					return true;
 				}
 			} catch (e) {
-				// no yarn.lock, but package.json - install time!
+				// no yarn.installed, but package.json - install time!
 				return true;
 			}
 		} catch (e) {
@@ -57,13 +57,8 @@ const yarnBuildTask = {
 					}
 
 					const resourcePath = GetResourcePath(resourceName);
-					const yarnLock = path.resolve(resourcePath, 'yarn.lock');
+					const yarnLock = path.resolve(resourcePath, '.yarn.installed');
-
+					fs.writeFileSync(yarnLock, '');
-					try {
-						fs.utimesSync(yarnLock, new Date(), new Date());
-					} catch (e) {
-
-					}
 
 					buildingInProgress = false;
 					currentBuildingModule = '';