Merge pull request #565 from bitpredator/dev

chore: update to version 2.7.6

.github/CHANGELOG.md

@@ -30,7 +30,7 @@
    [voice-ui/pnpm-lock.yaml]: chore(deps-dev): bump follow-redirects in /voice-ui
    [voice-ui/pnpm-lock.yaml]: chore(deps-dev): bump browserify-sign from 4.2.1 to 4.2.2 in /voice-ui
 7. [npwd + es_extended]: chore: removed support for npwd_crypto @bitpredator
-8. [ox_lib]: chore: ox_lib update to version '3.11.0' @bitpredator
+8. [ox_lib]: chore: ox_lib update to version 3.12.0 @bitpredator
 9. [esx_addons]: chore: replace esx_drivingschooljob with esx_dmvschool @bitpredator
 10. [SQL]: chore: update database @bitpredator
 11. [maps]: delete: remove maps verpi_driving_school @bitpredator
@@ -51,8 +51,12 @@
 26. [esx_status/server]: fix: unused argument @bitpredator
 27. [esx_addoninventory]: chore: check for nil society @bitpredator
 28. [npwd]: chore: npwd update to version 1.8.6 @bitpredator
-29. [bpt_deliveries]: chore: clean up the code @bitpredator
+29. [bpt_deliveries]: chore: clean up the code + fix readme & fxmanifest @bitpredator
 30. [esx-radialmenu]: chore:  fix lint error + clean up the code @bitpredator
 31. [esx-qalle-jail]: fix: fix lint error @bitpredator
 32. [esx_multicaracter]: fix: fix lint error @bitpredator
-33. [esx_dmvschool]: fix: fix lint error @bitpredator
+33. [esx_dmvschool]: fix: fix lint error @bitpredator
+34. [oxmysql]: chore: update to version 2.7.6 @bitpredator
+35. [esx-radio] fix: fixed No such export addChannelCheck in resource pma-voice @bitpredator
+36. [bpt_vehicletax]: chore: clean up the code @bitpredator
+37. [jsfour-idcard]: fix: value assigned to variable ESX is overwritten @bitpredator

server-data/resources/[bpt_addons]/bpt_deliveries/README.md

@@ -10,8 +10,8 @@ FiveM deliveries job plugin
 
 ## Requirements
 
-1. [ESX](https://github.com/ESX-Org/es_extended)
-2. [esx_skin](https://github.com/ESX-Org/esx_skin)
+1. [es_extended](https://github.com/bitpredator/es_extended)
+2. [esx_skin]
 
 ## Installation
 
@@ -22,8 +22,6 @@ FiveM deliveries job plugin
 start bpt_deliveries
 ```
 
-## Legal
-
 ### License
 
 bpt_deliveries - Delivery job plugin for ESX

server-data/resources/[bpt_addons]/bpt_deliveries/fxmanifest.lua

@@ -1,7 +1,7 @@
 fx_version 'adamant'
 game 'gta5'
 description 'bpt_deliveries'
-version '1.0'
+version '1.0.0'
 
 client_scripts {
 	'@es_extended/locale.lua',

server-data/resources/[bpt_addons]/bpt_vehicletax/server/server.lua

@@ -1,4 +1,3 @@
-ESX = nil
 local vehicleprices = {}
 local percentage = 1
 ESX = exports["es_extended"]:getSharedObject()

server-data/resources/[esx_addons]/jsfour-idcard/fxmanifest.lua

@@ -1,7 +1,6 @@
 fx_version 'adamant'
-
 game 'gta5'
-
+version '1.0.0'
 ui_page 'html/index.html'
 
 shared_script '@es_extended/imports.lua'

server-data/resources/[esx_addons]/jsfour-idcard/html/index.html

@@ -24,4 +24,4 @@
     <script src="assets/js/materialize.js" type="text/javascript"></script>
     <script src="assets/js/init.js" type="text/javascript"></script>
   </body>
-</html>
+</html>

server-data/resources/[esx_addons]/jsfour-idcard/server.lua

@@ -1,10 +1,7 @@
-local ESX = nil
--- ESX
-ESX = exports["es_extended"]:getSharedObject()
-
 -- Open ID card
 RegisterServerEvent('jsfour-idcard:open')
 AddEventHandler('jsfour-idcard:open', function(ID, targetID, type)
+	ESX = exports["es_extended"]:getSharedObject()
 	local identifier = ESX.GetPlayerFromId(ID).identifier
 	local _source 	 = ESX.GetPlayerFromId(targetID).source
 	local show       = false

server-data/resources/[ox]/ox_lib/fxmanifest.lua

@@ -8,7 +8,7 @@ rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aw
 --[[ Resource Information ]]--
 name         'ox_lib'
 author       'Overextended'
-version      '3.11.0'
+version      '3.12.0'
 license      'LGPL-3.0-or-later'
 repository   'https://github.com/overextended/ox_lib'
 description  'A library of shared functions to utilise in other resources.'

server-data/resources/[ox]/ox_lib/imports/require/shared.lua

@@ -38,7 +38,7 @@ function lib.require(modname)
             local di = debug.getinfo(idx, 'S')
 
             if di then
-                if not di.short_src:find('^@ox_lib/imports/require') and not di.short_src:find('^%[C%]') and not di.short_src:find('^citizen') then
+                if not di.short_src:find('^@ox_lib/imports/require') and not di.short_src:find('^%[C%]') and not di.short_src:find('^citizen') and di.short_src ~= '?' then
                     resourceSrc = di.short_src:gsub('^@(.-)/.+', '%1')
                     break
                 end

server-data/resources/[ox]/ox_lib/resource/interface/client/menu.lua

@@ -46,28 +46,27 @@ end
 ---@param startIndex? number
 function lib.showMenu(id, startIndex)
     local menu = registeredMenus[id]
-
     if not menu then
         error(('No menu with id %s was found'):format(id))
     end
-
     if not openMenu then
         local control = cache.game == 'fivem' and 140 or 0xE30CD707
+
         CreateThread(function()
             while openMenu do
                 if openMenu.disableInput == nil or openMenu.disableInput then
                     DisablePlayerFiring(cache.playerId, true)
-                    HudWeaponWheelIgnoreSelection()
+                    if cache.game == 'fivem' then
+                        HudWeaponWheelIgnoreSelection()  -- Not a REDM native
+                    end
                     DisableControlAction(0, control, true)
                 end
-
                 Wait(0)
             end
         end)
     end
 
     openMenu = menu
-
     lib.setNuiFocus(not menu.disableInput, true)
 
     SendNUIMessage({
@@ -81,7 +80,6 @@ function lib.showMenu(id, startIndex)
         }
     })
 end
-
 ---@param onExit boolean?
 function lib.hideMenu(onExit)
     local menu = openMenu

server-data/resources/[ox]/ox_lib/resource/interface/client/radial.lua

@@ -324,6 +324,7 @@ lib.addKeybind({
             DisablePlayerFiring(cache.playerId, true)
             DisableControlAction(0, 1, true)
             DisableControlAction(0, 2, true)
+            DisableControlAction(0, 142, true)
             DisableControlAction(2, 199, true)
             DisableControlAction(2, 200, true)
             Wait(0)