@nativewrappers/fivem 0.0.30 → 0.0.31

package/client/Game.js

@@ -76,7 +76,7 @@ export class Game {
      */
     static get Player() {
         const handle = PlayerId();
-        if (typeof this.cachedPlayer === 'undefined' || handle !== this.cachedPlayer.Handle) {
+        if (this.cachedPlayer === undefined || handle !== this.cachedPlayer.Handle) {
             this.cachedPlayer = new Player(handle);
         }
         return this.cachedPlayer;

package/client/TaskSequence.js

@@ -1,4 +1,5 @@
 import { Ped } from './models/Ped';
+// TODO: Figure out why this uses 'null ped'
 export class TaskSequence {
     constructor(handle) {
         this.handle = 0;

package/client/models/BaseEntity.d.ts

@@ -132,19 +132,11 @@ export declare class BaseEntity {
     isNearEntity(entity: BaseEntity, bounds: Vector3): boolean;
     isTouching(entity: BaseEntity): boolean;
     isTouchingModel(model: Model): boolean;
-    /**
-      * @deprecated use [[getAbsolutePositionOffset]]
-      */
-    getOffsetPosition(offset: Vector3): Vector3;
     /**
      * @param offset: the amount to offset from the entity
      * @returns the offset position from the entity in world coords
      */
-    getAbsolutePositionOffset(offset: Vector3): Vector3;
-    /**
-     * @deprecated use [[getRelativePositionOffset]] instead
-     */
-    getPositionOffset(worldCoords: Vector3): Vector3;
+    getAbsolutePositionOffset(worldCoords: Vector3): Vector3;
     /**
       * @example
       * ```typescript
@@ -161,7 +153,15 @@ export declare class BaseEntity {
       * @param worldCoords: the offset given the world coords
       * @returns the offset position from the entity in relative coords
       */
-    getRelativePositionOffset(worldCoords: Vector3): Vector3;
+    getRelativePositionOffset(offset: Vector3): Vector3;
+    /**
+     * @deprecated use [[getAbsolutePositionOffset]] instead
+     */
+    getPositionOffset(worldCoords: Vector3): Vector3;
+    /**
+      * @deprecated use [[getRelativePositionOffset]]
+      */
+    getOffsetPosition(offset: Vector3): Vector3;
     attachTo(entity: BaseEntity, position: Vector3, rotation: Vector3, collisions?: boolean, unk9?: boolean, useSoftPinning?: boolean, rotationOrder?: number): void;
     attachToBone(entityBone: EntityBone, position: Vector3, rotation: Vector3, collisions?: boolean, unk9?: boolean, useSoftPinning?: boolean, rotationOrder?: number): void;
     detach(): void;

package/client/models/BaseEntity.js

@@ -362,24 +362,12 @@ export class BaseEntity {
     isTouchingModel(model) {
         return IsEntityTouchingModel(this.handle, model.Hash);
     }
-    /**
-      * @deprecated use [[getAbsolutePositionOffset]]
-      */
-    getOffsetPosition(offset) {
-        return Vector3.fromArray(GetOffsetFromEntityInWorldCoords(this.handle, offset.x, offset.y, offset.z));
-    }
     /**
      * @param offset: the amount to offset from the entity
      * @returns the offset position from the entity in world coords
      */
-    getAbsolutePositionOffset(offset) {
-        return Vector3.fromArray(GetOffsetFromEntityInWorldCoords(this.handle, offset.x, offset.y, offset.z));
-    }
-    /**
-     * @deprecated use [[getRelativePositionOffset]] instead
-     */
-    getPositionOffset(worldCoords) {
-        return this.getRelativePositionOffset(worldCoords);
+    getAbsolutePositionOffset(worldCoords) {
+        return Vector3.fromArray(GetOffsetFromEntityGivenWorldCoords(this.handle, worldCoords.x, worldCoords.y, worldCoords.z));
     }
     // TODO: Better example
     /**
@@ -398,8 +386,20 @@ export class BaseEntity {
       * @param worldCoords: the offset given the world coords
       * @returns the offset position from the entity in relative coords
       */
-    getRelativePositionOffset(worldCoords) {
-        return Vector3.fromArray(GetOffsetFromEntityGivenWorldCoords(this.handle, worldCoords.x, worldCoords.y, worldCoords.z));
+    getRelativePositionOffset(offset) {
+        return Vector3.fromArray(GetOffsetFromEntityInWorldCoords(this.handle, offset.x, offset.y, offset.z));
+    }
+    /**
+     * @deprecated use [[getAbsolutePositionOffset]] instead
+     */
+    getPositionOffset(worldCoords) {
+        return this.getAbsolutePositionOffset(worldCoords);
+    }
+    /**
+      * @deprecated use [[getRelativePositionOffset]]
+      */
+    getOffsetPosition(offset) {
+        return this.getRelativePositionOffset(offset);
     }
     attachTo(entity, position, rotation, collisions = false, unk9 = true, useSoftPinning = true, rotationOrder = 1) {
         if (this.handle == entity.Handle) {

package/client/models/EntityBoneCollection.d.ts

@@ -2,8 +2,6 @@ import { EntityBone } from './';
 import type { BaseEntity } from './BaseEntity';
 export declare class EntityBoneCollection {
     protected readonly owner: BaseEntity;
-    private readonly _collection;
-    private _currentIndex;
     constructor(owner: BaseEntity);
     hasBone(name: string): boolean;
     getBone(boneIndex?: number, boneName?: string): EntityBone;

package/client/models/EntityBoneCollection.js

@@ -1,7 +1,6 @@
 import { EntityBone } from './';
 export class EntityBoneCollection {
     constructor(owner) {
-        this._currentIndex = -1;
         this.owner = owner;
     }
     hasBone(name) {

package/client/models/Ped.d.ts

@@ -9,11 +9,11 @@ import { BaseEntity } from './BaseEntity';
 export declare class Ped extends BaseEntity {
     static exists(ped: Ped): boolean;
     static fromHandle(handle: number): Ped | null;
-    static fromNetworkId(networkId: number, errorOnInvalid?: boolean): Ped | null;
+    static fromNetworkId(networkId: number): Ped | null;
     protected type: ClassTypes;
-    private pedBones;
-    private weapons;
-    private readonly speechModifierNames;
+    private pedBones?;
+    private weapons?;
+    private static readonly speechModifierNames;
     private tasks;
     constructor(handle: number);
     get Player(): Player;
@@ -107,7 +107,7 @@ export declare class Ped extends BaseEntity {
     set DrivingStyle(style: DrivingStyle);
     set IsDrunk(isDrunk: boolean);
     set MotionBlur(value: boolean);
-    get Task(): Tasks | undefined;
+    get Task(): Tasks;
     get DeathCause(): number;
     get TaskSequenceProgress(): number;
     set BlockPermanentEvents(block: boolean);
@@ -157,7 +157,7 @@ export declare class Ped extends BaseEntity {
     setConfigFlag(flagId: number, value: boolean): void;
     resetConfigFlag(flagId: number): void;
     clone(): Ped;
-    exists(ped?: Ped): boolean;
+    exists(): boolean;
     isFacingPed(ped: Ped, angle?: number): boolean;
     setComponentVariation(componentId: number, drawableId: number, textureId: number, paletteId?: number): void;
     setRandomComponentVariation(): void;

package/client/models/Ped.js

@@ -12,54 +12,15 @@ export class Ped extends BaseEntity {
     static fromHandle(handle) {
         return new Ped(handle);
     }
-    static fromNetworkId(networkId, errorOnInvalid = false) {
-        if (errorOnInvalid && NetworkDoesEntityExistWithNetworkId(networkId)) {
-            throw new Error(`Entity with ${networkId} doesn't exist`);
+    static fromNetworkId(networkId) {
+        if (!NetworkDoesEntityExistWithNetworkId(networkId)) {
+            return null;
         }
         return new Ped(NetworkGetEntityFromNetworkId(networkId));
     }
     constructor(handle) {
         super(handle);
         this.type = ClassTypes.Ped;
-        this.speechModifierNames = [
-            'SPEECH_PARAMS_STANDARD',
-            'SPEECH_PARAMS_ALLOW_REPEAT',
-            'SPEECH_PARAMS_BEAT',
-            'SPEECH_PARAMS_FORCE',
-            'SPEECH_PARAMS_FORCE_FRONTEND',
-            'SPEECH_PARAMS_FORCE_NO_REPEAT_FRONTEND',
-            'SPEECH_PARAMS_FORCE_NORMAL',
-            'SPEECH_PARAMS_FORCE_NORMAL_CLEAR',
-            'SPEECH_PARAMS_FORCE_NORMAL_CRITICAL',
-            'SPEECH_PARAMS_FORCE_SHOUTED',
-            'SPEECH_PARAMS_FORCE_SHOUTED_CLEAR',
-            'SPEECH_PARAMS_FORCE_SHOUTED_CRITICAL',
-            'SPEECH_PARAMS_FORCE_PRELOAD_ONLY',
-            'SPEECH_PARAMS_MEGAPHONE',
-            'SPEECH_PARAMS_HELI',
-            'SPEECH_PARAMS_FORCE_MEGAPHONE',
-            'SPEECH_PARAMS_FORCE_HELI',
-            'SPEECH_PARAMS_INTERRUPT',
-            'SPEECH_PARAMS_INTERRUPT_SHOUTED',
-            'SPEECH_PARAMS_INTERRUPT_SHOUTED_CLEAR',
-            'SPEECH_PARAMS_INTERRUPT_SHOUTED_CRITICAL',
-            'SPEECH_PARAMS_INTERRUPT_NO_FORCE',
-            'SPEECH_PARAMS_INTERRUPT_FRONTEND',
-            'SPEECH_PARAMS_INTERRUPT_NO_FORCE_FRONTEND',
-            'SPEECH_PARAMS_ADD_BLIP',
-            'SPEECH_PARAMS_ADD_BLIP_ALLOW_REPEAT',
-            'SPEECH_PARAMS_ADD_BLIP_FORCE',
-            'SPEECH_PARAMS_ADD_BLIP_SHOUTED',
-            'SPEECH_PARAMS_ADD_BLIP_SHOUTED_FORCE',
-            'SPEECH_PARAMS_ADD_BLIP_INTERRUPT',
-            'SPEECH_PARAMS_ADD_BLIP_INTERRUPT_FORCE',
-            'SPEECH_PARAMS_FORCE_PRELOAD_ONLY_SHOUTED',
-            'SPEECH_PARAMS_FORCE_PRELOAD_ONLY_SHOUTED_CLEAR',
-            'SPEECH_PARAMS_FORCE_PRELOAD_ONLY_SHOUTED_CRITICAL',
-            'SPEECH_PARAMS_SHOUTED',
-            'SPEECH_PARAMS_SHOUTED_CLEAR',
-            'SPEECH_PARAMS_SHOUTED_CRITICAL',
-        ];
     }
     get Player() {
         return new Player(NetworkGetPlayerIndexFromPed(this.handle));
@@ -441,12 +402,12 @@ export class Ped extends BaseEntity {
         RemovePedFromGroup(this.handle);
     }
     playAmbientSpeed(speechName, voiceName = '', modifier = SpeechModifier.Standard) {
-        if (Number(modifier) >= 0 && Number(modifier) < this.speechModifierNames.length) {
+        if (Number(modifier) >= 0 && Number(modifier) < Ped.speechModifierNames.length) {
             if (voiceName === '') {
-                PlayAmbientSpeech1(this.handle, speechName, this.speechModifierNames[Number(modifier)]);
+                PlayAmbientSpeech1(this.handle, speechName, Ped.speechModifierNames[Number(modifier)]);
             }
             else {
-                PlayAmbientSpeechWithVoice(this.handle, speechName, voiceName, this.speechModifierNames[Number(modifier)], false);
+                PlayAmbientSpeechWithVoice(this.handle, speechName, voiceName, Ped.speechModifierNames[Number(modifier)], false);
             }
         }
         else {
@@ -533,11 +494,8 @@ export class Ped extends BaseEntity {
     clone() {
         return new Ped(ClonePed(this.handle, false, false, false));
     }
-    exists(ped) {
-        if (!ped) {
-            return super.exists() && GetEntityType(this.handle) === 1;
-        }
-        return ped?.exists() ?? false;
+    exists() {
+        return super.exists() && GetEntityType(this.handle) === 1;
     }
     isFacingPed(ped, angle = 25.0) {
         return IsPedFacingPed(this.handle, ped.Handle, angle);
@@ -683,3 +641,42 @@ export class Ped extends BaseEntity {
         return HasPedHeadBlendFinished(this.handle);
     }
 }
+Ped.speechModifierNames = [
+    'SPEECH_PARAMS_STANDARD',
+    'SPEECH_PARAMS_ALLOW_REPEAT',
+    'SPEECH_PARAMS_BEAT',
+    'SPEECH_PARAMS_FORCE',
+    'SPEECH_PARAMS_FORCE_FRONTEND',
+    'SPEECH_PARAMS_FORCE_NO_REPEAT_FRONTEND',
+    'SPEECH_PARAMS_FORCE_NORMAL',
+    'SPEECH_PARAMS_FORCE_NORMAL_CLEAR',
+    'SPEECH_PARAMS_FORCE_NORMAL_CRITICAL',
+    'SPEECH_PARAMS_FORCE_SHOUTED',
+    'SPEECH_PARAMS_FORCE_SHOUTED_CLEAR',
+    'SPEECH_PARAMS_FORCE_SHOUTED_CRITICAL',
+    'SPEECH_PARAMS_FORCE_PRELOAD_ONLY',
+    'SPEECH_PARAMS_MEGAPHONE',
+    'SPEECH_PARAMS_HELI',
+    'SPEECH_PARAMS_FORCE_MEGAPHONE',
+    'SPEECH_PARAMS_FORCE_HELI',
+    'SPEECH_PARAMS_INTERRUPT',
+    'SPEECH_PARAMS_INTERRUPT_SHOUTED',
+    'SPEECH_PARAMS_INTERRUPT_SHOUTED_CLEAR',
+    'SPEECH_PARAMS_INTERRUPT_SHOUTED_CRITICAL',
+    'SPEECH_PARAMS_INTERRUPT_NO_FORCE',
+    'SPEECH_PARAMS_INTERRUPT_FRONTEND',
+    'SPEECH_PARAMS_INTERRUPT_NO_FORCE_FRONTEND',
+    'SPEECH_PARAMS_ADD_BLIP',
+    'SPEECH_PARAMS_ADD_BLIP_ALLOW_REPEAT',
+    'SPEECH_PARAMS_ADD_BLIP_FORCE',
+    'SPEECH_PARAMS_ADD_BLIP_SHOUTED',
+    'SPEECH_PARAMS_ADD_BLIP_SHOUTED_FORCE',
+    'SPEECH_PARAMS_ADD_BLIP_INTERRUPT',
+    'SPEECH_PARAMS_ADD_BLIP_INTERRUPT_FORCE',
+    'SPEECH_PARAMS_FORCE_PRELOAD_ONLY_SHOUTED',
+    'SPEECH_PARAMS_FORCE_PRELOAD_ONLY_SHOUTED_CLEAR',
+    'SPEECH_PARAMS_FORCE_PRELOAD_ONLY_SHOUTED_CRITICAL',
+    'SPEECH_PARAMS_SHOUTED',
+    'SPEECH_PARAMS_SHOUTED_CLEAR',
+    'SPEECH_PARAMS_SHOUTED_CRITICAL',
+];

package/client/models/Player.d.ts

@@ -3,7 +3,7 @@ import { StateBagChangeHandler } from '../cfx';
 import { BaseEntity, Ped } from './';
 export declare class Player {
     private handle;
-    private ped;
+    private ped?;
     private pvp;
     private stateBagCookies;
     private source;

package/client/models/Prop.d.ts

@@ -3,7 +3,7 @@ import { BaseEntity } from './BaseEntity';
 export declare class Prop extends BaseEntity {
     static exists(prop: Prop): boolean;
     static fromHandle(handle: number): Prop | null;
-    static fromNetworkId(networkId: number, errorOnInvalid?: boolean): Prop | null;
+    static fromNetworkId(networkId: number): Prop | null;
     protected type: ClassTypes;
     constructor(handle: number);
     exists(): boolean;

package/client/models/Prop.js

@@ -7,9 +7,9 @@ export class Prop extends BaseEntity {
     static fromHandle(handle) {
         return new Prop(handle);
     }
-    static fromNetworkId(networkId, errorOnInvalid = false) {
-        if (errorOnInvalid && NetworkDoesEntityExistWithNetworkId(networkId)) {
-            throw new Error(`Entity with ${networkId} doesn't exist`);
+    static fromNetworkId(networkId) {
+        if (!NetworkDoesEntityExistWithNetworkId(networkId)) {
+            return null;
         }
         return new Prop(NetworkGetEntityFromNetworkId(networkId));
     }

package/client/models/Vehicle.d.ts

@@ -11,10 +11,10 @@ export declare class Vehicle extends BaseEntity {
     static exists(vehicle: Vehicle): boolean;
     static fromHandle(handle: number): Vehicle | null;
     static fromNetworkId(networkId: number): Vehicle | null;
-    private _doors;
-    private _mods;
-    private _wheels;
-    private _windows;
+    private _doors?;
+    private _mods?;
+    private _wheels?;
+    private _windows?;
     protected type: ClassTypes;
     constructor(handle: number);
     exists(): boolean;

package/client/models/VehicleModCollection.d.ts

@@ -16,7 +16,7 @@ export declare class VehicleModCollection {
     set WheelType(type: VehicleWheelType);
     installModKit(): void;
     get Livery(): number | undefined;
-    set Livery(value: number | undefined);
+    set Livery(value: number);
     get LiveryCount(): number;
     get WindowTint(): VehicleWindowTint;
     set WindowTint(tint: VehicleWindowTint);

package/client/models/VehicleModCollection.js

@@ -44,6 +44,7 @@ export class VehicleModCollection {
     installModKit() {
         SetVehicleModKit(this._owner.Handle, 0);
     }
+    // TODO: This should return always return a  number
     get Livery() {
         const modCount = this.getMod(VehicleModType.Livery)?.ModCount;
         if (modCount !== undefined && modCount > 0) {
@@ -52,8 +53,6 @@ export class VehicleModCollection {
         return GetVehicleLivery(this._owner.Handle);
     }
     set Livery(value) {
-        if (value === undefined)
-            return;
         const mod = this.getMod(VehicleModType.Livery);
         if (mod !== undefined && mod.ModCount > 0) {
             mod.Index = value;

package/client/models/VehicleWindowCollection.d.ts

@@ -5,8 +5,8 @@ export declare class VehicleWindowCollection {
     private _owner;
     private readonly _vehicleWindows;
     constructor(owner: Vehicle);
-    getWindow(index: VehicleWindowIndex): VehicleWindow | undefined;
-    getAllWindows(): (VehicleWindow | null | undefined)[];
+    getWindow(index: VehicleWindowIndex): VehicleWindow;
+    getAllWindows(): (VehicleWindow | null)[];
     get AreAllWindowsIntact(): boolean;
     rollDownAllWindows(): void;
     rollUpAllWindows(): void;

package/client/models/VehicleWindowCollection.js

@@ -6,10 +6,13 @@ export class VehicleWindowCollection {
         this._owner = owner;
     }
     getWindow(index) {
-        if (!this._vehicleWindows.has(index)) {
-            this._vehicleWindows.set(index, new VehicleWindow(this._owner, index));
+        let window = this._vehicleWindows.get(index);
+        if (!window) {
+            const vehicleWindow = new VehicleWindow(this._owner, index);
+            this._vehicleWindows.set(index, vehicleWindow);
+            return vehicleWindow;
         }
-        return this._vehicleWindows.get(index);
+        return window;
     }
     getAllWindows() {
         return Object.keys(VehicleWindowIndex)
@@ -37,8 +40,6 @@ export class VehicleWindowCollection {
         });
     }
     hasWindow(window) {
-        if (this._owner.Bones === undefined)
-            return false;
         switch (window) {
             case VehicleWindowIndex.FrontLeftWindow:
                 return this._owner.Bones.hasBone('window_lf');

package/client/ui/menu/Menu.d.ts

@@ -9,8 +9,8 @@ export declare class Menu {
     static screenResolution: Size;
     readonly id: string;
     visible: boolean;
-    parentMenu: Menu | undefined;
-    parentItem: UIMenuItem | undefined;
+    parentMenu?: Menu;
+    parentItem?: UIMenuItem;
     items: UIMenuItem[];
     children: Map<string, Menu>;
     readonly menuOpen: LiteEvent;

package/client/ui/menu/items/UIMenuItem.d.ts

@@ -18,7 +18,7 @@ export declare class UIMenuItem {
     selected: boolean;
     hovered: boolean;
     offset: Point;
-    parent: Menu | undefined;
+    parent?: Menu;
     readonly activated: LiteEvent;
     readonly panelActivated: LiteEvent;
     protected supportsDescription: boolean;

package/client/ui/menu/items/panels/AbstractUIMenuPanel.d.ts

@@ -3,9 +3,9 @@ import { Rectangle, Sprite } from '../../../';
 import { Menu } from '../../';
 export declare abstract class AbstractUIMenuPanel {
     readonly id: string;
-    protected parentItem: UIMenuItem | undefined;
+    protected parentItem?: UIMenuItem;
     protected enabled: boolean;
-    protected readonly background: Sprite | Rectangle | undefined;
+    protected readonly background?: Sprite | Rectangle;
     get ParentMenu(): Menu | undefined;
     get ParentItem(): UIMenuItem | undefined;
     set ParentItem(value: UIMenuItem | undefined);

package/client/ui/menu/items/panels/AbstractUIMenuPanel.js

@@ -10,7 +10,7 @@ export class AbstractUIMenuPanel {
         return this.parentItem ? this.parentItem.parent : undefined;
     }
     get ParentItem() {
-        return this.parentItem ?? undefined;
+        return this.parentItem;
     }
     set ParentItem(value) {
         this.parentItem = value;

package/client/ui/menu/items/panels/UIMenuGridPanel.d.ts

@@ -7,10 +7,10 @@ export declare class UIMenuGridPanel extends AbstractUIMenuPanel {
     private _pressed;
     private _lockXAxis;
     private _lockYAxis;
-    private _topText;
-    private _leftText;
-    private _rightText;
-    private _bottomText;
+    private _topText?;
+    private _leftText?;
+    private _rightText?;
+    private _bottomText?;
     private _lastCirclePosition;
     private readonly _grid;
     private readonly _circle;

package/package.json

@@ -4,7 +4,7 @@
   "author": "Remco Troost <d0p3t>",
   "license": "MIT",
   "type": "module",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "publishConfig": {
     "directory": "lib"
   },