diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/client/main.lua b/server-data/resources/[esx_addons]/esx_basicneeds/client/main.lua index 35ecdf870..bfb13064b 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/client/main.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/client/main.lua @@ -69,63 +69,4 @@ end) AddEventHandler('esx_basicneeds:isEating', function(cb) cb(IsAnimated) -end) - -RegisterNetEvent('esx_basicneeds:onUse') -AddEventHandler('esx_basicneeds:onUse', function(type, prop_name, anim) - if not IsAnimated then - local anim = anim - IsAnimated = true - if type == 'food' then - prop_name = prop_name or 'prop_cs_burger_01' - anim = anim - elseif type == 'drink' then - prop_name = prop_name or 'prop_ld_flow_bottle' - anim = anim - end - - CreateThread(function() - local playerPed = PlayerPedId() - local x,y,z = table.unpack(GetEntityCoords(playerPed)) - local prop = CreateObject(joaat(prop_name), x, y, z + 0.2, true, true, true) - local boneIndex = GetPedBoneIndex(playerPed, 18905) - AttachEntityToEntity(prop, playerPed, boneIndex, 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) - - ESX.Streaming.RequestAnimDict(anim.dict, function() - TaskPlayAnim(playerPed, anim.dict, anim.name, anim.settings[1], anim.settings[2], anim.settings[3], anim.settings[4], anim.settings[5], anim.settings[6], anim.settings[7], anim.settings[8]) - RemoveAnimDict(anim.dict) - - Wait(3000) - IsAnimated = false - ClearPedSecondaryTask(playerPed) - DeleteObject(prop) - end) - end) - end -end) - --- Backwards compatibility -RegisterNetEvent('esx_basicneeds:onEat') -AddEventHandler('esx_basicneeds:onEat', function(prop_name) - local Invoke = GetInvokingResource() - - print(('[^3WARNING^7] ^5%s^7 used ^5esx_basicneeds:onEat^7, this method is deprecated and should not be used! Refer to ^5https://documentation.esx-framework.org/addons/esx_basicneeds/events/oneat^7 for more info!'):format(Invoke)) - - if not prop_name then - prop_name = 'prop_cs_burger_01' - end - TriggerEvent('esx_basicneeds:onUse', 'food', prop_name) -end) - -RegisterNetEvent('esx_basicneeds:onDrink') -AddEventHandler('esx_basicneeds:onDrink', function(prop_name) - local Invoke = GetInvokingResource() - - print(('[^3WARNING^7] ^5%s^7 used ^5esx_basicneeds:onDrink^7, this method is deprecated and should not be used! Refer to ^5https://documentation.esx-framework.org/addons/esx_basicneeds/events/ondrink^7 for more info!'):format(Invoke)) - - - if not prop_name then - prop_name = 'prop_ld_flow_bottle' - end - TriggerEvent('esx_basicneeds:onUse', 'drink', prop_name) -end) +end) \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/config.lua b/server-data/resources/[esx_addons]/esx_basicneeds/config.lua index 745411e17..9c86897f6 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/config.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/config.lua @@ -1,21 +1,3 @@ Config = {} Config.Locale = 'en' -Config.Visible = false - -Config.Items = { - ["bread"] = { - type = "food", - prop = "prop_cs_burger_01", - status = 200000, - remove = true, - anim = {dict = 'mp_player_inteat@burger', name = 'mp_player_int_eat_burger_fp', settings = {8.0, -8, -1, 49, 0, 0, 0, 0}} - }, - - ["water"] = { - type = "drink", - prop = "prop_ld_flow_bottle", - status = 100000, - remove = true, - anim = {dict = 'mp_player_intdrink', name = 'loop_bottle', settings = {1.0, -1.0, 2000, 0, 1, true, true, true}} - } -} +Config.Visible = false \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/esx_basicneeds.sql deleted file mode 100644 index d34699a1f..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Bread', 1), - ('water', 'Water', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/locales/da.lua b/server-data/resources/[esx_addons]/esx_basicneeds/locales/da.lua index 1d16ddc97..15c31d5a8 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/locales/da.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/locales/da.lua @@ -1,5 +1,3 @@ Locales['da'] = { - ['used_food'] = 'Du har spist 1x %s', - ['used_drink'] = 'Du har drukket 1x %s', ['got_healed'] = 'Du er blevet helbredt.' } diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/locales/de.lua b/server-data/resources/[esx_addons]/esx_basicneeds/locales/de.lua index 7a160b5ba..94d91f9d5 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/locales/de.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/locales/de.lua @@ -1,5 +1,3 @@ Locales['de'] = { - ['used_food'] = 'Du hast 1x %s gegessen', - ['used_drink'] = 'Du hast 1x %s getrunken', ['got_healed'] = 'Du wurdest geheilt.' } diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/locales/en.lua b/server-data/resources/[esx_addons]/esx_basicneeds/locales/en.lua index a994b1bf1..3f490d0a1 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/locales/en.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/locales/en.lua @@ -1,5 +1,3 @@ Locales['en'] = { - ['used_food'] = 'You have eaten 1x %s', - ['used_drink'] = 'You have drinked 1x %s', ['got_healed'] = 'You have been healed.' } diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/locales/fr.lua b/server-data/resources/[esx_addons]/esx_basicneeds/locales/fr.lua index 0936879fc..728539d77 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/locales/fr.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/locales/fr.lua @@ -1,5 +1,3 @@ Locales['fr'] = { - ['used_food'] = 'Vous avez mangé 1x %s', - ['used_drink'] = 'Vous avez bu 1x %s', ['got_healed'] = 'Vous avez été soigné.' } diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/locales/nl.lua b/server-data/resources/[esx_addons]/esx_basicneeds/locales/nl.lua index 695f9d732..23bb68a10 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/locales/nl.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/locales/nl.lua @@ -1,4 +1,3 @@ Locales['nl'] = { - ['used_eat'] = 'je hebt een %s gegeten', - ['used_drink'] = 'je hebt een %s gedronken', - } + ['used_eat'] = 'je hebt een %s gegeten', +} diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/locales/sl.lua b/server-data/resources/[esx_addons]/esx_basicneeds/locales/sl.lua index 8a216d372..031851624 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/locales/sl.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/locales/sl.lua @@ -1,5 +1,3 @@ Locales['sl'] = { - ['used_food'] = 'Vi ste pojedli 1x %s', - ['used_drink'] = 'Vi ste popili 1x %s', ['got_healed'] = 'Vi ste bili Pozdravljeni.' } diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/locales/sr.lua b/server-data/resources/[esx_addons]/esx_basicneeds/locales/sr.lua index ef06eb2b6..336eda766 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/locales/sr.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/locales/sr.lua @@ -1,5 +1,3 @@ Locales['sr'] = { - ['used_food'] = 'Pojeli ste 1x %s', - ['used_drink'] = 'Popili ste 1x %s', ['got_healed'] = 'Vi ste izlečeni.' } diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/locales/zh-cn.lua b/server-data/resources/[esx_addons]/esx_basicneeds/locales/zh-cn.lua index 6b6bb62fc..2ed1e6073 100644 --- a/server-data/resources/[esx_addons]/esx_basicneeds/locales/zh-cn.lua +++ b/server-data/resources/[esx_addons]/esx_basicneeds/locales/zh-cn.lua @@ -1,5 +1,3 @@ Locales['zh-cn'] = { - ['used_food'] = '已食用了1x %s', - ['used_drink'] = '已饮用了1x %s', ['got_healed'] = '已重置饥饿+饥渴双值.' } diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/cs_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/cs_esx_basicneeds.sql deleted file mode 100644 index 919d4c53a..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/cs_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Chleba', 1), - ('water', 'Voda', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/de_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/de_esx_basicneeds.sql deleted file mode 100644 index df1ea1cc6..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/de_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Brot', 1), - ('water', 'Wasser', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/es_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/es_esx_basicneeds.sql deleted file mode 100644 index f8f9fb4c3..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/es_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Pan', 1), - ('water', 'Agua', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/fi_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/fi_esx_basicneeds.sql deleted file mode 100644 index 433091907..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/fi_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Leipä', 1), - ('water', 'Vesi', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/fr_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/fr_esx_basicneeds.sql deleted file mode 100644 index c867a41f7..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/fr_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Pain', 1), - ('water', 'Eau', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql deleted file mode 100644 index 717b77399..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/hu_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Kenyér', 1), - ('water', 'Víz', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/it_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/it_esx_basicneeds.sql deleted file mode 100644 index dcacac149..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/it_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Pane', 1), - ('water', 'Acqua', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/nl_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/nl_esx_basicneeds.sql deleted file mode 100644 index 71ba8c361..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/nl_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Brood', 1), - ('water', 'Water', 1) -; \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/pl_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/pl_esx_basicneeds.sql deleted file mode 100644 index 8bc2f1722..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/pl_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Chleb', 1), - ('water', 'Woda', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/sl_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/sl_esx_basicneeds.sql deleted file mode 100644 index 27bda1665..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/sl_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Kruh', 1), - ('water', 'Voda', 1) -; diff --git a/server-data/resources/[esx_addons]/esx_basicneeds/localization/sr_esx_basicneeds.sql b/server-data/resources/[esx_addons]/esx_basicneeds/localization/sr_esx_basicneeds.sql deleted file mode 100644 index 12b28f8f3..000000000 --- a/server-data/resources/[esx_addons]/esx_basicneeds/localization/sr_esx_basicneeds.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Hleb', 1), - ('water', 'Voda', 1) -;