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.

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

fix: bpt_lumberjack fixed typos and removed unused code #596

Merged
merged 3 commits into from
Dec 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,6 @@ 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
62. [bpt_loadscreen]: chore: bpt_loadscreen improves code formatting @bitpredator
63. [bpt_lumberjack]: fix: bpt_lumberjack fixed typos and removed unused code @bitpredator
64. [bpt_crafting]: fix: correct ingredients to use @bitpredator
4 changes: 2 additions & 2 deletions server-data/resources/[bpt_addons]/bpt_crafting/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},

Expand Down Expand Up @@ -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
}
},

Expand Down
674 changes: 674 additions & 0 deletions server-data/resources/[bpt_addons]/bpt_loadscreen/LICENSE

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions server-data/resources/[bpt_addons]/bpt_loadscreen/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<h1 align='center'>bpt_loadscreen</a></h1>
<p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>

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/.
11 changes: 7 additions & 4 deletions server-data/resources/[bpt_addons]/bpt_lumberjack/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# bpt_woodcutter
<h1 align='center'>bpt_lumberjack</a></h1>
<p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>

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.
Expand All @@ -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/.
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -179,7 +153,6 @@ function GetCoordZ(x, y)
return z
end
end

return 43.0
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Config = {}

Config.Locale = 'en'

Config.CircleZones = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
}
Loading