diff --git a/fxmanifest.lua b/fxmanifest.lua index 3bd117b..27322a9 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -18,7 +18,7 @@ server_scripts { '@oxmysql/lib/MySQL.lua', 'settings/serverConfig.lua', 'modules/locales/shared.lua', - 'modules/utility/server/*.lua', + 'modules/version/server/*.lua', 'modules/framework/**/server.lua', 'modules/inventory/**/server.lua', 'modules/doorlock/**/server.lua', diff --git a/init.lua b/init.lua index f3c7b6e..4d1cb32 100644 --- a/init.lua +++ b/init.lua @@ -86,6 +86,7 @@ if not IsDuplicityVersion() then goto client end Bridge.RegisterModule("SQL", cLib.SQL) Bridge.RegisterModule("Logs", cLib.Logs) Bridge.RegisterModule("LootTables", cLib.LootTables) +Bridge.RegisterModule("Version", Version) -- ▄▀▀ █ █ ██▀ █▄ █ ▀█▀ @@ -101,6 +102,7 @@ Bridge.RegisterModule("Progressbar", Progressbar) Bridge.RegisterModule("Target", Target) Bridge.RegisterModule("Menu", Menu) Bridge.RegisterModule("Utility", cLib.Utility) + Bridge.RegisterModule("Placeable", cLib.Placeable) --new Bridge.RegisterModule("Gizmo", cLib.Gizmo) diff --git a/locales/en.json b/locales/en.json index 938e08e..643f796 100644 --- a/locales/en.json +++ b/locales/en.json @@ -5,5 +5,11 @@ "place_object_scroll_up": "[SCROLL UP] Turn right \n", "place_object_scroll_down": "[SCROLL DOWN] Turn left", "enter_text": "Enter Text", - "no_prop_defined": "You didnt define any object to place" + "no_prop_defined": "You didnt define any object to place", + "UNITTEST": { + "UNITTESTA": "Im a %s %s", + "UNITTEST": { + "UNITTESTA": "\n.-._ _,-,\n`._`-._ _,-'_,'\n `._ `-._ _,-' _,'\n `._ `-._ __.-----.__ _,-' _,'\n `._ `#===\\\"\\\"\\\" \\\"\\\"\\\"===#' _,'\n `._/) ._ _. (\\_,'\n )*' **.__ __.** '*(\n # .==..__ \\\"\\\" \\\"\\\" __..==, #\n # `\\\"._(_). .(_)_.\\\"' #" + } + } } \ No newline at end of file diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index eb92eaf..6841e62 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -34,6 +34,11 @@ Framework.GetPlayerJob = function() return playerData.job.name, playerData.job.label, playerData.job.grade_label, playerData.job.grade end +Framework.HasItem = function(item) + local hasItem = ESX.SearchInventory(item, true) + return hasItem > 0 and true or false +end + Framework.GetPlayerInventory = function() return ESX.GetPlayerData().inventory end diff --git a/modules/framework/ox_core/client.lua b/modules/framework/ox_core/client.lua index cb054e4..8084091 100644 --- a/modules/framework/ox_core/client.lua +++ b/modules/framework/ox_core/client.lua @@ -29,6 +29,12 @@ Framework.GetPlayerJob = function() return group, title, title, grade end +Framework.HasItem = function() + local itemCount = ox_inventory:Search('count', item) + local hasItem = itemCount ~= 0 + return hasItem +end + Framework.GetPlayerInventory = function() return exports.ox_inventory:GetPlayerItems() end @@ -55,4 +61,4 @@ RegisterNetEvent('ox:setGroup', function(name, grade) PlayerJobGradeName = grade PlayerJobGradeLevel = grade TriggerEvent('community_bridge:Client:OnPlayerJobUpdate',PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) -end) \ No newline at end of file +end) diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index 3b8291b..cb62bc9 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -57,6 +57,10 @@ Framework.GetPlayerJob = function() return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level end +Framework.HasItem = function(item) + return QBCore.Functions.HasItem(item) +end + Framework.GetPlayerInventory = function() local items = {} local frameworkInv = QBCore.Functions.GetPlayerData().items @@ -109,4 +113,4 @@ RegisterNetEvent('QBCore:Client:OnGangUpdate', function(data) PlayerJobGradeLevel = data.grade.level TriggerEvent('community_bridge:Client:OnPlayerGangUpdate', PlayerGangName, PlayerGangLabel, PlayerGangGradeName, PlayerGangGradeLevel) --]] -end) \ No newline at end of file +end) diff --git a/modules/fuel/BigDaddy-Fuel/client.lua b/modules/fuel/BigDaddy-Fuel/client.lua index 6c6d435..c4ff03e 100644 --- a/modules/fuel/BigDaddy-Fuel/client.lua +++ b/modules/fuel/BigDaddy-Fuel/client.lua @@ -1,5 +1,5 @@ if GetResourceState('BigDaddy-Fuel') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end diff --git a/modules/fuel/LegacyFuel/client.lua b/modules/fuel/LegacyFuel/client.lua index e5e6613..524f590 100644 --- a/modules/fuel/LegacyFuel/client.lua +++ b/modules/fuel/LegacyFuel/client.lua @@ -1,5 +1,5 @@ if GetResourceState('LegacyFuel') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end diff --git a/modules/fuel/Renewed-Fuel/client.lua b/modules/fuel/Renewed-Fuel/client.lua index 97e17ff..7a44d74 100644 --- a/modules/fuel/Renewed-Fuel/client.lua +++ b/modules/fuel/Renewed-Fuel/client.lua @@ -1,5 +1,5 @@ if GetResourceState('Renewed-Fuel') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end diff --git a/modules/fuel/cdn-fuel/client.lua b/modules/fuel/cdn-fuel/client.lua index 752d7b4..486519c 100644 --- a/modules/fuel/cdn-fuel/client.lua +++ b/modules/fuel/cdn-fuel/client.lua @@ -1,5 +1,5 @@ if GetResourceState('cdn-fuel') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end diff --git a/modules/fuel/esx-sna-fuel/client.lua b/modules/fuel/esx-sna-fuel/client.lua index 9ca3a17..774fc6d 100644 --- a/modules/fuel/esx-sna-fuel/client.lua +++ b/modules/fuel/esx-sna-fuel/client.lua @@ -1,5 +1,5 @@ if GetResourceState('esx-sna-fuel') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end diff --git a/modules/fuel/okokGasStation/client.lua b/modules/fuel/okokGasStation/client.lua index f263a31..78c4f42 100644 --- a/modules/fuel/okokGasStation/client.lua +++ b/modules/fuel/okokGasStation/client.lua @@ -1,5 +1,5 @@ if GetResourceState('okokGasStation') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end diff --git a/modules/fuel/ox_fuel/client.lua b/modules/fuel/ox_fuel/client.lua index 2b03c6c..2032591 100644 --- a/modules/fuel/ox_fuel/client.lua +++ b/modules/fuel/ox_fuel/client.lua @@ -1,5 +1,5 @@ if GetResourceState('cdn-fuel') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end diff --git a/modules/fuel/ps-fuel/client.lua b/modules/fuel/ps-fuel/client.lua index 1d51570..590122f 100644 --- a/modules/fuel/ps-fuel/client.lua +++ b/modules/fuel/ps-fuel/client.lua @@ -1,5 +1,5 @@ if GetResourceState('ps-fuel') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end diff --git a/modules/fuel/qs-fuelstations/client.lua b/modules/fuel/qs-fuelstations/client.lua index 02bdada..ae19c7b 100644 --- a/modules/fuel/qs-fuelstations/client.lua +++ b/modules/fuel/qs-fuelstations/client.lua @@ -1,6 +1,5 @@ if GetResourceState('qs-fuelstations') ~= 'started' then return end - -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end diff --git a/modules/fuel/ti_fuel/client.lua b/modules/fuel/ti_fuel/client.lua index 234734c..55eac90 100644 --- a/modules/fuel/ti_fuel/client.lua +++ b/modules/fuel/ti_fuel/client.lua @@ -1,5 +1,5 @@ if GetResourceState('ti_fuel') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0, type end diff --git a/modules/fuel/x-fuel/client.lua b/modules/fuel/x-fuel/client.lua index 0b34d99..22b59c1 100644 --- a/modules/fuel/x-fuel/client.lua +++ b/modules/fuel/x-fuel/client.lua @@ -1,5 +1,5 @@ if GetResourceState('x-fuel') ~= 'started' then return end -Fuel = {} +Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0, type end diff --git a/modules/inventory/_default/client.lua b/modules/inventory/_default/client.lua index db02090..bd5f17b 100644 --- a/modules/inventory/_default/client.lua +++ b/modules/inventory/_default/client.lua @@ -5,6 +5,10 @@ Inventory.GetItemInfo = function(item) return Framework.GetItemInfo(item) end +Inventory.HasItem = function(item) + return Framework.HasItem(item) +end + Inventory.GetImagePath = function(item) return "https://avatars.githubusercontent.com/u/47620135" -end \ No newline at end of file +end diff --git a/modules/inventory/codem-inventory/client.lua b/modules/inventory/codem-inventory/client.lua index 6ad452c..83a0228 100644 --- a/modules/inventory/codem-inventory/client.lua +++ b/modules/inventory/codem-inventory/client.lua @@ -38,4 +38,4 @@ Inventory.GetPlayerInventory = function() }) end return items -end \ No newline at end of file +end diff --git a/modules/inventory/jpr-inventory/client.lua b/modules/inventory/jpr-inventory/client.lua index d29debf..cf5a4df 100644 --- a/modules/inventory/jpr-inventory/client.lua +++ b/modules/inventory/jpr-inventory/client.lua @@ -1,5 +1,6 @@ if GetResourceState('jpr-inventory') ~= 'started' then return end +local jpr = exports['jpr-inventory'] Inventory = Inventory or {} RegisterNetEvent('community_bridge:client:jpr-inventory:openStash', function(id, data) @@ -8,8 +9,12 @@ RegisterNetEvent('community_bridge:client:jpr-inventory:openStash', function(id, TriggerServerEvent('inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) +Inventory.HasItem = function(item) + return jpr:HasItem(item) +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("jpr-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://jpr-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" -end \ No newline at end of file +end diff --git a/modules/inventory/origen_inventory/client.lua b/modules/inventory/origen_inventory/client.lua index ebb4154..e7c139a 100644 --- a/modules/inventory/origen_inventory/client.lua +++ b/modules/inventory/origen_inventory/client.lua @@ -17,6 +17,10 @@ Inventory.GetItemInfo = function(item) return repackedTable or {} end +Inventory.HasItem = function(item) + return origin:HasItem(item) +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("origen_inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://origen_inventory/html/images/%s.png", item) @@ -39,4 +43,4 @@ Inventory.GetPlayerInventory = function() }) end return items -end \ No newline at end of file +end diff --git a/modules/inventory/ox_inventory/client.lua b/modules/inventory/ox_inventory/client.lua index 3f1c239..dc2f1d0 100644 --- a/modules/inventory/ox_inventory/client.lua +++ b/modules/inventory/ox_inventory/client.lua @@ -17,6 +17,12 @@ Inventory.GetItemInfo = function(item) return repackedTable end +Inventory.HasItem = function(item) + local itemCount = ox_inventory:Search('count', item) + local hasItem = itemCount ~= 0 + return hasItem +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("ox_inventory", string.format("web/images/%s.png", item)) local imagePath = file and string.format("nui://ox_inventory/web/images/%s.png", item) @@ -27,4 +33,4 @@ Inventory.GetPlayerInventory = function() return exports.ox_inventory:GetPlayerItems() end ---Bridge.RegisterModule("Inventory", Inventory) \ No newline at end of file +--Bridge.RegisterModule("Inventory", Inventory) diff --git a/modules/inventory/ps-inventory/client.lua b/modules/inventory/ps-inventory/client.lua index f031826..b1f0332 100644 --- a/modules/inventory/ps-inventory/client.lua +++ b/modules/inventory/ps-inventory/client.lua @@ -1,5 +1,7 @@ if GetResourceState('ps-inventory') ~= 'started' then return end +local ps = exports['ps-inventory'] + Inventory = Inventory or {} RegisterNetEvent('community_bridge:client:ps-inventory:openStash', function(id, data) @@ -8,8 +10,12 @@ RegisterNetEvent('community_bridge:client:ps-inventory:openStash', function(id, TriggerServerEvent('ps-inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) +Inventory.HasItem = function(item) + return ps:HasItem(item) +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("ps-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://ps-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" -end \ No newline at end of file +end diff --git a/modules/inventory/qb-inventory/client.lua b/modules/inventory/qb-inventory/client.lua index fc28b4a..cfe6b5c 100644 --- a/modules/inventory/qb-inventory/client.lua +++ b/modules/inventory/qb-inventory/client.lua @@ -1,5 +1,7 @@ if GetResourceState('qb-inventory') ~= 'started' then return end +local qb = exports['qb-inventory'] + Inventory = Inventory or {} RegisterNetEvent('community_bridge:client:qb-inventory:openStash', function(id, data) @@ -8,8 +10,12 @@ RegisterNetEvent('community_bridge:client:qb-inventory:openStash', function(id, TriggerServerEvent('inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) +Inventory.HasItem = function(item) + return qb:HasItem(item) +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("qb-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://qb-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" -end \ No newline at end of file +end diff --git a/modules/inventory/qs-inventory/client.lua b/modules/inventory/qs-inventory/client.lua index a7b7c1d..819abe6 100644 --- a/modules/inventory/qs-inventory/client.lua +++ b/modules/inventory/qs-inventory/client.lua @@ -21,6 +21,11 @@ Inventory.GetItemInfo = function(item) return repackedTable end +Inventory.HasItem = function(item) + local check = quasar:Search(item) + return check and true or false +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("qs-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://qs-inventory/html/images/%s.png", item) diff --git a/modules/inventory/tgiann-inventory/client.lua b/modules/inventory/tgiann-inventory/client.lua index 9508c85..bef81e4 100644 --- a/modules/inventory/tgiann-inventory/client.lua +++ b/modules/inventory/tgiann-inventory/client.lua @@ -21,6 +21,10 @@ Inventory.GetItemInfo = function(item) return repackedTable end +Inventory.HasItem = function(item) + return tgiann:HasItem(item) +end + Inventory.GetImagePath = function(item) local pngPath = LoadResourceFile("inventory_images", string.format("html/images/%s.png", item)) local webpPath = LoadResourceFile("inventory_images", string.format("html/images/%s.webp", item)) @@ -44,4 +48,4 @@ Inventory.GetPlayerInventory = function() }) end return items -end \ No newline at end of file +end diff --git a/modules/locales/shared.lua b/modules/locales/shared.lua index 5769c70..1e49843 100644 --- a/modules/locales/shared.lua +++ b/modules/locales/shared.lua @@ -19,41 +19,57 @@ Language = {} function Language.Locale(str, ...) local resource = GetInvokingResource() or GetCurrentResourceName() assert(resource, "Resource name not found") - --print(resource, "locales/" .. Lang .. ".json") + local locales = LoadResourceFile(resource, "locales/" .. Lang .. ".json") - --print(locales, Lang) locales = locales and json.decode(locales) or {} - local locale = locales[str] - if not locale then - warn("Locale not found for language: " .. Lang) - return str - end - - local args = {...} - if #args > 0 then - for i = 1, #args do - locale = locale:gsub('{' .. i .. '}', args[i]) + -- Handle nested tables via dot notation + local current = locales + for part in str:gmatch("[^%.]+") do + if type(current) ~= "table" then + warn(("Invalid nested locale path: %s"):format(str)) + return str + end + current = current[part] + if not current then + warn(("Locale not found for key: %s in language: %s"):format(str, Lang)) + return str end end - return locale + -- Handle variable replacement + local args = {...} + + if type(current) == "string" and #args > 0 then + current = string.format(current, ...) + end + + return current end + + + if BridgeSharedConfig.DebugLevel == 2 then -- if outside this resource, use local whatever = Require("modules/locales/shared.lua") -- whatever.Locales("some-index-in-language-.json-file") -- Files must be stored in "locales" folder, within the resource. -- Instead of using Require you can also import it via the manifest. -- The Lang variable is available globally, which tells you what the server is using. - --print("Language: ", Lang) - --print("Locale: ", Language.Locale("locale-unit-test")) + -- print("Language: ", Lang) + -- print("Locale: ", Language.Locale("locale-unit-test")) -- Example outside community bridge resource: -- local Language = Require('modules/locales/shared.lua') -- print("Language: ", Lang) -- print("Locale: ", Language.Locale("locale-unit-test")) + RegisterCommand("lang", function(source, args, raw) + print(Language.Locale("UNITTEST.UNITTEST.UNITTESTA")) + print(Language.Locale("UNITTEST.UNITTESTA", "Devil", "GERRRRRRR!")) + + print( "Oh also this works", Language.Locale("place_object_scroll_down")) + end) end return Language \ No newline at end of file diff --git a/modules/menu/client.lua b/modules/menu/client.lua index fa84ab0..dbb41f9 100644 --- a/modules/menu/client.lua +++ b/modules/menu/client.lua @@ -7,7 +7,6 @@ Menu = {} ---@return id string The menu ID. function Menu.Open(data, useQb) local id = data.id or Ids.CreateUniqueId(Menus, nil, nil) - local menuExists = Menus[id] Menus[id] = OpenMenu(id, data, useQb) data.id = id return id @@ -20,8 +19,8 @@ RegisterNetEvent('community_bridge:client:MenuCallback', function(_args) local id = _args.id local onSelect = _args.onSelect local args = _args.args - if not Menus[id] then return end - onSelect({number=_args.selected}, false, args) + Menus[id] = nil + onSelect(args) end) diff --git a/modules/utility/server/VersionChecker.lua b/modules/version/server/VersionChecker.lua similarity index 93% rename from modules/utility/server/VersionChecker.lua rename to modules/version/server/VersionChecker.lua index 9ee14aa..e278d5a 100644 --- a/modules/utility/server/VersionChecker.lua +++ b/modules/version/server/VersionChecker.lua @@ -1,6 +1,6 @@ -Utility = Utility or {} +Version = Version or {} -function Utility.VersionChecker(repoPath) +function Version.VersionChecker(repoPath) local resource = repoPath:match("([^/]+)$") if not resource then return Prints.Error('^1Invalid repository format. Expected format: "username/reponame"^0') end @@ -34,5 +34,5 @@ end AddEventHandler('onResourceStart', function(resourceName) if GetCurrentResourceName() ~= resourceName then return end - Utility.VersionChecker("The-Order-Of-The-Sacred-Framework/community_bridge") + Version.VersionChecker("The-Order-Of-The-Sacred-Framework/community_bridge") end) \ No newline at end of file