From 5507152ead93f62644a5e0529fa3241f317cce3f Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Fri, 5 May 2023 12:56:14 +0200 Subject: [PATCH] fix([bpt_addons]\bpt_crafting):whitespace removed --- .../[bpt_addons]/bpt_crafting/client/main.lua | 8 +- .../[bpt_addons]/bpt_crafting/config.lua | 183 +++++++++--------- .../[bpt_addons]/bpt_crafting/server/main.lua | 2 +- 3 files changed, 93 insertions(+), 100 deletions(-) diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua b/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua index 13dbadeb4..6efb1bf66 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua @@ -27,8 +27,7 @@ CreateThread( job = ESX.GetPlayerData().job.name grade = ESX.GetPlayerData().job.grade - ESX.TriggerServerCallback( - "bpt_crafting:getItemNames", + ESX.TriggerServerCallback("bpt_crafting:getItemNames", function(info) labels = info end @@ -175,8 +174,7 @@ CreateThread( ) RegisterNetEvent("bpt_crafting:craftStart") -AddEventHandler( - "bpt_crafting:craftStart", +AddEventHandler("bpt_crafting:craftStart", function(item, count) local id = math.random(000, 999) table.insert(craftingQueue, {time = Config.Recipes[item].Time, item = item, count = 1, id = id}) @@ -248,4 +246,4 @@ function DrawText3D(x, y, z, text) AddTextComponentString(text) EndTextCommandDisplayText(_x, _y) end -end +end \ 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 554faf7cd..24adf98c2 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua @@ -52,7 +52,6 @@ PermanentItems = { -- Items that dont get removed when crafting }, Recipes = { -- Enter Item name and then the speed value! The higher the value the more torque - ['bandage'] = { Level = 0, -- From what level this item will be craftable Category = 'medical', -- The category item will be put in @@ -84,44 +83,44 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th }, ['bandage'] = { - Level = 0, - Category = 'medical', - isGun = false, - Jobs = {'ambulance'}, - JobGrades = {}, - Amount = 1, + Level = 0, + Category = 'medical', + isGun = false, + Jobs = {'ambulance'}, + JobGrades = {}, + Amount = 1, SuccessRate = 100, - requireBlueprint = false, - Time = 20, - Ingredients = { - ['cottonforbandages'] = 2 + requireBlueprint = false, + Time = 20, + Ingredients = { + ['cottonforbandages'] = 2 } }, ['ironsheet'] = { Level = 0, - Category = 'dustman', - isGun = false, - Jobs = {'dustman'}, - JobGrades = {}, - Amount = 2, + Category = 'dustman', + isGun = false, + Jobs = {'dustman'}, + JobGrades = {}, + Amount = 2, SuccessRate = 100, requireBlueprint = false, Time = 60, - Ingredients = { - ['trash_can'] = 5, + Ingredients = { + ['trash_can'] = 5, ['hammer'] = 1 } }, ['recycled_paper'] = { - Level = 0, - Category = 'dustman', - isGun = false, - Jobs = {'dustman'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, + Level = 0, + Category = 'dustman', + isGun = false, + Jobs = {'dustman'}, + JobGrades = {}, + Amount = 1, + SuccessRate = 100, requireBlueprint = false, Time = 30, Ingredients = { @@ -132,13 +131,13 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th ['paper'] = { Level = 0, Category = 'dustman', - isGun = false, - Jobs = {'dustman'}, - JobGrades = {}, - Amount = 6, - SuccessRate = 100, - requireBlueprint = false, - Time = 30, + isGun = false, + Jobs = {'dustman'}, + JobGrades = {}, + Amount = 6, + SuccessRate = 100, + requireBlueprint = false, + Time = 30, Ingredients = { ['newspaper'] = 1, ['trash_burgershot'] = 1 @@ -147,11 +146,11 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th ['hammer'] = { Level = 0, - Category = 'import', - isGun = false, - Jobs = {'import'}, - JobGrades = {}, - Amount = 4, + Category = 'import', + isGun = false, + Jobs = {'import'}, + JobGrades = {}, + Amount = 4, SuccessRate = 100, requireBlueprint = false, Time = 60, @@ -163,13 +162,13 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th ['fixkit'] = { Level = 0, - Category = 'mechanic', - isGun = false, - Jobs = {'mechanic'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, - requireBlueprint = false, + Category = 'mechanic', + isGun = false, + Jobs = {'mechanic'}, + JobGrades = {}, + Amount = 1, + SuccessRate = 100, + requireBlueprint = false, Time = 60, Ingredients = { ['ironsheet'] = 2, @@ -179,12 +178,12 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th ['almondmilk'] = { Level = 0, - Category = 'unicorn', - isGun = false, - Jobs = {'unicorn'}, - JobGrades = {}, + Category = 'unicorn', + isGun = false, + Jobs = {'unicorn'}, + JobGrades = {}, Amount = 1, - SuccessRate = 100, + SuccessRate = 100, requireBlueprint = false, Time = 60, Ingredients = { @@ -196,7 +195,7 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th ['slicedchips'] = { Level = 0, - Category = 'unicorn', + Category = 'unicorn', isGun = false, Jobs = {'unicorn'}, JobGrades = {}, @@ -212,14 +211,14 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th ['iron'] = { Level = 0, - Category = 'import', + Category = 'import', isGun = false, Jobs = {'import'}, JobGrades = {}, Amount = 3, SuccessRate = 100, - requireBlueprint = false, - Time = 10, + requireBlueprint = false, + Time = 10, Ingredients = { ['hammer'] = 1, ['ironsheet'] = 10 @@ -228,15 +227,15 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th ['cigarette_paper'] = { Level = 0, - Category = 'ballas', - isGun = false, + Category = 'ballas', + isGun = false, Jobs = {'ballas'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, - requireBlueprint = false, - Time = 10, - Ingredients = { + JobGrades = {}, + Amount = 1, + SuccessRate = 100, + requireBlueprint = false, + Time = 10, + Ingredients = { ['recycled_paper'] = 1 } }, @@ -294,45 +293,45 @@ Recipes = { -- Enter Item name and then the speed value! The higher the value th ['bread'] = { Level = 0, - Category = 'baker', - isGun = false, - Jobs = {'baker'}, - JobGrades = {}, + Category = 'baker', + isGun = false, + Jobs = {'baker'}, + JobGrades = {}, Amount = 5, - SuccessRate = 100, - requireBlueprint = false, - Time = 200, - Ingredients = { - ['flour'] = 1 + SuccessRate = 100, + requireBlueprint = false, + Time = 200, + Ingredients = { + ['flour'] = 1 } }, ['flour'] = { Level = 0, - Category = 'baker', - isGun = false, - Jobs = {'baker'}, - JobGrades = {}, - Amount = 1, - SuccessRate = 100, - requireBlueprint = false, - Time = 120, - Ingredients = { - ['grain'] = 10 + Category = 'baker', + isGun = false, + Jobs = {'baker'}, + JobGrades = {}, + Amount = 1, + SuccessRate = 100, + requireBlueprint = false, + Time = 120, + Ingredients = { + ['grain'] = 10 } }, ['bread_deer'] = { Level = 0, - Category = 'unicorn', - isGun = false, - Jobs = {'unicorn'}, - JobGrades = {}, - Amount = 3, - SuccessRate = 100, - requireBlueprint = false, - Time = 120, - Ingredients = { + Category = 'unicorn', + isGun = false, + Jobs = {'unicorn'}, + JobGrades = {}, + Amount = 3, + SuccessRate = 100, + requireBlueprint = false, + Time = 120, + Ingredients = { ['deer_meat'] = 1, ['bread'] = 3 } @@ -357,8 +356,4 @@ Text = { ['workbench_hologram'] = '[~b~E~w~] banco da lavoro', ['inv_limit_exceed'] = 'Limite inventario superato! Rimuovi qualcosa prima di perdere altra merce', ['crafting_failed'] = 'Non sei riuscito a creare l\'oggetto!' -}} - - - - +}} \ No newline at end of file diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua b/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua index f81e1b02f..f38e34386 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua @@ -181,4 +181,4 @@ ESX.RegisterServerCallback( end ) end -) +) \ No newline at end of file