enhance built in ui target code

Now properly tracks scripts that added a new target, if that is restarted it created ones properly

If an overriding target is sent, use that and remove old one

ui_modules/target.lua

@@ -1,5 +1,4 @@
 -- Global Key Table, defined once.
----
 local KEY_TABLE = { 38, 29, 47, 23, 45, 159, 162, 163 }
 
 -- Mapping of key codes to human-readable key names.
@@ -17,122 +16,196 @@ local Keys = {
     [20] = "Z", [73] = "X", [26] = "C", [0] = "V",  [29] = "B", [249] = "N",
     [244] = "M", [82] = ",", [81] = "."
 }
--- Tables for storing created targets.
-local TextTargets    = {}   -- For fallback DrawText3D targets.
-local targetEntities = {}   -- For entity targets.
 
-function createEntityTarget(entity, opts, dist)
-    startTargetLoop()
-    targetEntities[#targetEntities + 1] = entity
-    local entityCoords = GetEntityCoords(entity)
 
-    local existingTarget = nil
+-- ===== Ownership + indexes =====
-    for _, target in pairs(TextTargets) do
+-- TextTargets: key -> target data (coords/entity/models/options/etc.)
-        if #(target.coords - entityCoords) < 0.01 then
+local TextTargets = {}
-            existingTarget = target
+-- targetEntities kept for parity (not strictly required)
-            break
+local targetEntities = {}
+
+-- registry: key -> owner, owner -> set(keys)
+local TargetRegistry = { byKey = {}, byResource = {} }
+
+local function getOwnerResource()
+    return GetInvokingResource() or GetCurrentResourceName() or "unknown"
+end
+
+local function registerTarget(owner, key)
+    -- move key across owners if replacing
+    local prev = TargetRegistry.byKey[key]
+    if prev and TargetRegistry.byResource[prev] then
+        TargetRegistry.byResource[prev][key] = nil
+    end
+    TargetRegistry.byKey[key] = owner
+    TargetRegistry.byResource[owner] = TargetRegistry.byResource[owner] or {}
+    TargetRegistry.byResource[owner][key] = true
+end
+
+local function removeTargetKey(key, reason)
+    local owner = TargetRegistry.byKey[key]
+    if TextTargets[key] then
+        TextTargets[key] = nil
+        -- print("^6Bridge^7:^5 Target^7: ^2Removed target '%s'%s", key, reason and (" ("..reason..")") or "")
+    end
+    if owner then
+        if TargetRegistry.byResource[owner] then
+            TargetRegistry.byResource[owner][key] = nil
+        end
+        TargetRegistry.byKey[key] = nil
     end
 end
 
-    if existingTarget then
+AddEventHandler("onResourceStop", function(res)
-        for i = 1, #opts do
+    local owned = TargetRegistry.byResource[res]
-            local key = KEY_TABLE[#existingTarget.options + i]
+    if not owned then return end
-            opts[i].key = key
+    local cnt = 0
-            existingTarget.buttontext[#existingTarget.buttontext + 1] = " ~b~[~w~" .. Keys[key] .. "~b~] ~w~" .. opts[i].label
+    for key in pairs(owned) do
-            existingTarget.options[#existingTarget.options + 1] = opts[i]
+        removeTargetKey(key, "resource stopped: "..res)
+        cnt = cnt + 1
     end
-        updateCachedText(existingTarget)
+    TargetRegistry.byResource[res] = nil
-    else
+    -- print("^6Bridge^7:^5 Target^7: ^2Cleared "..cnt.." target(s) from '"..res.."'")
+end)
+
+-- ===== Helpers =====
+local function vecKey(v)
+    -- stable rounded coord string for entity dedupe when name isn't provided
+    return ("%.3f,%.3f,%.3f"):format(v.x, v.y, v.z)
+end
+
+local function bakeButtons(opts)
     local tempText = {}
     for i = 1, #opts do
         opts[i].key = KEY_TABLE[i]
-            tempText[#tempText + 1] = " ~b~[~w~" .. Keys[opts[i].key] .. "~b~] ~w~" .. opts[i].label
+        tempText[#tempText + 1] =
-        end
+            (" ~b~[~w~%s~b~] ~w~%s"):format(Keys[opts[i].key] or ("K"..opts[i].key), opts[i].label or ("Option "..i))
-        TextTargets[entity] = {
-            coords = vec3(entityCoords.x, entityCoords.y, entityCoords.z),
-            buttontext = tempText,
-            options = opts,
-            dist = dist,
-            text = table.concat(tempText, "\n")
-        }
     end
+    return tempText
 end
 
+-- Update cached text blob
+local function updateCachedText(target)
+    target.text = table.concat(target.buttontext, "\n")
+end
+
+-- ===== Public API: Create targets =====
+-- ENTITY: createEntityTarget(entity, opts, dist, nameOpt?)
+function createEntityTarget(entity, opts, dist, name)
+    startTargetLoop()
+
+    if not entity or entity == 0 then return end
+    targetEntities[#targetEntities + 1] = entity
+
+    local owner = getOwnerResource()
+    local coords = GetEntityCoords(entity)
+    local key    = tostring(name) or ("entity@" .. vecKey(coords))
+
+    -- Always overwrite on same key
+    local buttontext = bakeButtons(opts)
+    TextTargets[key] = {
+        _key   = key,
+        _type  = "entity",
+        _owner = owner,
+        entity = entity,
+        coords = vec3(coords.x, coords.y, coords.z),
+        buttontext = buttontext,
+        options    = opts,
+        dist       = dist,
+    }
+    updateCachedText(TextTargets[key])
+    registerTarget(owner, key)
+    -- print("^6Bridge^7:^5 Target^7: ^2Added/Updated ENTITY target '"..key.."' by '"..owner.."' @ "..formatCoord(coords))
+    return key
+end
+
+-- ZONE: createZoneTarget(data, opts, dist)
+-- Expect data[1] = id/name, data[2] = vec3 coords (as in your original)
 function createZoneTarget(data, opts, dist)
     startTargetLoop()
-    local existingTarget = nil
-    for _, target in pairs(TextTargets) do
-        if #(target.coords - data[2]) < 0.01 then
-            existingTarget = target
-            break
-        end
-    end
 
-    if existingTarget then
+    local owner = getOwnerResource()
-        for i = 1, #opts do
+    local zname = tostring(data[1] or ("zone@"..vecKey(data[2] or vec3(0,0,0))))
-            local key = KEY_TABLE[#existingTarget.options + i]
+    local coords = data[2]
-            opts[i].key = key
+
-            existingTarget.buttontext[#existingTarget.buttontext + 1] = " ~b~[~w~" .. Keys[key] .. "~b~] ~w~" .. opts[i].label
+    local buttontext = bakeButtons(opts)
-            existingTarget.options[#existingTarget.options + 1] = opts[i]
+    TextTargets[zname] = {
-        end
+        _key   = zname,
-        updateCachedText(existingTarget)
+        _type  = "zone",
-    else
+        _owner = owner,
-        local tempText = {}
+        coords = coords,
-        for i = 1, #opts do
+        buttontext = buttontext,
-            opts[i].key = KEY_TABLE[i]
-            tempText[#tempText + 1] = " ~b~[~w~" .. Keys[opts[i].key] .. "~b~] ~w~" .. opts[i].label
-        end
-        TextTargets[data[1]] = {
-            coords = data[2],
-            buttontext = tempText,
         options    = opts,
         dist       = dist,
-            text = table.concat(tempText, "\n")
     }
-    end
+    updateCachedText(TextTargets[zname])
-    return data[1]
+    registerTarget(owner, zname)
+    -- print("^6Bridge^7:^5 Target^7: ^2Added/Updated ZONE target '"..zname.."' by '"..owner.."' @ "..formatCoord(coords))
+    return zname
 end
 
-function createModelTarget(models, opts, dist)
+-- MODEL: createModelTarget(models, opts, dist, nameOpt?)
+function createModelTarget(models, opts, dist, name)
     startTargetLoop()
-    if type(models) ~= "table" then
+
-        models = { models }
+    local owner = getOwnerResource()
+    if type(models) ~= "table" then models = { models } end
+
+    local key
+    if name then
+        key = tostring(name)
+    else
+        local parts = {}
+        for i, m in ipairs(models) do parts[i] = tostring(m) end
+        key = "model_" .. table.concat(parts, "_")
     end
 
-    local tempText = {}
+    local buttontext = bakeButtons(opts)
-    for i = 1, #opts do
+    TextTargets[key] = {
-        opts[i].key = KEY_TABLE[i]
+        _key   = key,
-        tempText[#tempText + 1] = " ~b~[~w~" .. Keys[opts[i].key] .. "~b~] ~w~" .. opts[i].label
+        _type  = "model",
-    end
+        _owner = owner,
-
-    local keyStr = ""
-    for i, m in ipairs(models) do
-        keyStr = keyStr .. tostring(m) .. (i < #models and "_" or "")
-    end
-    local targetKey = "model_" .. keyStr
-
-    TextTargets[targetKey] = {
         models = models,
-        buttontext = tempText,
+        buttontext = buttontext,
         options    = opts,
         dist       = dist,
-        coords = vec3(0, 0, 0),
+        coords     = vec3(0, 0, 0), -- will be updated by the refresher
-        text = table.concat(tempText, "\n")
     }
-
+    updateCachedText(TextTargets[key])
-    return targetKey
+    registerTarget(owner, key)
+    -- print("^6Bridge^7:^5 Target^7: ^2Added/Updated MODEL target '"..key.."' by '"..owner.."' (models: "..table.concat(models, ",")..")")
+    return key
 end
 
-function removeEntityTarget(entity)
+-- ===== Public API: Remove targets =====
-    TextTargets[entity] = nil
+-- Entity removal accepts entity handle or key string.
+function removeEntityTarget(entityOrKey)
+    local key = nil
+    if type(entityOrKey) == "string" then
+        key = entityOrKey
+    elseif type(entityOrKey) == "number" then
+        for k, t in pairs(TextTargets) do
+            if t._type == "entity" and t.entity == entityOrKey then key = k break end
+        end
+        if not key then
+            -- Fallback: try coord-key match
+            local c = GetEntityCoords(entityOrKey)
+            local guess = "entity@"..vecKey(c)
+            if TextTargets[guess] then key = guess end
+        end
+    end
+    if key then removeTargetKey(key, "removeEntityTarget") end
 end
 
-function removeZoneTarget(target)
+function removeZoneTarget(key)
-    TextTargets[target] = nil
+    if not key then return end
+    removeTargetKey(key, "removeZoneTarget")
 end
 
-function removeModelTarget(model)
+-- For models, pass the returned key from createModelTarget (recommended).
-    TextTargets[model] = nil
+function removeModelTarget(key)
+    if not key then return end
+    removeTargetKey(key, "removeModelTarget")
 end
 
 exports("createEntityTarget", createEntityTarget)
@@ -143,22 +216,20 @@ exports("removeEntityTarget", removeEntityTarget)
 exports("removeZoneTarget", removeZoneTarget)
 exports("removeModelTarget", removeModelTarget)
 
-
 -------------------------------------------------------------
 -- Fallback: DrawText3D Targets (Experimental)
 -------------------------------------------------------------
 local started = false
 function startTargetLoop()
     if started then return end
-    Config = {
-        System = {
-
-        }
-    }
     started = true
+
+    -- lazy include (unchanged from your original)
+    Config = { System = {} }
     local fileLoader = assert(load(LoadResourceFile("jim_bridge", ('starter.lua')), ('@@jim_bridge/starter.lua')))
     fileLoader()
-    -- Model Entity Refresher
+
+    -- Model Entity Refresher (kept)
     CreateThread(function()
         while true do
             local pedCoords = GetEntityCoords(PlayerPedId())
@@ -178,7 +249,7 @@ function startTargetLoop()
         end
     end)
 
-    -- Main Target Loop
+    -- Main Target Loop (unchanged logic, just uses new TextTargets entries)
     CreateThread(function()
         while true do
             local ped = PlayerPedId()
@@ -238,12 +309,11 @@ function startTargetLoop()
                 ::continue::
             end
 
-            Wait(1) -- Throttled
+            Wait(1)
         end
     end)
 end
 
-
 function DrawText3D(coord, text, highlight)
     SetTextScale(0.30, 0.30)
     SetTextFont(0)
@@ -253,12 +323,12 @@ function DrawText3D(coord, text, highlight)
     SetTextCentre(true)
 
     local totalLength = string.len(text)
-    local textMaxLength = 99 -- max 99
+    local textMaxLength = 99
-    local text = totalLength > textMaxLength and text:sub(1, totalLength - (totalLength - textMaxLength)) or text
+    local txt = totalLength > textMaxLength and text:sub(1, textMaxLength) or text
-    AddTextComponentString(highlight and text:gsub("%~w~", "~y~") or text)
+    AddTextComponentString(highlight and txt:gsub("%~w~", "~y~") or txt)
     SetDrawOrigin(coord.x, coord.y, coord.z, 0)
     DrawText(0.0, 0.0)
-    local count, length = GetLineCountAndMaxLength(text)
+    local count, length = GetLineCountAndMaxLength(txt)
 
     local padding = 0.005
     local heightFactor = (count / 43) + padding
@@ -271,19 +341,10 @@ function DrawText3D(coord, text, highlight)
     ClearDrawOrigin()
 end
 
---- Calculates the number of lines and the maximum line length from the given text.
----
---- @param text string The text to analyze.
---- @return number, number The line count and maximum line length.
----
---- @usage
---- ```lua
---- local count, maxLen = GetLineCountAndMaxLength("Hello World")
---- ```
 function GetLineCountAndMaxLength(text)
     local lineCount, maxLength = 0, 0
     for line in text:gmatch("[^\n]+") do
-        lineCount += 1
+        lineCount = lineCount + 1
         local lineLength = string.len(line)
         if lineLength > maxLength then
             maxLength = lineLength
@@ -293,7 +354,6 @@ function GetLineCountAndMaxLength(text)
     return lineCount, maxLength
 end
 
-
 function RotationToDirection(rot)
     local adjust = math.pi / 180
     return vec3(
@@ -311,8 +371,3 @@ function normalizeVector(vec)
         return vec3(0, 0, 0)
     end
 end
-
--- Helper to update cached text.
-function updateCachedText(target)
-    target.text = table.concat(target.buttontext, "\n")
-end