From 1ebcb8f492fb127c8e44bc610118a5d5d4ff2919 Mon Sep 17 00:00:00 2001 From: gononono64 Date: Sat, 18 Jan 2025 05:31:33 -0600 Subject: [PATCH 01/10] some other stuff yum --- modules/input/_oxlib.lua | 55 +++++++++++++++++++++ modules/input/_qb-input.lua | 69 ++++++++++++++++++++++++++ modules/input/client.lua | 97 ++----------------------------------- modules/menu/_oxlib.lua | 2 +- modules/menu/_qb-menu.lua | 5 +- modules/menu/client.lua | 6 --- settings/clientConfig.lua | 2 +- 7 files changed, 132 insertions(+), 104 deletions(-) create mode 100644 modules/input/_oxlib.lua create mode 100644 modules/input/_qb-input.lua diff --git a/modules/input/_oxlib.lua b/modules/input/_oxlib.lua new file mode 100644 index 0000000..8b52b20 --- /dev/null +++ b/modules/input/_oxlib.lua @@ -0,0 +1,55 @@ +if GetResourceState('ox_lib') ~= 'started' or (BridgeClientConfig.InputSystem ~= "ox" and BridgeClientConfig.InputSystem ~= "auto") then return end + + + +function QBTypeToOxType(_type) + if _type == "text" then + return "input" + elseif _type == "password" then + return "input" + elseif _type == "number" then + return "number" + elseif _type == "radio" then + return "checkbox" + elseif _type == "checkbox" then + return "checkbox" + elseif _type == "select" then + return "select" + end +end + + +function QBToOxInput(data) + local returnData = {} + for i, v in pairs(data) do + local input = { + label = v.text, + name = i, + type = QBTypeToOxType(v.type), + required = v.isRequired, + default = v.placeholder, + } + if v.type == "select" then + input.options = {} + for i, v in pairs(v.options) do + table.insert(input.options, {value = v.value, label = v.text}) + end + elseif v.type == "checkbox" then + for i, v in pairs(v.options) do + table.insert(returnData, {value = v.value, label = v.text}) + end + end + table.insert(returnData, input) + end + return returnData +end + + +function OpenInput(title, data, isQBFormat, submitText) + local inputs = data.inputs + if isQBFormat then + return lib.inputDialog(title, QBToOxInput(inputs)) + else + return lib.inputDialog(title, data) + end +end \ No newline at end of file diff --git a/modules/input/_qb-input.lua b/modules/input/_qb-input.lua new file mode 100644 index 0000000..933fe0e --- /dev/null +++ b/modules/input/_qb-input.lua @@ -0,0 +1,69 @@ + +if GetResourceState('qb-input') ~= 'started' or (BridgeClientConfig.InputSystem ~= "qb" and BridgeClientConfig.InputSystem ~= "auto") then return end + + +-- ox to Qb +function OxTypeToQBType(_type) + if _type == "input" then + return "text" + elseif _type == "number" then + return "number" + elseif _type == "checkbox" then + return "checkbox" + elseif _type == "select" then + return "select" + elseif _type == "multi-select" then + return "select" + elseif _type == "slider" then + return "number" + elseif _type == "color" then + return "text" + elseif _type == "date" then + return "date" + elseif _type == "date-range" then + return "date" + elseif _type == "time" then + return "time" + elseif _type == "textarea" then + return "text" + end +end + +function OxToQBInput(data) + local returnData = {} + for i, v in pairs(data) do + local input = { + text = v.label, + name = i, + type = OxTypeToQBType(v.type), + isRequired = v.required, + placeholder = v.default, + } + if v.type == "select" then + input.text = "" + input.options = { + {value = v.value, text = v.label} + } + elseif v.type == "checkbox" then + input.text = "" + input.options = { + {value = v.value, text = v.label} + } + end + table.insert(returnData, input) + end + return returnData +end + +function OpenInput(title, data, isQBFormat, submitText) + print("Opening input", json.encode(data)) + local input = data.inputs + if not isQBFormat then + input = OxToQBInput(data) + end + return exports['qb-input']:ShowInput({ + header = title, + submitText = submitText or "Submit", + inputs = input + }) +end \ No newline at end of file diff --git a/modules/input/client.lua b/modules/input/client.lua index 8993def..e3067ac 100644 --- a/modules/input/client.lua +++ b/modules/input/client.lua @@ -79,104 +79,13 @@ if GetResourceState('ox_lib') ~= 'started' and GetResourceState('qb-menu') ~= 's Input = {} --- ox to Qb -function OxTypeToQBType(_type) - if _type == "input" then - return "text" - elseif _type == "number" then - return "number" - elseif _type == "checkbox" then - return "checkbox" - elseif _type == "select" then - return "select" - elseif _type == "multi-select" then - return "select" - elseif _type == "slider" then - return "number" - elseif _type == "color" then - return "text" - elseif _type == "date" then - return "date" - elseif _type == "date-range" then - return "date" - elseif _type == "time" then - return "time" - elseif _type == "textarea" then - return "text" - end -end -function OxToQBInput(data) - local returnData = {} - for i, v in pairs(data) do - local input = { - text = v.label, - name = i, - type = OxTypeToQBType(v.type), - isRequired = v.required, - placeholder = v.default, - } - if v.type == "select" then - input.text = "" - input.options = { - {value = v.value, text = v.label} - } - elseif v.type == "checkbox" then - input.text = "" - input.options = { - {value = v.value, text = v.label} - } - end - table.insert(returnData, input) - end - return returnData -end + + -- qb to ox -function QBTypeToOxType(_type) - if _type == "text" then - return "input" - elseif _type == "password" then - return "input" - elseif _type == "number" then - return "number" - elseif _type == "radio" then - return "checkbox" - elseif _type == "checkbox" then - return "checkbox" - elseif _type == "select" then - return "select" - end -end - - -function QBToOxInput(data) - local returnData = {} - for i, v in pairs(data) do - local input = { - label = v.text, - name = i, - type = QBTypeToOxType(v.type), - required = v.isRequired, - default = v.placeholder, - } - if v.type == "select" then - input.options = {} - for i, v in pairs(v.options) do - table.insert(input.options, {value = v.value, label = v.text}) - end - elseif v.type == "checkbox" then - for i, v in pairs(v.options) do - table.insert(returnData, {value = v.value, label = v.text}) - end - end - table.insert(returnData, input) - end - return returnData -end - --Open menu function Input.Open(title, data, isQBFormat, submitText) @@ -202,7 +111,7 @@ function Input.Open(title, data, isQBFormat, submitText) }) end end - return id + return OpenInput(title, data, isQBFormat, submitText) end --[[ diff --git a/modules/menu/_oxlib.lua b/modules/menu/_oxlib.lua index 3b602d7..a21207a 100644 --- a/modules/menu/_oxlib.lua +++ b/modules/menu/_oxlib.lua @@ -1,4 +1,4 @@ -if GetResourceState('ox_lib') ~= 'started' and (BridgeClientConfig.MenuSystem ~= "ox" or BridgeClientConfig.MenuSystem ~= "auto") then return end +if GetResourceState('ox_lib') ~= 'started' or (BridgeClientConfig.MenuSystem ~= "ox" and BridgeClientConfig.MenuSystem ~= "auto") then return end Menus = Menus or {} --- Converts a QB menu to an Ox menu. ---@param id string The menu ID. diff --git a/modules/menu/_qb-menu.lua b/modules/menu/_qb-menu.lua index 990c19c..e0fff1a 100644 --- a/modules/menu/_qb-menu.lua +++ b/modules/menu/_qb-menu.lua @@ -1,4 +1,5 @@ -if GetResourceState('qb-menu') ~= 'started' and (BridgeClientConfig.MenuSystem ~= "qb" or BridgeClientConfig.MenuSystem ~= "auto") then return end +if GetResourceState('qb-menu') ~= 'started' or (BridgeClientConfig.MenuSystem ~= "qb" and BridgeClientConfig.MenuSystem ~= "auto") then return end +print("Loading QB Menu") --- Converts an Ox menu to a QB menu. ---@param id string The menu ID. ---@param menu table The Ox menu data. @@ -16,7 +17,7 @@ function OxToQBMenu(id, menu) txt = v.description, icon = v.icon, } - + if v.onSelect then button.params = { event = "community_bridge:client:MenuCallback", diff --git a/modules/menu/client.lua b/modules/menu/client.lua index fe005d9..fa84ab0 100644 --- a/modules/menu/client.lua +++ b/modules/menu/client.lua @@ -1,12 +1,6 @@ Menus = Menus or {} Menu = {} -if GetResourceState('ox_lib') ~= 'started' and GetResourceState('qb-menu') ~= 'started' then return end - - - - - --- Opens a menu based on the configuration. ---@param data table The menu data. ---@param useQb boolean Whether to use QB menu syntax. diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 02b8515..012fc3b 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -1,7 +1,7 @@ BridgeClientConfig = {} BridgeClientConfig.NotifySystem = "ox" -- Change this to your notification system (ox/qb/esx?) BridgeClientConfig.ZoneSystem = "ox" -- Change this to your dialog system (ox/poly) -BridgeClientConfig.InputSystem = "ox" -- Change this to your Input system (ox/qb) +BridgeClientConfig.InputSystem = "auto" -- Change this to your Input system (ox/qb) BridgeClientConfig.MenuSystem = "auto" -- Change this to your Menu system (ox/qb) BridgeClientConfig.ProgressBar = "ox" -- Change this to your preferred progress bar (ox/qb) BridgeClientConfig.DebugLevel = 3 -- Change this to your Debug level, 1 for none, 2 for some, 3 for all data From 3cac7816c5ee375785b332d95064fd39df577b5f Mon Sep 17 00:00:00 2001 From: qwezert Date: Sat, 18 Jan 2025 15:26:55 +0200 Subject: [PATCH 02/10] fix require old code --- fxmanifest.lua | 1 + settings/clientConfig.lua | 1 - settings/serverConfig.lua | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index f4ceaf4..0285e44 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -7,6 +7,7 @@ description 'A bridge made for the community to use as a base for their own proj version '0.1.4' shared_scripts { + '@ox_lib/init.lua', 'settings/sharedConfig.lua', 'use/*.lua', 'modules/utility/shared/*.lua', diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 012fc3b..cb3776c 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -7,5 +7,4 @@ BridgeClientConfig.ProgressBar = "ox" -- Change this to your preferr BridgeClientConfig.DebugLevel = 3 -- Change this to your Debug level, 1 for none, 2 for some, 3 for all data BridgeClientConfig.ShowHelpText = "ox" -- -Require("init.lua", "ox_lib") return BridgeClientConfig \ No newline at end of file diff --git a/settings/serverConfig.lua b/settings/serverConfig.lua index 8f5c478..932de94 100644 --- a/settings/serverConfig.lua +++ b/settings/serverConfig.lua @@ -3,6 +3,5 @@ BridgeServerConfig.LogSystem = "builtin" -- "builtin", "qb", "ox" BridgeServerConfig.WebhookURL = "PUT_WEBHOOK_URL_HERE" BridgeServerConfig.WebhookImage = "https://cdn.discordapp.com/avatars/299410129982455808/31ce635662206e8bd0132c34ce9ce683?size=1024" BridgeServerConfig.MaxInventorySlots = 50 -Require("init.lua", "ox_lib") return BridgeServerConfig From bb1697dabadb1784cf5a45a079d5fa27770ae35f Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 20 Jan 2025 05:02:45 -0500 Subject: [PATCH 03/10] Update client.lua --- modules/framework/qb-core/client.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index fd33406..ad73bda 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -71,9 +71,12 @@ RegisterNetEvent('QBCore:Client:OnJobUpdate', function(data) end) RegisterNetEvent('QBCore:Client:OnGangUpdate', function(data) + -- Unsure what data is passed in this, but considering the gang data isnt updating I doubt this was tested. + --[[ PlayerJobName = data.name PlayerJobLabel = data.label PlayerJobGradeName = data.grade.name PlayerJobGradeLevel = data.grade.level TriggerEvent('community_bridge:Client:OnPlayerGangUpdate', PlayerGangName, PlayerGangLabel, PlayerGangGradeName, PlayerGangGradeLevel) + --]] end) \ No newline at end of file From 6dce64a81a854f9a1cf8b7181d58d836b00d2d45 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 20 Jan 2025 05:05:03 -0500 Subject: [PATCH 04/10] experimental nd_core This is not complete, but **most** is done. This framework has duplicates of keys on the play, unsure on why but I assume some older versions compatibility? Out of the ones I used I think they may be the newest? Group systems kinda cool but a pain to bridge 5metrics reports 180 servers run this so it may be worth bridging. --- modules/framework/nd_core/client.lua | 61 ++++++ modules/framework/nd_core/server.lua | 275 +++++++++++++++++++++++++++ 2 files changed, 336 insertions(+) create mode 100644 modules/framework/nd_core/client.lua create mode 100644 modules/framework/nd_core/server.lua diff --git a/modules/framework/nd_core/client.lua b/modules/framework/nd_core/client.lua new file mode 100644 index 0000000..69f90ae --- /dev/null +++ b/modules/framework/nd_core/client.lua @@ -0,0 +1,61 @@ +if GetResourceState('ND_Core') ~= 'started' then return end + +local NDCore = exports["ND_Core"]:GetCoreObject() + +Framework = {} + +Framework.GetPlayerData = function() + return NDCore:getPlayer() +end + +Framework.GetPlayerMetaData = function(metadata) + return NDCore:getPlayer().metadata[metadata] +end + +--[[ +-- Unused by this framework +Framework.GetItemInfo = function(item) + +end + +Framework.GetPlayerInventory = function() + +end +--]] + +Framework.GetPlayerIdentifier = function() + return NDCore:getPlayer().id +end + +Framework.GetPlayerName = function() + return NDCore:getPlayer().fullname +end + +Framework.GetPlayerJob = function() + local player = NDCore:getPlayer().jobInfo + return player.name, player.label, player.rankname, player.rank +end + +Framework.GetIsPlayerDead = function() + local playerState = LocalPlayer.state + return playerState.dead +end + +RegisterNetEvent("ND:characterLoaded",function(character) + Wait(1500) + FillBridgeTables() + TriggerEvent('community_bridge:Client:OnPlayerLoaded') +end) + +RegisterNetEvent("ND:characterUnloaded",function() + ClearClientSideVariables() + TriggerEvent('community_bridge:Client:OnPlayerUnload') +end) + +RegisterNetEvent("ND:updateCharacter", function(character) + PlayerJobName = character.jobInfo.name + PlayerJobLabel = character.jobInfo.label + PlayerJobGradeName = character.jobInfo.rankName + PlayerJobGradeLevel = character.jobInfo.rank + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) +end) \ No newline at end of file diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua new file mode 100644 index 0000000..ee8aaec --- /dev/null +++ b/modules/framework/nd_core/server.lua @@ -0,0 +1,275 @@ +local NDCore = exports["ND_Core"]:GetCoreObject() + +Framework = {} + +-- Framework.GetPlayerIdentifier(src) +-- Returns the citizen ID of the player. +Framework.GetPlayerIdentifier = function(src) + local player = NDCore.getPlayer(src) + return player.id +end + +-- Framework.GetPlayerName(src) +-- Returns the first and last name of the player. +Framework.GetPlayerName = function(src) + local player = NDCore.getPlayer(src) + return player.fullname +end + +--[[ +-- Unused by this framework +Framework.GetItem = function(src, item, metadata) + +end + +Framework.GetItemCount = function(src, item, metadata) + +end + +Framework.GetPlayerInventory = function(src) + +end + +Framework.AddItem = function(src, item, amount, slot, metadata) + +end + +Framework.RemoveItem = function(src, item, amount, slot, metadata) + +end + +Framework.SetMetadata = function(src, item, slot, metadata) + +end + + +Framework.Commands = {} +Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) + +end + +--]] + +-- Framework.SetMetadata(src, metadata, value) +-- Adds the specified metadata key and number value to the player's data. +Framework.SetPlayerMetadata = function(src, metadata, value) + local player = NDCore.getPlayer(src) + player.setMetadata(metadata, value) + return true +end + +-- Framework.GetMetadata(src, metadata) +-- Gets the specified metadata key to the player's data. +Framework.GetPlayerMetadata = function(src, metadata) + local player = NDCore.getPlayer(src) + local playerData = player.getMetadata(metadata) + return playerData or false +end + +-- Framework.AddStress(src, value) +-- Adds the specified value to the player's stress level and updates the client HUD. +Framework.AddStress = function(src, value) + print("Not Bridged Yet") + return 0 +end + +-- Framework.RemoveStress(src, value) +-- Removes the specified value from the player's stress level and updates the client HUD. +Framework.RemoveStress = function(src, value) + print("Not Bridged Yet") + return 0 +end + +-- Framework.AddHunger(src, value) +-- Adds the specified value from the player's hunger level. +Framework.AddHunger = function(src, value) + local player = NDCore.getPlayer(src) + local oldHunger = player.getMetadata("hunger").status + local newHunger = (oldHunger or 0) + value + player.setMetadata('hunger', Math.Clamp(newHunger, 0, 100)) + return newHunger +end + +-- Framework.AddThirst(src, value) +-- Adds the specified value from the player's thirst level. +Framework.AddThirst = function(src, value) + local player = NDCore.getPlayer(src) + local oldThirst = player.getMetadata("thirst").status + local newThirst = (oldThirst or 0) + value + player.setMetadata('thirst', Math.Clamp(newThirst, 0, 100)) + return newThirst +end + +Framework.GetHunger = function(src) + local player = NDCore.getPlayer(src) + local hunger = player.getMetadata("hunger") + return hunger.status +end + +Framework.GetThirst = function(src) + local player = NDCore.getPlayer(src) + local thirst = player.getMetadata("thirst") + return thirst.status +end + +-- Framework.GetPlayerPhone(src) +-- Returns the phone number of the player. +Framework.GetPlayerPhone = function(src) + local player = NDCore.getPlayer(src) + return player.phonenumber +end + +-- Framework.GetPlayerGang(src) +-- Returns the gang name of the player. +Framework.GetPlayerGang = function(src) + print("Not Bridged Yet") + return "none" +end + +-- Framework.GetPlayersByJob(jobname) +-- returns a table of player sources that have the specified job name. +Framework.GetPlayersByJob = function(job) + local playerList = {} + local players = NDCore.getPlayers("job", job, false) + for playerSource, _ in pairs(players) do + table.insert(playerList, playerSource) + end + return playerList +end + +-- Framework.GetPlayerJob(src) +-- Returns the job name, label, grade name, and grade level of the player. +Framework.GetPlayerJob = function(src) + local player = NDCore.getPlayer(src) + local jobName, jobInfo = player.getJob() + return jobInfo.name, jobInfo.label, jobInfo.rankName, jobInfo.rank +end + +-- Framework.SetPlayerJob(src, name, grade) +-- Sets the player's job to the specified name and grade. +Framework.SetPlayerJob = function(src, name, grade) + local player = NDCore.getPlayer(src) + return player.setJob(name, grade) +end + +Framework.ToggleDuty = function(src, status) + print("Not Bridged Yet") + return false +end + +-- Framework.AddAccountBalance(src, _type, amount) +-- Adds the specified amount to the player's account balance of the specified type. +Framework.AddAccountBalance = function(src, _type, amount) + local player = NDCore.getPlayer(src) + if _type == 'money' then _type = 'cash' end + return player.addMoney(_type, amount, "") +end + +-- Framework.RemoveAccountBalance(src, _type, amount) +-- Removes the specified amount from the player's account balance of the specified type. +Framework.RemoveAccountBalance = function(src, _type, amount) + local player = NDCore.getPlayer(src) + if _type == 'money' then _type = 'cash' end + return player.deductMoney(_type, amount, "") +end + +-- Framework.GetAccountBalance(src, _type) +-- Returns the player's account balance of the specified type. +Framework.GetAccountBalance = function(src, _type) + local player = NDCore.getPlayer(src) + if _type == 'money' then _type = 'cash' end + return player.getAccount(_type) +end + +Framework.RegisterUsableItem = function(itemName, cb) + exports(itemName, function(event, item, inventory, slot, data) + local slotData = exports.ox_inventory:GetSlot(inventory.id, slot) + if event == 'usingItem' then + cb(inventory.id, item, slotData) + end + end) +end + +Citizen.CreateThread(function() + Wait(1000) + local player = NDCore.getPlayer(1) + print(json.encode(player)) +end) + +-- local otherdata = NDCore.Functions.GetSelectedCharacter() and NDCore:getPlayer() are the same shit? + + +--[[ +{"metadata":{ + "status":{"armor":{"max":100.0,"reversed":true,"type":"armor","status":0.0}, + "hunger":{"status":99.97333333333333,"type":"hunger","max":100.0}, + "thirst":{"status":99.97777777777778,"type":"thirst","max":100.0}, + "health":{"status":100.0,"type":"health","max":100.0}, + "stamina":{"status":100.0,"type":"stamina","max":100.0}, + "alcohol":{"max":100.0,"reversed":true,"type":"alcohol","status":0}} +,"clothing":{"tattoos":[],"eyeColor":0,"props":[{"prop_id":0,"drawable":-1,"texture":-1},{"prop_id":1,"drawable":-1,"texture":-1},{"prop_id":2,"drawable":-1,"texture":-1},{"prop_id":6,"drawable":-1,"texture":-1},{"prop_id":7,"drawable":-1,"texture":-1}],"hair":{"style":0,"color":0,"highlight":0},"model":"mp_m_freemode_01","headOverlays":{"complexion":{"style":0,"color":0,"opacity":0},"bodyBlemishes":{"style":0,"color":0,"opacity":0},"lipstick":{"style":0,"color":0,"opacity":0},"blemishes":{"style":0,"color":0,"opacity":0},"beard":{"style":0,"color":0,"opacity":0},"blush":{"style":0,"color":0,"opacity":0},"moleAndFreckles":{"style":0,"color":0,"opacity":0},"chestHair":{"style":0,"color":0,"opacity":0},"makeUp":{"style":0,"color":0,"opacity":0},"eyebrows":{"style":0,"color":0,"opacity":0},"ageing":{"style":0,"color":0,"opacity":0},"sunDamage":{"style":0,"color":0,"opacity":0}},"headBlend":{"shapeSecond":0,"skinMix":0,"skinFirst":0,"skinSecond":0,"shapeMix":0,"shapeFirst":0},"components":[{"component_id":0,"drawable":0,"texture":0},{"component_id":1,"drawable":0,"texture":0},{"component_id":2,"drawable":0,"texture":0},{"component_id":3,"drawable":0,"texture":0},{"component_id":4,"drawable":0,"texture":0},{"component_id":5,"drawable":0,"texture":0},{"component_id":6,"drawable":0,"texture":0},{"component_id":7,"drawable":0,"texture":0},{"component_id":8,"drawable":0,"texture":0},{"component_id":9,"drawable":0,"texture":0},{"component_id":10,"drawable":0,"texture":0},{"component_id":11,"drawable":0,"texture":0}],"faceFeatures":{"jawBoneBackSize":0,"chinBoneSize":0,"eyeBrownHigh":0,"noseBoneHigh":0,"eyeBrownForward":0,"chinBoneLenght":0,"nosePeakHigh":0,"noseBoneTwist":0,"chinHole":0,"noseWidth":0,"eyesOpening":0,"chinBoneLowering":0,"jawBoneWidth":0,"lipsThickness":0,"nosePeakLowering":0,"cheeksBoneHigh":0,"neckThickness":0,"nosePeakSize":0,"cheeksBoneWidth":0,"cheeksWidth":0}},"ethnicity":"wgggggggg"}, +"groups":{"lsfd":{"isJob":true,"isBoss":false,"label":"LSFD","name":"lsfd","metadata":[],"rank":1,"rankName":"Volunteer"}}, +"dob":"1993-09-22", +"bank":8800, +"lastname":"Wood", +"fullname":"Charles Wood", +"firstname":"Charles", +"cash":2500, +"discord":[], +"inventory":[], +"source":1, +"job":"lsfd", +"jobInfo":{"isJob":true,"isBoss":false,"label":"LSFD","name":"lsfd","metadata":[],"rank":1,"rankName":"Volunteer"}, +"gender":"Male", +"name":"MrNewb", +"id":1, +"identifiers":{"ip":"ip:192.168.0.248","license":"license:4348f174860e7f066756f8057ad7a1d8406e7624","discord":"discord:299410129982455808","live":"live:985156709508143","fivem":"fivem:627480","xbl":"xbl:2533274909557009"}, +"identifier":"license:4348f174860e7f066756f8057ad7a1d8406e7624"} +--]] + + +--[[ +{"id":1, +"setData":{"__cfx_functionReference":"ND_Core:931:12157"}, +"name":"MrNewb", +"job":"lsfd", +"inventory":[], +"triggerEvent":{"__cfx_functionReference":"ND_Core:931:12149"}, +"cash":2520, +"setCoords":{"__cfx_functionReference":"ND_Core:931:12143"}, +"jobInfo":{"label":"LSFD","metadata":[],"isBoss":false,"isJob":true,"name":"lsfd","rankName":"Volunteer","rank":1}, +"identifiers":{"license":"license:4348f174860e7f066756f8057ad7a1d8406e7624","discord":"discord:299410129982455808","fivem":"fivem:627480","xbl":"xbl:2533274909557009","live":"live:985156709508143","ip":"ip:192.168.0.248"}, +"source":1, +"getLicense":{"__cfx_functionReference":"ND_Core:931:12141"}, +"setJob":{"__cfx_functionReference":"ND_Core:931:12150"}, +"firstname":"Charles", +"depositMoney":{"__cfx_functionReference":"ND_Core:931:12142"}, +"fullname":"Charles Wood", +"groups":{"lsfd":{"label":"LSFD","metadata":[],"isBoss":false,"isJob":true,"name":"lsfd","rankName":"Volunteer","rank":1}}, +"unload":{"__cfx_functionReference":"ND_Core:931:12159"},"getData":{"__cfx_functionReference":"ND_Core:931:12158"}, +"bank":9999777780, +"gender":"Male", +"metadata":{"PlateCarrier":{"name":"fib_specops_carrier","metadata":{"PlateCarrier":true,"Clothing":{"drawable":{"male":11,"female":1},"texture":{"male":0,"female":0}},"Condition":70,"SerialNumber":"Y8TYAW175174I8","description":"\n\n Condition :70\n\n Strength:7\n\n Serial Number:Y8TYAW175174I8","Strength":7}},"deathInfo":false,"clothing":{"eyeColor":0,"props":[{"prop_id":0,"texture":-1,"drawable":-1},{"prop_id":1,"texture":-1,"drawable":-1},{"prop_id":2,"texture":-1,"drawable":-1},{"prop_id":6,"texture":-1,"drawable":-1},{"prop_id":7,"texture":-1,"drawable":-1}],"headBlend":{"shapeFirst":0,"skinSecond":0,"shapeMix":0,"shapeSecond":0,"skinMix":0,"skinFirst":0},"tattoos":[],"hair":{"style":0,"color":0,"highlight":0},"faceFeatures":{"eyeBrownForward":0,"cheeksBoneWidth":0,"neckThickness":0,"noseBoneTwist":0,"chinBoneSize":0,"lipsThickness":0,"cheeksBoneHigh":0,"chinHole":0,"cheeksWidth":0,"chinBoneLenght":0,"chinBoneLowering":0,"nosePeakLowering":0,"nosePeakSize":0,"nosePeakHigh":0,"jawBoneBackSize":0,"jawBoneWidth":0,"noseBoneHigh":0,"eyeBrownHigh":0,"eyesOpening":0,"noseWidth":0},"model":"mp_m_freemode_01","headOverlays":{"beard":{"opacity":0,"color":0,"style":0},"makeUp":{"opacity":0,"color":0,"style":0},"ageing":{"opacity":0,"color":0,"style":0},"moleAndFreckles":{"opacity":0,"color":0,"style":0},"lipstick":{"opacity":0,"color":0,"style":0},"bodyBlemishes":{"opacity":0,"color":0,"style":0},"complexion":{"opacity":0,"color":0,"style":0},"chestHair":{"opacity":0,"color":0,"style":0},"eyebrows":{"opacity":0,"color":0,"style":0},"blush":{"opacity":0,"color":0,"style":0},"blemishes":{"opacity":0,"color":0,"style":0},"sunDamage":{"opacity":0,"color":0,"style":0}},"components":[{"drawable":0,"component_id":0,"texture":0},{"drawable":0,"component_id":1,"texture":0},{"drawable":0,"component_id":2,"texture":0},{"drawable":0,"component_id":3,"texture":0},{"drawable":0,"component_id":4,"texture":0},{"drawable":0,"component_id":5,"texture":0},{"drawable":0,"component_id":6,"texture":0},{"drawable":0,"component_id":7,"texture":0},{"drawable":0,"component_id":8,"texture":0},{"drawable":0,"component_id":9,"texture":0},{"drawable":0,"component_id":10,"texture":0},{"drawable":0,"component_id":11,"texture":0}]},"dead":false,"status":{"health":{"max":100.0,"status":88.09523809523809,"type":"health"},"alcohol":{"max":100.0,"reversed":true,"type":"alcohol","status":0},"armor":{"max":100.0,"reversed":true,"type":"armor","status":58.33333333333333},"stamina":{"max":100.0,"status":100.0,"type":"stamina"},"thirst":{"max":100.0,"status":37.88333333332389,"type":"thirst"},"hunger":{"max":100.0,"status":27.03999999999778,"type":"hunger"}},"ethnicity":"wgggggggg"}, +"updateLicense":{"__cfx_functionReference":"ND_Core:931:12146"}, +"revive":{"__cfx_functionReference":"ND_Core:931:12154"}, +"save":{"__cfx_functionReference":"ND_Core:931:12153"}, +"getJob":{"__cfx_functionReference":"ND_Core:931:12135"}, +"active":{"__cfx_functionReference":"ND_Core:931:12152"}, +"removeGroup":{"__cfx_functionReference":"ND_Core:931:12151"}, +"dob":"1993-09-22", +"identifier":"license:4348f174860e7f066756f8057ad7a1d8406e7624", +"notify":{"__cfx_functionReference":"ND_Core:931:12137"}, +"createLicense":{"__cfx_functionReference":"ND_Core:931:12144"}, +"lastname":"Wood", +"deductMoney":{"__cfx_functionReference":"ND_Core:931:12138"}, +"setMetadata":{"__cfx_functionReference":"ND_Core:931:12136"}, +"withdrawMoney":{"__cfx_functionReference":"ND_Core:931:12139"}, +"drop":{"__cfx_functionReference":"ND_Core:931:12155"}, +"delete":{"__cfx_functionReference":"ND_Core:931:12145"}, +"getMetadata":{"__cfx_functionReference":"ND_Core:931:12140"}, +"addGroup":{"__cfx_functionReference":"ND_Core:931:12156"}, +"getGroup":{"__cfx_functionReference":"ND_Core:931:12148"}, +"addMoney":{"__cfx_functionReference":"ND_Core:931:12147"}, +"discord":[]} + +]]-- \ No newline at end of file From ae90934552980f146af96df77085f217835f7eca Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 20 Jan 2025 05:08:24 -0500 Subject: [PATCH 05/10] Revert "experimental nd_core" This reverts commit 6dce64a81a854f9a1cf8b7181d58d836b00d2d45. --- modules/framework/nd_core/client.lua | 61 ------ modules/framework/nd_core/server.lua | 275 --------------------------- 2 files changed, 336 deletions(-) delete mode 100644 modules/framework/nd_core/client.lua delete mode 100644 modules/framework/nd_core/server.lua diff --git a/modules/framework/nd_core/client.lua b/modules/framework/nd_core/client.lua deleted file mode 100644 index 69f90ae..0000000 --- a/modules/framework/nd_core/client.lua +++ /dev/null @@ -1,61 +0,0 @@ -if GetResourceState('ND_Core') ~= 'started' then return end - -local NDCore = exports["ND_Core"]:GetCoreObject() - -Framework = {} - -Framework.GetPlayerData = function() - return NDCore:getPlayer() -end - -Framework.GetPlayerMetaData = function(metadata) - return NDCore:getPlayer().metadata[metadata] -end - ---[[ --- Unused by this framework -Framework.GetItemInfo = function(item) - -end - -Framework.GetPlayerInventory = function() - -end ---]] - -Framework.GetPlayerIdentifier = function() - return NDCore:getPlayer().id -end - -Framework.GetPlayerName = function() - return NDCore:getPlayer().fullname -end - -Framework.GetPlayerJob = function() - local player = NDCore:getPlayer().jobInfo - return player.name, player.label, player.rankname, player.rank -end - -Framework.GetIsPlayerDead = function() - local playerState = LocalPlayer.state - return playerState.dead -end - -RegisterNetEvent("ND:characterLoaded",function(character) - Wait(1500) - FillBridgeTables() - TriggerEvent('community_bridge:Client:OnPlayerLoaded') -end) - -RegisterNetEvent("ND:characterUnloaded",function() - ClearClientSideVariables() - TriggerEvent('community_bridge:Client:OnPlayerUnload') -end) - -RegisterNetEvent("ND:updateCharacter", function(character) - PlayerJobName = character.jobInfo.name - PlayerJobLabel = character.jobInfo.label - PlayerJobGradeName = character.jobInfo.rankName - PlayerJobGradeLevel = character.jobInfo.rank - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) -end) \ No newline at end of file diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua deleted file mode 100644 index ee8aaec..0000000 --- a/modules/framework/nd_core/server.lua +++ /dev/null @@ -1,275 +0,0 @@ -local NDCore = exports["ND_Core"]:GetCoreObject() - -Framework = {} - --- Framework.GetPlayerIdentifier(src) --- Returns the citizen ID of the player. -Framework.GetPlayerIdentifier = function(src) - local player = NDCore.getPlayer(src) - return player.id -end - --- Framework.GetPlayerName(src) --- Returns the first and last name of the player. -Framework.GetPlayerName = function(src) - local player = NDCore.getPlayer(src) - return player.fullname -end - ---[[ --- Unused by this framework -Framework.GetItem = function(src, item, metadata) - -end - -Framework.GetItemCount = function(src, item, metadata) - -end - -Framework.GetPlayerInventory = function(src) - -end - -Framework.AddItem = function(src, item, amount, slot, metadata) - -end - -Framework.RemoveItem = function(src, item, amount, slot, metadata) - -end - -Framework.SetMetadata = function(src, item, slot, metadata) - -end - - -Framework.Commands = {} -Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) - -end - ---]] - --- Framework.SetMetadata(src, metadata, value) --- Adds the specified metadata key and number value to the player's data. -Framework.SetPlayerMetadata = function(src, metadata, value) - local player = NDCore.getPlayer(src) - player.setMetadata(metadata, value) - return true -end - --- Framework.GetMetadata(src, metadata) --- Gets the specified metadata key to the player's data. -Framework.GetPlayerMetadata = function(src, metadata) - local player = NDCore.getPlayer(src) - local playerData = player.getMetadata(metadata) - return playerData or false -end - --- Framework.AddStress(src, value) --- Adds the specified value to the player's stress level and updates the client HUD. -Framework.AddStress = function(src, value) - print("Not Bridged Yet") - return 0 -end - --- Framework.RemoveStress(src, value) --- Removes the specified value from the player's stress level and updates the client HUD. -Framework.RemoveStress = function(src, value) - print("Not Bridged Yet") - return 0 -end - --- Framework.AddHunger(src, value) --- Adds the specified value from the player's hunger level. -Framework.AddHunger = function(src, value) - local player = NDCore.getPlayer(src) - local oldHunger = player.getMetadata("hunger").status - local newHunger = (oldHunger or 0) + value - player.setMetadata('hunger', Math.Clamp(newHunger, 0, 100)) - return newHunger -end - --- Framework.AddThirst(src, value) --- Adds the specified value from the player's thirst level. -Framework.AddThirst = function(src, value) - local player = NDCore.getPlayer(src) - local oldThirst = player.getMetadata("thirst").status - local newThirst = (oldThirst or 0) + value - player.setMetadata('thirst', Math.Clamp(newThirst, 0, 100)) - return newThirst -end - -Framework.GetHunger = function(src) - local player = NDCore.getPlayer(src) - local hunger = player.getMetadata("hunger") - return hunger.status -end - -Framework.GetThirst = function(src) - local player = NDCore.getPlayer(src) - local thirst = player.getMetadata("thirst") - return thirst.status -end - --- Framework.GetPlayerPhone(src) --- Returns the phone number of the player. -Framework.GetPlayerPhone = function(src) - local player = NDCore.getPlayer(src) - return player.phonenumber -end - --- Framework.GetPlayerGang(src) --- Returns the gang name of the player. -Framework.GetPlayerGang = function(src) - print("Not Bridged Yet") - return "none" -end - --- Framework.GetPlayersByJob(jobname) --- returns a table of player sources that have the specified job name. -Framework.GetPlayersByJob = function(job) - local playerList = {} - local players = NDCore.getPlayers("job", job, false) - for playerSource, _ in pairs(players) do - table.insert(playerList, playerSource) - end - return playerList -end - --- Framework.GetPlayerJob(src) --- Returns the job name, label, grade name, and grade level of the player. -Framework.GetPlayerJob = function(src) - local player = NDCore.getPlayer(src) - local jobName, jobInfo = player.getJob() - return jobInfo.name, jobInfo.label, jobInfo.rankName, jobInfo.rank -end - --- Framework.SetPlayerJob(src, name, grade) --- Sets the player's job to the specified name and grade. -Framework.SetPlayerJob = function(src, name, grade) - local player = NDCore.getPlayer(src) - return player.setJob(name, grade) -end - -Framework.ToggleDuty = function(src, status) - print("Not Bridged Yet") - return false -end - --- Framework.AddAccountBalance(src, _type, amount) --- Adds the specified amount to the player's account balance of the specified type. -Framework.AddAccountBalance = function(src, _type, amount) - local player = NDCore.getPlayer(src) - if _type == 'money' then _type = 'cash' end - return player.addMoney(_type, amount, "") -end - --- Framework.RemoveAccountBalance(src, _type, amount) --- Removes the specified amount from the player's account balance of the specified type. -Framework.RemoveAccountBalance = function(src, _type, amount) - local player = NDCore.getPlayer(src) - if _type == 'money' then _type = 'cash' end - return player.deductMoney(_type, amount, "") -end - --- Framework.GetAccountBalance(src, _type) --- Returns the player's account balance of the specified type. -Framework.GetAccountBalance = function(src, _type) - local player = NDCore.getPlayer(src) - if _type == 'money' then _type = 'cash' end - return player.getAccount(_type) -end - -Framework.RegisterUsableItem = function(itemName, cb) - exports(itemName, function(event, item, inventory, slot, data) - local slotData = exports.ox_inventory:GetSlot(inventory.id, slot) - if event == 'usingItem' then - cb(inventory.id, item, slotData) - end - end) -end - -Citizen.CreateThread(function() - Wait(1000) - local player = NDCore.getPlayer(1) - print(json.encode(player)) -end) - --- local otherdata = NDCore.Functions.GetSelectedCharacter() and NDCore:getPlayer() are the same shit? - - ---[[ -{"metadata":{ - "status":{"armor":{"max":100.0,"reversed":true,"type":"armor","status":0.0}, - "hunger":{"status":99.97333333333333,"type":"hunger","max":100.0}, - "thirst":{"status":99.97777777777778,"type":"thirst","max":100.0}, - "health":{"status":100.0,"type":"health","max":100.0}, - "stamina":{"status":100.0,"type":"stamina","max":100.0}, - "alcohol":{"max":100.0,"reversed":true,"type":"alcohol","status":0}} -,"clothing":{"tattoos":[],"eyeColor":0,"props":[{"prop_id":0,"drawable":-1,"texture":-1},{"prop_id":1,"drawable":-1,"texture":-1},{"prop_id":2,"drawable":-1,"texture":-1},{"prop_id":6,"drawable":-1,"texture":-1},{"prop_id":7,"drawable":-1,"texture":-1}],"hair":{"style":0,"color":0,"highlight":0},"model":"mp_m_freemode_01","headOverlays":{"complexion":{"style":0,"color":0,"opacity":0},"bodyBlemishes":{"style":0,"color":0,"opacity":0},"lipstick":{"style":0,"color":0,"opacity":0},"blemishes":{"style":0,"color":0,"opacity":0},"beard":{"style":0,"color":0,"opacity":0},"blush":{"style":0,"color":0,"opacity":0},"moleAndFreckles":{"style":0,"color":0,"opacity":0},"chestHair":{"style":0,"color":0,"opacity":0},"makeUp":{"style":0,"color":0,"opacity":0},"eyebrows":{"style":0,"color":0,"opacity":0},"ageing":{"style":0,"color":0,"opacity":0},"sunDamage":{"style":0,"color":0,"opacity":0}},"headBlend":{"shapeSecond":0,"skinMix":0,"skinFirst":0,"skinSecond":0,"shapeMix":0,"shapeFirst":0},"components":[{"component_id":0,"drawable":0,"texture":0},{"component_id":1,"drawable":0,"texture":0},{"component_id":2,"drawable":0,"texture":0},{"component_id":3,"drawable":0,"texture":0},{"component_id":4,"drawable":0,"texture":0},{"component_id":5,"drawable":0,"texture":0},{"component_id":6,"drawable":0,"texture":0},{"component_id":7,"drawable":0,"texture":0},{"component_id":8,"drawable":0,"texture":0},{"component_id":9,"drawable":0,"texture":0},{"component_id":10,"drawable":0,"texture":0},{"component_id":11,"drawable":0,"texture":0}],"faceFeatures":{"jawBoneBackSize":0,"chinBoneSize":0,"eyeBrownHigh":0,"noseBoneHigh":0,"eyeBrownForward":0,"chinBoneLenght":0,"nosePeakHigh":0,"noseBoneTwist":0,"chinHole":0,"noseWidth":0,"eyesOpening":0,"chinBoneLowering":0,"jawBoneWidth":0,"lipsThickness":0,"nosePeakLowering":0,"cheeksBoneHigh":0,"neckThickness":0,"nosePeakSize":0,"cheeksBoneWidth":0,"cheeksWidth":0}},"ethnicity":"wgggggggg"}, -"groups":{"lsfd":{"isJob":true,"isBoss":false,"label":"LSFD","name":"lsfd","metadata":[],"rank":1,"rankName":"Volunteer"}}, -"dob":"1993-09-22", -"bank":8800, -"lastname":"Wood", -"fullname":"Charles Wood", -"firstname":"Charles", -"cash":2500, -"discord":[], -"inventory":[], -"source":1, -"job":"lsfd", -"jobInfo":{"isJob":true,"isBoss":false,"label":"LSFD","name":"lsfd","metadata":[],"rank":1,"rankName":"Volunteer"}, -"gender":"Male", -"name":"MrNewb", -"id":1, -"identifiers":{"ip":"ip:192.168.0.248","license":"license:4348f174860e7f066756f8057ad7a1d8406e7624","discord":"discord:299410129982455808","live":"live:985156709508143","fivem":"fivem:627480","xbl":"xbl:2533274909557009"}, -"identifier":"license:4348f174860e7f066756f8057ad7a1d8406e7624"} ---]] - - ---[[ -{"id":1, -"setData":{"__cfx_functionReference":"ND_Core:931:12157"}, -"name":"MrNewb", -"job":"lsfd", -"inventory":[], -"triggerEvent":{"__cfx_functionReference":"ND_Core:931:12149"}, -"cash":2520, -"setCoords":{"__cfx_functionReference":"ND_Core:931:12143"}, -"jobInfo":{"label":"LSFD","metadata":[],"isBoss":false,"isJob":true,"name":"lsfd","rankName":"Volunteer","rank":1}, -"identifiers":{"license":"license:4348f174860e7f066756f8057ad7a1d8406e7624","discord":"discord:299410129982455808","fivem":"fivem:627480","xbl":"xbl:2533274909557009","live":"live:985156709508143","ip":"ip:192.168.0.248"}, -"source":1, -"getLicense":{"__cfx_functionReference":"ND_Core:931:12141"}, -"setJob":{"__cfx_functionReference":"ND_Core:931:12150"}, -"firstname":"Charles", -"depositMoney":{"__cfx_functionReference":"ND_Core:931:12142"}, -"fullname":"Charles Wood", -"groups":{"lsfd":{"label":"LSFD","metadata":[],"isBoss":false,"isJob":true,"name":"lsfd","rankName":"Volunteer","rank":1}}, -"unload":{"__cfx_functionReference":"ND_Core:931:12159"},"getData":{"__cfx_functionReference":"ND_Core:931:12158"}, -"bank":9999777780, -"gender":"Male", -"metadata":{"PlateCarrier":{"name":"fib_specops_carrier","metadata":{"PlateCarrier":true,"Clothing":{"drawable":{"male":11,"female":1},"texture":{"male":0,"female":0}},"Condition":70,"SerialNumber":"Y8TYAW175174I8","description":"\n\n Condition :70\n\n Strength:7\n\n Serial Number:Y8TYAW175174I8","Strength":7}},"deathInfo":false,"clothing":{"eyeColor":0,"props":[{"prop_id":0,"texture":-1,"drawable":-1},{"prop_id":1,"texture":-1,"drawable":-1},{"prop_id":2,"texture":-1,"drawable":-1},{"prop_id":6,"texture":-1,"drawable":-1},{"prop_id":7,"texture":-1,"drawable":-1}],"headBlend":{"shapeFirst":0,"skinSecond":0,"shapeMix":0,"shapeSecond":0,"skinMix":0,"skinFirst":0},"tattoos":[],"hair":{"style":0,"color":0,"highlight":0},"faceFeatures":{"eyeBrownForward":0,"cheeksBoneWidth":0,"neckThickness":0,"noseBoneTwist":0,"chinBoneSize":0,"lipsThickness":0,"cheeksBoneHigh":0,"chinHole":0,"cheeksWidth":0,"chinBoneLenght":0,"chinBoneLowering":0,"nosePeakLowering":0,"nosePeakSize":0,"nosePeakHigh":0,"jawBoneBackSize":0,"jawBoneWidth":0,"noseBoneHigh":0,"eyeBrownHigh":0,"eyesOpening":0,"noseWidth":0},"model":"mp_m_freemode_01","headOverlays":{"beard":{"opacity":0,"color":0,"style":0},"makeUp":{"opacity":0,"color":0,"style":0},"ageing":{"opacity":0,"color":0,"style":0},"moleAndFreckles":{"opacity":0,"color":0,"style":0},"lipstick":{"opacity":0,"color":0,"style":0},"bodyBlemishes":{"opacity":0,"color":0,"style":0},"complexion":{"opacity":0,"color":0,"style":0},"chestHair":{"opacity":0,"color":0,"style":0},"eyebrows":{"opacity":0,"color":0,"style":0},"blush":{"opacity":0,"color":0,"style":0},"blemishes":{"opacity":0,"color":0,"style":0},"sunDamage":{"opacity":0,"color":0,"style":0}},"components":[{"drawable":0,"component_id":0,"texture":0},{"drawable":0,"component_id":1,"texture":0},{"drawable":0,"component_id":2,"texture":0},{"drawable":0,"component_id":3,"texture":0},{"drawable":0,"component_id":4,"texture":0},{"drawable":0,"component_id":5,"texture":0},{"drawable":0,"component_id":6,"texture":0},{"drawable":0,"component_id":7,"texture":0},{"drawable":0,"component_id":8,"texture":0},{"drawable":0,"component_id":9,"texture":0},{"drawable":0,"component_id":10,"texture":0},{"drawable":0,"component_id":11,"texture":0}]},"dead":false,"status":{"health":{"max":100.0,"status":88.09523809523809,"type":"health"},"alcohol":{"max":100.0,"reversed":true,"type":"alcohol","status":0},"armor":{"max":100.0,"reversed":true,"type":"armor","status":58.33333333333333},"stamina":{"max":100.0,"status":100.0,"type":"stamina"},"thirst":{"max":100.0,"status":37.88333333332389,"type":"thirst"},"hunger":{"max":100.0,"status":27.03999999999778,"type":"hunger"}},"ethnicity":"wgggggggg"}, -"updateLicense":{"__cfx_functionReference":"ND_Core:931:12146"}, -"revive":{"__cfx_functionReference":"ND_Core:931:12154"}, -"save":{"__cfx_functionReference":"ND_Core:931:12153"}, -"getJob":{"__cfx_functionReference":"ND_Core:931:12135"}, -"active":{"__cfx_functionReference":"ND_Core:931:12152"}, -"removeGroup":{"__cfx_functionReference":"ND_Core:931:12151"}, -"dob":"1993-09-22", -"identifier":"license:4348f174860e7f066756f8057ad7a1d8406e7624", -"notify":{"__cfx_functionReference":"ND_Core:931:12137"}, -"createLicense":{"__cfx_functionReference":"ND_Core:931:12144"}, -"lastname":"Wood", -"deductMoney":{"__cfx_functionReference":"ND_Core:931:12138"}, -"setMetadata":{"__cfx_functionReference":"ND_Core:931:12136"}, -"withdrawMoney":{"__cfx_functionReference":"ND_Core:931:12139"}, -"drop":{"__cfx_functionReference":"ND_Core:931:12155"}, -"delete":{"__cfx_functionReference":"ND_Core:931:12145"}, -"getMetadata":{"__cfx_functionReference":"ND_Core:931:12140"}, -"addGroup":{"__cfx_functionReference":"ND_Core:931:12156"}, -"getGroup":{"__cfx_functionReference":"ND_Core:931:12148"}, -"addMoney":{"__cfx_functionReference":"ND_Core:931:12147"}, -"discord":[]} - -]]-- \ No newline at end of file From 22b64762d1aa7fdb671725ac6df807be83915f03 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 20 Jan 2025 05:09:23 -0500 Subject: [PATCH 06/10] reup --- modules/framework/nd_core/client.lua | 61 +++++++++ modules/framework/nd_core/server.lua | 191 +++++++++++++++++++++++++++ 2 files changed, 252 insertions(+) create mode 100644 modules/framework/nd_core/client.lua create mode 100644 modules/framework/nd_core/server.lua diff --git a/modules/framework/nd_core/client.lua b/modules/framework/nd_core/client.lua new file mode 100644 index 0000000..69f90ae --- /dev/null +++ b/modules/framework/nd_core/client.lua @@ -0,0 +1,61 @@ +if GetResourceState('ND_Core') ~= 'started' then return end + +local NDCore = exports["ND_Core"]:GetCoreObject() + +Framework = {} + +Framework.GetPlayerData = function() + return NDCore:getPlayer() +end + +Framework.GetPlayerMetaData = function(metadata) + return NDCore:getPlayer().metadata[metadata] +end + +--[[ +-- Unused by this framework +Framework.GetItemInfo = function(item) + +end + +Framework.GetPlayerInventory = function() + +end +--]] + +Framework.GetPlayerIdentifier = function() + return NDCore:getPlayer().id +end + +Framework.GetPlayerName = function() + return NDCore:getPlayer().fullname +end + +Framework.GetPlayerJob = function() + local player = NDCore:getPlayer().jobInfo + return player.name, player.label, player.rankname, player.rank +end + +Framework.GetIsPlayerDead = function() + local playerState = LocalPlayer.state + return playerState.dead +end + +RegisterNetEvent("ND:characterLoaded",function(character) + Wait(1500) + FillBridgeTables() + TriggerEvent('community_bridge:Client:OnPlayerLoaded') +end) + +RegisterNetEvent("ND:characterUnloaded",function() + ClearClientSideVariables() + TriggerEvent('community_bridge:Client:OnPlayerUnload') +end) + +RegisterNetEvent("ND:updateCharacter", function(character) + PlayerJobName = character.jobInfo.name + PlayerJobLabel = character.jobInfo.label + PlayerJobGradeName = character.jobInfo.rankName + PlayerJobGradeLevel = character.jobInfo.rank + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) +end) \ No newline at end of file diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua new file mode 100644 index 0000000..2e17ac8 --- /dev/null +++ b/modules/framework/nd_core/server.lua @@ -0,0 +1,191 @@ +local NDCore = exports["ND_Core"]:GetCoreObject() + +Framework = {} + +-- Framework.GetPlayerIdentifier(src) +-- Returns the citizen ID of the player. +Framework.GetPlayerIdentifier = function(src) + local player = NDCore.getPlayer(src) + return player.id +end + +-- Framework.GetPlayerName(src) +-- Returns the first and last name of the player. +Framework.GetPlayerName = function(src) + local player = NDCore.getPlayer(src) + return player.fullname +end + +--[[ +-- Unused by this framework +Framework.GetItem = function(src, item, metadata) + +end + +Framework.GetItemCount = function(src, item, metadata) + +end + +Framework.GetPlayerInventory = function(src) + +end + +Framework.AddItem = function(src, item, amount, slot, metadata) + +end + +Framework.RemoveItem = function(src, item, amount, slot, metadata) + +end + +Framework.SetMetadata = function(src, item, slot, metadata) + +end + + +Framework.Commands = {} +Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) + +end + +--]] + +-- Framework.SetMetadata(src, metadata, value) +-- Adds the specified metadata key and number value to the player's data. +Framework.SetPlayerMetadata = function(src, metadata, value) + local player = NDCore.getPlayer(src) + player.setMetadata(metadata, value) + return true +end + +-- Framework.GetMetadata(src, metadata) +-- Gets the specified metadata key to the player's data. +Framework.GetPlayerMetadata = function(src, metadata) + local player = NDCore.getPlayer(src) + local playerData = player.getMetadata(metadata) + return playerData or false +end + +-- Framework.AddStress(src, value) +-- Adds the specified value to the player's stress level and updates the client HUD. +Framework.AddStress = function(src, value) + print("Not Bridged Yet") + return 0 +end + +-- Framework.RemoveStress(src, value) +-- Removes the specified value from the player's stress level and updates the client HUD. +Framework.RemoveStress = function(src, value) + print("Not Bridged Yet") + return 0 +end + +-- Framework.AddHunger(src, value) +-- Adds the specified value from the player's hunger level. +Framework.AddHunger = function(src, value) + local player = NDCore.getPlayer(src) + local oldHunger = player.getMetadata("hunger").status + local newHunger = (oldHunger or 0) + value + player.setMetadata('hunger', Math.Clamp(newHunger, 0, 100)) + return newHunger +end + +-- Framework.AddThirst(src, value) +-- Adds the specified value from the player's thirst level. +Framework.AddThirst = function(src, value) + local player = NDCore.getPlayer(src) + local oldThirst = player.getMetadata("thirst").status + local newThirst = (oldThirst or 0) + value + player.setMetadata('thirst', Math.Clamp(newThirst, 0, 100)) + return newThirst +end + +Framework.GetHunger = function(src) + local player = NDCore.getPlayer(src) + local hunger = player.getMetadata("hunger") + return hunger.status +end + +Framework.GetThirst = function(src) + local player = NDCore.getPlayer(src) + local thirst = player.getMetadata("thirst") + return thirst.status +end + +-- Framework.GetPlayerPhone(src) +-- Returns the phone number of the player. +Framework.GetPlayerPhone = function(src) + local player = NDCore.getPlayer(src) + return player.phonenumber +end + +-- Framework.GetPlayerGang(src) +-- Returns the gang name of the player. +Framework.GetPlayerGang = function(src) + print("Not Bridged Yet") + return "none" +end + +-- Framework.GetPlayersByJob(jobname) +-- returns a table of player sources that have the specified job name. +Framework.GetPlayersByJob = function(job) + local playerList = {} + local players = NDCore.getPlayers("job", job, false) + for playerSource, _ in pairs(players) do + table.insert(playerList, playerSource) + end + return playerList +end + +-- Framework.GetPlayerJob(src) +-- Returns the job name, label, grade name, and grade level of the player. +Framework.GetPlayerJob = function(src) + local player = NDCore.getPlayer(src) + local jobName, jobInfo = player.getJob() + return jobInfo.name, jobInfo.label, jobInfo.rankName, jobInfo.rank +end + +-- Framework.SetPlayerJob(src, name, grade) +-- Sets the player's job to the specified name and grade. +Framework.SetPlayerJob = function(src, name, grade) + local player = NDCore.getPlayer(src) + return player.setJob(name, grade) +end + +Framework.ToggleDuty = function(src, status) + print("Not Bridged Yet") + return false +end + +-- Framework.AddAccountBalance(src, _type, amount) +-- Adds the specified amount to the player's account balance of the specified type. +Framework.AddAccountBalance = function(src, _type, amount) + local player = NDCore.getPlayer(src) + if _type == 'money' then _type = 'cash' end + return player.addMoney(_type, amount, "") +end + +-- Framework.RemoveAccountBalance(src, _type, amount) +-- Removes the specified amount from the player's account balance of the specified type. +Framework.RemoveAccountBalance = function(src, _type, amount) + local player = NDCore.getPlayer(src) + if _type == 'money' then _type = 'cash' end + return player.deductMoney(_type, amount, "") +end + +-- Framework.GetAccountBalance(src, _type) +-- Returns the player's account balance of the specified type. +Framework.GetAccountBalance = function(src, _type) + local player = NDCore.getPlayer(src) + if _type == 'money' then _type = 'cash' end + return player.getAccount(_type) +end + +Framework.RegisterUsableItem = function(itemName, cb) + exports(itemName, function(event, item, inventory, slot, data) + local slotData = exports.ox_inventory:GetSlot(inventory.id, slot) + if event == 'usingItem' then + cb(inventory.id, item, slotData) + end + end) +end \ No newline at end of file From 4b76a4095a8f35bc13859ec290b76c88293a9746 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 20 Jan 2025 05:19:07 -0500 Subject: [PATCH 07/10] fix item removal in nd_core This must return false to not auto remove the item, while its a great concept not every framework/inventory plays the same. People can continue to manually remove items with the exports like its been. --- modules/framework/nd_core/server.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua index 2e17ac8..137f9d5 100644 --- a/modules/framework/nd_core/server.lua +++ b/modules/framework/nd_core/server.lua @@ -186,6 +186,7 @@ Framework.RegisterUsableItem = function(itemName, cb) local slotData = exports.ox_inventory:GetSlot(inventory.id, slot) if event == 'usingItem' then cb(inventory.id, item, slotData) + return false end end) end \ No newline at end of file From 6e84b3f9cabe5ac240687b959f2d7e17129d420e Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:03:34 -0500 Subject: [PATCH 08/10] Update server.lua --- modules/framework/nd_core/server.lua | 53 +++++++++++++--------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua index 137f9d5..3d38e92 100644 --- a/modules/framework/nd_core/server.lua +++ b/modules/framework/nd_core/server.lua @@ -1,18 +1,19 @@ -local NDCore = exports["ND_Core"]:GetCoreObject() +--local NDCore = exports["ND_Core"]:GetCoreObject() +local NDCore = exports["ND_Core"] Framework = {} -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) return player.id end -- Framework.GetPlayerName(src) -- Returns the first and last name of the player. Framework.GetPlayerName = function(src) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) return player.fullname end @@ -53,7 +54,7 @@ end -- Framework.SetMetadata(src, metadata, value) -- Adds the specified metadata key and number value to the player's data. Framework.SetPlayerMetadata = function(src, metadata, value) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) player.setMetadata(metadata, value) return true end @@ -61,7 +62,7 @@ end -- Framework.GetMetadata(src, metadata) -- Gets the specified metadata key to the player's data. Framework.GetPlayerMetadata = function(src, metadata) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) local playerData = player.getMetadata(metadata) return playerData or false end @@ -83,39 +84,33 @@ end -- Framework.AddHunger(src, value) -- Adds the specified value from the player's hunger level. Framework.AddHunger = function(src, value) - local player = NDCore.getPlayer(src) - local oldHunger = player.getMetadata("hunger").status - local newHunger = (oldHunger or 0) + value - player.setMetadata('hunger', Math.Clamp(newHunger, 0, 100)) - return newHunger + -- Im stuck end -- Framework.AddThirst(src, value) -- Adds the specified value from the player's thirst level. Framework.AddThirst = function(src, value) - local player = NDCore.getPlayer(src) - local oldThirst = player.getMetadata("thirst").status - local newThirst = (oldThirst or 0) + value - player.setMetadata('thirst', Math.Clamp(newThirst, 0, 100)) - return newThirst + -- Im stuck end Framework.GetHunger = function(src) - local player = NDCore.getPlayer(src) - local hunger = player.getMetadata("hunger") - return hunger.status + local player = NDCore:getPlayer(src) + local metaData = player.metadata + local hunger = metaData.status.hunger.status + return hunger end Framework.GetThirst = function(src) - local player = NDCore.getPlayer(src) - local thirst = player.getMetadata("thirst") - return thirst.status + local player = NDCore:getPlayer(src) + local metaData = player.metadata + local thirst = metaData.status.thirst.status + return thirst end -- Framework.GetPlayerPhone(src) -- Returns the phone number of the player. Framework.GetPlayerPhone = function(src) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) return player.phonenumber end @@ -130,7 +125,7 @@ end -- returns a table of player sources that have the specified job name. Framework.GetPlayersByJob = function(job) local playerList = {} - local players = NDCore.getPlayers("job", job, false) + local players = NDCore:getPlayers("job", job, false) for playerSource, _ in pairs(players) do table.insert(playerList, playerSource) end @@ -140,7 +135,7 @@ end -- Framework.GetPlayerJob(src) -- Returns the job name, label, grade name, and grade level of the player. Framework.GetPlayerJob = function(src) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) local jobName, jobInfo = player.getJob() return jobInfo.name, jobInfo.label, jobInfo.rankName, jobInfo.rank end @@ -148,7 +143,7 @@ end -- Framework.SetPlayerJob(src, name, grade) -- Sets the player's job to the specified name and grade. Framework.SetPlayerJob = function(src, name, grade) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) return player.setJob(name, grade) end @@ -160,7 +155,7 @@ end -- Framework.AddAccountBalance(src, _type, amount) -- Adds the specified amount to the player's account balance of the specified type. Framework.AddAccountBalance = function(src, _type, amount) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) if _type == 'money' then _type = 'cash' end return player.addMoney(_type, amount, "") end @@ -168,7 +163,7 @@ end -- Framework.RemoveAccountBalance(src, _type, amount) -- Removes the specified amount from the player's account balance of the specified type. Framework.RemoveAccountBalance = function(src, _type, amount) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) if _type == 'money' then _type = 'cash' end return player.deductMoney(_type, amount, "") end @@ -176,9 +171,9 @@ end -- Framework.GetAccountBalance(src, _type) -- Returns the player's account balance of the specified type. Framework.GetAccountBalance = function(src, _type) - local player = NDCore.getPlayer(src) + local player = NDCore:getPlayer(src) if _type == 'money' then _type = 'cash' end - return player.getAccount(_type) + return player.getData(_type) end Framework.RegisterUsableItem = function(itemName, cb) From 00f69aa315ba87a09ff25599b29080caa678371f Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Thu, 23 Jan 2025 23:34:21 -0500 Subject: [PATCH 09/10] fix deprecated event method --- modules/clothing/qb-clothing/server.lua | 2 +- modules/notify/client.lua | 8 ++++++++ modules/notify/server.lua | 8 ++++++++ modules/utility/server/supplement_events.lua | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/clothing/qb-clothing/server.lua b/modules/clothing/qb-clothing/server.lua index d7a283a..5083d20 100644 --- a/modules/clothing/qb-clothing/server.lua +++ b/modules/clothing/qb-clothing/server.lua @@ -1,6 +1,6 @@ if GetResourceState('qb-clothing') ~= 'started' then return end -RegisterServerEvent('qb-clothing:saveSkin', function(model, skin) +RegisterNetEvent('qb-clothing:saveSkin', function(model, skin) local src = source if model ~= nil and skin ~= nil then TriggerClientEvent('community_bridge:client:updateStoredClothing', src, skin) diff --git a/modules/notify/client.lua b/modules/notify/client.lua index 1995499..67a810d 100644 --- a/modules/notify/client.lua +++ b/modules/notify/client.lua @@ -67,4 +67,12 @@ end RegisterNetEvent('community_bridge:Client:Notify', function(message, _type, time) Notify.SendNotify(message, _type, time) +end) + +RegisterNetEvent('community_bridge:Client:ShowHelpText', function(message, position) + Notify.ShowHelpText(message, position) +end) + +RegisterNetEvent('community_bridge:Client:HideHelpText', function() + Notify.HideHelpText() end) \ No newline at end of file diff --git a/modules/notify/server.lua b/modules/notify/server.lua index ebf5fbc..fd2c122 100644 --- a/modules/notify/server.lua +++ b/modules/notify/server.lua @@ -2,4 +2,12 @@ Notify = Notify or {} Notify.SendNotify = function(src, message, _type, time) TriggerClientEvent('community_bridge:Client:Notify', src, message, _type, time) +end + +Notify.ShowHelpText = function(src, message, position) + TriggerClientEvent('community_bridge:Client:ShowHelpText', src, message, position) +end + +Notify.HideHelpText = function(src) + TriggerClientEvent('community_bridge:Client:HideHelpText', src) end \ No newline at end of file diff --git a/modules/utility/server/supplement_events.lua b/modules/utility/server/supplement_events.lua index fbe2fa1..11181c0 100644 --- a/modules/utility/server/supplement_events.lua +++ b/modules/utility/server/supplement_events.lua @@ -1,4 +1,4 @@ -RegisterServerEvent("community_bridge:server:alert", function(data) +RegisterNetEvent("community_bridge:server:alert", function(data) local playersByJob = Framework.GetPlayersByJob(data.job) for _, src in pairs(playersByJob) do TriggerClientEvent("community_bridge:client:alert", src, data) From 781a6ff5530363faaf7ca82dc798e18c0acdc1e4 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:57:27 -0500 Subject: [PATCH 10/10] 0.1.5 --- fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index 0285e44..af94253 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -4,7 +4,7 @@ lua54 'yes' use_experimental_fxv2_oal 'yes' author 'The Order of the Sacred Framework' description 'A bridge made for the community to use as a base for their own projects. This bridge will allow a single format to work with nearly all commonly used systems while still offering expandability.' -version '0.1.4' +version '0.1.5' shared_scripts { '@ox_lib/init.lua',