diff --git a/init.lua b/init.lua index 8db2673..2fc7e21 100644 --- a/init.lua +++ b/init.lua @@ -105,22 +105,4 @@ Bridge.RegisterModule("Weather", Weather) Bridge.RegisterModule("Target", Target) Bridge.RegisterModule("Menu", Menu) Bridge.RegisterModule("Dialogue", Dialogue) -Bridge.RegisterModule("Accessibility", Accessibility) -- new - --- Fill the bridge tables with player data. -function FillBridgeTables() - PlayerLoaded = true - PlayerIdentifier = Framework.GetPlayerIdentifier() - PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel = Framework.GetPlayerJob() -end - --- Clean the bridge tables. -function ClearClientSideVariables() - PlayerLoaded = false - PlayerIdentifier = nil - PlayerJobName = nil - PlayerJobLabel = nil - PlayerJobGradeName = nil - PlayerJobGradeLevel = nil - StoredOldClothing = {} -end +Bridge.RegisterModule("Accessibility", Accessibility) -- new \ No newline at end of file diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index b0e3fca..0704ac1 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -26,7 +26,7 @@ end ---This will return the players birth date ---@return string Framework.GetPlayerDob = function() - local playerData = ESX.GetPlayerData() + local playerData = Framework.GetPlayerData() local dob = playerData.dateofbirth return dob end @@ -35,7 +35,7 @@ end ---@param metadata string ---@return table | nil Framework.GetPlayerMetaData = function(metadata) - return ESX.GetPlayerData().metadata[metadata] + return Framework.GetPlayerData().metadata[metadata] end ---This will prompt the user with a notification message @@ -64,7 +64,7 @@ end ---This will return the players identifier ---@return string Framework.GetPlayerIdentifier = function() - local playerData = ESX.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.identifier end @@ -72,7 +72,7 @@ end ---@return string ---@return string Framework.GetPlayerName = function() - local playerData = ESX.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.firstName, playerData.lastName end @@ -82,7 +82,7 @@ end ---@return string ---@return string Framework.GetPlayerJob = function() - local playerData = ESX.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.job.name, playerData.job.label, playerData.job.grade_label, playerData.job.grade end @@ -97,7 +97,7 @@ end ---This will return a table of the players inventory ---@return table Framework.GetPlayerInventory = function() - local playerData = ESX.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.inventory end @@ -113,27 +113,21 @@ end ---This will return a boolean if the player is dead ---@return boolean Framework.GetIsPlayerDead = function() - local playerData = ESX.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.dead end RegisterNetEvent('esx:playerLoaded', function(xPlayer) Wait(1500) - FillBridgeTables() - TriggerEvent('community_bridge:Client:OnPlayerLoaded') + TriggerEvent('community_bridge:Client:OnPlayerLoaded') end) RegisterNetEvent('esx:onPlayerLogout', function() - ClearClientSideVariables() - TriggerEvent('community_bridge:Client:OnPlayerUnload') + TriggerEvent('community_bridge:Client:OnPlayerUnload') end) RegisterNetEvent('esx:setJob', function(data) - PlayerJobName = data.name - PlayerJobLabel = data.label - PlayerJobGradeName = data.grade_label - PlayerJobGradeLevel = data.grade - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate',PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', data.name, data.label, data.grade_label, data.grade) end) return Framework \ No newline at end of file diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 5e125d9..83fee38 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -11,13 +11,15 @@ Framework.GetFrameworkName = function() end Framework.GetPlayerDob = function(src) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end local dob = xPlayer.get("dateofbirth") return dob end --- This will return a table of the players data +--- +--- This table is in the framework format and not converted to any standard. ---@param src any ---@return table | nil Framework.GetPlayer = function(src) @@ -29,7 +31,7 @@ end -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end return xPlayer.getIdentifier() end @@ -41,7 +43,7 @@ end -- Framework.GetPlayerName(src) -- Returns the first and last name of the player. Framework.GetPlayerName = function(src) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end return xPlayer.variables.firstName, xPlayer.variables.lastName end @@ -61,7 +63,7 @@ end -- Returns a table of items matching the specified name and if passed metadata from the player's inventory. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetItem = function(src, item, _) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end local playerItems = xPlayer.getInventory() local repackedTable = {} @@ -81,7 +83,7 @@ end -- Framework.GetItemCount(src, item, _) -- Returns the count of items matching the specified name and if passed metadata from the player's inventory. Framework.GetItemCount = function(src, item, _) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end return xPlayer.getInventoryItem(item).count end @@ -99,7 +101,7 @@ end -- Returns the entire inventory of the player as a table. -- returns {name = v.name, count = v.amount, _, _} Framework.GetPlayerInventory = function(src) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end local playerItems = xPlayer.getInventory() local repackedTable = {} @@ -119,7 +121,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 xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end xPlayer.setMeta(metadata, value, nil) return true @@ -128,7 +130,7 @@ end -- Framework.GetMetadata(src, metadata) -- Gets the specified metadata key and value to the player's data. Framework.GetPlayerMetadata = function(src, metadata) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end return xPlayer.getMeta(metadata) or false end @@ -139,13 +141,13 @@ end -- skin, status, is_dead, id, disabled, last_property, created_at, last_seen, -- phone_number, pincode Framework.GetStatus = function(src, column) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end return xPlayer.get(column) or nil end Framework.GetIsPlayerDead = function(src) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end return xPlayer.get("is_dead") or false end @@ -190,7 +192,7 @@ end -- Framework.GetPlayerPhone(src) -- Returns the phone number of the player. Framework.GetPlayerPhone = function(src) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end return xPlayer.get("phone_number") end @@ -203,7 +205,7 @@ end ---@return string | nil ---@return string | nil Framework.GetPlayerJob = function(src) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end local job = xPlayer.getJob() return job.name, job.label, job.grade_label, job.grade @@ -213,7 +215,7 @@ end ---@param src number ---@return boolean Framework.GetPlayerDuty = function(src) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return false end local job = xPlayer.getJob() if not job.onDuty then return false end @@ -225,7 +227,7 @@ end ---@param dutystatus boolean ---@return boolean Framework.SetPlayerDuty = function(src, dutystatus) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return false end local job = xPlayer.getJob() if not job.onDuty then return false end @@ -238,7 +240,7 @@ Framework.GetPlayersByJob = function(job) local players = GetPlayers() local playerList = {} for _, src in pairs(players) do - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if xPlayer.getJob().name == job then table.insert(playerList, src) end @@ -249,7 +251,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 xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end if not ESX.DoesJobExist(name, grade) then Prints.Error("Job Does Not Exsist In Framework :NAME " .. name .. " Grade:" .. grade) @@ -261,7 +263,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 xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end if _type == 'cash' then _type = 'money' end return xPlayer.addAccountMoney(_type, amount) @@ -270,7 +272,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 xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end if _type == 'cash' then _type = 'money' end xPlayer.removeAccountMoney(_type, amount) @@ -280,7 +282,7 @@ end -- Framework.GetAccountBalance(src, _type) -- Returns the player's account balance of the specified type. Framework.GetAccountBalance = function(src, _type) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end if _type == 'cash' then _type = 'money' end return xPlayer.getAccount(_type).money @@ -289,7 +291,7 @@ end -- Framework.AddItem(src, item, amount, _, _) -- Adds the specified item to the player's inventory. Framework.AddItem = function(src, item, amount, slot, metadata) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end return xPlayer.addInventoryItem(item, amount) end @@ -297,7 +299,7 @@ end -- Framework.RemoveItem(src, item, amount, _, _) -- Removes the specified item from the player's inventory. Framework.RemoveItem = function(src, item, amount, slot, metadata) - local xPlayer = ESX.GetPlayerFromId(src) + local xPlayer = Framework.GetPlayer(src) if not xPlayer then return end return xPlayer.removeInventoryItem(item, amount) end diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index 71639aa..1daa075 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -33,7 +33,7 @@ end ---This will get the players birth date ---@return string Framework.GetPlayerDob = function() - local player = QBCore.Functions.GetPlayerData() + local player = Framework.GetPlayerData() local playerData = player.PlayerData return playerData.charinfo.birthdate end @@ -42,7 +42,7 @@ end ---@param metadata table | string ---@return table | string | number | boolean Framework.GetPlayerMetaData = function(metadata) - return QBCore.Functions.GetPlayerData().metadata[metadata] + return Framework.GetPlayerData().metadata[metadata] end Framework.Notify = function(message, type, time) @@ -80,14 +80,14 @@ end ---This will get the players identifier (citizenid) etc. ---@return string Framework.GetPlayerIdentifier = function() - return QBCore.Functions.GetPlayerData().citizenid + return Framework.GetPlayerData().citizenid end ---This will get the players name (first and last). ---@return string ---@return string Framework.GetPlayerName = function() - local playerData = QBCore.Functions.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.charinfo.firstname, playerData.charinfo.lastname end @@ -97,7 +97,7 @@ end ---@return string ---@return string Framework.GetPlayerJob = function() - local playerData = QBCore.Functions.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level end @@ -109,7 +109,7 @@ end ---@param item string ---@return number Framework.GetItemCount = function(item) - local frameworkInv = QBCore.Functions.GetPlayerData().items + local frameworkInv = Framework.GetPlayerData().items local count = 0 for _, v in pairs(frameworkInv) do if v.name == item then @@ -121,7 +121,7 @@ end Framework.GetPlayerInventory = function() local items = {} - local frameworkInv = QBCore.Functions.GetPlayerData().items + local frameworkInv = Framework.GetPlayerData().items for _, v in pairs(frameworkInv) do table.insert(items, { name = v.name, @@ -140,7 +140,7 @@ end ---This will get a players dead status. ---@return boolean Framework.GetIsPlayerDead = function() - local playerData = QBCore.Functions.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.metadata["isdead"] or playerData.metadata["inlaststand"] end @@ -148,21 +148,15 @@ Framework.Shared = QBCore.Shared RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() Wait(1500) - FillBridgeTables() TriggerEvent('community_bridge:Client:OnPlayerLoaded') end) RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() - ClearClientSideVariables() - TriggerEvent('community_bridge:Client:OnPlayerUnload') + TriggerEvent('community_bridge:Client:OnPlayerUnload') end) RegisterNetEvent('QBCore:Client:OnJobUpdate', function(data) - PlayerJobName = data.name - PlayerJobLabel = data.label - PlayerJobGradeName = data.grade.name - PlayerJobGradeLevel = data.grade.level - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', data.name, data.label, data.grade_label, data.grade) end) RegisterNetEvent('QBCore:Client:OnGangUpdate', function(data) diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index c94145f..1a302da 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -13,7 +13,7 @@ end -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.citizenid @@ -44,7 +44,7 @@ end -- Returns the first and last name of the player. ---@return string, string Framework.GetPlayerName = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.charinfo.firstname, playerData.charinfo.lastname @@ -53,7 +53,7 @@ end ---This will get the players birth date ---@return string Framework.GetPlayerDob = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.charinfo.birthdate @@ -63,7 +63,7 @@ end -- Returns a table of items matching the specified name and if passed metadata from the player's inventory. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetItem = function(src, item, metadata) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local playerInventory = playerData.items @@ -106,7 +106,7 @@ end ---@param metadata table ---@return number Framework.GetItemCount = function(src, item, metadata) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local playerInventory = playerData.items @@ -132,7 +132,7 @@ end -- Returns the entire inventory of the player as a table. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetPlayerInventory = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local playerInventory = playerData.items @@ -160,7 +160,7 @@ Framework.GetPlayers = function() end Framework.GetItemBySlot = function(src, slot) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local playerInventory = playerData.items @@ -186,7 +186,7 @@ end -- Adds the specified metadata key and number value to the player's data. ---@return boolean | nil Framework.SetPlayerMetadata = function(src, metadata, value) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end player.Functions.SetMetaData(metadata, value) return true @@ -195,7 +195,7 @@ end -- Framework.GetMetadata(src, metadata) -- Gets the specified metadata key to the player's data. Framework.GetPlayerMetadata = function(src, metadata) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.metadata[metadata] or false @@ -205,7 +205,7 @@ end -- Adds the specified value to the player's stress level and updates the client HUD. ---@return number | nil Framework.AddStress = function(src, value) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newStress = playerData.metadata.stress + value @@ -218,7 +218,7 @@ end -- Removes the specified value from the player's stress level and updates the client HUD. ---@return number | nil Framework.RemoveStress = function(src, value) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newStress = (playerData.metadata.stress or 0) - value @@ -231,7 +231,7 @@ end -- Adds the specified value from the player's hunger level. ---@return number | nil Framework.AddHunger = function(src, value) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) + value @@ -246,7 +246,7 @@ end -- Adds the specified value from the player's thirst level. ---@return number | nil Framework.AddThirst = function(src, value) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) + value @@ -260,7 +260,7 @@ end ---@param src any ---@return number | nil Framework.GetHunger = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) @@ -268,7 +268,7 @@ Framework.GetHunger = function(src) end Framework.GetIsPlayerDead = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.metadata.isdead or playerData.metadata.inlaststand or false @@ -286,7 +286,7 @@ end ---@param src any ---@return number | nil Framework.GetThirst = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) @@ -296,7 +296,7 @@ end -- Framework.GetPlayerPhone(src) -- Returns the phone number of the player. Framework.GetPlayerPhone = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.charinfo.phone @@ -305,7 +305,7 @@ end -- Framework.GetPlayerGang(src) -- Returns the gang name of the player. Framework.GetPlayerGang = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.gang.name @@ -318,7 +318,7 @@ Framework.GetPlayersByJob = function(job) local playerList = {} local players = QBCore.Functions.GetPlayers() for _, src in pairs(players) do - local player = QBCore.Functions.GetPlayer(src).PlayerData + local player = Framework.GetPlayer(src).PlayerData if player.job.name == job then table.insert(playerList, src) end @@ -333,7 +333,7 @@ end ---@return string ---@return string Framework.GetPlayerJob = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level @@ -343,7 +343,7 @@ end ---@param src number ---@return boolean | nil Framework.GetPlayerDuty = function(src) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData if not playerData.job.onduty then return false end @@ -355,7 +355,7 @@ end ---@param status boolean ---@return nil Framework.SetPlayerDuty = function(src, status) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end player.Functions.SetJobDuty(status) TriggerEvent('QBCore:Server:SetDuty', src, player.PlayerData.job.onduty) @@ -367,7 +367,7 @@ end ---@param grade string ---@return nil Framework.SetPlayerJob = function(src, name, grade) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end return player.Functions.SetJob(name, grade) end @@ -378,7 +378,7 @@ end ---@param amount number ---@return boolean | nil Framework.AddAccountBalance = function(src, _type, amount) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end if _type == 'money' then _type = 'cash' end return player.Functions.AddMoney(_type, amount) @@ -390,7 +390,7 @@ end ---@param amount number ---@return boolean | nil Framework.RemoveAccountBalance = function(src, _type, amount) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end if _type == 'money' then _type = 'cash' end return player.Functions.RemoveMoney(_type, amount) @@ -401,7 +401,7 @@ end ---@param _type string ---@return string | nil Framework.GetAccountBalance = function(src, _type) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData if _type == 'money' then _type = 'cash' end @@ -411,7 +411,7 @@ end -- Framework.AddItem(src, item, amount, slot, metadata) -- Adds the specified item to the player's inventory. Framework.AddItem = function(src, item, amount, slot, metadata) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, { action = "add", item = item, count = amount, slot = slot, metadata = metadata }) @@ -421,7 +421,7 @@ end -- Framework.RemoveItem(src, item, amount, slot, metadata) -- Removes the specified item from the player's inventory. Framework.RemoveItem = function(src, item, amount, slot, metadata) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, { action = "remove", item = item, count = amount, slot = slot, metadata = metadata }) @@ -432,7 +432,7 @@ end -- Sets the metadata for the specified item in the player's inventory. -- Notes, this is kinda a jank workaround. with the framework aside from updating the entire table theres not really a better way Framework.SetMetadata = function(src, item, slot, metadata) - local player = QBCore.Functions.GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local slotFinder = Framework.GetPlayerInventory(src) local freeSlot = Table.FindFirstUnoccupiedSlot(slotFinder) diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index 2fee358..bf1e9af 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -18,7 +18,7 @@ Framework.GetFrameworkJobs = function() end Framework.GetPlayerDob = function() - local playerData = QBox.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.charinfo.birthdate end @@ -37,26 +37,26 @@ Framework.HideHelpText = function() end Framework.GetPlayerMetaData = function(metadata) - local playerData = QBox.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.metadata[metadata] end Framework.GetPlayerIdentifier = function() - return QBox.GetPlayerData().citizenid + return Framework.GetPlayerData().citizenid end Framework.GetPlayerName = function() - local playerData = QBox.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.charinfo.firstname, playerData.charinfo.lastname end Framework.GetPlayerJob = function() - local playerData = QBox.GetPlayerData() + local playerData = Framework.GetPlayerData() return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level end Framework.GetPlayerInventory = function() - return QBox.GetPlayerData().items + return Framework.GetPlayerData().items end ---comment @@ -68,27 +68,21 @@ Framework.GetItemCount = function(item) end Framework.GetIsPlayerDead = function() - local platerData = QBox.GetPlayerData() + local platerData = Framework.GetPlayerData() return platerData.metadata["isdead"] or platerData.metadata["inlaststand"] end RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() Wait(1500) - FillBridgeTables() TriggerEvent('community_bridge:Client:OnPlayerLoaded') end) RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() - ClearClientSideVariables() - TriggerEvent('community_bridge:Client:OnPlayerUnload') + TriggerEvent('community_bridge:Client:OnPlayerUnload') end) RegisterNetEvent('QBCore:Client:OnJobUpdate', function(data) - PlayerJobName = data.name - PlayerJobLabel = data.label - PlayerJobGradeName = data.grade.name - PlayerJobGradeLevel = data.grade.level - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate',PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', data.name, data.label, data.grade.name, data.grade.level) end) return Framework \ No newline at end of file diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index ddc1017..ef6cbcb 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -15,7 +15,7 @@ end ---@param src number ---@return string Framework.GetPlayerDob = function(src) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.charinfo.birthdate @@ -40,7 +40,7 @@ end ---@param src number ---@return string | boolean Framework.GetPlayerIdentifier = function(src) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData if not playerData then return false end @@ -62,7 +62,7 @@ end ---@param src number ---@return string | nil Framework.GetPlayerName = function(src) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.charinfo.firstname, playerData.charinfo.lastname @@ -74,7 +74,7 @@ end ---@param metadata table ---@return table Framework.GetItem = function(src, item, metadata) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerInventory = player.PlayerData.items local repackedTable = {} @@ -97,7 +97,7 @@ end ---@param metadata table ---@return number Framework.GetItemCount = function(src, item, metadata) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerInventory = player.PlayerData.items local count = 0 @@ -122,7 +122,7 @@ end ---@param src number ---@return table Framework.GetPlayerInventory = function(src) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerItems = player.PlayerData.items local repackedTable = {} @@ -143,7 +143,7 @@ end ---@param value string ---@return boolean Framework.SetPlayerMetadata = function(src, metadata, value) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end player.Functions.SetMetaData(metadata, value) return true @@ -154,7 +154,7 @@ end ---@param metadata string ---@return string | boolean | nil Framework.GetPlayerMetadata = function(src, metadata) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.metadata[metadata] or false @@ -165,7 +165,7 @@ end ---@param value number ---@return number | nil Framework.AddStress = function(src, value) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newStress = playerData.metadata.stress + value @@ -179,7 +179,7 @@ end ---@param value number ---@return number | nil Framework.RemoveStress = function(src, value) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newStress = (playerData.metadata.stress or 0) - value @@ -193,7 +193,7 @@ end ---@param value number ---@return number | nil Framework.AddHunger = function(src, value) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) + value @@ -207,7 +207,7 @@ end ---@param value number ---@return number | nil Framework.AddThirst = function(src, value) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) + value @@ -220,7 +220,7 @@ end ---@param src number ---@return number | nil Framework.GetHunger = function(src) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) @@ -228,7 +228,7 @@ Framework.GetHunger = function(src) end Framework.GetIsPlayerDead = function(src) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.metadata.isdead or false @@ -245,7 +245,7 @@ end ---@param src number ---@return number Framework.GetThirst = function(src) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) @@ -256,7 +256,7 @@ end ---@param src number ---@return string | nil Framework.GetPlayerPhone = function(src) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData return playerData.charinfo.phone @@ -266,7 +266,7 @@ end ---@param src number ---@return string | nil Framework.GetPlayerGang = function(src) - local player = QBox:GetPlayer(src).PlayerData + local player = Framework.GetPlayer(src).PlayerData return player.gang.name end @@ -291,7 +291,7 @@ end ---@return string | string | string | number | nil ---@return string | string | string | number | nil Framework.GetPlayerJob = function(src) - local player = QBox:GetPlayer(src).PlayerData + local player = Framework.GetPlayer(src).PlayerData if not player then return end return player.job.name, player.job.label, player.job.grade.name, player.job.grade.level end @@ -302,7 +302,7 @@ end ---@param grade string ---@return boolean | nil Framework.SetPlayerJob = function(src, name, grade) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end return player.Functions.SetJob(name, grade) end @@ -311,7 +311,7 @@ end ---@param src number ---@param status boolean Framework.SetPlayerDuty = function(src, status) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData QBox:SetJobDuty(playerData.citizenid, status) @@ -322,7 +322,7 @@ end ---@param src number ---@return boolean | nil Framework.GetPlayerDuty = function(src) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData if not playerData.job.onduty then return false end @@ -335,7 +335,7 @@ end ---@param amount number ---@return boolean | nil Framework.AddAccountBalance = function(src, _type, amount) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end if _type == 'money' then _type = 'cash' end return player.Functions.AddMoney(_type, amount) @@ -347,7 +347,7 @@ end ---@param amount number ---@return boolean | nil Framework.RemoveAccountBalance = function(src, _type, amount) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end if _type == 'money' then _type = 'cash' end return player.Functions.RemoveMoney(_type, amount) @@ -358,7 +358,7 @@ end ---@param _type string ---@return number | nil Framework.GetAccountBalance = function(src, _type) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end local playerData = player.PlayerData if _type == 'money' then _type = 'cash' end @@ -373,7 +373,7 @@ end ---@param metadata table ---@return boolean | nil Framework.AddItem = function(src, item, amount, slot, metadata) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, { action = "add", item = item, count = amount, slot = slot, metadata = metadata }) @@ -388,7 +388,7 @@ end ---@param metadata table ---@return boolean | nil Framework.RemoveItem = function(src, item, amount, slot, metadata) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, { action = "remove", item = item, count = amount, slot = slot, metadata = metadata }) @@ -402,7 +402,7 @@ end ---@param metadata table ---@return boolean | nil Framework.SetMetadata = function(src, item, slot, metadata) - local player = QBox:GetPlayer(src) + local player = Framework.GetPlayer(src) if not player then return end player.Functions.RemoveItem(item, 1, slot) return player.Functions.AddItem(item, 1, slot, metadata)