rock-mod 0.8.3 → 0.9.0

package/dist/server/entities/common/colshape/IColshapesManager.d.ts

@@ -1,6 +1,6 @@
 import { IWorldObjectCreateOptions, IWorldObjectsManager } from "../worldObject";
 import { IColshape } from "./IColshape";
-import { IVector2D } from "../../../common/utils";
+import { IVector2D } from "../../../../shared/common/utils";
 import { ICircleColshape } from "./ICircleColshape";
 import { ICuboidColshape } from "./ICuboidColshape";
 import { ICylinderColshape } from "./ICylinderColshape";

package/dist/server/entities/common/entity/IEntitiesManager.d.ts

@@ -1,6 +1,6 @@
 import { IWorldObjectCreateOptions, IWorldObjectsManager, IWorldObjectsManagerOptions } from "../worldObject/IWorldObjectsManager";
 import { IEntity } from "./IEntity";
-import { IVector3D } from "../../../common/utils";
+import { IVector3D } from "../../../../shared/common/utils";
 export interface IEntitiesManagerOptions extends IWorldObjectsManagerOptions {
 }
 export interface IEntityCreateOptions extends IWorldObjectCreateOptions {

package/dist/server/entities/common/entity/IEntity.d.ts

@@ -1,5 +1,5 @@
 import { IWorldObject, IWorldObjectOptions } from "../worldObject/IWorldObject";
-import { IVector3D } from "../../../common/utils";
+import { IVector3D } from "../../../../shared/common/utils";
 export interface IEntityOptions extends IWorldObjectOptions {
 }
 export interface IEntity extends IWorldObject {

package/dist/server/entities/common/marker/IMarker.d.ts

@@ -1,6 +1,6 @@
 import { IWorldObject, IWorldObjectOptions } from "../worldObject";
-import { IMarkerType } from "./IMarkersManager";
-import { IRGBA, IVector3D } from "../../../common/utils";
+import { IRGBA, IVector3D } from "../../../../shared/common/utils";
+import { IMarkerType } from "../../../../shared";
 export interface IMarkerOptions extends IWorldObjectOptions {
     type: IMarkerType;
     scale: number;

package/dist/server/entities/common/marker/IMarkersManager.d.ts

@@ -1,53 +1,7 @@
 import { IMarker } from "./IMarker";
 import { IWorldObjectCreateOptions, IWorldObjectsManager } from "../worldObject";
-import { IRGBA, IVector3D } from "../../../common/utils";
-export declare enum IMarkerType {
-    MarkerCone = 0,
-    MarkerCylinder = 1,
-    MarkerArrow = 2,
-    MarkerArrowFlat = 3,
-    MarkerFlag = 4,
-    MarkerRingFlag = 5,
-    MarkerRing = 6,
-    MarkerPlane = 7,
-    MarkerBikeLogo1 = 8,
-    MarkerBikeLogo2 = 9,
-    MarkerNum0 = 10,
-    MarkerNum1 = 11,
-    MarkerNum2 = 12,
-    MarkerNum3 = 13,
-    MarkerNum4 = 14,
-    MarkerNum5 = 15,
-    MarkerNum6 = 16,
-    MarkerNum7 = 17,
-    MarkerNum8 = 18,
-    MarkerNum9 = 19,
-    MarkerChevron1 = 20,
-    MarkerChevron2 = 21,
-    MarkerChevron3 = 22,
-    MarkerRingFlat = 23,
-    MarkerLap = 24,
-    MarkerHalo = 25,
-    MarkerHaloPoint = 26,
-    MarkerHaloRotate = 27,
-    MarkerSphere = 28,
-    MarkerMoney = 29,
-    MarkerLines = 30,
-    MarkerBeast = 31,
-    MarkerQuestionMark = 32,
-    MarkerTransformPlane = 33,
-    MarkerTransformHelicopter = 34,
-    MarkerTransformBoat = 35,
-    MarkerTransformCar = 36,
-    MarkerTransformBike = 37,
-    MarkerTransformPushBike = 38,
-    MarkerTransformTruck = 39,
-    MarkerTransformParachute = 40,
-    MarkerTransformThruster = 41,
-    MarkerWarp = 42,
-    MarkerBoxes = 43,
-    MarkerPitLane = 44
-}
+import { IRGBA, IVector3D } from "../../../../shared/common/utils";
+import { IMarkerType } from "../../../../shared";
 export interface IMarkerCreateOptions extends IWorldObjectCreateOptions {
     type: IMarkerType;
     scale: number;

package/dist/server/entities/common/marker/IMarkersManager.js

@@ -1,51 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IMarkerType = void 0;
-var IMarkerType;
-(function (IMarkerType) {
-    IMarkerType[IMarkerType["MarkerCone"] = 0] = "MarkerCone";
-    IMarkerType[IMarkerType["MarkerCylinder"] = 1] = "MarkerCylinder";
-    IMarkerType[IMarkerType["MarkerArrow"] = 2] = "MarkerArrow";
-    IMarkerType[IMarkerType["MarkerArrowFlat"] = 3] = "MarkerArrowFlat";
-    IMarkerType[IMarkerType["MarkerFlag"] = 4] = "MarkerFlag";
-    IMarkerType[IMarkerType["MarkerRingFlag"] = 5] = "MarkerRingFlag";
-    IMarkerType[IMarkerType["MarkerRing"] = 6] = "MarkerRing";
-    IMarkerType[IMarkerType["MarkerPlane"] = 7] = "MarkerPlane";
-    IMarkerType[IMarkerType["MarkerBikeLogo1"] = 8] = "MarkerBikeLogo1";
-    IMarkerType[IMarkerType["MarkerBikeLogo2"] = 9] = "MarkerBikeLogo2";
-    IMarkerType[IMarkerType["MarkerNum0"] = 10] = "MarkerNum0";
-    IMarkerType[IMarkerType["MarkerNum1"] = 11] = "MarkerNum1";
-    IMarkerType[IMarkerType["MarkerNum2"] = 12] = "MarkerNum2";
-    IMarkerType[IMarkerType["MarkerNum3"] = 13] = "MarkerNum3";
-    IMarkerType[IMarkerType["MarkerNum4"] = 14] = "MarkerNum4";
-    IMarkerType[IMarkerType["MarkerNum5"] = 15] = "MarkerNum5";
-    IMarkerType[IMarkerType["MarkerNum6"] = 16] = "MarkerNum6";
-    IMarkerType[IMarkerType["MarkerNum7"] = 17] = "MarkerNum7";
-    IMarkerType[IMarkerType["MarkerNum8"] = 18] = "MarkerNum8";
-    IMarkerType[IMarkerType["MarkerNum9"] = 19] = "MarkerNum9";
-    IMarkerType[IMarkerType["MarkerChevron1"] = 20] = "MarkerChevron1";
-    IMarkerType[IMarkerType["MarkerChevron2"] = 21] = "MarkerChevron2";
-    IMarkerType[IMarkerType["MarkerChevron3"] = 22] = "MarkerChevron3";
-    IMarkerType[IMarkerType["MarkerRingFlat"] = 23] = "MarkerRingFlat";
-    IMarkerType[IMarkerType["MarkerLap"] = 24] = "MarkerLap";
-    IMarkerType[IMarkerType["MarkerHalo"] = 25] = "MarkerHalo";
-    IMarkerType[IMarkerType["MarkerHaloPoint"] = 26] = "MarkerHaloPoint";
-    IMarkerType[IMarkerType["MarkerHaloRotate"] = 27] = "MarkerHaloRotate";
-    IMarkerType[IMarkerType["MarkerSphere"] = 28] = "MarkerSphere";
-    IMarkerType[IMarkerType["MarkerMoney"] = 29] = "MarkerMoney";
-    IMarkerType[IMarkerType["MarkerLines"] = 30] = "MarkerLines";
-    IMarkerType[IMarkerType["MarkerBeast"] = 31] = "MarkerBeast";
-    IMarkerType[IMarkerType["MarkerQuestionMark"] = 32] = "MarkerQuestionMark";
-    IMarkerType[IMarkerType["MarkerTransformPlane"] = 33] = "MarkerTransformPlane";
-    IMarkerType[IMarkerType["MarkerTransformHelicopter"] = 34] = "MarkerTransformHelicopter";
-    IMarkerType[IMarkerType["MarkerTransformBoat"] = 35] = "MarkerTransformBoat";
-    IMarkerType[IMarkerType["MarkerTransformCar"] = 36] = "MarkerTransformCar";
-    IMarkerType[IMarkerType["MarkerTransformBike"] = 37] = "MarkerTransformBike";
-    IMarkerType[IMarkerType["MarkerTransformPushBike"] = 38] = "MarkerTransformPushBike";
-    IMarkerType[IMarkerType["MarkerTransformTruck"] = 39] = "MarkerTransformTruck";
-    IMarkerType[IMarkerType["MarkerTransformParachute"] = 40] = "MarkerTransformParachute";
-    IMarkerType[IMarkerType["MarkerTransformThruster"] = 41] = "MarkerTransformThruster";
-    IMarkerType[IMarkerType["MarkerWarp"] = 42] = "MarkerWarp";
-    IMarkerType[IMarkerType["MarkerBoxes"] = 43] = "MarkerBoxes";
-    IMarkerType[IMarkerType["MarkerPitLane"] = 44] = "MarkerPitLane";
-})(IMarkerType || (exports.IMarkerType = IMarkerType = {}));

package/dist/server/entities/common/player/IPlayer.d.ts

@@ -1,8 +1,8 @@
 import { IEntity, IEntityOptions } from "../entity/IEntity";
 import { IVehicle } from "../vehicle/IVehicle";
-import { IVector3D } from "../../../common/utils/math/Vectors";
-import { INetClientEvents } from "../../../net/common/events/IEventsManager";
-import { INetClientRPC } from "../../../net/common/rpc/IRPCManager";
+import { IVector3D } from "../../../../shared/common/utils/math/Vectors";
+import { IServerToClientEvents } from "../../../../shared";
+import { IClientRPCList } from "../../../../shared/net/common/rpc/types";
 export interface ICustomization {
     gender: boolean;
     shapeFirst: number;
@@ -36,8 +36,8 @@ export interface IPlayer extends IEntity {
     get weaponAmmo(): number;
     get eyeColor(): number;
     get streamedPlayers(): IPlayer[];
-    emitEvent<K extends keyof INetClientEvents>(eventName: K, ...args: Parameters<INetClientEvents[K]>): void;
-    emitRPC<K extends keyof INetClientEvents>(rpcName: K, ...args: Parameters<INetClientEvents[K]>): Promise<ReturnType<INetClientRPC[K]>>;
+    emitEvent<K extends keyof IServerToClientEvents>(eventName: K, ...args: Parameters<IServerToClientEvents[K]>): void;
+    emitRPC<K extends keyof IClientRPCList>(rpcName: K, ...args: Parameters<IClientRPCList[K]>): Promise<ReturnType<IClientRPCList[K]>>;
     spawn(position: IVector3D): void;
     setName(name: string): void;
     setHeading(value: number): void;

package/dist/server/entities/common/vehicle/IVehicle.d.ts

@@ -1,5 +1,5 @@
 import { IEntity, IEntityOptions } from "../entity/IEntity";
-import { IRGBA } from "../../../common/utils";
+import { IRGBA } from "../../../../shared/common/utils";
 import { IPlayer } from "../player";
 export declare enum VehicleSeat {
     NONE = 255,

package/dist/server/entities/common/worldObject/IWorldObject.d.ts

@@ -1,5 +1,5 @@
 import { IBaseObject, IBaseObjectOptions } from "../baseObject";
-import { IVector3D } from "../../../common/utils";
+import { IVector3D } from "../../../../shared/common/utils";
 export interface IWorldObjectOptions extends IBaseObjectOptions {
 }
 export interface IWorldObject extends IBaseObject {

package/dist/server/entities/common/worldObject/IWorldObjectsIterator.d.ts

@@ -1,6 +1,6 @@
 import { IBaseObjectsIterator } from "../baseObject/IBaseObjectsIterator";
 import { IWorldObject } from "./IWorldObject";
-import { Vector2D, Vector3D } from "../../../common/utils/math/Vectors";
+import { Vector2D, Vector3D } from "../../../../shared/common/utils/math/Vectors";
 export interface IWorldObjectsIterator<T extends IWorldObject> extends IBaseObjectsIterator<T> {
     dimension(value: number): IterableIterator<T>;
     range2D(center: Vector2D, range: number): IterableIterator<T>;

package/dist/server/entities/common/worldObject/IWorldObjectsManager.d.ts

@@ -1,7 +1,7 @@
 import { IBaseObjectCreateOptions, IBaseObjectsManager, IBaseObjectsManagerOptions } from "../baseObject";
 import { IWorldObject } from "./IWorldObject";
 import { IWorldObjectsIterator } from "./IWorldObjectsIterator";
-import { IVector3D } from "../../../common/utils";
+import { IVector3D } from "../../../../shared/common/utils";
 export interface IWorldObjectsManagerOptions extends IBaseObjectsManagerOptions {
 }
 export interface IWorldObjectCreateOptions extends IBaseObjectCreateOptions {

package/dist/server/entities/mock/baseObject/MockBaseObject.d.ts

@@ -1,5 +1,6 @@
-import { IBaseObject, BaseObjectType } from "../../common/baseObject/IBaseObject";
-import { IVector3D } from "../../../common/utils/math/Vectors";
+import { IBaseObject } from "../../common/baseObject/IBaseObject";
+import { IVector3D } from "../../../../shared/common/utils/math/Vectors";
+import { BaseObjectType } from "../../../../shared";
 export interface IMockBaseObjectOptions {
     id: number;
     type: BaseObjectType;

package/dist/server/entities/mock/baseObject/MockBaseObjectsManager.d.ts

@@ -1,7 +1,7 @@
 import { IBaseObjectsManager, IBaseObjectsManagerOptions } from "../../common/baseObject/IBaseObjectsManager";
-import { BaseObjectType } from "../../common/baseObject/IBaseObject";
 import { MockBaseObject } from "./MockBaseObject";
 import { MockBaseObjectsIterator } from "./MockBaseObjectsIterator";
+import { BaseObjectType } from "../../../../shared";
 export interface IMockBaseObjectsManagerOptions extends IBaseObjectsManagerOptions {
 }
 export declare abstract class MockBaseObjectsManager<T extends MockBaseObject> implements IBaseObjectsManager<T> {

package/dist/server/entities/mock/baseObject/MockBaseObjectsManager.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockBaseObjectsManager = void 0;
 const MockBaseObjectsIterator_1 = require("./MockBaseObjectsIterator");
 const RockMod_1 = require("../../../RockMod");
+const types_1 = require("../../../net/common/events/types");
 class MockBaseObjectsManager {
     _baseObjects;
     _baseObjectsType;
@@ -34,13 +35,13 @@ class MockBaseObjectsManager {
             throw new Error(`BaseObject [${this._baseObjectsType}] with id ${baseObject.id} already exists`);
         }
         this._baseObjects.set(baseObject.id, baseObject);
-        RockMod_1.RockMod.instance.net.events.emit("rm::entityCreated", baseObject);
+        RockMod_1.RockMod.instance.net.events.emitInternal(types_1.ServerInternalEventName.EntityCreated, baseObject);
     }
     unregisterBaseObject(baseObject) {
         if (!this._baseObjects.delete(baseObject.id)) {
             throw new Error(`BaseObject [${this._baseObjectsType}] with id ${baseObject.id} not found`);
         }
-        RockMod_1.RockMod.instance.net.events.emit("rm::entityDestroyed", baseObject);
+        RockMod_1.RockMod.instance.net.events.emitInternal(types_1.ServerInternalEventName.EntityDestroyed, baseObject);
     }
 }
 exports.MockBaseObjectsManager = MockBaseObjectsManager;

package/dist/server/entities/mock/blip/MockBlip.d.ts

@@ -1,5 +1,6 @@
-import { IBlip, IBlipColor, IBlipSprite } from "../../common/blip/IBlip";
 import { MockWorldObject, IMockWorldObjectOptions } from "../worldObject/MockWorldObject";
+import { IBlip } from "../../common";
+import { IBlipColor, IBlipSprite } from "../../../../shared";
 export interface IMockBlipOptions extends IMockWorldObjectOptions {
     alpha: number;
     color: number;

package/dist/server/entities/mock/blip/MockBlipsManager.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockBlipsManager = void 0;
 const MockWorldObjectsManager_1 = require("../worldObject/MockWorldObjectsManager");
 const MockBlip_1 = require("./MockBlip");
-const common_1 = require("../../common");
+const shared_1 = require("../../../../shared");
 class MockBlipsManager extends MockWorldObjectsManager_1.MockWorldObjectsManager {
     constructor() {
         super({
@@ -14,7 +14,7 @@ class MockBlipsManager extends MockWorldObjectsManager_1.MockWorldObjectsManager
         const { alpha = 255, drawDistance = 30, shortRange = false, sprite, scale = 1, color = 1, name = "Blip", position, dimension, rotation = 0, } = options;
         const blip = new MockBlip_1.MockBlip({
             id: 0,
-            type: common_1.BaseObjectType.Blip,
+            type: shared_1.BaseObjectType.Blip,
             alpha,
             drawDistance,
             shortRange,

package/dist/server/entities/mock/colshape/MockColshapesManager.js

@@ -2,18 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockColshapesManager = void 0;
 const MockWorldObjectsManager_1 = require("../worldObject/MockWorldObjectsManager");
-const Vectors_1 = require("../../../common/utils/math/Vectors");
+const Vectors_1 = require("../../../../shared/common/utils/math/Vectors");
 const MockCircleColshape_1 = require("./MockCircleColshape");
 const MockCuboidColshape_1 = require("./MockCuboidColshape");
 const MockCylinderColshape_1 = require("./MockCylinderColshape");
 const MockRectangleColshape_1 = require("./MockRectangleColshape");
 const MockSphereColshape_1 = require("./MockSphereColshape");
-const IBaseObject_1 = require("../../common/baseObject/IBaseObject");
+const shared_1 = require("../../../../shared");
 class MockColshapesManager extends MockWorldObjectsManager_1.MockWorldObjectsManager {
     _nextId;
     constructor() {
         super({
-            baseObjectsType: IBaseObject_1.BaseObjectType.Colshape,
+            baseObjectsType: shared_1.BaseObjectType.Colshape,
         });
         this._nextId = 0;
     }
@@ -22,7 +22,7 @@ class MockColshapesManager extends MockWorldObjectsManager_1.MockWorldObjectsMan
         const { x, y } = position;
         const colshape = new MockCircleColshape_1.MockCircleColshape({
             id: this._nextId++,
-            type: IBaseObject_1.BaseObjectType.Colshape,
+            type: shared_1.BaseObjectType.Colshape,
             range,
             position: new Vectors_1.Vector3D(x, y, 0),
             dimension,
@@ -35,7 +35,7 @@ class MockColshapesManager extends MockWorldObjectsManager_1.MockWorldObjectsMan
         const { x, y, z } = position;
         const colshape = new MockCuboidColshape_1.MockCuboidColshape({
             id: this._nextId++,
-            type: IBaseObject_1.BaseObjectType.Colshape,
+            type: shared_1.BaseObjectType.Colshape,
             width,
             depth,
             height,
@@ -50,7 +50,7 @@ class MockColshapesManager extends MockWorldObjectsManager_1.MockWorldObjectsMan
         const { x, y, z } = position;
         const colshape = new MockCylinderColshape_1.MockCylinderColshape({
             id: this._nextId++,
-            type: IBaseObject_1.BaseObjectType.Colshape,
+            type: shared_1.BaseObjectType.Colshape,
             range,
             height,
             position: new Vectors_1.Vector3D(x, y, z),
@@ -64,7 +64,7 @@ class MockColshapesManager extends MockWorldObjectsManager_1.MockWorldObjectsMan
         const { x, y } = position;
         const colshape = new MockRectangleColshape_1.MockRectangleColshape({
             id: this._nextId++,
-            type: IBaseObject_1.BaseObjectType.Colshape,
+            type: shared_1.BaseObjectType.Colshape,
             width,
             height,
             position: new Vectors_1.Vector3D(x, y, 0),
@@ -78,7 +78,7 @@ class MockColshapesManager extends MockWorldObjectsManager_1.MockWorldObjectsMan
         const { x, y, z } = position;
         const colshape = new MockSphereColshape_1.MockSphereColshape({
             id: this._nextId++,
-            type: IBaseObject_1.BaseObjectType.Colshape,
+            type: shared_1.BaseObjectType.Colshape,
             range,
             position: new Vectors_1.Vector3D(x, y, z),
             dimension,

package/dist/server/entities/mock/common/IMockEntity.d.ts

@@ -1,4 +1,4 @@
-import { Vector3D } from "../../../common/utils/math/Vectors";
+import { Vector3D } from "../../../../shared/common/utils/math/Vectors";
 export interface IMockEntity {
     id: number;
     model: number;

package/dist/server/entities/mock/entity/MockEntity.d.ts

@@ -1,6 +1,6 @@
 import { IEntity } from "../../common/entity/IEntity";
 import { MockWorldObject, IMockWorldObjectOptions } from "../worldObject/MockWorldObject";
-import { IVector3D, Vector3D } from "../../../common/utils";
+import { IVector3D, Vector3D } from "../../../../shared/common/utils";
 export interface IMockEntityOptions extends IMockWorldObjectOptions {
     model: number;
     rotation: IVector3D;

package/dist/server/entities/mock/entity/MockEntity.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockEntity = void 0;
 const MockWorldObject_1 = require("../worldObject/MockWorldObject");
-const utils_1 = require("../../../common/utils");
+const utils_1 = require("../../../../shared/common/utils");
 const RockMod_1 = require("../../../RockMod");
 class MockEntity extends MockWorldObject_1.MockWorldObject {
     _model;

package/dist/server/entities/mock/marker/MockMarker.d.ts

@@ -1,7 +1,7 @@
 import { IMarker } from "../../common/marker/IMarker";
 import { MockWorldObject, IMockWorldObjectOptions } from "../worldObject/MockWorldObject";
-import { IRGBA, IVector3D } from "../../../common/utils";
-import { IMarkerType } from "../../common";
+import { IRGBA, IVector3D } from "../../../../shared/common/utils";
+import { IMarkerType } from "../../../../shared";
 export interface IMockMarkerOptions extends IMockWorldObjectOptions {
     markerType?: IMarkerType;
     scale?: number;

package/dist/server/entities/mock/marker/MockMarker.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockMarker = void 0;
 const MockWorldObject_1 = require("../worldObject/MockWorldObject");
-const utils_1 = require("../../../common/utils");
-const common_1 = require("../../common");
+const utils_1 = require("../../../../shared/common/utils");
+const shared_1 = require("../../../../shared");
 class MockMarker extends MockWorldObject_1.MockWorldObject {
     _markerType;
     _visible;
@@ -27,7 +27,7 @@ class MockMarker extends MockWorldObject_1.MockWorldObject {
     }
     constructor(options) {
         super(options);
-        const { markerType = common_1.IMarkerType.MarkerArrow, scale = 1, color = new utils_1.RGBA(255, 255, 255), rotation = new utils_1.Vector3D(0, 0, 0), } = options;
+        const { markerType = shared_1.IMarkerType.MarkerArrow, scale = 1, color = new utils_1.RGBA(255, 255, 255), rotation = new utils_1.Vector3D(0, 0, 0), } = options;
         this._markerType = markerType;
         this._visible = true;
         this._scale = scale;

package/dist/server/entities/mock/marker/MockMarkersManager.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockMarkersManager = void 0;
 const MockWorldObjectsManager_1 = require("../worldObject/MockWorldObjectsManager");
 const MockMarker_1 = require("./MockMarker");
-const common_1 = require("../../common");
+const shared_1 = require("../../../../shared");
 class MockMarkersManager extends MockWorldObjectsManager_1.MockWorldObjectsManager {
     _nextId;
     constructor() {
@@ -16,7 +16,7 @@ class MockMarkersManager extends MockWorldObjectsManager_1.MockWorldObjectsManag
         const { type, scale, color, position, dimension, rotation } = options;
         const marker = new MockMarker_1.MockMarker({
             id: this._nextId++,
-            type: common_1.BaseObjectType.Marker,
+            type: shared_1.BaseObjectType.Marker,
             markerType: type,
             scale,
             color,

package/dist/server/entities/mock/object/MockObjectsManager.js

@@ -4,7 +4,7 @@ exports.MockObjectsManager = void 0;
 const MockEntitiesManager_1 = require("../entity/MockEntitiesManager");
 const MockObject_1 = require("./MockObject");
 const RockMod_1 = require("../../../RockMod");
-const common_1 = require("../../common");
+const shared_1 = require("../../../../shared");
 class MockObjectsManager extends MockEntitiesManager_1.MockEntitiesManager {
     _nextId;
     constructor() {
@@ -17,7 +17,7 @@ class MockObjectsManager extends MockEntitiesManager_1.MockEntitiesManager {
         const { model, alpha, position, dimension, rotation } = options;
         const object = new MockObject_1.MockObject({
             id: this._nextId++,
-            type: common_1.BaseObjectType.Object,
+            type: shared_1.BaseObjectType.Object,
             model: RockMod_1.RockMod.instance.utils.hash(model),
             alpha,
             position,

package/dist/server/entities/mock/ped/MockPedsManager.js

@@ -4,7 +4,7 @@ exports.MockPedsManager = void 0;
 const MockEntitiesManager_1 = require("../entity/MockEntitiesManager");
 const MockPed_1 = require("./MockPed");
 const RockMod_1 = require("../../../RockMod");
-const common_1 = require("../../common");
+const shared_1 = require("../../../../shared");
 class MockPedsManager extends MockEntitiesManager_1.MockEntitiesManager {
     _nextId;
     constructor() {
@@ -17,7 +17,7 @@ class MockPedsManager extends MockEntitiesManager_1.MockEntitiesManager {
         const { model, position, dimension, rotation } = options;
         const ped = new MockPed_1.MockPed({
             id: this._nextId++,
-            type: common_1.BaseObjectType.Ped,
+            type: shared_1.BaseObjectType.Ped,
             model: RockMod_1.RockMod.instance.utils.hash(model),
             position,
             dimension,

package/dist/server/entities/mock/player/MockPlayer.d.ts

@@ -1,9 +1,9 @@
 import { IPlayer } from "../../common/player/IPlayer";
 import { MockEntity, IMockEntityOptions } from "../entity/MockEntity";
-import { Vector3D } from "../../../common/utils/math/Vectors";
+import { Vector3D } from "../../../../shared/common/utils/math/Vectors";
 import { RageVehicle } from "../../ragemp/vehicle/RageVehicle";
-import { IMockClientEvents } from "../../../net/mock/events/MockEventsManager";
 import { IMockClientRPC } from "../../../net/mock/rpc/MockRPCManager";
+import { IServerToClientEvents } from "../../../../shared";
 export interface IMockPlayerOptions extends IMockEntityOptions {
     name?: string;
     socialClub?: string;
@@ -32,7 +32,7 @@ export declare class MockPlayer extends MockEntity implements IPlayer {
     get eyeColor(): number;
     get streamedPlayers(): MockPlayer[];
     constructor(options: IMockPlayerOptions);
-    emitEvent<K extends keyof IMockClientEvents>(eventName: K, ...args: Parameters<IMockClientEvents[K]>): void;
+    emitEvent<K extends keyof IServerToClientEvents>(eventName: K, ...args: Parameters<IServerToClientEvents[K]>): void;
     emitRPC<K extends keyof IMockClientRPC>(rpcName: K, ...args: Parameters<IMockClientRPC[K]>): Promise<ReturnType<IMockClientRPC[K]>>;
     spawn(position: Vector3D): void;
     setName(name: string): void;

package/dist/server/entities/mock/player/MockPlayer.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockPlayer = void 0;
 const MockEntity_1 = require("../entity/MockEntity");
 const RockMod_1 = require("../../../RockMod");
+const Math_1 = require("../../../../shared/common/utils/math/Math");
 class MockPlayer extends MockEntity_1.MockEntity {
     _playerData;
     get name() {
@@ -79,10 +80,10 @@ class MockPlayer extends MockEntity_1.MockEntity {
         this._playerData.heading = value;
     }
     setHealth(value) {
-        this._playerData.health = Math.clamp(value, 0, 100);
+        this._playerData.health = (0, Math_1.MathClamp)(value, 0, 100);
     }
     setArmour(value) {
-        this._playerData.armour = Math.clamp(value, 0, 100);
+        this._playerData.armour = (0, Math_1.MathClamp)(value, 0, 100);
     }
     setWeaponAmmo(weapon, ammo) {
         this._playerData.weapon = RockMod_1.RockMod.instance.utils.hash(weapon);

package/dist/server/entities/mock/player/MockPlayersManager.d.ts

@@ -1,7 +1,7 @@
 import { IPlayersManager } from "../../common/player/IPlayersManager";
 import { MockPlayer } from "./MockPlayer";
 import { MockEntitiesManager } from "../entity/MockEntitiesManager";
-import { Vector3D } from "../../../common/utils/math/Vectors";
+import { Vector3D } from "../../../../shared/common/utils/math/Vectors";
 export interface IMockPlayerConnectOptions {
     id?: number;
     name?: string;

package/dist/server/entities/mock/player/MockPlayersManager.js

@@ -4,8 +4,9 @@ exports.MockPlayersManager = void 0;
 const MockPlayer_1 = require("./MockPlayer");
 const MockEntitiesManager_1 = require("../entity/MockEntitiesManager");
 const RockMod_1 = require("../../../RockMod");
-const common_1 = require("../../common");
-const Vectors_1 = require("../../../common/utils/math/Vectors");
+const Vectors_1 = require("../../../../shared/common/utils/math/Vectors");
+const shared_1 = require("../../../../shared");
+const types_1 = require("../../../net/common/events/types");
 class MockPlayersManager extends MockEntitiesManager_1.MockEntitiesManager {
     _nextId;
     constructor() {
@@ -48,7 +49,7 @@ class MockPlayersManager extends MockEntitiesManager_1.MockEntitiesManager {
         const { id = this._nextId++, name = `Player${id}`, socialClub = `Player${id}`, position = new Vectors_1.Vector3D(0, 0, 0), dimension = 0, health = 100, armour = 0, ip = "127.0.0.1", serial = `MOCK_${id}`, } = options;
         const player = new MockPlayer_1.MockPlayer({
             id,
-            type: common_1.BaseObjectType.Player,
+            type: shared_1.BaseObjectType.Player,
             name,
             socialClub,
             position,
@@ -65,14 +66,14 @@ class MockPlayersManager extends MockEntitiesManager_1.MockEntitiesManager {
     }
     simulateConnect(options = {}) {
         const player = this.createPlayer(options);
-        RockMod_1.RockMod.instance.net.events.emit("rm::playerConnected", player);
+        RockMod_1.RockMod.instance.net.events.emitInternal(types_1.ServerInternalEventName.PlayerConnected, player);
         return player;
     }
     simulateDisconnect(player) {
         if (!this._baseObjects.has(player.id)) {
             throw new Error(`Player with id ${player.id} not found`);
         }
-        RockMod_1.RockMod.instance.net.events.emit("rm::playerDisconnected", player);
+        RockMod_1.RockMod.instance.net.events.emitInternal(types_1.ServerInternalEventName.PlayerDisconnected, player);
         this.unregisterBaseObject(player);
     }
 }

package/dist/server/entities/mock/vehicle/MockVehicle.d.ts

@@ -1,6 +1,6 @@
 import { IVehicle } from "../../common/vehicle/IVehicle";
 import { MockEntity, IMockEntityOptions } from "../entity/MockEntity";
-import { RGBA } from "../../../common/utils";
+import { RGBA } from "../../../../shared/common/utils";
 import { MockPlayer } from "../player/MockPlayer";
 export interface IMockVehicleOptions extends IMockEntityOptions {
     engine?: boolean;

package/dist/server/entities/mock/vehicle/MockVehicle.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockVehicle = void 0;
 const MockEntity_1 = require("../entity/MockEntity");
-const utils_1 = require("../../../common/utils");
+const utils_1 = require("../../../../shared/common/utils");
+const Math_1 = require("../../../../shared/common/utils/math/Math");
 class MockVehicle extends MockEntity_1.MockEntity {
     _bodyHealth;
     _engineHealth;
@@ -71,7 +72,7 @@ class MockVehicle extends MockEntity_1.MockEntity {
         this._bodyHealth = value;
     }
     setEngineHealth(value) {
-        this._engineHealth = Math.clamp(value, 0, 1000);
+        this._engineHealth = (0, Math_1.MathClamp)(value, 0, 1000);
     }
     setNumberPlate(value) {
         this._numberPlate = value;

package/dist/server/entities/mock/vehicle/MockVehiclesManager.js

@@ -4,7 +4,7 @@ exports.MockVehiclesManager = void 0;
 const MockEntitiesManager_1 = require("../entity/MockEntitiesManager");
 const MockVehicle_1 = require("./MockVehicle");
 const RockMod_1 = require("../../../RockMod");
-const common_1 = require("../../common");
+const shared_1 = require("../../../../shared");
 class MockVehiclesManager extends MockEntitiesManager_1.MockEntitiesManager {
     _nextId;
     constructor() {
@@ -17,7 +17,7 @@ class MockVehiclesManager extends MockEntitiesManager_1.MockEntitiesManager {
         const { model, engine, locked, position, dimension, rotation } = options;
         const vehicle = new MockVehicle_1.MockVehicle({
             id: this._nextId++,
-            type: common_1.BaseObjectType.Vehicle,
+            type: shared_1.BaseObjectType.Vehicle,
             model: RockMod_1.RockMod.instance.utils.hash(model),
             engine,
             locked,

package/dist/server/entities/mock/worldObject/MockWorldObject.d.ts

@@ -1,6 +1,6 @@
 import { IWorldObject } from "../../common/worldObject/IWorldObject";
 import { MockBaseObject, IMockBaseObjectOptions } from "../baseObject/MockBaseObject";
-import { IVector3D } from "../../../common/utils/math/Vectors";
+import { IVector3D } from "../../../../shared/common/utils/math/Vectors";
 export interface IMockWorldObjectOptions extends IMockBaseObjectOptions {
     position: IVector3D;
     dimension: number;

package/dist/server/entities/mock/worldObject/MockWorldObjectsIterator.d.ts

@@ -1,7 +1,7 @@
 import { IWorldObjectsIterator } from "../../common/worldObject/IWorldObjectsIterator";
 import { MockWorldObject } from "./MockWorldObject";
 import { MockBaseObjectsIterator } from "../baseObject/MockBaseObjectsIterator";
-import { Vector2D, Vector3D } from "../../../common/utils/math/Vectors";
+import { Vector2D, Vector3D } from "../../../../shared/common/utils/math/Vectors";
 export declare class MockWorldObjectsIterator<T extends MockWorldObject> extends MockBaseObjectsIterator<T> implements IWorldObjectsIterator<T> {
     constructor(baseObjects: ReadonlyMap<number, T>);
     dimension(value: number): IterableIterator<T>;