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.

Sign up for GitHub

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

Jump to bottom

Massive fixes & Cleanups #18

Merged
merged 8 commits into from
Apr 25, 2022
Merged

Massive fixes & Cleanups #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7b80ec6
Code clean up
MonkeyWhisper Apr 25, 2022
d09e785
Suffix change
MonkeyWhisper Apr 25, 2022
d0d95c8
Prefix change
MonkeyWhisper Apr 25, 2022
59252c0
Prefix fixed
MonkeyWhisper Apr 25, 2022
90968f9
Added Trigger & Cleanup
MonkeyWhisper Apr 25, 2022
54a8943
Code cleanup & Core revert name change
MonkeyWhisper Apr 25, 2022
fcf2f38
Events Cleanup
MonkeyWhisper Apr 25, 2022
e72ea1a
Merge branch 'main' into MonkeyWhisper-dev
MonkeyWhisper Apr 25, 2022
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ qb-inventory > html > images
* qb-menu - https://github.com/qbcore-framework/qb-menu

# Original Repo
https://github.com/DoPeMan17/esx_drugs
https://github.com/DoPeMan17/esx_drugs
69 changes: 24 additions & 45 deletions client/chemicals.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,9 @@ AddEventHandler('onResourceStop', function(resource)
end
end)

--[[Citizen.CreateThread(function()
while true do
Citizen.Wait(0)
local playerPed = PlayerPedId()
local coords = GetEntityCoords(playerPed)

if GetDistanceBetweenCoords(coords, Config.CircleZones.ChemicalsConvertionMenu.coords, true) < 3 then
if not menuOpen then
local pos = GetEntityCoords(PlayerPedId())
QBCore.Functions.DrawText3D(pos.x, pos.y, pos.z, "~g~E~w~ - Open chemical menu")

if IsControlJustReleased(0, Keys['E']) then
TriggerEvent('qb-drugtrafficking:chemicalmenu')
end
else
Citizen.Wait(5500)
end
end
end
end)]]--

-- Chemical Menu Trigger & Menu Button Triggers --

RegisterNetEvent('qb-drugtrafficking:chemicalmenu', function()
RegisterNetEvent('ps-drugtrafficking:chemicalmenu', function()
createChemicalMenu()
exports['qb-menu']:openMenu(chemMenu)
end)
Expand All @@ -64,31 +43,31 @@ function createChemicalMenu()
txt = "x1 Chemicals",
params = {
isServer = false,
event = "qb-drugtrafficking:hydrochloric_acid",
event = "ps-drugtrafficking:hydrochloric_acid",
}
},
{
header = "Sodium Hydroxide",
txt = "x1 Chemicals",
params = {
isServer = false,
event = "qb-drugtrafficking:sodium_hydroxide",
event = "ps-drugtrafficking:sodium_hydroxide",
}
},
{
header = "Sulfuric Acid",
txt = "x1 Chemicals",
params = {
isServer = false,
event = "qb-drugtrafficking:sulfuric_acid",
event = "ps-drugtrafficking:sulfuric_acid",
}
},
{
header = "LSA",
txt = "x1 Chemicals",
params = {
isServer = false,
event = "qb-drugtrafficking:lsa",
event = "ps-drugtrafficking:lsa",
}
},
{
Expand All @@ -105,8 +84,8 @@ end

--------------------------------------------------------------------

RegisterNetEvent("qb-drugtrafficking:hydrochloric_acid")
AddEventHandler("qb-drugtrafficking:hydrochloric_acid", function()
RegisterNetEvent("ps-drugtrafficking:hydrochloric_acid")
AddEventHandler("ps-drugtrafficking:hydrochloric_acid", function()
ped = PlayerPedId();
QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result)
if result then
Expand All @@ -117,8 +96,8 @@ AddEventHandler("qb-drugtrafficking:hydrochloric_acid", function()
end, 'chemicals')
end)

RegisterNetEvent("qb-drugtrafficking:lsa")
AddEventHandler("qb-drugtrafficking:lsa", function()
RegisterNetEvent("ps-drugtrafficking:lsa")
AddEventHandler("ps-drugtrafficking:lsa", function()
ped = PlayerPedId();
QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result)
if result then
Expand All @@ -141,7 +120,7 @@ function process_lsa()
disableMouse = false,
disableCombat = true,
}, {}, {}, {}, function()
TriggerServerEvent('qb-drugtrafficking:process_lsa')
TriggerServerEvent('ps-drugtrafficking:process_lsa')

local timeLeft = Config.Delays.thionylchlorideProcessing / 1000

Expand All @@ -150,7 +129,7 @@ function process_lsa()
timeLeft = timeLeft - 1

if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.ChemicalsConvertionMenu.coords, false) > 4 then
TriggerServerEvent('qb-drugtrafficking:cancelProcessing')
TriggerServerEvent('ps-drugtrafficking:cancelProcessing')
break
end
end
Expand All @@ -162,8 +141,8 @@ function process_lsa()
isProcessing = false
end

RegisterNetEvent("qb-drugtrafficking:sulfuric_acid")
AddEventHandler("qb-drugtrafficking:sulfuric_acid", function()
RegisterNetEvent("ps-drugtrafficking:sulfuric_acid")
AddEventHandler("ps-drugtrafficking:sulfuric_acid", function()
ped = PlayerPedId();
QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result)
if result then
Expand All @@ -174,8 +153,8 @@ AddEventHandler("qb-drugtrafficking:sulfuric_acid", function()
end, 'chemicals')
end)

RegisterNetEvent("qb-drugtrafficking:sodium_hydroxide")
AddEventHandler("qb-drugtrafficking:sodium_hydroxide", function()
RegisterNetEvent("ps-drugtrafficking:sodium_hydroxide")
AddEventHandler("ps-drugtrafficking:sodium_hydroxide", function()
ped = PlayerPedId();
QBCore.Functions.TriggerCallback('QBCore:HasItem', function(result)
if result then
Expand All @@ -198,7 +177,7 @@ function process_sulfuric_acid()
disableMouse = false,
disableCombat = true,
}, {}, {}, {}, function()
TriggerServerEvent('qb-drugtrafficking:processprocess_sulfuric_acid')
TriggerServerEvent('ps-drugtrafficking:processprocess_sulfuric_acid')

local timeLeft = Config.Delays.thionylchlorideProcessing / 1000

Expand All @@ -207,7 +186,7 @@ function process_sulfuric_acid()
timeLeft = timeLeft - 1

if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.ChemicalsConvertionMenu.coords, false) > 4 then
TriggerServerEvent('qb-drugtrafficking:cancelProcessing')
TriggerServerEvent('ps-drugtrafficking:cancelProcessing')
break
end
end
Expand All @@ -231,7 +210,7 @@ function process_sodium_hydroxide()
disableMouse = false,
disableCombat = true,
}, {}, {}, {}, function()
TriggerServerEvent('qb-drugtrafficking:processsodium_hydroxide')
TriggerServerEvent('ps-drugtrafficking:processsodium_hydroxide')

local timeLeft = Config.Delays.thionylchlorideProcessing / 1000

Expand All @@ -240,7 +219,7 @@ function process_sodium_hydroxide()
timeLeft = timeLeft - 1

if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.ChemicalsConvertionMenu.coords, false) > 4 then
TriggerServerEvent('qb-drugtrafficking:cancelProcessing')
TriggerServerEvent('ps-drugtrafficking:cancelProcessing')
break
end
end
Expand All @@ -264,7 +243,7 @@ function process_hydrochloric_acid()
disableMouse = false,
disableCombat = true,
}, {}, {}, {}, function()
TriggerServerEvent('qb-drugtrafficking:processHydrochloric_acid')
TriggerServerEvent('ps-drugtrafficking:processHydrochloric_acid')

local timeLeft = Config.Delays.thionylchlorideProcessing / 1000

Expand All @@ -273,7 +252,7 @@ function process_hydrochloric_acid()
timeLeft = timeLeft - 1

if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.ChemicalsConvertionMenu.coords, false) > 4 then
TriggerServerEvent('qb-drugtrafficking:cancelProcessing')
TriggerServerEvent('ps-drugtrafficking:cancelProcessing')
break
end
end
Expand All @@ -286,8 +265,8 @@ function process_hydrochloric_acid()
end


RegisterNetEvent("qb-drugtrafficking:chemicals")
AddEventHandler("qb-drugtrafficking:chemicals", function()
RegisterNetEvent("ps-drugtrafficking:pickChemicals")
AddEventHandler("ps-drugtrafficking:pickChemicals", function()
Citizen.Wait(0)
local playerPed = PlayerPedId()
local coords = GetEntityCoords(playerPed)
Expand Down Expand Up @@ -316,7 +295,7 @@ AddEventHandler("qb-drugtrafficking:chemicals", function()
table.remove(Chemicals, nearbyID)
SpawnedChemicals = SpawnedChemicals - 1

TriggerServerEvent('qb-drugtrafficking:pickedUpChemicals')
TriggerServerEvent('ps-drugtrafficking:pickedUpChemicals')

end, function()
ClearPedTasks(PlayerPedId())
Expand Down
45 changes: 24 additions & 21 deletions client/coke.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Citizen.CreateThread(function()
end
end)

RegisterNetEvent('qb-drugprocessing:ProcessCocaFarm')
AddEventHandler('qb-drugprocessing:ProcessCocaFarm', function()
RegisterNetEvent('ps-drugprocessing:ProcessCocaFarm')
AddEventHandler('ps-drugprocessing:ProcessCocaFarm', function()
local coords = GetEntityCoords(PlayerPedId(source))

if GetDistanceBetweenCoords(coords, Config.CircleZones.CokeProcessing.coords, true) < 5 then
Expand All @@ -46,8 +46,8 @@ AddEventHandler('qb-drugprocessing:ProcessCocaFarm', function()
end
end)

RegisterNetEvent('qb-drugprocessing:ProcessCocaPowder')
AddEventHandler('qb-drugprocessing:ProcessCocaPowder', function()
RegisterNetEvent('ps-drugprocessing:ProcessCocaPowder')
AddEventHandler('ps-drugprocessing:ProcessCocaPowder', function()
local coords = GetEntityCoords(PlayerPedId(source))
local amount = 10
local amount2 = 5
Expand Down Expand Up @@ -94,8 +94,8 @@ AddEventHandler('qb-drugprocessing:ProcessCocaPowder', function()
end
end)

RegisterNetEvent('qb-drugprocessing:ProcessBricks')
AddEventHandler('qb-drugprocessing:ProcessBricks', function()
RegisterNetEvent('ps-drugprocessing:ProcessBricks')
AddEventHandler('ps-drugprocessing:ProcessBricks', function()
local coords = GetEntityCoords(PlayerPedId(source))
local amount = 4

Expand Down Expand Up @@ -127,8 +127,8 @@ AddEventHandler('qb-drugprocessing:ProcessBricks', function()
end
end)

RegisterNetEvent('qb-drugprocessing:EnterCWarehouse')
AddEventHandler('qb-drugprocessing:EnterCWarehouse', function()
RegisterNetEvent('ps-drugprocessing:EnterCWarehouse')
AddEventHandler('ps-drugprocessing:EnterCWarehouse', function()
local ped = PlayerPedId()
local pos = GetEntityCoords(ped)
local dist = #(pos - vector3(Config.CokeLab["enter"].coords.x, Config.CokeLab["enter"].coords.y, Config.CokeLab["enter"].coords.z))
Expand All @@ -146,8 +146,8 @@ AddEventHandler('qb-drugprocessing:EnterCWarehouse', function()
end
end)

RegisterNetEvent('qb-drugprocessing:ExitCWarehouse')
AddEventHandler('qb-drugprocessing:ExitCWarehouse', function()
RegisterNetEvent('ps-drugprocessing:ExitCWarehouse')
AddEventHandler('ps-drugprocessing:ExitCWarehouse', function()
local ped = PlayerPedId()
local pos = GetEntityCoords(ped)
local dist = #(pos - vector3(Config.CokeLab["exit"].coords.x, Config.CokeLab["exit"].coords.y, Config.CokeLab["exit"].coords.z))
Expand Down Expand Up @@ -198,7 +198,7 @@ function ProcessCoke()
disableMouse = false,
disableCombat = true,
}, {}, {}, {}, function()
TriggerServerEvent('qb-drugtrafficking:processCocaLeaf')
TriggerServerEvent('ps-drugtrafficking:processCocaLeaf')

local timeLeft = Config.Delays.CokeProcessing / 1000

Expand All @@ -207,7 +207,7 @@ function ProcessCoke()
timeLeft = timeLeft - 1

if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.CokeProcessing.coords, false) > 4 then
TriggerServerEvent('qb-drugtrafficking:cancelProcessing')
TriggerServerEvent('ps-drugtrafficking:cancelProcessing')
break
end
end
Expand All @@ -230,7 +230,7 @@ function CutCokePowder()
disableMouse = false,
disableCombat = true,
}, {}, {}, {}, function()
TriggerServerEvent('qb-drugtrafficking:processCocaPowder')
TriggerServerEvent('ps-drugtrafficking:processCocaPowder')

local timeLeft = Config.Delays.CokeProcessing / 1000

Expand All @@ -239,7 +239,7 @@ function CutCokePowder()
timeLeft = timeLeft - 1

if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.CokeProcessing.coords, false) > 4 then
TriggerServerEvent('qb-drugtrafficking:cancelProcessing')
TriggerServerEvent('ps-drugtrafficking:cancelProcessing')
break
end
end
Expand All @@ -263,7 +263,7 @@ function ProcessBricks()
disableMouse = false,
disableCombat = true,
}, {}, {}, {}, function()
TriggerServerEvent('qb-drugtrafficking:processCocaBrick')
TriggerServerEvent('ps-drugtrafficking:processCocaBrick')

local timeLeft = Config.Delays.CokeProcessing / 1000

Expand All @@ -272,7 +272,7 @@ function ProcessBricks()
timeLeft = timeLeft - 1

if GetDistanceBetweenCoords(GetEntityCoords(playerPed), Config.CircleZones.CokeBrick.coords, false) > 4 then
TriggerServerEvent('qb-drugtrafficking:cancelProcessing')
TriggerServerEvent('ps-drugtrafficking:cancelProcessing')
break
end
end
Expand All @@ -285,8 +285,8 @@ function ProcessBricks()
end


RegisterNetEvent('qb-drugprocessing:pickCocaLeaves')
AddEventHandler('qb-drugprocessing:pickCocaLeaves', function()
RegisterNetEvent('ps-drugprocessing:pickCocaLeaves')
AddEventHandler('ps-drugprocessing:pickCocaLeaves', function()
local playerPed = PlayerPedId()
local coords = GetEntityCoords(playerPed)
local nearbyObject, nearbyID
Expand Down Expand Up @@ -316,7 +316,7 @@ AddEventHandler('qb-drugprocessing:pickCocaLeaves', function()
table.remove(CocaPlants, nearbyID)
spawnedCocaLeaf = spawnedCocaLeaf - 1

TriggerServerEvent('qb-drugtrafficking:pickedUpCocaLeaf')
TriggerServerEvent('ps-drugtrafficking:pickedUpCocaLeaf')

end, function()
ClearPedTasks(PlayerPedId())
Expand All @@ -330,6 +330,8 @@ AddEventHandler('qb-drugprocessing:pickCocaLeaves', function()

end)

<<<<<<< Updated upstream
=======
--[[Citizen.CreateThread(function()
while true do
Citizen.Wait(0)
Expand Down Expand Up @@ -366,7 +368,7 @@ end)
table.remove(CocaPlants, nearbyID)
spawnedCocaLeaf = spawnedCocaLeaf - 1

TriggerServerEvent('qb-drugtrafficking:pickedUpCocaLeaf')
TriggerServerEvent('ps-drugtrafficking:pickedUpCocaLeaf')

end, function()
ClearPedTasks(PlayerPedId())
Expand All @@ -380,6 +382,7 @@ end)
end
end)]]--

>>>>>>> Stashed changes
AddEventHandler('onResourceStop', function(resource)
if resource == GetCurrentResourceName() then
for k, v in pairs(CocaPlants) do
Expand Down Expand Up @@ -490,4 +493,4 @@ RegisterCommand('propfix', function()
DeleteEntity(v)
end
end
end)
end)
Loading