@nativewrappers/fivem 0.0.14 → 0.0.16

package/client/Blip.d.ts

@@ -1,7 +1,6 @@
 import { Vector3 } from './utils';
 import { BlipColor, BlipSprite } from './enums';
-import { Player } from './models';
-import { EntityType } from './types/EntityType';
+import { BaseEntity, Player } from './models';
 export declare class Blip {
     protected handle: number;
     constructor(handle: number);
@@ -22,7 +21,7 @@ export declare class Blip {
     set Display(display: number);
     set Name(name: string);
     setNameToPlayerName(player: Player): void;
-    get Entity(): EntityType | null;
+    get Entity(): BaseEntity | null;
     set ShowHeadingIndicator(show: boolean);
     set ShowRoute(show: boolean);
     set IsFriendly(friendly: boolean);

package/client/Blip.js

@@ -1,5 +1,5 @@
 import { Vector3 } from './utils';
-import { Entity } from './models/Entity';
+import { BaseEntity } from './models';
 export class Blip {
     constructor(handle) {
         this.handle = handle;
@@ -58,7 +58,7 @@ export class Blip {
         SetBlipNameToPlayerName(this.handle, player.Handle);
     }
     get Entity() {
-        return Entity.fromHandle(GetBlipInfoIdEntityIndex(this.handle));
+        return new BaseEntity(GetBlipInfoIdEntityIndex(this.handle));
     }
     set ShowHeadingIndicator(show) {
         ShowHeadingIndicatorOnBlip(this.handle, show);

package/client/Events.d.ts

@@ -3,9 +3,9 @@ export declare class Events {
     /**
      * An onNet wrapper that properly converts the type into the correct type
      */
-    onNet: (eventName: string, event: NetEvent) => void;
+    static onNet: (eventName: string, event: NetEvent) => void;
     /**
      * An on wrapper that properly converts the classes
      */
-    on: (eventName: string, event: NetEvent) => void;
+    static on: (eventName: string, event: NetEvent) => void;
 }

package/client/Events.js

@@ -7,7 +7,7 @@ import { Vector4 } from './utils/Vector4';
 import { Player } from './models/Player';
 import { Prop } from './models/Prop';
 import { Vehicle } from './models/Vehicle';
-import { Entity } from './models/Entity';
+import { BaseEntity } from './models';
 const getClassFromArguments = (...args) => {
     const newArgs = [];
     for (const arg of args) {
@@ -41,7 +41,7 @@ const getClassFromArguments = (...args) => {
                 continue;
             }
             case ClassTypes.Entity: {
-                newArgs.push(Entity.fromNetworkId(arg.netId));
+                newArgs.push(BaseEntity.fromNetworkId(arg.netId));
                 continue;
             }
             default: {
@@ -51,23 +51,23 @@ const getClassFromArguments = (...args) => {
     }
     return newArgs;
 };
+// TODO: Add a third argument to enable recursive decent and change any
+// object/array to its proper type
 export class Events {
-    constructor() {
-        /**
-         * An onNet wrapper that properly converts the type into the correct type
-         */
-        this.onNet = (eventName, event) => {
-            onNet(eventName, (...args) => {
-                event(...getClassFromArguments(...args));
-            });
-        };
-        /**
-         * An on wrapper that properly converts the classes
-         */
-        this.on = (eventName, event) => {
-            on(eventName, (...args) => {
-                event(...getClassFromArguments(...args));
-            });
-        };
-    }
 }
+/**
+ * An onNet wrapper that properly converts the type into the correct type
+ */
+Events.onNet = (eventName, event) => {
+    onNet(eventName, (...args) => {
+        event(...getClassFromArguments(...args));
+    });
+};
+/**
+ * An on wrapper that properly converts the classes
+ */
+Events.on = (eventName, event) => {
+    on(eventName, (...args) => {
+        event(...getClassFromArguments(...args));
+    });
+};

package/client/models/BaseEntity.d.ts

@@ -10,6 +10,7 @@ import { StateBagChangeHandler } from '../cfx';
 import { ClassTypes } from '../enums/ClassTypes';
 export declare class BaseEntity {
     static fromNetworkId(networkId: number): BaseEntity | null;
+    static fromStateBagName(stateBagName: string): BaseEntity | null;
     protected handle: number;
     protected bones: EntityBoneCollection | undefined;
     protected stateBagCookies: number[];

package/client/models/BaseEntity.js

@@ -9,6 +9,13 @@ 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;
+    }
     constructor(handle) {
         this.stateBagCookies = [];
         this.netId = null;

package/client/models/Entity.d.ts

@@ -1,9 +1 @@
-import { Ped, Prop, Vehicle } from './';
-import { ClassTypes } from '../enums/ClassTypes';
-import { BaseEntity } from './BaseEntity';
-export declare class Entity extends BaseEntity {
-    static fromHandle(handle: number): Ped | Vehicle | Prop | null;
-    static fromNetworkId(networkId: number): Ped | Vehicle | Prop | null;
-    protected type: ClassTypes;
-    constructor(handle: number);
-}
+export {};

package/client/models/Entity.js

@@ -1,24 +1,25 @@
-import { Ped, Prop, Vehicle } from './';
-import { ClassTypes } from '../enums/ClassTypes';
-import { BaseEntity } from './BaseEntity';
-export class Entity extends BaseEntity {
-    static fromHandle(handle) {
-        switch (GetEntityType(handle)) {
-            case 1:
-                return new Ped(handle);
-            case 2:
-                return new Vehicle(handle);
-            case 3:
-                return new Prop(handle);
-            default:
-                return null;
-        }
-    }
-    static fromNetworkId(networkId) {
-        return this.fromHandle(NetworkGetEntityFromNetworkId(networkId));
-    }
-    constructor(handle) {
-        super(handle);
-        this.type = ClassTypes.Entity;
-    }
-}
+export {};
+// export class Entity extends BaseEntity {
+// 	public static fromHandle(handle: number): Ped | Vehicle | Prop | null {
+// 		switch (GetEntityType(handle)) {
+// 			case 1:
+// 				return new Ped(handle);
+// 			case 2:
+// 				return new Vehicle(handle);
+// 			case 3:
+// 				return new Prop(handle);
+// 			default:
+// 				return null;
+// 		}
+// 	}
+//
+// 	public static fromNetworkId(networkId: number): Ped | Vehicle | Prop | null {
+// 		return this.fromHandle(NetworkGetEntityFromNetworkId(networkId));
+// 	}
+//
+// 	protected type = ClassTypes.Entity;
+//
+// 	constructor(handle: number) {
+// 		super(handle);
+// 	}
+// }

package/client/models/Player.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="@citizenfx/client" />
-import { Prop, Vehicle, Model, Color } from '..';
+import { Model, Color } from '..';
 import { StateBagChangeHandler } from '../cfx';
-import { Ped } from './';
+import { BaseEntity, Ped } from './';
 export declare class Player {
     private handle;
     private ped;
@@ -37,7 +37,7 @@ export declare class Player {
     get PvPEnabled(): boolean;
     set PvPEnabled(value: boolean);
     get IsDead(): boolean;
-    get EntityPlayerIsAimingAt(): Ped | Vehicle | Prop | null;
+    get EntityPlayerIsAimingAt(): BaseEntity | null;
     get StealthNoise(): number;
     get FakeWantedLevel(): number;
     get PlayerGroup(): number;
@@ -57,7 +57,7 @@ export declare class Player {
     /**
      * The players melee target?
      */
-    get TargetEntity(): Ped | Vehicle | Prop | null;
+    get TargetEntity(): BaseEntity | null;
     get Team(): number;
     CanPedHearPlayer(ped: Ped): boolean;
 }

package/client/models/Player.js

@@ -1,7 +1,7 @@
-import { Entity, Model, Color } from '..';
+import { Model, Color } from '..';
 import cfx from '../cfx';
 import { ClassTypes } from '../enums/ClassTypes';
-import { Ped } from './';
+import { BaseEntity, Ped } from './';
 export class Player {
     static fromPedHandle(handle) {
         return new Player(NetworkGetPlayerIndexFromPed(handle));
@@ -97,7 +97,7 @@ export class Player {
     get EntityPlayerIsAimingAt() {
         const [entityHit, entity] = GetEntityPlayerIsFreeAimingAt(this.handle);
         if (entityHit) {
-            return Entity.fromHandle(entity);
+            return new BaseEntity(entity);
         }
         return null;
     }
@@ -160,7 +160,7 @@ export class Player {
     get TargetEntity() {
         const [entityHit, entity] = GetPlayerTargetEntity(this.handle);
         if (entityHit) {
-            return Entity.fromHandle(entity);
+            return new BaseEntity(entity);
         }
         return null;
     }

package/client/models/index.d.ts

@@ -1,5 +1,4 @@
 export { BaseEntity } from './BaseEntity';
-export { Entity } from './Entity';
 export { EntityBone } from './EntityBone';
 export { EntityBoneCollection } from './EntityBoneCollection';
 export { Ped } from './Ped';

package/client/models/index.js

@@ -1,5 +1,5 @@
 export { BaseEntity } from './BaseEntity';
-export { Entity } from './Entity';
+// export { Entity } from './Entity';
 export { EntityBone } from './EntityBone';
 export { EntityBoneCollection } from './EntityBoneCollection';
 export { Ped } from './Ped';

package/package.json

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

package/server/Events.d.ts

@@ -7,9 +7,9 @@ export declare class Events {
     /**
      * An onNet wrapper that properly converts the type into the correct type
      */
-    onNet: (eventName: string, event: NetEvent) => void;
+    static onNet: (eventName: string, event: NetEvent) => void;
     /**
      * An on wrapper that properly converts the classes
      */
-    on: (eventName: string, event: NetEvent) => void;
+    static on: (eventName: string, event: NetEvent) => void;
 }

package/server/Events.js

@@ -47,26 +47,6 @@ const getClassFromArguments = (...args) => {
     return newArgs;
 };
 export class Events {
-    constructor() {
-        /**
-         * An onNet wrapper that properly converts the type into the correct type
-         */
-        this.onNet = (eventName, event) => {
-            onNet(eventName, (...args) => {
-                const ply = new Player(source);
-                event(ply, ...getClassFromArguments(...args));
-            });
-        };
-        /**
-         * An on wrapper that properly converts the classes
-         */
-        this.on = (eventName, event) => {
-            on(eventName, (...args) => {
-                const ply = new Player(source);
-                event(ply, ...getClassFromArguments(...args));
-            });
-        };
-    }
     static cancel() {
         CancelEvent();
     }
@@ -77,3 +57,21 @@ export class Events {
         return GetInvokingResource();
     }
 }
+/**
+ * An onNet wrapper that properly converts the type into the correct type
+ */
+Events.onNet = (eventName, event) => {
+    onNet(eventName, (...args) => {
+        const ply = new Player(source);
+        event(ply, ...getClassFromArguments(...args));
+    });
+};
+/**
+ * An on wrapper that properly converts the classes
+ */
+Events.on = (eventName, event) => {
+    on(eventName, (...args) => {
+        const ply = new Player(source);
+        event(ply, ...getClassFromArguments(...args));
+    });
+};

package/client/types/EntityType.d.ts

@@ -1,2 +0,0 @@
-import { Ped, Prop, Vehicle } from '../models';
-export type EntityType = Ped | Vehicle | Prop;

package/client/types/EntityType.js

@@ -1 +0,0 @@
-export {};