mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-18 06:26:01 +01:00
Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
0accdda2dd | ||
|
|
37b855d7a7 | ||
|
|
7432dd5118 | ||
|
|
59ff34c9cc | ||
|
|
b81ada265b | ||
|
|
65c9c6c586 | ||
|
|
278cbb4d34 | ||
|
|
381c19e701 | ||
|
|
fc2ebefc9e | ||
|
|
423b75e7d9 | ||
|
|
e984a437df | ||
|
|
0818dae0df | ||
|
|
771a2a3217 | ||
|
|
04b3f87b32 | ||
|
|
6c3d0ffc5e | ||
|
|
3f093ce934 | ||
|
|
9a47ec59b0 | ||
|
|
69ce8d9225 |
17
.github/workflows/notify-discord.yml
vendored
Normal file
17
.github/workflows/notify-discord.yml
vendored
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
name: Discord Commit Notifier
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- '*' # triggers on all branches
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
notify:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Discord Commits
|
||||||
|
uses: Sniddl/discord-commits@v1.6
|
||||||
|
with:
|
||||||
|
webhook: ${{ secrets.DISCORD_WEBHOOK }}
|
||||||
|
template: "avatar-with-link"
|
||||||
|
include-extras: true
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
function parseVersion(version)
|
local function parseVersion(version)
|
||||||
local parts = {}
|
local parts = {}
|
||||||
for num in version:gmatch("%d+") do
|
for num in version:gmatch("%d+") do
|
||||||
table.insert(parts, tonumber(num))
|
table.insert(parts, tonumber(num))
|
||||||
@@ -6,7 +6,7 @@ function parseVersion(version)
|
|||||||
return parts
|
return parts
|
||||||
end
|
end
|
||||||
|
|
||||||
function compareVersions(current, newest)
|
local function compareVersions(current, newest)
|
||||||
local currentParts = parseVersion(current)
|
local currentParts = parseVersion(current)
|
||||||
local newestParts = parseVersion(newest)
|
local newestParts = parseVersion(newest)
|
||||||
for i = 1, math.max(#currentParts, #newestParts) do
|
for i = 1, math.max(#currentParts, #newestParts) do
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
name "Jim_Bridge"
|
name "Jim_Bridge"
|
||||||
author "Jimathy"
|
author "Jimathy"
|
||||||
version "2.0.01"
|
version "2.0.04"
|
||||||
description "Framework Bridge By Jimathy"
|
description "Framework Bridge By Jimathy"
|
||||||
fx_version "cerulean"
|
fx_version "cerulean"
|
||||||
rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
|
rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
|
||||||
@@ -17,8 +17,3 @@ files {
|
|||||||
|
|
||||||
-- Version checker
|
-- Version checker
|
||||||
server_scripts { '_versioncheck.lua' }
|
server_scripts { '_versioncheck.lua' }
|
||||||
|
|
||||||
-- NUI Menu Loading
|
|
||||||
client_scripts { 'nui/*.lua' }
|
|
||||||
ui_page 'nui/index.html'
|
|
||||||
files { 'nui/index.html', 'nui/script.js', 'nui/style.css' }
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<title>QB Menu</title>
|
|
||||||
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
|
|
||||||
|
|
||||||
<!-- Font Awesome Icons Import -->
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="./style.css" />
|
|
||||||
<script src="./script.js" defer></script>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="container">
|
|
||||||
<div id="buttons"></div>
|
|
||||||
</div>
|
|
||||||
<!--
|
|
||||||
<div id="input-popup" class="hidden">
|
|
||||||
<div class="input-box">
|
|
||||||
<div class="input-header">Enter Info</div>
|
|
||||||
<form id="input-form">
|
|
||||||
</form>
|
|
||||||
<div class="input-actions">
|
|
||||||
<button type="submit" form="input-form" class="input-submit">Submit</button>
|
|
||||||
<button type="button" class="input-cancel">Cancel</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
-->
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
138
nui/main.lua
138
nui/main.lua
@@ -1,138 +0,0 @@
|
|||||||
Config = Config or { System = {} }
|
|
||||||
|
|
||||||
CreateThread(function()
|
|
||||||
local fileLoader = assert(load(LoadResourceFile('jim_bridge', ('starter.lua')), ('@@jim_bridge/starter.lua')))
|
|
||||||
fileLoader()
|
|
||||||
end)
|
|
||||||
|
|
||||||
local headerShown = false
|
|
||||||
local sendData = nil
|
|
||||||
local sendModifiers = nil
|
|
||||||
|
|
||||||
|
|
||||||
--Colours for progressbar
|
|
||||||
local colours = {
|
|
||||||
["dark.0"] = "#C1C2C5", ["dark.1"] = "#A6A7AB", ["dark.2"] = "#909296", ["dark.3"] = "#5C5F66", ["dark.4"] = "#373A40", ["dark.5"] = "#2C2E33", ["dark.6"] = "#25262B", ["dark.7"] = "#1A1B1E", ["dark.8"] = "#141517", ["dark.9"] = "#101113",
|
|
||||||
["gray.0"] = "#F8F9FA", ["gray.1"] = "#F1F3F5", ["gray.2"] = "#E9ECEF", ["gray.3"] = "#DEE2E6", ["gray.4"] = "#CED4DA", ["gray.5"] = "#ADB5BD", ["gray.6"] = "#868E96", ["gray.7"] = "#495057", ["gray.8"] = "#343A40", ["gray.9"] = "#212529",
|
|
||||||
["red.0"] = "#FFF5F5", ["red.1"] = "#FFE3E3", ["red.2"] = "#FFC9C9", ["red.3"] = "#FFA8A8", ["red.4"] = "#FF8787", ["red.5"] = "#FF6B6B", ["red.6"] = "#FA5252", ["red.7"] = "#F03E3E", ["red.8"] = "#E03131", ["red.9"] = "#C92A2A",
|
|
||||||
["pink.0"] = "#FFF0F6", ["pink.1"] = "#FFDEEB", ["pink.2"] = "#FCC2D7", ["pink.3"] = "#FAA2C1", ["pink.4"] = "#F783AC", ["pink.5"] = "#F06595", ["pink.6"] = "#E64980", ["pink.7"] = "#D6336C", ["pink.8"] = "#C2255C", ["pink.9"] = "#A61E4D",
|
|
||||||
["grape.0"] = "#F8F0FC", ["grape.1"] = "#F3D9FA", ["grape.2"] = "#EEBEFA", ["grape.3"] = "#E599F7", ["grape.4"] = "#DA77F2", ["grape.5"] = "#CC5DE8", ["grape.6"] = "#BE4BDB", ["grape.7"] = "#AE3EC9", ["grape.8"] = "#9C36B5", ["grape.9"] = "#862E9C",
|
|
||||||
["violet.0"] = "#F3F0FF", ["violet.1"] = "#E5DBFF", ["violet.2"] = "#D0BFFF", ["violet.3"] = "#B197FC", ["violet.4"] = "#9775FA", ["violet.5"] = "#845EF7", ["violet.6"] = "#7950F2", ["violet.7"] = "#7048E8", ["violet.8"] = "#6741D9", ["violet.9"] = "#5F3DC4",
|
|
||||||
["indigo.0"] = "#EDF2FF", ["indigo.1"] = "#DBE4FF", ["indigo.2"] = "#BAC8FF", ["indigo.3"] = "#91A7FF", ["indigo.4"] = "#748FFC", ["indigo.5"] = "#5C7CFA", ["indigo.6"] = "#4C6EF5", ["indigo.7"] = "#4263EB", ["indigo.8"] = "#3B5BDB", ["indigo.9"] = "#364FC7",
|
|
||||||
["blue.0"] = "#E7F5FF", ["blue.1"] = "#D0EBFF", ["blue.2"] = "#A5D8FF", ["blue.3"] = "#74C0FC", ["blue.4"] = "#4DABF7", ["blue.5"] = "#339AF0", ["blue.6"] = "#228BE6", ["blue.7"] = "#1C7ED6", ["blue.8"] = "#1971C2", ["blue.9"] = "#1864AB",
|
|
||||||
["cyan.0"] = "#E3FAFC", ["cyan.1"] = "#C5F6FA", ["cyan.2"] = "#99E9F2", ["cyan.3"] = "#66D9E8", ["cyan.4"] = "#3BC9DB", ["cyan.5"] = "#22B8CF", ["cyan.6"] = "#15AABF", ["cyan.7"] = "#1098AD", ["cyan.8"] = "#0C8599", ["cyan.9"] = "#0B7285",
|
|
||||||
["teal.0"] = "#E6FCF5", ["teal.1"] = "#C3FAE8", ["teal.2"] = "#96F2D7", ["teal.3"] = "#63E6BE", ["teal.4"] = "#38D9A9", ["teal.5"] = "#20C997", ["teal.6"] = "#12B886", ["teal.7"] = "#0CA678", ["teal.8"] = "#099268", ["teal.9"] = "#087F5B",
|
|
||||||
["green.0"] = "#EBFBEE", ["green.1"] = "#D3F9D8", ["green.2"] = "#B2F2BB", ["green.3"] = "#8CE99A", ["green.4"] = "#69DB7C", ["green.5"] = "#51CF66", ["green.6"] = "#40C057", ["green.7"] = "#37B24D", ["green.8"] = "#2F9E44", ["green.9"] = "#2B8A3E",
|
|
||||||
["lime.0"] = "#F4FCE3", ["lime.1"] = "#E9FAC8", ["lime.2"] = "#D8F5A2", ["lime.3"] = "#C0EB75", ["lime.4"] = "#A9E34B", ["lime.5"] = "#94D82D", ["lime.6"] = "#82C91E", ["lime.7"] = "#74B816", ["lime.8"] = "#66A80F", ["lime.9"] = "#5C940D",
|
|
||||||
["yellow.0"] = "#FFF9DB", ["yellow.1"] = "#FFF3BF", ["yellow.2"] = "#FFEC99", ["yellow.3"] = "#FFE066", ["yellow.4"] = "#FFD43B", ["yellow.5"] = "#FCC419", ["yellow.6"] = "#FAB005", ["yellow.7"] = "#F59F00", ["yellow.8"] = "#F08C00", ["yellow.9"] = "#E67700",
|
|
||||||
["orange.0"] = "#FFF4E6", ["orange.1"] = "#FFE8CC", ["orange.2"] = "#FFD8A8", ["orange.3"] = "#FFC078", ["orange.4"] = "#FFA94D", ["orange.5"] = "#FF922B", ["orange.6"] = "#FD7E14", ["orange.7"] = "#F76707",["orange.8"] = "#E8590C",["orange.9"] = "#D9480F"
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Functions
|
|
||||||
function openNuiMenu(data, modifiers)
|
|
||||||
if not data or not next(data) then return end
|
|
||||||
for _, v in pairs(data) do
|
|
||||||
v["icon"] = v["arrow"] and "fas fa-angle-right" or v["icon"] or nil
|
|
||||||
v["colorScheme"] = v["colourScheme"] and colours[v["colourScheme"]] or (v["colorScheme"] and colours[v["colorScheme"]] or colours["green.7"])
|
|
||||||
if v["onSelect"] then
|
|
||||||
v.params = { isAction = true, event = v["onSelect"] }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
SetNuiFocus(true, true)
|
|
||||||
headerShown = false
|
|
||||||
sendData = data
|
|
||||||
sendModifiers = modifiers or {}
|
|
||||||
SendNUIMessage({ action = 'OPEN_MENU', data = table.clone(data) })
|
|
||||||
end
|
|
||||||
|
|
||||||
local function closeMenu()
|
|
||||||
sendData = nil
|
|
||||||
sendModifiers = nil
|
|
||||||
headerShown = false
|
|
||||||
SetNuiFocus(false, false)
|
|
||||||
SendNUIMessage({ action = 'CLOSE_MENU' })
|
|
||||||
end
|
|
||||||
|
|
||||||
local function showHeader(data)
|
|
||||||
if not data or not next(data) then return end
|
|
||||||
headerShown = true
|
|
||||||
sendData = data
|
|
||||||
SendNUIMessage({ action = 'SHOW_HEADER', data = table.clone(data) })
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Events
|
|
||||||
|
|
||||||
RegisterNetEvent("jim_bridge:client:openMenu", function(data) openNuiMenu(data) end)
|
|
||||||
|
|
||||||
RegisterNetEvent("jim_bridge:client:closeMenu", function() closeMenu() end)
|
|
||||||
|
|
||||||
-- NUI Callbacks
|
|
||||||
|
|
||||||
RegisterNUICallback('clickedButton', function(option)
|
|
||||||
if headerShown then headerShown = false end
|
|
||||||
PlaySound(-1, "CLICK_BACK", "WEB_NAVIGATION_SOUNDS_PHONE", 0, 0, 1)
|
|
||||||
SetNuiFocus(false, false)
|
|
||||||
if sendData then
|
|
||||||
local data = sendData[tonumber(option)]
|
|
||||||
sendData = nil
|
|
||||||
if data then
|
|
||||||
if data.params and data.params.event then
|
|
||||||
if data.params.isServer then
|
|
||||||
TriggerServerEvent(data.params.event, data.params.args)
|
|
||||||
elseif data.params.isCommand then
|
|
||||||
ExecuteCommand(data.params.event)
|
|
||||||
elseif data.params.isQBCommand then
|
|
||||||
TriggerServerEvent('QBCore:CallCommand', data.params.event, data.params.args)
|
|
||||||
elseif data.params.isAction then
|
|
||||||
data.params.event(data.params.args)
|
|
||||||
else
|
|
||||||
TriggerEvent(data.params.event, data.params.args)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
|
|
||||||
RegisterNUICallback('closeMenu', function()
|
|
||||||
if sendModifiers and sendModifiers.onExit then sendModifiers.onExit() end -- when close menu is triggered (with esc or using a button to close it) trigger onExit function
|
|
||||||
headerShown = false
|
|
||||||
sendModifiers = nil
|
|
||||||
sendData = nil
|
|
||||||
SetNuiFocus(false, false)
|
|
||||||
end)
|
|
||||||
|
|
||||||
-- Command and Keymapping
|
|
||||||
RegisterCommand('playerfocus', function() if headerShown then SetNuiFocus(true, true) end end)
|
|
||||||
RegisterKeyMapping('playerFocus', 'Give Menu Focus', 'keyboard', 'LMENU')
|
|
||||||
|
|
||||||
-- Exports
|
|
||||||
exports('openMenu', function(data) openNuiMenu(data) end)
|
|
||||||
exports('closeMenu', function() closeMenu() end)
|
|
||||||
exports('showHeader', function(data) showHeader(data) end)
|
|
||||||
|
|
||||||
|
|
||||||
-- Input Dialog
|
|
||||||
-- function inputDialog(title, config)
|
|
||||||
-- local p = promise.new()
|
|
||||||
-- local cbId = math.random(111111, 999999)
|
|
||||||
--
|
|
||||||
-- RegisterNUICallback("inputResult", function(data, cb)
|
|
||||||
-- if data.cbId == cbId then
|
|
||||||
-- cb({})
|
|
||||||
-- SetNuiFocus(false, false)
|
|
||||||
-- p:resolve(data.result)
|
|
||||||
-- end
|
|
||||||
-- end)
|
|
||||||
--
|
|
||||||
-- SendNUIMessage({
|
|
||||||
-- action = "SHOW_INPUT",
|
|
||||||
-- title = title,
|
|
||||||
-- data = config,
|
|
||||||
-- cbId = cbId
|
|
||||||
-- })
|
|
||||||
--
|
|
||||||
-- SetNuiFocus(true, true)
|
|
||||||
-- return Citizen.Await(p)
|
|
||||||
-- end
|
|
||||||
--
|
|
||||||
-- exports('inputDialog', inputDialog)
|
|
||||||
342
nui/script.js
342
nui/script.js
@@ -1,342 +0,0 @@
|
|||||||
let buttonParams = [];
|
|
||||||
let menuItems = [];
|
|
||||||
|
|
||||||
const openMenu = (data = null) => {
|
|
||||||
let html = "<div id='buttons'>";
|
|
||||||
|
|
||||||
// Add search as a title-like fixed header
|
|
||||||
html += `
|
|
||||||
<div class="title search-container">
|
|
||||||
<input type="text" id="search-input" placeholder="Search..." autocomplete="off">
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
|
|
||||||
data.forEach((item, index) => {
|
|
||||||
if (!item.hidden) {
|
|
||||||
let header = item.header || item.title;
|
|
||||||
let message = item.txt || item.text || item.description;
|
|
||||||
let isMenuHeader = item.isMenuHeader;
|
|
||||||
let isDisabled = item.disabled;
|
|
||||||
let icon = item.icon;
|
|
||||||
let progress = item.progress || item.progressbar;
|
|
||||||
let colour = item.colorScheme;
|
|
||||||
html += getButtonRender(header, message, index, isMenuHeader, isDisabled, icon, progress, colour);
|
|
||||||
if (item.params) buttonParams[index] = item.params;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
html += "</div>";
|
|
||||||
|
|
||||||
$("#container").html(html);
|
|
||||||
|
|
||||||
$('.button').click(function() {
|
|
||||||
const target = $(this)
|
|
||||||
if (!target.hasClass('title') && !target.hasClass('disabled')) {
|
|
||||||
postData(target.attr('id'));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$("#search-input").on("input", function() {
|
|
||||||
const value = $(this).val().toLowerCase();
|
|
||||||
$("#buttons .button, #buttons .title").filter(function(index) {
|
|
||||||
if (index === 0) return; // Skip the search bar itself (first title)
|
|
||||||
$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const getButtonRender = (header, message = null, id, isMenuHeader, isDisabled, icon, progress, colour) => {
|
|
||||||
return `
|
|
||||||
<div class="${isMenuHeader ? "title" : "button"} ${isDisabled ? "disabled" : ""} " id="${id}">
|
|
||||||
${icon ? `
|
|
||||||
<div class="icon">
|
|
||||||
<img src=${icon} onerror="this.onerror=null; this.remove();">
|
|
||||||
<i class="${icon}" onerror="this.onerror=null; this.remove();"></i>
|
|
||||||
</div>
|
|
||||||
` : " " }
|
|
||||||
<div class="column">
|
|
||||||
<div class="header">${header ? `${header}` : " "}</div>
|
|
||||||
${message ? `<div class="text"> ${message}</div>` : ""}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
${progress ? `
|
|
||||||
<div class="progress-container">
|
|
||||||
<div class="progress-bar" style="width: ${progress}%; background-color: ${colour};"></div>
|
|
||||||
</div>`
|
|
||||||
: ""}
|
|
||||||
`;
|
|
||||||
};
|
|
||||||
|
|
||||||
const closeMenu = () => {
|
|
||||||
$("#buttons").html(" ");
|
|
||||||
buttonParams = [];
|
|
||||||
$("#search-input").hide(); // hide search bar
|
|
||||||
};
|
|
||||||
|
|
||||||
const postData = (id) => {
|
|
||||||
$.post(`https://${GetParentResourceName()}/clickedButton`, JSON.stringify(parseInt(id) + 1));
|
|
||||||
return closeMenu();
|
|
||||||
};
|
|
||||||
|
|
||||||
const cancelMenu = () => {
|
|
||||||
$.post(`https://${GetParentResourceName()}/closeMenu`);
|
|
||||||
return closeMenu();
|
|
||||||
};
|
|
||||||
|
|
||||||
const filterButtons = (query) => {
|
|
||||||
const filteredItems = menuItems.filter(item => item.header.toLowerCase().includes(query.toLowerCase()));
|
|
||||||
openMenu(filteredItems);
|
|
||||||
};
|
|
||||||
|
|
||||||
$("#search-input").on('input', function() {
|
|
||||||
filterButtons($(this).val());
|
|
||||||
});
|
|
||||||
|
|
||||||
document.onkeyup = function (event) {
|
|
||||||
const charCode = event.key;
|
|
||||||
if (charCode == "Escape") {
|
|
||||||
cancelMenu();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let inputCallbackId = null;
|
|
||||||
|
|
||||||
window.addEventListener("message", (event) => {
|
|
||||||
const data = event.data;
|
|
||||||
const buttons = data.data;
|
|
||||||
const action = data.action;
|
|
||||||
debugLog("Opening Input Popup", data.data); // Log the input config specifically
|
|
||||||
|
|
||||||
switch (action) {
|
|
||||||
case "OPEN_MENU":
|
|
||||||
case "SHOW_HEADER":
|
|
||||||
return openMenu(buttons);
|
|
||||||
case "CLOSE_MENU":
|
|
||||||
return closeMenu();
|
|
||||||
case "SHOW_INPUT":
|
|
||||||
inputCallbackId = data.cbId;
|
|
||||||
debugLog("Opening Input Popup", data.data); // Log the input config specifically
|
|
||||||
return openInputPopup(data.data);
|
|
||||||
default:
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
document.onkeyup = function (event) {
|
|
||||||
const charCode = event.key;
|
|
||||||
if (charCode == "Escape") {
|
|
||||||
cancelMenu();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const openInputPopup = (config) => {
|
|
||||||
if (!config || !Array.isArray(config)) {
|
|
||||||
console.error("Invalid input config: missing or malformed 'fields'", config);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const container = document.getElementById("input-popup");
|
|
||||||
const form = document.getElementById("input-form");
|
|
||||||
form.innerHTML = ""; // clear form
|
|
||||||
|
|
||||||
config.forEach(field => {
|
|
||||||
let input;
|
|
||||||
|
|
||||||
switch (field.type) {
|
|
||||||
case "text":
|
|
||||||
case "number":
|
|
||||||
input = document.createElement("input");
|
|
||||||
input.type = field.type;
|
|
||||||
break;
|
|
||||||
case "radio":
|
|
||||||
input = document.createElement("input");
|
|
||||||
input.type = "radio";
|
|
||||||
break;
|
|
||||||
case "select":
|
|
||||||
input = document.createElement("select");
|
|
||||||
field.options.forEach(opt => {
|
|
||||||
const option = document.createElement("option");
|
|
||||||
option.value = opt;
|
|
||||||
option.textContent = opt;
|
|
||||||
input.appendChild(option);
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case "slider":
|
|
||||||
input = document.createElement("input");
|
|
||||||
input.type = "range";
|
|
||||||
input.min = field.min;
|
|
||||||
input.max = field.max;
|
|
||||||
input.step = field.step || 1;
|
|
||||||
break;
|
|
||||||
case "color":
|
|
||||||
input = document.createElement("input");
|
|
||||||
input.type = "color";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!input) return;
|
|
||||||
|
|
||||||
input.name = field.name;
|
|
||||||
input.className = "input-field";
|
|
||||||
input.placeholder = field.label || field.placeholder || "";
|
|
||||||
if (field.required) input.required = true;
|
|
||||||
|
|
||||||
const wrapper = document.createElement("div");
|
|
||||||
wrapper.className = "input-wrapper";
|
|
||||||
if (field.type === "radio") {
|
|
||||||
if (field.label) {
|
|
||||||
const titleLabel = document.createElement("label");
|
|
||||||
titleLabel.className = "input-label";
|
|
||||||
titleLabel.textContent = field.label;
|
|
||||||
wrapper.appendChild(titleLabel);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Array.isArray(field.options)) {
|
|
||||||
field.options.forEach(opt => {
|
|
||||||
const radioWrapper = document.createElement("label");
|
|
||||||
radioWrapper.className = "radio-wrapper";
|
|
||||||
|
|
||||||
const radio = document.createElement("input");
|
|
||||||
radio.type = "radio";
|
|
||||||
radio.name = field.name;
|
|
||||||
radio.value = opt.value;
|
|
||||||
radio.className = "radio-input";
|
|
||||||
|
|
||||||
// Set default checked radio
|
|
||||||
if (field.default === opt.value) {
|
|
||||||
radio.checked = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
const label = document.createElement("span");
|
|
||||||
label.className = "radio-label";
|
|
||||||
label.textContent = opt.label || opt.value;
|
|
||||||
|
|
||||||
radioWrapper.appendChild(radio);
|
|
||||||
radioWrapper.appendChild(label);
|
|
||||||
wrapper.appendChild(radioWrapper);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
form.appendChild(wrapper);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (field.type === "color") {
|
|
||||||
if (field.label) {
|
|
||||||
const titleLabel = document.createElement("label");
|
|
||||||
titleLabel.className = "input-label";
|
|
||||||
titleLabel.textContent = field.label;
|
|
||||||
wrapper.appendChild(titleLabel);
|
|
||||||
}
|
|
||||||
const colorPreview = document.createElement("span");
|
|
||||||
colorPreview.className = "color-preview";
|
|
||||||
colorPreview.textContent = input.value;
|
|
||||||
|
|
||||||
input.addEventListener("input", () => {
|
|
||||||
const hex = input.value;
|
|
||||||
const rgb = hexToRgb(hex);
|
|
||||||
colorPreview.textContent = `${hex.toUpperCase()} (${rgb})`;
|
|
||||||
});
|
|
||||||
wrapper.classList.add("color-picker");
|
|
||||||
|
|
||||||
wrapper.appendChild(input);
|
|
||||||
wrapper.appendChild(colorPreview);
|
|
||||||
form.appendChild(wrapper);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (field.type === "slider") {
|
|
||||||
if (field.label) {
|
|
||||||
const titleLabel = document.createElement("label");
|
|
||||||
titleLabel.className = "input-label";
|
|
||||||
titleLabel.textContent = field.label;
|
|
||||||
wrapper.appendChild(titleLabel);
|
|
||||||
}
|
|
||||||
input.value = field.default || field.min;
|
|
||||||
const sliderValue = document.createElement("div");
|
|
||||||
sliderValue.className = "slider-values";
|
|
||||||
sliderValue.innerHTML = `
|
|
||||||
<span class="slider-min">${field.min}</span>
|
|
||||||
<span class="slider-current">${input.value}</span>
|
|
||||||
<span class="slider-max">${field.max}</span>
|
|
||||||
`;
|
|
||||||
|
|
||||||
input.addEventListener("input", () => {
|
|
||||||
sliderValue.querySelector(".slider-current").textContent = input.value;
|
|
||||||
});
|
|
||||||
|
|
||||||
wrapper.appendChild(sliderValue);
|
|
||||||
wrapper.appendChild(input);
|
|
||||||
form.appendChild(wrapper);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Common label
|
|
||||||
const label = document.createElement("label");
|
|
||||||
label.className = "input-label";
|
|
||||||
label.textContent = field.label || field.name || "Input";
|
|
||||||
wrapper.appendChild(label);
|
|
||||||
|
|
||||||
// Input
|
|
||||||
input.name = field.name;
|
|
||||||
input.className = "input-field";
|
|
||||||
if (field.required) input.required = true;
|
|
||||||
wrapper.appendChild(input);
|
|
||||||
|
|
||||||
form.appendChild(wrapper);
|
|
||||||
|
|
||||||
form.appendChild(wrapper);
|
|
||||||
});
|
|
||||||
|
|
||||||
form.onsubmit = function (e) {
|
|
||||||
e.preventDefault();
|
|
||||||
const data = {};
|
|
||||||
new FormData(form).forEach((val, key) => {
|
|
||||||
// checkboxes return "on" when checked
|
|
||||||
if (form[key].type === "checkbox") {
|
|
||||||
data[key] = form[key].checked;
|
|
||||||
} else if (form[key].type === "color") {
|
|
||||||
const hex = val;
|
|
||||||
const rgb = hexToRgb(hex);
|
|
||||||
data[key] = {
|
|
||||||
hex: hex.toUpperCase(),
|
|
||||||
rgb: rgb
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
data[key] = val;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
returnInputData(data);
|
|
||||||
};
|
|
||||||
|
|
||||||
document.querySelector(".input-cancel").onclick = () => {
|
|
||||||
returnInputData(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
container.classList.remove("hidden");
|
|
||||||
};
|
|
||||||
|
|
||||||
const closeInputPopup = () => {
|
|
||||||
document.getElementById("input-popup").classList.add("hidden");
|
|
||||||
};
|
|
||||||
|
|
||||||
const returnInputData = (result) => {
|
|
||||||
$.post(`https://${GetParentResourceName()}/inputResult`, JSON.stringify({
|
|
||||||
cbId: inputCallbackId,
|
|
||||||
result
|
|
||||||
}));
|
|
||||||
closeInputPopup();
|
|
||||||
};
|
|
||||||
|
|
||||||
const debugLog = (label, data) => {
|
|
||||||
//console.log(`^4[DEBUG] ${label}`);
|
|
||||||
//console.log(JSON.stringify(data, null, 2));
|
|
||||||
};
|
|
||||||
|
|
||||||
function hexToRgb(hex) {
|
|
||||||
const bigint = parseInt(hex.slice(1), 16);
|
|
||||||
const r = (bigint >> 16) & 255;
|
|
||||||
const g = (bigint >> 8) & 255;
|
|
||||||
const b = bigint & 255;
|
|
||||||
return `RGB(${r}, ${g}, ${b})`;
|
|
||||||
}
|
|
||||||
450
nui/style.css
450
nui/style.css
@@ -1,450 +0,0 @@
|
|||||||
@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@300;500&display=swap");
|
|
||||||
|
|
||||||
:root {
|
|
||||||
--font-family: "Poppins", sans-serif !important;
|
|
||||||
--width: 65%;
|
|
||||||
|
|
||||||
|
|
||||||
--text-colour: white;
|
|
||||||
--text-colour-hover: black;
|
|
||||||
--background-button: rgba(23, 23, 23, 85%);
|
|
||||||
--background-button-hover: rgba(200, 200, 200, 85%);
|
|
||||||
--background-title: rgba(23, 23, 23, 100%);
|
|
||||||
|
|
||||||
/*
|
|
||||||
--text-colour: black;
|
|
||||||
--text-colour-hover: white;
|
|
||||||
--background-button: rgba(200, 200, 200, 85%);
|
|
||||||
--background-button-hover: rgba(0, 0, 0, 85%);
|
|
||||||
--background-title: rgba(200, 200, 200);
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
font-family: var(--font-family);
|
|
||||||
font-weight: 300;
|
|
||||||
}
|
|
||||||
|
|
||||||
#container {
|
|
||||||
position: absolute;
|
|
||||||
height: auto;
|
|
||||||
top: 15%;
|
|
||||||
right: 20%;
|
|
||||||
z-index: 2;
|
|
||||||
}
|
|
||||||
.button {
|
|
||||||
cursor: pointer;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row !important;
|
|
||||||
gap: 10px;
|
|
||||||
}
|
|
||||||
.title {
|
|
||||||
cursor: default;
|
|
||||||
gap: 10px;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#buttons {
|
|
||||||
max-height: 80vh;
|
|
||||||
width: 250%;
|
|
||||||
overflow-x: none;
|
|
||||||
overflow-y: auto;
|
|
||||||
padding: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
html, body { background: transparent !important; }
|
|
||||||
|
|
||||||
#buttons::-webkit-scrollbar { display: none; }
|
|
||||||
|
|
||||||
body::-webkit-scrollbar { display: none; }
|
|
||||||
|
|
||||||
.button {
|
|
||||||
max-width: 56%;
|
|
||||||
height: 60%;
|
|
||||||
background-color: var(--background-button);
|
|
||||||
color: var(--text-colour);
|
|
||||||
margin: auto;
|
|
||||||
position: relative;
|
|
||||||
top: 10%;
|
|
||||||
overflow: hidden;
|
|
||||||
padding: 0.45rem;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
cursor: pointer;
|
|
||||||
z-index: 1;
|
|
||||||
transition-property: color;
|
|
||||||
transition-duration: 0.1s, 0.2s;
|
|
||||||
transition-timing-function: linear, ease-in;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button::before {
|
|
||||||
content: "";
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 0%;
|
|
||||||
height: 100%;
|
|
||||||
background-color: var(--background-button-hover);
|
|
||||||
z-index: 0;
|
|
||||||
transition: width 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button:hover::before {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button > * {
|
|
||||||
position: relative;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button:hover {
|
|
||||||
color: var(--text-colour-hover);
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon > img {
|
|
||||||
width: 2.2vh !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon {
|
|
||||||
font-size: 1.2vh;
|
|
||||||
transition-property: all, filter;
|
|
||||||
transition-duration: 0.1s, 0.3s;
|
|
||||||
transition-timing-function: linear, ease-in;
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
position: static;
|
|
||||||
justify-content: left;
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button:hover > .icon {
|
|
||||||
opacity: 1.0;
|
|
||||||
animation: bounce 2s linear;
|
|
||||||
filter: drop-shadow(-1px -1px 15px white);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bounce {
|
|
||||||
animation-name: bounce-4;
|
|
||||||
animation-timing-function: ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes bounce {
|
|
||||||
0% { transform: scale(1,1); }
|
|
||||||
10% { transform: scale(1.1); }
|
|
||||||
30% { transform: scale(1.5); }
|
|
||||||
50% { transform: scale(1.5); }
|
|
||||||
100% { transform: scale(1.5); }
|
|
||||||
}
|
|
||||||
|
|
||||||
.title {
|
|
||||||
font-family: var(--font-family);
|
|
||||||
width: auto;
|
|
||||||
max-width: 56%;
|
|
||||||
height: 60%;
|
|
||||||
background: var(--background-title);
|
|
||||||
color: var(--text-colour);
|
|
||||||
margin: auto;
|
|
||||||
margin-left: -0.5;
|
|
||||||
position: relative;
|
|
||||||
top: 10%;
|
|
||||||
overflow: hidden;
|
|
||||||
padding: 0.45rem;
|
|
||||||
flex-direction: column;
|
|
||||||
border-left: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.title > div.header {
|
|
||||||
font-family: var(--font-family);
|
|
||||||
text-decoration: underline !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.disabled {
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
|
|
||||||
div > .text {
|
|
||||||
font-family: var(--font-family);
|
|
||||||
flex-direction: column;
|
|
||||||
font-size: 1.0vh;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
div > .header {
|
|
||||||
font-family: var(--font-family);
|
|
||||||
width: 100%;
|
|
||||||
max-width: 100%;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
position: relative;
|
|
||||||
justify-content: left;
|
|
||||||
overflow: wrap;
|
|
||||||
font-size: 1.3vh;
|
|
||||||
font-weight: 400;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Search input */
|
|
||||||
|
|
||||||
.title.search-container {
|
|
||||||
background: var(--background-button);
|
|
||||||
color: var(--text-colour);
|
|
||||||
border-top-left-radius: 8px;
|
|
||||||
border-top-right-radius: 8px;
|
|
||||||
z-index: 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
.title.search-container input[type="text"] {
|
|
||||||
color: var(--text-colour);
|
|
||||||
font-family: var(--font-family);
|
|
||||||
font-size: 1rem;
|
|
||||||
width: auto;
|
|
||||||
max-width: 56%;
|
|
||||||
border: none;
|
|
||||||
background-color: transparent;
|
|
||||||
transition: background-color 0.2s ease, color 0.2s ease;
|
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.title.search-container input[type="text"]::placeholder {
|
|
||||||
color: var(--text-colour);
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.progress-container {
|
|
||||||
z-index: 99999;
|
|
||||||
width: auto;
|
|
||||||
max-width: 56%;
|
|
||||||
background-color: var(--background-title);
|
|
||||||
height: 0.4vh;
|
|
||||||
padding-left: 0.45rem;
|
|
||||||
padding-right: 0.45rem;
|
|
||||||
margin: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.progress-bar {
|
|
||||||
height: 90%;
|
|
||||||
max-width: auto;
|
|
||||||
transition: width 0.3s ease-in-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.hidden {
|
|
||||||
display: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#input-popup {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
height: 100vh;
|
|
||||||
width: 100vw;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
background: rgba(0, 0, 0, 0.5);
|
|
||||||
z-index: 999;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-box {
|
|
||||||
font-weight: 300;
|
|
||||||
background: var(--background-button);
|
|
||||||
color: var(--text-colour);
|
|
||||||
width: 25vw;
|
|
||||||
box-shadow: 0 0 15px var(--background-button-hover);
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-header {
|
|
||||||
font-size: 1.4rem;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
margin-top: 0.5rem;
|
|
||||||
font-weight: 500;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-actions {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-actions button {
|
|
||||||
padding: 0.5rem 1rem;
|
|
||||||
border: none;
|
|
||||||
border-radius: 6px;
|
|
||||||
margin-bottom: 0.8rem;
|
|
||||||
margin-left: 0.6rem;
|
|
||||||
margin-right: 0.6rem;
|
|
||||||
cursor: pointer;
|
|
||||||
background: var(--background-button);
|
|
||||||
color: var(--text-colour);
|
|
||||||
transition: background 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-actions button:hover {
|
|
||||||
color: var(--text-colour-hover);
|
|
||||||
background: var(--background-button-hover);
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper {
|
|
||||||
position: relative;
|
|
||||||
width: 95%;
|
|
||||||
padding: 0.1rem;
|
|
||||||
margin-left: 0.6rem;
|
|
||||||
margin-bottom: 0.8rem;
|
|
||||||
background-color: var(--background-title);
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper::before {
|
|
||||||
content: "";
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 0%;
|
|
||||||
height: 100%;
|
|
||||||
background-color: var(--background-button-hover);
|
|
||||||
z-index: 0;
|
|
||||||
transition: width 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper:focus-within::before {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper:focus-within .input-field {
|
|
||||||
color: var(--text-colour-hover) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper:focus-within .input-label {
|
|
||||||
color: var(--text-colour-hover) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox-wrapper:has(.checkbox-input:focus) .checkbox-label {
|
|
||||||
color: var(--text-colour-hover) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper:focus-within .color-preview {
|
|
||||||
color: var(--text-colour-hover) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper:has(input[type="range"]:focus) .slider-values {
|
|
||||||
color: var(--text-colour-hover) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper:focus-within .slider-current {
|
|
||||||
color: var(--text-colour-hover) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.input-field {
|
|
||||||
width: 100%;
|
|
||||||
position: relative;
|
|
||||||
z-index: 1;
|
|
||||||
border: transparent;
|
|
||||||
background: transparent;
|
|
||||||
color: var(--text-colour);
|
|
||||||
font-size: 1rem;
|
|
||||||
transition: color 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper:hover .input-field {
|
|
||||||
color: var(--text-colour-hover);
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-label {
|
|
||||||
display: block;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
font-weight: 500;
|
|
||||||
color: var(--text-colour);
|
|
||||||
margin-bottom: 0.25rem;
|
|
||||||
z-index: 1;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-wrapper {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.5rem;
|
|
||||||
padding: 0.5rem;
|
|
||||||
background: var(--background-title);
|
|
||||||
border-radius: 4px;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-input {
|
|
||||||
transform: scale(1.2);
|
|
||||||
accent-color: var(--background-button-hover);
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.radio-label {
|
|
||||||
color: var(--text-colour);
|
|
||||||
font-size: 0.95rem;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Focus styling */
|
|
||||||
.radio-wrapper:has(.radio-input:focus) .radio-label {
|
|
||||||
color: var(--text-colour-hover) !important;
|
|
||||||
}
|
|
||||||
.input-wrapper:focus-within .radio-label {
|
|
||||||
color: var(--text-colour-hover) !important;
|
|
||||||
}
|
|
||||||
.input-wrapper.color-picker {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column; /* this is key */
|
|
||||||
align-items: flex-start;
|
|
||||||
justify-content: flex-start;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-field[type="color"] {
|
|
||||||
width: 100%; /* half width */
|
|
||||||
padding: 0.2rem;
|
|
||||||
cursor: pointer;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.color-preview {
|
|
||||||
display: inline-block;
|
|
||||||
margin-left: 0.5rem;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
color: var(--text-colour);
|
|
||||||
z-index: 1;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.slider-values {
|
|
||||||
z-index: 2;
|
|
||||||
position: relative; /* <-- this is the key */
|
|
||||||
margin-left: 0.6rem;
|
|
||||||
margin-right: 0.6rem;
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
color: var(--text-colour);
|
|
||||||
margin-bottom: 0.3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.slider-current {
|
|
||||||
font-weight: bold;
|
|
||||||
color: var(--text-colour);
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-field select,
|
|
||||||
.input-field option {
|
|
||||||
background-color: var(--background-button);
|
|
||||||
color: var(--text-colour);
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-field option:hover,
|
|
||||||
.input-field option:focus {
|
|
||||||
background-color: var(--background-button-hover);
|
|
||||||
color: var(--text-colour-hover);
|
|
||||||
}
|
|
||||||
@@ -27,14 +27,15 @@ OXLibExport, QBXExport, QBExport, ESXExport, OXCoreExport =
|
|||||||
Exports.ESXExport or "",
|
Exports.ESXExport or "",
|
||||||
Exports.OXCoreExport or ""
|
Exports.OXCoreExport or ""
|
||||||
|
|
||||||
OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv =
|
OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv =
|
||||||
Exports.OXInv or "",
|
Exports.OXInv or "",
|
||||||
Exports.QBInv or "",
|
Exports.QBInv or "",
|
||||||
Exports.PSInv or "",
|
Exports.PSInv or "",
|
||||||
Exports.QSInv or "",
|
Exports.QSInv or "",
|
||||||
Exports.CoreInv or "",
|
Exports.CoreInv or "",
|
||||||
Exports.CodeMInv or "",
|
Exports.CodeMInv or "",
|
||||||
Exports.OrigenInv or ""
|
Exports.OrigenInv or "",
|
||||||
|
Exports.TgiannInv or ""
|
||||||
|
|
||||||
RSGExport, RSGInv =
|
RSGExport, RSGInv =
|
||||||
Exports.RSGExport or "",
|
Exports.RSGExport or "",
|
||||||
@@ -119,12 +120,10 @@ elseif isStarted(RSGExport) then
|
|||||||
itemResource = RSGExport
|
itemResource = RSGExport
|
||||||
Core = Core or exports[RSGExport]:GetCoreObject()
|
Core = Core or exports[RSGExport]:GetCoreObject()
|
||||||
Items = Core and Core.Shared.Items or nil
|
Items = Core and Core.Shared.Items or nil
|
||||||
if isStarted(RSGExport) and not isStarted(QBXExport) then
|
RegisterNetEvent('RSGCore:Client:UpdateObject', function()
|
||||||
RegisterNetEvent('QBCore:Client:UpdateObject', function()
|
Core = Core or exports[RSGExport]:GetCoreObject()
|
||||||
Core = Core or exports[RSGExport]:GetCoreObject()
|
Items = Core and Core.Shared.Items or nil
|
||||||
Items = Core and Core.Shared.Items or nil
|
end)
|
||||||
end)
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -189,12 +188,10 @@ elseif isStarted(ESXExport) then
|
|||||||
elseif isStarted(RSGExport) then
|
elseif isStarted(RSGExport) then
|
||||||
Core = Core or exports[RSGExport]:GetCoreObject()
|
Core = Core or exports[RSGExport]:GetCoreObject()
|
||||||
Vehicles = Core and Core.Shared.Vehicles
|
Vehicles = Core and Core.Shared.Vehicles
|
||||||
if isStarted(RSGExport) then
|
RegisterNetEvent('RSGCore:Client:UpdateObject', function()
|
||||||
RegisterNetEvent('RSGExport:Client:UpdateObject', function()
|
Core = Core or exports[RSGExport]:GetCoreObject()
|
||||||
Core = Core or exports[RSGExport]:GetCoreObject()
|
Vehicles = Core and Core.Shared.Vehicles
|
||||||
Vehicles = Core and Core.Shared.Vehicles
|
end)
|
||||||
end)
|
|
||||||
end
|
|
||||||
vehResource = RSGExport
|
vehResource = RSGExport
|
||||||
end
|
end
|
||||||
if vehResource == nil then
|
if vehResource == nil then
|
||||||
@@ -275,12 +272,10 @@ elseif isStarted(RSGExport) then
|
|||||||
jobResource = RSGExport
|
jobResource = RSGExport
|
||||||
Core = Core or exports[RSGExport]:GetCoreObject()
|
Core = Core or exports[RSGExport]:GetCoreObject()
|
||||||
Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
|
Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
|
||||||
if isStarted(RSGExport) and not isStarted(QBXExport) then
|
RegisterNetEvent('RSGCore:Client:UpdateObject', function()
|
||||||
RegisterNetEvent('QBCore:Client:UpdateObject', function()
|
Core = exports[RSGExport]:GetCoreObject()
|
||||||
Core = exports[RSGExport]:GetCoreObject()
|
Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
|
||||||
Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
|
end)
|
||||||
end)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if jobResource == nil then
|
if jobResource == nil then
|
||||||
|
|||||||
@@ -371,8 +371,10 @@ function makeItem(data)
|
|||||||
anim = anim,
|
anim = anim,
|
||||||
flag = 49,
|
flag = 49,
|
||||||
icon = data.item,
|
icon = data.item,
|
||||||
|
request = true,
|
||||||
}) then
|
}) then
|
||||||
TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata)
|
TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
|
||||||
|
currentToken = nil -- clear client cached token
|
||||||
CreateThread(function()
|
CreateThread(function()
|
||||||
if data.craft["hasCrafted"] ~= nil then
|
if data.craft["hasCrafted"] ~= nil then
|
||||||
debugPrint("hasCrafted Found, marking '"..data.item.."' as crafted for player")
|
debugPrint("hasCrafted Found, marking '"..data.item.."' as crafted for player")
|
||||||
@@ -431,8 +433,28 @@ end
|
|||||||
--- @param stashName string|table The stash name(s) to remove ingredients from.
|
--- @param stashName string|table The stash name(s) to remove ingredients from.
|
||||||
--- @param metadata table (optional) Metadata for the crafted item.
|
--- @param metadata table (optional) Metadata for the crafted item.
|
||||||
--- @usage
|
--- @usage
|
||||||
RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable, stashName, metadata)
|
RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable, stashName, metadata, token)
|
||||||
local src = source
|
local src = source
|
||||||
|
debugPrint(GetInvokingResource())
|
||||||
|
if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= "qb-core" then
|
||||||
|
debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if token == nil then
|
||||||
|
debugPrint("^1Auth^7: ^1No token recieved^7")
|
||||||
|
dupeWarn(src, item, "Auth: Player "..src.." attempted to spawn "..item.." without an auth token")
|
||||||
|
else
|
||||||
|
if token ~= validTokens[src] then
|
||||||
|
debugPrint("^1Auth^7: ^1Tokens don't match! ^7", token, validTokens[src])
|
||||||
|
dupeWarn(src, item, "Auth: "..src.." attempted to trigger server only events with an incorrect auth token")
|
||||||
|
else
|
||||||
|
debugPrint("^1Auth^7: ^2Client and Server Auth tokens match^7!", token, validTokens[src])
|
||||||
|
validTokens[src] = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
local hasItems, hasTable = hasItem(ItemMake, 1, src)
|
local hasItems, hasTable = hasItem(ItemMake, 1, src)
|
||||||
if stashName then
|
if stashName then
|
||||||
local itemRemove = {}
|
local itemRemove = {}
|
||||||
|
|||||||
@@ -120,9 +120,17 @@ function getPlayerInv(src)
|
|||||||
elseif isStarted(CodeMInv) then
|
elseif isStarted(CodeMInv) then
|
||||||
foundInv = CodeMInv
|
foundInv = CodeMInv
|
||||||
if src then
|
if src then
|
||||||
grabInv = exports[CodeMInv]:GetInventory(src)
|
grabInv = exports[CodeMInv]:GetInventory(getPlayer(src).citizenId, src)
|
||||||
else
|
else
|
||||||
grabInv = exports[CodeMInv]:GetClientPlayerInventory()
|
grabInv = exports[CodeMInv]:getUserInventory()
|
||||||
|
end
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
foundInv = TgiannInv
|
||||||
|
if src then
|
||||||
|
grabInv = exports[TgiannInv]:GetPlayerItems(src)
|
||||||
|
else
|
||||||
|
grabInv = exports[TgiannInv]:GetPlayerItems()
|
||||||
end
|
end
|
||||||
|
|
||||||
elseif isStarted(QBInv) then
|
elseif isStarted(QBInv) then
|
||||||
|
|||||||
@@ -31,15 +31,22 @@ validTokens = {}
|
|||||||
--- ```
|
--- ```
|
||||||
function createUseableItem(item, funct)
|
function createUseableItem(item, funct)
|
||||||
if isStarted(ESXExport) then
|
if isStarted(ESXExport) then
|
||||||
debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7es_extended", item)
|
debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7es_extended^7", item)
|
||||||
while not ESX do Wait(0) end
|
while not ESX do Wait(0) end
|
||||||
ESX.RegisterUsableItem(item, funct)
|
ESX.RegisterUsableItem(item, funct)
|
||||||
|
|
||||||
elseif isStarted(QBExport) and not isStarted(QBXExport) then
|
elseif isStarted(QBExport) and not isStarted(QBXExport) then
|
||||||
debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7qb-core", item)
|
debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7qb-core^7", item)
|
||||||
Core.Functions.CreateUseableItem(item, funct)
|
Core.Functions.CreateUseableItem(item, funct)
|
||||||
|
|
||||||
elseif isStarted(QBXExport) then
|
elseif isStarted(QBXExport) then
|
||||||
debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7qbx_core", item)
|
debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7qbx_core^7", item)
|
||||||
exports[QBXExport]:CreateUseableItem(item, funct)
|
exports[QBXExport]:CreateUseableItem(item, funct)
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^1rsg-core^7", item)
|
||||||
|
Core.Functions.CreateUseableItem(item, funct)
|
||||||
|
|
||||||
else
|
else
|
||||||
print("^4ERROR^7: No supported framework detected for registering usable item: ^3"..item.."^7")
|
print("^4ERROR^7: No supported framework detected for registering usable item: ^3"..item.."^7")
|
||||||
end
|
end
|
||||||
@@ -64,18 +71,28 @@ function invImg(item)
|
|||||||
if item ~= "" and Items[item] then
|
if item ~= "" and Items[item] then
|
||||||
if isStarted(OXInv) then
|
if isStarted(OXInv) then
|
||||||
imgLink = "nui://"..OXInv.."/web/images/"..(Items[item].image or "")
|
imgLink = "nui://"..OXInv.."/web/images/"..(Items[item].image or "")
|
||||||
|
|
||||||
elseif isStarted(QSInv) then
|
elseif isStarted(QSInv) then
|
||||||
imgLink = "nui://"..QSInv.."/html/images/"..(Items[item].image or "")
|
imgLink = "nui://"..QSInv.."/html/images/"..(Items[item].image or "")
|
||||||
|
|
||||||
elseif isStarted(CoreInv) then
|
elseif isStarted(CoreInv) then
|
||||||
imgLink = "nui://"..CoreInv.."/html/img/"..(Items[item].image or "")
|
imgLink = "nui://"..CoreInv.."/html/img/"..(Items[item].image or "")
|
||||||
|
|
||||||
elseif isStarted(CodeMInv) then
|
elseif isStarted(CodeMInv) then
|
||||||
imgLink = "nui://"..CodeMInv.."/html/itemimages/"..(Items[item].image or "")
|
imgLink = "nui://"..CodeMInv.."/html/itemimages/"..(Items[item].image or "")
|
||||||
|
|
||||||
elseif isStarted(OrigenInv) then
|
elseif isStarted(OrigenInv) then
|
||||||
imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")
|
imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")
|
||||||
|
|
||||||
elseif isStarted(QBInv) then
|
elseif isStarted(QBInv) then
|
||||||
imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "")
|
imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "")
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
imgLink = "nui://inventory_images/images/"..(Items[item].image or "")
|
||||||
|
|
||||||
elseif isStarted(RSGInv) then
|
elseif isStarted(RSGInv) then
|
||||||
imgLink = "nui://"..RSGInv.."/html/images/"..(Items[item].image or "")
|
imgLink = "nui://"..RSGInv.."/html/images/"..(Items[item].image or "")
|
||||||
|
|
||||||
else
|
else
|
||||||
print("^4ERROR^7: ^2No Inventory detected for invImg - Check starter.lua")
|
print("^4ERROR^7: ^2No Inventory detected for invImg - Check starter.lua")
|
||||||
end
|
end
|
||||||
@@ -219,6 +236,9 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
|
|||||||
elseif isStarted(CodeMInv) then invName = CodeMInv
|
elseif isStarted(CodeMInv) then invName = CodeMInv
|
||||||
exports[CodeMInv]:RemoveItem(src, item, remamount)
|
exports[CodeMInv]:RemoveItem(src, item, remamount)
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then invName = TgiannInv
|
||||||
|
exports[TgiannInv]:RemoveItem(src, item, remamount)
|
||||||
|
|
||||||
elseif isStarted(QBInv) then invName = QBInv
|
elseif isStarted(QBInv) then invName = QBInv
|
||||||
while remamount > 0 do
|
while remamount > 0 do
|
||||||
if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1, slot) then
|
if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1, slot) then
|
||||||
@@ -296,6 +316,9 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
|
|||||||
elseif isStarted(OrigenInv) then invName = OrigenInv
|
elseif isStarted(OrigenInv) then invName = OrigenInv
|
||||||
exports[OrigenInv]:addItem(src, item, amountToAdd, info, slot)
|
exports[OrigenInv]:addItem(src, item, amountToAdd, info, slot)
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then invName = TgiannInv
|
||||||
|
exports[TgiannInv]:AddItem(src, item, amountToAdd, slot, info)
|
||||||
|
|
||||||
elseif isStarted(QBInv) then invName = QBInv
|
elseif isStarted(QBInv) then invName = QBInv
|
||||||
if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
|
if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
|
||||||
TriggerClientEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
|
TriggerClientEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
|
||||||
@@ -349,7 +372,7 @@ end)
|
|||||||
--- ```
|
--- ```
|
||||||
function dupeWarn(src, item, amount)
|
function dupeWarn(src, item, amount)
|
||||||
local name = getPlayer(src).name
|
local name = getPlayer(src).name
|
||||||
print("^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..item.."^7' but it wasn't there")
|
print("^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..item.."^7'^2 but it wasn't there^7")
|
||||||
if not debugMode then
|
if not debugMode then
|
||||||
DropPlayer(src, name.."("..tostring(src)..") Kicked for suspected duplicating items: "..item)
|
DropPlayer(src, name.."("..tostring(src)..") Kicked for suspected duplicating items: "..item)
|
||||||
end
|
end
|
||||||
@@ -432,7 +455,7 @@ function getDurability(item)
|
|||||||
for _, v in pairs(itemcheck) do
|
for _, v in pairs(itemcheck) do
|
||||||
if v.name == item and v.slot <= lowestSlot then
|
if v.name == item and v.slot <= lowestSlot then
|
||||||
lowestSlot = v.slot
|
lowestSlot = v.slot
|
||||||
durability = v.metadata.durability
|
durability = v.info.durability
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -452,7 +475,7 @@ function getDurability(item)
|
|||||||
for _, v in pairs(itemcheck) do
|
for _, v in pairs(itemcheck) do
|
||||||
if v.name == item and v.slot <= lowestSlot then
|
if v.name == item and v.slot <= lowestSlot then
|
||||||
lowestSlot = v.slot
|
lowestSlot = v.slot
|
||||||
durability = v.metadata.durability
|
durability = v.info.durability
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -467,6 +490,16 @@ function getDurability(item)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if isStarted(TgiannInv) then
|
||||||
|
local itemcheck = exports[TgiannInv]:GetPlayerItems()
|
||||||
|
for _, v in pairs(itemcheck) do
|
||||||
|
if v.name == item and v.slot <= lowestSlot then
|
||||||
|
lowestSlot = v.slot
|
||||||
|
durability = v.metadata.durability
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- For ESX default inventory (es_extended)
|
-- For ESX default inventory (es_extended)
|
||||||
if ESX and isStarted(ESXExport) then
|
if ESX and isStarted(ESXExport) then
|
||||||
local xPlayer = ESX.GetPlayerData() or {}
|
local xPlayer = ESX.GetPlayerData() or {}
|
||||||
@@ -524,6 +557,9 @@ RegisterNetEvent(getScript()..":server:setMetaData", function(data)
|
|||||||
|
|
||||||
elseif isStarted(OrigenInv) then
|
elseif isStarted(OrigenInv) then
|
||||||
exports[OrigenInv]:setMetadata(src, data.slot, data.metadata)
|
exports[OrigenInv]:setMetadata(src, data.slot, data.metadata)
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
exports[TgiannInv]:UpdateItemMetadata(src, data.item, data.slot, data.metadata)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -633,6 +669,11 @@ function canCarry(itemTable, src)
|
|||||||
resultTable[k] = exports[OrigenInv]:canCarryItem(src, k, v)
|
resultTable[k] = exports[OrigenInv]:canCarryItem(src, k, v)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
for k, v in pairs(itemTable) do
|
||||||
|
resultTable[k] = exports[TgiannInv]:CanCarryItem(source, k, v)
|
||||||
|
end
|
||||||
|
|
||||||
elseif isStarted(QBInv) then
|
elseif isStarted(QBInv) then
|
||||||
for k, v in pairs(itemTable) do
|
for k, v in pairs(itemTable) do
|
||||||
resultTable[k] = exports[QBInv]:CanAddItem(src, k, v)
|
resultTable[k] = exports[QBInv]:CanAddItem(src, k, v)
|
||||||
|
|||||||
@@ -12,7 +12,9 @@
|
|||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
-- Global Duty Status
|
-- Global Duty Status
|
||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
onDuty = false
|
-- This attempts to sync up with the players framework onDuty variable
|
||||||
|
-- This stops the script getting confused when one is false and one is true
|
||||||
|
onDuty = not isServer() and getPlayer().onDuty or false
|
||||||
|
|
||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
-- Boss Role Detection
|
-- Boss Role Detection
|
||||||
@@ -92,9 +94,14 @@ end
|
|||||||
--- toggleDuty() -- Player receives a notification of their new duty status.
|
--- toggleDuty() -- Player receives a notification of their new duty status.
|
||||||
--- ```
|
--- ```
|
||||||
function toggleDuty()
|
function toggleDuty()
|
||||||
onDuty = not onDuty
|
|
||||||
if isStarted(QBExport) or isStarted(QBXExport) then
|
if isStarted(QBExport) or isStarted(QBXExport) then
|
||||||
TriggerServerEvent("QBCore:ToggleDuty")
|
TriggerServerEvent("QBCore:ToggleDuty")
|
||||||
|
Wait(100)
|
||||||
|
onDuty = getPlayer().onDuty
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
TriggerServerEvent("RSGCore:ToggleDuty")
|
||||||
|
Wait(100)
|
||||||
|
onDuty = getPlayer().onDuty
|
||||||
else
|
else
|
||||||
if onDuty then
|
if onDuty then
|
||||||
triggerNotify(nil, "Now on duty", "success")
|
triggerNotify(nil, "Now on duty", "success")
|
||||||
@@ -104,6 +111,15 @@ function toggleDuty()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Framework specific functions to keep duty status synced
|
||||||
|
RegisterNetEvent("QBCore:Client:OnJobUpdate", function(JobInfo) onDuty = JobInfo.onduty end)
|
||||||
|
RegisterNetEvent("QBCore:Client:SetDuty", function(duty) onDuty = duty end)
|
||||||
|
|
||||||
|
RegisterNetEvent("qbx_core:client:onJobUpdate", function(JobInfo) onDuty = JobInfo.onduty end)
|
||||||
|
|
||||||
|
RegisterNetEvent("RSGCore:Client:OnJobUpdate", function(JobInfo) onDuty = JobInfo.onduty end)
|
||||||
|
RegisterNetEvent("RSGCore:Client:SetDuty", function(duty) onDuty = duty end)
|
||||||
|
|
||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
-- Interaction Functions
|
-- Interaction Functions
|
||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
|
|||||||
@@ -23,15 +23,23 @@ function GetPlayer(source)
|
|||||||
if isStarted(QBExport) then
|
if isStarted(QBExport) then
|
||||||
debugPrint("^6Bridge^7: ^3GetPlayer^7() QBExport")
|
debugPrint("^6Bridge^7: ^3GetPlayer^7() QBExport")
|
||||||
return exports[QBExport]:GetCoreObject().Functions.GetPlayer(source)
|
return exports[QBExport]:GetCoreObject().Functions.GetPlayer(source)
|
||||||
|
|
||||||
elseif isStarted(QBXExport) then
|
elseif isStarted(QBXExport) then
|
||||||
debugPrint("^6Bridge^7: ^3GetPlayer^7() QBOXExport")
|
debugPrint("^6Bridge^7: ^3GetPlayer^7() QBOXExport")
|
||||||
return exports[QBXExport]:GetCoreObject().Functions.GetPlayer(source)
|
return exports[QBXExport]:GetCoreObject().Functions.GetPlayer(source)
|
||||||
|
|
||||||
elseif isStarted(ESXExport) then
|
elseif isStarted(ESXExport) then
|
||||||
debugPrint("^6Bridge^7: ^3GetPlayer^7() ESXExport")
|
debugPrint("^6Bridge^7: ^3GetPlayer^7() ESXExport")
|
||||||
return ESX.GetPlayerFromId(source)
|
return ESX.GetPlayerFromId(source)
|
||||||
|
|
||||||
elseif isStarted(OXCoreExport) then
|
elseif isStarted(OXCoreExport) then
|
||||||
debugPrint("^6Bridge^7: ^3GetPlayer^7() OXCoreExport")
|
debugPrint("^6Bridge^7: ^3GetPlayer^7() OXCoreExport")
|
||||||
return exports[OXCoreExport]:GetPlayer(source)
|
return exports[OXCoreExport]:GetPlayer(source)
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
debugPrint("^6Bridge^7: ^3GetPlayer^7() RSGExport")
|
||||||
|
return exports[RSGExport]:GetCoreObject().Functions.GetPlayer(source)
|
||||||
|
|
||||||
end
|
end
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
@@ -58,14 +66,21 @@ function GetMetadata(player, key)
|
|||||||
return triggerCallback(getScript()..":server:GetMetadata", key)
|
return triggerCallback(getScript()..":server:GetMetadata", key)
|
||||||
else
|
else
|
||||||
if isStarted(QBExport) or isStarted(QBXExport) then
|
if isStarted(QBExport) or isStarted(QBXExport) then
|
||||||
debugPrint("^6Bridge^7: ^3GetMetadata^7() QBExport or QBXExport", key)
|
debugPrint("^6Bridge^7: ^3GetMetadata^7() QBExport/QBXExport", key)
|
||||||
return player.PlayerData.metadata[key]
|
return player.PlayerData.metadata[key]
|
||||||
|
|
||||||
elseif isStarted(ESXExport) then
|
elseif isStarted(ESXExport) then
|
||||||
debugPrint("^6Bridge^7: ^3GetMetadata^7() ESXExport", key)
|
debugPrint("^6Bridge^7: ^3GetMetadata^7() ESXExport", key)
|
||||||
return player.getMeta(key)
|
return player.getMeta(key)
|
||||||
|
|
||||||
elseif isStarted(OXCoreExport) then
|
elseif isStarted(OXCoreExport) then
|
||||||
debugPrint("^6Bridge^7: ^3GetMetadata^7() OXCoreExport", key)
|
debugPrint("^6Bridge^7: ^3GetMetadata^7() OXCoreExport", key)
|
||||||
return player.get(key)
|
return player.get(key)
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
debugPrint("^6Bridge^7: ^3GetMetadata^7() RSGExport", key)
|
||||||
|
return player.PlayerData.metadata[key]
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return nil
|
return nil
|
||||||
@@ -112,12 +127,19 @@ function SetMetadata(player, key, value)
|
|||||||
if isStarted(QBExport) or isStarted(QBXExport) then
|
if isStarted(QBExport) or isStarted(QBXExport) then
|
||||||
debugPrint("^6Bridge^7: ^3SetMetadata^7() using QBExport/QBXExport")
|
debugPrint("^6Bridge^7: ^3SetMetadata^7() using QBExport/QBXExport")
|
||||||
player.Functions.SetMetaData(key, value)
|
player.Functions.SetMetaData(key, value)
|
||||||
|
|
||||||
elseif isStarted(ESXExport) then
|
elseif isStarted(ESXExport) then
|
||||||
debugPrint("^6Bridge^7: ^3SetMetadata^7() using ESXExport")
|
debugPrint("^6Bridge^7: ^3SetMetadata^7() using ESXExport")
|
||||||
player.setMeta(key, value)
|
player.setMeta(key, value)
|
||||||
|
|
||||||
elseif isStarted(OXCoreExport) then
|
elseif isStarted(OXCoreExport) then
|
||||||
debugPrint("^6Bridge^7: ^3SetMetadata^7() using OXCoreExport")
|
debugPrint("^6Bridge^7: ^3SetMetadata^7() using OXCoreExport")
|
||||||
player.set(key, value)
|
player.set(key, value)
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
debugPrint("^6Bridge^7: ^3SetMetadata^7() using RSGExport")
|
||||||
|
player.Functions.SetMetaData(key, value)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -78,6 +78,11 @@ function sendPhoneMail(data)
|
|||||||
TriggerServerEvent(getScript()..":jpr:SendMail", mailData)
|
TriggerServerEvent(getScript()..":jpr:SendMail", mailData)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{ name = "ef-phone",
|
||||||
|
send = function(mailData)
|
||||||
|
TriggerServerEvent('qb-phone:server:sendNewMail', mailData)
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
local activePhone = nil
|
local activePhone = nil
|
||||||
|
|||||||
@@ -111,10 +111,16 @@ end)
|
|||||||
function setThirst(src, thirst)
|
function setThirst(src, thirst)
|
||||||
if isStarted(ESXExport) then
|
if isStarted(ESXExport) then
|
||||||
TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
|
TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
|
||||||
|
|
||||||
elseif isStarted(QBExport) or isStarted(QBXExport) then
|
elseif isStarted(QBExport) or isStarted(QBXExport) then
|
||||||
local Player = Core.Functions.GetPlayer(src)
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
Player.Functions.SetMetaData('thirst', thirst)
|
Player.Functions.SetMetaData('thirst', thirst)
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
|
TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
|
Player.Functions.SetMetaData('thirst', thirst)
|
||||||
|
TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -130,10 +136,16 @@ end
|
|||||||
function setHunger(src, hunger)
|
function setHunger(src, hunger)
|
||||||
if isStarted(ESXExport) then
|
if isStarted(ESXExport) then
|
||||||
TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
|
TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
|
||||||
|
|
||||||
elseif isStarted(QBExport) or isStarted(QBXExport) then
|
elseif isStarted(QBExport) or isStarted(QBXExport) then
|
||||||
local Player = Core.Functions.GetPlayer(src)
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
Player.Functions.SetMetaData('hunger', hunger)
|
Player.Functions.SetMetaData('hunger', hunger)
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
|
TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
|
Player.Functions.SetMetaData('hunger', hunger)
|
||||||
|
TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -161,20 +173,31 @@ function chargePlayer(cost, moneyType, newsrc)
|
|||||||
if moneyType == "cash" then
|
if moneyType == "cash" then
|
||||||
if isStarted(OXInv) then fundResource = OXInv
|
if isStarted(OXInv) then fundResource = OXInv
|
||||||
exports[OXInv]:RemoveItem(src, "money", cost)
|
exports[OXInv]:RemoveItem(src, "money", cost)
|
||||||
|
|
||||||
elseif isStarted(QBExport) or isStarted(QBXExport) then
|
elseif isStarted(QBExport) or isStarted(QBXExport) then
|
||||||
fundResource = QBExport
|
fundResource = QBExport
|
||||||
Core.Functions.GetPlayer(src).Functions.RemoveMoney("cash", cost)
|
Core.Functions.GetPlayer(src).Functions.RemoveMoney("cash", cost)
|
||||||
|
|
||||||
elseif isStarted(RSGExport) then
|
elseif isStarted(RSGExport) then
|
||||||
fundResource = QBExport
|
fundResource = RSGExport
|
||||||
Core.Functions.GetPlayer(src).Functions.RemoveMoney("cash", cost)
|
Core.Functions.GetPlayer(src).Functions.RemoveMoney("cash", cost)
|
||||||
|
|
||||||
elseif isStarted(ESXExport) then
|
elseif isStarted(ESXExport) then
|
||||||
fundResource = ESXExport
|
fundResource = ESXExport
|
||||||
ESX.GetPlayerFromId(src).removeMoney(cost, "")
|
ESX.GetPlayerFromId(src).removeMoney(cost, "")
|
||||||
|
|
||||||
end
|
end
|
||||||
elseif moneyType == "bank" then
|
elseif moneyType == "bank" then
|
||||||
if isStarted(QBExport) or isStarted(QBXExport) then fundResource = QBExport
|
if isStarted(QBExport) or isStarted(QBXExport) then
|
||||||
|
fundResource = QBExport
|
||||||
Core.Functions.GetPlayer(src).Functions.RemoveMoney("bank", cost)
|
Core.Functions.GetPlayer(src).Functions.RemoveMoney("bank", cost)
|
||||||
elseif isStarted(ESXExport) then fundResource = ESXExport
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
fundResource = RSGExport
|
||||||
|
Core.Functions.GetPlayer(src).Functions.RemoveMoney("bank", cost)
|
||||||
|
|
||||||
|
elseif isStarted(ESXExport) then
|
||||||
|
fundResource = ESXExport
|
||||||
ESX.GetPlayerFromId(src).removeMoney(cost, "")
|
ESX.GetPlayerFromId(src).removeMoney(cost, "")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -212,17 +235,29 @@ function fundPlayer(fund, moneyType, newsrc)
|
|||||||
if isStarted(OXInv) then
|
if isStarted(OXInv) then
|
||||||
fundResource = OXInv
|
fundResource = OXInv
|
||||||
exports[OXInv]:AddItem(src, "money", fund)
|
exports[OXInv]:AddItem(src, "money", fund)
|
||||||
|
|
||||||
elseif isStarted(QBExport) or isStarted(QBXExport) then
|
elseif isStarted(QBExport) or isStarted(QBXExport) then
|
||||||
fundResource = QBExport
|
fundResource = QBExport
|
||||||
Core.Functions.GetPlayer(src).Functions.AddMoney("cash", fund)
|
Core.Functions.GetPlayer(src).Functions.AddMoney("cash", fund)
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
fundResource = RSGExport
|
||||||
|
Core.Functions.GetPlayer(src).Functions.AddMoney("cash", fund)
|
||||||
|
|
||||||
elseif isStarted(ESXExport) then
|
elseif isStarted(ESXExport) then
|
||||||
fundResource = ESXExport
|
fundResource = ESXExport
|
||||||
PlayESX.GetPlayerFromId(src).addMoney(fund, "")
|
ESX.GetPlayerFromId(src).addMoney(fund, "")
|
||||||
|
|
||||||
end
|
end
|
||||||
elseif moneyType == "bank" then
|
elseif moneyType == "bank" then
|
||||||
if isStarted(QBExport) or isStarted(QBXExport) then
|
if isStarted(QBExport) or isStarted(QBXExport) then
|
||||||
fundResource = QBExport
|
fundResource = QBExport
|
||||||
Core.Functions.GetPlayer(src).Functions.AddMoney("bank", fund)
|
Core.Functions.GetPlayer(src).Functions.AddMoney("bank", fund)
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
fundResource = RSGExport
|
||||||
|
Core.Functions.GetPlayer(src).Functions.AddMoney("bank", fund)
|
||||||
|
|
||||||
elseif isStarted(ESXExport) then
|
elseif isStarted(ESXExport) then
|
||||||
fundResource = ESXExport
|
fundResource = ESXExport
|
||||||
ESX.GetPlayerFromId(src).addMoney(fund, "")
|
ESX.GetPlayerFromId(src).addMoney(fund, "")
|
||||||
@@ -380,6 +415,35 @@ function hasJob(job, source, grade)
|
|||||||
if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
|
if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
if Core.Functions.GetPlayer then
|
||||||
|
local player = Core.Functions.GetPlayer(src)
|
||||||
|
if not player then print("Player not found for src: "..src) end
|
||||||
|
local jobinfo = player.PlayerData.job
|
||||||
|
if jobinfo.name == job then
|
||||||
|
hasJobFlag = true
|
||||||
|
duty = player.PlayerData.job.onduty
|
||||||
|
if grade and not (grade <= jobinfo.grade.level) then hasJobFlag = false end
|
||||||
|
end
|
||||||
|
local ganginfo = player.PlayerData.gang
|
||||||
|
if ganginfo.name == job then
|
||||||
|
hasJobFlag = true
|
||||||
|
if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
local jobinfo = exports[RSGExport]:GetPlayer(src).PlayerData.job
|
||||||
|
if jobinfo.name == job then
|
||||||
|
hasJobFlag = true
|
||||||
|
duty = exports[RSGExport]:GetPlayer(src).PlayerData.job.onduty
|
||||||
|
if grade and not (grade <= jobinfo.grade.level) then hasJobFlag = false end
|
||||||
|
end
|
||||||
|
local ganginfo = exports[RSGExport]:GetPlayer(src).PlayerData.gang
|
||||||
|
if ganginfo.name == job then
|
||||||
|
hasJobFlag = true
|
||||||
|
if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
|
||||||
|
end
|
||||||
|
end
|
||||||
else
|
else
|
||||||
print("^4ERROR^7: ^2No Core detected for hasJob ^7- ^2Check ^3starter^1.^2lua^7")
|
print("^4ERROR^7: ^2No Core detected for hasJob ^7- ^2Check ^3starter^1.^2lua^7")
|
||||||
end
|
end
|
||||||
@@ -425,6 +489,22 @@ function hasJob(job, source, grade)
|
|||||||
hasJobFlag = true
|
hasJobFlag = true
|
||||||
if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
|
if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
local info = nil
|
||||||
|
Core.Functions.GetPlayerData(function(PlayerData) info = PlayerData end)
|
||||||
|
local jobinfo = info.job
|
||||||
|
if jobinfo.name == job then
|
||||||
|
hasJobFlag = true
|
||||||
|
duty = jobinfo.onduty
|
||||||
|
if grade and not (grade <= jobinfo.grade.level) then hasJobFlag = false end
|
||||||
|
end
|
||||||
|
local ganginfo = info.gang
|
||||||
|
if ganginfo.name == job then
|
||||||
|
hasJobFlag = true
|
||||||
|
if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
|
||||||
|
end
|
||||||
|
|
||||||
else
|
else
|
||||||
print("^4ERROR^7: ^2No Core detected for hasJob() ^7- ^2Check ^3starter^1.^2lua^7")
|
print("^4ERROR^7: ^2No Core detected for hasJob() ^7- ^2Check ^3starter^1.^2lua^7")
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -148,6 +148,7 @@ end)
|
|||||||
--- })
|
--- })
|
||||||
--- ```
|
--- ```
|
||||||
function openShop(data)
|
function openShop(data)
|
||||||
|
jsonPrint(data)
|
||||||
if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
|
if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
|
||||||
|
|
||||||
if Config.General.JimShops then
|
if Config.General.JimShops then
|
||||||
@@ -156,24 +157,34 @@ function openShop(data)
|
|||||||
elseif isStarted(OXInv) then
|
elseif isStarted(OXInv) then
|
||||||
exports[OXInv]:openInventory('shop', { type = data.shop })
|
exports[OXInv]:openInventory('shop', { type = data.shop })
|
||||||
|
|
||||||
|
elseif isStarted(QSInv) then
|
||||||
|
TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
TriggerServerEvent(getScript()..':server:OpenShopTgiann', data.shop)
|
||||||
|
|
||||||
elseif isStarted(QBInv) then
|
elseif isStarted(QBInv) then
|
||||||
if QBInvNew then
|
if QBInvNew then
|
||||||
TriggerServerEvent(getScript()..':server:OpenShopNewQB', data.shop)
|
TriggerServerEvent(getScript()..':server:OpenShopNewQB', data.shop)
|
||||||
else
|
else
|
||||||
TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
|
TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
|
||||||
end
|
end
|
||||||
|
|
||||||
elseif isStarted(RSGInv) then
|
elseif isStarted(RSGInv) then
|
||||||
TriggerServerEvent(getScript()..':server:OpenShopNewRSG', data.shop)
|
TriggerServerEvent(getScript()..':server:OpenShopRSG', data.shop)
|
||||||
end
|
end
|
||||||
lookEnt(data.coords)
|
lookEnt(data.coords)
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Server event handler for opening a shop using the new QB inventory system.
|
|
||||||
RegisterNetEvent(getScript()..':server:OpenShopNewQB', function(data)
|
RegisterNetEvent(getScript()..':server:OpenShopNewQB', function(data)
|
||||||
exports[QBInv]:OpenShop(source, data)
|
exports[QBInv]:OpenShop(source, data)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
RegisterNetEvent(getScript()..':server:OpenShopNewRSG', function(data)
|
RegisterNetEvent(getScript()..':server:OpenShopTgiann', function(data)
|
||||||
|
exports[TgiannInv]:OpenShop(source, data)
|
||||||
|
end)
|
||||||
|
|
||||||
|
RegisterNetEvent(getScript()..':server:OpenShopRSG', function(data)
|
||||||
exports[RSGInv]:OpenShop(source, data)
|
exports[RSGInv]:OpenShop(source, data)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -196,6 +207,11 @@ function registerShop(name, label, items, society)
|
|||||||
inventory = items,
|
inventory = items,
|
||||||
society = society,
|
society = society,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
debugPrint("^6Bridge^7: ^2Registering ^3Tgiann ^2Store^7:", name, label)
|
||||||
|
exports[TgiannInv]:RegisterShop(name, items)
|
||||||
|
|
||||||
elseif isStarted(QBInv) and QBInvNew then
|
elseif isStarted(QBInv) and QBInvNew then
|
||||||
debugPrint("^6Bridge^7: ^2Registering ^3QB ^2Store^7:", name, label)
|
debugPrint("^6Bridge^7: ^2Registering ^3QB ^2Store^7:", name, label)
|
||||||
exports[QBInv]:CreateShop({
|
exports[QBInv]:CreateShop({
|
||||||
|
|||||||
@@ -151,6 +151,14 @@ function openStash(data)
|
|||||||
elseif isStarted(OrigenInv) then
|
elseif isStarted(OrigenInv) then
|
||||||
exports[OrigenInv]:openInventory('stash', data.stash, { label = data.label })
|
exports[OrigenInv]:openInventory('stash', data.stash, { label = data.label })
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
TriggerServerEvent(getScript()..':server:OpenStashTgiann', {
|
||||||
|
stashName = data.stash,
|
||||||
|
label = data.label,
|
||||||
|
maxweight = data.maxWeight or 600000,
|
||||||
|
slots = data.slots or 40
|
||||||
|
})
|
||||||
|
|
||||||
elseif isStarted(QBInv) then
|
elseif isStarted(QBInv) then
|
||||||
if QBInvNew then
|
if QBInvNew then
|
||||||
TriggerServerEvent(getScript()..':server:OpenStashQB', {
|
TriggerServerEvent(getScript()..':server:OpenStashQB', {
|
||||||
@@ -181,7 +189,10 @@ function openStash(data)
|
|||||||
lookEnt(data.coords)
|
lookEnt(data.coords)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Register an event for opening QB stashes.
|
RegisterNetEvent(getScript()..':server:OpenStashTgiann', function(data)
|
||||||
|
exports[TgiannInv]:OpenInventory(source, 'stash', data.stashName, data)
|
||||||
|
end)
|
||||||
|
|
||||||
RegisterNetEvent(getScript()..':server:OpenStashQB', function(data)
|
RegisterNetEvent(getScript()..':server:OpenStashQB', function(data)
|
||||||
exports[QBInv]:OpenInventory(source, data.stashName, data)
|
exports[QBInv]:OpenInventory(source, data.stashName, data)
|
||||||
end)
|
end)
|
||||||
@@ -234,6 +245,10 @@ function getStash(stashName)
|
|||||||
stashResource = OrigenInv
|
stashResource = OrigenInv
|
||||||
stashItems = exports[OrigenInv]:getInventory(stashName)
|
stashItems = exports[OrigenInv]:getInventory(stashName)
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
stashResource = TgiannInv
|
||||||
|
stashItems = exports[TgiannInv]:GetSecondaryInventoryItems("stash", stashName)
|
||||||
|
|
||||||
elseif isStarted(PSInv) then
|
elseif isStarted(PSInv) then
|
||||||
stashResource = PSInv
|
stashResource = PSInv
|
||||||
local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
|
local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
|
||||||
@@ -322,7 +337,7 @@ function stashRemoveItem(stashItems, stashName, items)
|
|||||||
stashItems[l] = nil
|
stashItems[l] = nil
|
||||||
else
|
else
|
||||||
debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
|
debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
|
||||||
exports[QSInv]:RemoveItemIntoStash(stashName, k, v, l)
|
exports[QSInv]:RemoveItemIntoStash(stashName[1], k, v, l)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -330,7 +345,7 @@ function stashRemoveItem(stashItems, stashName, items)
|
|||||||
|
|
||||||
elseif isStarted(CoreInv) then
|
elseif isStarted(CoreInv) then
|
||||||
for k, v in pairs(items) do
|
for k, v in pairs(items) do
|
||||||
exports[CoreInv]:removeItemExact(stashName, k, v)
|
exports[CoreInv]:removeItemExact(stashName[1], k, v)
|
||||||
debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..CoreInv, k, v)
|
debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..CoreInv, k, v)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -348,14 +363,22 @@ function stashRemoveItem(stashItems, stashName, items)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
exports[CodeMInv]:UpdateStash(stashName, stashItems)
|
exports[CodeMInv]:UpdateStash(stashName[1], stashItems)
|
||||||
debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3CodeM^2 stash ^7'^6"..stashName.."^7'")
|
debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3CodeM^2 stash ^7'^6"..stashName.."^7'")
|
||||||
|
|
||||||
elseif isStarted(OrigenInv) then
|
elseif isStarted(OrigenInv) then
|
||||||
for k, v in pairs(items) do
|
for k, v in pairs(items) do
|
||||||
exports[OrigenInv]:RemoveFromStash(stashName, k, v)
|
exports[OrigenInv]:RemoveFromStash(stashName[1], k, v)
|
||||||
debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OrigenInv, k, v)
|
debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OrigenInv, k, v)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
for k, v in pairs(items) do
|
||||||
|
local itemData = exports["tgiann-inventory"]:GetItemByNameFromSecondaryInventory("stash", stashName[1], k)
|
||||||
|
exports[TgiannInv]:RemoveItemFromSecondaryInventory("stash", stashName[1], k, v, itemData.slot, nil)
|
||||||
|
debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..TgiannInv, k, v)
|
||||||
|
end
|
||||||
|
|
||||||
elseif isStarted(PSInv) then
|
elseif isStarted(PSInv) then
|
||||||
for k, v in pairs(items) do
|
for k, v in pairs(items) do
|
||||||
for l in pairs(stashItems) do
|
for l in pairs(stashItems) do
|
||||||
@@ -408,6 +431,16 @@ function stashRemoveItem(stashItems, stashName, items)
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
elseif isStarted(RSGInv) then
|
||||||
|
for k, v in pairs(items) do
|
||||||
|
exports[RSGInv]:RemoveItem(stashName[1], k, v, false, 'crafting')
|
||||||
|
debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..RSGInv, k, v)
|
||||||
|
end
|
||||||
|
debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName[1].."^7'")
|
||||||
|
MySQL.Async.insert('INSERT INTO inventories (identifier, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
|
||||||
|
['stash'] = stashName[1],
|
||||||
|
['items'] = json.encode(stashItems)
|
||||||
|
})
|
||||||
else
|
else
|
||||||
print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
|
print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
|
||||||
end
|
end
|
||||||
@@ -432,7 +465,7 @@ RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem)
|
|||||||
--- local hasAll, details = stashhasItem(currentStashItems, { iron = 2, wood = 5 })
|
--- local hasAll, details = stashhasItem(currentStashItems, { iron = 2, wood = 5 })
|
||||||
--- ```
|
--- ```
|
||||||
function stashhasItem(stashItems, items, amount)
|
function stashhasItem(stashItems, items, amount)
|
||||||
local invs = { OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, QBInv, PSInv }
|
local invs = { OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv, QBInv, PSInv, RSGInv }
|
||||||
local foundInv = ""
|
local foundInv = ""
|
||||||
for _, inv in ipairs(invs) do
|
for _, inv in ipairs(invs) do
|
||||||
if isStarted(inv) then
|
if isStarted(inv) then
|
||||||
|
|||||||
@@ -108,6 +108,7 @@ function getVehicleProperties(vehicle)
|
|||||||
if isStarted(QBExport) and not isStarted(QBXExport) then
|
if isStarted(QBExport) and not isStarted(QBXExport) then
|
||||||
properties = Core.Functions.GetVehicleProperties(vehicle)
|
properties = Core.Functions.GetVehicleProperties(vehicle)
|
||||||
debugPrint("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]")
|
debugPrint("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]")
|
||||||
|
|
||||||
elseif isStarted(OXLibExport) then
|
elseif isStarted(OXLibExport) then
|
||||||
properties = lib.getVehicleProperties(vehicle)
|
properties = lib.getVehicleProperties(vehicle)
|
||||||
debugPrint("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]")
|
debugPrint("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]")
|
||||||
@@ -134,6 +135,7 @@ function setVehicleProperties(vehicle, props)
|
|||||||
if isStarted(QBExport) and not isStarted(QBXExport) then
|
if isStarted(QBExport) and not isStarted(QBXExport) then
|
||||||
Core.Functions.SetVehicleProperties(vehicle, props)
|
Core.Functions.SetVehicleProperties(vehicle, props)
|
||||||
debugPrint("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]")
|
debugPrint("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]")
|
||||||
|
|
||||||
elseif isStarted(OXLibExport) then
|
elseif isStarted(OXLibExport) then
|
||||||
lib.setVehicleProperties(vehicle, props, false)
|
lib.setVehicleProperties(vehicle, props, false)
|
||||||
debugPrint("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]")
|
debugPrint("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]")
|
||||||
|
|||||||
@@ -21,17 +21,25 @@
|
|||||||
--- })
|
--- })
|
||||||
--- ```
|
--- ```
|
||||||
function registerCommand(command, options)
|
function registerCommand(command, options)
|
||||||
|
|
||||||
if isStarted(OXLibExport) then
|
if isStarted(OXLibExport) then
|
||||||
debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7"..OXLibExport, command)
|
debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7"..OXLibExport, command)
|
||||||
lib.addCommand(command, { help = options[1], restricted = options[5] and "group."..options[5] or nil }, options[4])
|
lib.addCommand(command, { help = options[1], restricted = options[5] and "group."..options[5] or nil }, options[4])
|
||||||
|
|
||||||
elseif isStarted(QBExport) and not isStarted(QBXExport) then
|
elseif isStarted(QBExport) and not isStarted(QBXExport) then
|
||||||
debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7"..QBExport, command)
|
debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7"..QBExport, command)
|
||||||
Core.Commands.Add(command, options[1], options[2], options[3], options[4], options[5] or nil)
|
Core.Commands.Add(command, options[1], options[2], options[3], options[4], options[5] or nil)
|
||||||
|
|
||||||
|
elseif isStarted(RSGExport) then
|
||||||
|
debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7"..RSGExport, command)
|
||||||
|
Core.Commands.Add(command, options[1], options[2], options[3], options[4], options[5] or nil)
|
||||||
|
|
||||||
elseif isStarted(ESXExport) then
|
elseif isStarted(ESXExport) then
|
||||||
debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7ESX Legacy", command)
|
debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7ESX Legacy", command)
|
||||||
ESX.RegisterCommand(command, options[5] or 'admin', function(xPlayer, args, showError)
|
ESX.RegisterCommand(command, options[5] or 'admin', function(xPlayer, args, showError)
|
||||||
options[4](xPlayer.source, args, showError)
|
options[4](xPlayer.source, args, showError)
|
||||||
end, false, { help = options[1] })
|
end, false, { help = options[1] })
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -59,9 +67,10 @@ function registerStash(name, label, slots, weight, owner, coords)
|
|||||||
if isStarted(OXInv) then
|
if isStarted(OXInv) then
|
||||||
debugPrint("^6Bridge^7: ^2Registering ^3OX ^2Stash^7:", name, label, owner or nil)
|
debugPrint("^6Bridge^7: ^2Registering ^3OX ^2Stash^7:", name, label, owner or nil)
|
||||||
exports[OXInv]:RegisterStash(name, label, slots or 50, weight or 4000000, owner or nil)
|
exports[OXInv]:RegisterStash(name, label, slots or 50, weight or 4000000, owner or nil)
|
||||||
|
|
||||||
elseif isStarted(QSInv) then
|
elseif isStarted(QSInv) then
|
||||||
debugPrint("^6Bridge^7: ^2Registering ^3QS ^2Stash^7:", name, label)
|
debugPrint("^6Bridge^7: ^2Registering ^3QS ^2Stash^7:", name, label)
|
||||||
exports[QSInv]:RegisterStash(nil, name, slots or 50, weight or 4000000)
|
exports[QSInv]:RegisterStash(name, label, slots or 50, weight or 4000000)
|
||||||
|
|
||||||
--elseif isStarted(CoreInv) then
|
--elseif isStarted(CoreInv) then
|
||||||
-- debugPrint("^6Bridge^7: ^2Registering ^3CoreInv ^2Stash^7:", name, label)
|
-- debugPrint("^6Bridge^7: ^2Registering ^3CoreInv ^2Stash^7:", name, label)
|
||||||
@@ -70,6 +79,11 @@ function registerStash(name, label, slots, weight, owner, coords)
|
|||||||
elseif isStarted(OrigenInv) then
|
elseif isStarted(OrigenInv) then
|
||||||
debugPrint("^6Bridge^7: ^2Registering ^3OrigenInv ^2Stash^7:", name, label)
|
debugPrint("^6Bridge^7: ^2Registering ^3OrigenInv ^2Stash^7:", name, label)
|
||||||
exports["origen_inventory"]:registerStash(name, label, slots or 50, weight or 4000000)
|
exports["origen_inventory"]:registerStash(name, label, slots or 50, weight or 4000000)
|
||||||
|
|
||||||
|
elseif isStarted(TgiannInv) then
|
||||||
|
debugPrint("^6Bridge^7: ^2Registering ^3TgiannInv ^2Stash^7:", name, label)
|
||||||
|
exports[TgiannInv]:RegisterStash(name, label, slots or 50, weight or 4000000)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
50
starter.lua
50
starter.lua
@@ -13,6 +13,7 @@ Exports = {
|
|||||||
CoreInv = "core_inventory",
|
CoreInv = "core_inventory",
|
||||||
CodeMInv = "codem-inventory",
|
CodeMInv = "codem-inventory",
|
||||||
OrigenInv = "origen_inventory",
|
OrigenInv = "origen_inventory",
|
||||||
|
TgiannInv = "tgiann-inventory",
|
||||||
|
|
||||||
OXLibExport = "ox_lib",
|
OXLibExport = "ox_lib",
|
||||||
|
|
||||||
@@ -29,7 +30,12 @@ Exports = {
|
|||||||
-- Required variables
|
-- Required variables
|
||||||
debugMode = Config.System.Debug
|
debugMode = Config.System.Debug
|
||||||
|
|
||||||
-- Check server convars for hard set defaults
|
QBInvNew = true
|
||||||
|
|
||||||
|
InventoryWeight = 120000
|
||||||
|
|
||||||
|
-- [[ Server.Cfg Convar Check ]]--
|
||||||
|
-- Check server convars for hard set defaults, otherwise it uses per script configurations
|
||||||
if Config and Config.System then
|
if Config and Config.System then
|
||||||
if Config.System.Debug then
|
if Config.System.Debug then
|
||||||
if GetConvar("jim_DisableDebug", "false") == "true" then
|
if GetConvar("jim_DisableDebug", "false") == "true" then
|
||||||
@@ -51,28 +57,28 @@ if Config and Config.System then
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
QBInvNew = true
|
|
||||||
|
|
||||||
InventoryWeight = 120000
|
|
||||||
|
|
||||||
-- Testing loading the core files here instead of in fxmanifests
|
-- Testing loading the core files here instead of in fxmanifests
|
||||||
--for k, v in pairs({ -- This is a specific load order
|
-- Forcefully loads the files and quietly, compared to fxmanifest complaining if they don't exist
|
||||||
-- [Exports.OXLibExport] = "init.lua",
|
-- This may be better button would require more refinement maybe
|
||||||
-- [Exports.OXCoreExport] = "lib/init.lua",
|
--[[
|
||||||
-- [Exports.ESXExport] = "imports.lua",
|
for k, v in pairs({ -- This is a specific load order
|
||||||
-- [Exports.QBXExport] = "modules/playerdata.lua",
|
[Exports.OXLibExport] = "init.lua",
|
||||||
--}) do
|
[Exports.OXCoreExport] = "lib/init.lua",
|
||||||
-- if GetResourceState(k) == "started" then
|
[Exports.ESXExport] = "imports.lua",
|
||||||
-- print("^5Loading^7: '"..k.."/"..v.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
|
[Exports.QBXExport] = "modules/playerdata.lua",
|
||||||
-- local fileLoader = assert(load(LoadResourceFile(k, (v)), ('@@'..k..'/'..v)))
|
}) do
|
||||||
-- fileLoader()
|
if GetResourceState(k) == "started" then
|
||||||
-- print("^2Success^7: ^2loaded ^1Core ^2file^7: ^3"..k.."^7/^3"..(v):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
|
print("^5Loading^7: '"..k.."/"..v.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
|
||||||
-- else
|
local fileLoader = assert(load(LoadResourceFile(k, (v)), ('@@'..k..'/'..v)))
|
||||||
-- if debugMode then
|
fileLoader()
|
||||||
-- print("^3Warning^7: ^3"..k.." ^2not found^7, ^2skipping")
|
print("^2Success^7: ^2loaded ^1Core ^2file^7: ^3"..k.."^7/^3"..(v):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
|
||||||
-- end
|
else
|
||||||
-- end
|
if debugMode then
|
||||||
--end
|
print("^3Warning^7: ^3"..k.." ^2not found^7, ^2skipping")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
]]
|
||||||
|
|
||||||
-- Load files here into the invoking script
|
-- Load files here into the invoking script
|
||||||
for _, v in pairs({ -- This is a specific load order
|
for _, v in pairs({ -- This is a specific load order
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
2.0.01
|
2.0.04
|
||||||
Reference in New Issue
Block a user