Merge pull request #631 from bitpredator/dev

🎨 Run formatter
bitpredator · Jan 30, 2024 · 3b8d743 · 3b8d743
2 parents 656405e + 63453e4
commit 3b8d743
Show file tree

Hide file tree

Showing 63 changed files with 784 additions and 591 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -105,4 +105,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
 79. [esx_society]: refactor: (esx_society):  complete rebuild for esx_society @bitpredator
 80. [npwd]: fix: database error npwd @bitpredator
 81. [CayoTwoIslands]: fix: nil value (global 'Config') @bitpredator
-82. [esx_vehicleshop]fix: globalstate rewrite + inventory removal via ox_inventory @bitpredator
+82. [esx_vehicleshop]: fix: globalstate rewrite + inventory removal via ox_inventory @bitpredator
+83. [esx_mechanicjob]: refactor: esx_mechanicjob inventory implementation @bitpredator
diff --git a/server-data/resources/[bpt_addons]/bpt_bakerjob/LICENSE b/server-data/resources/[bpt_addons]/bpt_bakerjob/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/server-data/resources/[bpt_addons]/bpt_bakerjob/README.md b/server-data/resources/[bpt_addons]/bpt_bakerjob/README.md
@@ -2,7 +2,7 @@
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
 📌 License
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 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.
 

diff --git a/server-data/resources/[bpt_addons]/bpt_ballasjob/LICENSE b/server-data/resources/[bpt_addons]/bpt_ballasjob/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/server-data/resources/[bpt_addons]/bpt_ballasjob/README.md b/server-data/resources/[bpt_addons]/bpt_ballasjob/README.md
@@ -2,7 +2,7 @@
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
 📌 License
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 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.
 

diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/LICENSE b/server-data/resources/[bpt_addons]/bpt_crafting/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/README.md b/server-data/resources/[bpt_addons]/bpt_crafting/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_crafting</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 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.
 

diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua
@@ -1,8 +1,8 @@
 Config = {
-	UseLimitSystem = false, -- Enable if your esx uses limit system
-	CraftingStopWithDistance = false, -- Crafting will stop when not near workbench
-	ExperiancePerCraft = 5, -- The amount of experiance added per craft (100 Experiance is 1 level)
-	HideWhenCantCraft = false, -- Instead of lowering the opacity it hides the item that is not craftable due to low level or wrong job
+    UseLimitSystem = false, -- Enable if your esx uses limit system
+    CraftingStopWithDistance = false, -- Crafting will stop when not near workbench
+    ExperiancePerCraft = 5, -- The amount of experiance added per craft (100 Experiance is 1 level)
+    HideWhenCantCraft = false, -- Instead of lowering the opacity it hides the item that is not craftable due to low level or wrong job
 
 	Categories = {
 		["medical"] = {

diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_crafting/fxmanifest.lua
@@ -7,24 +7,24 @@ shared_script("@es_extended/imports.lua")
 ui_page("html/form.html")
 
 files({
-	"html/form.html",
-	"html/css.css",
-	"html/script.js",
-	"html/jquery-3.4.1.min.js",
-	"html/img/*.png",
+    "html/form.html",
+    "html/css.css",
+    "html/script.js",
+    "html/jquery-3.4.1.min.js",
+    "html/img/*.png",
 })
 
 client_scripts({
-	"@es_extended/locale.lua",
-	"locales/*.lua",
-	"config.lua",
-	"client/main.lua",
+    "@es_extended/locale.lua",
+    "locales/*.lua",
+    "config.lua",
+    "client/main.lua",
 })
 
 server_scripts({
-	"@es_extended/locale.lua",
-	"locales/*.lua",
-	"@oxmysql/lib/MySQL.lua",
-	"config.lua",
-	"server/main.lua",
-})
+    "@es_extended/locale.lua",
+    "locales/*.lua",
+    "@oxmysql/lib/MySQL.lua",
+    "config.lua",
+    "server/main.lua",
+})
diff --git a/server-data/resources/[bpt_addons]/bpt_deliveries/README.md b/server-data/resources/[bpt_addons]/bpt_deliveries/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_deliveries</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 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.
 

diff --git a/server-data/resources/[bpt_addons]/bpt_doorlock/LICENSE b/server-data/resources/[bpt_addons]/bpt_doorlock/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 bitpredator
+Copyright (c) 2023-2024 bitpredator
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/server-data/resources/[bpt_addons]/bpt_doorlock/README.md b/server-data/resources/[bpt_addons]/bpt_doorlock/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_dorlock</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 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.

diff --git a/server-data/resources/[bpt_addons]/bpt_dustman/LICENSE b/server-data/resources/[bpt_addons]/bpt_dustman/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) 2022-2023  bitpredator
+    <program>  Copyright (C) 2022-2024  bitpredator
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/server-data/resources/[bpt_addons]/bpt_dustman/README.md b/server-data/resources/[bpt_addons]/bpt_dustman/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_dustman</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 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.

diff --git a/server-data/resources/[bpt_addons]/bpt_farmer/LICENSE b/server-data/resources/[bpt_addons]/bpt_farmer/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) 2022-2023  bitpredator
+    <program>  Copyright (C) 2022-2024  bitpredator
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/server-data/resources/[bpt_addons]/bpt_farmer/README.md b/server-data/resources/[bpt_addons]/bpt_farmer/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_farmer</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 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.
 

diff --git a/server-data/resources/[bpt_addons]/bpt_fisherman/LICENSE b/server-data/resources/[bpt_addons]/bpt_fisherman/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/server-data/resources/[bpt_addons]/bpt_fisherman/README.md b/server-data/resources/[bpt_addons]/bpt_fisherman/README.md
@@ -2,7 +2,7 @@
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
 📌 License
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 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.
 

diff --git a/server-data/resources/[bpt_addons]/bpt_hud/LICENSE b/server-data/resources/[bpt_addons]/bpt_hud/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/server-data/resources/[bpt_addons]/bpt_menu/README.md b/server-data/resources/[bpt_addons]/bpt_menu/README.md
@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_menu</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.
 

diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/LICENSE b/server-data/resources/[esx_addons]/esx_mechanicjob/LICENSE
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <2022>  <bitpredator>
+    esx_mechanicjob
+     Copyright (C) 2022-2024 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
@@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
     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 <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <2022>  <bitpredator>
+    esx_mechanicjob  Copyright (C) 2022-2024 bitpredator
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/server-data/resources/[esx_addons]/esx_mechanicjob/README.md b/server-data/resources/[esx_addons]/esx_mechanicjob/README.md
@@ -1,8 +1,12 @@
-# esx_mechanicjob
+<h1 align='center'>esx_mechanicjob</a></h1>
+<p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2022 bitpredator
+### License
+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.