Discord + +Copyright (C) 2022-2023 bitpredator + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +ATTENTION: +You are not authorized to change the name of the resource and the resources within it. + +If you want to contribute you can open a pull request. + +You are not authorized to sell this software (this is free project). + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. \ No newline at end of file From a2f1a74202b605128d3a62d1f0dc3c9eeb7296e4 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sun, 31 Dec 2023 12:37:22 +0100 Subject: [PATCH 2/3] fix: bpt_lumberjack fixed typos and removed unused code --- .github/CHANGELOG.md | 3 +- .../[bpt_addons]/bpt_lumberjack/README.md | 11 ++++--- .../bpt_lumberjack/client/main.lua | 31 ++----------------- .../[bpt_addons]/bpt_lumberjack/config.lua | 1 - .../bpt_lumberjack/fxmanifest.lua | 2 +- .../bpt_lumberjack/locales/en.lua | 4 +-- 6 files changed, 14 insertions(+), 38 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index cc90a57d6..96a361146 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -86,4 +86,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse 59. [bpt_fishermanjob]: refactor: bpt_fishermanjob inventory implementation @bitpredator 60. [bpt_hud]: chore: push for version 1.0.0 @bitpredator 61. [bpt_importjob]: refactor: bpt_importjob inventory implementation @bitpredator -62. [bpt_loadscreen]: chore: bpt_loadscreen improves code formatting @bitpredator \ No newline at end of file +62. [bpt_loadscreen]: chore: bpt_loadscreen improves code formatting @bitpredator +63. [bpt_lumberjack]: fix: bpt_lumberjack fixed typos and removed unused code @bitpredator \ No newline at end of file diff --git a/server-data/resources/[bpt_addons]/bpt_lumberjack/README.md b/server-data/resources/[bpt_addons]/bpt_lumberjack/README.md index d28fddc0a..2a89e44b3 100644 --- a/server-data/resources/[bpt_addons]/bpt_lumberjack/README.md +++ b/server-data/resources/[bpt_addons]/bpt_lumberjack/README.md @@ -1,8 +1,11 @@ -# bpt_woodcutter +
Discord -Copyright (C) 2022-2023 bitpredator +Copyright (C) 2022-2024 bitpredator -This program is a project for the fivem community, you have legal permission to distribute and / or modify it only if you have forked this repository, if it is not a fork repository, the version will be removed from the DMCA request. +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. ATTENTION: You are not authorized to change the name of the resource and the resources within it. @@ -13,4 +16,4 @@ You are not authorized to sell this software (this is free project). This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua b/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua index 3e4c53f16..75824798f 100644 --- a/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua @@ -10,23 +10,7 @@ Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -local menuOpen = false - -CreateThread(function() - ESX = exports["es_extended"]:getSharedObject() - while ESX.GetPlayerData().job == nil do - Wait(100) - end - ESX.PlayerData = ESX.GetPlayerData() -end) - -AddEventHandler('onResourceStop', function(resource) - if resource == GetCurrentResourceName() then - if menuOpen then - ESX.UI.Menu.CloseAll() - end - end -end) +ESX = exports["es_extended"]:getSharedObject() local spawnedWood = 0 local TreeWood = {} @@ -75,7 +59,7 @@ CreateThread(function() end if IsControlJustReleased(0, Keys['E']) and not Collection then - ollection = true + Collection = true ESX.TriggerServerCallback('bpt_woodcutter:canPickUp', function(canPickUp) @@ -104,16 +88,6 @@ CreateThread(function() else Wait(500) end - - end - -end) - -AddEventHandler('onResourceStop', function(resource) - if resource == GetCurrentResourceName() then - for _, v in pairs(TreeWood) do - ESX.Game.DeleteObject(v) - end end end) @@ -179,7 +153,6 @@ function GetCoordZ(x, y) return z end end - return 43.0 end diff --git a/server-data/resources/[bpt_addons]/bpt_lumberjack/config.lua b/server-data/resources/[bpt_addons]/bpt_lumberjack/config.lua index 89455832b..139b60296 100644 --- a/server-data/resources/[bpt_addons]/bpt_lumberjack/config.lua +++ b/server-data/resources/[bpt_addons]/bpt_lumberjack/config.lua @@ -1,5 +1,4 @@ Config = {} - Config.Locale = 'en' Config.CircleZones = { diff --git a/server-data/resources/[bpt_addons]/bpt_lumberjack/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_lumberjack/fxmanifest.lua index 4ec6ec3e9..b27fff198 100644 --- a/server-data/resources/[bpt_addons]/bpt_lumberjack/fxmanifest.lua +++ b/server-data/resources/[bpt_addons]/bpt_lumberjack/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'cerulean' game 'gta5' lua54 'yes' author 'bitpredator' -version '0.0.4' +version '1.0.0' server_scripts { '@oxmysql/lib/MySQL.lua', diff --git a/server-data/resources/[bpt_addons]/bpt_lumberjack/locales/en.lua b/server-data/resources/[bpt_addons]/bpt_lumberjack/locales/en.lua index 2ed334247..849bb544d 100644 --- a/server-data/resources/[bpt_addons]/bpt_lumberjack/locales/en.lua +++ b/server-data/resources/[bpt_addons]/bpt_lumberjack/locales/en.lua @@ -1,7 +1,7 @@ -Locales ['it'] = { +Locales ['en'] = { -- wood ['wood_pickupprompt'] = 'press ~INPUT_CONTEXT~ to fell ~g~the tree~s~', ['wood_inventoryfull'] = 'Inventory ~g~full~s~.', -- blips - ['blip_woodfield'] = 'wood', + ['blip_woodfield'] = 'wood' } \ No newline at end of file From ebc99282ed0fc1808b34862a716108983b6a8f74 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sun, 31 Dec 2023 12:39:03 +0100 Subject: [PATCH 3/3] fix: correct ingredients to use --- .github/CHANGELOG.md | 3 ++- server-data/resources/[bpt_addons]/bpt_crafting/config.lua | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 96a361146..7d6b2888c 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -87,4 +87,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse 60. [bpt_hud]: chore: push for version 1.0.0 @bitpredator 61. [bpt_importjob]: refactor: bpt_importjob inventory implementation @bitpredator 62. [bpt_loadscreen]: chore: bpt_loadscreen improves code formatting @bitpredator -63. [bpt_lumberjack]: fix: bpt_lumberjack fixed typos and removed unused code @bitpredator \ No newline at end of file +63. [bpt_lumberjack]: fix: bpt_lumberjack fixed typos and removed unused code @bitpredator +64. [bpt_crafting]: fix: correct ingredients to use @bitpredator \ No newline at end of file diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua index bf2713516..f1a3ca1ba 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua @@ -146,7 +146,7 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th Time = 60, Ingredients = { ['iron'] = 4, - ['legnatagliata'] = 1 + ['wood'] = 1 } }, @@ -243,7 +243,7 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th Ingredients = { ['copper'] = 1, ['iron'] = 1, - ['legnatagliata'] = 1 + ['wood'] = 1 } },