@nativewrappers/fivem 0.0.12 → 0.0.14

package/client/Tasks.d.ts

@@ -1,5 +1,5 @@
 import { AnimationFlags, DrivingStyle, FiringPattern, LeaveVehicleFlags, VehicleSeat } from './enums';
-import { Entity, Ped, Vehicle } from './models';
+import { Ped, Vehicle } from './models';
 import { BaseEntity } from './models/BaseEntity';
 import { TaskSequence } from './TaskSequence';
 import { Vector3 } from './utils';
@@ -32,7 +32,7 @@ export declare class Tasks {
     guardCurrentPosition(): void;
     handsUp(duration: number): void;
     landPlane(startPosition: Vector3, touchdownPosition: Vector3, plane?: Vehicle | null): void;
-    lookAt(targetOrPosition: Entity | Vector3, duration?: number): void;
+    lookAt(targetOrPosition: BaseEntity | Vector3, duration?: number): void;
     parachuteTo(position: Vector3): void;
     parkVehicle(vehicle: Vehicle, position: Vector3, heading: number, radius?: number, keepEngineOn?: boolean): void;
     performSequence(sequence: TaskSequence): void;
@@ -46,7 +46,7 @@ export declare class Tasks {
     standStill(duration: number): void;
     startScenario(name: string, position: Vector3, heading?: number, duration?: number, sittingScenario?: boolean, teleport?: boolean): void;
     swapWeapon(): void;
-    turnTo(targetOrPosition: Entity | Vector3, duration?: number): void;
+    turnTo(targetOrPosition: BaseEntity | Vector3, duration?: number): void;
     useParachute(): void;
     useMobilePhone(duration?: number): void;
     putAwayParachute(): void;

package/client/Tasks.js

@@ -1,5 +1,5 @@
 import { DrivingStyle, FiringPattern, VehicleSeat, } from './enums';
-import { Entity, Ped } from './models';
+import { Ped } from './models';
 import { BaseEntity } from './models/BaseEntity';
 import { Vector3 } from './utils';
 import { LoadAnimDict } from './utils/Animations';
@@ -122,7 +122,7 @@ export class Tasks {
         }
     }
     lookAt(targetOrPosition, duration = -1) {
-        if (targetOrPosition instanceof Entity)
+        if (targetOrPosition instanceof BaseEntity)
             TaskLookAtEntity(this.ped.Handle, targetOrPosition.Handle, duration, 0, 2);
         else
             TaskLookAtCoord(this.ped.Handle, targetOrPosition.x, targetOrPosition.y, targetOrPosition.z, duration, 0, 2);
@@ -177,7 +177,7 @@ export class Tasks {
         TaskSwapWeapon(this.ped.Handle, false);
     }
     turnTo(targetOrPosition, duration = -1) {
-        if (targetOrPosition instanceof Entity)
+        if (targetOrPosition instanceof BaseEntity)
             TaskTurnPedToFaceEntity(this.ped.Handle, targetOrPosition.Handle, duration);
         else
             TaskTurnPedToFaceCoord(this.ped.Handle, targetOrPosition.x, targetOrPosition.y, targetOrPosition.z, duration);

package/client/models/BaseEntity.d.ts

@@ -4,16 +4,11 @@ import { ForceType } from '../enums';
 import { MaterialHash, WeaponHash } from '../hashes';
 import { Model } from '../Model';
 import { Quaternion, Vector3 } from '../utils';
-import { EntityBoneCollection, Ped, Prop, Vehicle } from './';
+import { EntityBoneCollection } from './';
 import { EntityBone } from './EntityBone';
 import { StateBagChangeHandler } from '../cfx';
-import { Entity, Player } from '..';
 import { ClassTypes } from '../enums/ClassTypes';
 export declare class BaseEntity {
-    /**
-     * @deprecated you should use class specific fromHandle instead of this wrapper
-     */
-    static fromHandle(handle: number): Ped | Vehicle | Prop | null;
     static fromNetworkId(networkId: number): BaseEntity | null;
     protected handle: number;
     protected bones: EntityBoneCollection | undefined;
@@ -41,7 +36,6 @@ export declare class BaseEntity {
     listenForStateChange(keyFilter: string | null, handler: StateBagChangeHandler): number;
     removeStateListener(tgtCookie: number): void;
     get Owner(): number;
-    isPlayerOwner(player: Player): boolean;
     get Speed(): number;
     getSpeedVector(isRelative?: boolean): Vector3;
     get ForwardVector(): Vector3;
@@ -124,10 +118,10 @@ export declare class BaseEntity {
     get Bones(): EntityBoneCollection;
     get AttachedBlip(): Blip | null;
     attachBlip(): Blip;
-    setNoCollision(entity: Entity, toggle: boolean): void;
-    hasClearLosToEntity(entity: Entity, traceType?: number): boolean;
-    hasClearLosToEntityInFront(entity: Entity): boolean;
-    hasBeenDamagedBy(entity: Entity): boolean;
+    setNoCollision(entity: BaseEntity, toggle: boolean): void;
+    hasClearLosToEntity(entity: BaseEntity, traceType?: number): boolean;
+    hasClearLosToEntityInFront(entity: BaseEntity): boolean;
+    hasBeenDamagedBy(entity: BaseEntity): boolean;
     hasBeenDamagedByWeapon(weapon: WeaponHash): boolean;
     hasBeenDamagedByAnyWeapon(): boolean;
     hasBeenDamagedByAnyMeleeWeapon(): boolean;
@@ -135,8 +129,8 @@ export declare class BaseEntity {
     isInArea(minBounds: Vector3, maxBounds: Vector3): boolean;
     isInAngledArea(origin: Vector3, edge: Vector3, angle: number): boolean;
     isInRangeOf(position: Vector3, range: number): boolean;
-    isNearEntity(entity: Entity, bounds: Vector3): boolean;
-    isTouching(entity: Entity): boolean;
+    isNearEntity(entity: BaseEntity, bounds: Vector3): boolean;
+    isTouching(entity: BaseEntity): boolean;
     isTouchingModel(model: Model): boolean;
     /**
      * @param offset: the amount to offset from the entity
@@ -144,12 +138,12 @@ export declare class BaseEntity {
      */
     getOffsetPosition(offset: Vector3): Vector3;
     getPositionOffset(worldCoords: Vector3): Vector3;
-    attachTo(entity: Entity, position: Vector3, rotation: Vector3, collisions?: boolean, unk9?: boolean, useSoftPinning?: boolean, rotationOrder?: number): void;
+    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;
     isAttached(): boolean;
-    isAttachedTo(entity: Entity): boolean;
-    getEntityAttachedTo(): Ped | Vehicle | Prop | null;
+    isAttachedTo(entity: BaseEntity): boolean;
+    getEntityAttachedTo(): BaseEntity;
     applyForce(direction: Vector3, rotation: Vector3, forceType?: ForceType): void;
     applyForceRelative(direction: Vector3, rotation: Vector3, forceType?: ForceType): void;
     /**

package/client/models/BaseEntity.js

@@ -1,28 +1,11 @@
 import { Blip } from '../Blip';
 import { ForceType } from '../enums';
-import { Game } from '../Game';
 import { Model } from '../Model';
 import { Quaternion, Vector3 } from '../utils';
-import { EntityBoneCollection, Ped, Prop, Vehicle } from './';
+import { EntityBoneCollection } from './';
 import cfx from '../cfx';
-import { Entity } from '..';
 import { ClassTypes } from '../enums/ClassTypes';
 export class BaseEntity {
-    /**
-     * @deprecated you should use class specific fromHandle instead of this wrapper
-     */
-    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 new BaseEntity(NetworkGetEntityFromNetworkId(networkId));
     }
@@ -97,9 +80,9 @@ export class BaseEntity {
     get Owner() {
         return NetworkGetEntityOwner(this.handle);
     }
-    isPlayerOwner(player) {
-        return this.Owner === player.Handle;
-    }
+    // public isPlayerOwner(player: Player): boolean {
+    //     return this.Owner === player.Handle;
+    // }
     get Speed() {
         return GetEntitySpeed(this.handle);
     }
@@ -418,7 +401,7 @@ export class BaseEntity {
         return IsEntityAttachedToEntity(this.handle, entity.Handle);
     }
     getEntityAttachedTo() {
-        return Entity.fromHandle(GetEntityAttachedTo(this.handle));
+        return new BaseEntity(GetEntityAttachedTo(this.handle));
     }
     applyForce(direction, rotation, forceType = ForceType.MaxForceRot2) {
         ApplyForceToEntity(this.handle, Number(forceType), direction.x, direction.y, direction.z, rotation.x, rotation.y, rotation.z, 0, false, true, true, false, true);
@@ -442,12 +425,10 @@ export class BaseEntity {
         return DoesEntityExist(this.handle);
     }
     delete() {
-        if (this.handle !== Game.PlayerPed.Handle) {
-            this.IsMissionEntity = true;
-            DeleteEntity(this.handle);
-            for (const cookie of this.stateBagCookies) {
-                RemoveStateBagChangeHandler(cookie);
-            }
+        this.IsMissionEntity = true;
+        DeleteEntity(this.handle);
+        for (const cookie of this.stateBagCookies) {
+            RemoveStateBagChangeHandler(cookie);
         }
     }
     /**

package/package.json

@@ -4,7 +4,7 @@
   "author": "Remco Troost <d0p3t>",
   "license": "MIT",
   "type": "module",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "publishConfig": {
     "directory": "lib"
   },
@@ -13,9 +13,6 @@
     "./server": "./server/index.js",
     "./client": "./client/index.js"
   },
-  "sideEffects": [
-    "./client/src/models/**"
-  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/nativewrappers/fivem.git"