@armoury/fivem-framework-common 1.0.66 → 1.0.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/cjs/decorators/interaction.decorator.js +8 -2
  2. package/dist/esm/decorators/interaction.decorator.js +8 -2
  3. package/dist/types/decorators/interaction.decorator.d.ts +2 -0
  4. package/package.json +1 -1
package/dist/cjs/decorators/interaction.decorator.js CHANGED
@@ -6,8 +6,11 @@ const decorator_utils_1 = require("./decorator.utils");
6
6
  const ui_listener_decorator_1 = require("./ui-listener.decorator");
7
7
  function Interaction(data) {
8
8
  return function (target, propertyKey, descriptor) {
9
- Reflect.defineMetadata(`arm_interaction_${data.interactableType}_${Math.floor(Math.random() * Number.MAX_SAFE_INTEGER)}`, data, target);
10
- (0, ui_listener_decorator_1.UIListener)({ eventName: `getAvailableInteractions:${data.interactableType}` })(target, propertyKey, descriptor);
9
+ const nonce = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
10
+ Reflect.defineMetadata(`arm_interaction_${data.interactableType}_${nonce}`, { ...data, nonce }, target);
11
+ (0, ui_listener_decorator_1.UIListener)({
12
+ eventName: `validateInteraction:${data.interactableType}:${nonce}`
13
+ })(target, propertyKey, descriptor);
11
14
  };
12
15
  }
13
16
  function Interactions(target, _prototype, providers) {
@@ -23,6 +26,9 @@ function Interactions(target, _prototype, providers) {
23
26
  Cfx.exports['armoury'].sendUIMessage({
24
27
  type: 'game:interactable:prompt:register',
25
28
  interactableType: mapping.value?.interactableType,
29
+ nonce: mapping.value?.nonce,
30
+ label: `${Cfx.Client.GetCurrentResourceName()}.${mapping.value?.label}`,
31
+ icon: mapping.value?.icon,
26
32
  resource: Cfx.Client.GetCurrentResourceName(),
27
33
  });
28
34
  }
package/dist/esm/decorators/interaction.decorator.js CHANGED
@@ -2,8 +2,11 @@ import { DecoratorUtils } from './decorator.utils';
2
2
  import { UIListener } from './ui-listener.decorator';
3
3
  export function Interaction(data) {
4
4
  return function (target, propertyKey, descriptor) {
5
- Reflect.defineMetadata(`arm_interaction_${data.interactableType}_${Math.floor(Math.random() * Number.MAX_SAFE_INTEGER)}`, data, target);
6
- UIListener({ eventName: `getAvailableInteractions:${data.interactableType}` })(target, propertyKey, descriptor);
5
+ const nonce = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
6
+ Reflect.defineMetadata(`arm_interaction_${data.interactableType}_${nonce}`, { ...data, nonce }, target);
7
+ UIListener({
8
+ eventName: `validateInteraction:${data.interactableType}:${nonce}`
9
+ })(target, propertyKey, descriptor);
7
10
  };
8
11
  }
9
12
  export function Interactions(target, _prototype, providers) {
@@ -19,6 +22,9 @@ export function Interactions(target, _prototype, providers) {
19
22
  Cfx.exports['armoury'].sendUIMessage({
20
23
  type: 'game:interactable:prompt:register',
21
24
  interactableType: mapping.value?.interactableType,
25
+ nonce: mapping.value?.nonce,
26
+ label: `${Cfx.Client.GetCurrentResourceName()}.${mapping.value?.label}`,
27
+ icon: mapping.value?.icon,
22
28
  resource: Cfx.Client.GetCurrentResourceName(),
23
29
  });
24
30
  }
package/dist/types/decorators/interaction.decorator.d.ts CHANGED
@@ -1,4 +1,6 @@
1
1
  export declare function Interaction(data: {
2
2
  interactableType: number;
3
+ label: string;
4
+ icon: string;
3
5
  }): <T extends (...args: any[]) => any>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T> & (Parameters<T> extends [object, ...unknown[]] ? unknown : never)) => void;
4
6
  export declare function Interactions(target: any, _prototype: any, providers?: Object[]): void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@armoury/fivem-framework-common",
3
- "version": "1.0.66",
3
+ "version": "1.0.68",
4
4
  "description": "Shared APIs for the Armoury FiveM framework",
5
5
  "main": "dist/cjs/common/index.js",
6
6
  "module": "dist/esm/common/index.js",