From c50003cfd836d9054b7263fdb4577128559130da Mon Sep 17 00:00:00 2001 From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com> Date: Sat, 11 Nov 2023 03:02:08 +0100 Subject: [PATCH] feat: convar for compatibility --- client/main.lua | 3 ++- compatibility/backwards/client.lua | 2 ++ compatibility/backwards/server.lua | 2 ++ compatibility/esx/client.lua | 2 ++ compatibility/esx/server.lua | 2 ++ server/main.lua | 3 ++- 6 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 compatibility/esx/client.lua diff --git a/client/main.lua b/client/main.lua index 5428b2f..6dafd98 100644 --- a/client/main.lua +++ b/client/main.lua @@ -13,7 +13,8 @@ Config = { randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30), disableVehicleAirControl = GetConvarInt("core:disableVehicleAirControl", 1) == 1, useInventoryForKeys = GetConvarInt("core:useInventoryForKeys", 1) == 1, - groups = json.decode(GetConvar("core:groups", "[]")) + groups = json.decode(GetConvar("core:groups", "[]")), + compatibility = json.decode(GetConvar("core:compatibility", "[]")) } -- Discord rich presence. diff --git a/compatibility/backwards/client.lua b/compatibility/backwards/client.lua index 9275a7a..5f5ecb1 100644 --- a/compatibility/backwards/client.lua +++ b/compatibility/backwards/client.lua @@ -1,3 +1,5 @@ +if not lib.table.contains(Config.compatibility, "backwards") then return end + NDCore.Functions = {} NDCore.Functions.GetSelectedCharacter = NDCore.getPlayer NDCore.Functions.GetCharacters = NDCore.getCharacters diff --git a/compatibility/backwards/server.lua b/compatibility/backwards/server.lua index 529c467..172a692 100644 --- a/compatibility/backwards/server.lua +++ b/compatibility/backwards/server.lua @@ -1,3 +1,5 @@ +if not lib.table.contains(Config.compatibility, "backwards") then return end + exports("GetCoreObject", function() return NDCore end) diff --git a/compatibility/esx/client.lua b/compatibility/esx/client.lua new file mode 100644 index 0000000..a2bb939 --- /dev/null +++ b/compatibility/esx/client.lua @@ -0,0 +1,2 @@ +if not lib.table.contains(Config.compatibility, "esx") then return end + diff --git a/compatibility/esx/server.lua b/compatibility/esx/server.lua index e09f2d5..41a1b3e 100644 --- a/compatibility/esx/server.lua +++ b/compatibility/esx/server.lua @@ -1,3 +1,5 @@ +if not lib.table.contains(Config.compatibility, "esx") then return end + local itemNames local registeredItems = {} diff --git a/server/main.lua b/server/main.lua index c692d6b..b09ee76 100644 --- a/server/main.lua +++ b/server/main.lua @@ -23,7 +23,8 @@ Config = { groups = json.decode(GetConvar("core:groups", "[]")), admins = json.decode(GetConvar("core:admins", "[]")), adminDiscordRoles = json.decode(GetConvar("core:adminDiscordRoles", "[]")), - multiCharacter = false + multiCharacter = false, + compatibility = json.decode(GetConvar("core:compatibility", "[]")) } SetConvarServerInfo("Discord", Config.discordInvite)