diff --git a/LICENSE.md b/[esx]/esx_multicharacter/LICENSE.md similarity index 100% rename from LICENSE.md rename to [esx]/esx_multicharacter/LICENSE.md diff --git a/client/main.lua b/[esx]/esx_multicharacter/client/main.lua similarity index 100% rename from client/main.lua rename to [esx]/esx_multicharacter/client/main.lua diff --git a/config.lua b/[esx]/esx_multicharacter/config.lua similarity index 100% rename from config.lua rename to [esx]/esx_multicharacter/config.lua diff --git a/esx_multicharacter.sql b/[esx]/esx_multicharacter/esx_multicharacter.sql similarity index 100% rename from esx_multicharacter.sql rename to [esx]/esx_multicharacter/esx_multicharacter.sql diff --git a/fxmanifest.lua b/[esx]/esx_multicharacter/fxmanifest.lua similarity index 100% rename from fxmanifest.lua rename to [esx]/esx_multicharacter/fxmanifest.lua diff --git a/html/css/main.css b/[esx]/esx_multicharacter/html/css/main.css similarity index 100% rename from html/css/main.css rename to [esx]/esx_multicharacter/html/css/main.css diff --git a/html/js/app.js b/[esx]/esx_multicharacter/html/js/app.js similarity index 100% rename from html/js/app.js rename to [esx]/esx_multicharacter/html/js/app.js diff --git a/html/locales/cs.js b/[esx]/esx_multicharacter/html/locales/cs.js similarity index 100% rename from html/locales/cs.js rename to [esx]/esx_multicharacter/html/locales/cs.js diff --git a/html/locales/de.js b/[esx]/esx_multicharacter/html/locales/de.js similarity index 100% rename from html/locales/de.js rename to [esx]/esx_multicharacter/html/locales/de.js diff --git a/html/locales/en.js b/[esx]/esx_multicharacter/html/locales/en.js similarity index 100% rename from html/locales/en.js rename to [esx]/esx_multicharacter/html/locales/en.js diff --git a/html/locales/fr.js b/[esx]/esx_multicharacter/html/locales/fr.js similarity index 100% rename from html/locales/fr.js rename to [esx]/esx_multicharacter/html/locales/fr.js diff --git a/html/locales/pl.js b/[esx]/esx_multicharacter/html/locales/pl.js similarity index 100% rename from html/locales/pl.js rename to [esx]/esx_multicharacter/html/locales/pl.js diff --git a/html/locales/pt.js b/[esx]/esx_multicharacter/html/locales/pt.js similarity index 100% rename from html/locales/pt.js rename to [esx]/esx_multicharacter/html/locales/pt.js diff --git a/html/locales/tr.js b/[esx]/esx_multicharacter/html/locales/tr.js similarity index 100% rename from html/locales/tr.js rename to [esx]/esx_multicharacter/html/locales/tr.js diff --git a/html/ui.html b/[esx]/esx_multicharacter/html/ui.html similarity index 100% rename from html/ui.html rename to [esx]/esx_multicharacter/html/ui.html diff --git a/locales/cs.lua b/[esx]/esx_multicharacter/locales/cs.lua similarity index 100% rename from locales/cs.lua rename to [esx]/esx_multicharacter/locales/cs.lua diff --git a/locales/de.lua b/[esx]/esx_multicharacter/locales/de.lua similarity index 100% rename from locales/de.lua rename to [esx]/esx_multicharacter/locales/de.lua diff --git a/locales/en.lua b/[esx]/esx_multicharacter/locales/en.lua similarity index 100% rename from locales/en.lua rename to [esx]/esx_multicharacter/locales/en.lua diff --git a/locales/it.lua b/[esx]/esx_multicharacter/locales/it.lua similarity index 100% rename from locales/it.lua rename to [esx]/esx_multicharacter/locales/it.lua diff --git a/locales/pt.lua b/[esx]/esx_multicharacter/locales/pt.lua similarity index 100% rename from locales/pt.lua rename to [esx]/esx_multicharacter/locales/pt.lua diff --git a/locales/tr.lua b/[esx]/esx_multicharacter/locales/tr.lua similarity index 100% rename from locales/tr.lua rename to [esx]/esx_multicharacter/locales/tr.lua diff --git a/readme.md b/[esx]/esx_multicharacter/readme.md similarity index 97% rename from readme.md rename to [esx]/esx_multicharacter/readme.md index 6e2393c9..c25c77cd 100644 --- a/readme.md +++ b/[esx]/esx_multicharacter/readme.md @@ -1,72 +1,72 @@ -### Requirements (ensure you are using the latest) -- [ESX Legacy](https://github.com/esx-framework/esx-legacy) -- [OxMySQL](https://github.com/overextended/oxmysql/releases) - -### Conflicts -* The following resources should not be used with ESX Legacy and can result in errors - - essentialmode - - basic-gamemode - - fivem-map-skater - - fivem-map-hipster - - default_spawnpoint - -### Installation -- Modify your ESX config with `Config.Multichar = true` -- Run `esx_multicharacter.sql` into your database -- All owner and identifier columns should be set to `VARCHAR(60)` to ensure correct data entry - - The resource will attempt to set columns automatically - - -#### The menu is esx_menu_default - you can use any version if you want a different appearance -![image](https://user-images.githubusercontent.com/65407488/126976325-17cc3241-bb9e-451f-a6ed-610a8ef52fa5.png) - -### Relogging -- Do not enable this setting if you do not intend to properly set up relog support -- Requires the latest update for ESX Status (prevents multiple status ticks from running) -- Add the following events to resources that require support for relogging, or -- Add them to [@es_extended/imports.lua](https://github.com/esx-framework/esx-legacy/blob/main/[esx]/es_extended/imports.lua) (and use the imports in your resources) -```lua -RegisterNetEvent('esx:playerLoaded', function(xPlayer) - ESX.PlayerData = xPlayer - ESX.PlayerLoaded = true -end) - -RegisterNetEvent('esx:onPlayerLogout', function() - ESX.PlayerLoaded = false - ESX.PlayerData = {} -end) -``` - -### Notes -- This resource is not compatible with ExtendedMode or previous versions of ESX -- Legacy, skin, and identity must be updated to at least the minimum commits specified above -- Characters are stored in the users table as `char#:license` - if you need to use a different identifier then you need to modify ESX itself -- Character deletion does not require manual entries for the tables to remove -- As characters are stored with unique identifiers, there is no excessive queries being executed - -### Kashacters -- This project is forked from the [kashacters multicharacter resource](https://github.com/FiveEYZ/esx_kashacter) -- Most of the code has been entirely rewritten -- KASH has given permission for this resource to use his code and the addition of a license -- The license obviously does not apply to previous versions and KASH has stated his resource is free to be used however - - - -## Notice -Copyright © 2021 Linden and KASH - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see https://www.gnu.org/licenses. - - -### Thanks to KASH, XxFri3ndlyxX, and all those who have contributed +### Requirements (ensure you are using the latest) +- [ESX Legacy](https://github.com/esx-framework/esx-legacy) +- [OxMySQL](https://github.com/overextended/oxmysql/releases) + +### Conflicts +* The following resources should not be used with ESX Legacy and can result in errors + - essentialmode + - basic-gamemode + - fivem-map-skater + - fivem-map-hipster + - default_spawnpoint + +### Installation +- Modify your ESX config with `Config.Multichar = true` +- Run `esx_multicharacter.sql` into your database +- All owner and identifier columns should be set to `VARCHAR(60)` to ensure correct data entry + - The resource will attempt to set columns automatically + + +#### The menu is esx_menu_default - you can use any version if you want a different appearance +![image](https://user-images.githubusercontent.com/65407488/126976325-17cc3241-bb9e-451f-a6ed-610a8ef52fa5.png) + +### Relogging +- Do not enable this setting if you do not intend to properly set up relog support +- Requires the latest update for ESX Status (prevents multiple status ticks from running) +- Add the following events to resources that require support for relogging, or +- Add them to [@es_extended/imports.lua](https://github.com/esx-framework/esx-legacy/blob/main/[esx]/es_extended/imports.lua) (and use the imports in your resources) +```lua +RegisterNetEvent('esx:playerLoaded', function(xPlayer) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true +end) + +RegisterNetEvent('esx:onPlayerLogout', function() + ESX.PlayerLoaded = false + ESX.PlayerData = {} +end) +``` + +### Notes +- This resource is not compatible with ExtendedMode or previous versions of ESX +- Legacy, skin, and identity must be updated to at least the minimum commits specified above +- Characters are stored in the users table as `char#:license` - if you need to use a different identifier then you need to modify ESX itself +- Character deletion does not require manual entries for the tables to remove +- As characters are stored with unique identifiers, there is no excessive queries being executed + +### Kashacters +- This project is forked from the [kashacters multicharacter resource](https://github.com/FiveEYZ/esx_kashacter) +- Most of the code has been entirely rewritten +- KASH has given permission for this resource to use his code and the addition of a license +- The license obviously does not apply to previous versions and KASH has stated his resource is free to be used however + + + +## Notice +Copyright © 2021 Linden and KASH + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see https://www.gnu.org/licenses. + + +### Thanks to KASH, XxFri3ndlyxX, and all those who have contributed diff --git a/server/commands.lua b/[esx]/esx_multicharacter/server/commands.lua similarity index 100% rename from server/commands.lua rename to [esx]/esx_multicharacter/server/commands.lua diff --git a/server/main.lua b/[esx]/esx_multicharacter/server/main.lua similarity index 100% rename from server/main.lua rename to [esx]/esx_multicharacter/server/main.lua