Create .gitignore

Added more addons to list

.gitignore

@@ -0,0 +1,2 @@
+
+config_server.lua

README.md

@@ -4,19 +4,25 @@
 
 <p align='center'><b><a href="discord.gg/nc82d8zvjm">Discord</a></b>
 
-<p align='center'><b><a href="https://ndframework.gitbook.io/nd-framework/">Documentation</a></b>
+<p align='center'><b><a href="https://ndfw.gitbook.io/nd-framework/">Documentation</a></b>
 
 ## Dependency:
 [oxmysql](https://github.com/overextended/oxmysql/releases/download/v2.4.0/oxmysql.zip)
 
 ## Addons
+
+* [Ox Inventory](https://github.com/overextended/ox_inventory/releases)
 * [Character Selection](https://github.com/ND-Framework/ND_CharacterSelection)
+* [No Characters (use framework without character selection)](https://github.com/ND-Framework/ND_NoCharacters)
+* [Vehicle System](https://github.com/ND-Framework/ND_VehicleSystem)
+* [Dealerships](https://github.com/ND-Framework/ND_Dealership)
 * [Fuel (with nozzle and hose)](https://github.com/ND-Framework/ND_Fuel)
+* [Nitro](https://github.com/ND-Framework/ND_Nitro)
 * [Shot Spotter](https://github.com/ND-Framework/ND_ShotSpotter)
 * [Banking](https://github.com/ND-Framework/ND_Banking)
-* [Door locks](https://github.com/ND-Framework/ND_Doorlocks)
-* [Ox Inventory](https://github.com/overextended/ox_inventory/releases)
-* [No Characters (use framework without character selection)](https://github.com/ND-Framework/ND_NoCharacters)
+* [Doorlocks](https://github.com/ND-Framework/ND_Doorlocks)
+* [Properties](https://github.com/ND-Framework/ND_Properties)
+* [Appearance Shops](https://github.com/ND-Framework/ND_AppearanceShops)
 
 # Need support?
-[![Need Support?](https://user-images.githubusercontent.com/86536434/147299047-73691b78-2690-4786-b58b-27d24e48a0d2.png)](https://discord.gg/Z9Mxu72zZ6)
+[![Discord](https://discordapp.com/api/guilds/857672921912836116/widget.png?style=banner3)](https://discord.gg/Z9Mxu72zZ6)

client/functions.lua

@@ -8,4 +8,52 @@ end
 
 function NDCore.Functions.GetCharacters()
     return NDCore.Characters
+end
+
+-- Callbacks are licensed under LGPL v3.0
+-- <https://github.com/overextended/ox_lib>
+NDCore.callback = {}
+local events = {}
+
+RegisterNetEvent("ND:callbacks", function(key, ...)
+	local cb = events[key]
+	return cb and cb(...)
+end)
+
+local function triggerCallback(_, name, cb, ...)
+    local key = ("%s:%s"):format(name, math.random(0, 100000))
+	TriggerServerEvent(("ND:%s_cb"):format(name), key, ...)
+    
+    local promise = not cb and promise.new()
+
+	events[key] = function(response, ...)
+        response = { response, ... }
+		events[key] = nil
+
+		if promise then
+			return promise:resolve(response)
+		end
+
+        if cb then
+            cb(table.unpack(response))
+        end
+	end
+
+	if promise then
+		return table.unpack(Citizen.Await(promise))
+	end
+end
+
+setmetatable(NDCore.callback, {
+	__call = triggerCallback
+})
+
+function NDCore.callback.await(name, ...)
+    return triggerCallback(nil, name, false, ...)
+end
+
+function NDCore.callback.register(name, callback)
+    RegisterNetEvent(("ND:%s_cb"):format(name), function(key, ...)
+        TriggerServerEvent("ND:callbacks", key, callback(...))
+    end)
 end

fxmanifest.lua

@@ -15,16 +15,17 @@ shared_scripts {
 client_scripts {
     "client/main.lua",
     "client/functions.lua",
-    "client/events.lua"
+    "client/events.lua",
+    "shared/import.lua"
 }
-
 server_scripts {
     "@oxmysql/lib/MySQL.lua",
     "config_server.lua",
     "server/main.lua",
     "server/functions.lua",
     "server/events.lua",
-    "server/commands.lua"
+    "server/commands.lua",
+    "shared/import.lua"
 }
 
 exports {

server/events.lua

@@ -68,7 +68,8 @@ end)
 -- Update the characters clothes.
 RegisterNetEvent("ND:updateClothes", function(clothing)
     local player = source
-    NDCore.Functions.SetPlayerData(player, "clothing", clothing)
+    local character = NDCore.Players[player]
+    NDCore.Functions.SetPlayerData(character.id, "clothing", clothing)
 end)
 
 -- Disconnecting a player
@@ -111,4 +112,4 @@ AddEventHandler("onResourceStart", function(resourceName)
             NDCore.PlayersDiscordInfo[tonumber(playerId)] = discordInfo
         end
     end
-end)
+end)

server/functions.lua

@@ -690,6 +690,7 @@ function NDCore.Functions.VersionChecker(expectedResourceName, resourceName, dow
     end
     PerformHttpRequest(rawGithubLink, function(errorCode, resultData, resultHeaders)
         local i, j = tostring(resultData):find("version")
+        if not i or not j then return end
         local resultData = tostring(resultData):sub(i, j + 12)
         local resultData = resultData:gsub("version \"", "")
         local i, j = resultData:find("\"")
@@ -717,3 +718,53 @@ function NDCore.Functions.VersionChecker(expectedResourceName, resourceName, dow
     end)
 end
 NDCore.Functions.VersionChecker("ND_Core", GetCurrentResourceName(), "https://github.com/ND-Framework/ND_Core", "https://raw.githubusercontent.com/ND-Framework/ND_Core/main/fxmanifest.lua")
+
+
+-- Callbacks are licensed under LGPL v3.0
+-- <https://github.com/overextended/ox_lib>
+NDCore.callback = {}
+local events = {}
+
+RegisterNetEvent("ND:callbacks", function(key, ...)
+	local cb = events[key]
+	return cb and cb(...)
+end)
+
+function triggerCallback(_, name, playerId, cb, ...)
+	local key = ("%s:%s:%s"):format(name, math.random(0, 100000), playerId)
+	TriggerClientEvent(("ND:%s_cb"):format(name), playerId, key, ...)
+
+	local promise = not cb and promise.new()
+
+	events[key] = function(response, ...)
+        response = { response, ... }
+		events[key] = nil
+
+		if promise then
+			return promise:resolve(response)
+		end
+
+        if cb then
+            cb(table.unpack(response))
+        end
+	end
+
+	if promise then
+		return table.unpack(Citizen.Await(promise))
+	end
+end
+
+setmetatable(NDCore.callback, {
+	__call = triggerCallback
+})
+
+function NDCore.callback.await(name, playerId, ...)
+    return triggerCallback(nil, name, playerId, false, ...)
+end
+
+function NDCore.callback.register(name, callback)
+    RegisterNetEvent(("ND:%s_cb"):format(name), function(key, ...)
+        local src = source
+        TriggerClientEvent("ND:callbacks", src, key, callback(src, ...))
+    end)
+end

shared/import.lua

@@ -0,0 +1 @@
+NDCore = exports["ND_Core"]:GetCoreObject()