Merge pull request #813 from BerkieBb/main

Move usableitems back to the core

server/functions.lua

@@ -1,6 +1,7 @@
 QBCore.Functions = {}
 QBCore.Player_Buckets = {}
 QBCore.Entity_Buckets = {}
+QBCore.UsableItems = {}
 
 -- Getters
 -- Get your player first and then trigger a function on them
@@ -251,24 +252,12 @@ end
 
 -- Items
 
-function QBCore.Functions.CreateUseableItem(item, cb)
-    if GetResourceState('qb-inventory') == 'missing' then return end
-
-    if GetResourceState('qb-inventory') ~= 'started' then
-        CreateThread(function()
-            repeat
-                Wait(1000)
-            until GetResourceState('qb-inventory') == 'started'
-            exports['qb-inventory']:CreateUsableItem(item, cb)
-        end)
-    else
-        exports['qb-inventory']:CreateUsableItem(item, cb)
-    end
+function QBCore.Functions.CreateUseableItem(item, data)
+    QBCore.UsableItems[item] = data
 end
 
 function QBCore.Functions.CanUseItem(item)
-    if GetResourceState('qb-inventory') == 'missing' then return end
-    return exports['qb-inventory']:GetUsableItem(item)
+    return QBCore.UsableItems[item]
 end
 
 function QBCore.Functions.UseItem(source, item)
@@ -276,16 +265,6 @@ function QBCore.Functions.UseItem(source, item)
     exports['qb-inventory']:UseItem(source, item)
 end
 
-exports('SetUseableItems', function(val)
-    QBCore.UseableItems = val
-end)
-
-exports('SetUseableItem', function(item, cb)
-    QBCore.UseableItems[item] = cb
-end)
-
-exports('GetUseableItems', function() return QBCore.UseableItems end)
-
 -- Kick Player
 
 function QBCore.Functions.Kick(source, reason, setKickReason, deferrals)

server/main.lua

@@ -3,7 +3,6 @@ QBCore.Config = QBConfig
 QBCore.Shared = QBShared
 QBCore.ClientCallbacks = {}
 QBCore.ServerCallbacks = {}
-QBCore.UseableItems = {}
 
 exports('GetCoreObject', function()
     return QBCore