@nativewrappers/fivem 0.0.25 → 0.0.28

package/client/Events.js

@@ -1,5 +1,4 @@
-/* eslint-disable */
-import { ClassTypes } from './enums/ClassTypes';
+import { ClassTypes } from '../common/utils/ClassTypes';
 import { Ped } from './models/Ped';
 import { Vector2, Vector3, Vector4 } from './utils';
 import { Player } from './models/Player';
@@ -9,6 +8,10 @@ import { BaseEntity } from './models';
 const getClassFromArguments = (...args) => {
     const newArgs = [];
     for (const arg of args) {
+        if (!arg.type) {
+            newArgs.push(arg);
+            continue;
+        }
         switch (arg.type) {
             case ClassTypes.Vector2: {
                 newArgs.push(Vector2.fromObject(arg));

package/client/Game.js

@@ -430,7 +430,10 @@ export class Game {
         ExtendWorldBoundaryForPlayer(vec.x, vec.y, vec.z);
     }
     get LastVehicle() {
-        return new Vehicle(GetPlayersLastVehicle());
+        const vehicle = GetPlayersLastVehicle();
+        if (vehicle === 0)
+            return null;
+        return new Vehicle(vehicle);
     }
     static getWaypointBlip() {
         if (!Game.IsWaypointActive)

package/client/models/BaseEntity.d.ts

@@ -7,7 +7,7 @@ import { Quaternion, Vector3 } from '../utils';
 import { EntityBoneCollection } from './';
 import { EntityBone } from './EntityBone';
 import { StateBagChangeHandler } from '../cfx';
-import { ClassTypes } from '../enums/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 export declare class BaseEntity {
     static fromNetworkId(networkId: number): BaseEntity | null;
     static fromStateBagName(stateBagName: string): BaseEntity | null;

package/client/models/BaseEntity.js

@@ -4,17 +4,16 @@ import { Model } from '../Model';
 import { Quaternion, Vector3 } from '../utils';
 import { EntityBoneCollection } from './';
 import cfx from '../cfx';
-import { ClassTypes } from '../enums/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 export class BaseEntity {
     static fromNetworkId(networkId) {
         return new BaseEntity(NetworkGetEntityFromNetworkId(networkId));
     }
     static fromStateBagName(stateBagName) {
         const entity = GetEntityFromStateBagName(stateBagName);
-        if (entity !== 0) {
-            return new BaseEntity(entity);
-        }
-        return null;
+        if (entity === 0)
+            return null;
+        return new BaseEntity(entity);
     }
     constructor(handle) {
         this.stateBagCookies = [];

package/client/models/Ped.d.ts

@@ -4,7 +4,7 @@ import { WeaponHash } from '../hashes';
 import { Tasks } from '../Tasks';
 import { PedBoneCollection, Vehicle } from './';
 import { WeaponCollection } from '../weapon/WeaponCollection';
-import { ClassTypes } from '../enums/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity } from './BaseEntity';
 export declare class Ped extends BaseEntity {
     static exists(ped: Ped): boolean;

package/client/models/Ped.js

@@ -3,7 +3,7 @@ import { Gender, RagdollType, SpeechModifier, VehicleSeat, } from '../enums';
 import { Tasks } from '../Tasks';
 import { PedBoneCollection, Vehicle } from './';
 import { WeaponCollection } from '../weapon/WeaponCollection';
-import { ClassTypes } from '../enums/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity } from './BaseEntity';
 export class Ped extends BaseEntity {
     static exists(ped) {

package/client/models/Player.js

@@ -1,6 +1,6 @@
 import { Model, Color } from '..';
 import cfx from '../cfx';
-import { ClassTypes } from '../enums/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity, Ped } from './';
 export class Player {
     static fromPedHandle(handle) {

package/client/models/Prop.d.ts

@@ -1,4 +1,4 @@
-import { ClassTypes } from '../enums/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity } from './BaseEntity';
 export declare class Prop extends BaseEntity {
     static exists(prop: Prop): boolean;

package/client/models/Prop.js

@@ -1,4 +1,4 @@
-import { ClassTypes } from '../enums/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity } from './BaseEntity';
 export class Prop extends BaseEntity {
     static exists(prop) {

package/client/models/Vehicle.d.ts

@@ -2,7 +2,7 @@ import { Ped, VehicleDoorCollection, VehicleModCollection, VehicleWheelCollectio
 import { RadioStation, VehicleClass, VehicleLandingGearState, VehicleLockStatus, VehicleRoofState, VehicleSeat } from '../enums';
 import { Model } from '../Model';
 import { Vector3 } from '../utils';
-import { ClassTypes } from '../enums/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity } from './BaseEntity';
 export declare class Vehicle extends BaseEntity {
     static getModelDisplayName(vehicleModel: Model): string;

package/client/models/Vehicle.js

@@ -2,7 +2,7 @@ import { Ped, VehicleDoorCollection, VehicleModCollection, VehicleWheelCollectio
 import { VehicleRoofState, VehicleSeat, } from '../enums';
 import { Game } from '../Game';
 import { Vector3 } from '../utils';
-import { ClassTypes } from '../enums/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity } from './BaseEntity';
 export class Vehicle extends BaseEntity {
     static getModelDisplayName(vehicleModel) {

package/common/utils/Vector.d.ts

@@ -1,4 +1,5 @@
 import type { MsgpackBuffer } from '../types';
+import { ClassTypes } from './ClassTypes';
 /**
  * Represents a 2-dimensional vector.
  */
@@ -57,7 +58,7 @@ export declare class Vector {
     /**
      * The type identifier for vectors.
      */
-    type: string;
+    type: ClassTypes;
     protected static create(x: number, y?: number): Vector2;
     protected static create(x: number, y?: number, z?: number): Vector3;
     protected static create(x: number, y?: number, z?: number, w?: number): Vector4;
@@ -195,7 +196,6 @@ export declare class Vector {
     constructor(size: number, x?: number, y?: number, z?: number | undefined, w?: number | undefined);
     [Symbol.iterator](): Iterator<number>;
     toString(): string;
-    toJSON(): string;
     /**
      * @see Vector.clone
      */
@@ -265,7 +265,7 @@ export declare class Vector {
  * Represents a 2-dimensional vector.
  */
 export declare class Vector2 extends Vector {
-    type: string;
+    type: ClassTypes;
     static readonly Zero: Vector2;
     /**
      * Constructs a new 2D vector.
@@ -278,7 +278,7 @@ export declare class Vector2 extends Vector {
  * Represents a 3-dimensional vector.
  */
 export declare class Vector3 extends Vector implements Vec3 {
-    type: string;
+    type: ClassTypes;
     z: number;
     static readonly Zero: Vector3;
     /**
@@ -301,7 +301,7 @@ export declare class Vector3 extends Vector implements Vec3 {
  * Represents a 4-dimensional vector.
  */
 export declare class Vector4 extends Vector {
-    type: string;
+    type: ClassTypes;
     z: number;
     w: number;
     static readonly Zero: Vector4;

package/common/utils/Vector.js

@@ -1,4 +1,5 @@
 // Adapted from https://raw.githubusercontent.com/you21979/typescript-vector/master/vector3.ts
+import { ClassTypes } from './ClassTypes';
 /**
  * A base vector class inherited by all vector classes.
  */
@@ -16,16 +17,14 @@ export class Vector {
             return new Vector2(x, x);
         if (typeof x === 'object')
             ({ x, y, z, w } = x);
-        const type = this instanceof Vector
-            ? this.type
-            : `vec${[x, y, z, w].filter(arg => arg !== undefined).length}`;
-        switch (type) {
+        const size = this instanceof Vector ? this.size : [x, y, z, w].filter(arg => arg !== undefined).length;
+        switch (size) {
             default:
-            case 'vec':
+            case 2:
                 return new Vector2(x, y);
-            case 'vec3':
+            case 3:
                 return new Vector3(x, y, z);
-            case 'vec4':
+            case 4:
                 return new Vector4(x, y, z, w);
         }
     }
@@ -155,11 +154,12 @@ export class Vector {
     static dotProduct(a, b) {
         let result = 0;
         for (const key of ['x', 'y', 'z', 'w']) {
-            if (key in a && key in b)
-                result += a[key] * b[key];
-            else {
+            const x = a[key];
+            const y = b[key];
+            if (!!x && !!y)
+                result += x * y;
+            else if (x || y)
                 throw new Error('Vectors must have the same dimensions');
-            }
         }
         return result;
     }
@@ -247,7 +247,7 @@ export class Vector {
         /**
          * The type identifier for vectors.
          */
-        this.type = 'vec';
+        this.type = ClassTypes.Vector2;
     }
     *[Symbol.iterator]() {
         yield this.x;
@@ -258,11 +258,7 @@ export class Vector {
             yield this.w;
     }
     toString() {
-        const { x, y, z, w } = this;
-        return `${this.type}(${[x, y, z, w].filter(val => val !== undefined).join(', ')})`;
-    }
-    toJSON() {
-        return this.toString();
+        return `vector${this.size}(${this.toArray().join(', ')})`;
     }
     /**
      * @see Vector.clone
@@ -375,7 +371,7 @@ export class Vector2 extends Vector {
      */
     constructor(x, y = x) {
         super(2, x, y);
-        this.type = 'vec2';
+        this.type = ClassTypes.Vector2;
     }
 }
 Vector2.Zero = new Vector2(0, 0);
@@ -391,7 +387,7 @@ export class Vector3 extends Vector {
      */
     constructor(x, y = x, z = y) {
         super(3, x, y, z);
-        this.type = 'vec3';
+        this.type = ClassTypes.Vector3;
         this.z = z;
     }
     /**
@@ -421,7 +417,7 @@ export class Vector4 extends Vector {
      */
     constructor(x, y = x, z = y, w = z) {
         super(4, x, y, z, w);
-        this.type = 'vec4';
+        this.type = ClassTypes.Vector4;
         this.z = z;
         this.w = w;
     }

package/package.json

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

package/server/Events.d.ts

@@ -1,5 +1,6 @@
 import { Player } from './entities/Player';
 export type NetEvent = (player: Player, ...args: any[]) => void;
+export type LocalEvent = (...args: any[]) => void;
 export declare class Events {
     static cancel(): void;
     static wasCanceled(): boolean;
@@ -11,5 +12,5 @@ export declare class Events {
     /**
      * An on wrapper that properly converts the classes
      */
-    static on: (eventName: string, event: NetEvent) => void;
+    static on: (eventName: string, event: LocalEvent) => void;
 }

package/server/Events.js

@@ -1,11 +1,14 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { Ped, Prop, Vehicle, Entity } from './entities';
 import { Player } from './entities/Player';
-import { ClassTypes } from './enum/ClassTypes';
+import { ClassTypes } from '../common/utils/ClassTypes';
 import { Vector2, Vector3, Vector4 } from './utils';
 const getClassFromArguments = (...args) => {
     const newArgs = [];
     for (const arg of args) {
+        if (!arg.type) {
+            newArgs.push(arg);
+            continue;
+        }
         switch (arg.type) {
             case ClassTypes.Vector2: {
                 newArgs.push(Vector2.fromObject(arg));
@@ -71,7 +74,6 @@ Events.onNet = (eventName, event) => {
  */
 Events.on = (eventName, event) => {
     on(eventName, (...args) => {
-        const ply = new Player(source);
-        event(ply, ...getClassFromArguments(...args));
+        event(...getClassFromArguments(...args));
     });
 };

package/server/entities/BaseEntity.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="@citizenfx/server" />
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { eEntityType } from '../enum/eEntityType';
 import { PopulationType } from '../enum/PopulationType';
 import { Hash } from '../type/Hash';

package/server/entities/BaseEntity.js

@@ -1,5 +1,5 @@
 import cfx from '../cfx';
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { Vector4 } from '../utils';
 import { Vector3 } from '../utils';
 export class BaseEntity {

package/server/entities/Ped.d.ts

@@ -1,4 +1,4 @@
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { Hash } from '../type/Hash';
 import { BaseEntity } from './BaseEntity';
 import { Vehicle } from './Vehicle';

package/server/entities/Ped.js

@@ -1,4 +1,4 @@
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity } from './BaseEntity';
 import { Vehicle } from './Vehicle';
 export class Ped extends BaseEntity {

package/server/entities/Player.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="@citizenfx/server" />
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { Vector3 } from '../utils';
 import { Ped } from './Ped';
 export declare class Player {

package/server/entities/Player.js

@@ -1,5 +1,5 @@
 import cfx from '../cfx';
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { cleanPlayerName } from '../utils';
 import { Vector3 } from '../utils';
 import { Ped } from './Ped';
@@ -129,7 +129,6 @@ export class Player {
     drop(reason = 'No reason specified') {
         DropPlayer(this.Src, reason);
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     emit(eventName, ...args) {
         TriggerClientEvent(eventName, this.source, ...args);
     }

package/server/entities/Prop.d.ts

@@ -1,4 +1,4 @@
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity } from './BaseEntity';
 export declare class Prop extends BaseEntity {
     protected type: ClassTypes;

package/server/entities/Prop.js

@@ -1,4 +1,4 @@
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { BaseEntity } from './BaseEntity';
 export class Prop extends BaseEntity {
     constructor(handle) {

package/server/entities/Vehicle.d.ts

@@ -1,4 +1,4 @@
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { VehicleLockStatus } from '../enum/VehicleLockStatus';
 import { VehicleType } from '../enum/VehicleType';
 import { Hash } from '../type/Hash';

package/server/entities/Vehicle.js

@@ -1,4 +1,4 @@
-import { ClassTypes } from '../enum/ClassTypes';
+import { ClassTypes } from '../../common/utils/ClassTypes';
 import { Color } from '../utils';
 import { BaseEntity } from './BaseEntity';
 export class Vehicle extends BaseEntity {

package/server/enum/index.d.ts

@@ -1,4 +1,3 @@
-export { ClassTypes } from './ClassTypes';
 export { eEntityType } from './eEntityType';
 export { PopulationType } from './PopulationType';
 export { VehicleLockStatus } from './VehicleLockStatus';

package/server/enum/index.js

@@ -1,4 +1,3 @@
-export { ClassTypes } from './ClassTypes';
 export { eEntityType } from './eEntityType';
 export { PopulationType } from './PopulationType';
 export { VehicleLockStatus } from './VehicleLockStatus';

package/server/enum/ClassTypes.d.ts

@@ -1,11 +0,0 @@
-export declare enum ClassTypes {
-    Ped = 0,
-    Prop = 1,
-    Vehicle = 2,
-    Entity = 3,
-    Player = 4,
-    Vector2 = 5,
-    Vector3 = 6,
-    Vector4 = 7,
-    Quanterion = 8
-}

package/server/enum/ClassTypes.js

@@ -1,12 +0,0 @@
-export var ClassTypes;
-(function (ClassTypes) {
-    ClassTypes[ClassTypes["Ped"] = 0] = "Ped";
-    ClassTypes[ClassTypes["Prop"] = 1] = "Prop";
-    ClassTypes[ClassTypes["Vehicle"] = 2] = "Vehicle";
-    ClassTypes[ClassTypes["Entity"] = 3] = "Entity";
-    ClassTypes[ClassTypes["Player"] = 4] = "Player";
-    ClassTypes[ClassTypes["Vector2"] = 5] = "Vector2";
-    ClassTypes[ClassTypes["Vector3"] = 6] = "Vector3";
-    ClassTypes[ClassTypes["Vector4"] = 7] = "Vector4";
-    ClassTypes[ClassTypes["Quanterion"] = 8] = "Quanterion";
-})(ClassTypes || (ClassTypes = {}));