rock-mod 0.21.0 → 0.23.0

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,64 +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._warnOnce("taskEnterVehicle");
+    taskEnterVehicle(vehicleHandle, timeout, seat, speed, flag, _p6) {
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.taskEnterVehicle(vehicleHandle, timeout, seat, speed, flag);
     }
     clearTasks() {
-        this._warnOnce("clearTasks");
+        var _a;
+        (_a = this._getNativePlayer()) === null || _a === void 0 ? void 0 : _a.clearTasks();
     }
     clearTasksImmediately() {
-        this._warnOnce("clearTasksImmediately");
+        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");
@@ -280,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 {
@@ -305,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;

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

@@ -9,9 +9,10 @@ import { CCMPPlayer } from "./CCMPPlayer";
  *
  * ### Хранилище
  *
- * `Map<id, CCMPPlayer>`. У CCMP нет отдельных `id`/`remoteId` как в RageMP:
- * один числовой `id` приходит от сервера, и он же используется везде.
- * `findByID`/`findByRemoteID`/`findByRemoteId` маппятся на один lookup.
+ * `Map<id, CCMPPlayer>`. For CCMP players only, `id` and `remoteId` still
+ * mean the same server/network id. Non-player CCMP wrappers have a separate
+ * client-local `id` and nullable server `remoteId`.
+ * `findByID`/`findByRemoteID`/`findByRemoteId` map to one lookup for players.
  *
  * ### Жизненный цикл local player'а
  *

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

@@ -7,9 +7,10 @@ import { CCMPPlayer } from "./CCMPPlayer";
  *
  * ### Хранилище
  *
- * `Map<id, CCMPPlayer>`. У CCMP нет отдельных `id`/`remoteId` как в RageMP:
- * один числовой `id` приходит от сервера, и он же используется везде.
- * `findByID`/`findByRemoteID`/`findByRemoteId` маппятся на один lookup.
+ * `Map<id, CCMPPlayer>`. For CCMP players only, `id` and `remoteId` still
+ * mean the same server/network id. Non-player CCMP wrappers have a separate
+ * client-local `id` and nullable server `remoteId`.
+ * `findByID`/`findByRemoteID`/`findByRemoteId` map to one lookup for players.
  *
  * ### Жизненный цикл local player'а
  *
@@ -62,16 +63,28 @@ export class CCMPPlayersManager {
             [ClientInternalEventName.PlayerReady]: (player) => {
                 // Если кто-то ещё эмитнул rm::playerReady (например, cooperation
                 // fallback в будущем) — синхронизируем своё состояние.
-                this._ensurePlayer(player.remoteId, player.name, /* isLocal */ true);
+                const remoteId = player.remoteId;
+                if (remoteId === null) {
+                    return;
+                }
+                this._ensurePlayer(remoteId, player.name, /* isLocal */ true);
             },
             [ClientInternalEventName.PlayerConnected]: (player) => {
-                this._ensurePlayer(player.remoteId, player.name, /* isLocal */ false);
+                const remoteId = player.remoteId;
+                if (remoteId === null) {
+                    return;
+                }
+                this._ensurePlayer(remoteId, player.name, /* isLocal */ false);
             },
             [ClientInternalEventName.PlayerDisconnected]: (player) => {
-                const existing = this._players.get(player.remoteId);
+                const remoteId = player.remoteId;
+                if (remoteId === null) {
+                    return;
+                }
+                const existing = this._players.get(remoteId);
                 if (existing) {
                     existing.markRemoved();
-                    this._players.delete(player.remoteId);
+                    this._players.delete(remoteId);
                 }
             },
         });

package/dist/client/entities/ccmp/vehicle/CCMPVehicle.d.ts

@@ -0,0 +1,102 @@
+import { type Vehicle as CcmpVehicle } from "@classic-mp/types/client";
+import { BaseObjectType } from "../../../../shared/entities";
+import { type IRGB, type IVector3D, Vector3D } from "../../../../shared/common/utils";
+import { type IBaseObject } from "../../common/baseObject/IBaseObject";
+import { type ILightState, type IVehicle } from "../../common/vehicle/IVehicle";
+export type ICCMPNativeVehicle = CcmpVehicle;
+export declare class CCMPVehicle implements IVehicle {
+    private readonly _ccmpVehicle;
+    private readonly _onDestroy;
+    private _destroyed;
+    constructor(_ccmpVehicle: ICCMPNativeVehicle, _onDestroy?: (vehicle: CCMPVehicle) => void);
+    get id(): number;
+    get remoteId(): number | null;
+    get type(): BaseObjectType;
+    get isExists(): boolean;
+    get handle(): number;
+    destroy(): void;
+    get position(): Vector3D;
+    get dimension(): number;
+    setPosition(value: IVector3D): 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;
+    get rotation(): Vector3D;
+    get forwardVector(): Vector3D;
+    setRotation(value: IVector3D): void;
+    freezePosition(freeze: boolean): void;
+    setCollision(collision: boolean, keepPhysics: boolean): void;
+    setInvincible(invincible: boolean): void;
+    setVisible(visible: boolean): void;
+    setAlpha(alpha: number): void;
+    get alpha(): number;
+    resetAlpha(): void;
+    getOffsetFromInWorldCoords(offsetX: number, offsetY: number, offsetZ: number): IVector3D;
+    getBoneIndexByName(boneName: string): number;
+    getWorldPositionOfBone(boneIndex: number): IVector3D;
+    getVariable(name: string): unknown | null;
+    getSyncedMeta(key: string): unknown | undefined;
+    hasSyncedMeta(key: string): boolean;
+    getSyncedMetaKeys(): readonly string[];
+    attachToEntity(target: IBaseObject, boneIndex: number, offset: IVector3D, rotation: IVector3D, p9: boolean, useSoftPinning: boolean, collision: boolean, isPed: boolean, vertexIndex: number, fixedRot: boolean): void;
+    detach(useDetachVelocity: boolean, collision: boolean): void;
+    getSpeed(): number;
+    isPlayingAnim(dictionary: string, name: string, taskFlag: number): boolean;
+    get bodyHealth(): number;
+    get engineHealth(): number;
+    get numberPlate(): string;
+    get isDead(): boolean;
+    setBodyHealth(value: number): void;
+    setEngineHealth(value: number): void;
+    setNumberPlate(value: string): void;
+    explode(): void;
+    getPedInSeat(seat: number): number;
+    setUndriveable(toggle: boolean): void;
+    get maxNumberOfPassengers(): number;
+    get gear(): number;
+    get speed(): number;
+    get isEngineRunning(): boolean;
+    setEngineOn(toggle: boolean, instantly: boolean, otherwise: boolean): void;
+    get lightsState(): ILightState;
+    get isLocked(): boolean;
+    setIsLocked(value: boolean): void;
+    setCustomPrimaryColour(color: IRGB): void;
+    setCustomSecondaryColour(color: IRGB): void;
+    get customPrimaryColour(): IRGB;
+    get customSecondaryColour(): IRGB;
+    setMod(modType: number, modIndex: number): void;
+    getMod(modType: number): number;
+    getNumMods(modType: number): number;
+    setNeonLightEnabled(index: number, toggle: boolean): void;
+    setNeonLightsColour(color: IRGB): void;
+    setWindowTint(tintType: number): void;
+    get windowTint(): number;
+    setWheelType(wheelType: number): void;
+    get wheelType(): number;
+    setNumberPlateTextIndex(index: number): void;
+    get numberPlateTextIndex(): number;
+    setDoorOpen(doorIndex: number, loose: boolean, openInstantly: boolean): void;
+    setDoorShut(doorIndex: number, instantly: boolean): void;
+    setHandling(field: string, value: number): void;
+    getHandling(field: string): number;
+    setEnginePowerMultiplier(value: number): void;
+    setEngineTorqueMultiplier(value: number): void;
+    modifyTopSpeed(value: number): void;
+    setCheatPowerIncrease(value: number): void;
+    toggleMod(modType: number, toggle: boolean): void;
+    setTyreSmokeColor(r: number, g: number, b: number): void;
+    setModColor1(paintType: number, color: number, p3: number): void;
+    setExtraColours(pearlescentColor: number, wheelColor: number): void;
+    setHeadlightColor(colorIndex: number): void;
+    setDashboardColor(colorIndex: number): void;
+    setInteriorColor(colorIndex: number): void;
+    getMaxBraking(): number;
+    getAcceleration(): number;
+    getMaxTraction(): number;
+    getModelMaxSpeed(): number;
+    private _normalizeHandle;
+    private _getRemoteVehicleExists;
+}