diff --git a/fxmanifest.lua b/fxmanifest.lua index 4305cab..c8cee29 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -4,7 +4,7 @@ lua54 'yes' use_experimental_fxv2_oal 'yes' author 'The Order of the Sacred Framework' description 'A bridge made for the community to use as a base for their own projects. This bridge will allow a single format to work with nearly all commonly used systems while still offering expandability.' -version '0.3.0' +version '0.3.1' shared_scripts { '@ox_lib/init.lua', diff --git a/modules/menu/_oxlib.lua b/modules/menu/_oxlib.lua index 991d31c..46cc0e1 100644 --- a/modules/menu/_oxlib.lua +++ b/modules/menu/_oxlib.lua @@ -41,12 +41,10 @@ local function QBToOxMenu(id, menu) return oxMenu end - - OpenMenu = function(id, data, useQBinput) - if useQBinput then + if useQBinput then data = QBToOxMenu(id, data) - end + end lib.registerContext(data) lib.showContext(id) return data diff --git a/modules/menu/_qb-menu.lua b/modules/menu/_qb-menu.lua index e0fff1a..9115f79 100644 --- a/modules/menu/_qb-menu.lua +++ b/modules/menu/_qb-menu.lua @@ -1,5 +1,5 @@ if GetResourceState('qb-menu') ~= 'started' or (BridgeClientConfig.MenuSystem ~= "qb" and BridgeClientConfig.MenuSystem ~= "auto") then return end -print("Loading QB Menu") +--print("Loading QB Menu") --- Converts an Ox menu to a QB menu. ---@param id string The menu ID. ---@param menu table The Ox menu data. @@ -17,24 +17,24 @@ function OxToQBMenu(id, menu) txt = v.description, icon = v.icon, } - + if v.onSelect then button.params = { - event = "community_bridge:client:MenuCallback", + event = "community_bridge:client:MenuCallback", args = {id = id, selected = i, args = v.args, onSelect = v.onSelect}, } end table.insert(qbMenu, button) end - + return qbMenu end OpenMenu = function(id, data, useQBinput) - if not useQBinput then + if not useQBinput then data = OxToQBMenu(id, data) - end + end exports['qb-menu']:openMenu(data) return data end \ No newline at end of file diff --git a/modules/version/server/VersionChecker.lua b/modules/version/server/VersionChecker.lua index e278d5a..35ecfe3 100644 --- a/modules/version/server/VersionChecker.lua +++ b/modules/version/server/VersionChecker.lua @@ -23,7 +23,8 @@ function Version.VersionChecker(repoPath) local latest = response.tag_name:match('%d+%.%d+%.%d+') if not latest then return Prints.Error(failure) end - if latest == version then return print(('^2 %s is on the latest version.^0'):format(resource)) end + --if latest == version then return print(('^2 %s is on the latest version.^0'):format(resource)) end + if latest == version then return end local currentVersion, latestVersion = version:gsub('%D', ''), latest:gsub('%D', '') if currentVersion < latestVersion then diff --git a/settings/sharedConfig.lua b/settings/sharedConfig.lua index e30285a..3d81fd2 100644 --- a/settings/sharedConfig.lua +++ b/settings/sharedConfig.lua @@ -1,5 +1,5 @@ BridgeSharedConfig = {} BridgeSharedConfig.Lang = "auto" -- Change this to your preferred language (must match the locale file name ex. en or fr etc) -BridgeSharedConfig.DebugLevel = 2 -- Change this to your Debug level, 0 for none, 1 for some, 2 for all data +BridgeSharedConfig.DebugLevel = 0 -- Change this to your Debug level, 0 for none, 1 for some, 2 for all data return BridgeSharedConfig \ No newline at end of file