finish and load compat files

Author: DemiAutomatic

client/compat/interact.lua

@@ -1,127 +1,124 @@
---- compat for https://github.com/darktrovx/interact
-
--- Utility function to generate UUIDs (for compatibility with the second script)
 local function generateUUID()
     return ('xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'):gsub('[xy]', function(c)
         local v = (c == 'x') and math.random(0, 0xf) or math.random(8, 0xb)
         return ('%x'):format(v)
     end)
 end
 
--- Export handler to register functions as exports
 local function exportHandler(exportName, func)
     AddEventHandler(('__cfx_export_interact_%s'):format(exportName), function(setCB)
         setCB(func)
     end)
 end
 
--- Convert options from the second script to sleepless_interact's Option structure
-local function convertOptions(options, resource, id)
+local function convert(data, resource)
     local converted = {}
-    for _, option in ipairs(options) do
+    local id = data.id or generateUUID()
+    for i = 1, #data.options do
+        local option = data.options[i]
         local newOption = {
             label = option.label or "Unnamed Option",
             icon = option.icon,
             iconColor = option.iconColor,
-            distance = option.distance,
+            distance = data.interactDst or 1.0,
             canInteract = option.canInteract,
-            name = option.name or id,
+            groups = data.groups,
+            name = id,
             resource = resource,
-            offset = option.offset,
-            bones = option.bone, -- Map 'bone' to 'bones' in sleepless_interact
-            onSelect = option.onSelect,
-            cooldown = option.cooldown,
-            export = option.export,
+            offset = data.offset,
+            bones = (data.bone and { data.bone }) or nil,
+            onSelect = option.action,
+            cooldown = 1000,
             event = option.event,
             serverEvent = option.serverEvent,
-            command = option.command
         }
-        -- Handle groups (jobs) if present
-        if option.groups or option.job then
-            newOption.groups = option.groups or option.job
-        end
         converted[#converted + 1] = newOption
     end
-    return converted
+    return converted, id
 end
 
--- AddInteraction (coords-based)
 exportHandler('AddInteraction', function(data)
     local coords = data.coords
-    local options = convertOptions(data.options, GetInvokingResource())
+    local options = convert(data, GetInvokingResource())
     local id = interact.addCoords(coords, options)
-    return id -- Returns the coordinate-based ID from sleepless_interact
+    return id
 end)
 
--- AddLocalEntityInteraction
 exportHandler('AddLocalEntityInteraction', function(data)
     local entity = data.entity
-    local options = convertOptions(data.options, GetInvokingResource())
-    interact.addLocalEntity({ entity }, options)
-    -- Generate a UUID since addLocalEntity doesn't return an ID
-    return generateUUID()
+    local options, id = convert(data, GetInvokingResource())
+    interact.addLocalEntity(entity, options)
+    return id
 end)
 
--- AddEntityInteraction (networked entity)
 exportHandler('AddEntityInteraction', function(data)
     local netId = data.netId
-    local options = convertOptions(data.options, GetInvokingResource())
-    interact.addEntity({ netId }, options)
-    -- Generate a UUID since addEntity doesn't return an ID
-    return generateUUID()
+    local options, id = convert(data, GetInvokingResource())
+    interact.addEntity(netId, options)
+    return id
 end)
 
--- AddGlobalVehicleInteraction
 exportHandler('AddGlobalVehicleInteraction', function(data)
-    local options = convertOptions(data.options, GetInvokingResource())
+    local options, id = convert(data, GetInvokingResource())
     interact.addGlobalVehicle(options)
-    -- Generate a UUID since addGlobalVehicle doesn't return an ID
-    return generateUUID()
+    return id
 end)
 
--- AddGlobalPlayerInteraction
 exportHandler('addGlobalPlayerInteraction', function(data)
-    local options = convertOptions(data.options, GetInvokingResource())
+    local options, id = convert(data, GetInvokingResource())
     interact.addGlobalPlayer(options)
-    -- Generate a UUID since addGlobalPlayer doesn't return an ID
-    return generateUUID()
+    return id
 end)
 
--- AddModelInteraction
 exportHandler('AddModelInteraction', function(data)
     local model = data.model
-    local options = convertOptions(data.options, GetInvokingResource())
+    local options, id = convert(data, GetInvokingResource())
     interact.addModel(model, options)
-    -- Generate a UUID since addModel doesn't return an ID
-    return generateUUID()
+    return id
 end)
 
--- RemoveInteraction (by ID)
 exportHandler('RemoveInteraction', function(id)
-    interact.removeCoords(id, nil, true) -- Remove coords-based interaction by ID
+    interact.removeCoords(id, nil, true)
 end)
 
--- RemoveLocalEntityInteraction
 exportHandler('RemoveLocalEntityInteraction', function(entity, id)
-    interact.removeLocalEntity({ entity }, id)
+    interact.removeLocalEntity(entity, id)
 end)
 
--- RemoveEntityInteraction
 exportHandler('RemoveEntityInteraction', function(netId, id)
-    interact.removeEntity({ netId }, id)
+    interact.removeEntity(netId, id)
 end)
 
--- RemoveModelInteraction
 exportHandler('RemoveModelInteraction', function(model, id)
     interact.removeModel(model, id)
 end)
 
--- RemoveGlobalVehicleInteraction
 exportHandler('RemoveGlobalVehicleInteraction', function(id)
     interact.removeGlobalVehicle(id)
 end)
 
--- RemoveGlobalPlayerInteraction
 exportHandler('RemoveGlobalPlayerInteraction', function(id)
     interact.removeGlobalPlayer(id)
-end)
+end)
+
+
+
+-- local id = exports.interact:AddInteraction({
+--     coords = GetEntityCoords(cache.ped),
+--     distance = 8.0,           -- optional
+--     interactDst = 1.0,        -- optional
+--     id = 'myCoolUniqueId',    -- needed for removing interactions
+--     name = 'interactionName', -- optional
+--     options = {
+--         {
+--             label = 'Hello World!',
+--             action = function(entity, coords, args)
+--                 print(entity, coords, json.encode(args))
+--             end,
+--         },
+--     }
+-- })
+
+-- SetTimeout(3000, function()
+--     exports.interact:RemoveInteraction(id)
+-- end)

client/main.lua

@@ -3,6 +3,10 @@ local store = require 'client.modules.store'
 local config = require 'client.modules.config'
 local utils = require 'client.modules.utils'
 
+require 'client.compat.qtarget'
+require 'client.compat.ox_target'
+require 'client.compat.interact'
+
 ---@type boolean
 local drawLoopRunning = false
 
@@ -418,7 +422,7 @@ local function drawLoop()
 
                 SetDrawOrigin(coords.x, coords.y, coords.z)
 
-                if not foundValid and data.validCount > 0 then
+                if not foundValid and data.validOpts and data.validCount > 0 then
                     foundValid = true
                     DrawSprite(dui.instance.dictName, dui.instance.txtName, 0.0, 0.0, 1.0, 1.0, 0.0, 255, 255, 255, 255)
                     local newClosestId = item.bone or item.offset or item.entity or item.coordId

client/modules/config.lua

@@ -11,7 +11,7 @@ config.themeColor = { 28, 100, 184, 200 } --- r, g, b, a
 config.IndicatorSprite = { dict = 'shared', txt = 'emptydot_32' }
 
 -- boolean true/false use a keybind to show and hide the interactions
-config.useShowKeyBind = true
+config.useShowKeyBind = false
 
 -- string default key mapping for the show interactions keybind
 config.defaultShowKeyBind = 'LMENU'

fxmanifest.lua

@@ -19,6 +19,7 @@ files {
 	'web/**',
 	'client/modules/*.lua',
 	'client/framework/*.lua',
+	'client/compat/*.lua'
 }
 
 provides {