From e0bf1aece1dc10cc29d32928ebf7b74d46c8e8a8 Mon Sep 17 00:00:00 2001 From: Stuyk Date: Mon, 16 Oct 2023 09:39:59 -0600 Subject: [PATCH] Remove Dead Enums --- package.json | 4 ++-- scripts/buildresource/index.js | 3 +++ src/core/server/player/emit.ts | 1 - src/core/shared/enums/views.ts | 33 +++++++++++---------------------- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 6ee99f00c2..1e4dd494cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "altv-athena", - "version": "5.2.0", + "version": "5.3.0", "description": "a roleplay framework for alt:V", "author": "stuyk", "type": "module", @@ -30,7 +30,7 @@ "@altv/types-webview": "^1.0.7", "@altv/types-worker": "1.0.7", "@babel/types": "^7.17.0", - "@stuyk/altv-config": "^4.0.1", + "@stuyk/altv-config": "^4.0.2", "@swc/cli": "0.1.62", "@swc/core": "1.3.92", "@types/minimatch": "^3.0.5", diff --git a/scripts/buildresource/index.js b/scripts/buildresource/index.js index 72c88d2a43..a36898831d 100644 --- a/scripts/buildresource/index.js +++ b/scripts/buildresource/index.js @@ -10,6 +10,9 @@ const defaults = { 'client-files': ['client/*', 'shared/*'], deps: [], 'required-permissions': ['Screen Capture'], + 'config.js-module-v2': { + compatabilityEnabled: true, + }, }; async function getClientPluginFolders() { diff --git a/src/core/server/player/emit.ts b/src/core/server/player/emit.ts index 51bc09332c..46753f668a 100644 --- a/src/core/server/player/emit.ts +++ b/src/core/server/player/emit.ts @@ -2,7 +2,6 @@ import * as Athena from '@AthenaServer/api'; import * as alt from 'alt-server'; import { PLAYER_SYNCED_META } from '@AthenaShared/enums/playerSynced'; import { SYSTEM_EVENTS } from '@AthenaShared/enums/system'; -import { View_Events_Input_Menu } from '@AthenaShared/enums/views'; import { ANIMATION_FLAGS } from '@AthenaShared/flags/animationFlags'; import IAttachable from '@AthenaShared/interfaces/iAttachable'; import ICredit from '@AthenaShared/interfaces/iCredit'; diff --git a/src/core/shared/enums/views.ts b/src/core/shared/enums/views.ts index 669b78f821..3f22f07f4b 100644 --- a/src/core/shared/enums/views.ts +++ b/src/core/shared/enums/views.ts @@ -1,23 +1,12 @@ -export enum View_Events_Inventory { - Process = 'inventory:Process', - Use = 'inventory:Use', - Split = 'inventory:Split', - Pickup = 'inventory:Pickup', -} +export const VIEW_EVENTS_JOB_TRIGGER = { + OPEN: 'jobTrigger:Open', + CANCEL: 'jobTrigger:Cancel', + ACCEPT: 'jobTrigger:Accept', +}; -export enum View_Events_Input_Menu { - SetMenu = 'inputmenu:Set', -} - -export enum VIEW_EVENTS_JOB_TRIGGER { - OPEN = 'jobTrigger:Open', - CANCEL = 'jobTrigger:Cancel', - ACCEPT = 'jobTrigger:Accept', -} - -export enum VIEW_EVENTS_WHEEL_MENU { - ADD_OPTIONS = 'wheelMenu:AddOptions', - READY = 'wheelMenu:Ready', - CLOSE = 'wheelMenu:Close', - EXECUTE = 'wheelMenu:Execute', -} +export const VIEW_EVENTS_WHEEL_MENU = { + ADD_OPTIONS: 'wheelMenu:AddOptions', + READY: 'wheelMenu:Ready', + CLOSE: 'wheelMenu:Close', + EXECUTE: 'wheelMenu:Execute', +};