fix(update): many updates

Author: ThornWalli

packages/app/lib/classes/App.ts

@@ -24,7 +24,7 @@ import InventoryAppModule from './appModule/Inventory';
 import ShopAppModule from './appModule/Shop';
 import TimeAppModule from './appModule/Time';
 import LightAppModule from './appModule/Light';
-import type { UnitIdentifier } from './Unit';
+import type { UnitIdentifier } from '../types/unit';
 
 type AppModuleList = (
   | typeof CursorAppModule

packages/app/lib/classes/Unit.ts

@@ -37,13 +37,12 @@ import {
   ROTATION_TYPE,
   rotationDirections
 } from '../utils/rotation';
-import type { UnitDescription, UnitType } from '../types/unit';
+import type { UnitDescription, UnitIdentifier, UnitType } from '../types/unit';
 import type { TextureMaps } from '../types/textures';
 import type { ConditionDirectionsDescription } from '../utils/pathfindng';
 import { rotateVector2 } from '../utils/vector';
 import { prepareTexture } from '../utils/texture';
 
-export type UnitIdentifier = string;
 declare module '../../lib/utils/object' {
   interface ObjectUserData {
     UNIT: string;

packages/app/lib/classes/appModule/Multiplayer.ts

@@ -20,7 +20,7 @@ import { Vector3 } from 'three';
 import CurrentPlayer from '../player/Current';
 import type App from '../App';
 import type { PlayerSettings } from '../../types/player';
-import type { UnitIdentifier } from '../Unit';
+import type { UnitIdentifier } from '../../types/unit';
 
 export interface Message {
   id: string;

packages/app/lib/classes/appModule/Player.ts

@@ -1,4 +1,4 @@
-import type { UnitIdentifier } from './../Unit';
+import type { UnitIdentifier } from '../../types/unit';
 import { ReplaySubject, Subject } from 'rxjs';
 import AppModule, {
   type AppModuleObservables,

packages/app/lib/classes/appModule/Room.ts

@@ -26,11 +26,13 @@ import { OBJECT_NAME } from '../../utils/object';
 import type Unit from '../Unit';
 import type { IntersectionListener } from '../rendererModule/Intersection';
 import CharacterUnitModule from '../unitModule/Character';
-import TeleporterUnit from '../unit/Teleporter';
-import type { UnitIdentifier } from '../Unit';
+import type TeleporterUnit from '../unit/Teleporter';
+import type { UnitIdentifier } from '../../types/unit';
 import BedUnitModule from '../unitModule/Bed';
 import ChairUnitModule from '../unitModule/Chair';
-import { TELEPORTER_TYPE } from '../unitModule/Teleporter';
+import TeleporterUnitModule, {
+  TELEPORTER_TYPE
+} from '../unitModule/Teleporter';
 import BenchUnitModule from '../unitModule/Bench';
 import SlotUnitModule from '../unitModule/Slot';
 
@@ -156,11 +158,12 @@ export default class RoomAppModule extends AppModule<State, Observables> {
         } else if (unit.getPosition().equals(new Vector3(0, 0, 0))) {
           const entranceTeleporter = room.modules.units
             .getUnits()
-            .filter(unit => unit instanceof TeleporterUnit)
+            .filter(unit => unit.hasModuleType(TeleporterUnitModule))
             .find(
               teleporterUnit =>
-                teleporterUnit.modules.teleporter.state.type ==
-                TELEPORTER_TYPE.ENTRANCE
+                teleporterUnit.getModuleByType<TeleporterUnitModule>(
+                  TeleporterUnitModule
+                ).state.type == TELEPORTER_TYPE.ENTRANCE
             ) as TeleporterUnit;
 
           unitTeleporter = entranceTeleporter;

packages/app/lib/classes/unitModule/Movement.ts

@@ -34,7 +34,7 @@ import { getRadByRotation, getRotationByPosition } from '../../utils/rotation';
 import TeleporterUnitModule, { TELEPORTER_TYPE } from './Teleporter';
 import CharacterUnitModule from './Character';
 import BedUnitModule, { type BedOptions } from './Bed';
-import TeleporterUnit from '../unit/Teleporter';
+import type TeleporterUnit from '../unit/Teleporter';
 import { ANIMATION_ACTION } from '../../types/animation';
 import SlotUnitModule from './Slot';
 import type { BenchUnitOptions } from '../unit/Bench';
@@ -345,8 +345,10 @@ export default class MovementUnitModule extends UnitModule<
     //#region teleporter
     if (
       targetUnit &&
-      targetUnit instanceof TeleporterUnit &&
-      targetUnit.modules.teleporter.getType() === TELEPORTER_TYPE.TELEPORTER
+      targetUnit.hasModuleType(TeleporterUnitModule) &&
+      targetUnit
+        .getModuleByType<TeleporterUnitModule>(TeleporterUnitModule)
+        .getType() === TELEPORTER_TYPE.TELEPORTER
     ) {
       const teleporterUnit = targetUnit as TeleporterUnit;
       characterModule.useTeleporter(teleporterUnit);

packages/app/lib/classes/unitModule/Teleporter.ts

@@ -7,7 +7,7 @@ import UnitModule, {
 } from '../UnitModule';
 import { UNIT_TYPE } from '../../types/unit';
 import type Unit from '../Unit';
-import type { UnitIdentifier } from '../Unit';
+import type { UnitIdentifier } from '../../types/unit';
 import type TeleporterUnit from '../unit/Teleporter';
 
 declare module '../../types/unit' {

packages/app/lib/types/unit.ts

@@ -2,6 +2,8 @@ import type { Vector3 } from 'three';
 import type { UnitModuleState } from '../classes/UnitModule';
 import type { ROTATION } from '../utils/rotation';
 
+export type UnitIdentifier = string;
+
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface UnitType {}