Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(es_extended/server): complete restructure #1463

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

refactor(es_extended/server): complete restructure #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef187ce
refactor(es_extended/server): complete restructure
Mycroft-Studios Nov 13, 2024
671db38
fix(es_extended/server/oxinventory): auto detect
Mycroft-Studios Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions [core]/es_extended/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,18 @@ shared_scripts {

server_scripts {
'@oxmysql/lib/MySQL.lua',

'server/modules/utils/*.lua',
'shared/config/logs.lua',
'server/modules/*.lua',

'server/common.lua',
'server/modules/callback.lua',
'server/classes/player.lua',
'server/classes/overrides/*.lua',
'server/functions.lua',
'server/modules/onesync.lua',
'server/modules/paycheck.lua',

'server/main.lua',
'server/modules/commands.lua',

'server/bridge/**/*.lua',
'server/modules/actions.lua',
'server/modules/npwd.lua',
'server/modules/createJob.lua'
'server/bridge/**/*.lua',
}


client_scripts {
'client/common.lua',
'client/functions.lua',
Expand Down
12 changes: 11 additions & 1 deletion [core]/es_extended/server/bridge/inventory/oxinventory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
if Config.CustomInventory ~= "ox" then return end
if Config.CustomInventory ~= "ox" then
if GetResourceState("ox_inventory") ~= "missing" then
Config.CustomInventory = "ox"
Config.OxInventory = true
else
return
end
end

SetConvarReplicated("inventory:framework", "esx")
SetConvarReplicated("inventory:weight", tostring(Config.MaxWeight * 1000))

MySQL.ready(function()
TriggerEvent("__cfx_export_ox_inventory_Items", function(ref)
Expand Down
67 changes: 0 additions & 67 deletions [core]/es_extended/server/common.lua
View file
Open in desktop

This file was deleted.

Loading
Loading