Skip to content

Commit

Permalink
chore(client): rename
Browse files Browse the repository at this point in the history
  • Loading branch information
DemiAutomatic committed Mar 2, 2024
1 parent ce337bf commit e0cb527
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 29 deletions.
16 changes: 8 additions & 8 deletions bridge/esx/client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ local Groups = {}
local Loaded = false

RegisterNetEvent('esx:setPlayerData', function(key, value)
if not Loaded or GetInvokingResource() ~= 'es_extended' then return end
if not Loaded or GetInvokingResource() ~= 'es_extended' then return end

if key ~= 'job' then return end

Groups = { [value.name] = value.grade }
TriggerEvent('demi_interact:updateGroups', Groups)
TriggerEvent('sleepless_interact:updateGroups', Groups)
end)

RegisterNetEvent('esx:playerLoaded',function(xPlayer)
RegisterNetEvent('esx:playerLoaded', function(xPlayer)
Groups = {
[xPlayer.job.name] = xPlayer.job.grade,
}
[xPlayer.job.name] = xPlayer.job.grade,
}
Loaded = true
TriggerEvent('demi_interact:updateGroups', Groups)
TriggerEvent('demi_interact:LoadDui')
TriggerEvent('sleepless_interact:updateGroups', Groups)
TriggerEvent('sleepless_interact:LoadDui')
MainLoop()
end)

RegisterNetEvent('esx:onPlayerLogout', function()
Groups = table.wipe(Groups)
end)

return Groups
return Groups
8 changes: 4 additions & 4 deletions bridge/ox/client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ local Groups = {}

RegisterNetEvent('ox:setGroup', function(name, grade)
Groups[name] = grade
TriggerEvent('demi_interact:updateGroups', Groups)
TriggerEvent('sleepless_interact:updateGroups', Groups)
end)

AddEventHandler('ox:playerLoaded', function()
Groups = Ox.GetPlayerData().groups
TriggerEvent('demi_interact:updateGroups', Groups)
TriggerEvent('demi_interact:LoadDui')
TriggerEvent('sleepless_interact:updateGroups', Groups)
TriggerEvent('sleepless_interact:LoadDui')
MainLoop()
end)

Expand All @@ -26,7 +26,7 @@ AddEventHandler('onResourceStart', function(resource)
if resource == GetCurrentResourceName() then
Wait(500)
Groups = Ox.GetPlayerData().groups
TriggerEvent('demi_interact:updateGroups', Groups)
TriggerEvent('sleepless_interact:updateGroups', Groups)
MainLoop()
end
end)
Expand Down
8 changes: 4 additions & 4 deletions bridge/qb/client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RegisterNetEvent('QBCore:Client:OnJobUpdate', function(job)
Groups[Player.job] = nil
Groups[job.name] = job.grade.level
Player.job = job.name
TriggerEvent('demi_interact:updateGroups', Groups)
TriggerEvent('sleepless_interact:updateGroups', Groups)
end)

RegisterNetEvent('QBCore:Client:OnGangUpdate', function(gang)
Expand All @@ -18,7 +18,7 @@ RegisterNetEvent('QBCore:Client:OnGangUpdate', function(gang)
Groups[Player.gang] = nil
Groups[gang.name] = gang.grade.level
Player.gang = gang.name
TriggerEvent('demi_interact:updateGroups', Groups)
TriggerEvent('sleepless_interact:updateGroups', Groups)
end)

RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
Expand All @@ -32,8 +32,8 @@ RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
job = PlayerData.job.name,
gang = PlayerData.gang.name,
}
TriggerEvent('demi_interact:updateGroups', Groups)
TriggerEvent('demi_interact:LoadDui')
TriggerEvent('sleepless_interact:updateGroups', Groups)
TriggerEvent('sleepless_interact:LoadDui')
MainLoop()
end)

Expand Down
2 changes: 1 addition & 1 deletion client/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local ClosestInteraction = nil
local ActiveInteraction

lib.addKeybind({
name = 'demi_interact',
name = 'sleepless_interact',
description = 'Interact',
defaultKey = 'E',
onPressed = function(self)
Expand Down
6 changes: 3 additions & 3 deletions imports/dui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ RegisterNetEvent('onResourceStop', function(resourceName)
end)

RegisterNetEvent('onResourceStart', function(resourceName)
dui.DuiObject = CreateDui("https://cfx-nui-demi_interact/web/build/index.html", dui.screenW, dui.screenH)
dui.DuiObject = CreateDui("https://cfx-nui-sleepless_interact/web/build/index.html", dui.screenW, dui.screenH)
CreateRuntimeTextureFromDuiHandle(dui.txd, dui.txtName, GetDuiHandle(dui.DuiObject))
end)

RegisterNetEvent('demi_interact:LoadDui', function()
dui.DuiObject = CreateDui("https://cfx-nui-demi_interact/web/build/index.html", dui.screenW, dui.screenH)
RegisterNetEvent('sleepless_interact:LoadDui', function()
dui.DuiObject = CreateDui("https://cfx-nui-sleepless_interact/web/build/index.html", dui.screenW, dui.screenH)
CreateRuntimeTextureFromDuiHandle(dui.txd, dui.txtName, GetDuiHandle(dui.DuiObject))
end)

Expand Down
6 changes: 3 additions & 3 deletions imports/sprites.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

local sprites = {}

sprites.spriteDictName = 'demi_interact_sprites'
sprites.spriteDictName = 'sleepless_interact_sprites'
local txd = CreateRuntimeTxd(sprites.spriteDictName)
sprites.sprites = {
indicator = 'indicator',
Expand All @@ -15,7 +15,7 @@ end

RegisterNetEvent('onResourceStop', function(resourceName)
if not resourceName == GetCurrentResourceName() then return end
SetStreamedTextureDictAsNoLongerNeeded('demi_interact_sprites')
SetStreamedTextureDictAsNoLongerNeeded('sleepless_interact_sprites')
end)

return sprites
return sprites
2 changes: 1 addition & 1 deletion imports/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ utils.sendReactMessage = function(action, data)
}))
end

RegisterNetEvent('demi_interact:updateGroups', function(update)
RegisterNetEvent('sleepless_interact:updateGroups', function(update)
Groups = update
end)

Expand Down
6 changes: 3 additions & 3 deletions init.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---Thanks linden https://github.com/overextended
local export = exports.demi_interact
local export = exports.sleepless_interact

local function call(self, index, ...)
local function method(...)
Expand All @@ -14,13 +14,13 @@ local function call(self, index, ...)
end

local interact = setmetatable({
name = 'demi_interact',
name = 'sleepless_interact',
}, {
__index = call,
__newindex = function(self, key, fn)
rawset(self, key, fn)

if debug.getinfo(2, 'S').short_src:find('@demi_interact/exports') then
if debug.getinfo(2, 'S').short_src:find('@sleepless_interact/exports') then
exports(key, fn)
end
end
Expand Down
2 changes: 1 addition & 1 deletion web/build/assets/index-fRUqwa_x.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/src/utils/fetchNui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export async function fetchNui<T = unknown>(

const resourceName = (window as any).GetParentResourceName
? (window as any).GetParentResourceName()
: "demi_interact";
: "sleepless_interact";

const resp = await fetch(`https://${resourceName}/${eventName}`, options);

Expand Down

0 comments on commit e0cb527

Please sign in to comment.