Version Bump

`2.0.09` - `2.0.10`

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.07"
+version "2.0.10"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

shared/_loaders.lua

@@ -40,6 +40,7 @@ function onPlayerLoaded(func, onStart)
 
     if not loaded then
         local tempFunc = function()
+            Wait(2000)
             debugPrint("^6Bridge^7: ^2Executing onPlayerLoaded")
             func()
         end
@@ -49,7 +50,13 @@ function onPlayerLoaded(func, onStart)
             AddEventHandler('QBCore:Client:OnPlayerLoaded', tempFunc)
         elseif isStarted(ESXExport) then
             onPlayerFramework = ESXExport
-            AddEventHandler('esx:playerLoaded', tempFunc)
+            AddEventHandler('esx:playerLoaded', function()
+                if waitForSharedLoad() then
+                    if isStarted(ESXExport) then Wait(11000) end
+                    tempFunc()
+                end
+            end
+        )
         elseif isStarted(OXCoreExport) then
             onPlayerFramework = OXCoreExport
             AddEventHandler('ox:playerLoaded', tempFunc)
@@ -102,7 +109,11 @@ function onResourceStart(func, thisScript)
     debugPrint("^6Bridge^7: ^2Registering ^3onResourceStart^7()")
     AddEventHandler('onResourceStart', function(resourceName)
         if getScript() == resourceName and (thisScript or true) then
-            func()
+            if waitForSharedLoad() then
+                print("^6Bridge^7: ^2Shared Load Detected^7.")
+                if isStarted(ESXExport) then Wait(10000) end
+                func()
+            end
         end
     end)
 end
@@ -138,9 +149,7 @@ function waitForLogin()
     local loggedIn = false
 
     if isStarted(ESXExport) then
-        debugPrint("^6Bridge^7: ^3ESX waitForLogin^7() ^2running^7")
         while (GetGameTimer() - startTime) < timeout do
-            while not ESX do Wait(100) end
             local playerData = ESX.GetPlayerData()
             if playerData and playerData.job then
                 loggedIn = true
@@ -175,4 +184,26 @@ function waitForLogin()
         debugPrint("^6Bridge^7: ^2Player Login Detected^7.")
         return true
     end
+end
+
+function waitForSharedLoad()
+    local timeout = 100000  -- 10 seconds in milliseconds
+    local startTime = GetGameTimer()
+    local loaded = true
+    while ((not Jobs or not next(Jobs)) and (not Items or not next(Items)) and (not Vehicles or not next(Vehicles))) and (GetGameTimer() - startTime) < timeout do
+        print((GetGameTimer() - startTime) < timeout)
+        Wait(1000)
+        debugPrint("Waiting for Jobs, Items, and Vehicles to be loaded")
+        if Jobs and Items and Vehicles then
+            print("^6Bridge^7: ^2Jobs, Items, and Vehicles Loaded^7.")
+            loaded = true
+            break
+        end
+    end
+    if not loaded then
+        print("^4Error^7: ^2Timeout reached while waiting for shared load^7.")
+        return false
+    else
+        return true
+    end
 end

shared/_scriptversioncheck.lua

@@ -30,7 +30,7 @@ local scriptAuthor = ("^2by ^4"..GetResourceMetadata(getScript(), 'author', nil)
 print(scriptName.." ^7v"..scriptVersion.."^7 - "..scriptDescription.." "..scriptAuthor.."^7")
 
 function CheckVersion()
-    if isServer() then
+    if isServer() and GetResourceMetadata(getScript(), 'author', nil) == "Jimathy" then
         CreateThread(function()
             Wait(4000)
 

shared/coreloader.lua

@@ -9,7 +9,7 @@
 -------------------------------------------------------------
 -- Global Variable Initialization
 -------------------------------------------------------------
-Items, Vehicles, Jobs, Gangs, Core, ESX = {}, nil, nil, nil, nil, nil
+Items, Vehicles, Jobs, Gangs, Core = {}, nil, nil, nil, nil
 
 -------------------------------------------------------------
 -- Correct QB Inventory Export
@@ -96,13 +96,7 @@ elseif isStarted(QBExport) then
 
 elseif isStarted(ESXExport) then
     itemResource = ESXExport
-    ESX = exports[ESXExport]:getSharedObject()
-    while ESX == nil do
-        print("Waiting for ESX")
-        Wait(0)
-    end
     CreateThread(function()
-        while not ESX do Wait(0) end
         if isServer() then
             Items = ESX.GetItems()
             while not createCallback do Wait(100) end
@@ -140,6 +134,7 @@ end
 -------------------------------------------------------------
 -- Compile vehicles from the detected frameworks into a unified table.
 if isStarted(QBXExport) or isStarted(QBExport) then
+    vehResource = QBExport
     Core = Core or exports[QBExport]:GetCoreObject()
     Vehicles = Core and Core.Shared.Vehicles
     if isStarted(QBExport) and not isStarted(QBXExport) then
@@ -148,26 +143,23 @@ if isStarted(QBXExport) or isStarted(QBExport) then
             Vehicles = Core and Core.Shared.Vehicles
         end)
     end
-    vehResource = QBExport
 
 elseif isStarted(OXCoreExport) then
+    vehResource = OXCoreExport
     Vehicles = {}
     for k, v in pairs(Ox.GetVehicleData()) do
         Vehicles[k] = { model = k, hash = GetHashKey(k), price = v.price, name = v.name, brand = v.make }
     end
-    vehResource = OXCoreExport
 
 elseif isStarted(ESXExport) then
+    vehResource = ESXExport
     CreateThread(function()
         if isServer() then
-            vehResource = ESXExport
             createCallback(getScript()..":getVehiclesPrices", function(source)
                 return Vehicles
             end)
             while not MySQL do Wait(2000) print("^1Waiting for MySQL to exist") end
             Vehicles = MySQL.query.await('SELECT model, price, name FROM vehicles')
-            --jsonPrint(Vehicles)
-            --while not createCallback do print("waiting") Wait(100) end
         end
         if not isServer() then
             --while not triggerCallback do print("waiting") Wait(100) end
@@ -186,19 +178,19 @@ elseif isStarted(ESXExport) then
     end)
 
 elseif isStarted(RSGExport) then
+    vehResource = RSGExport
     Core = Core or exports[RSGExport]:GetCoreObject()
     Vehicles = Core and Core.Shared.Vehicles
     RegisterNetEvent('RSGCore:Client:UpdateObject', function()
         Core = Core or exports[RSGExport]:GetCoreObject()
         Vehicles = Core and Core.Shared.Vehicles
     end)
-    vehResource = RSGExport
 end
 if vehResource == nil then
     print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3starter^1.^2lua^7")
 else
     CreateThread(function()
-        while not Vehicles do Wait(1000) print("Waiting") end
+        while not Vehicles do Wait(1000) end
         debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
     end)
 end
@@ -246,27 +238,32 @@ elseif isStarted(QBExport) then
     end
 
 elseif isStarted(ESXExport) then
-    ESX = exports[ESXExport]:getSharedObject()
+    jobResource = ESXExport
     if isServer() then
+        -- If server, create callback to get jobs
+        createCallback(getScript()..":getESXJobs", function(source)
+            return Jobs
+        end)
+        -- Populate jobs table with ESX.GetJobs()
         Jobs = ESX.GetJobs()
+        --If retreived jobs is empty, wait for ESX to load
+        while countTable(Jobs) == 0 do
+            Jobs = ESX.GetJobs()
+            Wait(100)
+        end
+        -- Organise into a table the script can use
         for k, v in pairs(Jobs) do
             local count = countTable(Jobs[k].grades) - 1
             Jobs[k].grades[tostring(count)].isBoss = true
         end
+        -- ESX Default doesn't have gangs, so copy jobs to gangs
+        Gangs = Jobs
+    end
+    -- If client side, trigger callback to get jobs
+    if not isServer() then
+        Jobs = triggerCallback(getScript()..":getESXJobs")
         Gangs = Jobs
     end
-    CreateThread(function()
-        while not ESX do Wait(0) end
-        if isServer() then
-            createCallback(getScript()..":getJobs", function(source)
-                return Jobs
-            end)
-        end
-        if not isServer() then
-            Jobs = triggerCallback(getScript()..":getJobs")
-            Gangs = Jobs
-        end
-    end)
 
 elseif isStarted(RSGExport) then
     jobResource = RSGExport
@@ -281,7 +278,7 @@ end
 if jobResource == nil then
     print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3starter^1.^2lua^7")
 else
-    while not Jobs do Wait(100) end
+    while not Jobs do Wait(1000) end
     debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Jobs).." ^3Jobs^2 from ^7"..jobResource)
     debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Gangs).." ^3Gangs^2 from ^7"..jobResource)
 end

shared/crafting.lua

@@ -353,8 +353,8 @@ function makeItem(data)
                         Wait(200)
                     end
                     if isInventoryOpen() then
-                        print("^1Error^7: ^2Inventory is open, you tried to break things")
-                        crafted, crafting = false, false
+                        --print("^1Error^7: ^2Inventory is open, you tried to break things")
+                        crafted, crafting, CraftLock = false, false, false
                         return
                     end
                     if crafted then
@@ -368,8 +368,9 @@ function makeItem(data)
                             PlaySoundFromEntity(s.soundId, s.audioName, PlayerPedId(), s.audioRef, true, 0)
                         end
                         if isInventoryOpen() then
-                            print("^1Error^7: ^2Inventory is open, you tried to break things")
+                            --print("^1Error^7: ^2Inventory is open, you tried to break things")
                             crafted, crafting = false, false
+                            crafted, crafting, CraftLock = false, false, false
                             return
                         end
                         if crafting and progressBar({
@@ -462,7 +463,9 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
                 stashItems = getStash(name)
                 for k, v in pairs(craftable[ItemMake] or {}) do
                     for _, b in pairs(stashItems or {}) do
-                        if k == b.name then itemRemove[k] = v end
+                        if k == b.name then
+                            itemRemove[k] = v
+                        end
                     end
                 end
             end
@@ -470,7 +473,9 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
             stashItems = getStash(stashName)
             for k, v in pairs(craftable[ItemMake] or {}) do
                 for _, b in pairs(stashItems or {}) do
-                    if k == b.name then itemRemove[k] = v end
+                    if k == b.name then
+                        itemRemove[k] = v
+                    end
                 end
             end
         end

shared/helpers.lua

@@ -262,7 +262,7 @@ end
 --- ```
 function countTable(tbl)
     local i = 0
-    for _ in pairs(tbl) do i = i + 1 end
+    for _ in pairs(tbl) do i += 1 end
     return i
 end
 

shared/inventories.lua

@@ -99,7 +99,8 @@ function getPlayerInv(src)
         if src then
             grabInv = exports[QSInv]:GetInventory(src)
         else
-            grabInv = exports[QSInv]:getUserInventory()
+            --grabInv = exports[QSInv]:getUserInventory()
+            grabInv = triggerCallback(getScript().."getServerInvData", GetPlayerServerId(PlayerId()))
         end
 
     elseif isStarted(OrigenInv) then
@@ -171,6 +172,10 @@ function getPlayerInv(src)
     return grabInv, foundInv
 end
 
+createCallback(getScript()..":getServerInvData", function(source)
+    local src = source
+    return getPlayerInv(src)
+end)
 
 function isInventoryOpen()
     if isStarted(OXInv) then

shared/playerfunctions.lua

@@ -301,17 +301,17 @@ function ConsumeSuccess(itemName, type, data)
 
     if isStarted(ESXExport) then
         if hunger then
-            TriggerServerEvent(getScript()..":server:setNeed", "hunger", hunger * 10000)
+            TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
         end
         if thirst then
-            TriggerServerEvent(getScript()..":server:setNeed", "thirst", thirst * 10000)
+            TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
         end
     else
         if hunger then
-            TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + hunger)
+            TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + tonumber(hunger))
         end
         if thirst then
-            TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + thirst)
+            TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + tonumber(thirst))
         end
     end
 
@@ -325,7 +325,9 @@ function ConsumeSuccess(itemName, type, data)
         end
     end
 
-    getRandomReward(itemName)
+    if Config.Reward then
+        getRandomReward(itemName)
+    end
 end
 
 -------------------------------------------------------------

shared/shops.lua

@@ -48,7 +48,9 @@ function sellMenu(data)
                     header = k,
                     txt = "Amount of items: "..countTable(v.Items),
                     onSelect = function()
-                        v.onBack = function() sellMenu(origData) end
+                        v.onBack = function()
+                            sellMenu(origData)
+                        end
                         v.sellTable = data.sellTable[k]
                         sellMenu(v)
                     end,
@@ -57,8 +59,8 @@ function sellMenu(data)
         end
     end
     openMenu(Menu, {
-        header = data.sellTable.Header or "Amount of items: "..countTable(data.sellTable.Items),
-        headertxt = data.sellTable.Header and "Amount of items: "..countTable(data.sellTable.Items) or "",
+        header = data.sellTable.Header or "Amount of items: "..countTable(data.sellTable.Items or data.sellTable),
+        headertxt = data.sellTable.Header and "Amount of items: "..countTable(data.sellTable.Items or data.sellTable),
         canClose = true,
         onBack = data.onBack,
     })
@@ -105,12 +107,14 @@ function sellAnim(data)
     TriggerServerEvent(getScript().."Sellitems", data)
     lookEnt(data.ped)
     local dict = "mp_common"
-    playAnim(dict, "givetake2_a", 0.3, 2)
-    playAnim(dict, "givetake2_b", 0.3, 2, data.ped)
+    playAnim(dict, "givetake2_a", 0.3, 48)
+    playAnim(dict, "givetake2_b", 0.3, 48, data.ped)
     Wait(2000)
     StopAnimTask(PlayerPedId(), dict, "givetake2_a", 0.5)
     StopAnimTask(data.ped, dict, "givetake2_b", 0.5)
-    if data.onBack then data.onBack() end
+    if data.onBack then
+        data.onBack()
+    end
 end
 
 --- Server event handler for processing item sales.

shared/stashcontrol.lua

@@ -174,7 +174,7 @@ function openStash(data)
             })
         else
             TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-            TriggerServerEvent("ps-inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
         end
 
     elseif isStarted(RSGInv) then
@@ -332,34 +332,22 @@ function stashRemoveItem(stashItems, stashName, items)
     if type(stashName) ~= "table" then
         stashName = { stashName }
     end
+
     if isStarted(OXInv) then
         for k, v in pairs(items) do
-            if type(stashName) == "table" then
-                for _, name in pairs(stashName) do
-                    local success = exports[OXInv]:RemoveItem(name, k, v)
-                    if success then
-                        debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OXInv, k, v)
-                        break
-                    end
+            for _, name in pairs(stashName) do
+                local success = exports[OXInv]:RemoveItem(name, k, v)
+                if success then
+                    debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OXInv, k, v)
+                    break
                 end
-            else
-                exports[OXInv]:RemoveItem(stashName, k, v)
             end
         end
 
     elseif isStarted(QSInv) then
         for k, v in pairs(items) do
-            for l in pairs(stashItems) do
-                if stashItems[l].name == k then
-                    if (stashItems[l].amount - v) <= 0 then
-                        debugPrint("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v)
-                        stashItems[l] = nil
-                    else
-                        debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v)
-                        exports[QSInv]:RemoveItemIntoStash(stashName[1], k, v, l)
-                    end
-                end
-            end
+            exports[QSInv]:RemoveItemIntoStash(stashName[1], k, v)
+            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v)
         end
 
     elseif isStarted(CoreInv) then
@@ -393,7 +381,7 @@ function stashRemoveItem(stashItems, stashName, items)
 
     elseif isStarted(TgiannInv) then
         for k, v in pairs(items) do
-            local itemData = exports["tgiann-inventory"]:GetItemByNameFromSecondaryInventory("stash", stashName[1], k)
+            local itemData = exports[TgiannInv]:GetItemByNameFromSecondaryInventory("stash", stashName[1], k)
             exports[TgiannInv]:RemoveItemFromSecondaryInventory("stash", stashName[1], k, v, itemData.slot, nil)
             debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..TgiannInv, k, v)
         end
@@ -404,11 +392,6 @@ function stashRemoveItem(stashItems, stashName, items)
                 exports[QBInv]:RemoveItem(stashName[1], k, v, false, 'crafting')
                 debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
             end
-            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName[1].."^7'")
-            MySQL.Async.insert('INSERT INTO inventories (identifier, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-                ['stash'] = stashName[1],
-                ['items'] = json.encode(stashItems)
-            })
         else
             for k, v in pairs(items) do
                 for l in pairs(stashItems) do
@@ -423,14 +406,13 @@ function stashRemoveItem(stashItems, stashName, items)
                     end
                 end
             end
-            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash '^6"..stashName.."^7'")
+            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash '^6"..stashName[1].."^7'")
             MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-                ['stash'] = stashName,
+                ['stash'] = stashName[1],
                 ['items'] = json.encode(stashItems)
             })
         end
 
-
     elseif isStarted(PSInv) then
         for k, v in pairs(items) do
             for l in pairs(stashItems) do
@@ -445,9 +427,9 @@ function stashRemoveItem(stashItems, stashName, items)
                 end
             end
         end
-        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName.."^7'")
+        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3PS^2 stash ^7'^6"..stashName[1].."^7'")
         MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-            ['stash'] = stashName,
+            ['stash'] = stashName[1],
             ['items'] = json.encode(stashItems)
         })
 
@@ -456,11 +438,6 @@ function stashRemoveItem(stashItems, stashName, items)
             exports[RSGInv]:RemoveItem(stashName[1], k, v, false, 'crafting')
             debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..RSGInv, k, v)
         end
-        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName[1].."^7'")
-        MySQL.Async.insert('INSERT INTO inventories (identifier, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-            ['stash'] = stashName[1],
-            ['items'] = json.encode(stashItems)
-        })
     else
         print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
     end

starter.lua

@@ -57,78 +57,58 @@ if Config and Config.System then
     end
 end
 
--- Testing loading the core files here instead of in fxmanifests
+-- Load the core files here instead of in fxmanifests
 -- Forcefully loads the files and quietly, compared to fxmanifest complaining if they don't exist when you don't need them all
-
---[[
--- Shared framework file loader
-for k, v in pairs({ -- This is a specific load order
-    [Exports.OXLibExport] = "init.lua",
-    [Exports.OXCoreExport] = "lib/init.lua",
-    [Exports.ESXExport] = "imports.lua",
-    [Exports.QBXExport] = "modules/playerdata.lua",
-}) do
-    local state = GetResourceState(k)
-    -- if the resource is started, load the file
-    if state == "started" then
-        if type(v) == "string" then
-            v = { v }
-        end
-        for _, file in pairs(v) do
-            --print("^5CoreLoader^7: '"..k.."/"..file.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
-            local fileLoader = assert(load(LoadResourceFile(k, (file)), ('@@'..k..'/'..file)))
-            fileLoader()
-            print("^5CoreLoader^7: ^2loaded ^1Core ^2file^7: ^3"..k.."^7/^3"..(file):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
-        end
-    end
-
-    -- if script is in server, but not started warn the user
-    if state == "uninitialized" or state == "stopped" then
-        print("^5CoreLoader^7: ^3"..k.." ^1 found but it wasn't started^7. ^1Check your ^3server^7.^3cfg ^1load order^7")
-    end
-
-    -- debugging only, if the script is missing, warn the user
-    if state == "missing" then
-        if debugMode then
-            print("^5CoreLoader^7: ^3"..k.." ^2not found^7, ^2skipping")
-        end
-    end
-end
-
--- Client only file loader
-if not IsDuplicityVersion() then
-    for k, v in pairs({ -- This is a specific load order
+local filesToLoad = {
+    Shared = {
+        [Exports.OXLibExport] = { "init.lua" },
+        [Exports.OXCoreExport] = { "lib/init.lua" },
+        [Exports.ESXExport] = { "imports.lua" },
+        [Exports.QBXExport] = { "modules/playerdata.lua" },
+    },
+    Client = {
         ["PolyZone"] = { "client.lua", "BoxZone.lua", "EntityZone.lua", "CircleZone.lua", "ComboZone.lua" },
         ["warmenu"] = { "warmenu.lua", },
-    }) do
-        local state = GetResourceState(k)
-        -- if the resource is started, load the file
-        if state == "started" then
-            if type(v) == "string" then
-                v = { v }
-            end
-            for _, file in pairs(v) do
-                --print("^5CoreLoader^7: '"..k.."/"..file.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
-                local fileLoader = assert(load(LoadResourceFile(k, (file)), ('@@'..k..'/'..file)))
-                fileLoader()
-                print("^5CoreLoader^7: ^2loaded ^1Core ^2file^7: ^3"..k.."^7/^3"..(file):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
-            end
-        end
+    },
+}
 
-        -- if script is in server, but not started warn the user
-        if state == "uninitialized" or state == "stopped" then
-            print("^5CoreLoader^7: ^3"..k.." ^1 found but it wasn't started^7. ^1Check your ^3server^7.^3cfg ^1load order^7")
-        end
+-- Shared framework file loader
+for Type, ScriptTable in pairs(filesToLoad) do
+    if Type == "Client" and IsDuplicityVersion() then
+        goto continue
+    else
+        for scriptName, files in pairs(ScriptTable) do
+            local state = GetResourceState(scriptName)
+            -- if the resource is started, load the file
+            if state == "started" then
+                -- Force items into a table if they are not
+                if type(files) == "string" then
+                    files = { files }
+                end
+                for _, file in pairs(files) do
+                    --print("^5CoreLoader^7: '"..k.."/"..file.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
+                    local fileLoader = assert(load(LoadResourceFile(scriptName, (file)), ('@@'..scriptName..'/'..file)))
+                    fileLoader()
+                    print("^5CoreLoader^7: ^2loaded ^1Core ^2file^7: ^3"..scriptName.."^7/^3"..(file):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").." ^2into ^7'"..GetCurrentResourceName().."'")
+                end
+            end
 
-        -- debugging only, if the script is missing, warn the user
-        if state == "missing" then
-            if debugMode then
-                print("^3Warning^7: ^3"..k.." ^2not found^7, ^2skipping")
+            -- if script is in server, but not started warn the user
+            if state == "uninitialized" or state == "stopped" then
+                print("^5CoreLoader^7: ^3"..scriptName.." ^1 found but it wasn't started^7.")
+                print("^1Check your ^3server^7.^3cfg ^1load order^7")
+            end
+
+            -- debugging only, if the script is missing, warn the user
+            if state == "missing" then
+                if debugMode then
+                    print("^5CoreLoader^7: ^3"..scriptName.." ^2not found^7, ^2skipping")
+                end
             end
         end
     end
+    ::continue::
 end
-]]
 
 -- Load files here into the invoking script
 for _, v in pairs({ -- This is a specific load order

version.txt

@@ -1 +1 @@
-2.0.07
+2.0.10