diff --git a/.gitignore b/.gitignore index b859df7..3d611a4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,12 +7,9 @@ node_modules/ data/ crashdumps/ cache/ +simple-ui/ /AltV.Net.Host.runtimeconfig.json package-lock.json jsconfig.json yarn.lock -yarn.lock -yarn.lock -yarn.lock -yarn.lock diff --git a/.prettierignore b/.prettierignore index a36ea36..243d0a0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,2 @@ -html mysql2-wrapper -web package.json \ No newline at end of file diff --git a/README.MD b/README.MD index ac7cf8c..c1ac691 100644 --- a/README.MD +++ b/README.MD @@ -1,45 +1,7 @@ # uRP Framework -

Getting Started

 +The uRP Framework is now archived, and the code will remain available for research purposes, but the support for this framework has ceased. The use of this framework is no longer encouraged. -### Useful links +Instead, you can use Stuyk's Athena, available at: https://gtavathena.com/ -- .NET 5.0 SDK (https://dotnet.microsoft.com/download/dotnet/5.0) -- Node.JS (https://nodejs.org/en/) -- Uniform Server (https://www.uniformserver.com/) [This can be used to run a MySQL server in your windows machine, but you can use MySQL Community Server or XAMPP (it's all about preferences)] - -### Standalone resources (Already packed - non optional): - -- mysql2-wrapper (https://github.com/nickplayz/mysql2-wrapper) -- altV-Chat-Extended (https://github.com/Stuyk/altV-Chat-Extended) [Archived] -- altv-csharp-entity-sync-to-js-wrapper (https://github.com/Kudze/altv-csharp-entity-sync-to-js-wrapper) -- altv-os-missing-interiors (https://github.com/jovanivanovic/altv-os-missing-interiors) -- altv-os-context-menu (https://github.com/Stuyk/altv-os-context-menu) -- urp-sound, fishing job (https://github.com/Zuiron/altv_lisa_opensource) - -> If there's any doubt about this framework contact us in discord https://discord.gg/aJmSz8v9w4 - -### How to get stated: - - -0. Open a command prompt in a folder. - -1. Run this: - -git clone https://github.com/Underground-Roleplay/framework - -cd framework - -2. Install npm to the base - -npm i - -3. Install XAMPP / Uniform Server (Links given above) - -update the database with database.sql - -4. Update server.cfg - -5 . start server - -6. Click on

Getting Started

 to know more +Thanks, uRP development team. \ No newline at end of file diff --git a/database.sql b/database.sql index 062cdd5..be45c7e 100644 --- a/database.sql +++ b/database.sql @@ -1,31 +1,33 @@ --- Dumping database structure for urp -CREATE DATABASE IF NOT EXISTS `urp` /*!40100 DEFAULT CHARACTER SET utf8 */; +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET NAMES utf8 */; +/*!50503 SET NAMES utf8mb4 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +CREATE DATABASE IF NOT EXISTS `urp` /*!40100 DEFAULT CHARACTER SET utf8 */ /*!80016 DEFAULT ENCRYPTION='N' */; USE `urp`; --- Dumping structure for table urp.characters CREATE TABLE IF NOT EXISTS `characters` ( `id` int NOT NULL AUTO_INCREMENT, `ssn` varchar(50) NOT NULL, `dimension` int DEFAULT NULL, `socialID` varchar(255) NOT NULL, + `metadata` mediumtext CHARACTER SET utf8 NOT NULL, `name` varchar(255) NOT NULL, `money` text NOT NULL, `charinfo` text NOT NULL, `job` mediumtext NOT NULL, - `gang` text DEFAULT NULL, + `gang` text, `position` mediumtext NOT NULL, - `metadata` mediumtext NOT NULL, `inventory` longtext NOT NULL, `last_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`ssn`), KEY `id` (`id`), KEY `last_updated` (`last_updated`), KEY `socialID` (`socialID`) -) ENGINE=InnoDB AUTO_INCREMENT=1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- Data exporting was unselected. - --- Dumping structure for table urp.characters_customs CREATE TABLE IF NOT EXISTS `characters_customs` ( `id` int NOT NULL AUTO_INCREMENT, `ssn` varchar(255) NOT NULL, @@ -34,11 +36,65 @@ CREATE TABLE IF NOT EXISTS `characters_customs` ( `cloakroom` int NOT NULL DEFAULT '0', PRIMARY KEY (`ssn`) USING BTREE, KEY `ssn` (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `characters_homes` ( + `id` int NOT NULL AUTO_INCREMENT, + `ssn` varchar(255) NOT NULL, + `name` varchar(100) DEFAULT NULL, + `chest` longtext, + `slot` int DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `home` (`name`,`slot`) USING BTREE, + KEY `ssn` (`ssn`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `characters_vehicles` ( + `id` int NOT NULL AUTO_INCREMENT, + `ssn` varchar(255) NOT NULL, + `model` varchar(255) NOT NULL, + `position` varchar(255) NOT NULL, + `plate` varchar(50) NOT NULL, + `status` longtext NOT NULL, + `metadata` longtext NOT NULL, + `customizations` longtext NOT NULL, + `inventory` longtext, + PRIMARY KEY (`id`) USING BTREE, + KEY `ssn` (`ssn`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `chat` ( + `id` int NOT NULL AUTO_INCREMENT, + `id_player_one` varchar(50) NOT NULL, + `id_player_two` varchar(50) NOT NULL, + `contain_message` int DEFAULT '0', + `last_message` varchar(500) DEFAULT '', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `chat_message` ( + `id` int NOT NULL AUTO_INCREMENT, + `type` varchar(50) DEFAULT '', + `message` varchar(50) NOT NULL DEFAULT '0', + `ssn` varchar(50) NOT NULL, + `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `read` int DEFAULT '0', + `deleted` int DEFAULT '0', + `chave_id` int NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) USING BTREE, + KEY `FK_chat_message_chat` (`chave_id`) USING BTREE, + CONSTRAINT `FK_chat_message_chat` FOREIGN KEY (`chave_id`) REFERENCES `chat` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- Data exporting was unselected. +CREATE TABLE IF NOT EXISTS `dealership` ( + `id` int NOT NULL AUTO_INCREMENT, + `model` varchar(50) DEFAULT NULL, + `category` varchar(50) DEFAULT NULL, + `stock` int DEFAULT NULL, + `price` int DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- Dumping structure for table urp.permissions CREATE TABLE IF NOT EXISTS `permissions` ( `id` int NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, @@ -46,11 +102,33 @@ CREATE TABLE IF NOT EXISTS `permissions` ( `permission` varchar(255) NOT NULL, PRIMARY KEY (`id`), KEY `socialID` (`socialID`) -) ENGINE=InnoDB AUTO_INCREMENT=1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `phone_contact` ( + `id` int NOT NULL AUTO_INCREMENT, + `ssn` varchar(20) NOT NULL, + `contact` varchar(1000) NOT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- Data exporting was unselected. +CREATE TABLE IF NOT EXISTS `phone_recent` ( + `id` int NOT NULL AUTO_INCREMENT, + `ssn` varchar(20) NOT NULL, + `recent` varchar(4000) DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `storages` ( + `id` int NOT NULL AUTO_INCREMENT, + `ssn` varchar(50) CHARACTER SET utf8 NOT NULL, + `data` longtext CHARACTER SET utf8 NOT NULL, + `name` varchar(250) CHARACTER SET utf8 NOT NULL, + `perm` varchar(100) CHARACTER SET utf8 DEFAULT NULL, + `last_updated` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) USING BTREE, + KEY `ssn` (`ssn`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- Dumping structure for table urp.users CREATE TABLE IF NOT EXISTS `users` ( `id` int NOT NULL AUTO_INCREMENT, `identifier` char(255) NOT NULL DEFAULT '', @@ -58,103 +136,9 @@ CREATE TABLE IF NOT EXISTS `users` ( `whitelisted` int DEFAULT NULL, `socialID` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1; - --- Data exporting was unselected. - --- Dumping structure for table urp.characters_vehicles -CREATE TABLE IF NOT EXISTS `characters_vehicles` ( - `id` int NOT NULL AUTO_INCREMENT, - `ssn` varchar(255) NOT NULL NOT NULL, - `model` varchar(255) NOT NULL NOT NULL, - `position` varchar(255) NOT NULL NOT NULL, - `plate` varchar(50) NOT NULL NOT NULL, - `status` longtext NOT NULL NOT NULL, - `metadata` longtext NOT NULL NOT NULL, - `customizations` longtext NOT NULL, - `inventory` longtext NULL, - PRIMARY KEY (`id`) USING BTREE, - KEY `ssn` (`ssn`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1; - --- Dumping structure for table urp.characters_homes -CREATE TABLE IF NOT EXISTS `characters_homes`( - `id` int NOT NULL AUTO_INCREMENT, - `ssn` varchar(255) NOT NULL, - `name` VARCHAR(100), - `chest` LONGTEXT NULL , - `slot` INTEGER, - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `home` (`name`,`slot`) USING BTREE, - KEY `ssn` (`ssn`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1; - - -CREATE TABLE `chest` ( - `id` INT(10) NOT NULL AUTO_INCREMENT, - `cords` VARCHAR(50) NOT NULL DEFAULT '', - `chest` LONGTEXT NOT NULL , - PRIMARY KEY (`id`) USING BTREE -) -ENGINE=InnoDB -AUTO_INCREMENT=2 -; --- Data exporting was unselected. - -CREATE TABLE IF NOT EXISTS dealership ( - id int NOT NULL AUTO_INCREMENT, - model varchar(50) DEFAULT NULL, - category varchar(50) DEFAULT NULL, - stock int DEFAULT NULL, - price int DEFAULT NULL, - PRIMARY KEY (id) -) ENGINE=InnoDB AUTO_INCREMENT=1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `chat` ( - `id` INT(10) NOT NULL AUTO_INCREMENT, - `id_player_one` VARCHAR(50) NOT NULL, - `id_player_two` VARCHAR(50) NOT NULL, - `contain_message` INT(10) NULL DEFAULT '0', - `last_message` VARCHAR(500) NULL DEFAULT '', - PRIMARY KEY (`id`) USING BTREE -) -ENGINE=InnoDB -AUTO_INCREMENT=1 -; - -CREATE TABLE IF NOT EXISTS `chat_message` ( - `id` INT(10) NOT NULL AUTO_INCREMENT, - `type` VARCHAR(50) NULL DEFAULT '', - `message` VARCHAR(50) NOT NULL DEFAULT '0', - `ssn` VARCHAR(50) NOT NULL, - `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - `read` INT(10) NULL DEFAULT '0', - `deleted` INT(10) NULL DEFAULT '0', - `chave_id` INT(10) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) USING BTREE, - INDEX `FK_chat_message_chat` (`chave_id`) USING BTREE, - CONSTRAINT `FK_chat_message_chat` FOREIGN KEY (`chave_id`) REFERENCES `urp`.`chat` (`id`) ON UPDATE NO ACTION ON DELETE NO ACTION -) -ENGINE=InnoDB -AUTO_INCREMENT=1 -; - -CREATE TABLE IF NOT EXISTS `phone_contact` ( - `id` INT(10) NOT NULL AUTO_INCREMENT, - `ssn` VARCHAR(20) NOT NULL, - `contact` VARCHAR(1000) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) -ENGINE=InnoDB -AUTO_INCREMENT=1 -; - -CREATE TABLE IF NOT EXISTS `phone_recent` ( - `id` INT(10) NOT NULL AUTO_INCREMENT, - `ssn` VARCHAR(20) NOT NULL, - `recent` VARCHAR(4000) NULL, - PRIMARY KEY (`id`) USING BTREE -) -ENGINE=InnoDB -AUTO_INCREMENT=1 -; +/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; +/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */; diff --git a/resources/urp-inventory/client/html/img/images/10kgoldchain.png b/inv/10kgoldchain.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/10kgoldchain.png rename to inv/10kgoldchain.png diff --git a/resources/urp-inventory/client/html/img/images/acetone.png b/inv/acetone.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/acetone.png rename to inv/acetone.png diff --git a/resources/urp-inventory/client/html/img/images/advancedkit.png b/inv/advancedkit.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/advancedkit.png rename to inv/advancedkit.png diff --git a/resources/urp-inventory/client/html/img/images/advancedlockpick.png b/inv/advancedlockpick.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/advancedlockpick.png rename to inv/advancedlockpick.png diff --git a/resources/urp-inventory/client/html/img/images/aluminum.png b/inv/aluminum.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/aluminum.png rename to inv/aluminum.png diff --git a/resources/urp-inventory/client/html/img/images/aluminumoxide.png b/inv/aluminumoxide.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/aluminumoxide.png rename to inv/aluminumoxide.png diff --git a/resources/urp-inventory/client/html/img/images/antipatharia_coral.png b/inv/antipatharia_coral.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/antipatharia_coral.png rename to inv/antipatharia_coral.png diff --git a/resources/urp-inventory/client/html/img/images/armor.png b/inv/armor.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/armor.png rename to inv/armor.png diff --git a/resources/urp-inventory/client/html/img/images/bandage.png b/inv/bandage.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/bandage.png rename to inv/bandage.png diff --git a/resources/urp-inventory/client/html/img/images/beer.png b/inv/beer.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/beer.png rename to inv/beer.png diff --git a/resources/urp-inventory/client/html/img/images/binoculars.png b/inv/binoculars.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/binoculars.png rename to inv/binoculars.png diff --git a/resources/urp-inventory/client/html/img/images/casinochips.png b/inv/casinochips.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/casinochips.png rename to inv/casinochips.png diff --git a/resources/urp-inventory/client/html/img/images/certificate.png b/inv/certificate.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/certificate.png rename to inv/certificate.png diff --git a/resources/urp-inventory/client/html/img/images/cleaningkit.png b/inv/cleaningkit.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/cleaningkit.png rename to inv/cleaningkit.png diff --git a/resources/urp-inventory/client/html/img/images/cocaine_baggy.png b/inv/cocaine_baggy.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/cocaine_baggy.png rename to inv/cocaine_baggy.png diff --git a/resources/urp-inventory/client/html/img/images/cocaineleaf.png b/inv/cocaineleaf.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/cocaineleaf.png rename to inv/cocaineleaf.png diff --git a/resources/urp-inventory/client/html/img/images/coffee.png b/inv/coffee.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/coffee.png rename to inv/coffee.png diff --git a/resources/urp-inventory/client/html/img/images/coke_brick.png b/inv/coke_brick.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/coke_brick.png rename to inv/coke_brick.png diff --git a/resources/urp-inventory/client/html/img/images/coke_small_brick.png b/inv/coke_small_brick.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/coke_small_brick.png rename to inv/coke_small_brick.png diff --git a/resources/urp-inventory/client/html/img/images/cola.png b/inv/cola.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/cola.png rename to inv/cola.png diff --git a/resources/urp-inventory/client/html/img/images/copper.png b/inv/copper.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/copper.png rename to inv/copper.png diff --git a/resources/urp-inventory/client/html/img/images/crack_baggy.png b/inv/crack_baggy.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/crack_baggy.png rename to inv/crack_baggy.png diff --git a/resources/urp-inventory/client/html/img/images/cryptostick.png b/inv/cryptostick.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/cryptostick.png rename to inv/cryptostick.png diff --git a/resources/urp-inventory/client/html/img/images/dendrogyra_coral.png b/inv/dendrogyra_coral.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/dendrogyra_coral.png rename to inv/dendrogyra_coral.png diff --git a/resources/urp-inventory/client/html/img/images/diamond_ring.png b/inv/diamond_ring.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/diamond_ring.png rename to inv/diamond_ring.png diff --git a/resources/urp-inventory/client/html/img/images/diving_gear.png b/inv/diving_gear.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/diving_gear.png rename to inv/diving_gear.png diff --git a/resources/urp-inventory/client/html/img/images/drill.png b/inv/drill.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/drill.png rename to inv/drill.png diff --git a/resources/urp-inventory/client/html/img/images/driver_license.png b/inv/driver_license.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/driver_license.png rename to inv/driver_license.png diff --git a/resources/urp-inventory/client/html/img/images/electronickit.png b/inv/electronickit.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/electronickit.png rename to inv/electronickit.png diff --git a/resources/urp-inventory/client/html/img/images/ephedrine.png b/inv/ephedrine.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/ephedrine.png rename to inv/ephedrine.png diff --git a/resources/urp-inventory/client/html/img/images/evidence.png b/inv/evidence.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/evidence.png rename to inv/evidence.png diff --git a/resources/urp-inventory/client/html/img/images/firework1.png b/inv/firework1.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/firework1.png rename to inv/firework1.png diff --git a/resources/urp-inventory/client/html/img/images/firework2.png b/inv/firework2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/firework2.png rename to inv/firework2.png diff --git a/resources/urp-inventory/client/html/img/images/firework3.png b/inv/firework3.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/firework3.png rename to inv/firework3.png diff --git a/resources/urp-inventory/client/html/img/images/firework4.png b/inv/firework4.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/firework4.png rename to inv/firework4.png diff --git a/resources/urp-inventory/client/html/img/images/firstaid.png b/inv/firstaid.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/firstaid.png rename to inv/firstaid.png diff --git a/resources/urp-inventory/client/html/img/images/fish.png b/inv/fish.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/fish.png rename to inv/fish.png diff --git a/resources/urp-inventory/client/html/img/images/fishbait.png b/inv/fishbait.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/fishbait.png rename to inv/fishbait.png diff --git a/resources/urp-inventory/client/html/img/images/fishingrod.png b/inv/fishingrod.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/fishingrod.png rename to inv/fishingrod.png diff --git a/resources/urp-inventory/client/html/img/images/fitbit.png b/inv/fitbit.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/fitbit.png rename to inv/fitbit.png diff --git a/resources/urp-inventory/client/html/img/images/glass.png b/inv/glass.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/glass.png rename to inv/glass.png diff --git a/resources/urp-inventory/client/html/img/images/goldbar.png b/inv/goldbar.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/goldbar.png rename to inv/goldbar.png diff --git a/resources/urp-inventory/client/html/img/images/goldchain.png b/inv/goldchain.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/goldchain.png rename to inv/goldchain.png diff --git a/resources/urp-inventory/client/html/img/images/grape.png b/inv/grape.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/grape.png rename to inv/grape.png diff --git a/resources/urp-inventory/client/html/img/images/grapejuice.png b/inv/grapejuice.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/grapejuice.png rename to inv/grapejuice.png diff --git a/resources/urp-inventory/client/html/img/images/handcuffs.png b/inv/handcuffs.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/handcuffs.png rename to inv/handcuffs.png diff --git a/resources/urp-inventory/client/html/img/images/harness.png b/inv/harness.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/harness.png rename to inv/harness.png diff --git a/resources/urp-inventory/client/html/img/images/hydrochloricacid.png b/inv/hydrochloricacid.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/hydrochloricacid.png rename to inv/hydrochloricacid.png diff --git a/resources/urp-inventory/client/html/img/images/id_card.png b/inv/id_card.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/id_card.png rename to inv/id_card.png diff --git a/resources/urp-inventory/client/html/img/images/iphone.png b/inv/iphone.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/iphone.png rename to inv/iphone.png diff --git a/resources/urp-inventory/client/html/img/images/iron.png b/inv/iron.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/iron.png rename to inv/iron.png diff --git a/resources/urp-inventory/client/html/img/images/ironoxide.png b/inv/ironoxide.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/ironoxide.png rename to inv/ironoxide.png diff --git a/resources/urp-inventory/client/html/img/images/jerry_can.png b/inv/jerry_can.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/jerry_can.png rename to inv/jerry_can.png diff --git a/resources/urp-inventory/client/html/img/images/joint.png b/inv/joint.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/joint.png rename to inv/joint.png diff --git a/resources/urp-inventory/client/html/img/images/labkey.png b/inv/labkey.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/labkey.png rename to inv/labkey.png diff --git a/resources/urp-inventory/client/html/img/images/laptop.png b/inv/laptop.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/laptop.png rename to inv/laptop.png diff --git a/resources/urp-inventory/client/html/img/images/lawyerpass.png b/inv/lawyerpass.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/lawyerpass.png rename to inv/lawyerpass.png diff --git a/resources/urp-inventory/client/html/img/images/lighter.png b/inv/lighter.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/lighter.png rename to inv/lighter.png diff --git a/resources/urp-inventory/client/html/img/images/lockpick.png b/inv/lockpick.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/lockpick.png rename to inv/lockpick.png diff --git a/resources/urp-inventory/client/html/img/images/markedbills.png b/inv/markedbills.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/markedbills.png rename to inv/markedbills.png diff --git a/resources/urp-inventory/client/html/img/images/mastercard.png b/inv/mastercard.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/mastercard.png rename to inv/mastercard.png diff --git a/resources/urp-inventory/client/html/img/images/metalscrap.png b/inv/metalscrap.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/metalscrap.png rename to inv/metalscrap.png diff --git a/resources/urp-inventory/client/html/img/images/meth_baggy.png b/inv/meth_baggy.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/meth_baggy.png rename to inv/meth_baggy.png diff --git a/resources/urp-inventory/client/html/img/images/meth_tray.png b/inv/meth_tray.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/meth_tray.png rename to inv/meth_tray.png diff --git a/resources/urp-inventory/client/html/img/images/mg_ammo.png b/inv/mg_ammo.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/mg_ammo.png rename to inv/mg_ammo.png diff --git a/resources/urp-inventory/client/html/img/images/moneybag.png b/inv/moneybag.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/moneybag.png rename to inv/moneybag.png diff --git a/resources/urp-inventory/client/html/img/images/nitrous.png b/inv/nitrous.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/nitrous.png rename to inv/nitrous.png diff --git a/resources/urp-inventory/client/html/img/images/oxy.png b/inv/oxy.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/oxy.png rename to inv/oxy.png diff --git a/resources/urp-inventory/client/html/img/images/painkillers.png b/inv/painkillers.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/painkillers.png rename to inv/painkillers.png diff --git a/resources/urp-inventory/client/html/img/images/parachute.png b/inv/parachute.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/parachute.png rename to inv/parachute.png diff --git a/resources/urp-inventory/client/html/img/images/phone.png b/inv/phone.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/phone.png rename to inv/phone.png diff --git a/resources/urp-inventory/client/html/img/images/pinger.png b/inv/pinger.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/pinger.png rename to inv/pinger.png diff --git a/resources/urp-inventory/client/html/img/images/pistol_ammo.png b/inv/pistol_ammo.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/pistol_ammo.png rename to inv/pistol_ammo.png diff --git a/resources/urp-inventory/client/html/img/images/pistol_extendedclip.png b/inv/pistol_extendedclip.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/pistol_extendedclip.png rename to inv/pistol_extendedclip.png diff --git a/resources/urp-inventory/client/html/img/images/pistol_suppressor.png b/inv/pistol_suppressor.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/pistol_suppressor.png rename to inv/pistol_suppressor.png diff --git a/resources/urp-inventory/client/html/img/images/plastic.png b/inv/plastic.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/plastic.png rename to inv/plastic.png diff --git a/resources/urp-inventory/client/html/img/images/police_stormram.png b/inv/police_stormram.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/police_stormram.png rename to inv/police_stormram.png diff --git a/resources/urp-inventory/client/html/img/images/printerdocument.png b/inv/printerdocument.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/printerdocument.png rename to inv/printerdocument.png diff --git a/resources/urp-inventory/client/html/img/images/radio.png b/inv/radio.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/radio.png rename to inv/radio.png diff --git a/resources/urp-inventory/client/html/img/images/radioscanner.png b/inv/radioscanner.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/radioscanner.png rename to inv/radioscanner.png diff --git a/resources/urp-inventory/client/html/img/images/repairkit.png b/inv/repairkit.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/repairkit.png rename to inv/repairkit.png diff --git a/resources/urp-inventory/client/html/img/images/rifle_ammo.png b/inv/rifle_ammo.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/rifle_ammo.png rename to inv/rifle_ammo.png diff --git a/resources/urp-inventory/client/html/img/images/rifle_drummag.png b/inv/rifle_drummag.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/rifle_drummag.png rename to inv/rifle_drummag.png diff --git a/resources/urp-inventory/client/html/img/images/rolex.png b/inv/rolex.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/rolex.png rename to inv/rolex.png diff --git a/resources/urp-inventory/client/html/img/images/rolling_paper.png b/inv/rolling_paper.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/rolling_paper.png rename to inv/rolling_paper.png diff --git a/resources/urp-inventory/client/html/img/images/rubber.png b/inv/rubber.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/rubber.png rename to inv/rubber.png diff --git a/resources/urp-inventory/client/html/img/images/samsungphone.png b/inv/samsungphone.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/samsungphone.png rename to inv/samsungphone.png diff --git a/resources/urp-inventory/client/html/img/images/sandwich.png b/inv/sandwich.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/sandwich.png rename to inv/sandwich.png diff --git a/resources/urp-inventory/client/html/img/images/screwdriverset.png b/inv/screwdriverset.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/screwdriverset.png rename to inv/screwdriverset.png diff --git a/resources/urp-inventory/client/html/img/images/security_card_01.png b/inv/security_card_01.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/security_card_01.png rename to inv/security_card_01.png diff --git a/resources/urp-inventory/client/html/img/images/security_card_02.png b/inv/security_card_02.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/security_card_02.png rename to inv/security_card_02.png diff --git a/resources/urp-inventory/client/html/img/images/shotgun_ammo.png b/inv/shotgun_ammo.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/shotgun_ammo.png rename to inv/shotgun_ammo.png diff --git a/resources/urp-inventory/client/html/img/images/smg_ammo.png b/inv/smg_ammo.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/smg_ammo.png rename to inv/smg_ammo.png diff --git a/resources/urp-inventory/client/html/img/images/smg_flashlight.png b/inv/smg_flashlight.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/smg_flashlight.png rename to inv/smg_flashlight.png diff --git a/resources/urp-inventory/client/html/img/images/smg_scope.png b/inv/smg_scope.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/smg_scope.png rename to inv/smg_scope.png diff --git a/resources/urp-inventory/client/html/img/images/snikkel_candy.png b/inv/snikkel_candy.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/snikkel_candy.png rename to inv/snikkel_candy.png diff --git a/resources/urp-inventory/client/html/img/images/snowball.png b/inv/snowball.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/snowball.png rename to inv/snowball.png diff --git a/resources/urp-inventory/client/html/img/images/snspistol_part_1.png b/inv/snspistol_part_1.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/snspistol_part_1.png rename to inv/snspistol_part_1.png diff --git a/resources/urp-inventory/client/html/img/images/snspistol_part_2.png b/inv/snspistol_part_2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/snspistol_part_2.png rename to inv/snspistol_part_2.png diff --git a/resources/urp-inventory/client/html/img/images/snspistol_part_3.png b/inv/snspistol_part_3.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/snspistol_part_3.png rename to inv/snspistol_part_3.png diff --git a/resources/urp-inventory/client/html/img/images/steel.png b/inv/steel.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/steel.png rename to inv/steel.png diff --git a/resources/urp-inventory/client/html/img/images/stickynote.png b/inv/stickynote.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/stickynote.png rename to inv/stickynote.png diff --git a/resources/urp-inventory/client/html/img/images/tablet.png b/inv/tablet.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/tablet.png rename to inv/tablet.png diff --git a/resources/urp-inventory/client/html/img/images/thermite.png b/inv/thermite.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/thermite.png rename to inv/thermite.png diff --git a/resources/urp-inventory/client/html/img/images/tosti.png b/inv/tosti.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/tosti.png rename to inv/tosti.png diff --git a/resources/urp-inventory/client/html/img/images/tunerchip.png b/inv/tunerchip.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/tunerchip.png rename to inv/tunerchip.png diff --git a/resources/urp-inventory/client/html/img/images/twerks_candy.png b/inv/twerks_candy.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/twerks_candy.png rename to inv/twerks_candy.png diff --git a/resources/urp-inventory/client/html/img/images/usb_device.png b/inv/usb_device.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/usb_device.png rename to inv/usb_device.png diff --git a/resources/urp-inventory/client/html/img/images/visacard.png b/inv/visacard.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/visacard.png rename to inv/visacard.png diff --git a/resources/urp-inventory/client/html/img/images/vodka.png b/inv/vodka.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/vodka.png rename to inv/vodka.png diff --git a/resources/urp-inventory/client/html/img/images/walkstick.png b/inv/walkstick.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/walkstick.png rename to inv/walkstick.png diff --git a/resources/urp-inventory/client/html/img/images/water_bottle.png b/inv/water_bottle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/water_bottle.png rename to inv/water_bottle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_advancedrifle.png b/inv/weapon_advancedrifle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_advancedrifle.png rename to inv/weapon_advancedrifle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_appistol.png b/inv/weapon_appistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_appistol.png rename to inv/weapon_appistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_assaultrifle.png b/inv/weapon_assaultrifle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_assaultrifle.png rename to inv/weapon_assaultrifle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_assaultrifle_mk2.png b/inv/weapon_assaultrifle_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_assaultrifle_mk2.png rename to inv/weapon_assaultrifle_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_assaultshotgun.png b/inv/weapon_assaultshotgun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_assaultshotgun.png rename to inv/weapon_assaultshotgun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_assaultsmg.png b/inv/weapon_assaultsmg.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_assaultsmg.png rename to inv/weapon_assaultsmg.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_autoshotgun.png b/inv/weapon_autoshotgun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_autoshotgun.png rename to inv/weapon_autoshotgun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_ball.png b/inv/weapon_ball.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_ball.png rename to inv/weapon_ball.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_bat.png b/inv/weapon_bat.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_bat.png rename to inv/weapon_bat.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_battleaxe.png b/inv/weapon_battleaxe.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_battleaxe.png rename to inv/weapon_battleaxe.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_bottle.png b/inv/weapon_bottle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_bottle.png rename to inv/weapon_bottle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_bullpuprifle.png b/inv/weapon_bullpuprifle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_bullpuprifle.png rename to inv/weapon_bullpuprifle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_bullpuprifle_mk2.png b/inv/weapon_bullpuprifle_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_bullpuprifle_mk2.png rename to inv/weapon_bullpuprifle_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_bullpupshotgun.png b/inv/weapon_bullpupshotgun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_bullpupshotgun.png rename to inv/weapon_bullpupshotgun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_carbinerifle.png b/inv/weapon_carbinerifle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_carbinerifle.png rename to inv/weapon_carbinerifle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_carbinerifle_mk2.png b/inv/weapon_carbinerifle_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_carbinerifle_mk2.png rename to inv/weapon_carbinerifle_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_ceramicpistol.png b/inv/weapon_ceramicpistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_ceramicpistol.png rename to inv/weapon_ceramicpistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_combatmg.png b/inv/weapon_combatmg.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_combatmg.png rename to inv/weapon_combatmg.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_combatmg_mk2.png b/inv/weapon_combatmg_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_combatmg_mk2.png rename to inv/weapon_combatmg_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_combatpdw.png b/inv/weapon_combatpdw.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_combatpdw.png rename to inv/weapon_combatpdw.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_combatpistol.png b/inv/weapon_combatpistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_combatpistol.png rename to inv/weapon_combatpistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_compactlauncher.png b/inv/weapon_compactlauncher.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_compactlauncher.png rename to inv/weapon_compactlauncher.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_compactrifle.png b/inv/weapon_compactrifle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_compactrifle.png rename to inv/weapon_compactrifle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_crowbar.png b/inv/weapon_crowbar.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_crowbar.png rename to inv/weapon_crowbar.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_dagger.png b/inv/weapon_dagger.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_dagger.png rename to inv/weapon_dagger.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_dbshotgun.png b/inv/weapon_dbshotgun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_dbshotgun.png rename to inv/weapon_dbshotgun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_doubleaction.png b/inv/weapon_doubleaction.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_doubleaction.png rename to inv/weapon_doubleaction.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_fireextinguisher.png b/inv/weapon_fireextinguisher.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_fireextinguisher.png rename to inv/weapon_fireextinguisher.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_firework.png b/inv/weapon_firework.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_firework.png rename to inv/weapon_firework.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_flare.png b/inv/weapon_flare.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_flare.png rename to inv/weapon_flare.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_flaregun.png b/inv/weapon_flaregun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_flaregun.png rename to inv/weapon_flaregun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_flashlight.png b/inv/weapon_flashlight.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_flashlight.png rename to inv/weapon_flashlight.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_gas.png b/inv/weapon_gas.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_gas.png rename to inv/weapon_gas.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_golfclub.png b/inv/weapon_golfclub.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_golfclub.png rename to inv/weapon_golfclub.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_grenade.png b/inv/weapon_grenade.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_grenade.png rename to inv/weapon_grenade.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_grenadelauncher.png b/inv/weapon_grenadelauncher.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_grenadelauncher.png rename to inv/weapon_grenadelauncher.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_gusenberg.png b/inv/weapon_gusenberg.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_gusenberg.png rename to inv/weapon_gusenberg.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_hammer.png b/inv/weapon_hammer.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_hammer.png rename to inv/weapon_hammer.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_hatchet.png b/inv/weapon_hatchet.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_hatchet.png rename to inv/weapon_hatchet.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_hazardcan.png b/inv/weapon_hazardcan.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_hazardcan.png rename to inv/weapon_hazardcan.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_heavypistol.png b/inv/weapon_heavypistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_heavypistol.png rename to inv/weapon_heavypistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_heavyshotgun.png b/inv/weapon_heavyshotgun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_heavyshotgun.png rename to inv/weapon_heavyshotgun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_heavysniper.png b/inv/weapon_heavysniper.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_heavysniper.png rename to inv/weapon_heavysniper.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_heavysniper_mk2.png b/inv/weapon_heavysniper_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_heavysniper_mk2.png rename to inv/weapon_heavysniper_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_hominglauncher.png b/inv/weapon_hominglauncher.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_hominglauncher.png rename to inv/weapon_hominglauncher.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_knife.png b/inv/weapon_knife.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_knife.png rename to inv/weapon_knife.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_knuckle.png b/inv/weapon_knuckle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_knuckle.png rename to inv/weapon_knuckle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_license.png b/inv/weapon_license.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_license.png rename to inv/weapon_license.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_machete.png b/inv/weapon_machete.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_machete.png rename to inv/weapon_machete.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_machinepistol.png b/inv/weapon_machinepistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_machinepistol.png rename to inv/weapon_machinepistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_marksmanpistol.png b/inv/weapon_marksmanpistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_marksmanpistol.png rename to inv/weapon_marksmanpistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_marksmanrifle.png b/inv/weapon_marksmanrifle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_marksmanrifle.png rename to inv/weapon_marksmanrifle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_marksmanrifle_mk2.png b/inv/weapon_marksmanrifle_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_marksmanrifle_mk2.png rename to inv/weapon_marksmanrifle_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_mg.png b/inv/weapon_mg.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_mg.png rename to inv/weapon_mg.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_microsmg.png b/inv/weapon_microsmg.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_microsmg.png rename to inv/weapon_microsmg.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_minigun.png b/inv/weapon_minigun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_minigun.png rename to inv/weapon_minigun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_minismg.png b/inv/weapon_minismg.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_minismg.png rename to inv/weapon_minismg.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_molotov.png b/inv/weapon_molotov.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_molotov.png rename to inv/weapon_molotov.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_musket.png b/inv/weapon_musket.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_musket.png rename to inv/weapon_musket.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_navyrevolver.png b/inv/weapon_navyrevolver.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_navyrevolver.png rename to inv/weapon_navyrevolver.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_nightstick.png b/inv/weapon_nightstick.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_nightstick.png rename to inv/weapon_nightstick.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_petrolcan.png b/inv/weapon_petrolcan.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_petrolcan.png rename to inv/weapon_petrolcan.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_pipebomb.png b/inv/weapon_pipebomb.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_pipebomb.png rename to inv/weapon_pipebomb.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_pistol.png b/inv/weapon_pistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_pistol.png rename to inv/weapon_pistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_pistol50.png b/inv/weapon_pistol50.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_pistol50.png rename to inv/weapon_pistol50.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_pistol_mk2.png b/inv/weapon_pistol_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_pistol_mk2.png rename to inv/weapon_pistol_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_poolcue.png b/inv/weapon_poolcue.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_poolcue.png rename to inv/weapon_poolcue.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_proxmine.png b/inv/weapon_proxmine.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_proxmine.png rename to inv/weapon_proxmine.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_pumpshotgun.png b/inv/weapon_pumpshotgun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_pumpshotgun.png rename to inv/weapon_pumpshotgun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_pumpshotgun_mk2.png b/inv/weapon_pumpshotgun_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_pumpshotgun_mk2.png rename to inv/weapon_pumpshotgun_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_railgun.png b/inv/weapon_railgun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_railgun.png rename to inv/weapon_railgun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_raycarbine.png b/inv/weapon_raycarbine.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_raycarbine.png rename to inv/weapon_raycarbine.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_rayminigun.png b/inv/weapon_rayminigun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_rayminigun.png rename to inv/weapon_rayminigun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_raypistol.png b/inv/weapon_raypistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_raypistol.png rename to inv/weapon_raypistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_revolver.png b/inv/weapon_revolver.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_revolver.png rename to inv/weapon_revolver.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_revolver_mk2.png b/inv/weapon_revolver_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_revolver_mk2.png rename to inv/weapon_revolver_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_rpg.png b/inv/weapon_rpg.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_rpg.png rename to inv/weapon_rpg.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_sawnoffshotgun.png b/inv/weapon_sawnoffshotgun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_sawnoffshotgun.png rename to inv/weapon_sawnoffshotgun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_smg.png b/inv/weapon_smg.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_smg.png rename to inv/weapon_smg.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_smg_mk2.png b/inv/weapon_smg_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_smg_mk2.png rename to inv/weapon_smg_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_sniperrifle.png b/inv/weapon_sniperrifle.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_sniperrifle.png rename to inv/weapon_sniperrifle.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_snowball.png b/inv/weapon_snowball.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_snowball.png rename to inv/weapon_snowball.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_snspistol.png b/inv/weapon_snspistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_snspistol.png rename to inv/weapon_snspistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_snspistol_mk2.png b/inv/weapon_snspistol_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_snspistol_mk2.png rename to inv/weapon_snspistol_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_specialcarbine.png b/inv/weapon_specialcarbine.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_specialcarbine.png rename to inv/weapon_specialcarbine.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_specialcarbine_mk2.png b/inv/weapon_specialcarbine_mk2.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_specialcarbine_mk2.png rename to inv/weapon_specialcarbine_mk2.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_stickybomb.png b/inv/weapon_stickybomb.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_stickybomb.png rename to inv/weapon_stickybomb.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_stone_hatchet.png b/inv/weapon_stone_hatchet.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_stone_hatchet.png rename to inv/weapon_stone_hatchet.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_stungun.png b/inv/weapon_stungun.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_stungun.png rename to inv/weapon_stungun.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_switchblade.png b/inv/weapon_switchblade.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_switchblade.png rename to inv/weapon_switchblade.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_vintagepistol.png b/inv/weapon_vintagepistol.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_vintagepistol.png rename to inv/weapon_vintagepistol.png diff --git a/resources/urp-inventory/client/html/img/images/weapon_wrench.png b/inv/weapon_wrench.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapon_wrench.png rename to inv/weapon_wrench.png diff --git a/resources/urp-inventory/client/html/img/images/weapontint_army.png b/inv/weapontint_army.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapontint_army.png rename to inv/weapontint_army.png diff --git a/resources/urp-inventory/client/html/img/images/weapontint_black.png b/inv/weapontint_black.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapontint_black.png rename to inv/weapontint_black.png diff --git a/resources/urp-inventory/client/html/img/images/weapontint_gold.png b/inv/weapontint_gold.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapontint_gold.png rename to inv/weapontint_gold.png diff --git a/resources/urp-inventory/client/html/img/images/weapontint_green.png b/inv/weapontint_green.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapontint_green.png rename to inv/weapontint_green.png diff --git a/resources/urp-inventory/client/html/img/images/weapontint_lspd.png b/inv/weapontint_lspd.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapontint_lspd.png rename to inv/weapontint_lspd.png diff --git a/resources/urp-inventory/client/html/img/images/weapontint_orange.png b/inv/weapontint_orange.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapontint_orange.png rename to inv/weapontint_orange.png diff --git a/resources/urp-inventory/client/html/img/images/weapontint_pink.png b/inv/weapontint_pink.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapontint_pink.png rename to inv/weapontint_pink.png diff --git a/resources/urp-inventory/client/html/img/images/weapontint_plat.png b/inv/weapontint_plat.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weapontint_plat.png rename to inv/weapontint_plat.png diff --git a/resources/urp-inventory/client/html/img/images/weed_baggy.png b/inv/weed_baggy.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weed_baggy.png rename to inv/weed_baggy.png diff --git a/resources/urp-inventory/client/html/img/images/weed_baggy_empty.png b/inv/weed_baggy_empty.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weed_baggy_empty.png rename to inv/weed_baggy_empty.png diff --git a/resources/urp-inventory/client/html/img/images/weed_brick.png b/inv/weed_brick.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weed_brick.png rename to inv/weed_brick.png diff --git a/resources/urp-inventory/client/html/img/images/weed_nutrition.png b/inv/weed_nutrition.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weed_nutrition.png rename to inv/weed_nutrition.png diff --git a/resources/urp-inventory/client/html/img/images/weed_seed.png b/inv/weed_seed.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/weed_seed.png rename to inv/weed_seed.png diff --git a/resources/urp-inventory/client/html/img/images/whiskey.png b/inv/whiskey.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/whiskey.png rename to inv/whiskey.png diff --git a/resources/urp-inventory/client/html/img/images/wine.png b/inv/wine.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/wine.png rename to inv/wine.png diff --git a/resources/urp-inventory/client/html/img/images/xtc_baggy.png b/inv/xtc_baggy.png similarity index 100% rename from resources/urp-inventory/client/html/img/images/xtc_baggy.png rename to inv/xtc_baggy.png diff --git a/package.json b/package.json index ad020de..0bb355e 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,10 @@ "uuid": "^8.3.2" }, "devDependencies": { - "@altv/types-client": "^1.9.9", + "@altv/types-client": "^2.1.4", "@altv/types-natives": "^1.4.4", - "@altv/types-server": "^2.1.7", - "@altv/types-shared": "^1.1.2", + "@altv/types-server": "^2.3.1", + "@altv/types-shared": "^1.2.3", "@altv/types-webview": "^1.0.2", "husky": "^7.0.4", "prettier": "2.5.1" diff --git a/resources/entity-sync/AltV.Net.Async.dll b/resources/entity-sync/AltV.Net.Async.dll index ebce89f..3879214 100644 Binary files a/resources/entity-sync/AltV.Net.Async.dll and b/resources/entity-sync/AltV.Net.Async.dll differ diff --git a/resources/entity-sync/AltV.Net.CApi.dll b/resources/entity-sync/AltV.Net.CApi.dll new file mode 100644 index 0000000..3624089 Binary files /dev/null and b/resources/entity-sync/AltV.Net.CApi.dll differ diff --git a/resources/entity-sync/AltV.Net.EntitySync.ServerEvent.dll b/resources/entity-sync/AltV.Net.EntitySync.ServerEvent.dll index d5f95df..011ac13 100644 Binary files a/resources/entity-sync/AltV.Net.EntitySync.ServerEvent.dll and b/resources/entity-sync/AltV.Net.EntitySync.ServerEvent.dll differ diff --git a/resources/entity-sync/AltV.Net.EntitySync.dll b/resources/entity-sync/AltV.Net.EntitySync.dll index 55c3d2b..0887b3b 100644 Binary files a/resources/entity-sync/AltV.Net.EntitySync.dll and b/resources/entity-sync/AltV.Net.EntitySync.dll differ diff --git a/resources/entity-sync/AltV.Net.Shared.dll b/resources/entity-sync/AltV.Net.Shared.dll new file mode 100644 index 0000000..7f9b8bd Binary files /dev/null and b/resources/entity-sync/AltV.Net.Shared.dll differ diff --git a/resources/entity-sync/AltV.Net.dll b/resources/entity-sync/AltV.Net.dll index 5519e81..de7dc38 100644 Binary files a/resources/entity-sync/AltV.Net.dll and b/resources/entity-sync/AltV.Net.dll differ diff --git a/resources/entity-sync/GameEntityScript.deps.json b/resources/entity-sync/GameEntityScript.deps.json index 306420b..8c50d8f 100644 --- a/resources/entity-sync/GameEntityScript.deps.json +++ b/resources/entity-sync/GameEntityScript.deps.json @@ -1,67 +1,89 @@ { "runtimeTarget": { - "name": ".NETCoreApp,Version=v5.0", + "name": ".NETCoreApp,Version=v6.0", "signature": "" }, "compilationOptions": {}, "targets": { - ".NETCoreApp,Version=v5.0": { + ".NETCoreApp,Version=v6.0": { "GameEntityScript/1.0.0": { "dependencies": { - "AltV.Net": "9.0.20-rc61", - "AltV.Net.EntitySync": "1.13.0", - "AltV.Net.EntitySync.ServerEvent": "9.0.20-rc61" + "AltV.Net": "10.0.3", + "AltV.Net.EntitySync": "1.18.0", + "AltV.Net.EntitySync.ServerEvent": "10.0.3" }, "runtime": { "GameEntityScript.dll": {} } }, - "AltV.Net/9.0.20-rc61": { + "AltV.Net/10.0.3": { + "dependencies": { + "AltV.Net.Shared": "10.0.3" + }, + "runtime": { + "lib/net6.0/AltV.Net.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "AltV.Net.Async/10.0.3": { + "dependencies": { + "AltV.Net": "10.0.3", + "System.Threading.Channels": "6.0.0" + }, + "runtime": { + "lib/net6.0/AltV.Net.Async.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "AltV.Net.CApi/10.0.3": { "runtime": { - "lib/net5.0/AltV.Net.dll": { + "lib/net6.0/AltV.Net.CApi.dll": { "assemblyVersion": "1.0.0.0", "fileVersion": "1.0.0.0" } } }, - "AltV.Net.Async/9.0.20-rc61": { + "AltV.Net.EntitySync/1.18.0": { "dependencies": { - "AltV.Net": "9.0.20-rc61", - "System.Threading.Channels": "5.0.0" + "System.Threading.Channels": "6.0.0" }, "runtime": { - "lib/net5.0/AltV.Net.Async.dll": { + "lib/net6.0/AltV.Net.EntitySync.dll": { "assemblyVersion": "1.0.0.0", "fileVersion": "1.0.0.0" } } }, - "AltV.Net.EntitySync/1.13.0": { + "AltV.Net.EntitySync.ServerEvent/10.0.3": { "dependencies": { - "System.Threading.Channels": "5.0.0" + "AltV.Net": "10.0.3", + "AltV.Net.Async": "10.0.3", + "AltV.Net.EntitySync": "1.18.0", + "System.Threading.Channels": "6.0.0" }, "runtime": { - "lib/net5.0/AltV.Net.EntitySync.dll": { + "lib/net6.0/AltV.Net.EntitySync.ServerEvent.dll": { "assemblyVersion": "1.0.0.0", "fileVersion": "1.0.0.0" } } }, - "AltV.Net.EntitySync.ServerEvent/9.0.20-rc61": { + "AltV.Net.Shared/10.0.3": { "dependencies": { - "AltV.Net": "9.0.20-rc61", - "AltV.Net.Async": "9.0.20-rc61", - "AltV.Net.EntitySync": "1.13.0", - "System.Threading.Channels": "5.0.0" + "AltV.Net.CApi": "10.0.3" }, "runtime": { - "lib/net5.0/AltV.Net.EntitySync.ServerEvent.dll": { + "lib/net6.0/AltV.Net.Shared.dll": { "assemblyVersion": "1.0.0.0", "fileVersion": "1.0.0.0" } } }, - "System.Threading.Channels/5.0.0": {} + "System.Threading.Channels/6.0.0": {} } }, "libraries": { @@ -70,40 +92,54 @@ "serviceable": false, "sha512": "" }, - "AltV.Net/9.0.20-rc61": { + "AltV.Net/10.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-8smVvkxaOb9bXg4l1NIPuZt/iCr466Lt9b9MyYTrzL3w7BVBDNfXVOFgS+5RvzEkmcGdGi0PnVlF2T8zMGwrwQ==", + "path": "altv.net/10.0.3", + "hashPath": "altv.net.10.0.3.nupkg.sha512" + }, + "AltV.Net.Async/10.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-BEx2us5b1P0cULz5Ctmo7KRmuSbEViGjqumJUxOwaKLz7nvxRWjvj9hz6v6ni7khy1idAHebu3vG1JiRR+ToBQ==", + "path": "altv.net.async/10.0.3", + "hashPath": "altv.net.async.10.0.3.nupkg.sha512" + }, + "AltV.Net.CApi/10.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-Inaie5t8jz/957HucKdHiAOLv2lJbmgdCWJyhhlCHP3vsUeFWNkDDygj9H5Sc/NEGj3xZkVdH+tynk6d0RpFzg==", - "path": "altv.net/9.0.20-rc61", - "hashPath": "altv.net.9.0.20-rc61.nupkg.sha512" + "sha512": "sha512-T+kaocjmPF4UQm0bM3+YoyVWILOzAaSysheJkLRlrVnRL9atHWYmMooxZgD7Ih/vV8rAqUirpQ626t3S3GdcrA==", + "path": "altv.net.capi/10.0.3", + "hashPath": "altv.net.capi.10.0.3.nupkg.sha512" }, - "AltV.Net.Async/9.0.20-rc61": { + "AltV.Net.EntitySync/1.18.0": { "type": "package", "serviceable": true, - "sha512": "sha512-iGeyj9Xf8Am9mKZjUwRTy2GrrRuWVGgCRz3IePnWUi08j2fiMUvzSKmaCRFO0qt80QYFYaxB4iLcm3xJqyScCw==", - "path": "altv.net.async/9.0.20-rc61", - "hashPath": "altv.net.async.9.0.20-rc61.nupkg.sha512" + "sha512": "sha512-MQK9bitRkjq6AXEzPX4qMrfA95Iq8D8zfgAHA5y1Xk1xDymaJWrt+s5SubsueD6JCWILgHebMI8g8S1dfxRHZQ==", + "path": "altv.net.entitysync/1.18.0", + "hashPath": "altv.net.entitysync.1.18.0.nupkg.sha512" }, - "AltV.Net.EntitySync/1.13.0": { + "AltV.Net.EntitySync.ServerEvent/10.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-b0DkilzzJqXd0PTI7h9f/k5OVDKn60h95NU3z13y3Nz+pxlgS2V1lSE8MbVwqkdFr2Jl+3dZUwRAOs9Ic77Sbg==", - "path": "altv.net.entitysync/1.13.0", - "hashPath": "altv.net.entitysync.1.13.0.nupkg.sha512" + "sha512": "sha512-J7lyPeYj2Clz8GubpxA9Ul8RdG3KfptE3fkNRLc8T22Fg0EM4mDkuc8OyfR67g+GNhbtfOCbxp6yXZ36L+tJkQ==", + "path": "altv.net.entitysync.serverevent/10.0.3", + "hashPath": "altv.net.entitysync.serverevent.10.0.3.nupkg.sha512" }, - "AltV.Net.EntitySync.ServerEvent/9.0.20-rc61": { + "AltV.Net.Shared/10.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-AAcxoIKh0I5wsfTghu8wZ78ZT9D4pnr2jdtcAbV7mNwfr8PfFpelJMkbsotA3OeuUAfgp+SZzvm/RTC5AdQJxg==", - "path": "altv.net.entitysync.serverevent/9.0.20-rc61", - "hashPath": "altv.net.entitysync.serverevent.9.0.20-rc61.nupkg.sha512" + "sha512": "sha512-Po8WQcOM8IFI03VO+njmNPLFT9XCKpbto5tvYA4QmFx5eHoyuGjcCHc2O7qdxy0sy+roBDbSN7ex4Zr2qGy+uA==", + "path": "altv.net.shared/10.0.3", + "hashPath": "altv.net.shared.10.0.3.nupkg.sha512" }, - "System.Threading.Channels/5.0.0": { + "System.Threading.Channels/6.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==", - "path": "system.threading.channels/5.0.0", - "hashPath": "system.threading.channels.5.0.0.nupkg.sha512" + "sha512": "sha512-TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==", + "path": "system.threading.channels/6.0.0", + "hashPath": "system.threading.channels.6.0.0.nupkg.sha512" } } } \ No newline at end of file diff --git a/resources/entity-sync/GameEntityScript.dll b/resources/entity-sync/GameEntityScript.dll index 2c07862..67d5345 100644 Binary files a/resources/entity-sync/GameEntityScript.dll and b/resources/entity-sync/GameEntityScript.dll differ diff --git a/resources/entity-sync/GameEntityScript.pdb b/resources/entity-sync/GameEntityScript.pdb index 8ea030f..3ad2a5f 100644 Binary files a/resources/entity-sync/GameEntityScript.pdb and b/resources/entity-sync/GameEntityScript.pdb differ diff --git a/resources/progressbar/client/html/static/js/2.74df1ca9.chunk.js b/resources/progressbar/client/html/static/js/2.74df1ca9.chunk.js index 31987c6..3c1083e 100644 --- a/resources/progressbar/client/html/static/js/2.74df1ca9.chunk.js +++ b/resources/progressbar/client/html/static/js/2.74df1ca9.chunk.js @@ -1,3 +1,12122 @@ /*! For license information please see 2.74df1ca9.chunk.js.LICENSE.txt */ -(this["webpackJsonpaltv-basic"]=this["webpackJsonpaltv-basic"]||[]).push([[2],[function(e,t,n){"use strict";e.exports=n(13)},function(e,t,n){"use strict";e.exports=n(19)},function(e,t,n){"use strict";function r(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}n.d(t,"a",(function(){return r}))},function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return ze}));var r=n(4),a=n(0),l=n.n(a),o=n(10),i=n.n(o),u=n(11),s=n(12),c=n(8),f=n(6),d=n.n(f);function p(){return(p=Object.assign||function(e){for(var t=1;t1?t-1:0),r=1;r0?" Args: "+n.join(", "):""))}var x=function(){function e(e){this.groupSizes=new Uint32Array(512),this.length=512,this.tag=e}var t=e.prototype;return t.indexOfGroup=function(e){for(var t=0,n=0;n=this.groupSizes.length){for(var n=this.groupSizes,r=n.length,a=r;e>=a;)(a<<=1)<0&&_(16,""+e);this.groupSizes=new Uint32Array(a),this.groupSizes.set(n),this.length=a;for(var l=r;l=this.length||0===this.groupSizes[e])return t;for(var n=this.groupSizes[e],r=this.indexOfGroup(e),a=r+n,l=r;l=T&&(T=t+1),P.set(e,t),O.set(t,e)},A="style["+k+'][data-styled-version="5.3.3"]',z=new RegExp("^"+k+'\\.g(\\d+)\\[id="([\\w\\d-]+)"\\].*?"([^"]*)'),I=function(e,t,n){for(var r,a=n.split(","),l=0,o=a.length;l=0;n--){var r=t[n];if(r&&1===r.nodeType&&r.hasAttribute(k))return r}}(n),l=void 0!==a?a.nextSibling:null;r.setAttribute(k,"active"),r.setAttribute("data-styled-version","5.3.3");var o=M();return o&&r.setAttribute("nonce",o),n.insertBefore(r,l),r},j=function(){function e(e){var t=this.element=F(e);t.appendChild(document.createTextNode("")),this.sheet=function(e){if(e.sheet)return e.sheet;for(var t=document.styleSheets,n=0,r=t.length;n=0){var n=document.createTextNode(t),r=this.nodes[e];return this.element.insertBefore(n,r||null),this.length++,!0}return!1},t.deleteRule=function(e){this.element.removeChild(this.nodes[e]),this.length--},t.getRule=function(e){return e0&&(s+=e+",")})),r+=""+i+u+'{content:"'+s+'"}/*!sc*/\n'}}}return r}(this)},e}(),V=/(a)(d)/gi,K=function(e){return String.fromCharCode(e+(e>25?39:97))};function Q(e){var t,n="";for(t=Math.abs(e);t>52;t=t/52|0)n=K(t%52)+n;return(K(t%52)+n).replace(V,"$1-$2")}var q=function(e,t){for(var n=t.length;n;)e=33*e^t.charCodeAt(--n);return e},Y=function(e){return q(5381,e)};function G(e){for(var t=0;t>>0);if(!t.hasNameForId(r,o)){var i=n(l,"."+o,void 0,r);t.insertRules(r,o,i)}a.push(o),this.staticRulesId=o}else{for(var u=this.rules.length,s=q(this.baseHash,n.hash),c="",f=0;f>>0);if(!t.hasNameForId(r,m)){var g=n(c,"."+m,void 0,r);t.insertRules(r,m,g)}a.push(m)}}return a.join(" ")},e}(),J=/^\s*\/\/.*$/gm,ee=[":","[",".","#"];function te(e){var t,n,r,a,l=void 0===e?v:e,o=l.options,i=void 0===o?v:o,s=l.plugins,c=void 0===s?g:s,f=new u.a(i),d=[],p=function(e){function t(t){if(t)try{e(t+"}")}catch(e){}}return function(n,r,a,l,o,i,u,s,c,f){switch(n){case 1:if(0===c&&64===r.charCodeAt(0))return e(r+";"),"";break;case 2:if(0===s)return r+"/*|*/";break;case 3:switch(s){case 102:case 112:return e(a[0]+r),"";default:return r+(0===f?"/*|*/":"")}case-2:r.split("/*|*/}").forEach(t)}}}((function(e){d.push(e)})),h=function(e,r,l){return 0===r&&-1!==ee.indexOf(l[n.length])||l.match(a)?e:"."+t};function m(e,l,o,i){void 0===i&&(i="&");var u=e.replace(J,""),s=l&&o?o+" "+l+" { "+u+" }":u;return t=i,n=l,r=new RegExp("\\"+n+"\\b","g"),a=new RegExp("(\\"+n+"\\b){2,}"),f(o||!l?"":l,s)}return f.use([].concat(c,[function(e,t,a){2===e&&a.length&&a[0].lastIndexOf(n)>0&&(a[0]=a[0].replace(r,h))},p,function(e){if(-2===e){var t=d;return d=[],t}}])),m.hash=c.length?c.reduce((function(e,t){return t.name||_(15),q(e,t.name)}),5381).toString():"",m}var ne=l.a.createContext(),re=(ne.Consumer,l.a.createContext()),ae=(re.Consumer,new B),le=te();function oe(){return Object(a.useContext)(ne)||ae}function ie(){return Object(a.useContext)(re)||le}function ue(e){var t=Object(a.useState)(e.stylisPlugins),n=t[0],r=t[1],o=oe(),u=Object(a.useMemo)((function(){var t=o;return e.sheet?t=e.sheet:e.target&&(t=t.reconstructWithOptions({target:e.target},!1)),e.disableCSSOMInjection&&(t=t.reconstructWithOptions({useCSSOMInjection:!1})),t}),[e.disableCSSOMInjection,e.sheet,e.target]),s=Object(a.useMemo)((function(){return te({options:{prefix:!e.disableVendorPrefixes},plugins:n})}),[e.disableVendorPrefixes,n]);return Object(a.useEffect)((function(){i()(n,e.stylisPlugins)||r(e.stylisPlugins)}),[e.stylisPlugins]),l.a.createElement(ne.Provider,{value:u},l.a.createElement(re.Provider,{value:s},e.children))}var se=function(){function e(e,t){var n=this;this.inject=function(e,t){void 0===t&&(t=le);var r=n.name+t.hash;e.hasNameForId(n.id,r)||e.insertRules(n.id,r,t(n.rules,r,"@keyframes"))},this.toString=function(){return _(12,String(n.name))},this.name=e,this.id="sc-keyframes-"+e,this.rules=t}return e.prototype.getName=function(e){return void 0===e&&(e=le),this.name+e.hash},e}(),ce=/([A-Z])/,fe=/([A-Z])/g,de=/^ms-/,pe=function(e){return"-"+e.toLowerCase()};function he(e){return ce.test(e)?e.replace(fe,pe).replace(de,"-ms-"):e}var me=function(e){return null==e||!1===e||""===e};function ge(e,t,n,r){if(Array.isArray(e)){for(var a,l=[],o=0,i=e.length;o1?t-1:0),r=1;r?@[\\\]^`{|}~-]+/g,ke=/(^-|-$)/g;function Se(e){return e.replace(we,"-").replace(ke,"")}var Ee=function(e){return Q(Y(e)>>>0)};function Ce(e){return"string"==typeof e&&!0}var _e=function(e){return"function"==typeof e||"object"==typeof e&&null!==e&&!Array.isArray(e)},xe=function(e){return"__proto__"!==e&&"constructor"!==e&&"prototype"!==e};function Pe(e,t,n){var r=e[n];_e(t)&&_e(r)?Oe(r,t):e[n]=t}function Oe(e){for(var t=arguments.length,n=new Array(t>1?t-1:0),r=1;r=0||(a[n]=e[n]);return a}(t,["componentId"]),l=r&&r+"-"+(Ce(e)?e:Se(b(e)));return Re(e,p({},a,{attrs:S,componentId:l}),n)},Object.defineProperty(C,"defaultProps",{get:function(){return this._foldedDefaultProps},set:function(t){this._foldedDefaultProps=r?Oe({},e.defaultProps,t):t}}),C.toString=function(){return"."+C.styledComponentId},o&&d()(C,e,{attrs:!0,componentStyle:!0,displayName:!0,foldedComponentIds:!0,shouldForwardProp:!0,styledComponentId:!0,target:!0,withComponent:!0}),C}var Le=function(e){return function e(t,n,a){if(void 0===a&&(a=v),!Object(r.isValidElementType)(n))return _(1,String(n));var l=function(){return t(n,a,ye.apply(void 0,arguments))};return l.withConfig=function(r){return e(t,n,p({},a,{},r))},l.attrs=function(r){return e(t,n,p({},a,{attrs:Array.prototype.concat(a.attrs,r).filter(Boolean)}))},l}(Re,e)};["a","abbr","address","area","article","aside","audio","b","base","bdi","bdo","big","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","dialog","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","marquee","menu","menuitem","meta","meter","nav","noscript","object","ol","optgroup","option","output","p","param","picture","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","title","tr","track","u","ul","var","video","wbr","circle","clipPath","defs","ellipse","foreignObject","g","image","line","linearGradient","marker","mask","path","pattern","polygon","polyline","radialGradient","rect","stop","svg","text","textPath","tspan"].forEach((function(e){Le[e]=Le(e)}));var Ae=function(){function e(e,t){this.rules=e,this.componentId=t,this.isStatic=G(e),B.registerId(this.componentId+1)}var t=e.prototype;return t.createStyles=function(e,t,n,r){var a=r(ge(this.rules,t,n,r).join(""),""),l=this.componentId+e;n.insertRules(l,l,a)},t.removeStyles=function(e,t){t.clearRules(this.componentId+e)},t.renderStyles=function(e,t,n,r){e>2&&B.registerId(this.componentId+e),this.removeStyles(e,n),this.createStyles(e,t,n,r)},e}();function ze(e){for(var t=arguments.length,n=new Array(t>1?t-1:0),r=1;r"+t+""},this.getStyleTags=function(){return e.sealed?_(2):e._emitSheetCSS()},this.getStyleElement=function(){var t;if(e.sealed)return _(2);var n=((t={})[k]="",t["data-styled-version"]="5.3.3",t.dangerouslySetInnerHTML={__html:e.instance.toString()},t),r=M();return r&&(n.nonce=r),[l.a.createElement("style",p({},n,{key:"sc-0-0"}))]},this.seal=function(){e.sealed=!0},this.instance=new B({isServer:!0}),this.sealed=!1}var t=e.prototype;t.collectStyles=function(e){return this.sealed?_(2):l.a.createElement(ue,{sheet:this.instance},e)},t.interleaveWithNodeStream=function(e){return _(3)}}();t.b=Le}).call(this,n(17))},function(e,t,n){"use strict";e.exports=n(18)},function(e,t,n){"use strict";var r=Object.getOwnPropertySymbols,a=Object.prototype.hasOwnProperty,l=Object.prototype.propertyIsEnumerable;function o(e){if(null===e||void 0===e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map((function(e){return t[e]})).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach((function(e){r[e]=e})),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(a){return!1}}()?Object.assign:function(e,t){for(var n,i,u=o(e),s=1;se.length)&&(t=e.length);for(var n=0,r=new Array(t);np)&&(j=(W=W.replace(" ",":")).length),0r&&(r=(t=t.trim()).charCodeAt(0)),r){case 38:return t.replace(g,"$1"+e.trim());case 58:return e.trim()+t.replace(g,"$1"+e.trim());default:if(0<1*n&&0u.charCodeAt(8))break;case 115:o=o.replace(u,"-webkit-"+u)+";"+o;break;case 207:case 102:o=o.replace(u,"-webkit-"+(102r.charCodeAt(0)&&(r=r.trim()),r=[r],0