@nativewrappers/fivem 0.0.15 → 0.0.17

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

@@ -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/package.json

@@ -4,7 +4,7 @@
   "author": "Remco Troost <d0p3t>",
   "license": "MIT",
   "type": "module",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "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/server/entities/Ped.d.ts

@@ -10,6 +10,7 @@ export declare class Ped extends BaseEntity {
      */
     static AllPeds(): IterableIterator<Ped>;
     static fromNetworkId(netId: number): Ped;
+    static fromSource(source: number): Ped;
     static fromHandle(handle: number): Ped;
     get Armour(): number;
     get CauseOfDeath(): Hash;

package/server/entities/Ped.js

@@ -17,6 +17,9 @@ export class Ped extends BaseEntity {
     static fromNetworkId(netId) {
         return new Ped(NetworkGetEntityFromNetworkId(netId));
     }
+    static fromSource(source) {
+        return new Ped(GetPlayerPed(source));
+    }
     static fromHandle(handle) {
         return new Ped(handle);
     }

package/server/entities/Vehicle.d.ts

@@ -37,6 +37,7 @@ export declare class Vehicle extends BaseEntity {
     get Livery(): number;
     get LockOnTarget(): Vehicle;
     get Plate(): string;
+    get PlateTrimmed(): string;
     get PlateIndex(): number;
     get PetrolTankHealth(): number;
     get RadioStation(): number;

package/server/entities/Vehicle.js

@@ -92,6 +92,9 @@ export class Vehicle extends BaseEntity {
     get Plate() {
         return GetVehicleNumberPlateText(this.handle);
     }
+    get PlateTrimmed() {
+        return this.Plate.trim();
+    }
     get PlateIndex() {
         return GetVehicleNumberPlateTextIndex(this.handle);
     }