diff --git a/fxmanifest.lua b/fxmanifest.lua index 14cb87a..0664d19 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -3,12 +3,12 @@ game 'gta5' lua54 '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.0.9' +version '0.0.10' shared_scripts { 'settings/sharedConfig.lua', 'use/*.lua', - 'modules/utilities/shared/*.lua', + 'modules/Utility/shared/*.lua', 'modules/locales/*.lua', } @@ -16,33 +16,35 @@ server_scripts { '@oxmysql/lib/MySQL.lua', 'settings/serverConfig.lua', 'modules/locales/shared.lua', - 'modules/utilities/server/*.lua', - 'modules/framework/**/server.lua', - 'modules/inventory/**/server.lua', - 'modules/stashes/server.lua', - 'modules/phones/**/server.lua', - 'modules/managment/**/server.lua', - 'modules/notify/server.lua', + 'modules/Utility/server/*.lua', + 'modules/Framework/**/server.lua', + 'modules/Inventory/**/server.lua', + 'modules/Doorlock/**/server.lua', + 'modules/Phone/**/server.lua', + 'modules/Notify/server.lua', + 'modules/Managment/**/server.lua', 'init.lua', } client_scripts { 'settings/clientConfig.lua', 'modules/locales/shared.lua', - 'modules/input/client.lua', - 'modules/utilities/client/*.lua', - 'modules/framework/**/client.lua', - 'modules/inventory/**/client.lua', - 'modules/keys/**/client.lua', - 'modules/fuel/**/client.lua', - 'modules/target/**/client.lua', - 'modules/menu/client.lua', - 'modules/notify/client.lua', - 'modules/dispatch/**/client.lua', - 'modules/progressbars/**/client.lua', - 'modules/clothing/**/client.lua', - 'modules/weather/**/client.lua', + 'modules/Utility/client/*.lua', + 'modules/Framework/**/client.lua', + 'modules/Inventory/**/client.lua', + 'modules/Doorlock/**/client.lua', + 'modules/Phone/**/client.lua', + 'modules/Notify/client.lua', + 'modules/Weather/**/client.lua', + 'modules/VehicleKey/**/client.lua', + 'modules/Fuel/**/client.lua', + 'modules/Target/**/client.lua', + 'modules/Dispatch/**/client.lua', + 'modules/Progressbar/**/client.lua', + 'modules/Clothing/**/client.lua', + 'modules/Input/client.lua', 'modules/math/*.lua', + 'modules/menu/client.lua', 'init.lua', } diff --git a/init.lua b/init.lua index 73d7c35..f3709da 100644 --- a/init.lua +++ b/init.lua @@ -11,22 +11,24 @@ PlayerJobGradeLevel = nil Bridge.Inventory = Inventory Bridge.Menu = Menu Bridge.Language = Language -Bridge.Debugger = Debugger Bridge.Framework = Framework Bridge.Doorlock = Doorlock Bridge.Phone = Phone Bridge.Notify = Notify Bridge.Vehicle = Vehicle +Bridge.Fuel = Fuel Bridge.Dispatch = Dispatch Bridge.Weather = Weather Bridge.Target = Target Bridge.Table = Table +Bridge.Input = Input +Bridge.Managment = Managment Bridge.Math = Math +Bridge.VehicleKey = VehicleKey Bridge.Clothing = Clothing Bridge.Progressbar = Progressbar Bridge.Utility = Utility Bridge.Prints = Prints -Bridge.Table = Table CreateThread(function() diff --git a/modules/doorlocks/doors_creator/client.lua b/modules/Doorlock/doors_creator/client.lua similarity index 100% rename from modules/doorlocks/doors_creator/client.lua rename to modules/Doorlock/doors_creator/client.lua diff --git a/modules/doorlocks/doors_creator/server.lua b/modules/Doorlock/doors_creator/server.lua similarity index 100% rename from modules/doorlocks/doors_creator/server.lua rename to modules/Doorlock/doors_creator/server.lua diff --git a/modules/doorlocks/ox_doorlock/client.lua b/modules/Doorlock/ox_doorlock/client.lua similarity index 100% rename from modules/doorlocks/ox_doorlock/client.lua rename to modules/Doorlock/ox_doorlock/client.lua diff --git a/modules/doorlocks/ox_doorlock/server.lua b/modules/Doorlock/ox_doorlock/server.lua similarity index 100% rename from modules/doorlocks/ox_doorlock/server.lua rename to modules/Doorlock/ox_doorlock/server.lua diff --git a/modules/doorlocks/qb-doorlock/client.lua b/modules/Doorlock/qb-doorlock/client.lua similarity index 100% rename from modules/doorlocks/qb-doorlock/client.lua rename to modules/Doorlock/qb-doorlock/client.lua diff --git a/modules/doorlocks/qb-doorlock/server.lua b/modules/Doorlock/qb-doorlock/server.lua similarity index 100% rename from modules/doorlocks/qb-doorlock/server.lua rename to modules/Doorlock/qb-doorlock/server.lua diff --git a/modules/doorlocks/rcore_doorlock/client.lua b/modules/Doorlock/rcore_doorlock/client.lua similarity index 100% rename from modules/doorlocks/rcore_doorlock/client.lua rename to modules/Doorlock/rcore_doorlock/client.lua diff --git a/modules/doorlocks/rcore_doorlock/server.lua b/modules/Doorlock/rcore_doorlock/server.lua similarity index 100% rename from modules/doorlocks/rcore_doorlock/server.lua rename to modules/Doorlock/rcore_doorlock/server.lua diff --git a/modules/Fuel/_defualts/client.lua b/modules/Fuel/_defualts/client.lua new file mode 100644 index 0000000..7b1055b --- /dev/null +++ b/modules/Fuel/_defualts/client.lua @@ -0,0 +1,11 @@ +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return GetVehicleFuelLevel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel, type) + if not DoesEntityExist(vehicle) then return end + return SetVehicleFuelLevel(vehicle, fuel) +end \ No newline at end of file diff --git a/modules/Inventory/_defualts/client.lua b/modules/Inventory/_defualts/client.lua new file mode 100644 index 0000000..d19ca5c --- /dev/null +++ b/modules/Inventory/_defualts/client.lua @@ -0,0 +1,9 @@ +Inventory = Inventory or {} + +Inventory.GetItemInfo = function(item) + return Framework.GetItemInfo(item) +end + +Inventory.GetImagePath = function(item) + return "https://avatars.githubusercontent.com/u/47620135" +end \ No newline at end of file diff --git a/modules/Inventory/_defualts/server.lua b/modules/Inventory/_defualts/server.lua new file mode 100644 index 0000000..8d058c5 --- /dev/null +++ b/modules/Inventory/_defualts/server.lua @@ -0,0 +1,33 @@ +Inventory = Inventory or {} + +Inventory.AddItem = function(src, item, count, slot, metadata) + return Framework.AddItem(src, item, count, slot, metadata) +end + +Inventory.RemoveItem = function(src, item, count, slot, metadata) + return Framework.RemoveItem(src, item, count, slot, metadata) +end + +Inventory.GetItemInfo = function(item) + return false, Print.Error("This Inventory Has Not Been Bridged For An Item Info Feature.") +end + +Inventory.GetItemCount = function(src, item, metadata) + return Framework.GetItemCount(src, item, metadata) +end + +Inventory.GetInventoryItems = function(src) + return Framework.GetPlayerInventory(src) +end + +Inventory.SetMetadata = function(src, item, slot, metadata) + return Framework.SetMetadata(src, item, slot, metadata) +end + +Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) + return false, Print.Error("This Inventory Has Not Been Bridged For A Stash Feature.") +end + +Inventory.GetImagePath = function(item) + return "https://avatars.githubusercontent.com/u/47620135" +end \ No newline at end of file diff --git a/modules/Phone/_defualts/client.lua b/modules/Phone/_defualts/client.lua new file mode 100644 index 0000000..8b33ca9 --- /dev/null +++ b/modules/Phone/_defualts/client.lua @@ -0,0 +1,5 @@ +Phone = Phone or {} + +Phone.SendEmail = function(email, title, message) + return false, Print.Error('There Is No Phone Bridged.') +end \ No newline at end of file diff --git a/modules/Phone/_defualts/server.lua b/modules/Phone/_defualts/server.lua new file mode 100644 index 0000000..a367380 --- /dev/null +++ b/modules/Phone/_defualts/server.lua @@ -0,0 +1,9 @@ +Phone = Phone or {} + +Phone.GetPlayerPhone = function(src) + return false, Print.Error('There Is No Phone Bridged.') +end + +Phone.SendEmail = function(src, email, title, message) + return false, Print.Error('There Is No Phone Bridged.') +end \ No newline at end of file diff --git a/modules/phones/gksphone/client.lua b/modules/Phone/gksphone/client.lua similarity index 76% rename from modules/phones/gksphone/client.lua rename to modules/Phone/gksphone/client.lua index 5a11629..ea45267 100644 --- a/modules/phones/gksphone/client.lua +++ b/modules/Phone/gksphone/client.lua @@ -1,6 +1,6 @@ if GetResourceState('gksphone') ~= 'started' then return end -Phones = {} +Phone = {} -Phones.SendEmail = function(email, title, message) +Phone.SendEmail = function(email, title, message) return exports["gksphone"]:SendNewMail({ sender = email, image = '/html/static/img/icons/mail.png', subject = title, message = message }) end \ No newline at end of file diff --git a/modules/phones/gksphone/server.lua b/modules/Phone/gksphone/server.lua similarity index 76% rename from modules/phones/gksphone/server.lua rename to modules/Phone/gksphone/server.lua index fe6c252..5de2c37 100644 --- a/modules/phones/gksphone/server.lua +++ b/modules/Phone/gksphone/server.lua @@ -1,11 +1,11 @@ if GetResourceState('gksphone') ~= 'started' then return end -Phones = {} +Phone = {} -Phones.GetPlayerPhone = function(src) +Phone.GetPlayerPhone = function(src) return exports["gksphone"]:GetPhoneBySource(src) or false end -Phones.SendEmail = function(src, email, title, message) +Phone.SendEmail = function(src, email, title, message) local data = {} data.sender = email data.image = '/html/static/img/icons/mail.png' diff --git a/modules/phones/lb-phone/client.lua b/modules/Phone/lb-phone/client.lua similarity index 73% rename from modules/phones/lb-phone/client.lua rename to modules/Phone/lb-phone/client.lua index 609c542..5918f64 100644 --- a/modules/phones/lb-phone/client.lua +++ b/modules/Phone/lb-phone/client.lua @@ -1,6 +1,6 @@ if GetResourceState('lb-phone') ~= 'started' then return end -Phones = {} +Phone = {} -Phones.SendEmail = function(email, title, message) +Phone.SendEmail = function(email, title, message) TriggerServerEvent('community_bridge:Server:genericEmail', {email = email, title = title, message = message}) end \ No newline at end of file diff --git a/modules/phones/lb-phone/server.lua b/modules/Phone/lb-phone/server.lua similarity index 58% rename from modules/phones/lb-phone/server.lua rename to modules/Phone/lb-phone/server.lua index 6044885..84cf579 100644 --- a/modules/phones/lb-phone/server.lua +++ b/modules/Phone/lb-phone/server.lua @@ -1,15 +1,15 @@ if GetResourceState('lb-phone') ~= 'started' then return end -Phones = {} +Phone = {} -Phones.GetPlayerPhone = function(src) +Phone.GetPlayerPhone = function(src) return exports["lb-phone"]:GetEquippedPhoneNumber(src) or false end -Phones.SendEmail = function(src, email, title, message) +Phone.SendEmail = function(src, email, title, message) local numberNumber = exports["lb-phone"]:GetEquippedPhoneNumber(src) - if not numberNumber then return false, print("Could not Find Phone number") end + if not numberNumber then return false, Prints.Error("Could not Find Phone number") end local playerEmail = exports["lb-phone"]:GetEmailAddress(numberNumber) - if not playerEmail then return false, print("Could not Find email") end + if not playerEmail then return false, Prints.Error("Could not Find email") end local success, id = exports["lb-phone"]:SendMail({ to = playerEmail, sender = email, @@ -21,6 +21,6 @@ end RegisterNetEvent('community_bridge:Server:genericEmail', function(data) local src = source - print('community_bridge:Server:genericEmail Hit') - return Phones.SendEmail(src, data.email, data.title, data.message) + Prints.Debug('community_bridge:Server:genericEmail Hit') + return Phone.SendEmail(src, data.email, data.title, data.message) end) \ No newline at end of file diff --git a/modules/phones/qs-smartphone/client.lua b/modules/Phone/qs-smartphone/client.lua similarity index 87% rename from modules/phones/qs-smartphone/client.lua rename to modules/Phone/qs-smartphone/client.lua index 475de32..b325b24 100644 --- a/modules/phones/qs-smartphone/client.lua +++ b/modules/Phone/qs-smartphone/client.lua @@ -1,7 +1,7 @@ if GetResourceState('qs-smartphone') ~= 'started' then return end -Phones = {} +Phone = {} -Phones.SendEmail = function(email, title, message) +Phone.SendEmail = function(email, title, message) return TriggerServerEvent('qs-smartphone:server:sendNewMail', { sender = email, subject = title, message = message, button = {} }) end diff --git a/modules/phones/qs-smartphone/server.lua b/modules/Phone/qs-smartphone/server.lua similarity index 73% rename from modules/phones/qs-smartphone/server.lua rename to modules/Phone/qs-smartphone/server.lua index 64f5ab3..909ee8d 100644 --- a/modules/phones/qs-smartphone/server.lua +++ b/modules/Phone/qs-smartphone/server.lua @@ -1,11 +1,11 @@ if GetResourceState('qs-smartphone') ~= 'started' then return end -Phones = {} +Phone = {} -Phones.GetPlayerPhone = function(src) +Phone.GetPlayerPhone = function(src) return exports['qs-base']:GetPlayerPhone(src) or false end -Phones.SendEmail = function(src, email, title, message) +Phone.SendEmail = function(src, email, title, message) TriggerClientEvent('community_bridge:Server:genericEmail', src, { sender = email, subject = title, message = message, button = {} }) return true end \ No newline at end of file diff --git a/modules/progressbars/ox_progressbars/client.lua b/modules/Progressbar/ox_progressbars/client.lua similarity index 81% rename from modules/progressbars/ox_progressbars/client.lua rename to modules/Progressbar/ox_progressbars/client.lua index b5d7503..50efeef 100644 --- a/modules/progressbars/ox_progressbars/client.lua +++ b/modules/Progressbar/ox_progressbars/client.lua @@ -1,16 +1,16 @@ if BridgeClientConfig.ProgressBar ~= "ox" then return end -ProgressBar = {} +Progressbar = {} local _progBarType = BridgeClientConfig.ProgressBarStyle or "bar" -ProgressBar.StartProgressBar = function(time, label, whiledead, cancancel, disable, animTable, successAction, canceledAction) +Progressbar.StartProgressBar = function(time, label, whiledead, cancancel, disable, animTable, successAction, canceledAction) local runTime = time or 10000 local textLabel = label or "Doing something" local deadBool = whiledead or false local cancelBool = cancancel or false local disableKeys = disable or { move = true, sprint = true, car = true, combat = true, } local anim = animTable or nil - local success = successAction or function() print("Success") end - local canceled = canceledAction or function() print("Cancelled") end + local success = successAction or function() Prints.Debug("Success") end + local canceled = canceledAction or function() Prints.Debug("Cancelled") end if _progBarType == "bar" then if exports.ox_lib:progressBar({ duration = runTime, @@ -33,6 +33,6 @@ ProgressBar.StartProgressBar = function(time, label, whiledead, cancancel, disab end end -ProgressBar.IsProgressBarActive = function() +Progressbar.IsProgressBarActive = function() return exports.ox_lib:progressActive() end \ No newline at end of file diff --git a/modules/progressbars/qb_progressbar/client.lua b/modules/Progressbar/qb_progressbar/client.lua similarity index 85% rename from modules/progressbars/qb_progressbar/client.lua rename to modules/Progressbar/qb_progressbar/client.lua index ae2ba32..a9df93f 100644 --- a/modules/progressbars/qb_progressbar/client.lua +++ b/modules/Progressbar/qb_progressbar/client.lua @@ -1,5 +1,5 @@ if BridgeClientConfig.ProgressBar ~= "qb" then return end -ProgressBar = {} +Progressbar = {} local function convertOxToQB(disabledTable, animTable) local repackedTable = { disabled = {}, animations = {}} @@ -28,13 +28,13 @@ local function convertOxToQB(disabledTable, animTable) return repackedTable end -ProgressBar.StartProgressBar = function(time, label, whiledead, cancancel, disable, animTable, successAction, canceledAction) +Progressbar.StartProgressBar = function(time, label, whiledead, cancancel, disable, animTable, successAction, canceledAction) local runTime = time or 10000 local textLabel = label or "Doing something" local deadBool = whiledead or false local cancelBool = cancancel or false - local success = successAction or function() print("Success") end - local canceled = canceledAction or function() print("Cancelled") end + local success = successAction or function() Prints.Debug("Success") end + local canceled = canceledAction or function() Prints.Debug("Cancelled") end local repackedTable = convertOxToQB(disable, animTable) exports['progressbar']:Progress({ name = textLabel, @@ -55,6 +55,6 @@ ProgressBar.StartProgressBar = function(time, label, whiledead, cancancel, disab end) end -ProgressBar.IsProgressBarActive = function() +Progressbar.IsProgressBarActive = function() return exports["progressbar"]:isDoingSomething() end \ No newline at end of file diff --git a/modules/utilities/client/object_Placer.lua b/modules/Utility/client/object_Placer.lua similarity index 98% rename from modules/utilities/client/object_Placer.lua rename to modules/Utility/client/object_Placer.lua index 28a3d1e..f2a4ddc 100644 --- a/modules/utilities/client/object_Placer.lua +++ b/modules/Utility/client/object_Placer.lua @@ -22,7 +22,7 @@ end Utility.PlaceObject = function(object, distance, snapToGround, allowedMats, offset) if activePlacementProp then return end - if not object then lib.print.error('no_prop_defined') end + if not object then Prints.Error('no_prop_defined') end local propObject = type(object) == 'string' and joaat(object) or object local heading = 0.0 diff --git a/modules/utilities/client/utility.lua b/modules/Utility/client/utility.lua similarity index 97% rename from modules/utilities/client/utility.lua rename to modules/Utility/client/utility.lua index be462ec..4cc1e60 100644 --- a/modules/utilities/client/utility.lua +++ b/modules/Utility/client/utility.lua @@ -7,7 +7,7 @@ lib.locale() Utility.CreateVehicle = function(model, coords, heading, networked) if networked == nil then networked = true end Utility.LoadModel(model) - if not HasModelLoaded(model) then return Prints.error("Model Has Not Loaded") end + if not HasModelLoaded(model) then return Prints.Error("Model Has Not Loaded") end local vehicle = CreateVehicle(model, coords.x, coords.y, coords.z, heading, networked, false) SetVehicleHasBeenOwnedByPlayer(vehicle, true) SetVehicleNeedsToBeHotwired(vehicle, false) @@ -30,7 +30,7 @@ end Utility.CreateProp = function(model, coords, heading, networked) if networked == nil then networked = true end Utility.LoadModel(model) - if not HasModelLoaded(model) then return Prints.error("Model Has Not Loaded") end + if not HasModelLoaded(model) then return Prints.Error("Model Has Not Loaded") end local propEntity = CreateObject(model, coords.x, coords.y, coords.z, networked, false, false) SetEntityHeading(propEntity, heading) SetModelAsNoLongerNeeded(model) @@ -78,7 +78,7 @@ end Utility.CreatePed = function(model, coords, heading, networked, clothing) if networked == nil then networked = true end Utility.LoadModel(model) - if not HasModelLoaded(model) then return Prints.error("Model Has Not Loaded") end + if not HasModelLoaded(model) then return Prints.Error("Model Has Not Loaded") end local spawnedEntity = CreatePed(0, model, coords.x, coords.y, coords.z, heading, networked, false) if clothing then for componentID, v in pairs(clothing) do diff --git a/modules/Utility/server/VersionChecker.lua b/modules/Utility/server/VersionChecker.lua new file mode 100644 index 0000000..98b7a52 --- /dev/null +++ b/modules/Utility/server/VersionChecker.lua @@ -0,0 +1,38 @@ +VersionCheck = {} + +function VersionCheck.VersionChecker(repoPath) + local resource = repoPath:match("([^/]+)$") + if not resource then return Prints.Error('^1Invalid repository format. Expected format: "username/reponame"^0') end + + local version = GetResourceMetadata(resource, "version", 0) + if not version then return Prints.Error(('^1Unable to determine current resource version for %s ^0'):format(resource)) end + + version = version:match('%d+%.%d+%.%d+') + if not version then return Prints.Error(('^1Invalid version format for %s ^0'):format(resource)) end + + local username, reponame = repoPath:match("([^/]+)/([^/]+)") + if not username or not reponame then return Prints.Error('^1Invalid repository format. Expected format: "username/reponame"^0') end + PerformHttpRequest(('https://api.github.com/repos/%s/%s/releases/latest'):format(username, reponame), function(status, response) + local failure = ('^1Unable locate github repo for resource %s ^0'):format(resource) + + if status ~= 200 then return Prints.Error(failure) end + response = json.decode(response) + + if response.prerelease then return Prints.Error(failure) end + + local latest = response.tag_name:match('%d+%.%d+%.%d+') + if not latest then return Prints.Error(failure) end + + if latest == version then return Prints.Error(('^2 %s is on the latest version.^0'):format(resource)) end + local currentVersion, latestVersion = version:gsub('%D', ''), latest:gsub('%D', '') + + if currentVersion < latestVersion then + return Prints.Error(('^1An update is available for %s (current version: %s)\r\n - ^5Please download the latest version from the GitHub release page.^7\r\n%s'):format(resource, version, response.html_url)) + end + end, 'GET') +end + +AddEventHandler('onResourceStart', function(resourceName) + if GetCurrentResourceName() ~= resourceName then return end + VersionCheck.VersionChecker("The-Order-Of-The-Sacred-Framework/community_bridge") +end) \ No newline at end of file diff --git a/modules/utilities/server/logs.lua b/modules/Utility/server/logs.lua similarity index 100% rename from modules/utilities/server/logs.lua rename to modules/Utility/server/logs.lua diff --git a/modules/utilities/server/lootTables.lua b/modules/Utility/server/lootTables.lua similarity index 100% rename from modules/utilities/server/lootTables.lua rename to modules/Utility/server/lootTables.lua diff --git a/modules/utilities/server/supplement_events.lua b/modules/Utility/server/supplement_events.lua similarity index 100% rename from modules/utilities/server/supplement_events.lua rename to modules/Utility/server/supplement_events.lua diff --git a/modules/utilities/shared/prints.lua b/modules/Utility/shared/prints.lua similarity index 75% rename from modules/utilities/shared/prints.lua rename to modules/Utility/shared/prints.lua index 96e78c7..a3198ac 100644 --- a/modules/utilities/shared/prints.lua +++ b/modules/Utility/shared/prints.lua @@ -7,18 +7,18 @@ local function printMessage(level, color, message) print(color .. '[' .. level .. ']:', message) end -Prints.info = function(message) +Prints.Info = function(message) printMessage('INFO', '^5', message) end -Prints.warn = function(message) +Prints.Warn = function(message) printMessage('WARN', '^3', message) end -Prints.error = function(message) +Prints.Error = function(message) printMessage('ERROR', '^1', message) end -Prints.debug = function(message) +Prints.Debug = function(message) printMessage('DEBUG', '^2', message) end \ No newline at end of file diff --git a/modules/utilities/shared/uniqueids.lua b/modules/Utility/shared/uniqueids.lua similarity index 100% rename from modules/utilities/shared/uniqueids.lua rename to modules/Utility/shared/uniqueids.lua diff --git a/modules/keys/MrNewbVehicleKeys/client.lua b/modules/VehicleKey/MrNewbVehicleKeys/client.lua similarity index 56% rename from modules/keys/MrNewbVehicleKeys/client.lua rename to modules/VehicleKey/MrNewbVehicleKeys/client.lua index 1636580..75778f6 100644 --- a/modules/keys/MrNewbVehicleKeys/client.lua +++ b/modules/VehicleKey/MrNewbVehicleKeys/client.lua @@ -1,15 +1,13 @@ if GetResourceState('MrNewbVehicleKeys') ~= 'started' then return end -VehicleKeys = {} +VehicleKey = {} -VehicleKeys.GiveKeys = function(vehicle, plate) +VehicleKey.GiveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end return exports.MrNewbVehicleKeys:GiveKeys(vehicle) end -VehicleKeys.RemoveKeys = function(vehicle, plate) +VehicleKey.RemoveKeys = function(vehicle, plate) if not vehicle and not plate then return false end - if not DoesEntityExist(vehicle) then - return exports.MrNewbVehicleKeys:RemoveKeysByPlate(plate) - end + if not DoesEntityExist(vehicle) then return exports.MrNewbVehicleKeys:RemoveKeysByPlate(plate) end return exports.MrNewbVehicleKeys:RemoveKeys(vehicle) end \ No newline at end of file diff --git a/modules/keys/Renewed-Vehiclekeys/client.lua b/modules/VehicleKey/Renewed-Vehiclekeys/client.lua similarity index 73% rename from modules/keys/Renewed-Vehiclekeys/client.lua rename to modules/VehicleKey/Renewed-Vehiclekeys/client.lua index e4081d8..6d502de 100644 --- a/modules/keys/Renewed-Vehiclekeys/client.lua +++ b/modules/VehicleKey/Renewed-Vehiclekeys/client.lua @@ -1,12 +1,12 @@ if GetResourceState('Renewed-Vehiclekeys') ~= 'started' then return end -VehicleKeys = {} +VehicleKey = {} -VehicleKeys.GiveKeys = function(vehicle, plate) +VehicleKey.GiveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end return exports['Renewed-Vehiclekeys']:addKey(plate) end -VehicleKeys.RemoveKeys = function(vehicle, plate) +VehicleKey.RemoveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end return exports['Renewed-Vehiclekeys']:removeKey(plate) end \ No newline at end of file diff --git a/modules/keys/cd_garage/client.lua b/modules/VehicleKey/cd_garage/client.lua similarity index 50% rename from modules/keys/cd_garage/client.lua rename to modules/VehicleKey/cd_garage/client.lua index dd4abf5..310b9eb 100644 --- a/modules/keys/cd_garage/client.lua +++ b/modules/VehicleKey/cd_garage/client.lua @@ -1,10 +1,10 @@ if GetResourceState('cd_garage') ~= 'started' then return end -VehicleKeys = {} +VehicleKey = {} -VehicleKeys.GiveKeys = function(vehicle, plate) +VehicleKey.GiveKeys = function(vehicle, plate) TriggerEvent('cd_garage:AddKeys', plate) end -VehicleKeys.RemoveKeys = function(vehicle, plate) +VehicleKey.RemoveKeys = function(vehicle, plate) end \ No newline at end of file diff --git a/modules/keys/mk_vehiclekeys/client.lua b/modules/VehicleKey/mk_vehiclekeys/client.lua similarity index 72% rename from modules/keys/mk_vehiclekeys/client.lua rename to modules/VehicleKey/mk_vehiclekeys/client.lua index 6f74b42..82d7f4c 100644 --- a/modules/keys/mk_vehiclekeys/client.lua +++ b/modules/VehicleKey/mk_vehiclekeys/client.lua @@ -1,12 +1,12 @@ if GetResourceState('mk_vehiclekeys') ~= 'started' then return end -VehicleKeys = {} +VehicleKey = {} -VehicleKeys.GiveKeys = function(vehicle, plate) +VehicleKey.GiveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end return exports["mk_vehiclekeys"]:AddKey(vehicle) end -VehicleKeys.RemoveKeys = function(vehicle, plate) +VehicleKey.RemoveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end return exports["mk_vehiclekeys"]:RemoveKey(vehicle) end \ No newline at end of file diff --git a/modules/VehicleKey/okokGarage/client.lua b/modules/VehicleKey/okokGarage/client.lua new file mode 100644 index 0000000..88543e4 --- /dev/null +++ b/modules/VehicleKey/okokGarage/client.lua @@ -0,0 +1,10 @@ +if GetResourceState('okokGarage') ~= 'started' then return end +VehicleKey = {} + +VehicleKey.GiveKeys = function(vehicle, plate) + TriggerServerEvent('okokGarage:GiveKeys', plate) +end + +VehicleKey.RemoveKeys = function(vehicle, plate) + return true +end \ No newline at end of file diff --git a/modules/keys/qb-vehiclekeys/client.lua b/modules/VehicleKey/qb-vehiclekeys/client.lua similarity index 63% rename from modules/keys/qb-vehiclekeys/client.lua rename to modules/VehicleKey/qb-vehiclekeys/client.lua index 40ca437..226200e 100644 --- a/modules/keys/qb-vehiclekeys/client.lua +++ b/modules/VehicleKey/qb-vehiclekeys/client.lua @@ -1,11 +1,11 @@ if GetResourceState('qb-vehiclekeys') ~= 'started' then return end if GetResourceState('qbx_vehiclekeys') == 'started' then return end -VehicleKeys = {} +VehicleKey = {} -VehicleKeys.GiveKeys = function(vehicle, plate) +VehicleKey.GiveKeys = function(vehicle, plate) TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate) end -VehicleKeys.RemoveKeys = function(vehicle, plate) - +VehicleKey.RemoveKeys = function(vehicle, plate) + return true end \ No newline at end of file diff --git a/modules/keys/qbx_vehiclekeys/client.lua b/modules/VehicleKey/qbx_vehiclekeys/client.lua similarity index 54% rename from modules/keys/qbx_vehiclekeys/client.lua rename to modules/VehicleKey/qbx_vehiclekeys/client.lua index e94fb29..f46158c 100644 --- a/modules/keys/qbx_vehiclekeys/client.lua +++ b/modules/VehicleKey/qbx_vehiclekeys/client.lua @@ -1,10 +1,10 @@ if GetResourceState('qbx_vehiclekeys') ~= 'started' then return end -VehicleKeys = {} +VehicleKey = {} -VehicleKeys.GiveKeys = function(vehicle, plate) +VehicleKey.GiveKeys = function(vehicle, plate) TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate) end -VehicleKeys.RemoveKeys = function(vehicle, plate) - +VehicleKey.RemoveKeys = function(vehicle, plate) + return true end \ No newline at end of file diff --git a/modules/keys/qs-vehiclekeys/client.lua b/modules/VehicleKey/qs-vehiclekeys/client.lua similarity index 68% rename from modules/keys/qs-vehiclekeys/client.lua rename to modules/VehicleKey/qs-vehiclekeys/client.lua index 5490838..aca4377 100644 --- a/modules/keys/qs-vehiclekeys/client.lua +++ b/modules/VehicleKey/qs-vehiclekeys/client.lua @@ -1,12 +1,12 @@ if GetResourceState('qs-vehiclekeys') ~= 'started' then return end -VehicleKeys = {} +VehicleKey = {} -VehicleKeys.GiveKeys = function(vehicle, plate) +VehicleKey.GiveKeys = function(vehicle, plate) local model = GetDisplayNameFromVehicleModel(GetEntityModel(vehicle)) local verifiedPlate = GetVehicleNumberPlateText(vehicle) exports['qs-vehiclekeys']:GiveKeys(verifiedPlate, model, true) end -VehicleKeys.RemoveKeys = function(vehicle, plate) - +VehicleKey.RemoveKeys = function(vehicle, plate) + return true end \ No newline at end of file diff --git a/modules/keys/t1ger_keys/client.lua b/modules/VehicleKey/t1ger_keys/client.lua similarity index 73% rename from modules/keys/t1ger_keys/client.lua rename to modules/VehicleKey/t1ger_keys/client.lua index 9c728d8..112e14b 100644 --- a/modules/keys/t1ger_keys/client.lua +++ b/modules/VehicleKey/t1ger_keys/client.lua @@ -1,12 +1,12 @@ if GetResourceState('t1ger_keys') ~= 'started' then return end -VehicleKeys = {} +VehicleKey = {} -VehicleKeys.GiveKeys = function(vehicle, plate) +VehicleKey.GiveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end local vehicle_display_name = GetDisplayNameFromVehicleModel(GetEntityModel(vehicle)) return exports['t1ger_keys']:GiveTemporaryKeys(plate, vehicle_display_name, 'some_keys') end -VehicleKeys.RemoveKeys = function(vehicle, plate) +VehicleKey.RemoveKeys = function(vehicle, plate) end \ No newline at end of file diff --git a/modules/keys/wasabi_carlock/client.lua b/modules/VehicleKey/wasabi_carlock/client.lua similarity index 58% rename from modules/keys/wasabi_carlock/client.lua rename to modules/VehicleKey/wasabi_carlock/client.lua index c2a90b0..d71e8a6 100644 --- a/modules/keys/wasabi_carlock/client.lua +++ b/modules/VehicleKey/wasabi_carlock/client.lua @@ -1,10 +1,10 @@ if GetResourceState('wasabi_carlock') ~= 'started' then return end -VehicleKeys = {} +VehicleKey = {} -VehicleKeys.GiveKeys = function(vehicle, plate) +VehicleKey.GiveKeys = function(vehicle, plate) exports.wasabi_carlock:GiveKey(plate) end -VehicleKeys.RemoveKeys = function(vehicle, plate) +VehicleKey.RemoveKeys = function(vehicle, plate) exports.wasabi_carlock:RemoveKey(plate) end \ No newline at end of file diff --git a/modules/clothing/illenium-appearance/client.lua b/modules/clothing/illenium-appearance/client.lua index 0a5fea1..ee3c32e 100644 --- a/modules/clothing/illenium-appearance/client.lua +++ b/modules/clothing/illenium-appearance/client.lua @@ -14,7 +14,7 @@ Clothing.SetAppearance = function(clothingData) clothing.components = exports['illenium-appearance']:getPedComponents(cache.ped) clothing.props = exports['illenium-appearance']:getPedProps(cache.ped) - print(json.encode(clothingData, {indent = true})) + Prints.Debug(json.encode(clothingData, {indent = true})) StoredOldClothing = clothing exports['illenium-appearance']:setPedComponents(cache.ped, clothingData.components) exports['illenium-appearance']:setPedProp(cache.ped, clothingData.props) diff --git a/modules/dispatch/ps-dispatch/client.lua b/modules/dispatch/ps-dispatch/client.lua index ea07175..69dad7a 100644 --- a/modules/dispatch/ps-dispatch/client.lua +++ b/modules/dispatch/ps-dispatch/client.lua @@ -70,6 +70,6 @@ CreateThread(function() jobs = { 'leo' } } Dispatch.SendAlert(data) - print("Dispatched") + Prints.Debug("Dispatched") end) --]] \ No newline at end of file diff --git a/modules/framework/ox_core/client.lua b/modules/framework/ox_core/client.lua deleted file mode 100644 index b1874e2..0000000 --- a/modules/framework/ox_core/client.lua +++ /dev/null @@ -1 +0,0 @@ -if GetResourceState('ox_core') ~= 'started' then return end \ No newline at end of file diff --git a/modules/framework/ox_core/server.lua b/modules/framework/ox_core/server.lua deleted file mode 100644 index b1874e2..0000000 --- a/modules/framework/ox_core/server.lua +++ /dev/null @@ -1 +0,0 @@ -if GetResourceState('ox_core') ~= 'started' then return end \ No newline at end of file diff --git a/modules/input/client.lua b/modules/input/client.lua index 277a4bd..8993def 100644 --- a/modules/input/client.lua +++ b/modules/input/client.lua @@ -179,8 +179,8 @@ end --Open menu -function Input.Open(title, data, isQB, submitText) - if isQB then +function Input.Open(title, data, isQBFormat, submitText) + if isQBFormat then local inputs = data.inputs if BridgeClientConfig.InputSystem == "ox" then return lib.inputDialog(title, QBToOxInput(inputs)) diff --git a/modules/keys/okokGarage/client.lua b/modules/keys/okokGarage/client.lua deleted file mode 100644 index 8eba078..0000000 --- a/modules/keys/okokGarage/client.lua +++ /dev/null @@ -1,10 +0,0 @@ -if GetResourceState('okokGarage') ~= 'started' then return end -VehicleKeys = {} - -VehicleKeys.GiveKeys = function(vehicle, plate) - TriggerServerEvent('okokGarage:GiveKeys', plate) -end - -VehicleKeys.RemoveKeys = function(vehicle, plate) - -end \ No newline at end of file diff --git a/modules/notify/client.lua b/modules/notify/client.lua index 5a7f2a9..9c51e4d 100644 --- a/modules/notify/client.lua +++ b/modules/notify/client.lua @@ -21,9 +21,9 @@ Notify.SendNotify = function(message, type, time) elseif notifyType == 'lab' then return exports['swe-notify']:SendNotification(message, time, type) elseif notifyType == 'custom' then - return Prints.error("You have not set up a custom notify in community_bridge") + return Prints.Error("You have not set up a custom notify in community_bridge") else - return Prints.error("You have not configured a notify in community_bridge") + return Prints.Error("You have not configured a notify in community_bridge") end end @@ -41,9 +41,9 @@ Notify.ShowHelpText = function(message, _position) elseif helptextType == 'lab' then return exports['lab-HintUI']:Show(message, "Hint Text") elseif helptextType == 'custom' then - return Prints.error("You have not set up a custom ShowHelpText in community_bridge") + return Prints.Error("You have not set up a custom ShowHelpText in community_bridge") else - return Prints.error("You have not configured a ShowHelpText in community_bridge") + return Prints.Error("You have not configured a ShowHelpText in community_bridge") end end @@ -59,9 +59,9 @@ Notify.HideHelpText = function() elseif helptextType == 'lab' then return exports['lab-HintUI']:Hide() elseif helptextType == 'custom' then - return Prints.error("You have not set up a custom HideHelpText in community_bridge") + return Prints.Error("You have not set up a custom HideHelpText in community_bridge") else - return Prints.error("You have not configured a HideHelpText in community_bridge") + return Prints.Error("You have not configured a HideHelpText in community_bridge") end end diff --git a/modules/stashes/server.lua b/modules/stashes/server.lua deleted file mode 100644 index d921aec..0000000 --- a/modules/stashes/server.lua +++ /dev/null @@ -1,3 +0,0 @@ -Stashes = {} - --- Needs Redone \ No newline at end of file diff --git a/modules/utilities/server/VersionChecker.lua b/modules/utilities/server/VersionChecker.lua deleted file mode 100644 index 09c0c9e..0000000 --- a/modules/utilities/server/VersionChecker.lua +++ /dev/null @@ -1,38 +0,0 @@ -VersionCheck = {} - -function VersionCheck.VersionChecker(repoPath) - local resource = repoPath:match("([^/]+)$") - if not resource then return print('^1Invalid repository format. Expected format: "username/reponame"^0') end - - local version = GetResourceMetadata(resource, "version", 0) - if not version then return print(('^1Unable to determine current resource version for %s ^0'):format(resource)) end - - version = version:match('%d+%.%d+%.%d+') - if not version then return print(('^1Invalid version format for %s ^0'):format(resource)) end - - local username, reponame = repoPath:match("([^/]+)/([^/]+)") - if not username or not reponame then return print('^1Invalid repository format. Expected format: "username/reponame"^0') end - PerformHttpRequest(('https://api.github.com/repos/%s/%s/releases/latest'):format(username, reponame), function(status, response) - local failure = ('^1Unable locate github repo for resource %s ^0'):format(resource) - - if status ~= 200 then return print(failure) end - response = json.decode(response) - - if response.prerelease then return print(failure) end - - local latest = response.tag_name:match('%d+%.%d+%.%d+') - if not latest then return print(failure) end - - if latest == version then return print(('^2 %s is on the latest version.^0'):format(resource)) end - local currentVersion, latestVersion = version:gsub('%D', ''), latest:gsub('%D', '') - - if currentVersion < latestVersion then - return print(('^1An update is available for %s (current version: %s)\r\n - ^5Please download the latest version from the GitHub release page.^7\r\n%s'):format(resource, version, response.html_url)) - end - end, 'GET') -end - -AddEventHandler('onResourceStart', function(resourceName) - if GetCurrentResourceName() ~= resourceName then return end - VersionCheck.VersionChecker("The-Order-Of-The-Sacred-Framework/community_bridge") -end) \ No newline at end of file diff --git a/use/prints.lua b/use/prints.lua index 2adf428..59e30de 100644 --- a/use/prints.lua +++ b/use/prints.lua @@ -6,19 +6,19 @@ local function printMessage(level, color, message) print(color .. '[' .. level .. ']:', message) end -Prints.info = function(message) +Prints.Info = function(message) printMessage('INFO', '^5', message) end -Prints.warn = function(message) +Prints.Warn = function(message) printMessage('WARN', '^3', message) end -Prints.error = function(message) +Prints.Error = function(message) printMessage('ERROR', '^1', message) end -Prints.debug = function(message) +Prints.Debug = function(message) printMessage('DEBUG', '^2', message) end