rock-mod 0.22.0 → 0.23.0

package/dist/client/entities/ccmp/object/CCMPObject.d.ts

@@ -1,6 +1,6 @@
+import { type Object as CcmpObject } from "@classic-mp/types/client";
 import { BaseObjectType } from "../../../../shared/entities";
 import { type IVector3D, Vector3D } from "../../../../shared/common/utils";
-import { type Object as CcmpObject } from "@classic-mp/types/client";
 import { type IBaseObject } from "../../common/baseObject/IBaseObject";
 import { type IObject } from "../../common/object/IObject";
 export declare class CCMPObject implements IObject {
@@ -17,12 +17,12 @@ export declare class CCMPObject implements IObject {
     get position(): Vector3D;
     get dimension(): number;
     setPosition(value: IVector3D): void;
-    setDimension(_value: number): void;
+    setDimension(value: number): void;
     setCoords(xPos: number, yPos: number, zPos: number, xAxis: boolean, yAxis: boolean, zAxis: boolean, clearArea: boolean): void;
     get model(): number;
     get heading(): number;
     setHeading(heading: number): void;
-    setModel(_value: string): void;
+    setModel(value: string): void;
     get rotation(): Vector3D;
     get forwardVector(): Vector3D;
     setRotation(value: IVector3D): void;
@@ -46,8 +46,5 @@ export declare class CCMPObject implements IObject {
     detach(useDetachVelocity: boolean, collision: boolean): void;
     getSpeed(): number;
     isPlayingAnim(dictionary: string, name: string, taskFlag: number): boolean;
-    private _withHandle;
-    private _withHandleVoid;
     private _normalizeHandle;
-    private _getOffsetFromCachedTransform;
 }

package/dist/client/entities/ccmp/object/CCMPObject.js

@@ -1,9 +1,5 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import { BaseObjectType } from "../../../../shared/entities";
 import { Vector3D } from "../../../../shared/common/utils";
-const notImplemented = (memberName) => {
-    throw new Error(`CCMPObject.${memberName}: not implemented`);
-};
 export class CCMPObject {
     constructor(_ccmpObject, _onDestroy = () => { }) {
         this._ccmpObject = _ccmpObject;
@@ -23,8 +19,7 @@ export class CCMPObject {
         return !this._destroyed && this._ccmpObject.isExists;
     }
     get handle() {
-        const handle = Number(this._ccmpObject.handle);
-        return Number.isFinite(handle) && handle > 0 ? Math.trunc(handle) : 0;
+        return this._normalizeHandle(this._ccmpObject.handle);
     }
     destroy() {
         if (this._destroyed)
@@ -41,15 +36,13 @@ export class CCMPObject {
         return this._ccmpObject.dimension;
     }
     setPosition(value) {
-        this.setCoords(value.x, value.y, value.z, false, false, false, false);
+        this._ccmpObject.setPosition(value);
     }
-    setDimension(_value) {
-        notImplemented("setDimension");
+    setDimension(value) {
+        this._ccmpObject.setDimension(value);
     }
     setCoords(xPos, yPos, zPos, xAxis, yAxis, zAxis, clearArea) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.setEntityCoords(handle, xPos, yPos, zPos, xAxis, yAxis, zAxis, clearArea);
-        });
+        this._ccmpObject.setCoords(xPos, yPos, zPos, xAxis, yAxis, zAxis, clearArea);
     }
     get model() {
         return this._ccmpObject.model;
@@ -58,161 +51,99 @@ export class CCMPObject {
         return this._ccmpObject.heading;
     }
     setHeading(heading) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.setEntityHeading(handle, heading);
-        });
+        this._ccmpObject.setHeading(heading);
     }
-    setModel(_value) {
-        notImplemented("setModel");
+    setModel(value) {
+        this._ccmpObject.setModel(value);
     }
     get rotation() {
         const { x, y, z } = this._ccmpObject.rotation;
         return new Vector3D(x, y, z);
     }
     get forwardVector() {
-        const headingRad = (this.heading * Math.PI) / 180;
-        return new Vector3D(-Math.sin(headingRad), Math.cos(headingRad), 0);
+        const { x, y, z } = this._ccmpObject.forwardVector;
+        return new Vector3D(x, y, z);
     }
     setRotation(value) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.setEntityRotation(handle, value.x, value.y, value.z, 2, true);
-        });
+        this._ccmpObject.setRotation(value);
     }
     freezePosition(freeze) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.freezeEntityPosition(handle, freeze);
-        });
+        this._ccmpObject.freezePosition(freeze);
     }
     setCollision(collision, keepPhysics) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.setEntityCollision(handle, collision, keepPhysics);
-        });
+        this._ccmpObject.setCollision(collision, keepPhysics);
     }
     setInvincible(invincible) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.setEntityInvincible(handle, invincible, true);
-        });
+        this._ccmpObject.setInvincible(invincible);
     }
     setVisible(visible) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.setEntityVisible(handle, visible, false);
-        });
+        this._ccmpObject.setVisible(visible);
     }
     setAlpha(alpha) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.setEntityAlpha(handle, alpha, false);
-        });
+        this._ccmpObject.setAlpha(alpha);
     }
     get alpha() {
-        return this._withHandle(this._ccmpObject.alpha, (handle) => ccmp.natives.entity.getEntityAlpha(handle));
+        return this._ccmpObject.alpha;
     }
     resetAlpha() {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.resetEntityAlpha(handle);
-        });
+        this._ccmpObject.resetAlpha();
     }
     getOffsetFromInWorldCoords(offsetX, offsetY, offsetZ) {
-        return this._withHandle(this._getOffsetFromCachedTransform(offsetX, offsetY, offsetZ), (handle) => {
-            const { x, y, z } = ccmp.natives.entity.getOffsetFromEntityInWorldCoords(handle, offsetX, offsetY, offsetZ);
-            return new Vector3D(x, y, z);
-        });
+        const { x, y, z } = this._ccmpObject.getOffsetFromInWorldCoords(offsetX, offsetY, offsetZ);
+        return new Vector3D(x, y, z);
     }
     getBoneIndexByName(boneName) {
-        return this._withHandle(-1, (handle) => ccmp.natives.entity.getEntityBoneIndexByName(handle, boneName));
+        return this._ccmpObject.getBoneIndexByName(boneName);
     }
     getWorldPositionOfBone(boneIndex) {
-        return this._withHandle(this.position, (handle) => {
-            const { x, y, z } = ccmp.natives.entity.getWorldPositionOfEntityBone(handle, boneIndex);
-            return new Vector3D(x, y, z);
-        });
+        const { x, y, z } = this._ccmpObject.getWorldPositionOfBone(boneIndex);
+        return new Vector3D(x, y, z);
     }
     getVariable(name) {
         const remoteId = this.remoteId;
-        if (remoteId === null) {
+        if (remoteId === null)
             return null;
-        }
         const value = ccmp.entities.getStreamSyncedMeta(ccmp.entities.ENTITY_TYPE.Object, remoteId, name);
         return value === undefined ? null : value;
     }
     getSyncedMeta(key) {
         const remoteId = this.remoteId;
-        if (remoteId === null) {
+        if (remoteId === null)
             return undefined;
-        }
         return ccmp.entities.getStreamSyncedMeta(ccmp.entities.ENTITY_TYPE.Object, remoteId, key);
     }
     hasSyncedMeta(key) {
         const remoteId = this.remoteId;
-        if (remoteId === null) {
+        if (remoteId === null)
             return false;
-        }
         return ccmp.entities.hasStreamSyncedMeta(ccmp.entities.ENTITY_TYPE.Object, remoteId, key);
     }
     getSyncedMetaKeys() {
         const remoteId = this.remoteId;
-        if (remoteId === null) {
+        if (remoteId === null)
             return [];
-        }
         return ccmp.entities.getStreamSyncedMetaKeys(ccmp.entities.ENTITY_TYPE.Object, remoteId);
     }
     attachTo(entity, boneIndex, xPos, yPos, zPos, xRot, yRot, zRot, useSoftPinning, collision, isPed, vertexIndex, fixedRot) {
-        const targetHandle = this._normalizeHandle(entity);
-        if (!targetHandle)
-            return;
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.attachEntityToEntity(handle, targetHandle, boneIndex, xPos, yPos, zPos, xRot, yRot, zRot, false, useSoftPinning, collision, isPed, vertexIndex, fixedRot, 0);
-        });
+        this._ccmpObject.attachTo(entity, boneIndex, xPos, yPos, zPos, xRot, yRot, zRot, useSoftPinning, collision, isPed, vertexIndex, fixedRot);
     }
     isAttachedTo(entity) {
-        const targetHandle = this._normalizeHandle(entity);
-        if (!targetHandle)
-            return false;
-        return this._withHandle(false, (handle) => ccmp.natives.entity.isEntityAttachedToEntity(handle, targetHandle));
+        return this._ccmpObject.isAttachedTo(entity);
     }
     attachToEntity(target, boneIndex, offset, rotation, p9, useSoftPinning, collision, isPed, vertexIndex, fixedRot) {
-        const targetHandle = this._normalizeHandle(target.handle);
-        if (!targetHandle)
-            return;
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.attachEntityToEntity(handle, targetHandle, boneIndex, offset.x, offset.y, offset.z, rotation.x, rotation.y, rotation.z, p9, useSoftPinning, collision, isPed, vertexIndex, fixedRot, 0);
-        });
+        this._ccmpObject.attachToEntity(target, boneIndex, offset, rotation, p9, useSoftPinning, collision, isPed, vertexIndex, fixedRot);
     }
     detach(useDetachVelocity, collision) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.detachEntity(handle, useDetachVelocity, collision);
-        });
+        this._ccmpObject.detach(useDetachVelocity, collision);
     }
     getSpeed() {
-        return this._withHandle(0, (handle) => ccmp.natives.entity.getEntitySpeed(handle));
+        return this._ccmpObject.getSpeed();
     }
     isPlayingAnim(dictionary, name, taskFlag) {
-        return this._withHandle(false, (handle) => ccmp.natives.entity.isEntityPlayingAnim(handle, dictionary, name, taskFlag));
-    }
-    _withHandle(fallback, callback) {
-        const handle = this.handle;
-        if (!handle) {
-            return fallback;
-        }
-        return callback(handle);
-    }
-    _withHandleVoid(callback) {
-        const handle = this.handle;
-        if (!handle) {
-            return;
-        }
-        callback(handle);
+        return this._ccmpObject.isPlayingAnim(dictionary, name, taskFlag);
     }
     _normalizeHandle(value) {
         const handle = Number(value);
         return Number.isFinite(handle) && handle > 0 ? Math.trunc(handle) : 0;
     }
-    _getOffsetFromCachedTransform(offsetX, offsetY, offsetZ) {
-        const position = this.position;
-        const headingRad = (this.heading * Math.PI) / 180;
-        const rightX = Math.cos(headingRad);
-        const rightY = Math.sin(headingRad);
-        const forwardX = -Math.sin(headingRad);
-        const forwardY = Math.cos(headingRad);
-        return new Vector3D(position.x + rightX * offsetX + forwardX * offsetY, position.y + rightY * offsetX + forwardY * offsetY, position.z + offsetZ);
-    }
 }

package/dist/client/entities/ccmp/player/CCMPPlayer.d.ts

@@ -45,7 +45,7 @@ export declare class CCMPPlayer implements IPlayer {
     get model(): number;
     get heading(): number;
     setHeading(heading: number): void;
-    setModel(_value: string): void;
+    setModel(value: string): void;
     get rotation(): IVector3D;
     setRotation(value: IVector3D): void;
     get forwardVector(): IVector3D;
@@ -82,31 +82,29 @@ export declare class CCMPPlayer implements IPlayer {
     getAmmoInClip(_weapon: number): number;
     getWeaponAmmo(_weapon: number): number;
     getBoneIndex(boneId: number): number;
-    setDecoration(_collection: string, _overlay: string): void;
-    removeDecoration(_collection: string, _overlay: string): void;
+    setDecoration(collection: string, overlay: string): void;
+    removeDecoration(collection: string, overlay: string): void;
     clearDecorations(): void;
-    setHeadBlendData(_shapeFirstId: number, _shapeSecondId: number, _shapeThirdId: number, _skinFirstId: number, _skinSecondId: number, _skinThirdId: number, _shapeMix: number, _skinMix: number, _thirdMix: number, _isParent: boolean): void;
-    setFaceFeature(_index: number, _value: number): void;
-    setHeadOverlay(_overlayId: number, _index: number, _opacity: number, _firstColor: number, _secondColor: number): void;
-    setHeadOverlayColor(_overlayId: number, _colorTypeId: number, _firstColor: number, _secondColor: number): void;
-    setEyeColor(_eyeColor: number): void;
-    setHairColor(_colorId: number, _highlightColorId: number): void;
-    setComponentVariation(_componentId: number, _drawableId: number, _textureId: number, _paletteId: number): void;
-    setPropertyVariation(_componentId: number, _drawableId: number, _textureId: number, _attach: boolean): void;
-    clearProp(_componentId: number): void;
+    setHeadBlendData(shapeFirstId: number, shapeSecondId: number, shapeThirdId: number, skinFirstId: number, skinSecondId: number, skinThirdId: number, shapeMix: number, skinMix: number, thirdMix: number, isParent: boolean): void;
+    setFaceFeature(index: number, value: number): void;
+    setHeadOverlay(overlayId: number, index: number, opacity: number, _firstColor: number, _secondColor: number): void;
+    setHeadOverlayColor(overlayId: number, colorTypeId: number, firstColor: number, secondColor: number): void;
+    setEyeColor(eyeColor: number): void;
+    setHairColor(colorId: number, highlightColorId: number): void;
+    setComponentVariation(componentId: number, drawableId: number, textureId: number, paletteId: number): void;
+    setPropertyVariation(componentId: number, drawableId: number, textureId: number, attach: boolean): void;
+    clearProp(componentId: number): void;
     get isLocalPlayer(): boolean;
     taskSwapWeapon(): void;
     taskEnterVehicle(vehicleHandle: number, timeout: number, seat: number, speed: number, flag: number, _p6: number): void;
     clearTasks(): void;
     clearTasksImmediately(): void;
-    taskPlayAnim(_dictionary: string, _name: string, _blendInSpeed: number, _blendOutSpeed: number, _duration: number, _flag: number, _playbackRate: number, _lockX: boolean, _lockY: boolean, _lockZ: boolean): void;
-    stopAnim(_dictionary: string, _name: string, _blendOutSpeed: number): void;
+    taskPlayAnim(dictionary: string, name: string, blendInSpeed: number, blendOutSpeed: number, duration: number, flag: number, playbackRate: number, lockX: boolean, lockY: boolean, lockZ: boolean): void;
+    stopAnim(dictionary: string, name: string, blendOutSpeed: number): void;
     setMovementClipset(_clipset: string, _speed: number): void;
     resetMovementClipset(_blendDuration: number): void;
     getBoneCoords(boneId: number, offsetX: number, offsetY: number, offsetZ: number): IVector3D;
     setNoCollision(otherHandle: number, thisFrameOnly: boolean): void;
     private _getNativePlayer;
-    private _withHandle;
-    private _withHandleVoid;
     private _warnOnce;
 }

package/dist/client/entities/ccmp/player/CCMPPlayer.js

@@ -68,7 +68,8 @@ export class CCMPPlayer {
     }
     // -- IEntity --------------------------------------------------------------
     get model() {
-        return this._withHandle(0, (handle) => ccmp.natives.entity.getEntityModel(handle));
+        var _a, _b;
+        return (_b = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.model) !== null && _b !== void 0 ? _b : 0;
     }
     get heading() {
         var _a, _b;
@@ -78,25 +79,23 @@ export class CCMPPlayer {
         var _a;
         (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setHeading(heading);
     }
-    setModel(_value) {
-        this._warnOnce("setModel");
+    setModel(value) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setModel(value);
     }
     get rotation() {
-        return this._withHandle(ZERO_VECTOR, (handle) => {
-            const rotation = ccmp.natives.entity.getEntityRotation(handle, 2);
-            return new Vector3D(rotation.x, rotation.y, rotation.z);
-        });
+        var _a;
+        const rotation = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.rotation;
+        return rotation ? new Vector3D(rotation.x, rotation.y, rotation.z) : ZERO_VECTOR;
     }
     setRotation(value) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.setEntityRotation(handle, value.x, value.y, value.z, 2, true);
-        });
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setRotation(value);
     }
     get forwardVector() {
-        return this._withHandle(ZERO_VECTOR, (handle) => {
-            const vector = ccmp.natives.entity.getEntityForwardVector(handle);
-            return new Vector3D(vector.x, vector.y, vector.z);
-        });
+        var _a;
+        const vector = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.forwardVector;
+        return vector ? new Vector3D(vector.x, vector.y, vector.z) : ZERO_VECTOR;
     }
     freezePosition(freeze) {
         var _a;
@@ -127,19 +126,18 @@ export class CCMPPlayer {
         (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.resetAlpha();
     }
     getOffsetFromInWorldCoords(offsetX, offsetY, offsetZ) {
-        return this._withHandle(ZERO_VECTOR, (handle) => {
-            const position = ccmp.natives.entity.getOffsetFromEntityInWorldCoords(handle, offsetX, offsetY, offsetZ);
-            return new Vector3D(position.x, position.y, position.z);
-        });
+        var _a;
+        const position = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.getOffsetFromInWorldCoords(offsetX, offsetY, offsetZ);
+        return position ? new Vector3D(position.x, position.y, position.z) : ZERO_VECTOR;
     }
     getBoneIndexByName(boneName) {
-        return this._withHandle(-1, (handle) => ccmp.natives.entity.getEntityBoneIndexByName(handle, boneName));
+        var _a, _b;
+        return (_b = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.getBoneIndexByName(boneName)) !== null && _b !== void 0 ? _b : -1;
     }
     getWorldPositionOfBone(boneIndex) {
-        return this._withHandle(ZERO_VECTOR, (handle) => {
-            const position = ccmp.natives.entity.getWorldPositionOfEntityBone(handle, boneIndex);
-            return new Vector3D(position.x, position.y, position.z);
-        });
+        var _a;
+        const position = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.getWorldPositionOfBone(boneIndex);
+        return position ? new Vector3D(position.x, position.y, position.z) : ZERO_VECTOR;
     }
     getVariable(name) {
         const value = ccmp.entities.getStreamSyncedMeta(ccmp.entities.ENTITY_TYPE.Player, this._id, name);
@@ -155,20 +153,20 @@ export class CCMPPlayer {
         return ccmp.entities.getStreamSyncedMetaKeys(ccmp.entities.ENTITY_TYPE.Player, this._id);
     }
     attachToEntity(target, boneIndex, offset, rotation, p9, useSoftPinning, collision, isPed, vertexIndex, fixedRot) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.attachEntityToEntity(handle, target.handle, boneIndex, offset.x, offset.y, offset.z, rotation.x, rotation.y, rotation.z, p9, useSoftPinning, collision, isPed, vertexIndex, fixedRot, 0);
-        });
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.attachToEntity(target, boneIndex, offset, rotation, p9, useSoftPinning, collision, isPed, vertexIndex, fixedRot);
     }
     detach(useDetachVelocity, collision) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.entity.detachEntity(handle, useDetachVelocity, collision);
-        });
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.detach(useDetachVelocity, collision);
     }
     getSpeed() {
-        return this._withHandle(0, (handle) => ccmp.natives.entity.getEntitySpeed(handle));
+        var _a, _b;
+        return (_b = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.getSpeed()) !== null && _b !== void 0 ? _b : 0;
     }
     isPlayingAnim(dictionary, name, taskFlag) {
-        return this._withHandle(false, (handle) => ccmp.natives.entity.isEntityPlayingAnim(handle, dictionary, name, taskFlag));
+        var _a, _b;
+        return (_b = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.isPlayingAnim(dictionary, name, taskFlag)) !== null && _b !== void 0 ? _b : false;
     }
     // -- IPlayer --------------------------------------------------------------
     get name() {
@@ -214,70 +212,83 @@ export class CCMPPlayer {
         return 0;
     }
     getBoneIndex(boneId) {
-        return this._withHandle(-1, (handle) => ccmp.natives.ped.getPedBoneIndex(handle, boneId));
+        var _a, _b;
+        return (_b = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.getBoneIndex(boneId)) !== null && _b !== void 0 ? _b : -1;
     }
-    setDecoration(_collection, _overlay) {
-        this._warnOnce("setDecoration");
+    setDecoration(collection, overlay) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setDecoration(collection, overlay);
     }
-    removeDecoration(_collection, _overlay) {
-        this._warnOnce("removeDecoration");
+    removeDecoration(collection, overlay) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.removeDecoration(collection, overlay);
     }
     clearDecorations() {
-        this._warnOnce("clearDecorations");
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.clearDecorations();
     }
-    setHeadBlendData(_shapeFirstId, _shapeSecondId, _shapeThirdId, _skinFirstId, _skinSecondId, _skinThirdId, _shapeMix, _skinMix, _thirdMix, _isParent) {
-        this._warnOnce("setHeadBlendData");
+    setHeadBlendData(shapeFirstId, shapeSecondId, shapeThirdId, skinFirstId, skinSecondId, skinThirdId, shapeMix, skinMix, thirdMix, isParent) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setHeadBlendData(shapeFirstId, shapeSecondId, shapeThirdId, skinFirstId, skinSecondId, skinThirdId, shapeMix, skinMix, thirdMix, isParent);
     }
-    setFaceFeature(_index, _value) {
-        this._warnOnce("setFaceFeature");
+    setFaceFeature(index, value) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setFaceFeature(index, value);
     }
-    setHeadOverlay(_overlayId, _index, _opacity, _firstColor, _secondColor) {
-        this._warnOnce("setHeadOverlay");
+    setHeadOverlay(overlayId, index, opacity, _firstColor, _secondColor) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setHeadOverlay(overlayId, index, opacity);
     }
-    setHeadOverlayColor(_overlayId, _colorTypeId, _firstColor, _secondColor) {
-        this._warnOnce("setHeadOverlayColor");
+    setHeadOverlayColor(overlayId, colorTypeId, firstColor, secondColor) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setHeadOverlayColor(overlayId, colorTypeId, firstColor, secondColor);
     }
-    setEyeColor(_eyeColor) {
-        this._warnOnce("setEyeColor");
+    setEyeColor(eyeColor) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setEyeColor(eyeColor);
     }
-    setHairColor(_colorId, _highlightColorId) {
-        this._warnOnce("setHairColor");
+    setHairColor(colorId, highlightColorId) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setHairColor(colorId, highlightColorId);
     }
-    setComponentVariation(_componentId, _drawableId, _textureId, _paletteId) {
-        this._warnOnce("setComponentVariation");
+    setComponentVariation(componentId, drawableId, textureId, paletteId) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setComponentVariation(componentId, drawableId, textureId, paletteId);
     }
-    setPropertyVariation(_componentId, _drawableId, _textureId, _attach) {
-        this._warnOnce("setPropertyVariation");
+    setPropertyVariation(componentId, drawableId, textureId, attach) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setPropertyVariation(componentId, drawableId, textureId, attach);
     }
-    clearProp(_componentId) {
-        this._warnOnce("clearProp");
+    clearProp(componentId) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.clearProp(componentId);
     }
     get isLocalPlayer() {
         return this._isLocal;
     }
     taskSwapWeapon() {
-        this._warnOnce("taskSwapWeapon");
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.taskSwapWeapon(true);
     }
     taskEnterVehicle(vehicleHandle, timeout, seat, speed, flag, _p6) {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.task.taskEnterVehicle(handle, vehicleHandle, timeout, seat, speed, flag, "");
-        });
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.taskEnterVehicle(vehicleHandle, timeout, seat, speed, flag);
     }
     clearTasks() {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.task.clearPedTasks(handle);
-        });
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.clearTasks();
     }
     clearTasksImmediately() {
-        this._withHandleVoid((handle) => {
-            ccmp.natives.task.clearPedTasksImmediately(handle);
-        });
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.clearTasksImmediately();
     }
-    taskPlayAnim(_dictionary, _name, _blendInSpeed, _blendOutSpeed, _duration, _flag, _playbackRate, _lockX, _lockY, _lockZ) {
-        this._warnOnce("taskPlayAnim");
+    taskPlayAnim(dictionary, name, blendInSpeed, blendOutSpeed, duration, flag, playbackRate, lockX, lockY, lockZ) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.taskPlayAnim(dictionary, name, blendInSpeed, blendOutSpeed, duration, flag, playbackRate, lockX, lockY, lockZ);
     }
-    stopAnim(_dictionary, _name, _blendOutSpeed) {
-        this._warnOnce("stopAnim");
+    stopAnim(dictionary, name, blendOutSpeed) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.stopAnim(dictionary, name, blendOutSpeed);
     }
     setMovementClipset(_clipset, _speed) {
         this._warnOnce("setMovementClipset");
@@ -286,17 +297,13 @@ export class CCMPPlayer {
         this._warnOnce("resetMovementClipset");
     }
     getBoneCoords(boneId, offsetX, offsetY, offsetZ) {
-        return this._withHandle(ZERO_VECTOR, (handle) => {
-            const position = ccmp.natives.ped.getPedBoneCoords(handle, boneId, offsetX, offsetY, offsetZ);
-            return new Vector3D(position.x, position.y, position.z);
-        });
+        var _a;
+        const position = (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.getBoneCoords(boneId, offsetX, offsetY, offsetZ);
+        return position ? new Vector3D(position.x, position.y, position.z) : ZERO_VECTOR;
     }
     setNoCollision(otherHandle, thisFrameOnly) {
-        this._withHandleVoid((handle) => {
-            if (otherHandle !== 0) {
-                ccmp.natives.entity.setEntityNoCollisionEntity(handle, otherHandle, thisFrameOnly);
-            }
-        });
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.setNoCollision(otherHandle, thisFrameOnly);
     }
     _getNativePlayer() {
         try {
@@ -311,20 +318,6 @@ export class CCMPPlayer {
             return null;
         }
     }
-    _withHandle(fallback, callback) {
-        const handle = this.handle;
-        if (!handle) {
-            return fallback;
-        }
-        return callback(handle);
-    }
-    _withHandleVoid(callback) {
-        const handle = this.handle;
-        if (!handle) {
-            return;
-        }
-        callback(handle);
-    }
     _warnOnce(method) {
         if (CCMPPlayer._warnedMethods.has(method)) {
             return;